From 7c701367c0820691e2a0f8f1cfd1fb3470071704 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 2 Feb 2022 11:23:02 +0100
Subject: [PATCH 001/811] fix: some frameless windows showing a frame on
 Windows (#32692)

---
 shell/browser/native_window_views.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 0ba1637fe069a..2c8b8d190d30c 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -329,15 +329,14 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
     // Set Window style so that we get a minimize and maximize animation when
     // frameless.
     DWORD frame_style = WS_CAPTION | WS_OVERLAPPED;
-    if (resizable_)
+    if (resizable_ && thick_frame_)
       frame_style |= WS_THICKFRAME;
     if (minimizable_)
       frame_style |= WS_MINIMIZEBOX;
     if (maximizable_)
       frame_style |= WS_MAXIMIZEBOX;
-    // We should not show a frame for transparent window.
-    if (!thick_frame_)
-      frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
+    if (!thick_frame_ || !has_frame())
+      frame_style &= ~WS_CAPTION;
     ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
   }
 

From 8b6202b6a8847ddd28768fe09b0e014259a6b8e7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 05:20:39 -0800
Subject: [PATCH 002/811] Bump v19.0.0-nightly.20220202

---
 ELECTRON_VERSION                        | 2 +-
 docs/tutorial/support.md                | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d8c23d2a23ac7..7972b74ffe8dd 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-18.0.0-nightly.20220201
\ No newline at end of file
+19.0.0-nightly.20220202
\ No newline at end of file
diff --git a/docs/tutorial/support.md b/docs/tutorial/support.md
index e757ec22e21f1..d7a51f57140c4 100644
--- a/docs/tutorial/support.md
+++ b/docs/tutorial/support.md
@@ -70,10 +70,10 @@ until the maintainers feel the maintenance burden is too high to continue doing
 
 ### Currently supported versions
 
+* 19.x.y
 * 18.x.y
 * 17.x.y
 * 16.x.y
-* 15.x.y
 
 ### End-of-life
 
diff --git a/package.json b/package.json
index 17364c42ece0c..bc9587c97a192 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "18.0.0-nightly.20220201",
+  "version": "19.0.0-nightly.20220202",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 0e94c61a98fec..cf79321198695 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,0,0,20220201
- PRODUCTVERSION 18,0,0,20220201
+ FILEVERSION 19,0,0,20220202
+ PRODUCTVERSION 19,0,0,20220202
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "18.0.0"
+            VALUE "FileVersion", "19.0.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "18.0.0"
+            VALUE "ProductVersion", "19.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 9a5a45e804d83ea06f458d2ff9020aec87ffc17d Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Wed, 2 Feb 2022 07:06:36 -0800
Subject: [PATCH 003/811] fix: WCO window hover on window controls on Windows
 (#32672)

* fix: WCO window hover on window controls

* Update shell/browser/ui/win/electron_desktop_window_tree_host_win.cc

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

Co-authored-by: Robo <hop2deep@gmail.com>
---
 .../electron_desktop_window_tree_host_win.cc    | 17 +++++++++++++++++
 .../win/electron_desktop_window_tree_host_win.h |  1 +
 2 files changed, 18 insertions(+)

diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 03d0846c7f8f5..16e71fac12b39 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -99,4 +99,21 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
   return false;
 }
 
+bool ElectronDesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
+  // Call the default implementation of this method to get the event to its
+  // proper handler.
+  bool handled = views::DesktopWindowTreeHostWin::HandleMouseEvent(event);
+
+  // On WCO-enabled windows, we need to mark non-client mouse moved events as
+  // handled so they don't incorrectly propogate back to the OS.
+  if (native_window_view_->IsWindowControlsOverlayEnabled() &&
+      event->type() == ui::ET_MOUSE_MOVED &&
+      (event->flags() & ui::EF_IS_NON_CLIENT) != 0) {
+    event->SetHandled();
+    handled = true;
+  }
+
+  return handled;
+}
+
 }  // namespace electron
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
index 3fd831aae1ed0..8c7be1175a193 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
@@ -36,6 +36,7 @@ class ElectronDesktopWindowTreeHostWin
   bool GetDwmFrameInsetsInPixels(gfx::Insets* insets) const override;
   bool GetClientAreaInsets(gfx::Insets* insets,
                            HMONITOR monitor) const override;
+  bool HandleMouseEvent(ui::MouseEvent* event) override;
 
  private:
   NativeWindowViews* native_window_view_;  // weak ref

From ed185f324e791da5dea3475aeb8d4fae798d7122 Mon Sep 17 00:00:00 2001
From: Sofia Nguy <sofianguy@gmail.com>
Date: Wed, 2 Feb 2022 07:07:11 -0800
Subject: [PATCH 004/811] docs: Update E18 release date (#32665)

---
 docs/tutorial/electron-timelines.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/tutorial/electron-timelines.md b/docs/tutorial/electron-timelines.md
index eacc826928bd7..16418ab398c51 100644
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -26,4 +26,5 @@ Special notes:
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 |
 | 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 |
 | 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | TBD |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 |
+| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | TBD |

From c3d11e2ea2d9751a457c72805b7688a38ceac30a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 3 Feb 2022 00:32:53 +0900
Subject: [PATCH 005/811] test: fix failing tests of focus/blur events of
 WebContents (#32711)

---
 docs/api/web-contents.md           |  9 +++++++++
 spec-main/api-web-contents-spec.ts | 28 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 8bf9d9a8b8062..ac44742ac59c1 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -516,6 +516,15 @@ Emitted when the `WebContents` loses focus.
 
 Emitted when the `WebContents` gains focus.
 
+Note that on macOS, having focus means the `WebContents` is the first responder
+of window, so switching focus between windows would not trigger the `focus` and
+`blur` events of `WebContents`, as the first responder of each window is not
+changed.
+
+The `focus` and `blur` events of `WebContents` should only be used to detect
+focus change between different `WebContents` and `BrowserView` in the same
+window.
+
 #### Event: 'devtools-opened'
 
 Emitted when DevTools is opened.
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 911947a27e6e0..3d04494a50d1a 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -826,15 +826,20 @@ describe('webContents module', () => {
       });
     });
 
+    const moveFocusToDevTools = async (win: BrowserWindow) => {
+      const devToolsOpened = emittedOnce(win.webContents, 'devtools-opened');
+      win.webContents.openDevTools({ mode: 'right' });
+      await devToolsOpened;
+      win.webContents.devToolsWebContents!.focus();
+    };
+
     describe('focus event', () => {
       afterEach(closeAllWindows);
+
       it('is triggered when web contents is focused', async () => {
         const w = new BrowserWindow({ show: false });
         await w.loadURL('about:blank');
-        const devToolsOpened = emittedOnce(w.webContents, 'devtools-opened');
-        w.webContents.openDevTools();
-        await devToolsOpened;
-        w.webContents.devToolsWebContents!.focus();
+        await moveFocusToDevTools(w);
         const focusPromise = emittedOnce(w.webContents, 'focus');
         w.webContents.focus();
         await expect(focusPromise).to.eventually.be.fulfilled();
@@ -849,16 +854,17 @@ describe('webContents module', () => {
           window2.loadURL('about:blank')
         ]);
 
+        const focusPromise1 = emittedOnce(window1.webContents, 'focus');
+        const focusPromise2 = emittedOnce(window2.webContents, 'focus');
+
         window1.showInactive();
         window2.showInactive();
 
-        let focusPromise = emittedOnce(window1.webContents, 'focus');
         window1.focus();
-        await expect(focusPromise).to.eventually.be.fulfilled();
+        await expect(focusPromise1).to.eventually.be.fulfilled();
 
-        focusPromise = emittedOnce(window2.webContents, 'focus');
         window2.focus();
-        await expect(focusPromise).to.eventually.be.fulfilled();
+        await expect(focusPromise2).to.eventually.be.fulfilled();
       });
     });
 
@@ -867,11 +873,9 @@ describe('webContents module', () => {
       it('is triggered when web contents is blurred', async () => {
         const w = new BrowserWindow({ show: true });
         await w.loadURL('about:blank');
+        w.webContents.focus();
         const blurPromise = emittedOnce(w.webContents, 'blur');
-        const devToolsOpened = emittedOnce(w.webContents, 'devtools-opened');
-        w.webContents.openDevTools({ mode: 'detach' });
-        await devToolsOpened;
-        w.webContents.devToolsWebContents!.focus();
+        await moveFocusToDevTools(w);
         await expect(blurPromise).to.eventually.be.fulfilled();
       });
     });

From 4c39eb32b0d2be479b9a0856186c6dfeccae6b96 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 2 Feb 2022 23:01:05 +0100
Subject: [PATCH 006/811] refactor: use QuickLookThumbnailing where applicable
 (#32456)

---
 BUILD.gn                                      |   2 +
 .../api/electron_api_native_image_mac.mm      | 103 +++++++++++++-----
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 3aa40b4855f8e..7fe689d592bd1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -501,6 +501,8 @@ source_set("electron_lib") {
       "StoreKit.framework",
     ]
 
+    weak_frameworks = [ "QuickLookThumbnailing.framework" ]
+
     sources += [
       "shell/browser/ui/views/autofill_popup_view.cc",
       "shell/browser/ui/views/autofill_popup_view.h",
diff --git a/shell/common/api/electron_api_native_image_mac.mm b/shell/common/api/electron_api_native_image_mac.mm
index 68aacfdf28b25..60f3765a3def3 100644
--- a/shell/common/api/electron_api_native_image_mac.mm
+++ b/shell/common/api/electron_api_native_image_mac.mm
@@ -10,8 +10,10 @@
 
 #import <Cocoa/Cocoa.h>
 #import <QuickLook/QuickLook.h>
+#import <QuickLookThumbnailing/QuickLookThumbnailing.h>
 
 #include "base/mac/foundation_util.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "gin/arguments.h"
 #include "shell/common/gin_converters/image_converter.h"
@@ -53,32 +55,81 @@
   }
 
   CGSize cg_size = size.ToCGSize();
-  base::ScopedCFTypeRef<CFURLRef> cfurl = base::mac::FilePathToCFURL(path);
-  base::ScopedCFTypeRef<QLThumbnailRef> ql_thumbnail(
-      QLThumbnailCreate(kCFAllocatorDefault, cfurl, cg_size, NULL));
-  __block gin_helper::Promise<gfx::Image> p = std::move(promise);
-  // we do not want to blocking the main thread while waiting for quicklook to
-  // generate the thumbnail
-  QLThumbnailDispatchAsync(
-      ql_thumbnail,
-      dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, /*flags*/ 0), ^{
-        base::ScopedCFTypeRef<CGImageRef> cg_thumbnail(
-            QLThumbnailCopyImage(ql_thumbnail));
-        if (cg_thumbnail) {
-          NSImage* result =
-              [[[NSImage alloc] initWithCGImage:cg_thumbnail
-                                           size:cg_size] autorelease];
-          gfx::Image thumbnail(result);
-          dispatch_async(dispatch_get_main_queue(), ^{
-            p.Resolve(thumbnail);
-          });
-        } else {
-          dispatch_async(dispatch_get_main_queue(), ^{
-            p.RejectWithErrorMessage("unable to retrieve thumbnail preview "
-                                     "image for the given path");
-          });
-        }
-      });
+
+  if (@available(macOS 10.15, *)) {
+    NSURL* nsurl = base::mac::FilePathToNSURL(path);
+
+    // We need to explicitly check if the user has passed an invalid path
+    // because QLThumbnailGenerationRequest will generate a stock file icon
+    // and pass silently if we do not.
+    if (![[NSFileManager defaultManager] fileExistsAtPath:[nsurl path]]) {
+      promise.RejectWithErrorMessage(
+          "unable to retrieve thumbnail preview image for the given path");
+      return handle;
+    }
+
+    NSScreen* screen = [[NSScreen screens] firstObject];
+    base::scoped_nsobject<QLThumbnailGenerationRequest> request(
+        [[QLThumbnailGenerationRequest alloc]
+              initWithFileAtURL:nsurl
+                           size:cg_size
+                          scale:[screen backingScaleFactor]
+            representationTypes:
+                QLThumbnailGenerationRequestRepresentationTypeAll]);
+    __block gin_helper::Promise<gfx::Image> p = std::move(promise);
+    [[QLThumbnailGenerator sharedGenerator]
+        generateBestRepresentationForRequest:request
+                           completionHandler:^(
+                               QLThumbnailRepresentation* thumbnail,
+                               NSError* error) {
+                             if (error || !thumbnail) {
+                               std::string err_msg(
+                                   [error.localizedDescription UTF8String]);
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 p.RejectWithErrorMessage(
+                                     "unable to retrieve thumbnail preview "
+                                     "image for the given path: " +
+                                     err_msg);
+                               });
+                             } else {
+                               NSImage* result = [[[NSImage alloc]
+                                   initWithCGImage:[thumbnail CGImage]
+                                              size:cg_size] autorelease];
+                               gfx::Image image(result);
+                               dispatch_async(dispatch_get_main_queue(), ^{
+                                 p.Resolve(image);
+                               });
+                             }
+                           }];
+  } else {
+    base::ScopedCFTypeRef<CFURLRef> cfurl = base::mac::FilePathToCFURL(path);
+    base::ScopedCFTypeRef<QLThumbnailRef> ql_thumbnail(
+        QLThumbnailCreate(kCFAllocatorDefault, cfurl, cg_size, NULL));
+    __block gin_helper::Promise<gfx::Image> p = std::move(promise);
+    // Do not block the main thread waiting for quicklook to generate the
+    // thumbnail.
+    QLThumbnailDispatchAsync(
+        ql_thumbnail,
+        dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, /*flags*/ 0), ^{
+          base::ScopedCFTypeRef<CGImageRef> cg_thumbnail(
+              QLThumbnailCopyImage(ql_thumbnail));
+          if (cg_thumbnail) {
+            NSImage* result =
+                [[[NSImage alloc] initWithCGImage:cg_thumbnail
+                                             size:cg_size] autorelease];
+            gfx::Image thumbnail(result);
+            dispatch_async(dispatch_get_main_queue(), ^{
+              p.Resolve(thumbnail);
+            });
+          } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+              p.RejectWithErrorMessage("unable to retrieve thumbnail preview "
+                                       "image for the given path");
+            });
+          }
+        });
+  }
+
   return handle;
 }
 

From e0f2511cba757925ade70a3936fde14339a2504e Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Wed, 2 Feb 2022 14:14:11 -0800
Subject: [PATCH 007/811] chore: bump NMV for Electron 19 (#32703)

---
 build/args/all.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/args/all.gn b/build/args/all.gn
index 0eb443c8153e9..a346a9b3d4939 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 103
+node_module_version = 106
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0

From 2526031a5f9def6f4d1e6d5713d71463b799d0de Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 05:01:03 -0800
Subject: [PATCH 008/811] Bump v19.0.0-nightly.20220203

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7972b74ffe8dd..0c2d0c1753ddf 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220202
\ No newline at end of file
+19.0.0-nightly.20220203
\ No newline at end of file
diff --git a/package.json b/package.json
index bc9587c97a192..665b77f7df74d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220202",
+  "version": "19.0.0-nightly.20220203",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index cf79321198695..d2e0b381b2a1e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220202
- PRODUCTVERSION 19,0,0,20220202
+ FILEVERSION 19,0,0,20220203
+ PRODUCTVERSION 19,0,0,20220203
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7442905dd28c72235c8d61aab0e24d1f25eb6ca0 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jv@jviotti.com>
Date: Thu, 3 Feb 2022 16:57:21 -0400
Subject: [PATCH 009/811] build: Support cygwin in script/lib/util.py (#32731)

Running a build on Cygwin or MSYS2 otherwise fails.

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
---
 script/lib/util.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/lib/util.py b/script/lib/util.py
index 89b8bbb976c87..9c667fed9e906 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -206,6 +206,7 @@ def get_buildtools_executable(name):
     'linux': 'linux64',
     'linux2': 'linux64',
     'win32': 'win',
+    'cygwin': 'win',
   }[sys.platform]
   path = os.path.join(buildtools, chromium_platform, name)
   if sys.platform == 'win32':

From fb3f5e490e7aeda7a0f0939633afa70f57ca496d Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 3 Feb 2022 22:56:50 +0100
Subject: [PATCH 010/811] test: improve webContents.savePage() specs (#32727)

---
 spec-main/api-browser-window-spec.ts | 31 ++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index b1613fea6dce2..c181cb4f29b44 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3419,20 +3419,39 @@ describe('BrowserWindow module', () => {
     const savePageJsPath = path.join(savePageDir, 'save_page_files', 'test.js');
     const savePageCssPath = path.join(savePageDir, 'save_page_files', 'test.css');
 
-    after(() => {
+    afterEach(() => {
+      closeAllWindows();
+
       try {
         fs.unlinkSync(savePageCssPath);
         fs.unlinkSync(savePageJsPath);
         fs.unlinkSync(savePageHtmlPath);
         fs.rmdirSync(path.join(savePageDir, 'save_page_files'));
         fs.rmdirSync(savePageDir);
-      } catch (e) {
-        // Ignore error
-      }
+      } catch {}
+    });
+
+    it('should save page to disk with HTMLOnly', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'));
+      await w.webContents.savePage(savePageHtmlPath, 'HTMLOnly');
+
+      expect(fs.existsSync(savePageHtmlPath)).to.be.true('html path');
+      expect(fs.existsSync(savePageJsPath)).to.be.false('js path');
+      expect(fs.existsSync(savePageCssPath)).to.be.false('css path');
+    });
+
+    it('should save page to disk with MHTML', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'));
+      await w.webContents.savePage(savePageHtmlPath, 'MHTML');
+
+      expect(fs.existsSync(savePageHtmlPath)).to.be.true('html path');
+      expect(fs.existsSync(savePageJsPath)).to.be.false('js path');
+      expect(fs.existsSync(savePageCssPath)).to.be.false('css path');
     });
-    afterEach(closeAllWindows);
 
-    it('should save page to disk', async () => {
+    it('should save page to disk with HTMLComplete', async () => {
       const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'));
       await w.webContents.savePage(savePageHtmlPath, 'HTMLComplete');

From d46431b564d9618ca1f057aa8f44f085a0c8550a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 4 Feb 2022 05:01:08 -0800
Subject: [PATCH 011/811] Bump v19.0.0-nightly.20220204

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0c2d0c1753ddf..0f0ec291aff57 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220203
\ No newline at end of file
+19.0.0-nightly.20220204
\ No newline at end of file
diff --git a/package.json b/package.json
index 665b77f7df74d..0c20da5971860 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220203",
+  "version": "19.0.0-nightly.20220204",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d2e0b381b2a1e..eca4ff5dbbde7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220203
- PRODUCTVERSION 19,0,0,20220203
+ FILEVERSION 19,0,0,20220204
+ PRODUCTVERSION 19,0,0,20220204
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 81fcd732c2080ca857bc7cb5d5b8c701ab382a90 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 7 Feb 2022 09:51:59 +0100
Subject: [PATCH 012/811] fix: savePage throw on relative paths (#32728)

---
 docs/api/web-contents.md                       |  2 +-
 shell/browser/api/electron_api_web_contents.cc |  5 +++++
 spec-main/api-browser-window-spec.ts           | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index ac44742ac59c1..c5500d0acb8f9 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1856,7 +1856,7 @@ the cursor when dragging.
 
 #### `contents.savePage(fullPath, saveType)`
 
-* `fullPath` string - The full file path.
+* `fullPath` string - The absolute file path.
 * `saveType` string - Specify the save type.
   * `HTMLOnly` - Save only the HTML of the page.
   * `HTMLComplete` - Save complete-html page.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index dd53ce0dba80e..c3c0f8a9d47ed 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2353,6 +2353,11 @@ v8::Local<v8::Promise> WebContents::SavePage(
   gin_helper::Promise<void> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
+  if (!full_file_path.IsAbsolute()) {
+    promise.RejectWithErrorMessage("Path must be absolute");
+    return handle;
+  }
+
   auto* handler = new SavePageHandler(web_contents(), std::move(promise));
   handler->Handle(full_file_path, save_type);
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index c181cb4f29b44..5f3657001ab8c 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3431,6 +3431,23 @@ describe('BrowserWindow module', () => {
       } catch {}
     });
 
+    it('should throw when passing relative paths', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'));
+
+      await expect(
+        w.webContents.savePage('save_page.html', 'HTMLComplete')
+      ).to.eventually.be.rejectedWith('Path must be absolute');
+
+      await expect(
+        w.webContents.savePage('save_page.html', 'HTMLOnly')
+      ).to.eventually.be.rejectedWith('Path must be absolute');
+
+      await expect(
+        w.webContents.savePage('save_page.html', 'MHTML')
+      ).to.eventually.be.rejectedWith('Path must be absolute');
+    });
+
     it('should save page to disk with HTMLOnly', async () => {
       const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(fixtures, 'pages', 'save_page', 'index.html'));

From bf3650eb1fef2cede8cf94eec0b2227d53f80b35 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 05:02:35 -0800
Subject: [PATCH 013/811] Bump v19.0.0-nightly.20220207

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0f0ec291aff57..05033af68c543 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220204
\ No newline at end of file
+19.0.0-nightly.20220207
\ No newline at end of file
diff --git a/package.json b/package.json
index 0c20da5971860..1c1029c547c0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220204",
+  "version": "19.0.0-nightly.20220207",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index eca4ff5dbbde7..6ea789da446a2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220204
- PRODUCTVERSION 19,0,0,20220204
+ FILEVERSION 19,0,0,20220207
+ PRODUCTVERSION 19,0,0,20220207
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ce86e81aa622f4bd60b18cce1a6cd727ade6bcb0 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 8 Feb 2022 03:59:28 -0800
Subject: [PATCH 014/811] docs: clarify meaning of cssOrigin (#32753)

---
 docs/api/web-contents.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index c5500d0acb8f9..d4a1233c5976a 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1101,7 +1101,7 @@ Returns `string` - The user agent for this web page.
 
 * `css` string
 * `options` Object (optional)
-  * `cssOrigin` string (optional) - Can be either 'user' or 'author'; Specifying 'user' enables you to prevent websites from overriding the CSS you insert. Default is 'author'.
+  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
 
 Returns `Promise<string>` - A promise that resolves with a key for the inserted CSS that can later be used to remove the CSS via `contents.removeInsertedCSS(key)`.
 

From c09ce25ab6d2315f8dffb5e5c8e10543d695a2f0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Feb 2022 05:01:02 -0800
Subject: [PATCH 015/811] Bump v19.0.0-nightly.20220208

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 05033af68c543..315dbb4575e8a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220207
\ No newline at end of file
+19.0.0-nightly.20220208
\ No newline at end of file
diff --git a/package.json b/package.json
index 1c1029c547c0f..fa466252ba9ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220207",
+  "version": "19.0.0-nightly.20220208",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6ea789da446a2..f1b41dd372997 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220207
- PRODUCTVERSION 19,0,0,20220207
+ FILEVERSION 19,0,0,20220208
+ PRODUCTVERSION 19,0,0,20220208
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 58af7d2a9ab1f3ce7f94b6141a534cb336aa2684 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 8 Feb 2022 16:15:30 +0100
Subject: [PATCH 016/811] fix: failure to print on macOS (#32767)

---
 patches/chromium/.patches                     |   1 +
 ...ingcontext_calls_to_newpage_pagedone.patch | 511 ++++++++++++++++++
 2 files changed, 512 insertions(+)
 create mode 100644 patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index c2f0b55b8b8c2..68e2c048aa919 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -113,3 +113,4 @@ revert_stop_using_nsrunloop_in_renderer_process.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
 feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
+drop_extra_printingcontext_calls_to_newpage_pagedone.patch
diff --git a/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch b/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch
new file mode 100644
index 0000000000000..a27193a4aeb64
--- /dev/null
+++ b/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch
@@ -0,0 +1,511 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alan Screen <awscreen@chromium.org>
+Date: Wed, 5 Jan 2022 23:15:29 +0000
+Subject: Drop extra PrintingContext calls to NewPage/PageDone
+
+When system calls were refactored out of PrintedDocument in
+https://crrev.com/948253, there were extra calls to PrintingContext
+NewPage() and PageDone() left in PrintedDocument::RenderPrintedDocument.
+These had no effect on Windows or Linux, but caused an issue for macOS.
+
+This was undetected by tests which use TestPrintingContext, and would
+only be detectable if a test was capable of using system drivers (which
+generally does not occur on the bots).  Adding a test to detect this is
+difficult at this time, but should be easier to do once later portions
+of the out-of-process print drivers commit chains fill in more testing
+capabilities.  At that point it should be easier to fire off a request
+to have the macOS Preview be the output. https://crbug.com/1284745
+has been filed to capture this needed effort.
+
+Remove NewPage()/PageDone() as common methods to override from
+PrintingContext and make these specific to macOS only.  Update the
+various implementations of PrintingContext::PrintDocument() to include
+the aborted and in-print-job checks that were previously in all
+NewPage() implementations.  The same corresponding checks from
+PageDone() can be handled by PrintedDocument::RenderPrintedDocument()
+and PrintedDocumentWin::RenderPrintedPage().  There is no concern about
+`in_print_job_` having changed during the lifetime of
+RenderPrintedDocument()/RenderPrintedPage(), so just add extra checks
+against printing having been asynchronouly aborted before allowing a
+final successful return.
+
+Bug: 1283651
+Change-Id: I52992bc7550dd25d4ad9a1dc633c7d9452a27bb1
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3367333
+Reviewed-by: Lei Zhang <thestig@chromium.org>
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#955936}
+
+diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
+index 4283a5743c695a7376722f80925722d9e7a6496e..992a59c32ea082e3593c0183819d1b174fc8db7a 100644
+--- a/chrome/browser/printing/print_job_worker.cc
++++ b/chrome/browser/printing/print_job_worker.cc
+@@ -524,12 +524,6 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
+   DCHECK(task_runner_->RunsTasksInCurrentSequence());
+   DCHECK_NE(page_number_, PageNumber::npos());
+ 
+-  // Preprocess.
+-  if (printing_context_->NewPage() != mojom::ResultCode::kSuccess) {
+-    OnFailure();
+-    return;
+-  }
+-
+   // Actual printing.
+   if (document_->RenderPrintedPage(*page, printing_context_.get()) !=
+       mojom::ResultCode::kSuccess) {
+@@ -537,12 +531,6 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
+     return;
+   }
+ 
+-  // Postprocess.
+-  if (printing_context_->PageDone() != mojom::ResultCode::kSuccess) {
+-    OnFailure();
+-    return;
+-  }
+-
+   // Signal everyone that the page is printed.
+   DCHECK(print_job_);
+   print_job_->PostTask(FROM_HERE,
+diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
+index e830a1017f2262d2d1c226aa16d41a6ffe53aadf..7daa9f9bedd664123d7590b9831169e99688b9c9 100644
+--- a/printing/emf_win_unittest.cc
++++ b/printing/emf_win_unittest.cc
+@@ -115,7 +115,6 @@ TEST_F(EmfPrintingTest, Enumerate) {
+   // current directory.
+   // TODO(maruel):  Clean the .PRN file generated in current directory.
+   context.NewDocument(u"EmfTest.Enumerate");
+-  context.NewPage();
+   // Process one at a time.
+   RECT page_bounds = emf.GetPageBounds(1).ToRECT();
+   Emf::Enumerator emf_enum(emf, context.context(), &page_bounds);
+@@ -129,7 +128,6 @@ TEST_F(EmfPrintingTest, Enumerate) {
+     EXPECT_TRUE(itr->SafePlayback(&emf_enum.context_))
+         << " index: " << index << " type: " << itr->record()->iType;
+   }
+-  context.PageDone();
+   context.DocumentDone();
+ }
+ 
+diff --git a/printing/printed_document.cc b/printing/printed_document.cc
+index 54dd798f4c76c34fd6414f68d3ad11a15c1673af..81ebe973fc6a99d66f5d8792aa19e01764f33d3f 100644
+--- a/printing/printed_document.cc
++++ b/printing/printed_document.cc
+@@ -187,17 +187,18 @@ const MetafilePlayer* PrintedDocument::GetMetafile() {
+ 
+ mojom::ResultCode PrintedDocument::RenderPrintedDocument(
+     PrintingContext* context) {
+-  mojom::ResultCode result = context->NewPage();
++  base::AutoLock lock(lock_);
++  mojom::ResultCode result = context->PrintDocument(
++      *GetMetafile(), *immutable_.settings_, mutable_.expected_page_count_);
+   if (result != mojom::ResultCode::kSuccess)
+     return result;
+-  {
+-    base::AutoLock lock(lock_);
+-    result = context->PrintDocument(*GetMetafile(), *immutable_.settings_,
+-                                    mutable_.expected_page_count_);
+-    if (result != mojom::ResultCode::kSuccess)
+-      return result;
+-  }
+-  return context->PageDone();
++
++  // Beware of any asynchronous aborts of the print job that happened during
++  // printing.
++  if (context->PrintingAborted())
++    return mojom::ResultCode::kCanceled;
++
++  return mojom::ResultCode::kSuccess;
+ }
+ 
+ bool PrintedDocument::IsComplete() const {
+diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc
+index 4024150677fb64f8f8c9d53dfa73cf709c819a7c..8e34b288ec518c4e2d0c5d8113f38440ad2c648b 100644
+--- a/printing/printed_document_win.cc
++++ b/printing/printed_document_win.cc
+@@ -24,8 +24,17 @@ mojom::ResultCode PrintedDocument::RenderPrintedPage(
+ #endif
+ 
+   DCHECK(context);
+-  return context->RenderPage(page,
+-                             immutable_.settings_->page_setup_device_units());
++  mojom::ResultCode result = context->RenderPage(
++      page, immutable_.settings_->page_setup_device_units());
++  if (result != mojom::ResultCode::kSuccess)
++    return result;
++
++  // Beware of any asynchronous aborts of the print job that happened during
++  // printing.
++  if (context->PrintingAborted())
++    return mojom::ResultCode::kCanceled;
++
++  return mojom::ResultCode::kSuccess;
+ }
+ 
+ }  // namespace printing
+diff --git a/printing/printing_context.h b/printing/printing_context.h
+index e87170e6957733f06bcc296bcca3fc331557ed46..e196a7d448ca41ea02d523a4de410dedf4298b5e 100644
+--- a/printing/printing_context.h
++++ b/printing/printing_context.h
+@@ -122,18 +122,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+   virtual mojom::ResultCode NewDocument(
+       const std::u16string& document_name) = 0;
+ 
+-  // Starts a new page.
+-  virtual mojom::ResultCode NewPage() = 0;
+-
+ #if defined(OS_WIN)
+   // Renders a page.
+   virtual mojom::ResultCode RenderPage(const PrintedPage& page,
+                                        const PageSetup& page_setup) = 0;
+ #endif
+ 
+-  // Closes the printed page.
+-  virtual mojom::ResultCode PageDone() = 0;
+-
+   // Prints the document contained in `metafile`.
+   virtual mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                           const PrintSettings& settings,
+@@ -178,6 +172,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+   // Reinitializes the settings for object reuse.
+   void ResetSettings();
+ 
++  bool PrintingAborted() const { return abort_printing_; }
++
+   int job_id() const { return job_id_; }
+ 
+  protected:
+diff --git a/printing/printing_context_android.cc b/printing/printing_context_android.cc
+index c28a40eb0a9ce0058d9f85948eda5f83d0c64791..5b2f096cb2a705e7c4c7ebbeddbf93cac1b9eafb 100644
+--- a/printing/printing_context_android.cc
++++ b/printing/printing_context_android.cc
+@@ -213,30 +213,13 @@ mojom::ResultCode PrintingContextAndroid::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextAndroid::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+-mojom::ResultCode PrintingContextAndroid::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextAndroid::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+     uint32_t num_pages) {
++  if (abort_printing_)
++    return mojom::ResultCode::kCanceled;
++  DCHECK(in_print_job_);
+   DCHECK(is_file_descriptor_valid());
+ 
+   return metafile.SaveToFileDescriptor(fd_) ? mojom::ResultCode::kSuccess
+diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
+index 676d98949da675e3283969dd3c9c61028dc1c7b5..b4f2f25edec45f91f241b0b1a7bc73b3f51af252 100644
+--- a/printing/printing_context_android.h
++++ b/printing/printing_context_android.h
+@@ -60,8 +60,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextAndroid
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+diff --git a/printing/printing_context_chromeos.cc b/printing/printing_context_chromeos.cc
+index d996c3e1f7b2d9f96f5c50aadff67f8273c7e760..670df66ae406fa883f801682de699aab16779591 100644
+--- a/printing/printing_context_chromeos.cc
++++ b/printing/printing_context_chromeos.cc
+@@ -402,32 +402,14 @@ mojom::ResultCode PrintingContextChromeos::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextChromeos::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+-mojom::ResultCode PrintingContextChromeos::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextChromeos::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+     uint32_t num_pages) {
++  if (abort_printing_)
++    return mojom::ResultCode::kCanceled;
++  DCHECK(in_print_job_);
++
+ #if defined(USE_CUPS)
+   std::vector<char> buffer;
+   if (!metafile.GetDataAsVector(&buffer))
+diff --git a/printing/printing_context_chromeos.h b/printing/printing_context_chromeos.h
+index 77353372b2c6e003428d37ab634167e8dc824fa4..06cb16c8a569a4d90ccdccc5fefcaaf527e49f5f 100644
+--- a/printing/printing_context_chromeos.h
++++ b/printing/printing_context_chromeos.h
+@@ -39,8 +39,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextChromeos
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+diff --git a/printing/printing_context_linux.cc b/printing/printing_context_linux.cc
+index c5adfa317747cda3d370a2ace52d843662f4ce91..204cec8311bec69674f1da2223e8d6c4b5a13ba3 100644
+--- a/printing/printing_context_linux.cc
++++ b/printing/printing_context_linux.cc
+@@ -151,30 +151,13 @@ mojom::ResultCode PrintingContextLinux::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextLinux::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+-mojom::ResultCode PrintingContextLinux::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextLinux::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+     uint32_t num_pages) {
++  if (abort_printing_)
++    return mojom::ResultCode::kCanceled;
++  DCHECK(in_print_job_);
+   DCHECK(print_dialog_);
+   // TODO(crbug.com/1252685)  Plumb error code back from
+   // `PrintDialogGtkInterface`.
+diff --git a/printing/printing_context_linux.h b/printing/printing_context_linux.h
+index 17d768a24141954df80bed3c5dd6735c34115195..653170ba60e8341c972cb0126109d48394e0de7b 100644
+--- a/printing/printing_context_linux.h
++++ b/printing/printing_context_linux.h
+@@ -45,8 +45,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextLinux : public PrintingContext {
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
+index 85363bd922bf0ab2630e3d5f350de0c58792963a..221019f5df71e1d66accbf2ea2d161bd1125666f 100644
+--- a/printing/printing_context_mac.h
++++ b/printing/printing_context_mac.h
+@@ -35,8 +35,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+@@ -105,6 +103,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
+   // Returns true is the pair is set.
+   bool SetKeyValue(base::StringPiece key, base::StringPiece value);
+ 
++  // Starts a new page.
++  mojom::ResultCode NewPage();
++
++  // Closes the printed page.
++  mojom::ResultCode PageDone();
++
+   // The native print info object.
+   base::scoped_nsobject<NSPrintInfo> print_info_;
+ 
+diff --git a/printing/printing_context_no_system_dialog.cc b/printing/printing_context_no_system_dialog.cc
+index c10123f35b11e1600c813080585a2282d775dba1..253507fcee5476f497421316bc42a0794f97b12b 100644
+--- a/printing/printing_context_no_system_dialog.cc
++++ b/printing/printing_context_no_system_dialog.cc
+@@ -98,26 +98,6 @@ mojom::ResultCode PrintingContextNoSystemDialog::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextNoSystemDialog::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+-mojom::ResultCode PrintingContextNoSystemDialog::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op.
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextNoSystemDialog::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
+index 2753d7ba7a09e1c5e88c1eb21a9b146034ea53f5..cb0d0b8c12535c83dbfc07ecb2817f0504b4a8ba 100644
+--- a/printing/printing_context_no_system_dialog.h
++++ b/printing/printing_context_no_system_dialog.h
+@@ -32,8 +32,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextNoSystemDialog
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
+index 0addb52cd2f65b6f05b7cfb7cf8602baaf592541..4f1fb12619fc9bee0cce104ba60621008284d675 100644
+--- a/printing/printing_context_win.cc
++++ b/printing/printing_context_win.cc
+@@ -366,18 +366,6 @@ mojom::ResultCode PrintingContextWin::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextWin::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(context_);
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op. MetafileSkia::SafePlayback takes care of calling
+-  // ::StartPage().
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextWin::RenderPage(const PrintedPage& page,
+                                                  const PageSetup& page_setup) {
+   if (abort_printing_)
+@@ -416,17 +404,6 @@ mojom::ResultCode PrintingContextWin::RenderPage(const PrintedPage& page,
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode PrintingContextWin::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // Intentional No-op. MetafileSkia::SafePlayback takes care of calling
+-  // ::EndPage().
+-
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode PrintingContextWin::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
+index 700bfe2c744cc18b1be25b9db02dd690b5e306f9..babd443a1586c92a70ff6362a824e29a6395fae2 100644
+--- a/printing/printing_context_win.h
++++ b/printing/printing_context_win.h
+@@ -35,10 +35,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextWin : public PrintingContext {
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+   mojom::ResultCode RenderPage(const PrintedPage& page,
+                                const PageSetup& page_setup) override;
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;
+diff --git a/printing/test_printing_context.cc b/printing/test_printing_context.cc
+index 4f0bf0ae891164120d36c79a7df98845f38e55de..208e8a16b5648383ff26d8dec4a15f6485ef4454 100644
+--- a/printing/test_printing_context.cc
++++ b/printing/test_printing_context.cc
+@@ -116,15 +116,6 @@ mojom::ResultCode TestPrintingContext::NewDocument(
+   return mojom::ResultCode::kSuccess;
+ }
+ 
+-mojom::ResultCode TestPrintingContext::NewPage() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // No-op.
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ #if defined(OS_WIN)
+ mojom::ResultCode TestPrintingContext::RenderPage(const PrintedPage& page,
+                                                   const PageSetup& page_setup) {
+@@ -138,15 +129,6 @@ mojom::ResultCode TestPrintingContext::RenderPage(const PrintedPage& page,
+ }
+ #endif  // defined(OS_WIN)
+ 
+-mojom::ResultCode TestPrintingContext::PageDone() {
+-  if (abort_printing_)
+-    return mojom::ResultCode::kCanceled;
+-  DCHECK(in_print_job_);
+-
+-  // No-op.
+-  return mojom::ResultCode::kSuccess;
+-}
+-
+ mojom::ResultCode TestPrintingContext::PrintDocument(
+     const MetafilePlayer& metafile,
+     const PrintSettings& settings,
+diff --git a/printing/test_printing_context.h b/printing/test_printing_context.h
+index e2a0f906216f5bae2d05dd6efd6246257a3deea4..579a9269459470e8eac6e506d87503d828bed4cb 100644
+--- a/printing/test_printing_context.h
++++ b/printing/test_printing_context.h
+@@ -58,12 +58,10 @@ class TestPrintingContext : public PrintingContext {
+   mojom::ResultCode UpdatePrinterSettings(
+       const PrinterSettings& printer_settings) override;
+   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
+-  mojom::ResultCode NewPage() override;
+ #if defined(OS_WIN)
+   mojom::ResultCode RenderPage(const PrintedPage& page,
+                                const PageSetup& page_setup) override;
+ #endif
+-  mojom::ResultCode PageDone() override;
+   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
+                                   const PrintSettings& settings,
+                                   uint32_t num_pages) override;

From e119da8ce22eeefc60bdae9cbb040cde8c5f25af Mon Sep 17 00:00:00 2001
From: marekharanczyk <48673767+marekharanczyk@users.noreply.github.com>
Date: Tue, 8 Feb 2022 17:33:21 +0100
Subject: [PATCH 017/811] Make ElectronBrowser mojo interface frame associated.
 (#32734)

---
 shell/browser/electron_browser_client.cc      | 21 ++++++++++++-------
 .../browser/electron_browser_handler_impl.cc  |  4 ++--
 shell/browser/electron_browser_handler_impl.h |  9 ++++----
 .../renderer/api/electron_api_ipc_renderer.cc |  9 ++++----
 shell/renderer/api/electron_api_web_frame.cc  | 14 ++++++-------
 .../electron_render_frame_observer.cc         | 13 ++++++------
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 6f2a2f9a8fc19..dfc0043bd25ae 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1450,6 +1450,12 @@ bool ElectronBrowserClient::PreSpawnChild(sandbox::TargetPolicy* policy,
 }
 #endif  // defined(OS_WIN)
 
+void BindElectronBrowser(
+    mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser> receiver,
+    content::RenderFrameHost* frame_host) {
+  ElectronBrowserHandlerImpl::Create(frame_host, std::move(receiver));
+}
+
 bool ElectronBrowserClient::BindAssociatedReceiverFromFrame(
     content::RenderFrameHost* render_frame_host,
     const std::string& interface_name,
@@ -1461,6 +1467,13 @@ bool ElectronBrowserClient::BindAssociatedReceiverFromFrame(
         render_frame_host);
     return true;
   }
+  if (interface_name == electron::mojom::ElectronBrowser::Name_) {
+    BindElectronBrowser(
+        mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser>(
+            std::move(*handle)),
+        render_frame_host);
+    return true;
+  }
 #if BUILDFLAG(ENABLE_PRINTING)
   if (interface_name == printing::mojom::PrintManagerHost::Name_) {
     mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost> receiver(
@@ -1522,12 +1535,6 @@ void ElectronBrowserClient::BindHostReceiverForRenderer(
 #endif
 }
 
-void BindElectronBrowser(
-    content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<electron::mojom::ElectronBrowser> receiver) {
-  ElectronBrowserHandlerImpl::Create(frame_host, std::move(receiver));
-}
-
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
 void BindMimeHandlerService(
     content::RenderFrameHost* frame_host,
@@ -1576,8 +1583,6 @@ void ElectronBrowserClient::RegisterBrowserInterfaceBindersForFrame(
       base::BindRepeating(&BindNetworkHintsHandler));
   map->Add<blink::mojom::BadgeService>(
       base::BindRepeating(&badging::BadgeManager::BindFrameReceiver));
-  map->Add<electron::mojom::ElectronBrowser>(
-      base::BindRepeating(&BindElectronBrowser));
   map->Add<blink::mojom::KeyboardLockService>(base::BindRepeating(
       &content::KeyboardLockServiceImpl::CreateMojoService));
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
diff --git a/shell/browser/electron_browser_handler_impl.cc b/shell/browser/electron_browser_handler_impl.cc
index 665d2b2897b3c..e66968b0cb132 100644
--- a/shell/browser/electron_browser_handler_impl.cc
+++ b/shell/browser/electron_browser_handler_impl.cc
@@ -15,7 +15,7 @@
 namespace electron {
 ElectronBrowserHandlerImpl::ElectronBrowserHandlerImpl(
     content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<mojom::ElectronBrowser> receiver)
+    mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver)
     : render_process_id_(frame_host->GetProcess()->GetID()),
       render_frame_id_(frame_host->GetRoutingID()) {
   content::WebContents* web_contents =
@@ -135,7 +135,7 @@ content::RenderFrameHost* ElectronBrowserHandlerImpl::GetRenderFrameHost() {
 // static
 void ElectronBrowserHandlerImpl::Create(
     content::RenderFrameHost* frame_host,
-    mojo::PendingReceiver<mojom::ElectronBrowser> receiver) {
+    mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver) {
   new ElectronBrowserHandlerImpl(frame_host, std::move(receiver));
 }
 }  // namespace electron
diff --git a/shell/browser/electron_browser_handler_impl.h b/shell/browser/electron_browser_handler_impl.h
index f37cd56b7cd81..fea3f11907d1d 100644
--- a/shell/browser/electron_browser_handler_impl.h
+++ b/shell/browser/electron_browser_handler_impl.h
@@ -23,10 +23,11 @@ class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
  public:
   explicit ElectronBrowserHandlerImpl(
       content::RenderFrameHost* render_frame_host,
-      mojo::PendingReceiver<mojom::ElectronBrowser> receiver);
+      mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver);
 
-  static void Create(content::RenderFrameHost* frame_host,
-                     mojo::PendingReceiver<mojom::ElectronBrowser> receiver);
+  static void Create(
+      content::RenderFrameHost* frame_host,
+      mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver);
 
   // disable copy
   ElectronBrowserHandlerImpl(const ElectronBrowserHandlerImpl&) = delete;
@@ -75,7 +76,7 @@ class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
   const int render_process_id_;
   const int render_frame_id_;
 
-  mojo::Receiver<mojom::ElectronBrowser> receiver_{this};
+  mojo::AssociatedReceiver<mojom::ElectronBrowser> receiver_{this};
 
   base::WeakPtrFactory<ElectronBrowserHandlerImpl> weak_factory_{this};
 };
diff --git a/shell/renderer/api/electron_api_ipc_renderer.cc b/shell/renderer/api/electron_api_ipc_renderer.cc
index 74bf0e1dccc05..6b4f2698a968a 100644
--- a/shell/renderer/api/electron_api_ipc_renderer.cc
+++ b/shell/renderer/api/electron_api_ipc_renderer.cc
@@ -22,7 +22,7 @@
 #include "shell/common/node_bindings.h"
 #include "shell/common/node_includes.h"
 #include "shell/common/v8_value_serializer.h"
-#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_message_port_converter.h"
 
@@ -59,8 +59,8 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
         v8::Global<v8::Context>(isolate, isolate->GetCurrentContext());
     weak_context_.SetWeak();
 
-    render_frame->GetBrowserInterfaceBroker()->GetInterface(
-        electron_browser_remote_.BindNewPipeAndPassReceiver());
+    render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
+        &electron_browser_remote_);
   }
 
   void OnDestruct() override { electron_browser_remote_.reset(); }
@@ -223,7 +223,8 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
   }
 
   v8::Global<v8::Context> weak_context_;
-  mojo::Remote<electron::mojom::ElectronBrowser> electron_browser_remote_;
+  mojo::AssociatedRemote<electron::mojom::ElectronBrowser>
+      electron_browser_remote_;
 };
 
 gin::WrapperInfo IPCRenderer::kWrapperInfo = {gin::kEmbedderNativeGin};
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 14c0a7ac08276..25d2b5433b680 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -34,7 +34,7 @@
 #include "shell/renderer/api/electron_api_context_bridge.h"
 #include "shell/renderer/api/electron_api_spell_check_client.h"
 #include "shell/renderer/renderer_client_base.h"
-#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/page/page_zoom.h"
 #include "third_party/blink/public/common/web_cache/web_cache_resource_type_stats.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
@@ -453,9 +453,9 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     if (!MaybeGetRenderFrame(isolate, "setZoomLevel", &render_frame))
       return;
 
-    mojo::Remote<mojom::ElectronBrowser> browser_remote;
-    render_frame->GetBrowserInterfaceBroker()->GetInterface(
-        browser_remote.BindNewPipeAndPassReceiver());
+    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
+        &browser_remote);
     browser_remote->SetTemporaryZoomLevel(level);
   }
 
@@ -465,9 +465,9 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     if (!MaybeGetRenderFrame(isolate, "getZoomLevel", &render_frame))
       return result;
 
-    mojo::Remote<mojom::ElectronBrowser> browser_remote;
-    render_frame->GetBrowserInterfaceBroker()->GetInterface(
-        browser_remote.BindNewPipeAndPassReceiver());
+    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
+        &browser_remote);
     browser_remote->DoGetZoomLevel(&result);
     return result;
   }
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index 4947ac06f6559..ba1a122868c64 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -22,7 +22,7 @@
 #include "shell/common/options_switches.h"
 #include "shell/common/world_ids.h"
 #include "shell/renderer/renderer_client_base.h"
-#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/platform/web_isolated_world_info.h"
 #include "third_party/blink/public/web/blink.h"
@@ -149,9 +149,8 @@ void ElectronRenderFrameObserver::DraggableRegionsChanged() {
     regions.push_back(std::move(region));
   }
 
-  mojo::Remote<mojom::ElectronBrowser> browser_remote;
-  render_frame_->GetBrowserInterfaceBroker()->GetInterface(
-      browser_remote.BindNewPipeAndPassReceiver());
+  mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+  render_frame_->GetRemoteAssociatedInterfaces()->GetInterface(&browser_remote);
   browser_remote->UpdateDraggableRegions(std::move(regions));
 }
 
@@ -169,9 +168,9 @@ void ElectronRenderFrameObserver::OnDestruct() {
 void ElectronRenderFrameObserver::DidMeaningfulLayout(
     blink::WebMeaningfulLayout layout_type) {
   if (layout_type == blink::WebMeaningfulLayout::kVisuallyNonEmpty) {
-    mojo::Remote<mojom::ElectronBrowser> browser_remote;
-    render_frame_->GetBrowserInterfaceBroker()->GetInterface(
-        browser_remote.BindNewPipeAndPassReceiver());
+    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    render_frame_->GetRemoteAssociatedInterfaces()->GetInterface(
+        &browser_remote);
     browser_remote->OnFirstNonEmptyLayout();
   }
 }

From 841d223b3b04ce247eacaa2fc01a6588ae9b01ae Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Tue, 8 Feb 2022 23:33:33 +0530
Subject: [PATCH 018/811] build: rebuild the `dist_zip`s when the deps get
 modified (#32713)

* build: rebuild the dist_zips when the deps get modified

The dist.zip generated by the electron_dist_zip action was not getting
updated when changes were being made to the dependencies, like the
source files. It turns out, we were using data_deps for the dependencies
instead of deps. Here is the difference:

data_deps: things needed to ultimately run the thing built by a target
deps: things needed to build the target

So the difference in treatment of both sets of dependencies is actually
intentional.

Signed-off-by: Darshan Sen <raisinten@gmail.com>

* fixup! build: rebuild the dist_zips when the deps get modified

Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 BUILD.gn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index 7fe689d592bd1..bd4402cf8ac7d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1403,11 +1403,13 @@ dist_zip("electron_dist_zip") {
   if (is_linux) {
     data_deps += [ "//sandbox/linux:chrome_sandbox" ]
   }
+  deps = data_deps
   outputs = [ "$root_build_dir/dist.zip" ]
 }
 
 dist_zip("electron_ffmpeg_zip") {
   data_deps = [ "//third_party/ffmpeg" ]
+  deps = data_deps
   outputs = [ "$root_build_dir/ffmpeg.zip" ]
 }
 
@@ -1425,6 +1427,7 @@ group("electron_chromedriver") {
 dist_zip("electron_chromedriver_zip") {
   testonly = true
   data_deps = electron_chromedriver_deps
+  deps = data_deps
   outputs = [ "$root_build_dir/chromedriver.zip" ]
 }
 
@@ -1443,6 +1446,7 @@ group("electron_mksnapshot") {
 
 dist_zip("electron_mksnapshot_zip") {
   data_deps = mksnapshot_deps
+  deps = data_deps
   outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }
 
@@ -1453,6 +1457,7 @@ copy("hunspell_dictionaries") {
 
 dist_zip("hunspell_dictionaries_zip") {
   data_deps = [ ":hunspell_dictionaries" ]
+  deps = data_deps
   flatten = true
 
   outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
@@ -1466,6 +1471,7 @@ copy("libcxx_headers") {
 
 dist_zip("libcxx_headers_zip") {
   data_deps = [ ":libcxx_headers" ]
+  deps = data_deps
   flatten = true
   flatten_relative_to = rebase_path(
           "$target_gen_dir/electron_libcxx_include/buildtools/third_party/libc++/trunk",
@@ -1481,6 +1487,7 @@ copy("libcxxabi_headers") {
 
 dist_zip("libcxxabi_headers_zip") {
   data_deps = [ ":libcxxabi_headers" ]
+  deps = data_deps
   flatten = true
   flatten_relative_to = rebase_path(
           "$target_gen_dir/electron_libcxxabi_include/buildtools/third_party/libc++abi/trunk",

From ac1d426c518d57ead45f8634513e7da1c78273e0 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 9 Feb 2022 10:40:50 +0100
Subject: [PATCH 019/811] fix: pointer lock escape handling (#32369)

---
 .../browser/api/electron_api_web_contents.cc  | 40 +++++++++++++++----
 shell/browser/api/electron_api_web_contents.h | 11 +++--
 .../browser/web_contents_permission_helper.cc | 20 ++++------
 .../browser/web_contents_permission_helper.h  |  6 ++-
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index c3c0f8a9d47ed..a02d458dee929 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1244,6 +1244,9 @@ bool WebContents::PlatformHandleKeyboardEvent(
 content::KeyboardEventProcessingResult WebContents::PreHandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
+  if (exclusive_access_manager_->HandleUserKeyEvent(event))
+    return content::KeyboardEventProcessingResult::HANDLED;
+
   if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown ||
       event.GetType() == blink::WebInputEvent::Type::kKeyUp) {
     bool prevent_default = Emit("before-input-event", event);
@@ -1392,6 +1395,35 @@ void WebContents::FindReply(content::WebContents* web_contents,
   Emit("found-in-page", result.GetHandle());
 }
 
+void WebContents::RequestExclusivePointerAccess(
+    content::WebContents* web_contents,
+    bool user_gesture,
+    bool last_unlocked_by_target,
+    bool allowed) {
+  if (allowed) {
+    exclusive_access_manager_->mouse_lock_controller()->RequestToLockMouse(
+        web_contents, user_gesture, last_unlocked_by_target);
+  } else {
+    web_contents->GotResponseToLockMouseRequest(
+        blink::mojom::PointerLockResult::kPermissionDenied);
+  }
+}
+
+void WebContents::RequestToLockMouse(content::WebContents* web_contents,
+                                     bool user_gesture,
+                                     bool last_unlocked_by_target) {
+  auto* permission_helper =
+      WebContentsPermissionHelper::FromWebContents(web_contents);
+  permission_helper->RequestPointerLockPermission(
+      user_gesture, last_unlocked_by_target,
+      base::BindOnce(&WebContents::RequestExclusivePointerAccess,
+                     base::Unretained(this)));
+}
+
+void WebContents::LostMouseLock() {
+  exclusive_access_manager_->mouse_lock_controller()->LostMouseLock();
+}
+
 void WebContents::RequestKeyboardLock(content::WebContents* web_contents,
                                       bool esc_key_locked) {
   exclusive_access_manager_->keyboard_lock_controller()->RequestKeyboardLock(
@@ -1424,14 +1456,6 @@ void WebContents::RequestMediaAccessPermission(
   permission_helper->RequestMediaAccessPermission(request, std::move(callback));
 }
 
-void WebContents::RequestToLockMouse(content::WebContents* web_contents,
-                                     bool user_gesture,
-                                     bool last_unlocked_by_target) {
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  permission_helper->RequestPointerLockPermission(user_gesture);
-}
-
 content::JavaScriptDialogManager* WebContents::GetJavaScriptDialogManager(
     content::WebContents* source) {
   if (!dialog_manager_)
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 48cb59a2867d2..93c7862ebce88 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -556,6 +556,14 @@ class WebContents : public ExclusiveAccessContext,
                  const gfx::Rect& selection_rect,
                  int active_match_ordinal,
                  bool final_update) override;
+  void RequestExclusivePointerAccess(content::WebContents* web_contents,
+                                     bool user_gesture,
+                                     bool last_unlocked_by_target,
+                                     bool allowed);
+  void RequestToLockMouse(content::WebContents* web_contents,
+                          bool user_gesture,
+                          bool last_unlocked_by_target) override;
+  void LostMouseLock() override;
   void RequestKeyboardLock(content::WebContents* web_contents,
                            bool esc_key_locked) override;
   void CancelKeyboardLockRequest(content::WebContents* web_contents) override;
@@ -566,9 +574,6 @@ class WebContents : public ExclusiveAccessContext,
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       content::MediaResponseCallback callback) override;
-  void RequestToLockMouse(content::WebContents* web_contents,
-                          bool user_gesture,
-                          bool last_unlocked_by_target) override;
   content::JavaScriptDialogManager* GetJavaScriptDialogManager(
       content::WebContents* source) override;
   void OnAudioStateChanged(bool audible) override;
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 44129dd295834..2fd8cb0a6c699 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -43,17 +43,6 @@ void MediaAccessAllowed(const content::MediaStreamRequest& request,
     controller.Deny(blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED);
 }
 
-void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
-  if (web_contents) {
-    if (allowed)
-      web_contents->GotResponseToLockMouseRequest(
-          blink::mojom::PointerLockResult::kSuccess);
-    else
-      web_contents->GotResponseToLockMouseRequest(
-          blink::mojom::PointerLockResult::kPermissionDenied);
-  }
-}
-
 void OnPermissionResponse(base::OnceCallback<void(bool)> callback,
                           blink::mojom::PermissionStatus status) {
   if (status == blink::mojom::PermissionStatus::GRANTED)
@@ -157,10 +146,15 @@ void WebContentsPermissionHelper::RequestWebNotificationPermission(
 }
 
 void WebContentsPermissionHelper::RequestPointerLockPermission(
-    bool user_gesture) {
+    bool user_gesture,
+    bool last_unlocked_by_target,
+    base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
+        callback) {
   RequestPermission(
       static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
-      base::BindOnce(&OnPointerLockResponse, web_contents_), user_gesture);
+      base::BindOnce(std::move(callback), web_contents_, user_gesture,
+                     last_unlocked_by_target),
+      user_gesture);
 }
 
 void WebContentsPermissionHelper::RequestOpenExternalPermission(
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index 6f320b7a6a9b7..639dcd8a8829a 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -36,9 +36,13 @@ class WebContentsPermissionHelper
   void RequestFullscreenPermission(base::OnceCallback<void(bool)> callback);
   void RequestMediaAccessPermission(const content::MediaStreamRequest& request,
                                     content::MediaResponseCallback callback);
+  void RequestPointerLockPermission(
+      bool user_gesture,
+      bool last_unlocked_by_target,
+      base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
+          callback);
   void RequestWebNotificationPermission(
       base::OnceCallback<void(bool)> callback);
-  void RequestPointerLockPermission(bool user_gesture);
   void RequestOpenExternalPermission(base::OnceCallback<void(bool)> callback,
                                      bool user_gesture,
                                      const GURL& url);

From baaa7787affd03b01050f5309df9959d4c406cfa Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 05:01:45 -0800
Subject: [PATCH 020/811] Bump v19.0.0-nightly.20220209

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 315dbb4575e8a..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220208
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index fa466252ba9ce..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220208",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f1b41dd372997..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220208
- PRODUCTVERSION 19,0,0,20220208
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 254dbd7400797a0c65b6c3711b1008b9bfb541f5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 9 Feb 2022 23:20:51 +0900
Subject: [PATCH 021/811] test: disable the test that makes spec runner hang on
 exit (#32834)

---
 spec/chromium-spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index 86737f78860a1..afcc2b668a756 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -8,7 +8,7 @@ const ChildProcess = require('child_process');
 const { ipcRenderer } = require('electron');
 const { emittedOnce, waitForEvent } = require('./events-helpers');
 const { resolveGetters } = require('./expect-helpers');
-const { ifdescribe, delay } = require('./spec-helpers');
+const { ifit, ifdescribe, delay } = require('./spec-helpers');
 const features = process._linkedBinding('electron_common_features');
 
 /* Most of the APIs here don't use standard callbacks */
@@ -81,7 +81,8 @@ describe('chromium feature', () => {
       expect(event.data).to.equal(`size: ${width} ${height}`);
     });
 
-    it('disables node integration when it is disabled on the parent window', async () => {
+    // FIXME(zcbenz): This test is making the spec runner hang on exit on Windows.
+    ifit(process.platform !== 'win32')('disables node integration when it is disabled on the parent window', async () => {
       const windowUrl = require('url').format({
         pathname: `${fixtures}/pages/window-opener-no-node-integration.html`,
         protocol: 'file',

From e9a43be9beb91a4cb7af04242fe9e27955aa675c Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 9 Feb 2022 08:00:05 -0800
Subject: [PATCH 022/811] docs: add IPC doc (#32059)

* docs: add IPC doc

* fix: use "string" primitive

* use 'string' ipcrenderer

* use "number" primitive

* Update docs/tutorial/ipc.md

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>

* Update docs/tutorial/ipc.md

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>

* add code sample

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
---
 docs/api/ipc-main.md                          |  66 +-
 docs/api/ipc-renderer.md                      |  25 +-
 .../fiddles/communication/two-processes/.keep |   0
 .../asynchronous-messages/index.html          |  27 -
 .../asynchronous-messages/main.js             |  29 -
 .../asynchronous-messages/renderer.js         |  12 -
 .../synchronous-messages/index.html           |  27 -
 .../synchronous-messages/main.js              |  29 -
 .../synchronous-messages/renderer.js          |   9 -
 docs/fiddles/ipc/pattern-1/index.html         |  14 +
 docs/fiddles/ipc/pattern-1/main.js            |  30 +
 docs/fiddles/ipc/pattern-1/preload.js         |   5 +
 docs/fiddles/ipc/pattern-1/renderer.js        |   6 +
 docs/fiddles/ipc/pattern-2/index.html         |  14 +
 docs/fiddles/ipc/pattern-2/main.js            |  32 +
 docs/fiddles/ipc/pattern-2/preload.js         |   5 +
 docs/fiddles/ipc/pattern-2/renderer.js        |   7 +
 docs/fiddles/ipc/pattern-3/index.html         |  13 +
 docs/fiddles/ipc/pattern-3/main.js            |  48 ++
 docs/fiddles/ipc/pattern-3/preload.js         |   5 +
 docs/fiddles/ipc/pattern-3/renderer.js        |   8 +
 docs/tutorial/ipc.md                          | 571 ++++++++++++++++++
 22 files changed, 798 insertions(+), 184 deletions(-)
 delete mode 100644 docs/fiddles/communication/two-processes/.keep
 delete mode 100644 docs/fiddles/communication/two-processes/asynchronous-messages/index.html
 delete mode 100644 docs/fiddles/communication/two-processes/asynchronous-messages/main.js
 delete mode 100644 docs/fiddles/communication/two-processes/asynchronous-messages/renderer.js
 delete mode 100644 docs/fiddles/communication/two-processes/synchronous-messages/index.html
 delete mode 100644 docs/fiddles/communication/two-processes/synchronous-messages/main.js
 delete mode 100644 docs/fiddles/communication/two-processes/synchronous-messages/renderer.js
 create mode 100644 docs/fiddles/ipc/pattern-1/index.html
 create mode 100644 docs/fiddles/ipc/pattern-1/main.js
 create mode 100644 docs/fiddles/ipc/pattern-1/preload.js
 create mode 100644 docs/fiddles/ipc/pattern-1/renderer.js
 create mode 100644 docs/fiddles/ipc/pattern-2/index.html
 create mode 100644 docs/fiddles/ipc/pattern-2/main.js
 create mode 100644 docs/fiddles/ipc/pattern-2/preload.js
 create mode 100644 docs/fiddles/ipc/pattern-2/renderer.js
 create mode 100644 docs/fiddles/ipc/pattern-3/index.html
 create mode 100644 docs/fiddles/ipc/pattern-3/main.js
 create mode 100644 docs/fiddles/ipc/pattern-3/preload.js
 create mode 100644 docs/fiddles/ipc/pattern-3/renderer.js
 create mode 100644 docs/tutorial/ipc.md

diff --git a/docs/api/ipc-main.md b/docs/api/ipc-main.md
index f55e848c16398..e7c9800a25b50 100644
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -1,3 +1,10 @@
+---
+title: "ipcMain"
+description: "Communicate asynchronously from the main process to renderer processes."
+slug: ipc-main
+hide_title: false
+---
+
 # ipcMain
 
 > Communicate asynchronously from the main process to renderer processes.
@@ -9,7 +16,9 @@ process, it handles asynchronous and synchronous messages sent from a renderer
 process (web page). Messages sent from a renderer will be emitted to this
 module.
 
-## Sending Messages
+For usage examples, check out the [IPC tutorial].
+
+## Sending messages
 
 It is also possible to send messages from the main process to the renderer
 process, see [webContents.send][web-contents-send] for more information.
@@ -21,36 +30,6 @@ process, see [webContents.send][web-contents-send] for more information.
   coming from frames that aren't the main frame (e.g. iframes) whereas
   `event.sender.send(...)` will always send to the main frame.
 
-An example of sending and handling messages between the render and main
-processes:
-
-```javascript
-// In main process.
-const { ipcMain } = require('electron')
-ipcMain.on('asynchronous-message', (event, arg) => {
-  console.log(arg) // prints "ping"
-  event.reply('asynchronous-reply', 'pong')
-})
-
-ipcMain.on('synchronous-message', (event, arg) => {
-  console.log(arg) // prints "ping"
-  event.returnValue = 'pong'
-})
-```
-
-```javascript
-// In renderer process (web page).
-// NB. Electron APIs are only accessible from preload, unless contextIsolation is disabled.
-// See https://www.electronjs.org/docs/tutorial/process-model#preload-scripts for more details.
-const { ipcRenderer } = require('electron')
-console.log(ipcRenderer.sendSync('synchronous-message', 'ping')) // prints "pong"
-
-ipcRenderer.on('asynchronous-reply', (event, arg) => {
-  console.log(arg) // prints "pong"
-})
-ipcRenderer.send('asynchronous-message', 'ping')
-```
-
 ## Methods
 
 The `ipcMain` module has the following method to listen for events:
@@ -59,7 +38,7 @@ The `ipcMain` module has the following method to listen for events:
 
 * `channel` string
 * `listener` Function
-  * `event` IpcMainEvent
+  * `event` [IpcMainEvent][ipc-main-event]
   * `...args` any[]
 
 Listens to `channel`, when a new message arrives `listener` would be called with
@@ -69,7 +48,7 @@ Listens to `channel`, when a new message arrives `listener` would be called with
 
 * `channel` string
 * `listener` Function
-  * `event` IpcMainEvent
+  * `event` [IpcMainEvent][ipc-main-event]
   * `...args` any[]
 
 Adds a one time `listener` function for the event. This `listener` is invoked
@@ -93,8 +72,8 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<void> | any>
-  * `event` IpcMainInvokeEvent
+* `listener` Function<Promise\<void&#62; | any&#62;
+  * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
   * `...args` any[]
 
 Adds a handler for an `invoke`able IPC. This handler will be called whenever a
@@ -104,14 +83,14 @@ If `listener` returns a Promise, the eventual result of the promise will be
 returned as a reply to the remote caller. Otherwise, the return value of the
 listener will be used as the value of the reply.
 
-```js
-// Main process
+```js title='Main Process'
 ipcMain.handle('my-invokable-ipc', async (event, ...args) => {
   const result = await somePromise(...args)
   return result
 })
+```
 
-// Renderer process
+```js title='Renderer Process'
 async () => {
   const result = await ipcRenderer.invoke('my-invokable-ipc', arg1, arg2)
   // ...
@@ -130,7 +109,7 @@ provided to the renderer process. Please refer to
 ### `ipcMain.handleOnce(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<void> | any>
+* `listener` Function<Promise\<void&#62; | any&#62;
   * `event` IpcMainInvokeEvent
   * `...args` any[]
 
@@ -146,13 +125,16 @@ Removes any handler for `channel`, if present.
 ## IpcMainEvent object
 
 The documentation for the `event` object passed to the `callback` can be found
-in the [`ipc-main-event`](structures/ipc-main-event.md) structure docs.
+in the [`ipc-main-event`][ipc-main-event] structure docs.
 
 ## IpcMainInvokeEvent object
 
 The documentation for the `event` object passed to `handle` callbacks can be
-found in the [`ipc-main-invoke-event`](structures/ipc-main-invoke-event.md)
+found in the [`ipc-main-invoke-event`][ipc-main-invoke-event]
 structure docs.
 
+[IPC tutorial]: ../tutorial/ipc.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[web-contents-send]: web-contents.md#contentssendchannel-args
+[web-contents-send]: ../api/web-contents.md#contentssendchannel-args
+[ipc-main-event]:../api/structures/ipc-main-event.md
+[ipc-main-invoke-event]:../api/structures/ipc-main-invoke-event.md
diff --git a/docs/api/ipc-renderer.md b/docs/api/ipc-renderer.md
index 383c7c0857339..dae89527aa42c 100644
--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -1,3 +1,10 @@
+---
+title: "ipcRenderer"
+description: "Communicate asynchronously from a renderer process to the main process."
+slug: ipc-renderer
+hide_title: false
+---
+
 # ipcRenderer
 
 > Communicate asynchronously from a renderer process to the main process.
@@ -9,7 +16,7 @@ methods so you can send synchronous and asynchronous messages from the render
 process (web page) to the main process. You can also receive replies from the
 main process.
 
-See [ipcMain](ipc-main.md) for code examples.
+See [IPC tutorial](../tutorial/ipc.md) for code examples.
 
 ## Methods
 
@@ -70,7 +77,7 @@ throw an exception.
 > them. Attempting to send such objects over IPC will result in an error.
 
 The main process handles it by listening for `channel` with the
-[`ipcMain`](ipc-main.md) module.
+[`ipcMain`](./ipc-main.md) module.
 
 If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
 
@@ -98,7 +105,7 @@ throw an exception.
 > them. Attempting to send such objects over IPC will result in an error.
 
 The main process should listen for `channel` with
-[`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
+[`ipcMain.handle()`](./ipc-main.md#ipcmainhandlechannel-listener).
 
 For example:
 
@@ -124,11 +131,11 @@ If you do not need a response to the message, consider using [`ipcRenderer.send`
 * `channel` string
 * `...args` any[]
 
-Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.
+Returns `any` - The value sent back by the [`ipcMain`](./ipc-main.md) handler.
 
 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
@@ -140,13 +147,13 @@ throw an exception.
 > Electron's IPC to the main process, as the main process would have no way to decode
 > them. Attempting to send such objects over IPC will result in an error.
 
-The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
+The main process handles it by listening for `channel` with [`ipcMain`](./ipc-main.md) module,
 and replies by setting `event.returnValue`.
 
 > :warning: **WARNING**: Sending a synchronous message will block the whole
 > renderer process until the reply is received, so use this method only as a
 > last resort. It's much better to use the asynchronous version,
-> [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).
+> [`invoke()`](./ipc-renderer.md#ipcrendererinvokechannel-args).
 
 ### `ipcRenderer.postMessage(channel, message, [transfer])`
 
@@ -158,7 +165,7 @@ Send a message to the main process, optionally transferring ownership of zero
 or more [`MessagePort`][] objects.
 
 The transferred `MessagePort` objects will be available in the main process as
-[`MessagePortMain`](message-port-main.md) objects by accessing the `ports`
+[`MessagePortMain`](./message-port-main.md) objects by accessing the `ports`
 property of the emitted event.
 
 For example:
@@ -197,7 +204,7 @@ the host page instead of the main process.
 ## Event object
 
 The documentation for the `event` object passed to the `callback` can be found
-in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.
+in the [`ipc-renderer-event`](./structures/ipc-renderer-event.md) structure docs.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
diff --git a/docs/fiddles/communication/two-processes/.keep b/docs/fiddles/communication/two-processes/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/docs/fiddles/communication/two-processes/asynchronous-messages/index.html b/docs/fiddles/communication/two-processes/asynchronous-messages/index.html
deleted file mode 100644
index 43d23a29087f2..0000000000000
--- a/docs/fiddles/communication/two-processes/asynchronous-messages/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-  </head>
-  <body>
-    <div>
-      <div>
-        <h1>Asynchronous messages</h1>
-        <i>Supports: Win, macOS, Linux <span>|</span> Process: Both</i>
-        <div>
-          <div>
-            <button id="async-msg">Ping</button>
-            <span id="async-reply"></span>
-          </div>
-          <p>Using <code>ipc</code> to send messages between processes asynchronously is the preferred method since it will return when finished without blocking other operations in the same process.</p>
-
-          <p>This example sends a "ping" from this process (renderer) to the main process. The main process then replies with "pong".</p>
-        </div>
-      </div>
-    </div>
-    <script>
-      // You can also require other files to run in this process
-      require('./renderer.js')
-    </script>
-  </body>
-</html>
diff --git a/docs/fiddles/communication/two-processes/asynchronous-messages/main.js b/docs/fiddles/communication/two-processes/asynchronous-messages/main.js
deleted file mode 100644
index 942f7022f8590..0000000000000
--- a/docs/fiddles/communication/two-processes/asynchronous-messages/main.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const { app, BrowserWindow, ipcMain } = require('electron')
-
-let mainWindow = null
-
-function createWindow () {
-  const windowOptions = {
-    width: 600,
-    height: 400,
-    title: 'Asynchronous messages',
-    webPreferences: {
-      nodeIntegration: true
-    }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-}
-
-app.whenReady().then(() => {
-  createWindow()
-})
-
-ipcMain.on('asynchronous-message', (event, arg) => {
-  event.sender.send('asynchronous-reply', 'pong')
-})
diff --git a/docs/fiddles/communication/two-processes/asynchronous-messages/renderer.js b/docs/fiddles/communication/two-processes/asynchronous-messages/renderer.js
deleted file mode 100644
index 40ed596201ad2..0000000000000
--- a/docs/fiddles/communication/two-processes/asynchronous-messages/renderer.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const { ipcRenderer } = require('electron')
-
-const asyncMsgBtn = document.getElementById('async-msg')
-
-asyncMsgBtn.addEventListener('click', () => {
-  ipcRenderer.send('asynchronous-message', 'ping')
-})
-
-ipcRenderer.on('asynchronous-reply', (event, arg) => {
-  const message = `Asynchronous message reply: ${arg}`
-  document.getElementById('async-reply').innerHTML = message
-})
diff --git a/docs/fiddles/communication/two-processes/synchronous-messages/index.html b/docs/fiddles/communication/two-processes/synchronous-messages/index.html
deleted file mode 100644
index 055fcf3473ce1..0000000000000
--- a/docs/fiddles/communication/two-processes/synchronous-messages/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-  </head>
-  <body>
-    <div>
-      <div>
-        <h1>Synchronous messages</h1>
-        <i>Supports: Win, macOS, Linux <span>|</span> Process: Both</i>
-        <div>
-          <div>
-            <button id="sync-msg">Ping</button>
-            <span id="sync-reply"></span>
-          </div>
-          <p>You can use the <code>ipc</code> module to send synchronous messages between processes as well, but note that the synchronous nature of this method means that it <b>will block</b> other operations while completing its task.</p>
-          
-          <p>This example sends a synchronous message, "ping", from this process (renderer) to the main process. The main process then replies with "pong".</p>
-        </div>
-      </div>
-    </div>
-    <script>
-      // You can also require other files to run in this process
-      require('./renderer.js')
-    </script>
-  </body>
-</html> 
\ No newline at end of file
diff --git a/docs/fiddles/communication/two-processes/synchronous-messages/main.js b/docs/fiddles/communication/two-processes/synchronous-messages/main.js
deleted file mode 100644
index 1adb7c02c9f11..0000000000000
--- a/docs/fiddles/communication/two-processes/synchronous-messages/main.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const { app, BrowserWindow, ipcMain } = require('electron')
-
-let mainWindow = null
-
-function createWindow () {
-  const windowOptions = {
-    width: 600,
-    height: 400,
-    title: 'Synchronous Messages',
-    webPreferences: {
-      nodeIntegration: true
-    }
-  }
-
-  mainWindow = new BrowserWindow(windowOptions)
-  mainWindow.loadFile('index.html')
-
-  mainWindow.on('closed', () => {
-    mainWindow = null
-  })
-}
-
-app.whenReady().then(() => {
-  createWindow()
-})
-
-ipcMain.on('synchronous-message', (event, arg) => {
-    event.returnValue = 'pong'
-})
\ No newline at end of file
diff --git a/docs/fiddles/communication/two-processes/synchronous-messages/renderer.js b/docs/fiddles/communication/two-processes/synchronous-messages/renderer.js
deleted file mode 100644
index 4769b6f97f714..0000000000000
--- a/docs/fiddles/communication/two-processes/synchronous-messages/renderer.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const { ipcRenderer } = require('electron')
-
-const syncMsgBtn = document.getElementById('sync-msg')
-
-syncMsgBtn.addEventListener('click', () => {
-    const reply = ipcRenderer.sendSync('synchronous-message', 'ping')
-    const message = `Synchronous message reply: ${reply}`
-    document.getElementById('sync-reply').innerHTML = message
-})
\ No newline at end of file
diff --git a/docs/fiddles/ipc/pattern-1/index.html b/docs/fiddles/ipc/pattern-1/index.html
new file mode 100644
index 0000000000000..28c1e42cd8b17
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-1/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Hello World!</title>
+  </head>
+  <body>
+    Title: <input id="title"/>
+    <button id="btn" type="button">Set</button>
+    <script src="./renderer.js"></script>
+  </body>
+</html>
diff --git a/docs/fiddles/ipc/pattern-1/main.js b/docs/fiddles/ipc/pattern-1/main.js
new file mode 100644
index 0000000000000..2e9e97edb81b0
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-1/main.js
@@ -0,0 +1,30 @@
+const {app, BrowserWindow, ipcMain} = require('electron')
+const path = require('path')
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+
+  ipcMain.on('set-title', (event, title) => {
+    const webContents = event.sender
+    const win = BrowserWindow.fromWebContents(webContents)
+    win.setTitle(title)
+  })
+
+  mainWindow.loadFile('index.html')
+}
+
+app.whenReady().then(() => {
+  createWindow()
+  
+  app.on('activate', function () {
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+  })
+})
+
+app.on('window-all-closed', function () {
+  if (process.platform !== 'darwin') app.quit()
+})
diff --git a/docs/fiddles/ipc/pattern-1/preload.js b/docs/fiddles/ipc/pattern-1/preload.js
new file mode 100644
index 0000000000000..822f4ed51622b
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-1/preload.js
@@ -0,0 +1,5 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+    setTitle: (title) => ipcRenderer.send('set-title', title)
+})
diff --git a/docs/fiddles/ipc/pattern-1/renderer.js b/docs/fiddles/ipc/pattern-1/renderer.js
new file mode 100644
index 0000000000000..c44f59a8df08c
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-1/renderer.js
@@ -0,0 +1,6 @@
+const setButton = document.getElementById('btn')
+const titleInput = document.getElementById('title')
+setButton.addEventListener('click', () => {
+    const title = titleInput.value
+    window.electronAPI.setTitle(title)
+});
diff --git a/docs/fiddles/ipc/pattern-2/index.html b/docs/fiddles/ipc/pattern-2/index.html
new file mode 100644
index 0000000000000..06e928c8ef13d
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-2/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Dialog</title>
+  </head>
+  <body>
+    <button type="button" id="btn">Open a File</button>
+    File path: <strong id="filePath"></strong>
+    <script src='./renderer.js'></script>
+  </body>
+</html>
diff --git a/docs/fiddles/ipc/pattern-2/main.js b/docs/fiddles/ipc/pattern-2/main.js
new file mode 100644
index 0000000000000..6f53c4adcce62
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-2/main.js
@@ -0,0 +1,32 @@
+const {app, BrowserWindow, ipcMain} = require('electron')
+const path = require('path')
+
+async function handleFileOpen() {
+  const { canceled, filePaths } = await dialog.showOpenDialog()
+  if (canceled) {
+    return
+  } else {
+    return filePaths[0]
+  }
+}
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+  mainWindow.loadFile('index.html')
+}
+
+app.whenReady().then(() => {
+  ipcMain.handle('dialog:openFile', handleFileOpen)
+  createWindow()
+  app.on('activate', function () {
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+  })
+})
+
+app.on('window-all-closed', function () {
+  if (process.platform !== 'darwin') app.quit()
+})
diff --git a/docs/fiddles/ipc/pattern-2/preload.js b/docs/fiddles/ipc/pattern-2/preload.js
new file mode 100644
index 0000000000000..cb78f84230f8b
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-2/preload.js
@@ -0,0 +1,5 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI',{
+  openFile: () => ipcRenderer.invoke('dialog:openFile')
+})
diff --git a/docs/fiddles/ipc/pattern-2/renderer.js b/docs/fiddles/ipc/pattern-2/renderer.js
new file mode 100644
index 0000000000000..47712eefe7df1
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-2/renderer.js
@@ -0,0 +1,7 @@
+const btn = document.getElementById('btn')
+const filePathElement = document.getElementById('filePath')
+
+btn.addEventListener('click', async () => {
+  const filePath = await window.electronAPI.openFile()
+  filePathElement.innerText = filePath
+})
diff --git a/docs/fiddles/ipc/pattern-3/index.html b/docs/fiddles/ipc/pattern-3/index.html
new file mode 100644
index 0000000000000..18d2598986271
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-3/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Menu Counter</title>
+  </head>
+  <body>
+    Current value: <strong id="counter">0</strong>
+    <script src="./renderer.js"></script>
+  </body>
+</html>
diff --git a/docs/fiddles/ipc/pattern-3/main.js b/docs/fiddles/ipc/pattern-3/main.js
new file mode 100644
index 0000000000000..13d7a1ab60cfb
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-3/main.js
@@ -0,0 +1,48 @@
+const {app, BrowserWindow, Menu} = require('electron')
+const path = require('path')
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+
+  const menu = Menu.buildFromTemplate([
+    {
+      label: app.name,
+      submenu: [
+      {
+        click: () => mainWindow.webContents.send('update-counter', 1),
+        label: 'Increment',
+      },
+      {
+        click: () => mainWindow.webContents.send('update-counter', -1),
+        label: 'Decrement',
+      }
+      ]
+    }
+
+  ])
+
+  Menu.setApplicationMenu(menu)
+  mainWindow.loadFile('index.html')
+
+  // Open the DevTools.
+  mainWindow.webContents.openDevTools()
+}
+
+app.whenReady().then(() => {
+  ipcMain.on('counter-value', (_event, value) => {
+    console.log(value) // will print value to Node console
+  })
+  createWindow()
+  
+  app.on('activate', function () {
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+  })
+})
+
+app.on('window-all-closed', function () {
+  if (process.platform !== 'darwin') app.quit()
+})
diff --git a/docs/fiddles/ipc/pattern-3/preload.js b/docs/fiddles/ipc/pattern-3/preload.js
new file mode 100644
index 0000000000000..ad4dd27f1f9b2
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-3/preload.js
@@ -0,0 +1,5 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  handleCounter: (callback) => ipcRenderer.on('update-counter', callback)
+})
diff --git a/docs/fiddles/ipc/pattern-3/renderer.js b/docs/fiddles/ipc/pattern-3/renderer.js
new file mode 100644
index 0000000000000..3b184add08ba2
--- /dev/null
+++ b/docs/fiddles/ipc/pattern-3/renderer.js
@@ -0,0 +1,8 @@
+const counter = document.getElementById('counter')
+
+window.electronAPI.handleCounter((event, value) => {
+    const oldValue = Number(counter.innerText)
+    const newValue = oldValue + value
+    counter.innerText = newValue
+    event.reply('counter-value', newValue)
+})
diff --git a/docs/tutorial/ipc.md b/docs/tutorial/ipc.md
new file mode 100644
index 0000000000000..0189e0db7e806
--- /dev/null
+++ b/docs/tutorial/ipc.md
@@ -0,0 +1,571 @@
+---
+title: Inter-Process Communication
+description: Use the ipcMain and ipcRenderer modules to communicate between Electron processes
+slug: ipc
+hide_title: false
+---
+
+# Inter-Process Communication
+
+Inter-process communication (IPC) is a key part of building feature-rich desktop applications
+in Electron. Because the main and renderer processes have different responsibilities in
+Electron's process model, IPC is the only way to perform many common tasks, such as calling a
+native API from your UI or triggering changes in your web contents from native menus.
+
+## IPC channels
+
+In Electron, processes communicate by passing messages through developer-defined "channels"
+with the [`ipcMain`] and [`ipcRenderer`] modules. These channels are
+**arbitrary** (you can name them anything you want) and **bidirectional** (you can use the
+same channel name for both modules).
+
+In this guide, we'll be going over some fundamental IPC patterns with concrete examples that
+you can use as a reference for your app code.
+
+## Understanding context-isolated processes
+
+Before proceeding to implementation details, you should be familiar with the idea of using a
+[preload script] to import Node.js and Electron modules in a context-isolated renderer process.
+
+* For a full overview of Electron's process model, you can read the [process model docs].
+* For a primer into exposing APIs from your preload script using the `contextBridge` module, check
+out the [context isolation tutorial].
+
+## Pattern 1: Renderer to main (one-way)
+
+To fire a one-way IPC message from a renderer process to the main process, you can use the
+[`ipcRenderer.send`] API to send a message that is then received by the [`ipcMain.on`] API.
+
+You usually use this pattern to call a main process API from your web contents. We'll demonstrate
+this pattern by creating a simple app that can programmatically change its window title.
+
+For this demo, you'll need to add code to your main process, your renderer process, and a preload
+script. The full code is below, but we'll be explaining each file individually in the following
+sections.
+
+```fiddle docs/fiddles/ipc/pattern-1
+```
+
+### 1. Listen for events with `ipcMain.on`
+
+In the main process, set an IPC listener on the `set-title` channel with the `ipcMain.on` API:
+
+```javascript {6-10,22} title='main.js (Main Process)'
+const {app, BrowserWindow, ipcMain} = require('electron')
+const path = require('path')
+
+//...
+
+function handleSetTitle (event, title) {
+  const webContents = event.sender
+  const win = BrowserWindow.fromWebContents(webContents)
+  win.setTitle(title)
+}
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+  mainWindow.loadFile('index.html')
+}
+
+app.whenReady().then(() => {
+  ipcMain.on('set-title', handleSetTitle)
+  createWindow()
+}
+//...
+```
+
+The above `handleSetTitle` callback has two parameters: an [IpcMainEvent] structure and a
+`title` string. Whenever a message comes through the `set-title` channel, this function will
+find the BrowserWindow instance attached to the message sender and use the `win.setTitle`
+API on it.
+
+:::info
+Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
+:::
+
+### 2. Expose `ipcRenderer.send` via preload
+
+To send messages to the listener created above, you can use the `ipcRenderer.send` API.
+By default, the renderer process has no Node.js or Electron module access. As an app developer,
+you need to choose which APIs to expose from your preload script using the `contextBridge` API.
+
+In your preload script, add the following code, which will expose a global `window.electronAPI`
+variable to your renderer process.
+
+```javascript title='preload.js (Preload Script)'
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+    setTitle: (title) => ipcRenderer.send('set-title', title)
+})
+```
+
+At this point, you'll be able to use the `window.electronAPI.setTitle()` function in the renderer
+process.
+
+:::caution Security warning
+We don't directly expose the whole `ipcRenderer.send` API for [security reasons]. Make sure to
+limit the renderer's access to Electron APIs as much as possible.
+:::
+
+### 3. Build the renderer process UI
+
+In our BrowserWindow's loaded HTML file, add a basic user interface consisting of a text input
+and a button:
+
+```html {11-12} title='index.html'
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Hello World!</title>
+  </head>
+  <body>
+    Title: <input id="title"/>
+    <button id="btn" type="button">Set</button>
+    <script src="./renderer.js"></script>
+  </body>
+</html>
+```
+
+To make these elements interactive, we'll be adding a few lines of code in the imported
+`renderer.js` file that leverages the `window.electronAPI` functionality exposed from the preload
+script:
+
+```javascript title='renderer.js (Renderer Process)'
+const setButton = document.getElementById('btn')
+const titleInput = document.getElementById('title')
+setButton.addEventListener('click', () => {
+    const title = titleInput.value
+    window.electronAPI.setTitle(title)
+});
+```
+
+At this point, your demo should be fully functional. Try using the input field and see what happens
+to your BrowserWindow title!
+
+## Pattern 2: Renderer to main (two-way)
+
+A common application for two-way IPC is calling a main process module from your renderer process
+code and waiting for a result. This can be done by using [`ipcRenderer.invoke`] paired with
+[`ipcMain.handle`].
+
+In the following example, we'll be opening a native file dialog from the renderer process and
+returning the selected file's path.
+
+For this demo, you'll need to add code to your main process, your renderer process, and a preload
+script. The full code is below, but we'll be explaining each file individually in the following
+sections.
+
+```fiddle docs/fiddles/ipc/pattern-2
+```
+
+### 1. Listen for events with `ipcMain.handle`
+
+In the main process, we'll be creating a `handleFileOpen()` function that calls
+`dialog.showOpenDialog` and returns the value of the file path selected by the user. This function
+is used as a callback whenever an `ipcRender.invoke` message is sent through the `dialog:openFile`
+channel from the renderer process. The return value is then returned as a Promise to the original
+`invoke` call.
+
+:::caution A word on error handling
+Errors thrown through `handle` in the main process are not transparent as they
+are serialized and only the `message` property from the original error is
+provided to the renderer process. Please refer to
+[#24427](https://github.com/electron/electron/issues/24427) for details.
+:::
+
+```javascript {6-13,25} title='main.js (Main Process)'
+const { BrowserWindow, dialog, ipcMain } = require('electron')
+const path = require('path')
+
+//...
+
+async function handleFileOpen() {
+  const { canceled, filePaths } = await dialog.showOpenDialog()
+  if (canceled) {
+    return
+  } else {
+    return filePaths[0]
+  }
+}
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+  mainWindow.loadFile('index.html')
+}
+
+app.whenReady(() => {
+  ipcMain.handle('dialog:openFile', handleFileOpen)
+  createWindow()
+})
+//...
+```
+
+:::tip on channel names
+The `dialog:` prefix on the IPC channel name has no effect on the code. It only serves
+as a namespace that helps with code readability.
+:::
+
+:::info
+Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
+:::
+
+### 2. Expose `ipcRenderer.invoke` via preload
+
+In the preload script, we expose a one-line `openFile` function that calls and returns the value of
+`ipcRenderer.invoke('dialog:openFile')`. We'll be using this API in the next step to call the
+native dialog from our renderer's user interface.
+
+```javascript title='preload.js (Preload Script)'
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  openFile: () => ipcRenderer.invoke('dialog:openFile')
+})
+```
+
+:::caution Security warning
+We don't directly expose the whole `ipcRenderer.invoke` API for [security reasons]. Make sure to
+limit the renderer's access to Electron APIs as much as possible.
+:::
+
+### 3. Build the renderer process UI
+
+Finally, let's build the HTML file that we load into our BrowserWindow.
+
+```html {10-11} title='index.html'
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Dialog</title>
+  </head>
+  <body>
+    <button type="button" id="btn">Open a File</button>
+    File path: <strong id="filePath"></strong>
+    <script src='./renderer.js'></script>
+  </body>
+</html>
+```
+
+The UI consists of a single `#btn` button element that will be used to trigger our preload API, and
+a `#filePath` element that will be used to display the path of the selected file. Making these
+pieces work will take a few lines of code in the renderer process script:
+
+```javascript title='renderer.js (Renderer Process)'
+const btn = document.getElementById('btn')
+const filePathElement = document.getElementById('filePath')
+
+btn.addEventListener('click', async () => {
+  const filePath = await window.electronAPI.openFile()
+  filePathElement.innerText = filePath
+})
+```
+
+In the above snippet, we listen for clicks on the `#btn` button, and call our
+`window.electronAPI.openFile()` API to activate the native Open File dialog. We then display the
+selected file path in the `#filePath` element.
+
+### Note: legacy approaches
+
+The `ipcRenderer.invoke` API was added in Electron 7 as a developer-friendly way to tackle two-way
+IPC from the renderer process. However, there exist a couple alternative approaches to this IPC
+pattern.
+
+:::warning Avoid legacy approaches if possible
+We recommend using `ipcRenderer.invoke` whenever possible. The following two-way renderer-to-main
+patterns are documented for historical purposes.
+:::
+
+:::info
+For the following examples, we're calling `ipcRenderer` directly from the preload script to keep
+the code samples small.
+:::
+
+#### Using `ipcRenderer.send`
+
+The `ipcRenderer.send` API that we used for single-way communication can also be leveraged to
+perform two-way communication. This was the recommended way for asynchronous two-way communication
+via IPC prior to Electron 7.
+
+```javascript title='preload.js (Preload Script)'
+// You can also put expose this code to the renderer
+// process with the `contextBridge` API
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('asynchronous-reply', (_event, arg) => {
+  console.log(arg) // prints "pong" in the DevTools console
+})
+ipcRenderer.send('asynchronous-message', 'ping')
+```
+
+```javascript title='main.js (Main Process)'
+ipcMain.on('asynchronous-message', (event, arg) => {
+  console.log(arg) // prints "ping" in the Node console
+  // works like `send`, but returning a message back
+  // to the renderer that sent the original message
+  event.reply('asynchronous-reply', 'pong')
+})
+```
+
+There are a couple downsides to this approach:
+
+* You need to set up a second `ipcRenderer.on` listener to handle the response in the renderer
+process. With `invoke`, you get the response value returned as a Promise to the original API call.
+* There's no obvious way to pair the `asynchronous-reply` message to the original
+`asynchronous-message` one. If you have very frequent messages going back and forth through these
+channels, you would need to add additional app code to track each call and response individually.
+
+#### Using `ipcRenderer.sendSync`
+
+The `ipcRenderer.sendSync` API sends a message to the main process and waits _synchronously_ for a
+response.
+
+```javascript title='main.js (Main Process)'
+const { ipcMain } = require('electron')
+ipcMain.on('synchronous-message', (event, arg) => {
+  console.log(arg) // prints "ping" in the Node console
+  event.returnValue = 'pong'
+})
+```
+
+```javascript title='preload.js (Preload Script)'
+// You can also put expose this code to the renderer
+// process with the `contextBridge` API
+const { ipcRenderer } = require('electron')
+
+const result = ipcRenderer.sendSync('synchronous-message', 'ping')
+console.log(result) // prints "pong" in the DevTools console
+```
+
+The structure of this code is very similar to the `invoke` model, but we recommend
+**avoiding this API** for performance reasons. Its synchronous nature means that it'll block the
+renderer process until a reply is received.
+
+## Pattern 3: Main to renderer
+
+When sending a message from the main process to a renderer process, you need to specify which
+renderer is receiving the message. Messages need to be sent to a renderer process
+via its [`WebContents`] instance. This WebContents instance contains a [`send`][webcontents-send] method
+that can be used in the same way as `ipcRenderer.send`.
+
+To demonstrate this pattern, we'll be building a number counter controlled by the native operating
+system menu.
+
+For this demo, you'll need to add code to your main process, your renderer process, and a preload
+script. The full code is below, but we'll be explaining each file individually in the following
+sections.
+
+```fiddle docs/fiddles/ipc/pattern-3
+```
+
+### 1. Send messages with the `webContents` module
+
+For this demo, we'll need to first build a custom menu in the main process using Electron's `Menu`
+module that uses the `webContents.send` API to send an IPC message from the main process to the
+target renderer.
+
+```javascript {11-26} title='main.js (Main Process)'
+const {app, BrowserWindow, Menu} = require('electron')
+const path = require('path')
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+
+  const menu = Menu.buildFromTemplate([
+    {
+      label: app.name,
+      submenu: [
+        {
+          click: () => mainWindow.webContents.send('update-counter', 1),
+          label: 'Increment',
+        },
+        {
+          click: () => mainWindow.webContents.send('update-counter', -1),
+          label: 'Decrement',
+        }
+      ]
+    }
+  ])
+  Menu.setApplicationMenu(menu)
+
+  mainWindow.loadFile('index.html')
+}
+//...
+
+```
+
+For the purposes of the tutorial, it's important to note that the `click` handler
+sends a message (either `1` or `-1`) to the renderer process through the `counter` channel.
+
+```javascript
+click: () => mainWindow.webContents.send('update-counter', -1)
+```
+
+:::info
+Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
+:::
+
+### 2. Expose `ipcRenderer.on` via preload
+
+Like in the previous renderer-to-main example, we use the `contextBridge` and `ipcRenderer`
+modules in the preload script to expose IPC functionality to the renderer process:
+
+```javascript title='preload.js (Preload Script)'
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+    onUpdateCounter: (callback) => ipcRenderer.on('update-counter', callback)
+})
+```
+
+After loading the preload script, your renderer process should have access to the
+`window.electronAPI.onUpdateCounter()` listener function.
+
+:::caution Security warning
+We don't directly expose the whole `ipcRenderer.on` API for [security reasons]. Make sure to
+limit the renderer's access to Electron APIs as much as possible.
+:::
+
+:::info
+In the case of this minimal example, you can call `ipcRenderer.on` directly in the preload script
+rather than exposing it over the context bridge.
+
+```javascript title='preload.js (Preload Script)'
+const { ipcRenderer } = require('electron')
+
+window.addEventListener('DOMContentLoaded', () => {
+    const counter = document.getElementById('counter')
+    ipcRenderer.on('update-counter', (_event, value) => {
+        const oldValue = Number(counter.innerText)
+        const newValue = oldValue + value
+        counter.innerText = newValue
+    })
+})
+```
+
+However, this approach has limited flexibility compared to exposing your preload APIs
+over the context bridge, since your listener can't directly interact with your renderer code.
+:::
+
+### 3. Build the renderer process UI
+
+To tie it all together, we'll create an interface in the loaded HTML file that contains a
+`#counter` element that we'll use to display the values:
+
+```html {10} title='index.html'
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <title>Menu Counter</title>
+  </head>
+  <body>
+    Current value: <strong id="counter">0</strong>
+    <script src="./renderer.js"></script>
+  </body>
+</html>
+```
+
+Finally, to make the values update in the HTML document, we'll add a few lines of DOM manipulation
+so that the value of the `#counter` element is updated whenever we fire an `update-counter` event.
+
+```javascript title='renderer.js (Renderer Process)'
+const counter = document.getElementById('counter')
+
+window.electronAPI.onUpdateCounter((_event, value) => {
+    const oldValue = Number(counter.innerText)
+    const newValue = oldValue + value
+    counter.innerText = newValue
+})
+```
+
+In the above code, we're passing in a callback to the `window.electronAPI.onUpdateCounter` function
+exposed from our preload script. The second `value` parameter corresponds to the `1` or `-1` we
+were passing in from the `webContents.send` call from the native menu.
+
+### Optional: returning a reply
+
+There's no equivalent for `ipcRenderer.invoke` for main-to-renderer IPC. Instead, you can
+send a reply back to the main process from within the `ipcRenderer.on` callback.
+
+We can demonstrate this with slight modifications to the code from the previous example. In the
+renderer process, use the `event` parameter to send a reply back to the main process through the
+`counter-value` channel.
+
+```javascript title='renderer.js (Renderer Process)'
+const counter = document.getElementById('counter')
+
+window.electronAPI.onUpdateCounter((event, value) => {
+  const oldValue = Number(counter.innerText)
+  const newValue = oldValue + value
+  counter.innerText = newValue
+  event.reply('counter-value', newValue)
+})
+```
+
+In the main process, listen for `counter-value` events and handle them appropriately.
+
+```javascript title='main.js (Main Process)'
+//...
+ipcMain.on('counter-value', (_event, value) => {
+  console.log(value) // will print value to Node console
+})
+//...
+```
+
+## Pattern 4: Renderer to renderer
+
+There's no direct way to send messages between renderer processes in Electron using the `ipcMain`
+and `ipcRenderer` modules. To achieve this, you have two options:
+
+* Use the main process as a message broker between renderers. This would involve sending a message
+from one renderer to the main process, which would forward the message to the other renderer.
+* Pass a [MessagePort] from the main process to both renderers. This will allow direct communication
+between renderers after the initial setup.
+
+## Object serialization
+
+Electron's IPC implementation uses the HTML standard
+[Structured Clone Algorithm][sca] to serialize objects passed between processes, meaning that
+only certain types of objects can be passed through IPC channels.
+
+In particular, DOM objects (e.g. `Element`, `Location` and `DOMMatrix`), Node.js objects
+backed by C++ classes (e.g. `process.env`, some members of `Stream`), and Electron objects
+backed by C++ classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not serializable
+with Structured Clone.
+
+[context isolation tutorial]: context-isolation.md
+[security reasons]: ./context-isolation.md#security-considerations
+[`ipcMain`]: ../api/ipc-main.md
+[`ipcMain.handle`]: ../api/ipc-main.md#ipcmainhandlechannel-listener
+[`ipcMain.on`]: ../api/ipc-main.md
+[IpcMainEvent]: ../api/structures/ipc-main-event.md
+[`ipcRenderer`]: ../api/ipc-renderer.md
+[`ipcRenderer.invoke`]: ../api/ipc-renderer.md#ipcrendererinvokechannel-args
+[`ipcRenderer.send`]: ../api/ipc-renderer.md
+[MessagePort]: ./message-ports.md
+[preload script]: process-model.md#preload-scripts
+[process model docs]: process-model.md
+[sca]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
+[`WebContents`]: ../api/web-contents.md
+[webcontents-send]: ../api/web-contents.md#contentssendchannel-args

From 28ada6ea8bd2abeca8812e6d284c1f5f3974286b Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 18:58:52 -0800
Subject: [PATCH 023/811] chore: bump chromium to 100.0.4857.0 (main) (#32419)

* chore: bump chromium in DEPS to 99.0.4819.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4824.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4827.0

* chore: update patches

* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons

https://chromium-review.googlesource.com/c/chromium/src/+/3352511

* 3309164: webhid: Show FIDO devices in the chooser if allowed

https://chromium-review.googlesource.com/c/chromium/src/+/3309164

* 3297868: hid: Add experimental HIDDevice.forget()

https://chromium-review.googlesource.com/c/chromium/src/+/3297868

* 3362491: [Extensions] Move i18n API to //extensions

https://chromium-review.googlesource.com/c/chromium/src/+/3362491

* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.

https://chromium-review.googlesource.com/c/chromium/src/+/3281481

* 3352616: [Gtk] Remove libgtk from the link-line

https://chromium-review.googlesource.com/c/chromium/src/+/3352616

* 3249211: Clear-Site-Data support for partitioned cookies

https://chromium-review.googlesource.com/c/chromium/src/+/3249211

* [Extensions][COIL] Use [allow|block]list in //extensions/common

https://chromium-review.googlesource.com/c/chromium/src/+/3372668

* Begin ScopedUserPrefUpdate migration to modern base::Value

https://chromium-review.googlesource.com/c/chromium/src/+/3376154

* [Code Health] Refactor PrefService GetDict + GetList to use base::Value

https://chromium-review.googlesource.com/c/chromium/src/+/3343526

* 3354997: [CodeHealth] Remove deprecated SetDictionary method

https://chromium-review.googlesource.com/c/chromium/src/+/3354997

* 3287323: Add LacrosPrefStore for lacros settings

https://chromium-review.googlesource.com/c/chromium/src/+/3287323

* 3365916: [PA] Clean up remaining lazy commit code

https://chromium-review.googlesource.com/c/chromium/src/+/3365916

* [MPArch] Target the external protocol error at the responsible frame.

https://chromium-review.googlesource.com/c/chromium/src/+/3011560

* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories

https://chromium-review.googlesource.com/c/chromium/src/+/3350608

* Linux: Send OSCrypt raw encryption key to the Network Service

https://chromium-review.googlesource.com/c/chromium/src/+/3320484

* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.

https://chromium-review.googlesource.com/c/chromium/src/+/3359441

* chore: fixup for lint

* 3327621: Fix tablet mode detection for Win 11.

https://chromium-review.googlesource.com/c/chromium/src/+/3327621

* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella

https://chromium-review.googlesource.com/c/chromium/src/+/3342428

* 3353974: Mac: Use base::Feature for overlay features

https://chromium-review.googlesource.com/c/chromium/src/+/3353974

* chore: bump chromium in DEPS to 99.0.4828.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4837.0

* chore: update patches

* chore: update patches

* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142

* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749

* chore: bump chromium in DEPS to 99.0.4839.0

* chore: update patches

* chore: bump chromium in DEPS to 99.0.4840.0

* chore: bump chromium in DEPS to 99.0.4844.0

* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4845.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4847.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4849.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4851.0

* chore: bump chromium in DEPS to 100.0.4853.0

* update patches

* chore: update patches

* update patches

* 3383599: Fonts Access: Remove prototype that uses a font picker.

https://chromium-review.googlesource.com/c/chromium/src/+/3383599

* 3404768: Remove ALLOW_UNUSED macros

https://chromium-review.googlesource.com/c/chromium/src/+/3404768

* 3374762: Remove ignore_result.h

https://chromium-review.googlesource.com/c/chromium/src/+/3374762

* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections

https://chromium-review.googlesource.com/c/chromium/src/+/3399305

* 3402210: [Extensions] Don't trigger unload event for already unloaded extension

https://chromium-review.googlesource.com/c/chromium/src/+/3402210

* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.

https://chromium-review.googlesource.com/c/chromium/src/+/3410912

* 3370428: Make the AuthSchemes policy support dynamic refresh

https://chromium-review.googlesource.com/c/chromium/src/+/3370428

* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value

https://chromium-review.googlesource.com/c/chromium/src/+/3407603

* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11

https://chromium-review.googlesource.com/c/chromium/src/+/3378352

* 3370810: Delete chrome/service, AKA the Cloud Print service process.

https://chromium-review.googlesource.com/c/chromium/src/+/3370810

* chore: bump chromium in DEPS to 100.0.4855.0

* chore: update patches

* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.

* revert 3348007 to fix windows build

* 3318572: [Code health] Fix gn check errors in //extensions/browser:*

https://chromium-review.googlesource.com/c/chromium/src/+/3318572

* fix printing.patch

* fix iwyu issue

* 3408515: win: Make ShorcutOperation an enum class and modernize names

https://chromium-review.googlesource.com/c/chromium/src/+/3408515

* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc

https://chromium-review.googlesource.com/c/chromium/src/+/3388333

* fix windows build? i hope

* patch gn visibility of //ui/ozone/platform/x11

* missing include base/logging.h

* use BUILDFLAG for USE_NSS_CERTS

https://chromium-review.googlesource.com/c/chromium/src/+/3379123

* defined(OS_*) ==> BUILDFLAG(IS_*)

https://bugs.chromium.org/p/chromium/issues/detail?id=1234043

* fixup! 3404768: Remove ALLOW_UNUSED macros

* another attempt to fix windows build

* temporarily disable the custom scheme service worker test

https://github.com/electron/electron/issues/32664

* fix loading mv3 extensions

not sure what cl broke this unfort.

* fixup! 3404768: Remove ALLOW_UNUSED macros

* patch nan

https://chromium-review.googlesource.com/c/v8/v8/+/3395880

* fix node test

* fix nullptr in FindPdfFrame

* patch perfetto to fix build issue on win-ia32

https://source.chromium.org/chromium/_/android/platform/external/perfetto.git/+/bc44c3c7533c00e56f88c06c592d634aecc884be

* fix build for linux-x64-testing-no-run-as-node

* fix patch

* skip <webview>.capturePage() test

https://github.com/electron/electron/issues/32705

* test: fix failing tests of focus/blur events of WebContents (#32711)

* inherit stdio from app module test child processes

this prevents them from timing out due to full stdout buffers

* test to see if we can get better logs on windows ci

* try again for appveyor log things

* skip contentTracing tests on ia32

* ci: disable gpu compositing

* drop applied patch

* fix merge fail

* Revert "ci: disable gpu compositing"

This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 BUILD.gn                                      |   4 +-
 DEPS                                          |   2 +-
 appveyor.yml                                  |   5 +-
 chromium_src/BUILD.gn                         |  10 +-
 filenames.gni                                 |   4 -
 patches/boringssl/expose_ripemd160.patch      |   2 +-
 patches/chromium/.patches                     |   3 -
 patches/chromium/accelerator.patch            |   8 +-
 ...client_precreatemessageloop_callback.patch |   2 +-
 .../add_didinstallconditionalfeatures.patch   |  28 +-
 ...pedcliboardwriter_writeunsaferawdata.patch |  12 +-
 ..._scheduler_throttling_per_renderview.patch |  18 +-
 ..._windows_to_have_different_web_prefs.patch |  14 +-
 ...leges_in_unsandboxed_child_processes.patch |   2 +-
 patches/chromium/blink_file_path.patch        |   2 +-
 patches/chromium/blink_local_frame.patch      |   8 +-
 patches/chromium/boringssl_build_gn.patch     |   4 +-
 ..._node_processes_as_browser_processes.patch |   4 +-
 .../build_add_electron_tracing_category.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  22 +-
 patches/chromium/can_create_window.patch      |  40 +-
 ..._v8_initialization_isolate_callbacks.patch |   2 +-
 ...screationoverridden_with_full_params.patch |  40 +-
 ...esources_not_chrome_for_spellchecker.patch |  14 +-
 patches/chromium/chrome_key_systems.patch     |   4 +-
 patches/chromium/command-ismediakey.patch     |   2 +-
 ...allow_disabling_compression_on_linux.patch |   8 +-
 .../crash_allow_setting_more_options.patch    |  20 +-
 patches/chromium/dcheck.patch                 |   7 +-
 patches/chromium/desktop_media_list.patch     |   4 +-
 patches/chromium/disable-redraw-lock.patch    |   6 +-
 .../disable_color_correct_rendering.patch     |  50 +-
 .../disable_compositor_recycling.patch        |   2 +-
 patches/chromium/disable_hidden.patch         |  10 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |  20 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 ...ingcontext_calls_to_newpage_pagedone.patch | 511 ------------------
 .../chromium/enable_reset_aspect_ratio.patch  |   8 +-
 ...locator_for_usage_outside_of_the_gin.patch |   2 +-
 ...xpose_setuseragent_on_networkcontext.patch |  18 +-
 .../extend_apply_webpreferences.patch         |  10 +-
 ...ransfer_to_requestsingleinstancelock.patch |  10 +-
 ...dd_set_theme_source_to_allow_apps_to.patch |  14 +-
 ..._registry_to_multibuffer_data_source.patch |   4 +-
 ...g_the_base_spellchecker_download_url.patch |   4 +-
 ...to_add_observers_on_created_hunspell.patch |   4 +-
 ...screen_rendering_with_viz_compositor.patch |  50 +-
 ..._raw_response_headers_from_urlloader.patch |  10 +-
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |   6 +-
 ...ete_SerialPortManager_on_main_thread.patch |   2 +-
 ...ntcapturercount_in_web_contents_impl.patch |   8 +-
 ...media_key_usage_with_globalshortcuts.patch |   2 +-
 ...rmissions_checks_in_exclusive_access.patch |   4 +-
 ...out_profile_refs_in_accessibility_ui.patch |  14 +-
 ..._properly_honor_printing_page_ranges.patch |   4 +-
 ...fix_use_electron_generated_resources.patch |   2 +-
 patches/chromium/frame_host_manager.patch     |   6 +-
 .../gin_enable_disable_v8_platform.patch      |  10 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |  12 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |  32 +-
 ...nse_interceptor_to_point_to_electron.patch |   4 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   4 +-
 patches/chromium/isolate_holder.patch         |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...reate_a_console_if_logging_to_stderr.patch |   6 +-
 ...clude_of_stack_trace_h_unconditional.patch |  24 -
 patches/chromium/mas-cfisobjc.patch           |   8 +-
 .../mas-cgdisplayusesforcetogray.patch        |   4 +-
 .../mas_disable_remote_accessibility.patch    |  48 +-
 .../chromium/mas_disable_remote_layer.patch   |  36 +-
 patches/chromium/mas_no_private_api.patch     |  30 +-
 ...emote_certificate_verification_logic.patch |  26 +-
 .../chromium/notification_provenance.patch    |   6 +-
 patches/chromium/pepper_plugin_support.patch  |  28 +-
 patches/chromium/picture-in-picture.patch     |  34 +-
 patches/chromium/printing.patch               | 117 ++--
 patches/chromium/process_singleton.patch      |  37 +-
 patches/chromium/proxy_config_monitor.patch   |   2 +-
 ...put_back_deleted_colors_for_autofill.patch |  15 +-
 ...r_changes_to_the_webcontentsobserver.patch |  12 +-
 ...store_base_adaptcallbackforrepeating.patch |   2 +-
 ...f_incognito_apis_in_the_spellchecker.patch |   4 +-
 .../render_widget_host_view_base.patch        |   4 +-
 .../render_widget_host_view_mac.patch         |  14 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 ..._using_nsrunloop_in_renderer_process.patch |  28 -
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../chromium/skip_atk_toolchain_check.patch   |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |  12 +-
 patches/chromium/ui_gtk_public_header.patch   |  10 +-
 ...andboxed_ppapi_processes_skip_zygote.patch |  10 +-
 .../v8_context_snapshot_generator.patch       |   4 +-
 patches/chromium/web_contents.patch           |  12 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  12 +-
 ...feat_add_hook_to_notify_script_ready.patch |  18 +-
 patches/config.json                           |   4 +
 patches/nan/.patches                          |   1 +
 ...use_new_constructor_for_scriptorigin.patch |  42 ++
 patches/node/.patches                         |   1 +
 patches/node/fix_serdes_test.patch            |  36 ++
 patches/perfetto/.patches                     |   1 +
 ...size_t_to_be_intptr_t_to_match_libuv.patch |  26 +
 patches/v8/.patches                           |   2 +-
 patches/v8/build_gn.patch                     |   8 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...ed_attirbute_for_older_msvc_versions.patch |   2 +-
 ...dcheck_for_node_stream_array_buffers.patch |   4 +-
 ...in_v8_scriptormodule_legacy_lifetime.patch |  56 --
 ...eleted_cstors_in_cppheapcreateparams.patch |  21 +
 ...workaround_an_undefined_symbol_error.patch |   8 +-
 shell/app/electron_content_client.cc          |   4 +-
 shell/app/electron_crash_reporter_client.cc   |  18 +-
 shell/app/electron_crash_reporter_client.h    |  10 +-
 shell/app/electron_library_main.h             |   4 +-
 shell/app/electron_main_delegate.cc           |  48 +-
 shell/app/electron_main_delegate.h            |   4 +-
 shell/app/electron_main_linux.cc              |  13 +-
 shell/app/electron_main_mac.cc                |   2 +-
 shell/app/electron_main_win.cc                |   2 +-
 shell/app/node_main.cc                        |  14 +-
 shell/app/uv_stdio_fix.cc                     |  12 +-
 shell/browser/api/electron_api_app.cc         |  79 +--
 shell/browser/api/electron_api_app.h          |  21 +-
 shell/browser/api/electron_api_base_window.cc |  24 +-
 shell/browser/api/electron_api_base_window.h  |   8 +-
 .../api/electron_api_browser_window.cc        |  24 +-
 .../browser/api/electron_api_browser_window.h |   2 +-
 .../api/electron_api_crash_reporter.cc        |  18 +-
 .../browser/api/electron_api_crash_reporter.h |   2 +-
 .../api/electron_api_desktop_capturer.cc      |  14 +-
 .../api/electron_api_desktop_capturer.h       |   4 +-
 shell/browser/api/electron_api_dialog.cc      |   2 +-
 .../api/electron_api_global_shortcut.cc       |   8 +-
 .../api/electron_api_in_app_purchase.cc       |   4 +-
 shell/browser/api/electron_api_menu.cc        |  10 +-
 shell/browser/api/electron_api_menu.h         |   4 +-
 .../browser/api/electron_api_native_theme.cc  |   6 +-
 shell/browser/api/electron_api_native_theme.h |   2 +-
 .../browser/api/electron_api_power_monitor.cc |   8 +-
 .../browser/api/electron_api_power_monitor.h  |  10 +-
 shell/browser/api/electron_api_screen.cc      |   6 +-
 .../api/electron_api_system_preferences.cc    |  10 +-
 .../api/electron_api_system_preferences.h     |  16 +-
 shell/browser/api/electron_api_tray.cc        |  16 +-
 shell/browser/api/electron_api_url_loader.cc  |  10 +-
 shell/browser/api/electron_api_url_loader.h   |  10 +-
 .../browser/api/electron_api_web_contents.cc  |  66 +--
 shell/browser/api/electron_api_web_contents.h |   4 +-
 .../api/electron_api_web_contents_view.cc     |   6 +-
 shell/browser/api/gpu_info_enumerator.cc      |  18 +-
 shell/browser/api/gpuinfo_manager.cc          |   2 +-
 shell/browser/api/process_metric.cc           |  14 +-
 shell/browser/api/process_metric.h            |  12 +-
 shell/browser/auto_updater.cc                 |   2 +-
 shell/browser/browser.cc                      |   6 +-
 shell/browser/browser.h                       |  40 +-
 shell/browser/browser_linux.cc                |   2 +-
 shell/browser/browser_observer.h              |   2 +-
 shell/browser/browser_process_impl.cc         |   2 +-
 shell/browser/browser_process_impl.h          |   2 +-
 shell/browser/electron_browser_client.cc      | 166 +++---
 shell/browser/electron_browser_client.h       |  22 +-
 shell/browser/electron_browser_main_parts.cc  |  79 ++-
 shell/browser/electron_browser_main_parts.h   |  16 +-
 .../electron_download_manager_delegate.cc     |   4 +-
 shell/browser/electron_gpu_client.cc          |   4 +-
 ...electron_pdf_web_contents_helper_client.cc |  11 +
 .../electron_pdf_web_contents_helper_client.h |   2 +
 shell/browser/electron_permission_manager.cc  |   8 +-
 shell/browser/extensions/api/BUILD.gn         |   1 -
 .../cryptotoken_private_api.cc                |   8 +-
 shell/browser/extensions/api/i18n/i18n_api.cc |  24 -
 shell/browser/extensions/api/i18n/i18n_api.h  |  20 -
 .../extensions/electron_extension_system.cc   |   3 +-
 .../extensions/electron_extension_system.h    |   3 +-
 ...lectron_extensions_browser_api_provider.cc |   2 +-
 shell/browser/feature_list.cc                 |   8 +-
 shell/browser/file_select_helper.cc           |   8 +-
 shell/browser/file_select_helper.h            |   4 +-
 .../font/electron_font_access_delegate.cc     |  42 --
 .../font/electron_font_access_delegate.h      |  31 --
 shell/browser/font_defaults.cc                |   8 +-
 shell/browser/hid/electron_hid_delegate.cc    |  11 +-
 shell/browser/hid/electron_hid_delegate.h     |   6 +-
 shell/browser/javascript_environment.cc       |   8 +-
 shell/browser/native_window.cc                |  20 +-
 shell/browser/native_window.h                 |   8 +-
 shell/browser/native_window_observer.h        |   4 +-
 shell/browser/native_window_views.cc          | 132 ++---
 shell/browser/native_window_views.h           |  18 +-
 shell/browser/native_window_views_win.cc      |   4 +-
 shell/browser/net/asar/asar_url_loader.cc     |   3 +-
 .../net/electron_url_loader_factory.cc        |   6 +-
 shell/browser/net/network_context_service.cc  |   4 +-
 shell/browser/net/node_stream_loader.cc       |   3 +-
 .../net/proxying_url_loader_factory.cc        |   7 +-
 .../browser/net/proxying_url_loader_factory.h |   4 +-
 .../net/system_network_context_manager.cc     |  53 +-
 shell/browser/net/url_pipe_loader.cc          |   3 +-
 .../win/windows_toast_notification.cc         |   1 +
 shell/browser/osr/osr_host_display_client.cc  |   4 +-
 shell/browser/osr/osr_host_display_client.h   |   4 +-
 .../osr/osr_render_widget_host_view.cc        |   2 +-
 .../browser/osr/osr_render_widget_host_view.h |  10 +-
 shell/browser/osr/osr_web_contents_view.cc    |  10 +-
 shell/browser/osr/osr_web_contents_view.h     |   8 +-
 shell/browser/pref_store_delegate.h           |   1 +
 shell/browser/protocol_registry.cc            |   4 +-
 shell/browser/relauncher.cc                   |  16 +-
 shell/browser/relauncher.h                    |   6 +-
 .../browser/serial/serial_chooser_context.cc  |  24 +-
 shell/browser/serial/serial_chooser_context.h |   8 +-
 .../serial/serial_chooser_controller.cc       |   4 +-
 shell/browser/ui/electron_menu_model.cc       |   4 +-
 shell/browser/ui/electron_menu_model.h        |   8 +-
 shell/browser/ui/gtk/app_indicator_icon.cc    |   1 +
 shell/browser/ui/inspectable_web_contents.cc  |   8 +-
 .../ui/inspectable_web_contents_view.h        |   2 +-
 .../inspectable_web_contents_view_delegate.h  |   2 +-
 shell/browser/ui/tray_icon.h                  |   6 +-
 shell/browser/ui/views/autofill_popup_view.cc |   2 +-
 .../ui/views/electron_views_delegate.cc       |   8 +-
 .../ui/views/electron_views_delegate.h        |   6 +-
 .../inspectable_web_contents_view_views.cc    |   2 +-
 shell/browser/ui/views/menu_bar.cc            |  10 +-
 shell/browser/ui/views/menu_bar.h             |   2 +-
 shell/browser/ui/views/root_view.cc           |   2 +-
 shell/browser/ui/views/submenu_button.cc      |   2 +-
 shell/browser/web_contents_preferences.cc     |   8 +-
 shell/browser/web_contents_preferences.h      |   2 +-
 shell/browser/window_list.cc                  |   2 +-
 shell/browser/zoom_level_delegate.cc          |  43 +-
 shell/common/api/electron_api_clipboard.cc    |   8 +-
 shell/common/api/electron_api_native_image.cc |  24 +-
 shell/common/api/electron_api_native_image.h  |  10 +-
 shell/common/api/electron_api_shell.cc        |  15 +-
 shell/common/api/electron_bindings.cc         |  12 +-
 shell/common/application_info.h               |   6 +-
 shell/common/asar/archive.cc                  |  18 +-
 shell/common/asar/asar_util.cc                |   2 +-
 shell/common/asar/scoped_temporary_file.cc    |   4 +-
 shell/common/crash_keys.cc                    |  12 +-
 shell/common/electron_command_line.cc         |   4 +-
 shell/common/electron_command_line.h          |   2 +-
 shell/common/electron_paths.h                 |  14 +-
 shell/common/extensions/api/BUILD.gn          |   2 -
 .../extensions/electron_extensions_client.cc  |   2 +-
 .../extensions/electron_extensions_client.h   |   2 +-
 shell/common/gin_converters/base_converter.h  |   2 +-
 shell/common/gin_converters/guid_converter.h  |   8 +-
 shell/common/gin_converters/std_converter.h   |   6 +-
 shell/common/gin_helper/callback.h            |   6 +-
 shell/common/keyboard_util.cc                 |  44 +-
 shell/common/logging.cc                       |  11 +-
 shell/common/node_bindings.cc                 |  12 +-
 shell/common/node_bindings.h                  |   2 +-
 shell/common/platform_util.h                  |   6 +-
 shell/common/platform_util_linux.cc           |   1 +
 shell/common/skia_util.cc                     |   4 +-
 shell/common/skia_util.h                      |   2 +-
 .../api/electron_api_context_bridge.cc        |   9 +-
 shell/renderer/electron_api_service_impl.cc   |   3 +-
 .../electron_sandboxed_renderer_client.cc     |   4 +-
 shell/renderer/renderer_client_base.cc        |   6 +-
 .../electron_content_utility_client.cc        |  30 +-
 .../utility/electron_content_utility_client.h |   8 -
 spec-main/api-app-spec.ts                     |   4 +-
 spec-main/api-content-tracing-spec.ts         |   4 +-
 spec-main/api-protocol-spec.ts                |   5 +-
 spec-main/extensions-spec.ts                  |   2 +-
 spec/webview-spec.js                          |   5 +-
 279 files changed, 1682 insertions(+), 2237 deletions(-)
 delete mode 100644 patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch
 delete mode 100644 patches/chromium/make_include_of_stack_trace_h_unconditional.patch
 delete mode 100644 patches/chromium/revert_stop_using_nsrunloop_in_renderer_process.patch
 create mode 100644 patches/nan/.patches
 create mode 100644 patches/nan/use_new_constructor_for_scriptorigin.patch
 create mode 100644 patches/node/fix_serdes_test.patch
 create mode 100644 patches/perfetto/.patches
 create mode 100644 patches/perfetto/define_ssize_t_to_be_intptr_t_to_match_libuv.patch
 delete mode 100644 patches/v8/fix_use_allocationtype_kold_in_v8_scriptormodule_legacy_lifetime.patch
 create mode 100644 patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 delete mode 100644 shell/browser/extensions/api/i18n/i18n_api.cc
 delete mode 100644 shell/browser/extensions/api/i18n/i18n_api.h
 delete mode 100644 shell/browser/font/electron_font_access_delegate.cc
 delete mode 100644 shell/browser/font/electron_font_access_delegate.h

diff --git a/BUILD.gn b/BUILD.gn
index bd4402cf8ac7d..ec9e8b6a72b9f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -472,8 +472,8 @@ source_set("electron_lib") {
 
   if (is_linux) {
     deps += [
-      "//build/config/linux/gtk:gtkprint",
       "//components/crash/content/browser",
+      "//ui/gtk:gtk_config",
     ]
   }
 
@@ -551,7 +551,7 @@ source_set("electron_lib") {
       sources += filenames.lib_sources_linux_x11
       public_deps += [
         "//ui/base/x",
-        "//ui/platform_window/x11",
+        "//ui/ozone/platform/x11",
       ]
     }
     configs += [ ":gio_unix" ]
diff --git a/DEPS b/DEPS
index 858f9f05f58f6..db991a8702c70 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '99.0.4767.0',
+    '100.0.4855.0',
   'node_version':
     'v16.13.2',
   'nan_version':
diff --git a/appveyor.yml b/appveyor.yml
index 64b906aa0c010..f6be0fbd3596b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,6 +34,7 @@ environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
   ELECTRON_ENABLE_STACK_DUMPING: 1
+  ELECTRON_ALSO_LOG_TO_STDERR: 1
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
@@ -209,7 +210,7 @@ test_script:
       }
   - cd electron
   # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"
@@ -231,3 +232,5 @@ deploy_script:
       } elseif (Test-Path Env:\TEST_WOA) {
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
+on_finish:
+  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index c30edae4ac665..d577b448ccc2e 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -140,10 +140,6 @@ static_library("chrome") {
     "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
-  if (enable_basic_printing && is_win) {
-    deps += [ "//chrome/common:cloud_print_utility_mojom" ]
-  }
-
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
     if (use_ozone) {
@@ -243,8 +239,6 @@ static_library("chrome") {
       sources += [
         "//chrome/browser/printing/pdf_to_emf_converter.cc",
         "//chrome/browser/printing/pdf_to_emf_converter.h",
-        "//chrome/utility/printing_handler.cc",
-        "//chrome/utility/printing_handler.h",
       ]
     }
   }
@@ -261,6 +255,8 @@ static_library("chrome") {
       "//chrome/browser/ui/views/overlay/constants.h",
       "//chrome/browser/ui/views/overlay/hang_up_button.cc",
       "//chrome/browser/ui/views/overlay/hang_up_button.h",
+      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
+      "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
       "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
       "//chrome/browser/ui/views/overlay/overlay_window_views.h",
       "//chrome/browser/ui/views/overlay/playback_image_button.cc",
@@ -299,6 +295,8 @@ static_library("chrome") {
       sources += [
         "//chrome/browser/pdf/pdf_extension_util.cc",
         "//chrome/browser/pdf/pdf_extension_util.h",
+        "//chrome/browser/pdf/pdf_frame_util.cc",
+        "//chrome/browser/pdf/pdf_frame_util.h",
         "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
         "//chrome/renderer/pepper/chrome_pdf_print_client.h",
       ]
diff --git a/filenames.gni b/filenames.gni
index eb30e8506ff0e..8e6da3eb657f4 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -386,8 +386,6 @@ filenames = {
     "shell/browser/file_select_helper.cc",
     "shell/browser/file_select_helper.h",
     "shell/browser/file_select_helper_mac.mm",
-    "shell/browser/font/electron_font_access_delegate.cc",
-    "shell/browser/font/electron_font_access_delegate.h",
     "shell/browser/font_defaults.cc",
     "shell/browser/font_defaults.h",
     "shell/browser/hid/electron_hid_delegate.cc",
@@ -681,8 +679,6 @@ filenames = {
   ]
 
   lib_sources_extensions = [
-    "shell/browser/extensions/api/i18n/i18n_api.cc",
-    "shell/browser/extensions/api/i18n/i18n_api.h",
     "shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc",
     "shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h",
     "shell/browser/extensions/api/management/electron_management_api_delegate.cc",
diff --git a/patches/boringssl/expose_ripemd160.patch b/patches/boringssl/expose_ripemd160.patch
index 8671efe04dca9..fede352bb528f 100644
--- a/patches/boringssl/expose_ripemd160.patch
+++ b/patches/boringssl/expose_ripemd160.patch
@@ -82,7 +82,7 @@ index a3fb077b9b9e66d1bc524fd7987622e73aa4776a..852b76bea69988e0b3ac76a17b603128
  
  void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index fa7616896b6cc7422dc0171db29316f20fb25de8..6c19a0f0d454bef1abf16ebfeef380a53fb21e5c 100644
+index 6e889993edc1caa7e10670529dd270c337b5ae4c..f61f7e5009a9b4f5630cda2c3a5a21b44e5b88d8 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
 @@ -90,6 +90,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 68e2c048aa919..14c0fac52460a 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -92,7 +92,6 @@ webview_fullscreen.patch
 disable_unload_metrics.patch
 fix_add_check_for_sandbox_then_result.patch
 extend_apply_webpreferences.patch
-make_include_of_stack_trace_h_unconditional.patch
 build_libc_as_static_library.patch
 build_do_not_depend_on_packed_resource_integrity.patch
 refactor_restore_base_adaptcallbackforrepeating.patch
@@ -109,8 +108,6 @@ mas_gate_private_enterprise_APIs.patch
 load_v8_snapshot_in_browser_process.patch
 fix_patch_out_permissions_checks_in_exclusive_access.patch
 fix_aspect_ratio_with_max_size.patch
-revert_stop_using_nsrunloop_in_renderer_process.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
 feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
-drop_extra_printingcontext_calls_to_newpage_pagedone.patch
diff --git a/patches/chromium/accelerator.patch b/patches/chromium/accelerator.patch
index 6ba88a66c47ee..04f4464c2dbbf 100644
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= and Ctrl-Plus show up as such
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index be0df3662e3a1528fb88d5c723da49e5a29ac2b9..64a5eda05be16b3b6e1a0ceaa2b3a6884ca37268 100644
+index 2468b2c5881821d6f8e24a0e7c42243427b384ad..7e44c97edabf5ae012ff4f84d1404d8f223a13fe 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -30,7 +30,7 @@ index be0df3662e3a1528fb88d5c723da49e5a29ac2b9..64a5eda05be16b3b6e1a0ceaa2b3a688
 +    if (shifted_char) {
 +      shortcut += *shifted_char;
 +    } else {
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
      // Our fallback is to try translate the key code to a regular character
      // unless it is one of digits (VK_0 to VK_9). Some keyboard
 @@ -261,6 +267,10 @@ std::u16string Accelerator::GetShortcutText() const {
@@ -43,7 +43,7 @@ index be0df3662e3a1528fb88d5c723da49e5a29ac2b9..64a5eda05be16b3b6e1a0ceaa2b3a688
 +          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
    }
  
- #if defined(OS_MAC)
+ #if BUILDFLAG(IS_MAC)
 @@ -451,7 +461,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
      const std::u16string& shortcut) const {
    std::u16string result = shortcut;
@@ -63,7 +63,7 @@ index be0df3662e3a1528fb88d5c723da49e5a29ac2b9..64a5eda05be16b3b6e1a0ceaa2b3a688
  
    if (IsCmdDown()) {
 diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
-index 5cdb2f160beae4d7787eb84d5013280ee9464446..76bd4369faa5d43d8a99ea51ed012857d6bff293 100644
+index e0d9df439d120c0a47f55666b3818c7ba6796e70..283c6283f5aeaae1a5436e5fbb17ce2db4a9034e 100644
 --- a/ui/base/accelerators/accelerator.h
 +++ b/ui/base/accelerators/accelerator.h
 @@ -16,6 +16,7 @@
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 4f034602a39dd..0ae9ae781b29c 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index cdd437ad553493535015fd93d19aa29843e10c38..99b285b46c2193d0526fac8b706073213fa0846e 100644
+index 0c1e511e187c480006365fbbde6caa54b0f0eada..1904abcf314007d68c4941a4f2bdb83cace586ab 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -237,6 +237,10 @@ int GpuMain(MainFunctionParams parameters) {
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 8f8194bfc1c3b..ff441bdb349eb 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index f6d262f1bf7aa77c2a63f4a4c3351be0fe2ab3fd..52db2e1948fd7752b88d5a692748053491594c2d 100644
+index a92e09dc651a5f1a9bbae2572fad32233afcd46c..f99b652dda817b62615d2b3f00b4ae4b438ec44d 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
 @@ -129,6 +129,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index f6d262f1bf7aa77c2a63f4a4c3351be0fe2ab3fd..52db2e1948fd7752b88d5a6927480534
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 584ae29be139c9be347e4fa9f920a2cc84baf00a..c7a5f0916cf8ba6db6fa85537c140024a92ff24d 100644
+index fea269ba08af3296e2e304bb94610508ecd01b02..59e48882aba9b0431ddaa0b48f896866833f3376 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4515,6 +4515,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4453,6 +4453,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 584ae29be139c9be347e4fa9f920a2cc84baf00a..c7a5f0916cf8ba6db6fa85537c140024
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 1b582c1736db20dab712ee7875f37c2140bd7d45..efab4f51e56e6e179fb832b1cf47d7f4a348e6c7 100644
+index 4e5d10d32272d5617c7475f58b57ea73d3cf0a65..6ac30bdb5cbc81274e26fd74f3332f0e5c3fb1dc 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -602,6 +602,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -597,6 +597,8 @@ class CONTENT_EXPORT RenderFrameImpl
        blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index 1b582c1736db20dab712ee7875f37c2140bd7d45..efab4f51e56e6e179fb832b1cf47d7f4
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 994841c02b0472e5239d9b73a07b2592a39df8be..ad19a3cddf200f6600a04c1136fd21218d496ba8 100644
+index 507efab2cc79422cc58b1459de8e84a9b7992195..0948dd92c89db566317df7b352d9f5967a3ae86b 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -596,6 +596,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -598,6 +598,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -67,10 +67,10 @@ index 994841c02b0472e5239d9b73a07b2592a39df8be..ad19a3cddf200f6600a04c1136fd2121
    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                          int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index 29e255dc75a1d54211dc6059801d3c16b7cefdca..044195c7d77be5ff4abe9d2a71ddbbf2076b2efd 100644
+index aa4b510137d60e6fb924f4f1a6554fe06c19ad75..816b6260020a6cbb6880b0eed197743ccd9002f5 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -214,6 +214,7 @@ void LocalWindowProxy::Initialize() {
+@@ -205,6 +205,7 @@ void LocalWindowProxy::Initialize() {
    }
  
    InstallConditionalFeatures();
@@ -79,10 +79,10 @@ index 29e255dc75a1d54211dc6059801d3c16b7cefdca..044195c7d77be5ff4abe9d2a71ddbbf2
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index c28bc5f4d285ab2db1b0501ad8663c4f948f3ddc..327c04b40460fc033ca7f4e4f838608cfc6c0ba3 100644
+index cf6f792bb68df3a15a74a61921f50f790817b3ca..8a922b95064909d750b041e3e36ab6ebf0375284 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -311,6 +311,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -309,6 +309,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index c28bc5f4d285ab2db1b0501ad8663c4f948f3ddc..327c04b40460fc033ca7f4e4f838608c
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 0922aaf1a5f076ed4544b6870ac3674b023c428b..ff8ccf56eaafe36fe4de08a448789b13033e8604 100644
+index ba2d1beff9d4fe7b0eca90a274b8bd95a76446c1..3056ae4d9b6d1604b14f2626122a78a9f916d265 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -274,6 +274,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 0922aaf1a5f076ed4544b6870ac3674b023c428b..ff8ccf56eaafe36fe4de08a448789b13
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 59dd5662dccea2e570b93e7bbdc59fded301979c..30d7bafbf5877d71868fbdec9abbcacacd4b72a8 100644
+index 2d9517cb12b4debe28694f54bcaa0ad0af62a44a..09c9486bbbf789e9367fdbb3655f431f5a1ae199 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,7 +123,7 @@ index 59dd5662dccea2e570b93e7bbdc59fded301979c..30d7bafbf5877d71868fbdec9abbcaca
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 42f30c871534bf7037c13d71802443baa20eb850..552909b44f47d64a260b9cd39ea42dac41e31603 100644
+index 094de359d6831e656f0666732fb1c80f8f316fa7..65d2a6a279b2b4009b19494af54e194e8c9b626a 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
 @@ -356,6 +356,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
diff --git a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
index 70d6a9524d22f..f0f446b5350df 100644
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -8,12 +8,12 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
 
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index 153f169d2cdef6f8a726c188283a5bc1b7395fa3..3a5d9ab8dafacafb1025e1cb8c157e8a82078424 100644
+index 6405d91a2226e3b58fff4a4e73d2fc1c08f0954b..e12f0c4ec90e0e4f366bad292750676c0b446f2c 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
-@@ -212,6 +212,16 @@ void ScopedClipboardWriter::WriteData(const std::u16string& format,
-   }
+@@ -227,6 +227,16 @@ void ScopedClipboardWriter::WriteEncodedDataTransferEndpointForTesting(
  }
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 +void ScopedClipboardWriter::WriteUnsafeRawData(const std::u16string& format,
 +                                               mojo_base::BigBuffer data) {
@@ -29,10 +29,10 @@ index 153f169d2cdef6f8a726c188283a5bc1b7395fa3..3a5d9ab8dafacafb1025e1cb8c157e8a
    objects_.clear();
    platform_representations_.clear();
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-index 879acd4f6f0101a6da3af58d78eeda877ea41a4a..4d4149b6aa34c7073804994cb1c03368830c736d 100644
+index c47909313da0d7cd8a2b3cd670327011af66e3fb..0d259c21507f38124dfa46aceeacfda76cfd4a38 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.h
 +++ b/ui/base/clipboard/scoped_clipboard_writer.h
-@@ -80,6 +80,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
+@@ -84,6 +84,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
    // This is only used to write custom format data.
    void WriteData(const std::u16string& format, mojo_base::BigBuffer data);
  
@@ -42,4 +42,4 @@ index 879acd4f6f0101a6da3af58d78eeda877ea41a4a..4d4149b6aa34c7073804994cb1c03368
 +
    void WriteImage(const SkBitmap& bitmap);
  
-   // Mark the data to be written as confidential.
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 6c0d43aab7bce..b5923cea9b37a 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 2d918fcf473d6ce399dde0413da0b1d7444c32c0..29f53b668d6c8f50d901bf214d19ae08d765944d 100644
+index 5cf4fd6559dd7183ed74e44001d7e53ca9b055b1..ca6a293882fe2af1e2bf58b8353e1c5c9de827d1 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -633,6 +633,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -646,6 +646,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -48,7 +48,7 @@ index 787077d71c04d571aa825bec0a549c5fad2b8574..4b05b80802ba97a46eed60e509b503fc
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index 975757f5e878004180f155583712ad48de781ef6..3dad0b314f0d4e7f93e8b727f2ef875ce9d4762e 100644
+index 4e8d36420d6edc1725a840e1b9f123041d21abe4..dd198cb7bf02e509833c6b4c7d8e5d65d20d46dc 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
 @@ -152,6 +152,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
@@ -85,10 +85,10 @@ index 14d4a00293ab0b11e733676844ce483992d6cd8e..c6c2dbb9dddd1eaa21e8c7b276d871a3
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 6531f9b8d7720c8d3bb5f5df677cbac13a17454d..d4602eb32f1f14f639df26f866f5406ab36003d5 100644
+index 297ed65293723e8d539c65475d335947c840fec2..304dcdaa65ee1d9bed86f7c0e5956dd3a2a65585 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3662,6 +3662,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3679,6 +3679,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 6531f9b8d7720c8d3bb5f5df677cbac13a17454d..d4602eb32f1f14f639df26f866f5406a
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3673,7 +3680,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3690,7 +3697,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 6531f9b8d7720c8d3bb5f5df677cbac13a17454d..d4602eb32f1f14f639df26f866f5406a
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index cce6788b0a529ffb4d6330237c50c8f9a1b2093a..83c95f9867cbf52646a9b093706b05d8d99ce3b6 100644
+index 25f9a9fc617d75dfd26af582574ebcad3a16a8ef..7d8473a7915fd3312c3a4f582b3f1d87580e6e75 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index cce6788b0a529ffb4d6330237c50c8f9a1b2093a..83c95f9867cbf52646a9b093706b05d8
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -856,6 +857,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -855,6 +856,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 3a9f7941b6f61..9438dc2e0b9c7 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 6356025f24855b789b0fdb492ca61232bc6d8000..7eab027f4af2a10c77a8754f6faf06a67b2edce0 100644
+index 30e237f886b41bdf528b2a0e81054d15fb323f1f..43f7920cf6ff12d8a48ddef5440814a42266e8c5 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -144,6 +144,20 @@ WebPreferences::WebPreferences()
+@@ -145,6 +145,20 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -33,7 +33,7 @@ index 6356025f24855b789b0fdb492ca61232bc6d8000..7eab027f4af2a10c77a8754f6faf06a6
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 98391c17bc6c3371919966e9caf09efbcc94cec6..c2d3457f17a076e238dc851b5c61a9ed0efb3a19 100644
+index b9a65b0aa8771602f6659f5ffe79b6cdfd04f6e4..f1aab825f8aabc023f6405e6f4b5c843374d43a0 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -47,7 +47,7 @@ index 98391c17bc6c3371919966e9caf09efbcc94cec6..c2d3457f17a076e238dc851b5c61a9ed
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -156,6 +160,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -154,6 +158,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index 98391c17bc6c3371919966e9caf09efbcc94cec6..c2d3457f17a076e238dc851b5c61a9ed
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 9eefe05ffbd6f78a869e2a7449a8fa7c7d456dda..cc57fcbe8a1c51db906731c18a5ffe3bc711a755 100644
+index a8d4f1905dc3f48dbbde440e4ec50fe95744e365..4ec23ebc2b09b00c849eb762fa371a8cf2925869 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -103,7 +103,7 @@ index 9eefe05ffbd6f78a869e2a7449a8fa7c7d456dda..cc57fcbe8a1c51db906731c18a5ffe3b
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 5124059d0df902d3879f2c96d001472a10c2ead1..9ab4f31275dfebc98ef94ed496a23e8c28168c3a 100644
+index dc84e6f516492b72cf513c9786f17b472961dddb..72eb72cde86f0ef9c94123a104e8f30d12952391 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -176,7 +176,7 @@ index 5124059d0df902d3879f2c96d001472a10c2ead1..9ab4f31275dfebc98ef94ed496a23e8c
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 1f0ca7565e7df7bb535bb8c779929f6202273471..69c5932f498d2849847ddcc3605f45df3acc596d 100644
+index 067bb3bf74874f3106f4b68c3c3f13039439c526..8cd0710557eacb77f2bfd5a43074c983f956122c 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
index 8abcd5608600d..617c5e656d99e 100644
--- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
+++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
@@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index bbc1d4d057291cc4a3c65287309a22897179a47e..6318b1f2251670d5dd975fde695ee2438c456a0f 100644
+index f60ad777ab7698a4518d3b1b61ade29e7c618a3a..c7781bdb49f8a92aa9ee1d8dd1af03fa9cf2dfe3 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
 @@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
diff --git a/patches/chromium/blink_file_path.patch b/patches/chromium/blink_file_path.patch
index 3bae083f52892..319e320a9131b 100644
--- a/patches/chromium/blink_file_path.patch
+++ b/patches/chromium/blink_file_path.patch
@@ -7,7 +7,7 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index d70a95cc9b28674dd4ac925e9f1aca481e60c34b..fa9d21a20e77867a7d596e0df4ec143edb871f27 100644
+index e23ab93fdc031a022ae15d069017ebc2e6923e78..7e6d45d33fcc147d0b5b78cc2b254e1deb3cbf02 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
 @@ -191,6 +191,9 @@ class CORE_EXPORT File final : public Blob {
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 242f1e1274c1f..e6c093112d492 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 1b022bf6b37982e6321120951de5d8dcc10ecf6a..5cd7cf680244383e466106801103871b3bba8796 100644
+index 88bb66bd03b880f4e1e946a0fd1a31f512226db4..a100709c7b3bd0bcd5c9307e00f343aaf4c27620 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index 1b022bf6b37982e6321120951de5d8dcc10ecf6a..5cd7cf680244383e466106801103871b
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index fc47c47cc197a674d97e77e35a904d3bfb481891..bc1444a76d72f1f40966ddac21e689a4a5995125 100644
+index d02022a64426a47a568d438bd3d17ca63a3ac28f..f9817a21e00a66845138d321dd829ea1df39acb7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -533,10 +533,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -531,10 +531,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index fc47c47cc197a674d97e77e35a904d3bfb481891..bc1444a76d72f1f40966ddac21e689a4
    if (!Client())
      return false;
  
-@@ -582,6 +578,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -580,6 +576,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/boringssl_build_gn.patch b/patches/chromium/boringssl_build_gn.patch
index 309ff79d0a556..f4b23bcd39496 100644
--- a/patches/chromium/boringssl_build_gn.patch
+++ b/patches/chromium/boringssl_build_gn.patch
@@ -6,10 +6,10 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index 91ce539f2cdf3c17645126088ecb00e36befd1b8..8e1d78fdb56372836cea73e35cb4e03059cf5ec5 100644
+index e31d092151a68028e09bb73ddb896cf8df77355d..aee73fe9b9e0a6b061504db46bb91b7a4baf6a7a 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
-@@ -47,6 +47,20 @@ config("no_asm_config") {
+@@ -44,6 +44,20 @@ config("no_asm_config") {
  
  all_sources = crypto_sources + ssl_sources
  all_headers = crypto_headers + ssl_headers
diff --git a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
index d86fd3e45eca1..1222c47289414 100644
--- a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
+++ b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
@@ -10,7 +10,7 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index f55fd1c92770de6b8bce1fc46a047c79228d451e..5b308900ae8e9d49d711a1638e40c22d1d45af80 100644
+index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa6025207d80 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -718,8 +718,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
@@ -29,7 +29,7 @@ index f55fd1c92770de6b8bce1fc46a047c79228d451e..5b308900ae8e9d49d711a1638e40c22d
    info.distro = base::g_linux_distro;
    info.distro_length = my_strlen(base::g_linux_distro);
    info.upload = upload;
-@@ -2026,8 +2031,13 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2025,8 +2030,13 @@ void InitCrashReporter(const std::string& process_type) {
        process_type == kWebViewSingleProcessType ||
        process_type == kBrowserProcessType ||
  #endif
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index 96be2ad1e190d..848904efccaaf 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index f6f346bbc56d4a1f8693330b010fd4b3c2d28628..981eaef314d8ff0301e8d008927d02fc8a12ae54 100644
+index 5404ededf7722ae9d04e44d3413471b9d85085c0..a36554ff22e29df499ee9ce9b0d4c40835af48dd 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -77,6 +77,7 @@
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 176d5bc5a649f..f072110be0958 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,15 +11,15 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 33e8d4f5b27532d015d8cd4dbe7d2550916eb436..76945ae5d23af853d920810cbcb248c0daf2f544 100644
+index 71152d08a9e9ce2e112fd7a6c3134a547af5d978..fd11a574ed7b38d556bbdaed2fd649d55d6530f7 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -170,11 +170,16 @@ if (!is_android && !is_mac) {
+@@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
          "common/crash_keys.h",
        ]
  
 +      if (!is_electron_build) {
-+        deps += [
++        deps = [
 +          ":packed_resources_integrity",
 +        ]
 +      }
@@ -33,23 +33,23 @@ index 33e8d4f5b27532d015d8cd4dbe7d2550916eb436..76945ae5d23af853d920810cbcb248c0
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 8f418d78b7ac7a23d80f44e23d430febe641cf0a..dc378e799bad709709f339864fdf63e6d9a6cb69 100644
+index 5f0b1af64911966f9b24a2b5ef063e4473b81a8f..c186819512e21276e382edba2eca2c153da7403d 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4528,7 +4528,7 @@ static_library("browser") {
+@@ -4517,7 +4517,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
 -    if (!is_win) {
 +    if (!is_win && !is_electron_build) {
        deps += [ "//chrome:packed_resources_integrity" ]
+       sources += [ "certificate_viewer_stub.cc" ]
      }
- 
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 4d35024ba4a2f490f5749449c8772da60fb6eb46..de0d4c18362ba9c8e288e532b11f114f3b3f9532 100644
+index 89afb235bc478f19511579ca4c6b018505b372cd..1b5b9e33f5ad2b31617edd8a6ee65e73b31d3d20 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5531,7 +5531,6 @@ test("unit_tests") {
+@@ -5564,7 +5564,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 4d35024ba4a2f490f5749449c8772da60fb6eb46..de0d4c18362ba9c8e288e532b11f114f
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5554,6 +5553,10 @@ test("unit_tests") {
+@@ -5587,6 +5586,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 4d35024ba4a2f490f5749449c8772da60fb6eb46..de0d4c18362ba9c8e288e532b11f114f
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6245,7 +6248,6 @@ test("unit_tests") {
+@@ -6270,7 +6273,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 4d35024ba4a2f490f5749449c8772da60fb6eb46..de0d4c18362ba9c8e288e532b11f114f
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6286,6 +6288,11 @@ test("unit_tests") {
+@@ -6312,6 +6314,11 @@ test("unit_tests") {
        "//ui/native_theme:test_support",
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index e359d3ec35437..ebac034d783f8 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 38b4d4da5ea013118d8464d82fd84a551a36a80f..165d6b8eb5cb0ce949c71c1707687960c49a4ebb 100644
+index 9930040d9e6802d851c7216b314791bae5534bd7..365b6eb2efc2f09725a9a53b79e83a50bded1c75 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6602,6 +6602,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6640,6 +6640,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 38b4d4da5ea013118d8464d82fd84a551a36a80f..165d6b8eb5cb0ce949c71c1707687960
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c4351bea185f1a7d392ef3c1b95d66d35347e87a..131e74e1789632f59086b2bfb390654207f6d18f 100644
+index d89e1c2369d7218d62fd759c3877b1d502a8276e..f3e21a7cacb9d192bf3b6cf4d2bfc8d372cd8307 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3864,6 +3864,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3867,6 +3867,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index c4351bea185f1a7d392ef3c1b95d66d35347e87a..131e74e1789632f59086b2bfb3906542
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_id, session_storage_namespace);
  
-@@ -3906,12 +3914,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3909,12 +3917,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,7 +53,7 @@ index c4351bea185f1a7d392ef3c1b95d66d35347e87a..131e74e1789632f59086b2bfb3906542
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index afd57b6d28f8280d8b140370a36d9ca6ec17b774..da44b637ee5fdf371974f322aaf1a07ba8c018d7 100644
+index ace032dc2ffac27fbdddee5a4b13c3c3e36ba5ae..80f7dd56fdaa94a9880995b2b5393af0414eef29 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -550,6 +550,10 @@ struct CreateNewWindowParams {
@@ -68,10 +68,10 @@ index afd57b6d28f8280d8b140370a36d9ca6ec17b774..da44b637ee5fdf371974f322aaf1a07b
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index f26ff2199c9f72adfcea9df0db0dc9f0eb70a127..8bbca0ed64bdfc892b3f2e21f0f88fe14344459d 100644
+index 7c700a49d9a144fc1dd8c795d95c085e13aa470a..153c94d7d0fd4a11a15c74f7bbae065d7a0249a1 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -570,6 +570,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -573,6 +573,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,7 +81,7 @@ index f26ff2199c9f72adfcea9df0db0dc9f0eb70a127..8bbca0ed64bdfc892b3f2e21f0f88fe1
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index d50c7e0c618b8292e38b8f8b307d019701f70e49..253c47f41294155bab9a3b0884e65a09fcacd0d0 100644
+index 3aaacce3a8dc42f90bb4564987950a3be92e113e..17ce3078c995f581325b9dcffe6b1589b05f48bc 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -169,6 +169,7 @@ class NetworkService;
@@ -92,7 +92,7 @@ index d50c7e0c618b8292e38b8f8b307d019701f70e49..253c47f41294155bab9a3b0884e65a09
  }  // namespace network
  
  namespace sandbox {
-@@ -940,6 +941,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -944,6 +945,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index d50c7e0c618b8292e38b8f8b307d019701f70e49..253c47f41294155bab9a3b0884e65a09
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 2c87b891defb55771fd7686cb88971cd158c801f..a583c64b44b7add0b46ce25b4112563dd1b7e7b1 100644
+index aefe7344a605e5edded2b4c345c50ff22b6d8e34..5647a94ace369de0c7e0096c885865b7b5b04c61 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -27,6 +27,17 @@ namespace content {
@@ -124,7 +124,7 @@ index 2c87b891defb55771fd7686cb88971cd158c801f..a583c64b44b7add0b46ce25b4112563d
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index f04506bf8b64fef533d6cd9d2b609e5779c4382f..b0f14ef097c9178aa25bf04d19fff362fabfcf11 100644
+index 58e977220a5d98c68a20cbf22ad7ce3da39a38a1..5092190243d3eb95a4180cb44937e3d25c4a3ad9 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -135,7 +135,7 @@ index f04506bf8b64fef533d6cd9d2b609e5779c4382f..b0f14ef097c9178aa25bf04d19fff362
  #include "content/public/browser/eye_dropper.h"
  #include "content/public/browser/invalidate_type.h"
  #include "content/public/browser/media_stream_request.h"
-@@ -344,6 +345,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -343,6 +344,13 @@ class CONTENT_EXPORT WebContentsDelegate {
        const StoragePartitionId& partition_id,
        SessionStorageNamespace* session_storage_namespace);
  
@@ -150,10 +150,10 @@ index f04506bf8b64fef533d6cd9d2b609e5779c4382f..b0f14ef097c9178aa25bf04d19fff362
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 9eb0bc6d5460f640dc95cc170c9808b8e3f5fb16..190b517cea51bd3eae29695ba45efb22c4c82877 100644
+index 7809d32d777a2c7249b77e68468bc19625716662..7eec2fea69298d92e694471862b4427b69e9687f 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -31,6 +31,7 @@
+@@ -32,6 +32,7 @@
  #include "third_party/blink/public/platform/impression_conversions.h"
  #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
  #include "third_party/blink/public/platform/url_conversion.h"
@@ -161,7 +161,7 @@ index 9eb0bc6d5460f640dc95cc170c9808b8e3f5fb16..190b517cea51bd3eae29695ba45efb22
  #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
  #include "third_party/blink/public/web/web_frame_widget.h"
  #include "third_party/blink/public/web/web_local_frame.h"
-@@ -290,6 +291,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -291,6 +292,10 @@ WebView* RenderViewImpl::CreateView(
      params->impression = blink::ConvertWebImpressionToImpression(*impression);
    }
  
@@ -173,10 +173,10 @@ index 9eb0bc6d5460f640dc95cc170c9808b8e3f5fb16..190b517cea51bd3eae29695ba45efb22
        /*is_opener_navigation=*/false, request.HasUserGesture(),
        // `openee_can_access_opener_origin` only matters for opener navigations,
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 99d4577526d64e4a73591be4b5bb4d67826abb1a..213db9dc65d10d70b6e02ee3b9b95d38bd951ba3 100644
+index f565d0615c8cdb182d28d0add11fca6ebb49098b..8ac72d8d2efe413561e4e53722d4d0d15833cfdf 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -439,6 +439,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -186,7 +186,7 @@ index 99d4577526d64e4a73591be4b5bb4d67826abb1a..213db9dc65d10d70b6e02ee3b9b95d38
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index 76254db8ed262aa105eb9782c533fe6b25324828..3e757eb86ab685901dedde45f21b818438ec4827 100644
+index 953433b5cc0ca7633b5866d5ae0f9c3a5e6a6e3c..30a43c943e6ccdd9dbf809186d7d13d4d6f6f12e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
 @@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -220,7 +220,7 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 324322b9c1096cfd201ac33b279dcbd5a1d56e5d..e1ad20b728028c0ec9de4290afdef17e61df2c85 100644
+index fa6b705d267ac00fe86705d1f9d8e66730ba4ee4..9d541381c349132c6d4b44a5bee298252c2b8858 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
 @@ -2070,6 +2070,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index aecb5a5114f97..0e4566eed9f0d 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,7 +9,7 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 656c09327f0b88a6bdcd2753018fc12d5e931cb8..f787e4e35ea86c68dbf1423a376c75857d3b5b2a 100644
+index feae0aea593ef1945c1063b7d487892530f7ceed..beb0a9e85a0f5e102466952c220aafac2d6ebb39 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -457,8 +457,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index ae811011c4ef2..5fddd44da4723 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index da521ddb3d244d264f11f42a86dce97ba84fac55..8f12ce6257f72786c96428fbbd6040fdf0b87025 100644
+index a7a64effed043a75371e5dde0837ce7fbfa631ad..8f190e6d33497f52b536aef82505025b74602337 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1762,12 +1762,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1760,12 +1760,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,7 +127,7 @@ index da521ddb3d244d264f11f42a86dce97ba84fac55..8f12ce6257f72786c96428fbbd6040fd
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 10e4e2021cb39f2384f81d7ed8783e85286fa37b..4e98b6a5b51d41631b2f0a4601359b396e9c58b2 100644
+index 1cda4516162907a047b67edbc2d020e36cceb8f0..2d222d43c0c55d976eceb189a2d955793a6824ce 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
 @@ -810,8 +810,7 @@ class Browser : public TabStripModelObserver,
@@ -183,7 +183,7 @@ index 2c560d379ee6c08465455ea1dc2c5a59ddb65487..4fd703722db5d679b08acdb8fc080b08
    }
    content::WebContents* CreateCustomWebContents(
 diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.cc b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
-index 1aec422b4c83b823c92d76847366fe0d4d04cd00..ea8354f49b14631cf8671decc1ee96beb18d9561 100644
+index 1911b0558fad1d5834befa98e57a978e6e0b72da..cb85515f79617a32e2809ad6eb7f55e4ecc36b3f 100644
 --- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
 +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
 @@ -170,14 +170,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
@@ -218,10 +218,10 @@ index 2930898b03d7b7ef86d13733cec3cbe84105c166..76625339f42a867c8b68840253e91648
    void SetContentsBounds(content::WebContents* source,
                           const gfx::Rect& bounds) override;
 diff --git a/components/offline_pages/content/background_loader/background_loader_contents.cc b/components/offline_pages/content/background_loader/background_loader_contents.cc
-index 53fad64f87a952fd0d7398958288ecde259b57bf..26f64dabcbee575034e97ada29c7de48b315080f 100644
+index 2834e3ee5778185741779a473cf5157788a76cc5..64fcddc952065e574a84edd99e5b1b80febd3d26 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
-@@ -80,8 +80,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
+@@ -81,8 +81,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -232,7 +232,7 @@ index 53fad64f87a952fd0d7398958288ecde259b57bf..26f64dabcbee575034e97ada29c7de48
    return true;
  }
 diff --git a/components/offline_pages/content/background_loader/background_loader_contents.h b/components/offline_pages/content/background_loader/background_loader_contents.h
-index c1926fc79e9982739d17f4b971f5e7296afd0cf8..31f036c9d224f7e03d7fe38861db45b8d11a07b8 100644
+index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b76d09c4e8 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.h
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.h
 @@ -66,8 +66,7 @@ class BackgroundLoaderContents : public content::WebContentsDelegate {
@@ -246,10 +246,10 @@ index c1926fc79e9982739d17f4b971f5e7296afd0cf8..31f036c9d224f7e03d7fe38861db45b8
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3bc6a0207a5273e7a7b64ab59d4e3499482e4bd8..676c77b2ac7be7445d92db3fcfc94b5ec4915696 100644
+index 2e91c4f052501e4067cf8fee21f2f3c2674f1c1a..74e6928041145fd6f37ec4ce7acc6be0649b944d 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3812,8 +3812,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3815,8 +3815,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index 3bc6a0207a5273e7a7b64ab59d4e3499482e4bd8..676c77b2ac7be7445d92db3fcfc94b5e
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index a583c64b44b7add0b46ce25b4112563dd1b7e7b1..2af9f098d59e3b93949a33dae5a8e4b70f15937c 100644
+index 5647a94ace369de0c7e0096c885865b7b5b04c61..bf3e958a5f883c2408846f4954e58a30c76bee26 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -135,8 +135,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -274,10 +274,10 @@ index a583c64b44b7add0b46ce25b4112563dd1b7e7b1..2af9f098d59e3b93949a33dae5a8e4b7
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index b0f14ef097c9178aa25bf04d19fff362fabfcf11..590d52000e30c00a06e192d9fd1faafd4173595f 100644
+index 5092190243d3eb95a4180cb44937e3d25c4a3ad9..23a11de7c25b81e72c81db20caaa799191b70e45 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
-@@ -323,8 +323,7 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -322,8 +322,7 @@ class CONTENT_EXPORT WebContentsDelegate {
        SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -288,7 +288,7 @@ index b0f14ef097c9178aa25bf04d19fff362fabfcf11..590d52000e30c00a06e192d9fd1faafd
    // Allow delegate to creates a custom WebContents when
    // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index c5f63fc8512bfe0374121950804a4b815bcea44f..fac8e32dc27b248f9e06f3be151e73da51d04a63 100644
+index b1c4872e8139e4e6c7c38f94e6e1619ef1730bce..314a418c8d0ff43f115744a0229511dd409b48d6 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 @@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@@ -316,7 +316,7 @@ index 0d6ab312e2bdfac8f1d75ecb5df990d3d158b288..edcdae5183d5a2bcca31b440870f40ed
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index ded1894a7d1d7cc7929af3435978a0eb4a1ac781..3312dc397c96f9c5edc40feb8760ac08aac6dc45 100644
+index 2a8095bb93264360d2cdb0a54ff3330671905852..8a2745c318f865564368d5d3d90af61b5c20fb00 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -388,8 +388,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -330,7 +330,7 @@ index ded1894a7d1d7cc7929af3435978a0eb4a1ac781..3312dc397c96f9c5edc40feb8760ac08
  }
  
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index 4c0820c60e7654657bdb46efbbf072d8bfe149d0..c1c0e744a81c0dee8a3fd3e12d56d7f1bd5e7f1c 100644
+index 1b388778aac1420769de8c411489e026abbc75a4..b21d262c7014097e35ee83289fab400ab9d3bdc5 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 @@ -171,8 +171,7 @@ class MimeHandlerViewGuest
@@ -344,10 +344,10 @@ index 4c0820c60e7654657bdb46efbbf072d8bfe149d0..c1c0e744a81c0dee8a3fd3e12d56d7f1
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index 7d9e445c8b2c727787854aa6e296f2e3784942fb..c82b0b86ab93aceb0d8c0bd5562e72d823166010 100644
+index c0fc74673903a0c54164bddb5be0c96f3f7b73a4..2466675e80708aa0ba27e0431cbfb2a277abde32 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -401,8 +401,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -403,8 +403,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -358,10 +358,10 @@ index 7d9e445c8b2c727787854aa6e296f2e3784942fb..c82b0b86ab93aceb0d8c0bd5562e72d8
    // can catch bad client behavior while not interfering with normal operation.
    constexpr size_t kMaxPendingWebContentsCount = 10;
 diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index 38b5f8871464fc59c26e619dc2cdcc00711e2ce5..1ba0ac9d291a06f8a23e814742c38fdf382a05ec 100644
+index ea50835c2f8631851659db6abb3ba779a5fcb6e0..14207edb850689c126b2d09eff8d8feb1246ebb7 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
-@@ -290,8 +290,7 @@ class FrameImpl : public fuchsia::web::Frame,
+@@ -292,8 +292,7 @@ class FrameImpl : public fuchsia::web::Frame,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -372,7 +372,7 @@ index 38b5f8871464fc59c26e619dc2cdcc00711e2ce5..1ba0ac9d291a06f8a23e814742c38fdf
                            int opener_render_process_id,
                            int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 6fa4fa667839531f3ca6ca80f8bf17e135739688..bf56fbe1b7aee1a41a18d1cd98641034ba97a903 100644
+index 4cb2c255877182406158258c0fb3e88e50f612c7..0f314be5d9d88b60b925a1e25db30408f0b26dff 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
 @@ -177,8 +177,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
index c72ca8a8d03e9..15ec447216524 100644
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 3210670738694953fdd65b1d0c2ca30d7c29d8c9..8f418d78b7ac7a23d80f44e23d430febe641cf0a 100644
+index f338d61091545f4319b6d5318d10eed5c9b02af3..5f0b1af64911966f9b24a2b5ef063e4473b81a8f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7016,6 +7016,7 @@ static_library("browser") {
+@@ -7038,6 +7038,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",
@@ -19,11 +19,11 @@ index 3210670738694953fdd65b1d0c2ca30d7c29d8c9..8f418d78b7ac7a23d80f44e23d430feb
  
      if (!is_android) {
 diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 2b7aa1add57dccbcbf8202cead5b7d2d5a174270..2ba03fc045f2e4bb12f173aacb6581ccb20bfc5a 100644
+index 7c3b6a69acb16186add5d467dbc22360d90d46d4..703e2ce60f4f35f9c71e8b503ffd62f9ea8f365a 100644
 --- a/chrome/browser/spellchecker/spellcheck_factory.cc
 +++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -6,7 +6,7 @@
- 
+@@ -7,7 +7,7 @@
+ #include "build/build_config.h"
  #include "chrome/browser/profiles/incognito_helpers.h"
  #include "chrome/browser/spellchecker/spellcheck_service.h"
 -#include "chrome/grit/locale_settings.h"
@@ -32,7 +32,7 @@ index 2b7aa1add57dccbcbf8202cead5b7d2d5a174270..2ba03fc045f2e4bb12f173aacb6581cc
  #include "components/pref_registry/pref_registry_syncable.h"
  #include "components/prefs/pref_service.h"
 diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
-index 777634b4f93467051ea9e9e9fe448204a9c28cf1..11454e9e7cd06717033631cc4627c3d061301863 100644
+index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0dfaad727 100644
 --- a/components/language/core/browser/BUILD.gn
 +++ b/components/language/core/browser/BUILD.gn
 @@ -30,6 +30,7 @@ static_library("browser") {
@@ -44,7 +44,7 @@ index 777634b4f93467051ea9e9e9fe448204a9c28cf1..11454e9e7cd06717033631cc4627c3d0
    ]
  }
 diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 0c34853eba1243519f10bfd5e4dfa5d479a97bcc..99632534a06c11b9e8cb000151fb28e64a5ca0c7 100644
+index 491315f1fd94332a1895c2286618cb0e8ed1544b..303d29d577a87ea07005fb87f562eef79b36cd8f 100644
 --- a/components/language/core/browser/language_prefs.cc
 +++ b/components/language/core/browser/language_prefs.cc
 @@ -22,7 +22,7 @@
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index d237b2206d49d..bc53b898840d5 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 2bead927915b87261c7c4f953e73a887751ec81a..bff0fce048ea59696fec56eec40e8cd3682e821f 100644
+index 27474164dafdff0f79820e748c776b6a4372387c..ed21a9c1854a443947a1b3965c5fc2910b9d3fb6 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
@@ -20,7 +20,7 @@ index 2bead927915b87261c7c4f953e73a887751ec81a..bff0fce048ea59696fec56eec40e8cd3
  #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
  #include "components/cdm/renderer/widevine_key_system_properties.h"
  #include "content/public/renderer/render_thread.h"
-@@ -200,12 +202,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -206,12 +208,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
  
  // Returns persistent-license session support.
  EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch
index 6006b5064d291..0e8697f5c67d6 100644
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -87,7 +87,7 @@ index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add7
    // Create an observer that registers a hot key for |accelerator|.
    std::unique_ptr<gfx::SingletonHwndHotKeyObserver> observer =
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index 4145418210c2b1033390ec8a2e657cb1fcd048f8..5938f75742b793868638e693a9a8c8dc686dfc46 100644
+index 3cad85ec824d81ef43796a5c7e4f013dcfd5bf0a..d352b23f4a42b10e77a61de71069083f20f99136 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
 @@ -290,6 +290,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
diff --git a/patches/chromium/crash_allow_disabling_compression_on_linux.patch b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
index 39cd097c8cafb..6f4a3b926bbc6 100644
--- a/patches/chromium/crash_allow_disabling_compression_on_linux.patch
+++ b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
@@ -13,7 +13,7 @@ Ultimately we should remove the option to disable compression, and
 subsequently remove this patch.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 5b308900ae8e9d49d711a1638e40c22d1d45af80..87e222070ce5bbd2f9f5c8bac6db7367b6161931 100644
+index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb880264464787eb32 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -110,6 +110,8 @@ void SetUploadURL(const std::string& url) {
@@ -25,7 +25,7 @@ index 5b308900ae8e9d49d711a1638e40c22d1d45af80..87e222070ce5bbd2f9f5c8bac6db7367
  #endif
  
  bool g_is_node = false;
-@@ -1323,56 +1325,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1322,56 +1324,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
  
  #else   // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -127,7 +127,7 @@ index 5b308900ae8e9d49d711a1638e40c22d1d45af80..87e222070ce5bbd2f9f5c8bac6db7367
    static const char header_msg[] =
        "--header=Content-Type: multipart/form-data; boundary=";
    const size_t header_content_type_size =
-@@ -1399,7 +1405,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1398,7 +1404,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
    static const char kWgetBinary[] = "/usr/bin/wget";
    const char* args[] = {
        kWgetBinary,
@@ -137,7 +137,7 @@ index 5b308900ae8e9d49d711a1638e40c22d1d45af80..87e222070ce5bbd2f9f5c8bac6db7367
        header_content_type,
        post_file,
        g_upload_url,
-@@ -2040,6 +2047,7 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2039,6 +2046,7 @@ void InitCrashReporter(const std::string& process_type) {
  
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
    SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index 3ddffd4177ab7..c16edea8ac147 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -9,7 +9,7 @@ rate-limiting, compression and global annotations.
 This should be upstreamed.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index ec5b5b9b4da3b19e851c414695b2150b6588ecc7..f55fd1c92770de6b8bce1fc46a047c79228d451e 100644
+index 823e49a234e3dd31bf6527c2e4efa96f3d23f1f2..43f6d476f3ee2759cf41c492f932522994e7ddec 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -112,6 +112,7 @@ void SetUploadURL(const std::string& url) {
@@ -21,10 +21,10 @@ index ec5b5b9b4da3b19e851c414695b2150b6588ecc7..f55fd1c92770de6b8bce1fc46a047c79
  uint64_t g_process_start_time = 0;
  pid_t g_pid = 0;
 diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
-index 89b4bfccd5d3278231726184547378805fb30ed5..9f0cb9d52e2f7fc0c1808500b775bc28b4514d00 100644
+index 82b7f241e26184240260d0b6287ded159681e15b..abbb267f6a40de0cdf4d09700f9dd444a575fbdf 100644
 --- a/components/crash/core/app/crash_reporter_client.cc
 +++ b/components/crash/core/app/crash_reporter_client.cc
-@@ -139,6 +139,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
+@@ -141,6 +141,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
    return false;
  }
  
@@ -39,11 +39,11 @@ index 89b4bfccd5d3278231726184547378805fb30ed5..9f0cb9d52e2f7fc0c1808500b775bc28
 +void CrashReporterClient::GetProcessSimpleAnnotations(std::map<std::string, std::string>* annotations) {
 +}
 +
- #if defined(OS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID)
  unsigned int CrashReporterClient::GetCrashDumpPercentage() {
    return 100;
 diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
-index 39557cce474439238255ecd28030215085db0c81..5b3f980837911c710686ab91a2a81c318334080b 100644
+index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4353e2487 100644
 --- a/components/crash/core/app/crash_reporter_client.h
 +++ b/components/crash/core/app/crash_reporter_client.h
 @@ -5,6 +5,7 @@
@@ -54,7 +54,7 @@ index 39557cce474439238255ecd28030215085db0c81..5b3f980837911c710686ab91a2a81c31
  #include <string>
  
  #include "build/build_config.h"
-@@ -144,6 +145,19 @@ class CrashReporterClient {
+@@ -146,6 +147,19 @@ class CrashReporterClient {
    // that case, |breakpad_enabled| is set to the value enforced by policies.
    virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled);
  
@@ -71,14 +71,14 @@ index 39557cce474439238255ecd28030215085db0c81..5b3f980837911c710686ab91a2a81c31
 +  virtual void GetProcessSimpleAnnotations(
 +      std::map<std::string, std::string>* annotations);
 +
- #if defined(OS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID)
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index 212bc8359f454132b3cab81449075c1f18d5bd5b..771197daea11b2b7a9f9e845d3fd886913f1539b 100644
+index dc2b18b322350121768571b7997d632a10220ac9..3e3ee0f721a2316d324fb31e17ba97ff24d9e6d7 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
-@@ -179,6 +179,7 @@ bool PlatformCrashpadInitialization(
+@@ -180,6 +180,7 @@ bool PlatformCrashpadInitialization(
      // where crash_reporter provides it's own values for lsb-release.
      annotations["lsb-release"] = base::GetLinuxDistro();
  #endif
@@ -86,7 +86,7 @@ index 212bc8359f454132b3cab81449075c1f18d5bd5b..771197daea11b2b7a9f9e845d3fd8869
  
      std::vector<std::string> arguments;
      if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
-@@ -200,6 +201,13 @@ bool PlatformCrashpadInitialization(
+@@ -201,6 +202,13 @@ bool PlatformCrashpadInitialization(
      }
  #endif
  
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 718ddfd6c8839..335184a63282a 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,17 +17,18 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index cb6b39ee5cf75fec6cf015072eb1f5be08dcf7c4..269cde5100ff1380a9429e7aad1018b50cc01957 100644
+index 8a68c53e35dafce5fced1ad2c7ff5dad83ffbf3c..ee615d3eb03232b34f5acbb58490c7de9ad08cfd 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -432,7 +432,7 @@ void MobileFriendlinessChecker::ComputeSmallTextRatio(
+@@ -495,8 +495,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                 ->GetPageScaleConstraintsSet()
                                 .FinalConstraints()
                                 .initial_scale;
 -    DCHECK_GT(initial_scale, 0);
+-
 +    // DCHECK_GT(initial_scale, 0);
      double actual_font_size =
-         style.FontSize() * initial_scale / viewport_scalar_;
+         style.FontSize() * initial_scale / viewport_scalar;
      double area = text->PhysicalAreaSize();
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
 index fe8d191217e24b08d36339dbf047beaeb6bd6538..870db0552544e3e89d9498c22ec3db81b46df741 100644
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index 636f3f8bff8be..a900bf03618c0 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,7 +82,7 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 04dbc1f44944abd3333e83b603dcdf755c0cb09d..d3a722f60c67d6177c3ca0bfc1329b87acf0b622 100644
+index 91da584747d5afc3f07e51ae77b002d91c4ff7ac..bbf37f733a6e1831017f171edf162ab8aac3f0a4 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
 @@ -17,7 +17,7 @@
@@ -97,7 +97,7 @@ index 04dbc1f44944abd3333e83b603dcdf755c0cb09d..d3a722f60c67d6177c3ca0bfc1329b87
 @@ -95,8 +95,9 @@ gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
  }
  
- #if defined(OS_MAC)
+ #if BUILDFLAG(IS_MAC)
 +// Refs https://github.com/electron/electron/pull/30507
  const base::Feature kWindowCaptureMacV2{"WindowCaptureMacV2",
 -                                        base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index cc5ba533a25f2..8d5fab8db9350 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 387b5a7fd9c1971686ee577c5ec8ef9abdb00f74..0b714bac63853fb67f1b5b953c71f7120a266ca9 100644
+index 302915bac66a484f495c97e2602406a50b058014..7b46b19458ab03037fd02ac9a7f21a7b321843f1 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index 387b5a7fd9c1971686ee577c5ec8ef9abdb00f74..0b714bac63853fb67f1b5b953c71f712
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -978,6 +983,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -979,6 +984,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
@@ -49,7 +49,7 @@ index 387b5a7fd9c1971686ee577c5ec8ef9abdb00f74..0b714bac63853fb67f1b5b953c71f712
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 06b1e3552bb144dea11a100039e354c82657dc79..f6691252bd593e83fdda4fac73498df9d1cf3af6 100644
+index f4efdc7174b90e57fb332f031530545e493a2e0d..9d45f97b930831a703efab2bbdf10afb61140c7f 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -205,6 +205,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index e7c735f81408d..49d1fef1cdd0c 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index c13c06406ec4abd012082c5bfef02f2692a9bba1..0e82b376f740fcd51a608e4f99fcd7a016eefe5f 100644
+index 2c6e923952c7d8c1e411e3dedb149712a0e64025..0034d9998133920a2cd074b1f5562b58976d6d49 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1893,6 +1893,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1891,6 +1891,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  
  gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace(
      gfx::ContentColorUsage content_color_usage) const {
@@ -48,7 +48,7 @@ index 86180d4f001a7f849553a4bd5401d69fe4f1bec2..953b1f4f24e55e127af5fcb5fb3c4e1e
    // Image Decode Service and raster tiles without images until the decode is
    // ready.
 diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
-index e58b4023652785fa8ea47236a5ad7237c7ea6ed2..4ec673ea93410ee00b1af4330fdc8b5267ed6dfa 100644
+index d8e2bd1e55a52e86dda5c1b69c425b49e16538bd..80e2c77066f24e99a1894faadbf1d030a188ffa9 100644
 --- a/components/viz/common/display/renderer_settings.h
 +++ b/components/viz/common/display/renderer_settings.h
 @@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -60,7 +60,7 @@ index e58b4023652785fa8ea47236a5ad7237c7ea6ed2..4ec673ea93410ee00b1af4330fdc8b52
    bool force_antialiasing = false;
    bool force_blending_with_shaders = false;
 diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
-index d79f3beb58085672e0a67825a0b60de2a3aeb499..5f7ca2ea0d012be5518dd07ade8cf2820b4fd7a9 100644
+index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47da860679 100644
 --- a/components/viz/host/renderer_settings_creation.cc
 +++ b/components/viz/host/renderer_settings_creation.cc
 @@ -17,6 +17,7 @@
@@ -69,9 +69,9 @@ index d79f3beb58085672e0a67825a0b60de2a3aeb499..5f7ca2ea0d012be5518dd07ade8cf282
  #include "ui/base/ui_base_switches.h"
 +#include "ui/gfx/switches.h"
  
- #if defined(OS_APPLE)
- #include "ui/base/cocoa/remote_layer_api.h"
-@@ -53,6 +54,8 @@ bool GetSwitchValueAsInt(const base::CommandLine* command_line,
+ #if defined(USE_OZONE)
+ #include "ui/ozone/public/ozone_platform.h"
+@@ -49,6 +50,8 @@ bool GetSwitchValueAsInt(const base::CommandLine* command_line,
  RendererSettings CreateRendererSettings() {
    RendererSettings renderer_settings;
    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -81,7 +81,7 @@ index d79f3beb58085672e0a67825a0b60de2a3aeb499..5f7ca2ea0d012be5518dd07ade8cf282
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b30436703aab 100644
+index 963154eeda506350b71e3243ef172061efc8d4fb..daaea93f536759b67b4fffbca7c26479ceb04fcd 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -87,6 +87,9 @@
@@ -163,7 +163,7 @@ index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b304
 +  gfx::ColorSpace dst_color_space =
 +      PATCH_CS(CurrentRenderPassColorSpace());
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
    // Force sRGB output on Windows for overlay candidate video quads to match
 @@ -2768,7 +2777,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
  
@@ -186,7 +186,7 @@ index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b304
                  /*adjust_src_white_level=*/draw_cache_.is_video_frame,
                  locked_quad.hdr_metadata());
  
-@@ -3693,7 +3703,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
+@@ -3697,7 +3707,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
                                 const gfx::ColorSpace& dst_color_space,
                                 bool adjust_src_white_level,
                                 absl::optional<gfx::HDRMetadata> hdr_metadata) {
@@ -197,7 +197,7 @@ index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b304
    gfx::ColorSpace adjusted_src_color_space = src_color_space;
    if (adjust_src_white_level && src_color_space.IsHDR()) {
      // TODO(b/183236148): consider using the destination's HDR static metadata
-@@ -4076,9 +4088,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -4085,9 +4097,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
          cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
    }
  
@@ -210,7 +210,7 @@ index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b304
    *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                             gfx::SizeF((*overlay_texture)->texture.size()));
  
-@@ -4298,8 +4310,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -4307,8 +4319,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
  
    PrepareGeometry(SHARED_BINDING);
  
@@ -222,17 +222,17 @@ index e768356b9b7ebead39aedfcaf5aeba001bd667be..06de4adb9edaad6c65bc90114f89b304
  
    gfx::Transform render_matrix;
    render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -4488,3 +4501,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
- GLRenderer::OverlayTexture::~OverlayTexture() = default;
+@@ -4514,3 +4527,5 @@ bool GLRenderer::ColorTransformKey::operator<(
+ }
  
  }  // namespace viz
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index ec1ba57d8b0fc42c3c1dc85542f70c595e1eb464..c88cdac173ec22ea5df27a166f9e87ebe0100be4 100644
+index 926ea905b775c0706fd1b882f37b88b646b8b154..691eb2c5f7a26ea2b213b6378ab600b6b047531d 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -229,6 +229,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
  
  // Command-line switches to propagate to the GPU process.
  static const char* const kSwitchNames[] = {
@@ -241,10 +241,10 @@ index ec1ba57d8b0fc42c3c1dc85542f70c595e1eb464..c88cdac173ec22ea5df27a166f9e87eb
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index e044bc3739ad21c3d9704ddfa56116fae944e57a..8dfdd81a04c77e3c2ffc4317a859a689ca8ed66e 100644
+index 30a0c9216a206042a9769bdeda015eaf00e3cc49..e94e895aa31ab98e28137e793a8f298ed3146f5a 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -192,6 +192,7 @@
+@@ -193,6 +193,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
  #include "ui/display/display_switches.h"
@@ -252,7 +252,7 @@ index e044bc3739ad21c3d9704ddfa56116fae944e57a..8dfdd81a04c77e3c2ffc4317a859a689
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3288,6 +3289,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3281,6 +3282,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -261,7 +261,7 @@ index e044bc3739ad21c3d9704ddfa56116fae944e57a..8dfdd81a04c77e3c2ffc4317a859a689
      sandbox::policy::switches::kDisableSeccompFilterSandbox,
      sandbox::policy::switches::kNoSandbox,
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index f4d66861abb000e98fa613ec0bdd7096f891b6da..972efa2b1462d91ec7f6f28da0296138ef2c9656 100644
+index 6260d73068636f4a8d4c73c161a4ffe165b267d0..2686ef0dfb7d8b667647d11fece5aa8e1be76fe5 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 @@ -4,6 +4,7 @@
@@ -280,7 +280,7 @@ index f4d66861abb000e98fa613ec0bdd7096f891b6da..972efa2b1462d91ec7f6f28da0296138
  
  namespace blink {
  
-@@ -129,6 +131,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
+@@ -118,6 +120,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
  }
  
  gfx::ColorSpace CanvasColorParams::GetStorageGfxColorSpace() const {
@@ -293,7 +293,7 @@ index f4d66861abb000e98fa613ec0bdd7096f891b6da..972efa2b1462d91ec7f6f28da0296138
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index d8976665cc201e379b0a9ecd8d953eb63e10b74b..461e26d275886f3690255ab17f374aaeda7dd017 100644
+index 2f4fbbdd8059b2915b4848f95db925f1dbb1fb08..3fc675e4e56b3e658d70475800a938a7ce283567 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
@@ -315,7 +315,7 @@ index d8976665cc201e379b0a9ecd8d953eb63e10b74b..461e26d275886f3690255ab17f374aae
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index 7f5b6cc73cde4312720f4a6f54cb54ceb8709e15..1b76e0388d972b40619082f57019478754060068 100644
+index 298321f1aabcf4328fd39b856694a8a6459bfa24..4be245d082cd9d833db72b29e3d652120ecb913e 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
 @@ -21,6 +21,7 @@
@@ -358,7 +358,7 @@ index 7f5b6cc73cde4312720f4a6f54cb54ceb8709e15..1b76e0388d972b40619082f570194787
    if (__builtin_available(macos 10.12, *)) {
      IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
 diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
-index bea10b469ead89de3a090bb6119c9a68e49db5d6..332f0f7b08605179d9359ef603e70d7fd8426303 100644
+index be932ac3094a441cd5d9afa2ffd2c6d4a64ce559..a6aa9b4c6ba958eb81276911368cd053b9fb59f8 100644
 --- a/ui/gfx/switches.cc
 +++ b/ui/gfx/switches.cc
 @@ -11,6 +11,8 @@ namespace switches {
@@ -371,7 +371,7 @@ index bea10b469ead89de3a090bb6119c9a68e49db5d6..332f0f7b08605179d9359ef603e70d7f
  // sharpness, kerning, hinting and layout.
  const char kDisableFontSubpixelPositioning[] =
 diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h
-index 2b97abc9a0357972eff127761aa4a3cff5f34dbb..62be43283095895871221b4175ae26a5af73ec74 100644
+index 442809de1631081efbe062922539318f5172a5ae..b8e5c7e53d58a06175105c9396a7d976bda7a4bd 100644
 --- a/ui/gfx/switches.h
 +++ b/ui/gfx/switches.h
 @@ -12,6 +12,7 @@
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index d868e255965a8..3f08e39d4e1bb 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 7bdca5042ada597afe4228bab16489665eb29e24..da7feca7a5efa8fa3c3b1af9d4487ae3127fefb6 100644
+index 2c5f09db5e86855c33a79fb8c9f0a6ed770634e6..1c59ce6de1ce68b24e0372826cc67a891b4c2384 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -510,7 +510,11 @@
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index b4409d34b75f2..02ee885d5cbd6 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 367c17952131a789a834eb62000c7ebcc2b3249c..b0820c4411952ee0adf3dd4cbc6abb26c0368373 100644
+index 7436238cd110ef8c414e8be3d8ff07511b6223f4..4b0b2b0dc0900627aee38de021ec10cbdc9b3cb4 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -803,6 +803,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,10 +20,10 @@ index 367c17952131a789a834eb62000c7ebcc2b3249c..b0820c4411952ee0adf3dd4cbc6abb26
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index da4223e064f945fb7c19742ab01249c5a18238fc..4a88b0197b96c3b4fde090ae63dccb5831fbe10a 100644
+index 785cf70788ddb65712c45bc32281141e8a623b13..831a85653eb89b79ccc638400be6cfe10369b14b 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -875,6 +875,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -874,6 +874,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
    void OnLocalSurfaceIdChanged(
        const cc::RenderFrameMetadata& metadata) override;
  
@@ -34,10 +34,10 @@ index da4223e064f945fb7c19742ab01249c5a18238fc..4a88b0197b96c3b4fde090ae63dccb58
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index d295a11bbb3436fdbbbd85eaeacba941da71be60..bcb84ec6d5cf755f9360ae8bf9fa60dd38790219 100644
+index 20d613c480ce54f99e04dd49fe27af10056beee4..4a421fc2c244cf56d329ff66d0e9e17b0f0a5987 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -627,7 +627,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -595,7 +595,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index 30a56ad131425..cc1a3911ab8ab 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index 1462a2248b25aa5ba538e090dd52173ad0670c56..bbceb3be9442077c54cc8a3989e7c745ccfb3474 100644
+index a460f4643881a0bd70a863884aa50ae76e25c3b7..0635d66dad36e2d6042dd317962527793f5b96f7 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1158,6 +1158,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1159,6 +1159,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index 1462a2248b25aa5ba538e090dd52173ad0670c56..bbceb3be9442077c54cc8a3989e7c745
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1204,6 +1205,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1205,6 +1206,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 2dc41907bd58b..f58b76cc978b2 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -6,10 +6,10 @@ Subject: Don't run PCScan functions if PCScan is disabled
 PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
 
 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
-index cc4c5bad93175e309c21bc39e95e7473a22d1a7f..446fca9ebdf6f87a697905d0114a88f5f7c5214a 100644
+index 63819bf2593894bd763547d58cfae31d821bd7eb..a4ee9520cfc11125837e42955f8f6f6c3f21bf9e 100644
 --- a/base/allocator/partition_allocator/memory_reclaimer.cc
 +++ b/base/allocator/partition_allocator/memory_reclaimer.cc
-@@ -94,7 +94,7 @@ void PartitionAllocMemoryReclaimer::Reclaim(int flags) {
+@@ -67,7 +67,7 @@ void PartitionAllocMemoryReclaimer::Reclaim(int flags) {
    //
    // Lastly decommit empty slot spans and lastly try to discard unused pages at
    // the end of the remaining active slots.
@@ -19,10 +19,10 @@ index cc4c5bad93175e309c21bc39e95e7473a22d1a7f..446fca9ebdf6f87a697905d0114a88f5
      using PCScan = internal::PCScan;
      const auto invocation_mode = flags & PartitionPurgeAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index dfdd94db5d929b89671b93c991037dac957690c5..02543e37003dd0524f5321d4aa75f9f2f6899f57 100644
+index 4bfe2501309e832dc9962d5f4642c6b7c782f83d..c45f1207be984fae9aee2cc5b9a7c405ed5ed96e 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
  #endif
  
  #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
@@ -30,26 +30,26 @@ index dfdd94db5d929b89671b93c991037dac957690c5..02543e37003dd0524f5321d4aa75f9f2
  #include "base/allocator/partition_allocator/starscan/pcscan.h"
  #include "base/allocator/partition_allocator/starscan/stack/stack.h"
  #endif
-@@ -75,7 +76,7 @@ void* ThreadFunc(void* params) {
+@@ -76,7 +77,7 @@ void* ThreadFunc(void* params) {
        base::DisallowSingleton();
  
- #if !defined(OS_NACL)
+ #if !BUILDFLAG(IS_NACL)
 -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
      internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
  #endif
  
-@@ -101,7 +102,7 @@ void* ThreadFunc(void* params) {
+@@ -102,7 +103,7 @@ void* ThreadFunc(void* params) {
        PlatformThread::CurrentHandle().platform_handle(),
        PlatformThread::CurrentId());
  
--#if !defined(OS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
-+#if !defined(OS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
+-#if !BUILDFLAG(IS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
++#if !BUILDFLAG(IS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
    internal::PCScan::NotifyThreadDestroyed();
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 047114ee7e2ad54cfd6240dda930ee6b5b067947..ba912d601ac12bc1a7c331d0bfc22acbecb86f3a 100644
+index 5aee160aec0160f37d61005ec3b71accb58b2eaa..bc73591dd8b66c304fa42b3349bbbf6f82ed13ad 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -29,6 +29,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 02a40a1560a1e..0adfe2ccb420e 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index c7a5f0916cf8ba6db6fa85537c140024a92ff24d..54136bae9e3b8a1a36be132323ee86f28bdf0b98 100644
+index 59e48882aba9b0431ddaa0b48f896866833f3376..d4360bc18858d77aa079dbbafc563d2fa03f29e8 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2404,7 +2404,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2392,7 +2392,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch b/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch
deleted file mode 100644
index a27193a4aeb64..0000000000000
--- a/patches/chromium/drop_extra_printingcontext_calls_to_newpage_pagedone.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alan Screen <awscreen@chromium.org>
-Date: Wed, 5 Jan 2022 23:15:29 +0000
-Subject: Drop extra PrintingContext calls to NewPage/PageDone
-
-When system calls were refactored out of PrintedDocument in
-https://crrev.com/948253, there were extra calls to PrintingContext
-NewPage() and PageDone() left in PrintedDocument::RenderPrintedDocument.
-These had no effect on Windows or Linux, but caused an issue for macOS.
-
-This was undetected by tests which use TestPrintingContext, and would
-only be detectable if a test was capable of using system drivers (which
-generally does not occur on the bots).  Adding a test to detect this is
-difficult at this time, but should be easier to do once later portions
-of the out-of-process print drivers commit chains fill in more testing
-capabilities.  At that point it should be easier to fire off a request
-to have the macOS Preview be the output. https://crbug.com/1284745
-has been filed to capture this needed effort.
-
-Remove NewPage()/PageDone() as common methods to override from
-PrintingContext and make these specific to macOS only.  Update the
-various implementations of PrintingContext::PrintDocument() to include
-the aborted and in-print-job checks that were previously in all
-NewPage() implementations.  The same corresponding checks from
-PageDone() can be handled by PrintedDocument::RenderPrintedDocument()
-and PrintedDocumentWin::RenderPrintedPage().  There is no concern about
-`in_print_job_` having changed during the lifetime of
-RenderPrintedDocument()/RenderPrintedPage(), so just add extra checks
-against printing having been asynchronouly aborted before allowing a
-final successful return.
-
-Bug: 1283651
-Change-Id: I52992bc7550dd25d4ad9a1dc633c7d9452a27bb1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3367333
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Alan Screen <awscreen@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#955936}
-
-diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 4283a5743c695a7376722f80925722d9e7a6496e..992a59c32ea082e3593c0183819d1b174fc8db7a 100644
---- a/chrome/browser/printing/print_job_worker.cc
-+++ b/chrome/browser/printing/print_job_worker.cc
-@@ -524,12 +524,6 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
-   DCHECK(task_runner_->RunsTasksInCurrentSequence());
-   DCHECK_NE(page_number_, PageNumber::npos());
- 
--  // Preprocess.
--  if (printing_context_->NewPage() != mojom::ResultCode::kSuccess) {
--    OnFailure();
--    return;
--  }
--
-   // Actual printing.
-   if (document_->RenderPrintedPage(*page, printing_context_.get()) !=
-       mojom::ResultCode::kSuccess) {
-@@ -537,12 +531,6 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
-     return;
-   }
- 
--  // Postprocess.
--  if (printing_context_->PageDone() != mojom::ResultCode::kSuccess) {
--    OnFailure();
--    return;
--  }
--
-   // Signal everyone that the page is printed.
-   DCHECK(print_job_);
-   print_job_->PostTask(FROM_HERE,
-diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
-index e830a1017f2262d2d1c226aa16d41a6ffe53aadf..7daa9f9bedd664123d7590b9831169e99688b9c9 100644
---- a/printing/emf_win_unittest.cc
-+++ b/printing/emf_win_unittest.cc
-@@ -115,7 +115,6 @@ TEST_F(EmfPrintingTest, Enumerate) {
-   // current directory.
-   // TODO(maruel):  Clean the .PRN file generated in current directory.
-   context.NewDocument(u"EmfTest.Enumerate");
--  context.NewPage();
-   // Process one at a time.
-   RECT page_bounds = emf.GetPageBounds(1).ToRECT();
-   Emf::Enumerator emf_enum(emf, context.context(), &page_bounds);
-@@ -129,7 +128,6 @@ TEST_F(EmfPrintingTest, Enumerate) {
-     EXPECT_TRUE(itr->SafePlayback(&emf_enum.context_))
-         << " index: " << index << " type: " << itr->record()->iType;
-   }
--  context.PageDone();
-   context.DocumentDone();
- }
- 
-diff --git a/printing/printed_document.cc b/printing/printed_document.cc
-index 54dd798f4c76c34fd6414f68d3ad11a15c1673af..81ebe973fc6a99d66f5d8792aa19e01764f33d3f 100644
---- a/printing/printed_document.cc
-+++ b/printing/printed_document.cc
-@@ -187,17 +187,18 @@ const MetafilePlayer* PrintedDocument::GetMetafile() {
- 
- mojom::ResultCode PrintedDocument::RenderPrintedDocument(
-     PrintingContext* context) {
--  mojom::ResultCode result = context->NewPage();
-+  base::AutoLock lock(lock_);
-+  mojom::ResultCode result = context->PrintDocument(
-+      *GetMetafile(), *immutable_.settings_, mutable_.expected_page_count_);
-   if (result != mojom::ResultCode::kSuccess)
-     return result;
--  {
--    base::AutoLock lock(lock_);
--    result = context->PrintDocument(*GetMetafile(), *immutable_.settings_,
--                                    mutable_.expected_page_count_);
--    if (result != mojom::ResultCode::kSuccess)
--      return result;
--  }
--  return context->PageDone();
-+
-+  // Beware of any asynchronous aborts of the print job that happened during
-+  // printing.
-+  if (context->PrintingAborted())
-+    return mojom::ResultCode::kCanceled;
-+
-+  return mojom::ResultCode::kSuccess;
- }
- 
- bool PrintedDocument::IsComplete() const {
-diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc
-index 4024150677fb64f8f8c9d53dfa73cf709c819a7c..8e34b288ec518c4e2d0c5d8113f38440ad2c648b 100644
---- a/printing/printed_document_win.cc
-+++ b/printing/printed_document_win.cc
-@@ -24,8 +24,17 @@ mojom::ResultCode PrintedDocument::RenderPrintedPage(
- #endif
- 
-   DCHECK(context);
--  return context->RenderPage(page,
--                             immutable_.settings_->page_setup_device_units());
-+  mojom::ResultCode result = context->RenderPage(
-+      page, immutable_.settings_->page_setup_device_units());
-+  if (result != mojom::ResultCode::kSuccess)
-+    return result;
-+
-+  // Beware of any asynchronous aborts of the print job that happened during
-+  // printing.
-+  if (context->PrintingAborted())
-+    return mojom::ResultCode::kCanceled;
-+
-+  return mojom::ResultCode::kSuccess;
- }
- 
- }  // namespace printing
-diff --git a/printing/printing_context.h b/printing/printing_context.h
-index e87170e6957733f06bcc296bcca3fc331557ed46..e196a7d448ca41ea02d523a4de410dedf4298b5e 100644
---- a/printing/printing_context.h
-+++ b/printing/printing_context.h
-@@ -122,18 +122,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
-   virtual mojom::ResultCode NewDocument(
-       const std::u16string& document_name) = 0;
- 
--  // Starts a new page.
--  virtual mojom::ResultCode NewPage() = 0;
--
- #if defined(OS_WIN)
-   // Renders a page.
-   virtual mojom::ResultCode RenderPage(const PrintedPage& page,
-                                        const PageSetup& page_setup) = 0;
- #endif
- 
--  // Closes the printed page.
--  virtual mojom::ResultCode PageDone() = 0;
--
-   // Prints the document contained in `metafile`.
-   virtual mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                           const PrintSettings& settings,
-@@ -178,6 +172,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
-   // Reinitializes the settings for object reuse.
-   void ResetSettings();
- 
-+  bool PrintingAborted() const { return abort_printing_; }
-+
-   int job_id() const { return job_id_; }
- 
-  protected:
-diff --git a/printing/printing_context_android.cc b/printing/printing_context_android.cc
-index c28a40eb0a9ce0058d9f85948eda5f83d0c64791..5b2f096cb2a705e7c4c7ebbeddbf93cac1b9eafb 100644
---- a/printing/printing_context_android.cc
-+++ b/printing/printing_context_android.cc
-@@ -213,30 +213,13 @@ mojom::ResultCode PrintingContextAndroid::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextAndroid::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
--mojom::ResultCode PrintingContextAndroid::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextAndroid::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-     uint32_t num_pages) {
-+  if (abort_printing_)
-+    return mojom::ResultCode::kCanceled;
-+  DCHECK(in_print_job_);
-   DCHECK(is_file_descriptor_valid());
- 
-   return metafile.SaveToFileDescriptor(fd_) ? mojom::ResultCode::kSuccess
-diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
-index 676d98949da675e3283969dd3c9c61028dc1c7b5..b4f2f25edec45f91f241b0b1a7bc73b3f51af252 100644
---- a/printing/printing_context_android.h
-+++ b/printing/printing_context_android.h
-@@ -60,8 +60,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextAndroid
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-diff --git a/printing/printing_context_chromeos.cc b/printing/printing_context_chromeos.cc
-index d996c3e1f7b2d9f96f5c50aadff67f8273c7e760..670df66ae406fa883f801682de699aab16779591 100644
---- a/printing/printing_context_chromeos.cc
-+++ b/printing/printing_context_chromeos.cc
-@@ -402,32 +402,14 @@ mojom::ResultCode PrintingContextChromeos::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextChromeos::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
--mojom::ResultCode PrintingContextChromeos::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextChromeos::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-     uint32_t num_pages) {
-+  if (abort_printing_)
-+    return mojom::ResultCode::kCanceled;
-+  DCHECK(in_print_job_);
-+
- #if defined(USE_CUPS)
-   std::vector<char> buffer;
-   if (!metafile.GetDataAsVector(&buffer))
-diff --git a/printing/printing_context_chromeos.h b/printing/printing_context_chromeos.h
-index 77353372b2c6e003428d37ab634167e8dc824fa4..06cb16c8a569a4d90ccdccc5fefcaaf527e49f5f 100644
---- a/printing/printing_context_chromeos.h
-+++ b/printing/printing_context_chromeos.h
-@@ -39,8 +39,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextChromeos
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-diff --git a/printing/printing_context_linux.cc b/printing/printing_context_linux.cc
-index c5adfa317747cda3d370a2ace52d843662f4ce91..204cec8311bec69674f1da2223e8d6c4b5a13ba3 100644
---- a/printing/printing_context_linux.cc
-+++ b/printing/printing_context_linux.cc
-@@ -151,30 +151,13 @@ mojom::ResultCode PrintingContextLinux::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextLinux::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
--mojom::ResultCode PrintingContextLinux::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextLinux::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-     uint32_t num_pages) {
-+  if (abort_printing_)
-+    return mojom::ResultCode::kCanceled;
-+  DCHECK(in_print_job_);
-   DCHECK(print_dialog_);
-   // TODO(crbug.com/1252685)  Plumb error code back from
-   // `PrintDialogGtkInterface`.
-diff --git a/printing/printing_context_linux.h b/printing/printing_context_linux.h
-index 17d768a24141954df80bed3c5dd6735c34115195..653170ba60e8341c972cb0126109d48394e0de7b 100644
---- a/printing/printing_context_linux.h
-+++ b/printing/printing_context_linux.h
-@@ -45,8 +45,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextLinux : public PrintingContext {
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
-index 85363bd922bf0ab2630e3d5f350de0c58792963a..221019f5df71e1d66accbf2ea2d161bd1125666f 100644
---- a/printing/printing_context_mac.h
-+++ b/printing/printing_context_mac.h
-@@ -35,8 +35,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-@@ -105,6 +103,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
-   // Returns true is the pair is set.
-   bool SetKeyValue(base::StringPiece key, base::StringPiece value);
- 
-+  // Starts a new page.
-+  mojom::ResultCode NewPage();
-+
-+  // Closes the printed page.
-+  mojom::ResultCode PageDone();
-+
-   // The native print info object.
-   base::scoped_nsobject<NSPrintInfo> print_info_;
- 
-diff --git a/printing/printing_context_no_system_dialog.cc b/printing/printing_context_no_system_dialog.cc
-index c10123f35b11e1600c813080585a2282d775dba1..253507fcee5476f497421316bc42a0794f97b12b 100644
---- a/printing/printing_context_no_system_dialog.cc
-+++ b/printing/printing_context_no_system_dialog.cc
-@@ -98,26 +98,6 @@ mojom::ResultCode PrintingContextNoSystemDialog::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextNoSystemDialog::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
--mojom::ResultCode PrintingContextNoSystemDialog::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op.
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextNoSystemDialog::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
-index 2753d7ba7a09e1c5e88c1eb21a9b146034ea53f5..cb0d0b8c12535c83dbfc07ecb2817f0504b4a8ba 100644
---- a/printing/printing_context_no_system_dialog.h
-+++ b/printing/printing_context_no_system_dialog.h
-@@ -32,8 +32,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextNoSystemDialog
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
-index 0addb52cd2f65b6f05b7cfb7cf8602baaf592541..4f1fb12619fc9bee0cce104ba60621008284d675 100644
---- a/printing/printing_context_win.cc
-+++ b/printing/printing_context_win.cc
-@@ -366,18 +366,6 @@ mojom::ResultCode PrintingContextWin::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextWin::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(context_);
--  DCHECK(in_print_job_);
--
--  // Intentional No-op. MetafileSkia::SafePlayback takes care of calling
--  // ::StartPage().
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextWin::RenderPage(const PrintedPage& page,
-                                                  const PageSetup& page_setup) {
-   if (abort_printing_)
-@@ -416,17 +404,6 @@ mojom::ResultCode PrintingContextWin::RenderPage(const PrintedPage& page,
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode PrintingContextWin::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // Intentional No-op. MetafileSkia::SafePlayback takes care of calling
--  // ::EndPage().
--
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode PrintingContextWin::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
-index 700bfe2c744cc18b1be25b9db02dd690b5e306f9..babd443a1586c92a70ff6362a824e29a6395fae2 100644
---- a/printing/printing_context_win.h
-+++ b/printing/printing_context_win.h
-@@ -35,10 +35,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextWin : public PrintingContext {
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
-   mojom::ResultCode RenderPage(const PrintedPage& page,
-                                const PageSetup& page_setup) override;
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
-diff --git a/printing/test_printing_context.cc b/printing/test_printing_context.cc
-index 4f0bf0ae891164120d36c79a7df98845f38e55de..208e8a16b5648383ff26d8dec4a15f6485ef4454 100644
---- a/printing/test_printing_context.cc
-+++ b/printing/test_printing_context.cc
-@@ -116,15 +116,6 @@ mojom::ResultCode TestPrintingContext::NewDocument(
-   return mojom::ResultCode::kSuccess;
- }
- 
--mojom::ResultCode TestPrintingContext::NewPage() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // No-op.
--  return mojom::ResultCode::kSuccess;
--}
--
- #if defined(OS_WIN)
- mojom::ResultCode TestPrintingContext::RenderPage(const PrintedPage& page,
-                                                   const PageSetup& page_setup) {
-@@ -138,15 +129,6 @@ mojom::ResultCode TestPrintingContext::RenderPage(const PrintedPage& page,
- }
- #endif  // defined(OS_WIN)
- 
--mojom::ResultCode TestPrintingContext::PageDone() {
--  if (abort_printing_)
--    return mojom::ResultCode::kCanceled;
--  DCHECK(in_print_job_);
--
--  // No-op.
--  return mojom::ResultCode::kSuccess;
--}
--
- mojom::ResultCode TestPrintingContext::PrintDocument(
-     const MetafilePlayer& metafile,
-     const PrintSettings& settings,
-diff --git a/printing/test_printing_context.h b/printing/test_printing_context.h
-index e2a0f906216f5bae2d05dd6efd6246257a3deea4..579a9269459470e8eac6e506d87503d828bed4cb 100644
---- a/printing/test_printing_context.h
-+++ b/printing/test_printing_context.h
-@@ -58,12 +58,10 @@ class TestPrintingContext : public PrintingContext {
-   mojom::ResultCode UpdatePrinterSettings(
-       const PrinterSettings& printer_settings) override;
-   mojom::ResultCode NewDocument(const std::u16string& document_name) override;
--  mojom::ResultCode NewPage() override;
- #if defined(OS_WIN)
-   mojom::ResultCode RenderPage(const PrintedPage& page,
-                                const PageSetup& page_setup) override;
- #endif
--  mojom::ResultCode PageDone() override;
-   mojom::ResultCode PrintDocument(const MetafilePlayer& metafile,
-                                   const PrintSettings& settings,
-                                   uint32_t num_pages) override;
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index f3b9883faf7ec..42e510ac79568 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index d44e1caec0a369902f84c8737e17fd88c87416b7..03ba3f90405efd73cbb9d2e606c1499b46f4ec31 100644
+index 7323cb11296e9383db68753d9fc43203b5632e19..95349fc9016eda37668edcd742336364346d89f6 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
+@@ -529,7 +529,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
  }
  
  void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
@@ -19,10 +19,10 @@ index d44e1caec0a369902f84c8737e17fd88c87416b7..03ba3f90405efd73cbb9d2e606c1499b
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 0b714bac63853fb67f1b5b953c71f7120a266ca9..daa10f36722c6f6f0fbfbf5de3918b966323434a 100644
+index 7b46b19458ab03037fd02ac9a7f21a7b321843f1..40a81cb293469cb5ec1bd5ab5195fd8e1b0812dc 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -928,8 +928,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -929,8 +929,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index 98fedf7c940ee..c05e1e16aceef 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,7 +21,7 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 0ccafbde90f99bbafb180fffa1e94f9a35a16bd7..d28b2116930dc1ed9c0cc64c4b31612a68a3c5ba 100644
+index a7dad3d1053c3101183b9686adbccaa5cf3a87fc..24da1fde55c345cb58829539aec381af9af57bae 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
 @@ -368,6 +368,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index b0b3aebf0dbf4..a0ae92e9a1788 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 13c730e6d8c977e014c28d7eeb2513d1f9b6e47e..8af6961ab0b5f2f26e375b8f9c7555874df06f89 100644
+index b3008accd63bd6694a44761c4d00a0927fad90ad..d61c2e0031b0aa22c5c5822e8433ef4b4366afed 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1325,6 +1325,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1356,6 +1356,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,22 +51,22 @@ index 13c730e6d8c977e014c28d7eeb2513d1f9b6e47e..8af6961ab0b5f2f26e375b8f9c755587
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 55cff37a1ad0ae89bde3ffda11c3d1e9d194e22d..fcda182b959a3600be62a2b61573ad795d4b0509 100644
+index 486a151f6923fd0069ce5aaaffe6559cb60a88ec..589ee590edea4a6fb995fb73be36d035336f6e3a 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -278,6 +278,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -277,6 +277,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
 +  void SetUserAgent(const std::string& new_user_agent) override;
    void SetAcceptLanguage(const std::string& new_accept_language) override;
    void SetEnableReferrers(bool enable_referrers) override;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 647b1e2fc81fb4ee177827d6909c816631009ec3..52ee1744567ee19f1bfa3730427d9a65b5a666f3 100644
+index 89c00d7ab1510ebdbce49876fcd5f94c5096b3c9..41da1b6fac783be22ab2f3abc25aaa7687049048 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1044,6 +1044,9 @@ interface NetworkContext {
+@@ -1049,6 +1049,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,7 +77,7 @@ index 647b1e2fc81fb4ee177827d6909c816631009ec3..52ee1744567ee19f1bfa3730427d9a65
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index b766ae3aa91ffd6ce5ab7ae3835ff7fa58d02a0e..5719eec40aff5cd079110fc52c46d2791577fee8 100644
+index 309a96ff77d06f9456fd3faec02b869c8a55c7f7..998b5b04bc98cfd048fe929bf3b99bbfcdbbfb9a 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
@@ -87,4 +87,4 @@ index b766ae3aa91ffd6ce5ab7ae3835ff7fa58d02a0e..5719eec40aff5cd079110fc52c46d279
 +  void SetUserAgent(const std::string& new_user_agent) override {}
    void SetAcceptLanguage(const std::string& new_accept_language) override {}
    void SetEnableReferrers(bool enable_referrers) override {}
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 32d935113d968..e11b55274afd2 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index d4602eb32f1f14f639df26f866f5406ab36003d5..afae7a75567c7219490f13afe010317c68552ea4 100644
+index 304dcdaa65ee1d9bed86f7c0e5956dd3a2a65585..17ff3cdf79ec48f444640bc18df47f81aa4eba28 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -159,6 +159,7 @@
+@@ -158,6 +158,7 @@
  #include "third_party/blink/renderer/core/timing/dom_window_performance.h"
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
@@ -23,11 +23,11 @@ index d4602eb32f1f14f639df26f866f5406ab36003d5..afae7a75567c7219490f13afe010317c
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1793,6 +1794,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
- #if defined(OS_MAC)
+@@ -1797,6 +1798,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+ #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
 +  SetUseExternalPopupMenus(!prefs.offscreen);
  #endif
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index 99d6a9e4cc006..251704d5cd8cc 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -19,7 +19,7 @@ instance, but also so the second instance can send back additional
 data to the first instance if needed.
 
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 13b325ecad9ba48398173e89680287c63efd4fa6..e8188e4640b28d41559822e6c1bdd27dcccae93c 100644
+index 8f94cc300b58e8a94b6ca155aa3cf370bcb948d8..4340376f323d24e5e2c5897a81c6a9ebf13adab4 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -18,6 +18,7 @@
@@ -29,7 +29,7 @@ index 13b325ecad9ba48398173e89680287c63efd4fa6..e8188e4640b28d41559822e6c1bdd27d
 +#include "base/containers/span.h"
  #include "ui/gfx/native_widget_types.h"
  
- #if defined(OS_POSIX) && !defined(OS_ANDROID)
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
 @@ -93,6 +94,9 @@ class ProcessSingleton {
  
    static constexpr int kNumNotifyResults = LAST_VALUE + 1;
@@ -85,18 +85,18 @@ index 13b325ecad9ba48398173e89680287c63efd4fa6..e8188e4640b28d41559822e6c1bdd27d
 +  // Custom data to pass to the other instance during notify.
 +  base::span<const uint8_t> additional_data_;
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
    bool EscapeVirtualization(const base::FilePath& user_data_dir);
 @@ -190,6 +206,7 @@ class ProcessSingleton {
    HANDLE lock_file_;
    base::FilePath user_data_dir_;
    ShouldKillRemoteProcessCallback should_kill_remote_process_callback_;
 +  HANDLE ack_pipe_;
- #elif defined(OS_POSIX) && !defined(OS_ANDROID)
+ #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 0d74cd93a21b937f65f3d417b4734ae5b87acdf2..9bf6e633b5adc68a67d23e4f17460dce24a02cfa 100644
+index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e455dfd03 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -147,7 +147,7 @@ const char kACKToken[] = "ACK";
diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
index 9edc86cecd94e..9bf184662af7e 100644
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.
 
 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index ca0630b07722cf3d8b4d31103db7c03bc702ee6b..5f7c5166f3541718f1135b2af8dc6ef3b7bb69ca 100644
+index 93879cdb8d8001458f6283625232515bd214847d..1a729eb08de5d9f0b2fdbaad1eec95b7234a2f71 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
-@@ -153,6 +153,8 @@ absl::optional<SkColor> NativeTheme::GetColorProviderColor(
+@@ -152,6 +152,8 @@ absl::optional<SkColor> NativeTheme::GetColorProviderColor(
  }
  
  bool NativeTheme::ShouldUseDarkColors() const {
@@ -26,10 +26,10 @@ index ca0630b07722cf3d8b4d31103db7c03bc702ee6b..5f7c5166f3541718f1135b2af8dc6ef3
  }
  
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index 061a8549af88e8b531070799c41e3166b69ecb47..b4094564254fd12f41e84350e5e8c9540c387a9d 100644
+index 8ddda2eae1ce7578c8987e632b21dd0b6c20c554..cca14f9cf49e667a0f2def788097b4eabb4761f9 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -404,6 +404,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -406,6 +406,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
    SkColor GetUnprocessedSystemColor(ColorId color_id,
                                      ColorScheme color_scheme) const;
  
@@ -52,7 +52,7 @@ index 061a8549af88e8b531070799c41e3166b69ecb47..b4094564254fd12f41e84350e5e8c954
    // Returns a shared instance of the native theme that should be used for web
    // rendering. Do not use it in a normal application context (i.e. browser).
    // The returned object should not be deleted by the caller. This function is
-@@ -589,6 +605,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -591,6 +607,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
    bool forced_colors_ = false;
    PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
    PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
@@ -61,10 +61,10 @@ index 061a8549af88e8b531070799c41e3166b69ecb47..b4094564254fd12f41e84350e5e8c954
    SEQUENCE_CHECKER(sequence_checker_);
  };
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index 07852493fd23b8c1f057dc7ad830b6884db50a88..fee85c5c95bf7908cbd460619f71977cc73f3e6a 100644
+index 5f809b71c635abd3679ee593850e521a14cb62f5..b5ba2d7cd65742ceabaaad96a8ec0db8d661ad32 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -677,6 +677,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
+@@ -681,6 +681,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
    // ...unless --force-dark-mode was specified in which case caveat emptor.
    if (InForcedColorsMode() && !IsForcedDarkMode())
      return false;
diff --git a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
index 5855be1a4f264..8aec002466d42 100644
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -13,10 +13,10 @@ other protocols to register their streaming behavior. MultibufferDataSource::Ass
 then refers to the list so that it can correctly determine the data source's settings.
 
 diff --git a/third_party/blink/public/platform/media/multi_buffer_data_source.h b/third_party/blink/public/platform/media/multi_buffer_data_source.h
-index 3224b0cc8f4b5196d5e78f031f198cecd0fddf40..b797f446cb876315ff70645564658435445045cd 100644
+index fd2441add0c816c5031ed0e9321d2be7e0937161..c324d855b26f6dcb63d127d7ddafa509cb1074e4 100644
 --- a/third_party/blink/public/platform/media/multi_buffer_data_source.h
 +++ b/third_party/blink/public/platform/media/multi_buffer_data_source.h
-@@ -34,6 +34,8 @@ namespace blink {
+@@ -33,6 +33,8 @@ namespace blink {
  class BufferedDataSourceHost;
  class MultiBufferReader;
  
diff --git a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
index 254c8c2b8ea2e..9fc5bef9c5021 100644
--- a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
+++ b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -9,7 +9,7 @@ production use cases.  This is unlikely to be upstreamed as the change
 is entirely in //chrome.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-index 51c061d3bd117c926b74a10deab37d3a694e808b..1f0b787b13567be74553ced382d4b48a65bb2003 100644
+index 22fade6370fe654e48373f35bbac079131b873ff..57d694eab66c1431789405656f600390e023b533 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 @@ -51,6 +51,9 @@ namespace {
@@ -44,7 +44,7 @@ index 51c061d3bd117c926b74a10deab37d3a694e808b..1f0b787b13567be74553ced382d4b48a
        "https://redirector.gvt1.com/edgedl/chrome/dict/";
  
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
-index a8a1fb3c22b812cc3ff76a4c50853cb60c74c541..27c07b11ca2f56600fe8534170066bb77dd36037 100644
+index 4df6fc23f0e51e3279208a9331c9e55d7d4cb0ac..f4ddb557f6c04ede0caf5029b3dfb877a02ea721 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
 @@ -93,6 +93,8 @@ class SpellcheckHunspellDictionary
diff --git a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
index 587986730db3e..c63f9b05541ce 100644
--- a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+++ b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
@@ -7,7 +7,7 @@ Subject: feat: allow embedders to add observers on created hunspell
 This patch is used by Electron to implement spellchecker events.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index 7e6846c8bbb2d773c0b0ec97da928871d828bcbf..7a5f0d5034270dcfb287d9c46b2cd0431098d37e 100644
+index f841d5847fd107f551e4823ae0690e2e17225ba9..475590da5273c218353c9721b35a9b50be248a47 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.cc
 +++ b/chrome/browser/spellchecker/spellcheck_service.cc
 @@ -467,6 +467,9 @@ void SpellcheckService::LoadDictionaries() {
@@ -42,7 +42,7 @@ index 7e6846c8bbb2d773c0b0ec97da928871d828bcbf..7a5f0d5034270dcfb287d9c46b2cd043
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
 diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h
-index 67a7b52ea0e82c9ddc9e0fbdbe677855f60c536e..48bd507b2a23061ee20a02b00b79604077002aed 100644
+index c17c42fdfd943e7b77e0d7a8d333afd70e9c6abc..ab9ef6b1efdd63ea7cc47be2cf7de79eb9aa1b90 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.h
 +++ b/chrome/browser/spellchecker/spellcheck_service.h
 @@ -138,6 +138,8 @@ class SpellcheckService : public KeyedService,
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 9b87b52e3b9a2..a0987afbf7cf9 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -8,21 +8,21 @@ rendering with the viz compositor by way of a custom HostDisplayClient
 and LayeredWindowUpdater.
 
 diff --git a/components/viz/host/host_display_client.cc b/components/viz/host/host_display_client.cc
-index 3b00759e513dc7e19fd68398e853c8ce6ac73905..47f4e7cc2e8b3141dcaf9e7a498fec32c9342f40 100644
+index d3970b4d86e1fadc5321e99be20813c0f811d6b3..66d3ae8ecc299456de8ff621b2957f9d18e984a1 100644
 --- a/components/viz/host/host_display_client.cc
 +++ b/components/viz/host/host_display_client.cc
-@@ -45,9 +45,9 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
+@@ -46,9 +46,9 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
  }
  #endif
  
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
  void HostDisplayClient::CreateLayeredWindowUpdater(
      mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) {
-+#if defined(OS_WIN)
++#if BUILDFLAG(IS_WIN)
    if (!NeedsToUseLayerWindow(widget_)) {
      DLOG(ERROR) << "HWND shouldn't be using a layered window";
      return;
-@@ -55,8 +55,12 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
+@@ -56,8 +56,12 @@ void HostDisplayClient::CreateLayeredWindowUpdater(
  
    layered_window_updater_ =
        std::make_unique<LayeredWindowUpdaterImpl>(widget_, std::move(receiver));
@@ -37,14 +37,14 @@ index 3b00759e513dc7e19fd68398e853c8ce6ac73905..47f4e7cc2e8b3141dcaf9e7a498fec32
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 diff --git a/components/viz/host/host_display_client.h b/components/viz/host/host_display_client.h
-index b2ad84c881ac7190ee07e6db1f0eb2822066748d..b1527bd33ca9ba0f5345aa1fef08ee65f3ded91c 100644
+index 1c2885c42f4947bb22ce87c8b2d649689b278da1..e588d77072537b6b0760b278de72d69aa44f2b3f 100644
 --- a/components/viz/host/host_display_client.h
 +++ b/components/viz/host/host_display_client.h
 @@ -41,10 +41,9 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
        const gfx::CALayerParams& ca_layer_params) override;
  #endif
  
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 + protected:
    void CreateLayeredWindowUpdater(
        mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override;
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index fae4aae8ed31b10fba14c009bb6bf86128747b14..a672c74893f0c9a2774beec98734faf58a17cbf3 100644
+index 826714570d1ee1bfc10043597cd6cd00543318d1..d3223035f33db5f39fd4d6b6e8d99da57bb0e7cb 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -139,6 +139,8 @@ viz_component("service") {
@@ -108,10 +108,10 @@ index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e3658036
  
  }  // namespace viz
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191d20945f2 100644
+index 8a277c6337d446890bb32814a68db2a9d3d3cd72..4c4e631d5a1476eaad6f54281e6d6899070d1a65 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
  #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
  #include "components/viz/service/display_embedder/skia_output_surface_dependency_impl.h"
  #include "components/viz/service/display_embedder/skia_output_surface_impl.h"
@@ -119,7 +119,7 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
  #include "components/viz/service/display_embedder/software_output_surface.h"
  #include "components/viz/service/display_embedder/viz_process_context_provider.h"
  #include "components/viz/service/gl/gpu_service_impl.h"
-@@ -38,6 +39,7 @@
+@@ -39,6 +40,7 @@
  #include "gpu/ipc/scheduler_sequence.h"
  #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
  #include "gpu/ipc/service/image_transport_surface.h"
@@ -127,7 +127,7 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
  #include "ui/base/ui_base_switches.h"
  #include "ui/gl/gl_context.h"
  #include "ui/gl/init/gl_factory.h"
-@@ -125,7 +127,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -126,7 +128,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
      mojom::DisplayClient* display_client,
      DisplayCompositorMemoryAndTaskController* gpu_dependency,
      const RendererSettings& renderer_settings,
@@ -137,7 +137,7 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (surface_handle == gpu::kNullSurfaceHandle)
      return std::make_unique<OutputSurfaceUnified>();
-@@ -137,7 +140,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -138,7 +141,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  
    if (!gpu_compositing) {
      output_surface = std::make_unique<SoftwareOutputSurface>(
@@ -146,7 +146,7 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
    } else if (renderer_settings.use_skia_renderer) {
      DCHECK(gpu_dependency);
      {
-@@ -242,10 +245,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -243,10 +246,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  std::unique_ptr<SoftwareOutputDevice>
  OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
      gpu::SurfaceHandle surface_handle,
@@ -156,7 +156,7 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
    if (headless_)
      return std::make_unique<SoftwareOutputDevice>();
  
-+#if !defined(OS_MAC)
++#if !BUILDFLAG(IS_APPLE)
 +  if (offscreen) {
 +    DCHECK(display_client);
 +    mojom::LayeredWindowUpdaterPtr layered_window_updater;
@@ -167,11 +167,11 @@ index e0afde4b0cb45cb6cf2cae6f001875973898bb64..c41e9566b9a4d32cb1d0cb3e8c199191
 +  }
 +#endif
 +
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
    return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
                                         display_client);
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.h b/components/viz/service/display_embedder/output_surface_provider_impl.h
-index 07f266d8a379c7047f43c824c9062cbb162112f0..c756e1c5b4bda1978d27fd55fba1e4531dbeed8a 100644
+index fa9bc45b5c12821789270907f73c7e6f3c0c1424..6d2ad1d88631db82f41de2852c3e9a6ad1431b2e 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.h
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.h
 @@ -66,12 +66,14 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl
@@ -499,10 +499,10 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index 94a087b4beb3b683e90e89282c9fd6bb36825608..6efcb84af529a78e9ebc1234ef4d0c8834270c29 100644
+index 5362650a4f9bfa038f38f3490c50a7ddbd8d0e0e..106d98decdbb2cbb768388017dae5b4c4f00d777 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -49,7 +49,8 @@ RootCompositorFrameSinkImpl::Create(
+@@ -48,7 +48,8 @@ RootCompositorFrameSinkImpl::Create(
        params->gpu_compositing, params->widget, params->renderer_settings);
    auto output_surface = output_surface_provider->CreateOutputSurface(
        params->widget, params->gpu_compositing, display_client.get(),
@@ -513,10 +513,10 @@ index 94a087b4beb3b683e90e89282c9fd6bb36825608..6efcb84af529a78e9ebc1234ef4d0c88
    // Creating output surface failed. The host can send a new request, possibly
    // with a different compositing mode.
 diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
-index ba0d6ca4e9004a0c8cfc2b99f3e3aaff4c8a756b..3f1c77e14ab6164ee9bb7d4cc3e454125e0d700e 100644
+index 0e3af0f9280abe8560393325b400ad2543ed0556..7fe490e55a4bb8a183d0d241188ea15a44347245 100644
 --- a/content/browser/compositor/viz_process_transport_factory.cc
 +++ b/content/browser/compositor/viz_process_transport_factory.cc
-@@ -383,8 +383,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
+@@ -381,8 +381,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
    compositor_data.display_private.reset();
    root_params->display_private =
        compositor_data.display_private.BindNewEndpointAndPassReceiver();
@@ -546,7 +546,7 @@ index 9f7583e42405760bbe5994c87c4347a7d5a36fbe..c383f93ee22388cb4524119d0bead319
  
    // Notifies that a swap has occurred and provides information about the pixel
 diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
-index 83e7682b14367571a2d52bb3a6f2f63918d8efe9..3b6f2627196170e3a17992ad36534ac9bc178e4a 100644
+index a9a0e5a1167b2018e6dc206ecb7d37aad94042aa..3997ecb0228914144d6b04595c47376679fca3ef 100644
 --- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
 +++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
 @@ -32,6 +32,7 @@ struct RootCompositorFrameSinkParams {
@@ -569,7 +569,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 7e3a624f99fea87cd53ce6f399e5768058d3c305..384ec6d9b8a8c0e121fc2e875ce65ddb639c241b 100644
+index 383aff3755d4b086759099de8b81808de8d4bf0e..ecba52d0e92d6f8989b1b2c2e851645940dcc2af 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -81,6 +81,7 @@ class DisplayPrivate;
@@ -617,7 +617,7 @@ index 7e3a624f99fea87cd53ce6f399e5768058d3c305..384ec6d9b8a8c0e121fc2e875ce65ddb
    raw_ptr<Layer> root_layer_ = nullptr;
  
 diff --git a/ui/gfx/ca_layer_params.h b/ui/gfx/ca_layer_params.h
-index 232751b32f6d6dee6c913c7020b53ae4b604a552..ba5767a80d13e848b7281f55307f6569a1524ce3 100644
+index 12e115cd6a128d8d150abc786d4d38b1d5119d91..b6320de28750333bee7ee83393849f4eb0a956ac 100644
 --- a/ui/gfx/ca_layer_params.h
 +++ b/ui/gfx/ca_layer_params.h
 @@ -6,6 +6,7 @@
@@ -649,7 +649,7 @@ index de00e766ba17532e10dcf5d0fd31fa344920a9f7..7aaedf83ad22dcc1d2dd39a31cf7e08b
    float scale_factor;
  };
 diff --git a/ui/gfx/mojom/ca_layer_params_mojom_traits.cc b/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
-index c1f21d7f4348df96f7be5c0adb1b9650304048e0..760c849aebba70e575e59883655d707f36c5424a 100644
+index c7035798bd867f51b39f36f1be79293bf2b5cc12..131446361de812f9b915483bca2b6d2165b65e3d 100644
 --- a/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
 +++ b/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
 @@ -52,6 +52,9 @@ bool StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams>::Read(
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 40abb608830cb..c7a6f0aae7741 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -81,7 +81,7 @@ index 27477d595fd22dc49329631a0b52ebdaafe1edb1..a4fd22381738648040cd72dce747285f
    // browser decide.
    // Note: this is an enum of type PreviewsState.
 diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
-index 4a26ea8928e333a9231dad10b03947b3febf9d47..97bc79ff624767c56f215d77a1bcabed378330aa 100644
+index 80f26b62b25bd6aa46886e3112b2ffd2698693fe..e72cab84db36eec86309160d4f7416ee431f5e34 100644
 --- a/services/network/public/mojom/url_response_head.mojom
 +++ b/services/network/public/mojom/url_response_head.mojom
 @@ -7,6 +7,7 @@ module network.mojom;
@@ -103,10 +103,10 @@ index 4a26ea8928e333a9231dad10b03947b3febf9d47..97bc79ff624767c56f215d77a1bcabed
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index e53ff47c6f43d00fd89695c4ef08ef5f455df103..56dce34839df7569361bfe7076f6dd2f7ef307c7 100644
+index 59a89d471326069e183cdcc42af862fe19d7448e..39cd96d5e5785879bd3d82fb4c71fdf80c48e5ee 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -532,6 +532,7 @@ URLLoader::URLLoader(
+@@ -541,6 +541,7 @@ URLLoader::URLLoader(
        peer_closed_handle_watcher_(FROM_HERE,
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
@@ -114,7 +114,7 @@ index e53ff47c6f43d00fd89695c4ef08ef5f455df103..56dce34839df7569361bfe7076f6dd2f
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -690,7 +691,7 @@ URLLoader::URLLoader(
+@@ -699,7 +700,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index e53ff47c6f43d00fd89695c4ef08ef5f455df103..56dce34839df7569361bfe7076f6dd2f
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1340,6 +1341,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1349,6 +1350,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    response_ = network::mojom::URLResponseHead::New();
    PopulateResourceResponse(url_request_.get(), is_load_timing_enabled_,
                             options_, response_.get());
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 33e1bd005b790..2d62e04b8fe76 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index daa10f36722c6f6f0fbfbf5de3918b966323434a..067861bb743ee2f3c1916794d45efb7dd591b230 100644
+index 40a81cb293469cb5ec1bd5ab5195fd8e1b0812dc..4be0e5b0ef187d68f054672bc3d1dc328057c58b 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3567,6 +3567,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3574,6 +3574,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index 409db5c2413c1..f1f422de76bd9 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.js b/chrome/browser/resources/pdf/pdf_viewer.js
-index 42407ef7c214bed1eb44165a87c6d0dc44f0ad7f..64225caf3738549520b35259628559ec6c15d901 100644
+index 4d45dfa892fec8857dabdd70e3c09c46b784ef44..d9b72b9298494df57e2ad53738a213226a7c45e4 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.js
 +++ b/chrome/browser/resources/pdf/pdf_viewer.js
-@@ -967,25 +967,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -959,25 +959,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -47,7 +47,7 @@ index 42407ef7c214bed1eb44165a87c6d0dc44f0ad7f..64225caf3738549520b35259628559ec
    }
  
    /**
-@@ -1112,30 +1099,13 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -1104,30 +1091,13 @@ export class PDFViewerElement extends PDFViewerBaseElement {
      if (!fileName.toLowerCase().endsWith('.pdf')) {
        fileName = fileName + '.pdf';
      }
diff --git a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
index aaf3d8e889dd8..cf2398b0c00ef 100644
--- a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
+++ b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
@@ -50,7 +50,7 @@ upstream would also hit this DCHECK, so give it a try with content_shell or
 chrome and that would help reporting upstream crbug.
 
 diff --git a/services/device/device_service.cc b/services/device/device_service.cc
-index 1081fb518f896b1ca862f900866e271bb4cc31ad..b68e5bbb276204a4db752f5646c8256497ead18d 100644
+index 11a7b2902490986ba2462f92c3b3e5ae1b1a127f..32d591621c7206affab50ef061aa565527d5952f 100644
 --- a/services/device/device_service.cc
 +++ b/services/device/device_service.cc
 @@ -159,7 +159,7 @@ DeviceService::~DeviceService() {
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 5df60153704b6..614da08c32ba8 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,7 +8,7 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index b693a98ef9e4333b0d1825ee156860a5c2dafcf6..5ca08191deaf9e8af198e12e51b1d58bb5089ffb 100644
+index d2a50feea97add9d9c309e8066305caf9105c547..e6fe6ebd7f86df1e5193305a827ac938b822a1ab 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -1816,7 +1816,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -21,12 +21,12 @@ index b693a98ef9e4333b0d1825ee156860a5c2dafcf6..5ca08191deaf9e8af198e12e51b1d58b
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index d59f80df234872e0e7a89c9283e820a49c30b0e4..c3c97789daba03d288c442526015017adcaf1e88 100644
+index ac9bce453ff812679d8c77d661729ea681977061..7cef50818b3587e033f5cfeea324df17547dfa6e 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -677,6 +677,10 @@ class WebContents : public PageNavigator,
+@@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
        bool stay_awake,
-       bool is_activity = true) WARN_UNUSED_RESULT = 0;
+       bool is_activity = true) = 0;
  
 +  virtual void DecrementCapturerCount(bool stay_hidden,
 +                                      bool stay_awake,
diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
index 9ee02ccf3acd2..fa0cd24e666d4 100644
--- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
+++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
@@ -59,7 +59,7 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
    // true if register successfully, or false if 1) the specificied |accelerator|
    // has been registered by another caller or other native applications, or
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index 5938f75742b793868638e693a9a8c8dc686dfc46..7f30f3fdd2c63612232e31c331b26b17ad729efb 100644
+index d352b23f4a42b10e77a61de71069083f20f99136..36e9109a2eeb14983aa80905d09499ff68daeaf9 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
 @@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
index 302cb66261d11..f957509ddd87c 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
@@ -14,7 +14,7 @@ but it's not strictly necessary for this API to work to spec.
 Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index cf2a4efc6e99cd53bf0a3a7ae9222578627d3714..171ebbdc16d0fb47054ccc001cf144bb93355c28 100644
+index 9b2c91d39324b61afa49ccea6be2eda8308473ff..1652b52c5c752809348b3ab44d3703ac343c829d 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 @@ -382,13 +382,9 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -41,7 +41,7 @@ index cf2a4efc6e99cd53bf0a3a7ae9222578627d3714..171ebbdc16d0fb47054ccc001cf144bb
    if (display_id != display::kInvalidDisplayId) {
      // Check, but do not prompt, for permission to request a specific screen.
      // Sites generally need permission to get the display id in the first place.
-@@ -414,6 +411,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -413,6 +410,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        display_id = display::kInvalidDisplayId;
      }
    }
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 719b838e366ab..0b4c2c4aff7fe 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,7 +7,7 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index 2d17ddf94871a028af1b3470568a50d2b1fd7294..e994a0cd005890a9f0a4a41a1a8a5ba135a2d885 100644
+index 7a8ca6523bfd1ce237da9dce7fce03a6acb8b75e..c485572aa06e4b750468b8e23816fbcbf0515757 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
 @@ -20,7 +20,10 @@
@@ -24,7 +24,7 @@ index 2d17ddf94871a028af1b3470568a50d2b1fd7294..e994a0cd005890a9f0a4a41a1a8a5ba1
 @@ -49,9 +52,11 @@
  #include "ui/views/accessibility/view_accessibility.h"
  
- #if !defined(OS_ANDROID)
+ #if !BUILDFLAG(IS_ANDROID)
 +#if 0
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_list.h"
@@ -37,7 +37,7 @@ index 2d17ddf94871a028af1b3470568a50d2b1fd7294..e994a0cd005890a9f0a4a41a1a8a5ba1
                                 accessibility_mode);
  }
  
--#if !defined(OS_ANDROID)
+-#if !BUILDFLAG(IS_ANDROID)
 +#if 0
  std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
    std::unique_ptr<base::DictionaryValue> target_data(
@@ -65,13 +65,13 @@ index 2d17ddf94871a028af1b3470568a50d2b1fd7294..e994a0cd005890a9f0a4a41a1a8a5ba1
    data.Set(kPagesField, std::move(rvh_list));
  
    std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
--#if !defined(OS_ANDROID)
+-#if !BUILDFLAG(IS_ANDROID)
 +#if 0
    for (Browser* browser : *BrowserList::GetInstance()) {
      browser_list->Append(BuildTargetDescriptor(browser));
    }
--#endif  // !defined(OS_ANDROID)
-+#endif // !defined(OS_ANDROID)
+-#endif  // !BUILDFLAG(IS_ANDROID)
++#endif // !BUILDFLAG(IS_ANDROID)
    data.Set(kBrowsersField, std::move(browser_list));
  
    std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
@@ -113,7 +113,7 @@ index 2d17ddf94871a028af1b3470568a50d2b1fd7294..e994a0cd005890a9f0a4a41a1a8a5ba1
      }
    }
 +#endif
- #endif  // !defined(OS_ANDROID)
+ #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
    std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
 @@ -757,5 +770,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index e8e041d8c7179..7addac9d25797 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -10,10 +10,10 @@ them should they exist.
 This will be upstreamed.
 
 diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
-index 36f2e09d563a610128305cf4890e2af3bf6f4cdd..85363bd922bf0ab2630e3d5f350de0c58792963a 100644
+index 3725aa4cd902a9c84e22bbcbd702bd47e1901fe4..221019f5df71e1d66accbf2ea2d161bd1125666f 100644
 --- a/printing/printing_context_mac.h
 +++ b/printing/printing_context_mac.h
-@@ -85,6 +85,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
+@@ -83,6 +83,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
    // Returns true if the orientation was set.
    bool SetOrientationIsLandscape(bool landscape);
  
diff --git a/patches/chromium/fix_use_electron_generated_resources.patch b/patches/chromium/fix_use_electron_generated_resources.patch
index 1d976575fa597..60b0f49524594 100644
--- a/patches/chromium/fix_use_electron_generated_resources.patch
+++ b/patches/chromium/fix_use_electron_generated_resources.patch
@@ -26,7 +26,7 @@ index f72431f5bc7ba82316cf318f7845e7523c366d92..5133f3cd28c0d630a039118eb91c6c37
  #include "components/zoom/page_zoom_constants.h"
  #include "pdf/pdf_features.h"
 diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
-index ec70ac13f96a0085747ecc3f275fb392d3dcca42..6b470dad30760ee709e702e94c19eaeb3099442a 100644
+index 6d18517898c11c6a628cec2eade57fe845827b3d..a21f52e8a3c6f80d69b27faae4b77700fdd09e35 100644
 --- a/chrome/browser/printing/printing_service.cc
 +++ b/chrome/browser/printing/printing_service.cc
 @@ -5,7 +5,7 @@
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 78b610c496281..c3d77fe580024 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 4864b5301dec83150d3a48a9168e0d7ddef344ad..0e429686a325ef08ce617810c2c5ec4108bec973 100644
+index be63f30c49416be34766f75553ccb229687651a9..25f27103e7757b4b2ded2ea534e38f10a13ae33c 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3099,6 +3099,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3029,6 +3029,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,7 +20,7 @@ index 4864b5301dec83150d3a48a9168e0d7ddef344ad..0e429686a325ef08ce617810c2c5ec41
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 253c47f41294155bab9a3b0884e65a09fcacd0d0..ccce9c5de27c863c181e5c54b3f8976106a77c08 100644
+index 17ce3078c995f581325b9dcffe6b1589b05f48bc..986643109673cb62379ed822845f3c3050ab14aa 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -274,6 +274,11 @@ class CONTENT_EXPORT ContentBrowserClient {
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index a4fac7bbe5800..af18bf7aa9a6a 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -7,10 +7,10 @@ We don't use gin to create the V8 platform, because we need to inject Node
 things.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 6305d03e2315e8b9925071c018a81c102dda2a55..2bed8f7ce21ab052c0c319775875b9cf008b2636 100644
+index 0cd4077a0b534f089318e1ebffb9eb25214c3a42..f1ea1dfd740f4b9cf5f7cb7fd6bd445fb06e0100 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -115,9 +115,10 @@ IsolateHolder::~IsolateHolder() {
+@@ -117,9 +117,10 @@ IsolateHolder::~IsolateHolder() {
  void IsolateHolder::Initialize(ScriptMode mode,
                                 v8::ArrayBuffer::Allocator* allocator,
                                 const intptr_t* reference_table,
@@ -38,10 +38,10 @@ index 78133f9b34327c311c69620af621eba3d7f2cbf9..a965545de342811e468594fab4d792fc
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index f576fc909eed4168130571590e3a80d19ccc3dd8..ff91f59446275d027ac7100c1eb0dcd1051993da 100644
+index 1447b3828da1e50bd00f4a4975a2b4ce76a2c6ac..abdc2d491cd317d38cb4e7608681ea97bb5b8aab 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -341,12 +341,14 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -342,12 +342,14 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -59,7 +59,7 @@ index f576fc909eed4168130571590e3a80d19ccc3dd8..ff91f59446275d027ac7100c1eb0dcd1
    // Set this early on as some initialization steps, such as the initialization
    // of the virtual memory cage, already use V8's random number generator.
 diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
-index de650aa85dd083ec8c99d72b1f6cc447bb277f09..da97190ca86f5e04dd74dbff2282901fb4713f5b 100644
+index beeedc5737f6e60dde123200fbb6430a40366577..17ee4c894e89b7d2d12377475a5dd01910b61312 100644
 --- a/gin/v8_initializer.h
 +++ b/gin/v8_initializer.h
 @@ -29,7 +29,8 @@ class GIN_EXPORT V8Initializer {
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index 4a50d8a5e8825..385502d7e9df0 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -12,10 +12,10 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index 7821945da13ece57529c1de14d1cbd7f645d19ab..9be940f4ee047279f5969a6c572d6acbd408ddc5 100644
+index b26a3c72aa63b81f8f4558b28b404faf138a897b..335dc385eb03bc9634387af44dfd1aa3bfa71cb6 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
-@@ -229,6 +229,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
+@@ -230,6 +230,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
    base::AutoLock auto_lock(lock_);
    private_->TerminateInfoCollectionGpuProcess();
  }
@@ -28,7 +28,7 @@ index 7821945da13ece57529c1de14d1cbd7f645d19ab..9be940f4ee047279f5969a6c572d6acb
  
  void GpuDataManagerImpl::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index bb9a976842b869bf31c46c45686f6f5238841eb2..489619f6d3d4accadb811db287a9ff498f35d8bb 100644
+index 4364da656ac02f2f717e713f37d29ce44c14242b..ba044aee23db495e1da69c5bc0a807e96783faa9 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
 @@ -124,6 +124,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
@@ -40,10 +40,10 @@ index bb9a976842b869bf31c46c45686f6f5238841eb2..489619f6d3d4accadb811db287a9ff49
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index cddf8dfa73ba64b89e37b3ca375d5872d23b995f..06fbfe2b0a9a74a785ba54d495f7813286e81b6b 100644
+index 972bb4e8ba2d1470ed5f24c125551e3e627d79e4..d3b15d35eb458c00e470569904924c28c7a3957d 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1212,6 +1212,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1211,6 +1211,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
@@ -57,7 +57,7 @@ index cddf8dfa73ba64b89e37b3ca375d5872d23b995f..06fbfe2b0a9a74a785ba54d495f78132
  
  void GpuDataManagerImplPrivate::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index 8ae871aaf3da7b08da79490a87104ce62ca30b4e..ca6405c728187c10b19e86e7848b6f5fe558e601 100644
+index 81f6abb91a3fdefc1b0128f3224c7b82bfcbd0d2..99980e3528f4660bf1205e44326645d97e762cb9 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
 @@ -89,6 +89,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 55bed692b0c31..f735f131ced7f 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index f3a209264743ce4f38da3c51ad49a9a9308d39e0..57dbb19552cb8496a2c402cbf20ca7ce39c0dad2 100644
+index 1f84d9e87539d5d2d480f293732259d110a2d019..6d6111d61d52eed8950b98698393ef5811cf950f 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -903,6 +903,11 @@
+@@ -917,6 +917,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index c2802a41c4839..3fe0c64a017ec 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -6,25 +6,27 @@ Subject: gtk_visibility.patch
 Allow electron to depend on GTK in the GN build.
 
 diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
-index c7173176472e80d8de4888000e99d45843240785..c3076d8112ec8976a438d1351ad2e404ac64fce7 100644
+index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb1190282b6fc 100644
 --- a/build/config/linux/gtk/BUILD.gn
 +++ b/build/config/linux/gtk/BUILD.gn
-@@ -33,6 +33,7 @@ pkg_config("gtk_internal_config") {
+@@ -27,6 +27,7 @@ pkg_config("gtk_internal_config") {
  
  group("gtk") {
    visibility = [
 +    "//electron:*",
-     # This is the only target that can depend on GTK.  Do not add more targets
-     # to this list.
-     "//ui/gtk:gtk_stubs",
-@@ -64,6 +65,9 @@ pkg_config("gtkprint_internal_config") {
- }
+     # These are allow-listed for WebRTC builds.  Nothing in else should depend
+     # on GTK.
+     "//examples:peerconnection_client",
+diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
+index 54a3e170f5131ee03892410a0c883d4da4dd885a..1653e392630913dab5db84a7aafff0dfe36d1f71 100644
+--- a/ui/ozone/platform/x11/BUILD.gn
++++ b/ui/ozone/platform/x11/BUILD.gn
+@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//ui/base/ui_features.gni")
+ 
+-visibility = [ "//ui/ozone/*" ]
++visibility = [ "//ui/ozone/*", "//electron:*" ]
+ 
+ assert(is_linux || is_chromeos)
  
- group("gtkprint") {
--  visibility = [ "//ui/gtk:*" ]
-+  visibility = [
-+    "//electron:*",
-+    "//ui/gtk:*",
-+  ]
-   public_configs = [ ":gtkprint_internal_config" ]
- }
diff --git a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
index 200d22d17c1b8..2b0621f918e82 100644
--- a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
+++ b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
@@ -8,13 +8,13 @@ require a largeish patch to get working, so just redirect it to our
 implementation instead.
 
 diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
-index ae5c53a945707ea269db0468f3e12a90d61cbafb..e74637fd3bb934b97f7c55cd8c57e86035a8d64e 100644
+index b5c0e1c131351a51e3c03918dfc10e92ca1bace1..c6fe2e473a9d8a5ed2854a69909eb360d052147a 100644
 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 @@ -10,8 +10,8 @@
+ #include "base/bind.h"
  #include "base/feature_list.h"
  #include "base/guid.h"
- #include "base/ignore_result.h"
 -#include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
 -#include "chrome/browser/plugins/plugin_utils.h"
 +#include "electron/shell/browser/extensions/api/streams_private/streams_private_api.h"
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index dc5153dd6a2fd..5bc432556d651 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 13e126305548d8681754afdc5bca72e0df22f98c..63fd08c27d6f20295ce50be0685881ec0e645594 100755
+index 93bebfd9d25f4617bbbba559f62d9d75fe98d3eb..d0970adddd97f98d94d4d904d2cbcaa846a3ec5d 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
-@@ -282,6 +282,8 @@ def main():
+@@ -298,6 +298,8 @@ def main():
        'win32': 'win',
    }
    default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
diff --git a/patches/chromium/isolate_holder.patch b/patches/chromium/isolate_holder.patch
index 71d3f81551c19..6169c420417da 100644
--- a/patches/chromium/isolate_holder.patch
+++ b/patches/chromium/isolate_holder.patch
@@ -15,7 +15,7 @@ for us to register the isolate in between Isolate::Allocate and
 Isolate::Initialize.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 2bed8f7ce21ab052c0c319775875b9cf008b2636..9aa4536d5c8fb38ac58e41c107b946cf9ba5d738 100644
+index f1ea1dfd740f4b9cf5f7cb7fd6bd445fb06e0100..85a01a45bdd721e8f776a0d8f820452299614279 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
 @@ -57,7 +57,8 @@ IsolateHolder::IsolateHolder(
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index 05624bfa5e7b0..4bdf572786992 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 9b3e3ca0cf6c9052953e0ac82f1622113a8b2d0d..be8aaecf589bb5b8198d44acbf115e456ed76dc1 100644
+index 5a365936031e60fea77a5015414958756dc64ee7..104c1a5848ef0fa8b75b32a1243c52193d8a2d91 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -254,11 +254,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -245,11 +245,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
index 6ba0de2e1d1d7..b931eda611b74 100644
--- a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
+++ b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -9,12 +9,12 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index 5ad6c026e9d05b3c016adeab1c5eea9883dcac6c..2c94c115514b644c897e9c3896fe2941d42cf132 100644
+index bf4cbe990cb4db54f3836551ce2a5739ccdd8a65..6b1157bdc900beaea47f458d4ac62982cba72978 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -378,8 +378,12 @@ RunContentProcess(ContentMainParams params,
+@@ -379,8 +379,12 @@ RunContentProcess(ContentMainParams params,
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
      // Route stdio to parent console (if any) or create one.
 -    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
 -            switches::kEnableLogging)) {
diff --git a/patches/chromium/make_include_of_stack_trace_h_unconditional.patch b/patches/chromium/make_include_of_stack_trace_h_unconditional.patch
deleted file mode 100644
index d91176c28591b..0000000000000
--- a/patches/chromium/make_include_of_stack_trace_h_unconditional.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Tue, 11 May 2021 20:41:00 -0700
-Subject: make include of stack_trace.h unconditional
-
-This conditional include throws goma for a loop for no real reason.
-While we work on either upstreaming this or fixing the underlying goma
-issue this makes our builds 33% faster during local testing (11m vs 18m).
-
-diff --git a/base/sequence_checker.h b/base/sequence_checker.h
-index 50a548a759c2dc6d79978741a0c803500d53a9f8..cd5049e8bf59c51b890bcc332f9a1c5f0ec339c9 100644
---- a/base/sequence_checker.h
-+++ b/base/sequence_checker.h
-@@ -10,9 +10,8 @@
- #include "base/strings/string_piece.h"
- #include "build/build_config.h"
- 
--#if DCHECK_IS_ON()
- #include "base/debug/stack_trace.h"
--#endif
-+
- 
- // SequenceChecker is a helper class used to help verify that some methods of a
- // class are called sequentially (for thread-safety). It supports thread safety
diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch
index 6d09d342c4c50..390a3957727c5 100644
--- a/patches/chromium/mas-cfisobjc.patch
+++ b/patches/chromium/mas-cfisobjc.patch
@@ -6,11 +6,11 @@ Subject: mas: avoid usage of _CFIsObjC
 Removes usage of the _CFIsObjC private API.
 
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 6e5d76dc70e472f599385d967e8941200730fd9d..73d7f162a465d2e50d3ea3e6d14b6c0ed37775d1 100644
+index 11fa4bb6714518b98321d5e10919de3e01403efd..c9232593c08be04cb62fe7163a240cbed4f6e464 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
 @@ -31,12 +31,6 @@
- #if !defined(OS_IOS)
+ #if !BUILDFLAG(IS_IOS)
  CFTypeID SecACLGetTypeID();
  CFTypeID SecTrustedApplicationGetTypeID();
 -// The NSFont/CTFont toll-free bridging is broken before 10.15.
@@ -22,7 +22,7 @@ index 6e5d76dc70e472f599385d967e8941200730fd9d..73d7f162a465d2e50d3ea3e6d14b6c0e
  #endif
  }  // extern "C"
  
-@@ -329,8 +323,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+@@ -328,8 +322,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -32,7 +32,7 @@ index 6e5d76dc70e472f599385d967e8941200730fd9d..73d7f162a465d2e50d3ea3e6d14b6c0e
    return ns_val;
  }
  
-@@ -401,9 +394,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+@@ -400,9 +393,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  
diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch
index 8fc488bd02ce0..c55b2981c5830 100644
--- a/patches/chromium/mas-cgdisplayusesforcetogray.patch
+++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of CGDisplayUsesForceToGray
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 7354a04f927af9a61eff83a8a5a9bc1054da80ec..f38ef7e9e1781f0c880ffcccabb984dcafdaada8 100644
+index 1fb42e658d219e46bbc157d929d3b2158c063204..cb6dec724dbe511cb0c66d507d0b68db7296b648 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -149,7 +149,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
+@@ -155,7 +155,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
      display.set_color_depth(Display::kDefaultBitsPerPixel);
      display.set_depth_per_component(Display::kDefaultBitsPerComponent);
    }
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index afa9d5f4d5e02..653dc841ac895 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -11,10 +11,10 @@ needs to think it's coming from the PWA process). I think it can just be chopped
 out -- if there are any side-effects, we should be able to work around them.
 
 diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm
-index c8ba6f3da89d7d370032dd964c64a327b2e2484e..f9dde6d0a369a2691bac1a1fe1e79c21632abba3 100644
+index 9734fb620a9a4010083af41a9e5cea038556eef5..05c95fb9b15f5ccbfecaee29d360dd27bf42f086 100644
 --- a/components/remote_cocoa/app_shim/application_bridge.mm
 +++ b/components/remote_cocoa/app_shim/application_bridge.mm
-@@ -50,6 +50,7 @@
+@@ -51,6 +51,7 @@
  
    // NativeWidgetNSWindowHostHelper:
    id GetNativeViewAccessible() override {
@@ -22,7 +22,7 @@ index c8ba6f3da89d7d370032dd964c64a327b2e2484e..f9dde6d0a369a2691bac1a1fe1e79c21
      if (!remote_accessibility_element_) {
        int64_t browser_pid = 0;
        std::vector<uint8_t> element_token;
-@@ -60,6 +61,9 @@ id GetNativeViewAccessible() override {
+@@ -61,6 +62,9 @@ id GetNativeViewAccessible() override {
            ui::RemoteAccessibility::GetRemoteElementFromToken(element_token);
      }
      return remote_accessibility_element_.get();
@@ -32,7 +32,7 @@ index c8ba6f3da89d7d370032dd964c64a327b2e2484e..f9dde6d0a369a2691bac1a1fe1e79c21
    }
    void DispatchKeyEvent(ui::KeyEvent* event) override {
      bool event_handled = false;
-@@ -98,8 +102,10 @@ void GetWordAt(const gfx::Point& location_in_content,
+@@ -99,8 +103,10 @@ void GetWordAt(const gfx::Point& location_in_content,
    mojo::AssociatedRemote<mojom::TextInputHost> text_input_host_remote_;
  
    std::unique_ptr<NativeWidgetNSWindowBridge> bridge_;
@@ -44,10 +44,10 @@ index c8ba6f3da89d7d370032dd964c64a327b2e2484e..f9dde6d0a369a2691bac1a1fe1e79c21
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 2cb46846d9c42f8e08c29c39ad8fdbde12bc2ed9..5eb8124be309ad2e55ca01ece23a942b5e1b0101 100644
+index 1db44af73aba9f14aba348f83bf0f808412429b0..e89f05c94a55824aef573fc5cbc6fc29e57c6585 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -557,10 +557,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -560,10 +560,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -61,10 +61,10 @@ index 2cb46846d9c42f8e08c29c39ad8fdbde12bc2ed9..5eb8124be309ad2e55ca01ece23a942b
    // Beware: This view was briefly removed (in favor of a bare CALayer) in
    // crrev/c/1236675. The ordering of unassociated layers relative to NSView
 diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-index bea5957a47ebc4d75eafa52051be669ac2af9ffd..1f37c096cc4fa40ed26050db1cbdd28aea5dd681 100644
+index 2cd40c288f42937688e4f846a002779158ada68f..f4c7bb0ab75835bfdbd100ce852646bf77817c9e 100644
 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
 +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-@@ -75,8 +75,10 @@ id GetFocusedBrowserAccessibilityElement() override {
+@@ -73,8 +73,10 @@ id GetFocusedBrowserAccessibilityElement() override {
      return nil;
    }
    void SetAccessibilityWindow(NSWindow* window) override {
@@ -75,7 +75,7 @@ index bea5957a47ebc4d75eafa52051be669ac2af9ffd..1f37c096cc4fa40ed26050db1cbdd28a
    }
  
    void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event,
-@@ -138,8 +140,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
+@@ -136,8 +138,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
  
    mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_;
    std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_;
@@ -87,7 +87,7 @@ index bea5957a47ebc4d75eafa52051be669ac2af9ffd..1f37c096cc4fa40ed26050db1cbdd28a
  }
  
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 7d6b64bc764d16929ecad44dbf0187514a984b76..ed14f9459418e493a3baa6eb3a1265072a46ca76 100644
+index 80d639b4a9eb7fa9265da4977782d125b72db719..5f82a49f6336cf89c8d404f8aef7b103709c95e9 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
 @@ -49,7 +49,9 @@ class ScopedPasswordInputEnabler;
@@ -100,7 +100,7 @@ index 7d6b64bc764d16929ecad44dbf0187514a984b76..ed14f9459418e493a3baa6eb3a126507
  @class RenderWidgetHostViewCocoa;
  
  namespace content {
-@@ -667,10 +669,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -665,10 +667,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
    // EnsureSurfaceSynchronizedForWebTest().
    uint32_t latest_capture_sequence_number_ = 0u;
  
@@ -114,7 +114,7 @@ index 7d6b64bc764d16929ecad44dbf0187514a984b76..ed14f9459418e493a3baa6eb3a126507
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 72099de3d33e760cfcc56ee475da9c68f9389c07..7bdca5042ada597afe4228bab16489665eb29e24 100644
+index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed770634e6 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -253,8 +253,10 @@
@@ -128,7 +128,7 @@ index 72099de3d33e760cfcc56ee475da9c68f9389c07..7bdca5042ada597afe4228bab1648966
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1484,8 +1486,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1499,8 +1501,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index 72099de3d33e760cfcc56ee475da9c68f9389c07..7bdca5042ada597afe4228bab1648966
    return [GetInProcessNSView() window];
  }
  
-@@ -1529,9 +1533,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1544,9 +1548,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index 72099de3d33e760cfcc56ee475da9c68f9389c07..7bdca5042ada597afe4228bab1648966
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2030,12 +2036,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2039,12 +2045,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,10 +167,10 @@ index 72099de3d33e760cfcc56ee475da9c68f9389c07..7bdca5042ada597afe4228bab1648966
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 37151bca8d18a3decc418812b6a9ea76eb0c8f3a..3ac702aede00c3eba77751115d6663f561b43c05 100644
+index cf452160a6504379136712fdda8e7d68ed22b94c..2c0a36f1cd4fd25eddb70ac03f6c45832531e350 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -318,6 +318,13 @@ component("base") {
+@@ -317,6 +317,13 @@ component("base") {
      ]
    }
  
@@ -205,10 +205,10 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index 0dfd2de62df57def834a3be4349685da3aab72fb..1881932c122daad0d62e3382bd0e221402b6d380 100644
+index 03c2f1a992984995b5805dad12cc855775e223d9..14fb49999bc7be5c538b80c99651dab12bc6d2f6 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-@@ -29,7 +29,9 @@
+@@ -31,7 +31,9 @@
  #include "ui/views/window/dialog_observer.h"
  
  @class NativeWidgetMacNSWindow;
@@ -218,7 +218,7 @@ index 0dfd2de62df57def834a3be4349685da3aab72fb..1881932c122daad0d62e3382bd0e2214
  @class NSView;
  
  namespace remote_cocoa {
-@@ -429,11 +431,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -445,11 +447,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -233,10 +233,10 @@ index 0dfd2de62df57def834a3be4349685da3aab72fb..1881932c122daad0d62e3382bd0e2214
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index 48dd1adb4a74201a866b254cfaec85b996ee7517..5b2a46594a23968034a17fbfed173e1031867df9 100644
+index 946de814ec91afe047697c07c73edad6ffc42a78..9d5d58991bd1f16803ba470766416d4f8e409944 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -286,14 +286,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -294,14 +294,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +259,7 @@ index 48dd1adb4a74201a866b254cfaec85b996ee7517..5b2a46594a23968034a17fbfed173e10
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1206,6 +1214,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1271,6 +1279,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index 48dd1adb4a74201a866b254cfaec85b996ee7517..5b2a46594a23968034a17fbfed173e10
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1213,14 +1222,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1278,14 +1287,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index 20cabc776d492..541ac9b7e977d 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -16,10 +16,10 @@ cases where performance improves when disabling remote CoreAnimation (remote
 CoreAnimation is really only about battery usage).
 
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h
-index c384f18ec959303bd3671c570af87b604d20cf23..f420bd94951f5a2b03d20e5892a4039271ed2078 100644
+index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b42394474 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.h
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h
-@@ -20,7 +20,9 @@
+@@ -21,7 +21,9 @@
  #include "ui/gl/gl_surface_egl.h"
  #endif
  
@@ -29,7 +29,7 @@ index c384f18ec959303bd3671c570af87b604d20cf23..f420bd94951f5a2b03d20e5892a40392
  @class CALayer;
  
  namespace ui {
-@@ -113,7 +115,9 @@ class ImageTransportSurfaceOverlayMacBase : public BaseClass,
+@@ -116,7 +118,9 @@ class ImageTransportSurfaceOverlayMacBase : public BaseClass,
    base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
  
    bool use_remote_layer_api_;
@@ -40,10 +40,10 @@ index c384f18ec959303bd3671c570af87b604d20cf23..f420bd94951f5a2b03d20e5892a40392
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 79a357037df22c78d31ace77ee8cf6291818ecee..3c7d5add7e4f4372708a1b2f7bf31f7b0a4aa0af 100644
+index 224542e2a70e980684d5d882af7fe3988c5ee96b..7a726eea86f21fe31077aaa447cccc05007d5eaa 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@
  
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
@@ -52,7 +52,7 @@ index 79a357037df22c78d31ace77ee8cf6291818ecee..3c7d5add7e4f4372708a1b2f7bf31f7b
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -62,6 +62,7 @@
+@@ -68,6 +68,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
@@ -60,7 +60,7 @@ index 79a357037df22c78d31ace77ee8cf6291818ecee..3c7d5add7e4f4372708a1b2f7bf31f7b
  }
  
  template <typename BaseClass>
-@@ -142,7 +143,9 @@
+@@ -148,7 +149,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
@@ -114,18 +114,28 @@ index d684614589c9e55965450d712ee6dc0deef6aade..e0446753a3d972215423c079160fe8bf
  
  // This function will check if all of the interfaces listed above are supported
 diff --git a/ui/base/cocoa/remote_layer_api.mm b/ui/base/cocoa/remote_layer_api.mm
-index bbaf9f466f4999acb5bfccf3b9565fd8f556ca2f..8c846ce9523a4b2f6fbdbdbeae4f94b45ac3c115 100644
+index e6baf74c966791ed5326fea23e7d23259a781313..7fab070b8b06dfc5c9940c3b800735d187a72cf9 100644
 --- a/ui/base/cocoa/remote_layer_api.mm
 +++ b/ui/base/cocoa/remote_layer_api.mm
-@@ -12,6 +12,7 @@
+@@ -10,14 +10,17 @@
+ 
  namespace ui {
  
++#ifndef MAS_BUILD
+ namespace {
+ // Control use of cross-process CALayers to display content directly from the
+ // GPU process on Mac.
+ base::Feature kRemoteCoreAnimationAPI{"RemoteCoreAnimationAPI",
+                                       base::FEATURE_ENABLED_BY_DEFAULT};
+ }  // namespace
++#endif
+ 
  bool RemoteLayerAPISupported() {
 +#ifndef MAS_BUILD
-   static bool disabled_at_command_line =
-       base::CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kDisableRemoteCoreAnimation);
-@@ -46,6 +47,9 @@ bool RemoteLayerAPISupported() {
+   if (!base::FeatureList::IsEnabled(kRemoteCoreAnimationAPI))
+     return false;
+ 
+@@ -49,6 +52,9 @@ bool RemoteLayerAPISupported() {
  
    // If everything is there, we should be able to use the API.
    return true;
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index 71b40012bb4e9..a45b0eb6bd148 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -139,7 +139,7 @@ index 3f7dce0281f7b5a540d7b9377ef14a8a6aa9a2fa..11d8419791f3e45d5242081422d452d4
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 5e1b1f542e98f9257938f909a2d92e3117e298af..4b9825694c8b8d6bbe671ebeef8eb57baf8b05a1 100644
+index b19e09806e1e1863dd07bb9cf70628e951cd68a9..289e869b5efea09af5172f0b1c5cbd80eddd78cd 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -174,6 +174,12 @@ source_set("audio") {
@@ -169,10 +169,10 @@ index ebdc6364312ee710d416318836c03aeec9bfb65c..aa9b50de7efaf0e1b64effea93204984
  }
  
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 3a541ac224c53b2809e8634286dac91873d46b72..89c9b095a2a96b9cae5e8d4bba85847f9585f985 100644
+index e59fec60e9d593d311b21c12daf2d611a36a2d6e..b812dee59b55edee6efe73ce4b1da0a89b45240e 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
-@@ -140,8 +140,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
+@@ -129,8 +129,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
  
    bool Watch() override {
      CheckOnCorrectSequence();
@@ -182,10 +182,10 @@ index 3a541ac224c53b2809e8634286dac91873d46b72..89c9b095a2a96b9cae5e8d4bba85847f
      if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged,
                                                     base::Unretained(this)))) {
        LOG(ERROR) << "DNS config watch failed to start.";
-@@ -158,6 +158,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
+@@ -147,6 +147,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
        success = false;
      }
- #endif  // !defined(OS_IOS)
+ #endif  // !BUILDFLAG(IS_IOS)
 +#endif
      return success;
    }
@@ -285,3 +285,23 @@ index d59a16112d27e2696437163483c44eca414c225c..1ccd20fe7efa3cbae48f99d0660b0252
      default:
        NOTREACHED();
        return nullptr;
+diff --git a/ui/accessibility/platform/inspect/ax_transform_mac.mm b/ui/accessibility/platform/inspect/ax_transform_mac.mm
+index 7cb34e119cd30353fe56e7c71ed5e1d417896888..dbb6cc8e37eff9b30269687f29808ec3ca46b243 100644
+--- a/ui/accessibility/platform/inspect/ax_transform_mac.mm
++++ b/ui/accessibility/platform/inspect/ax_transform_mac.mm
+@@ -86,6 +86,7 @@
+     }
+   }
+ 
++#ifndef MAS_BUILD
+   // AXTextMarker
+   if (IsAXTextMarker(value)) {
+     return AXTextMarkerToBaseValue(value, indexer);
+@@ -94,6 +95,7 @@
+   // AXTextMarkerRange
+   if (IsAXTextMarkerRange(value))
+     return AXTextMarkerRangeToBaseValue(value, indexer);
++#endif
+ 
+   // Accessible object
+   if (IsNSAccessibilityElement(value) || IsAXUIElement(value)) {
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 55391abb060cd..053a68b0b3d18 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index f8e93f5926b60e496cf649a56c161158f6eb8044..13c730e6d8c977e014c28d7eeb2513d1f9b6e47e 100644
+index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a0927fad90ad 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -119,6 +119,11 @@
+@@ -123,6 +123,11 @@
  #include "services/network/web_transport.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
  
@@ -22,7 +22,7 @@ index f8e93f5926b60e496cf649a56c161158f6eb8044..13c730e6d8c977e014c28d7eeb2513d1
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -433,6 +438,79 @@ bool GetFullDataFilePath(
+@@ -437,6 +442,79 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -102,7 +102,7 @@ index f8e93f5926b60e496cf649a56c161158f6eb8044..13c730e6d8c977e014c28d7eeb2513d1
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -659,6 +737,13 @@ void NetworkContext::SetClient(
+@@ -674,6 +752,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -116,10 +116,10 @@ index f8e93f5926b60e496cf649a56c161158f6eb8044..13c730e6d8c977e014c28d7eeb2513d1
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2135,6 +2220,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2173,6 +2258,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 +    auto remote_cert_verifier = std::make_unique<RemoteCertVerifier>(std::move(cert_verifier));
 +    remote_cert_verifier_ = remote_cert_verifier.get();
 +    cert_verifier = std::make_unique<net::CachingCertVerifier>(std::move(remote_cert_verifier));
@@ -127,10 +127,10 @@ index f8e93f5926b60e496cf649a56c161158f6eb8044..13c730e6d8c977e014c28d7eeb2513d1
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 6784d76ced7754c44054b243a75a6265314b4d56..55cff37a1ad0ae89bde3ffda11c3d1e9d194e22d 100644
+index f69a86f90a6a9055cfc7d4a613e82c0260582688..486a151f6923fd0069ce5aaaffe6559cb60a88ec 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -103,6 +103,7 @@ class DomainReliabilityMonitor;
+@@ -101,6 +101,7 @@ class DomainReliabilityMonitor;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -138,7 +138,7 @@ index 6784d76ced7754c44054b243a75a6265314b4d56..55cff37a1ad0ae89bde3ffda11c3d1e9
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -217,6 +218,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -216,6 +217,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -147,7 +147,7 @@ index 6784d76ced7754c44054b243a75a6265314b4d56..55cff37a1ad0ae89bde3ffda11c3d1e9
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -758,6 +761,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -769,6 +772,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    CertVerifierWithTrustAnchors* cert_verifier_with_trust_anchors_ = nullptr;
  #endif
  
@@ -157,10 +157,10 @@ index 6784d76ced7754c44054b243a75a6265314b4d56..55cff37a1ad0ae89bde3ffda11c3d1e9
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 8cdb76c6eac2bf3412b55ab1dd0fad0ccb1f954d..647b1e2fc81fb4ee177827d6909c816631009ec3 100644
+index d7c10e5a55bf0db67c113e0f46094de3c3b3d158..89c00d7ab1510ebdbce49876fcd5f94c5096b3c9 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -272,6 +272,17 @@ struct NetworkContextFilePaths {
+@@ -277,6 +277,17 @@ struct NetworkContextFilePaths {
    bool trigger_migration = false;
  };
  
@@ -178,7 +178,7 @@ index 8cdb76c6eac2bf3412b55ab1dd0fad0ccb1f954d..647b1e2fc81fb4ee177827d6909c8166
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -787,6 +798,9 @@ interface NetworkContext {
+@@ -792,6 +803,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 78dad69115f51..196c6f8d617db 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -7,7 +7,7 @@ Pass RenderFrameHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.
 
 diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
-index e2aec3c3faf1dc35788c577b10f2944097a3b020..0c2ce17a3ce7ff70f47485b85fa8c70e8a1230b2 100644
+index 06a1db7fd9324de7d1fcf49c5b8a40b922a945be..c63b92a5a100785bf00b5e6da4c7f71bb9e769b7 100644
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
 @@ -196,6 +196,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
@@ -131,10 +131,10 @@ index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df6
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index ac1cbdad1eaa7ce7359a611a349b318ea7617f6c..dde9fb6174be8a0da70cf29d5428ef31035a39f7 100644
+index b95a062670467c93d01828962a9a592e3193811c..064b5642425290f1d9ab82f75b22fd43973ebf5b 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2130,7 +2130,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2124,7 +2124,7 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/pepper_plugin_support.patch b/patches/chromium/pepper_plugin_support.patch
index b6097fe2e8f84..b9d73ff072c6d 100644
--- a/patches/chromium/pepper_plugin_support.patch
+++ b/patches/chromium/pepper_plugin_support.patch
@@ -156,13 +156,13 @@ index 40fafdbed313800a3f420d9d5a3daf8bbbdb7d95..1367725e04455ba5f299b8341a28f222
  
  #endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
 diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-index 60cfd89dfd18eced6f6d103267b80d547d2e9f26..95d36e99832f434d878a2a2fc3101a611926acb2 100644
+index 4b84f4ef068a76fa2be244a7f7ca2c6a8734bd46..13ae0a57535dfb516eb70b272fdaa5a4720d0591 100644
 --- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
 +++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-@@ -7,8 +7,13 @@
+@@ -6,8 +6,13 @@
+ 
  #include "base/check_op.h"
  #include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
- #include "chrome/renderer/pepper/pepper_flash_fullscreen_host.h"
 +#if 0
  #include "chrome/renderer/pepper/pepper_uma_host.h"
 +#endif
@@ -173,23 +173,7 @@ index 60cfd89dfd18eced6f6d103267b80d547d2e9f26..95d36e99832f434d878a2a2fc3101a61
  #include "content/public/renderer/renderer_ppapi_host.h"
  #include "pdf/buildflags.h"
  #include "ppapi/host/ppapi_host.h"
-@@ -37,6 +42,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-   if (!host_->IsValidInstance(instance))
-     return nullptr;
- 
-+#if 0
-   if (host_->GetPpapiHost()->permissions().HasPermission(
-           ppapi::PERMISSION_FLASH)) {
-     switch (message.type()) {
-@@ -46,6 +52,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-       }
-     }
-   }
-+#endif
- 
-   // TODO(raymes): PDF also needs access to the FlashFontFileHost currently.
-   // We should either rename PPB_FlashFont_File to PPB_FontFile_Private or get
-@@ -68,7 +75,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
+@@ -55,7 +60,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
      }
    }
  
@@ -198,7 +182,7 @@ index 60cfd89dfd18eced6f6d103267b80d547d2e9f26..95d36e99832f434d878a2a2fc3101a61
    if (host_->GetPpapiHost()->permissions().HasPermission(
            ppapi::PERMISSION_PDF)) {
      switch (message.type()) {
-@@ -79,6 +86,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
+@@ -66,6 +71,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
    }
  #endif
  
@@ -206,7 +190,7 @@ index 60cfd89dfd18eced6f6d103267b80d547d2e9f26..95d36e99832f434d878a2a2fc3101a61
    // Permissions for the following interfaces will be checked at the
    // time of the corresponding instance's method calls.  Currently these
    // interfaces are available only for whitelisted apps which may not have
-@@ -88,6 +96,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
+@@ -75,6 +81,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
        return std::make_unique<PepperUMAHost>(host_, instance, resource);
      }
    }
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index 20da4288aef00..3c5ac87ef3497 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-index 3afa0d34a6aff1d8882592fc4a3720698124a9c4..18de9f4e9c3c9599d1ab83a638bbd887b9f7cc59 100644
+index 063cbf00a7ae871d426cef5cec00aa379c3ace11..444d3cc2e1b00a62f382232d3d2eccdd481abf11 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
 @@ -5,7 +5,7 @@
@@ -22,7 +22,7 @@ index 3afa0d34a6aff1d8882592fc4a3720698124a9c4..18de9f4e9c3c9599d1ab83a638bbd887
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-index 701d21200fe38870d08c2da93a1b8d139af79b5b..c5fc046b16e927efb017e40d980d98fa830b5bd4 100644
+index 648e199cb015155ba84cf1c846cf6d2a16858007..294bfb625d1155e640eeeb37bea597dc2d980e58 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 @@ -5,7 +5,7 @@
@@ -32,10 +32,10 @@ index 701d21200fe38870d08c2da93a1b8d139af79b5b..c5fc046b16e927efb017e40d980d98fa
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/base/cursor/cursor.h"
  #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index b40d96b754118c1dd1f1fb62f441a5a870d16ed9..7e205e324f5a8604ae6624c42b5b216e3070c072 100644
+index 0c1fa8676d00240e60ddd037664a409d1c9619dd..64d21f1878c3433324fc61353a10ee21d59c0b47 100644
 --- a/chrome/browser/ui/views/overlay/close_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/close_image_button.cc
 @@ -6,7 +6,7 @@
@@ -48,7 +48,7 @@ index b40d96b754118c1dd1f1fb62f441a5a870d16ed9..7e205e324f5a8604ae6624c42b5b216e
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
-index 7b711bdbaf4afddd6ccf300af7bab26487942243..987a60b81554b676661d8f1a53facbc9dc08f5d5 100644
+index 8e54570ea4c83483eedee4c781f0498ba07bc3dd..b1eb0b2f1a3dfb71e1f5d3917c67e66ac2b27d22 100644
 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc
 +++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
 @@ -4,7 +4,7 @@
@@ -59,9 +59,9 @@ index 7b711bdbaf4afddd6ccf300af7bab26487942243..987a60b81554b676661d8f1a53facbc9
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
- #include "ui/gfx/paint_vector_icon.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index d63256af63e93c7aab4ce348b9d27953d5346c6c..0f708806aa0e4555c288da38e0f9ecd4c89b1c3e 100644
+index 6636961b18c71de0477407e6bebc64b091144afd..674cd9100f6ce4e8811e04b459da9f98fb07af3d 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
 @@ -16,9 +16,11 @@
@@ -90,7 +90,7 @@ index d63256af63e93c7aab4ce348b9d27953d5346c6c..0f708806aa0e4555c288da38e0f9ecd4
  #include "ui/aura/window.h"
  #endif
  
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 +#if 0
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
@@ -99,13 +99,13 @@ index d63256af63e93c7aab4ce348b9d27953d5346c6c..0f708806aa0e4555c288da38e0f9ecd4
    overlay_window->Init(std::move(params));
    overlay_window->OnRootViewReady();
  
--#if defined(OS_WIN)
+-#if BUILDFLAG(IS_WIN)
 +#if 0
    std::wstring app_user_model_id;
    Browser* browser =
        chrome::FindBrowserWithWebContents(controller->GetWebContents());
 diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index ab1717bd630e8f143a2ba6dddfeb04bc95beb7fd..2cf5bcd690a9db84cb14c409f31a82da6a9c0348 100644
+index 2a1dcf30751d1c22831e4c2eed43e90ea539b535..113bce8bff4984f673c09d4cad5b98c7ce40a311 100644
 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
 @@ -6,7 +6,7 @@
@@ -118,7 +118,7 @@ index ab1717bd630e8f143a2ba6dddfeb04bc95beb7fd..2cf5bcd690a9db84cb14c409f31a82da
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-index 375efc8f931b1bfd595265829e47c8187a8d8d39..080e652f2c3e88b9a082dbd8fef82c461311cd9c 100644
+index 90c9dbbfa741da8cf72594738c1686b14e277663..34063436a7e8e36f624c1b86765fe886434df54a 100644
 --- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
 +++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
 @@ -6,7 +6,7 @@
@@ -131,7 +131,7 @@ index 375efc8f931b1bfd595265829e47c8187a8d8d39..080e652f2c3e88b9a082dbd8fef82c46
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-index 8153a0b667383374d787ce105c177eda0cdf2171..e5f33a4c43f2571669dd2bef2260e548e20be9b4 100644
+index ae3b37b13498d63b0bc8d7d66e228f974e1c4b4a..9a4e7de29921209a5a7807efeecb02e05f38692d 100644
 --- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
 +++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
 @@ -5,7 +5,7 @@
@@ -144,7 +144,7 @@ index 8153a0b667383374d787ce105c177eda0cdf2171..e5f33a4c43f2571669dd2bef2260e548
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-index a3cff2dfa906aa469abd5f12f3f70f0acea0adfe..93ad732afe209a9f51756112a5aa4f7dcd6a8b2e 100644
+index c5254509559fd89a8831d69498e2f120416b08df..711490193ac7a9a122fe2b85661dd1a63d3a06ac 100644
 --- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
 @@ -5,7 +5,7 @@
@@ -155,9 +155,9 @@ index a3cff2dfa906aa469abd5f12f3f70f0acea0adfe..93ad732afe209a9f51756112a5aa4f7d
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
- #include "ui/gfx/paint_vector_icon.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-index a681ba4ed2de3226b20c5e89361c4bec47dfb8ea..5cd85706018fe163d1e0a9e48e3b8a4be5dec7e9 100644
+index 98d653475bf2aaa57bd11961df3697882a9a40d7..3870cad08c531a2a8b3f6ba84088065a0d31f033 100644
 --- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
 @@ -5,7 +5,7 @@
@@ -168,9 +168,9 @@ index a681ba4ed2de3226b20c5e89361c4bec47dfb8ea..5cd85706018fe163d1e0a9e48e3b8a4b
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
- #include "ui/gfx/paint_vector_icon.h"
+ #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
-index 4fceb3f5d802e7f01df59d1b3e9c80cc48af714a..70075228f6104b5a16f551af56eafc6829124143 100644
+index d5690233eb85d9f2992ae90461c0d1fd83730d84..d32ee40d1dc7a0004d534540189179b240964888 100644
 --- a/chrome/browser/ui/views/overlay/track_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/track_image_button.cc
 @@ -6,7 +6,7 @@
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index cc7c628d48689..6b72c3846a61b 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
-index 0de0532d64897c91ce0f72d165976e12e1dec03e..735da67a83b10c56d747e2a2b512f7b7d1aae142 100644
+index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f57c192940 100644
 --- a/chrome/browser/printing/print_job.cc
 +++ b/chrome/browser/printing/print_job.cc
 @@ -88,6 +88,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
@@ -28,7 +28,7 @@ index 0de0532d64897c91ce0f72d165976e12e1dec03e..735da67a83b10c56d747e2a2b512f7b7
  }
 +#endif
  
- #endif  // defined(OS_WIN)
+ #endif  // BUILDFLAG(IS_WIN)
  
 @@ -355,8 +357,10 @@ void PrintJob::StartPdfToEmfConversion(
  
@@ -55,7 +55,7 @@ index 0de0532d64897c91ce0f72d165976e12e1dec03e..735da67a83b10c56d747e2a2b512f7b7
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
-index e19f62354edb8acad722c6680296b7d2f55f51fe..51c41b4dbab81ffe5840d59ef45b661cf5c5534b 100644
+index f922dc5c61ec85e6102a8e92b1b7096382dec6f0..477db7fa8517df9d4b09467ea569af3fe4c4f78c 100644
 --- a/chrome/browser/printing/print_job.h
 +++ b/chrome/browser/printing/print_job.h
 @@ -257,6 +257,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
@@ -69,7 +69,7 @@ index e19f62354edb8acad722c6680296b7d2f55f51fe..51c41b4dbab81ffe5840d59ef45b661c
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index d8f67ab5116483eb2eeb4cc09f19bbcbccb74b37..4283a5743c695a7376722f80925722d9e7a6496e 100644
+index fc26fd8f32e4c1edd3ca41baf0e9cdd482b25c03..aeaa88bee6b4ce499c361e1b2e93bf5fb0fd31ea 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,13 +20,13 @@
@@ -87,13 +87,13 @@ index d8f67ab5116483eb2eeb4cc09f19bbcbccb74b37..4283a5743c695a7376722f80925722d9
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -245,16 +245,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
- #endif  // defined(OS_LINUX) && defined(USE_CUPS)
+@@ -239,16 +239,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+ #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
 -  mojom::ResultCode result;
    {
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
      // Blocking is needed here because Windows printer drivers are oftentimes
      // not thread-safe and have to be accessed on the UI thread.
      base::ScopedAllowBlocking allow_blocking;
@@ -111,9 +111,22 @@ index d8f67ab5116483eb2eeb4cc09f19bbcbccb74b37..4283a5743c695a7376722f80925722d9
 -  GetSettingsDone(std::move(callback), result);
  }
  
- #if defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_CHROMEOS)
+diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
+index f8e48861a2964da636afd767c0034d782ee52d6e..174d51d3b6d9f0131be36cf80199b27875d23960 100644
+--- a/chrome/browser/printing/print_job_worker_oop.cc
++++ b/chrome/browser/printing/print_job_worker_oop.cc
+@@ -209,7 +209,7 @@ void PrintJobWorkerOop::OnFailure() {
+ }
+ 
+ void PrintJobWorkerOop::ShowErrorDialog() {
+-  ShowPrintErrorDialog();
++  // [electron]: removed.
+ }
+ 
+ void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e0478e3b15c 100644
+index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2e220f675 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -29,10 +29,10 @@
@@ -208,10 +221,10 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
 +                                    bool silent,
 +                                    base::Value settings,
 +                                    CompletionCallback callback)  {
-   auto weak_this = weak_ptr_factory_.GetWeakPtr();
-   DisconnectFromCurrentPrintJob();
-   if (!weak_this)
-@@ -347,7 +360,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+   // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
+   // is still valid after a possible inner message loop runs in
+   // `DisconnectFromCurrentPrintJob()`.
+@@ -355,7 +368,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
    // go in `ReleasePrintJob()`.
  
    SetPrintingRFH(rfh);
@@ -222,7 +235,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -491,7 +506,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -499,7 +514,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -232,7 +245,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
    if (!content::RenderProcessHost::FromID(process_id)) {
-@@ -499,16 +515,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -507,16 +523,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -256,7 +269,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -622,12 +641,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -630,12 +649,13 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -271,7 +284,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
-@@ -645,18 +665,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -653,18 +673,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -293,7 +306,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -666,6 +688,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -674,6 +696,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -301,7 +314,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -691,7 +714,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -699,7 +722,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -310,7 +323,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
      return;
    }
    int process_id = render_process_host->GetID();
-@@ -714,7 +737,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -722,7 +745,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -318,7 +331,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  #endif
  
    ReleasePrinterQuery();
-@@ -729,6 +751,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -737,6 +759,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -330,7 +343,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -739,8 +766,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -747,8 +774,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -341,7 +354,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -808,6 +837,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -816,6 +845,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -353,7 +366,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -869,7 +903,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -877,7 +911,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -365,7 +378,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    if (!weak_this)
      return false;
  
-@@ -944,6 +981,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -952,6 +989,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    content::RenderFrameHost* rfh = printing_rfh_;
    printing_rfh_ = nullptr;
  
@@ -379,7 +392,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
    if (!print_job_)
      return;
  
-@@ -989,7 +1033,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1001,7 +1045,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -389,7 +402,7 @@ index c9f1502da55d89de0eede73a7d39047c090594d0..c857a48e00c3535c74691f4e36d44e04
  
    if (!cookie) {
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 5771a3ebd76145c6cf8a2ccc33abc886802ed59f..fb3af5e3f57f868fd00716f76f70aa63c4cb99c9 100644
+index 2661776307f773ac8f2c62529ec86349b045ee8f..4fa8f358ee59baed32ef4fd0684d010256206a54 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
 @@ -37,6 +37,8 @@ namespace printing {
@@ -412,7 +425,7 @@ index 5771a3ebd76145c6cf8a2ccc33abc886802ed59f..fb3af5e3f57f868fd00716f76f70aa63
 +                        CompletionCallback callback);
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-   // Prints the document in |print_data| with settings specified in
+   // Prints the document in `print_data` with settings specified in
 @@ -106,6 +111,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
                       ScriptedPrintCallback callback) override;
    void ShowInvalidPrinterSettingsError() override;
@@ -421,7 +434,7 @@ index 5771a3ebd76145c6cf8a2ccc33abc886802ed59f..fb3af5e3f57f868fd00716f76f70aa63
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -197,7 +203,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -193,7 +199,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -431,7 +444,7 @@ index 5771a3ebd76145c6cf8a2ccc33abc886802ed59f..fb3af5e3f57f868fd00716f76f70aa63
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -252,9 +259,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -248,9 +255,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -470,7 +483,7 @@ index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19544cfe12 100644
+index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625c9209ba9 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -39,6 +39,7 @@
@@ -481,7 +494,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1226,7 +1227,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1253,7 +1254,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -491,7 +504,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
      if (!weak_this)
        return;
  
-@@ -1257,7 +1259,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1284,7 +1286,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -500,7 +513,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1272,7 +1274,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1299,7 +1301,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -509,7 +522,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1303,7 +1305,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1330,7 +1332,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -519,7 +532,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1350,6 +1353,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1377,6 +1380,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -528,7 +541,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
    print_preview_context_.OnPrintPreview();
  
    if (print_preview_context_.IsForArc()) {
-@@ -1886,7 +1891,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1914,7 +1919,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -538,7 +551,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1901,7 +1907,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1929,7 +1935,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -549,7 +562,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1909,7 +1917,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1937,7 +1945,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -558,7 +571,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1928,8 +1936,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1956,8 +1964,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -575,7 +588,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2177,36 +2192,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2205,36 +2220,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -639,7 +652,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2350,7 +2380,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2378,7 +2408,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -648,7 +661,7 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2579,18 +2609,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
+@@ -2623,18 +2653,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
@@ -669,10 +682,10 @@ index 650b5550f982fa5c5c522efaa9b8e305b7edc5e7..1b776a614d6e0f6c3ae13ef3c705bc19
  
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index 90236920457c931c86426049c6cbc30b592b597f..353178863eba37b9112e784ffa4b3519076e91b9 100644
+index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b43325da73 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
-@@ -256,7 +256,7 @@ class PrintRenderFrameHelper
+@@ -254,7 +254,7 @@ class PrintRenderFrameHelper
        mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
  
    // printing::mojom::PrintRenderFrame:
@@ -681,7 +694,7 @@ index 90236920457c931c86426049c6cbc30b592b597f..353178863eba37b9112e784ffa4b3519
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
-@@ -323,7 +323,9 @@ class PrintRenderFrameHelper
+@@ -321,7 +321,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -692,7 +705,7 @@ index 90236920457c931c86426049c6cbc30b592b597f..353178863eba37b9112e784ffa4b3519
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -332,12 +334,14 @@ class PrintRenderFrameHelper
+@@ -330,12 +332,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.
@@ -710,7 +723,7 @@ index 90236920457c931c86426049c6cbc30b592b597f..353178863eba37b9112e784ffa4b3519
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index f8f0f4bdfbb8db883f883f62f9d6e4b987d7b113..c2505f5e0049dc7ee8783056538ca4c2d0968744 100644
+index 3d8281c8af9a4339bdd492c67edafc4ec6efb09d..6f8b9d42e051579cf1d0774afa771a7e45d31ff2 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
 @@ -120,7 +120,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
@@ -722,12 +735,12 @@ index f8f0f4bdfbb8db883f883f62f9d6e4b987d7b113..c2505f5e0049dc7ee8783056538ca4c2
      std::unique_ptr<PrintSettings> settings =
          PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 7d937e7e3f19df351d410185fc4dc3b7c8937f2e..e87170e6957733f06bcc296bcca3fc331557ed46 100644
+index 3f36303105b7979a1a771bf26b42596abe5b3cce..52f740bb832db4a8d76431d9bc77cab10bb7e0c7 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
-@@ -175,6 +175,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -170,6 +170,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
  
-   std::unique_ptr<PrintSettings> TakeAndResetSettings();
+   bool PrintingAborted() const { return abort_printing_; }
  
 +  // Reinitializes the settings for object reuse.
 +  void ResetSettings();
@@ -735,7 +748,7 @@ index 7d937e7e3f19df351d410185fc4dc3b7c8937f2e..e87170e6957733f06bcc296bcca3fc33
    int job_id() const { return job_id_; }
  
   protected:
-@@ -185,9 +188,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -180,9 +183,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
    static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
                                                       bool skip_system_calls);
  
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index f67f292c483f1..4fa2ecbd96c66 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -1,11 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Raymond Zhao <raymondzhao@microsoft.com>
 Date: Wed, 18 Aug 2021 08:24:10 -0700
-Subject: Convert Electron ProcessSingleton changes to patch
+Subject: extend ProcessSingleton
 
-This patch applies Electron ProcessSingleton changes
-onto the Chromium files, so that Electron doesn't need to maintain
-separate copies of those files.
+This patch applies Electron ProcessSingleton changes onto the Chromium
+files.
 
 This patch adds a few changes to the Chromium code:
 1. It adds a parameter `program_name` to the Windows constructor, making
@@ -25,7 +24,7 @@ This patch adds a few changes to the Chromium code:
    before the browser thread is ready.
 
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index fd88cc5122ad5e02a6694b2dec9fd0d16a300cc0..13b325ecad9ba48398173e89680287c63efd4fa6 100644
+index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..8f94cc300b58e8a94b6ca155aa3cf370bcb948d8 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -102,12 +102,19 @@ class ProcessSingleton {
@@ -58,7 +57,7 @@ index fd88cc5122ad5e02a6694b2dec9fd0d16a300cc0..13b325ecad9ba48398173e89680287c6
    // Sets ourself up as the singleton instance.  Returns true on success.  If
    // false is returned, we are not the singleton instance and the caller must
 @@ -173,6 +182,8 @@ class ProcessSingleton {
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
    bool EscapeVirtualization(const base::FilePath& user_data_dir);
  
 +  std::string program_name_; // Used for mutexName.
@@ -74,19 +73,19 @@ index fd88cc5122ad5e02a6694b2dec9fd0d16a300cc0..13b325ecad9ba48398173e89680287c6
 +  bool listen_on_ready_ = false;
  #endif
  
- #if defined(OS_MAC)
+ #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 16a85061560ad7fbd45d516adac956179cf5283f..0d74cd93a21b937f65f3d417b4734ae5b87acdf2 100644
+index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d0b85b8f9 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -65,6 +65,7 @@
- #include "base/files/file_descriptor_watcher_posix.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
-+#include "base/ignore_result.h"
- #include "base/location.h"
- #include "base/logging.h"
- #include "base/memory/ref_counted.h"
+@@ -53,6 +53,7 @@
+ #include <memory>
+ #include <set>
+ #include <string>
++#include <tuple>
+ #include <type_traits>
+ 
+ #include <stddef.h>
 @@ -82,6 +83,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "base/task/sequenced_task_runner_helpers.h"
@@ -100,13 +99,13 @@ index 16a85061560ad7fbd45d516adac956179cf5283f..0d74cd93a21b937f65f3d417b4734ae5
  #include "ui/base/l10n/l10n_util.h"
  
 +#if 0
- #if defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "chrome/browser/ui/process_singleton_dialog_linux.h"
  #endif
 +#endif
  
  #if defined(TOOLKIT_VIEWS) && \
-     (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 @@ -348,6 +352,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
@@ -154,7 +153,7 @@ index 16a85061560ad7fbd45d516adac956179cf5283f..0d74cd93a21b937f65f3d417b4734ae5
 +  // Manually free resources with IO explicitly allowed.
 +  base::ThreadRestrictions::ScopedAllowIO allow_io;
 +  watcher_ = nullptr;
-+  ignore_result(socket_dir_.Delete());
++  std::ignore = socket_dir_.Delete();
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
diff --git a/patches/chromium/proxy_config_monitor.patch b/patches/chromium/proxy_config_monitor.patch
index 7e21dff1be572..155415a59b428 100644
--- a/patches/chromium/proxy_config_monitor.patch
+++ b/patches/chromium/proxy_config_monitor.patch
@@ -6,7 +6,7 @@ Subject: proxy_config_monitor.patch
 Allow monitoring proxy config changes for a pref service.
 
 diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
-index 583ae4a36a5dae700a8e11767839e4d9a5c6e9b4..2510362a4df21fd57c56ec1f336589ccde86694c 100644
+index 88fad9811069e7851363c8068f9702a9019669cc..526d951589f2757835fded706f4e448a8bb9daae 100644
 --- a/chrome/browser/net/proxy_config_monitor.cc
 +++ b/chrome/browser/net/proxy_config_monitor.cc
 @@ -11,7 +11,9 @@
diff --git a/patches/chromium/put_back_deleted_colors_for_autofill.patch b/patches/chromium/put_back_deleted_colors_for_autofill.patch
index 6ce6432d17aba..5a88aa521ea7e 100644
--- a/patches/chromium/put_back_deleted_colors_for_autofill.patch
+++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch
@@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
-index a8d95abb69da8d42aed26d3b215cc05d79ba676b..74fc4d9bb7f183765b05e94b7133599ccf714042 100644
+index e798a3156ffbea9e8bddc33e3e1373df949b385d..571767dcb702e876835e767e4a4a8588b0639a96 100644
 --- a/ui/native_theme/common_theme.cc
 +++ b/ui/native_theme/common_theme.cc
 @@ -32,6 +32,7 @@ absl::optional<SkColor> GetHighContrastColor(
@@ -44,7 +44,7 @@ index a8d95abb69da8d42aed26d3b215cc05d79ba676b..74fc4d9bb7f183765b05e94b7133599c
      case NativeTheme::kColorId_FocusedBorderColor:
        return gfx::kGoogleBlue500;
  
-@@ -136,6 +148,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
+@@ -114,6 +126,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
      case NativeTheme::kColorId_WindowBackground:
        return SK_ColorWHITE;
  
@@ -64,10 +64,10 @@ index a8d95abb69da8d42aed26d3b215cc05d79ba676b..74fc4d9bb7f183765b05e94b7133599c
        // Keeping the kColorId_NumColors case instead of using the default case
        // allows ColorId additions to trigger compile error for an incomplete
 diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h
-index a1b39a03776c287bc2b1f9a0a6ce11d0d9efde79..9132ff83b672b51c5f2f7ed95da877be7114c691 100644
+index e53194c75dce367b11ae1835427ee5529cdbcf13..4381a93e6c70ae4ca0556844f0303000987fbef5 100644
 --- a/ui/native_theme/native_theme_color_id.h
 +++ b/ui/native_theme/native_theme_color_id.h
-@@ -10,6 +10,7 @@
+@@ -10,12 +10,18 @@
  #define NATIVE_THEME_CROSS_PLATFORM_COLOR_IDS                                  \
    OP(kColorId_DefaultIconColor),                                               \
    OP(kColorId_FocusedBorderColor),                                             \
@@ -75,8 +75,7 @@ index a1b39a03776c287bc2b1f9a0a6ce11d0d9efde79..9132ff83b672b51c5f2f7ed95da877be
    OP(kColorId_FocusedMenuItemBackgroundColor),                                 \
    OP(kColorId_MenuBackgroundColor),                                            \
    OP(kColorId_MenuIconColor),                                                  \
-@@ -20,6 +21,11 @@
-   OP(kColorId_OverlayScrollbarThumbStroke),                                    \
+   OP(kColorId_MenuSeparatorColor),                                             \
    OP(kColorId_ProminentButtonColor),                                           \
    OP(kColorId_TextOnProminentButtonColor),                                     \
 +  /* Results Tables, such as the omnibox */                                    \
@@ -88,10 +87,10 @@ index a1b39a03776c287bc2b1f9a0a6ce11d0d9efde79..9132ff83b672b51c5f2f7ed95da877be
    OP(kColorId_ThrobberWaitingColor),                                           \
    OP(kColorId_WindowBackground)
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index 99256ffaf918e9d12a7c21b89d66cd41a0d29ac2..07852493fd23b8c1f057dc7ad830b6884db50a88 100644
+index e30e7a26e5c2d8a109c837e683d4f108537043f3..5f809b71c635abd3679ee593850e521a14cb62f5 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -623,10 +623,23 @@ absl::optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
+@@ -627,10 +627,23 @@ absl::optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
      case kColorId_ThrobberWaitingColor:
        return system_colors_[SystemThemeColor::kGrayText];
  
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 9555776dafd78..1d450b2a20b49 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,7 +30,7 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index b0820c4411952ee0adf3dd4cbc6abb26c0368373..cd2770dee3fac7f6b09c3fafbf87a5537de716fe 100644
+index 4b0b2b0dc0900627aee38de021ec10cbdc9b3cb4..12c15f92d9c4db4e100b7183a654ec199f64b25b 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,10 +43,10 @@ index b0820c4411952ee0adf3dd4cbc6abb26c0368373..cd2770dee3fac7f6b09c3fafbf87a553
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 131e74e1789632f59086b2bfb390654207f6d18f..3bc6a0207a5273e7a7b64ab59d4e3499482e4bd8 100644
+index f3e21a7cacb9d192bf3b6cf4d2bfc8d372cd8307..2e91c4f052501e4067cf8fee21f2f3c2674f1c1a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4415,6 +4415,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4418,6 +4418,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,7 +59,7 @@ index 131e74e1789632f59086b2bfb390654207f6d18f..3bc6a0207a5273e7a7b64ab59d4e3499
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 1c40c728a99fbcadedab1a8cc67efde90c7b164c..b693a98ef9e4333b0d1825ee156860a5c2dafcf6 100644
+index 822e00b20a272480a3df4c67be7b6ff93375fd15..d2a50feea97add9d9c309e8066305caf9105c547 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -963,6 +963,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -71,7 +71,7 @@ index 1c40c728a99fbcadedab1a8cc67efde90c7b164c..b693a98ef9e4333b0d1825ee156860a5
        RenderWidgetHostImpl* render_widget_host) override;
    bool IsShowingContextMenuOnPage() const override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index 5df646636e3d78f66a2f5a76fb53bf57a7be8535..5e7b3055b34cfa252f6236b84cb183f9d0f6471d 100644
+index 469b98f8405d24b9a13e559a56b9f239bbebd17f..82f61584e1786546cfcb469edfdfe8821c67b67c 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
 @@ -13,6 +13,7 @@
@@ -82,7 +82,7 @@ index 5df646636e3d78f66a2f5a76fb53bf57a7be8535..5e7b3055b34cfa252f6236b84cb183f9
  #include "content/public/browser/allow_service_worker_result.h"
  #include "content/public/browser/reload_type.h"
  #include "content/public/browser/render_frame_host.h"
-@@ -511,6 +512,9 @@ class CONTENT_EXPORT WebContentsObserver {
+@@ -533,6 +534,9 @@ class CONTENT_EXPORT WebContentsObserver {
    // Invoked when the primary main frame changes size.
    virtual void PrimaryMainFrameWasResized(bool width_changed) {}
  
diff --git a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
index 3ed2afc5fd742..ddd75f00d4f9a 100644
--- a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
+++ b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
@@ -12,7 +12,7 @@ should be removed as soon as those have been updated. Patching because
 every instance is a FTBFS that prevents testing any one instance's fix.
 
 diff --git a/base/callback_helpers.h b/base/callback_helpers.h
-index da876907836f0dbbd02a90ad7e0556304a9532cf..c3401f4cdd276e0f1b094b29753f37b10e72222d 100644
+index 046130ff8cbc4945e94a4ee71ac6320b4f7c5369..c71c3e1720b3f4c7b7362d99957cd2479bf88a37 100644
 --- a/base/callback_helpers.h
 +++ b/base/callback_helpers.h
 @@ -94,6 +94,22 @@ class OnceCallbackHolder final {
diff --git a/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch b/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch
index 74f18d7d81dfb..4bcaed9c6c175 100644
--- a/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch
+++ b/patches/chromium/remove_usage_of_incognito_apis_in_the_spellchecker.patch
@@ -9,10 +9,10 @@ change to move more of //chrome spellchecker logic into //components so
 that we can further separate our dependency from //chrome.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 1d426c35c539064e899b848d0ccc19306f1c4db8..2b7aa1add57dccbcbf8202cead5b7d2d5a174270 100644
+index 9d238b5de516a672d5b99f2f66316a205fc705a7..7c3b6a69acb16186add5d467dbc22360d90d46d4 100644
 --- a/chrome/browser/spellchecker/spellcheck_factory.cc
 +++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -71,7 +71,10 @@ void SpellcheckServiceFactory::RegisterProfilePrefs(
+@@ -72,7 +72,10 @@ void SpellcheckServiceFactory::RegisterProfilePrefs(
  
  content::BrowserContext* SpellcheckServiceFactory::GetBrowserContextToUse(
      content::BrowserContext* context) const {
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index bf2178a3183de..f20ba81bc3111 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,7 +6,7 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 0399fd10fffc282a3e2752ddc33d53823dd7b3f4..c04b5e11bc5e0c7746372dadfa49e34232f82507 100644
+index 1eb2b692c59d33b109085e594badb7fe8284dda5..1b36c21890541ab056ba7a5c403e14a75ce39be3 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
 @@ -649,6 +649,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
@@ -24,7 +24,7 @@ index 0399fd10fffc282a3e2752ddc33d53823dd7b3f4..c04b5e11bc5e0c7746372dadfa49e342
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index e15b08a576e27687801e4ef547bbd299ae60444e..f35cbc8be8a9496eaafbf693680746fc96a13144 100644
+index 0c21c3b6e2a4b76d9cb27d7857778dfcb273616e..849bc53f18c30338462acc89e59ab7a7045faa75 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index bb15a437035e9..9500c595ccfb4 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,10 +10,10 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a45cca2132 100644
+index 57b797c2e730a76d4910f8bcd5b35cc515a61012..61575390665f00b96d593a2e1066be3b28d8de6f 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-@@ -153,6 +153,15 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -154,6 +154,15 @@ void ExtractUnderlines(NSAttributedString* string,
  
  }  // namespace
  
@@ -29,7 +29,7 @@ index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a4
  // These are not documented, so use only after checking -respondsToSelector:.
  @interface NSApplication (UndocumentedSpeechMethods)
  - (void)speakString:(NSString*)string;
-@@ -609,6 +618,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+@@ -610,6 +619,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -39,7 +39,7 @@ index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a4
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -685,6 +697,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -686,6 +698,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -50,7 +50,7 @@ index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a4
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -1005,6 +1021,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -1006,6 +1022,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSKeyDown &&
                                !(modifierFlags & NSCommandKeyMask);
  
@@ -61,7 +61,7 @@ index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a4
    // We only handle key down events and just simply forward other events.
    if (eventType != NSKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1749,9 +1769,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1752,9 +1772,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index 4d8320110bdf8cf732ffa0110139ead3b2330d88..1cdbe6ef86c02f34ae7cfe5a941ab3a4
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1760,7 +1782,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1763,7 +1785,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 2ba001509c8a3..5d09097b66026 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 4b2632d89f3f2961975f1437fe9f533a4799894b..33e8d4f5b27532d015d8cd4dbe7d2550916eb436 100644
+index 67a430b99e98e21383d3851e0c54fa3d9affbdcd..71152d08a9e9ce2e112fd7a6c3134a547af5d978 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1543,7 +1543,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1586,7 +1586,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 4b2632d89f3f2961975f1437fe9f533a4799894b..33e8d4f5b27532d015d8cd4dbe7d2550
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1571,6 +1571,12 @@ if (!is_android) {
+@@ -1614,6 +1614,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/revert_stop_using_nsrunloop_in_renderer_process.patch b/patches/chromium/revert_stop_using_nsrunloop_in_renderer_process.patch
deleted file mode 100644
index 5007b7204d4f9..0000000000000
--- a/patches/chromium/revert_stop_using_nsrunloop_in_renderer_process.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Tue, 4 Jan 2022 11:10:27 +0100
-Subject: revert: stop using NSRunLoop in renderer process
-
-https://chromium-review.googlesource.com/c/chromium/src/+/3344749
-
-This can be removed once we update to a DEPS has which
-includes 4787f034924d0b05a2e4815a197a8ecf4a9c623c.
-
-diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
-index 261e6de9ad03cb017fd2c71e30aef14f51312b60..625c984fc5255fe7ab01f5e38767ada73c21ffec 100644
---- a/content/renderer/renderer_main.cc
-+++ b/content/renderer/renderer_main.cc
-@@ -91,7 +91,12 @@ void HandleRendererErrorTestParameters(const base::CommandLine& command_line) {
- }
- 
- std::unique_ptr<base::MessagePump> CreateMainThreadMessagePump() {
--#if defined(OS_FUCHSIA)
-+#if defined(OS_MAC)
-+  // As long as scrollbars on Mac are painted with Cocoa, the message pump
-+  // needs to be backed by a Foundation-level loop to process NSTimers. See
-+  // http://crbug.com/306348#c24 for details.
-+  return base::MessagePump::Create(base::MessagePumpType::NS_RUNLOOP);
-+#elif defined(OS_FUCHSIA)
-   // Allow FIDL APIs on renderer main thread.
-   return base::MessagePump::Create(base::MessagePumpType::IO);
- #else
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 7523a9870acbc..a714e9ca7e5d7 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index e59425121af678283a2866ff954d1ea6b389404a..4b118deb8f6ce2233bb43e00755cbc7465646d29 100644
+index 03f9fac83207248d6c99326b6a5c17b3555e7725..e211b83624c4cc691e29dc6c47a2a74f8a41f4b4 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1303,7 +1303,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1304,7 +1304,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/skip_atk_toolchain_check.patch b/patches/chromium/skip_atk_toolchain_check.patch
index 7fd7a7315bad1..51d38cce62e36 100644
--- a/patches/chromium/skip_atk_toolchain_check.patch
+++ b/patches/chromium/skip_atk_toolchain_check.patch
@@ -21,7 +21,7 @@ See //ui/accessibility/BUILD.gn:297:20: which caused the file to be included.
 which we don't build
 
 diff --git a/build/config/linux/atk/BUILD.gn b/build/config/linux/atk/BUILD.gn
-index 92baff2a9b6eea1bcfaa53a9e70b4857b68cea77..8fd6031dda6afa42e9ed0742ccc4e71a93df7583 100644
+index 647bef697ec8f6bf02d60e3984ae3ad01f480552..be79a50aad1213a299c606f2a00f6b5bbf8eab2a 100644
 --- a/build/config/linux/atk/BUILD.gn
 +++ b/build/config/linux/atk/BUILD.gn
 @@ -11,7 +11,7 @@ import("//build/config/ui.gni")
@@ -34,7 +34,7 @@ index 92baff2a9b6eea1bcfaa53a9e70b4857b68cea77..8fd6031dda6afa42e9ed0742ccc4e71a
  if (use_atk) {
    assert(use_glib, "use_atk=true requires that use_glib=true")
 diff --git a/build/config/linux/atspi2/BUILD.gn b/build/config/linux/atspi2/BUILD.gn
-index 988a9956813617456ee1945de8e857d43543e411..e6e17e9e8f5ff99404b52c0a42d508f97c61e7fc 100644
+index d103d09a39a519e65daab6db40ef7896de49b0ee..bfdef652886382eb87d5a19d2f9ed90dc91c14d2 100644
 --- a/build/config/linux/atspi2/BUILD.gn
 +++ b/build/config/linux/atspi2/BUILD.gn
 @@ -6,7 +6,6 @@ import("//build/config/linux/pkg_config.gni")
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index 965db355cfc84..d18ff7c274509 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index dde9fb6174be8a0da70cf29d5428ef31035a39f7..e044bc3739ad21c3d9704ddfa56116fae944e57a 100644
+index 064b5642425290f1d9ab82f75b22fd43973ebf5b..30a0c9216a206042a9769bdeda015eaf00e3cc49 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1835,9 +1835,15 @@ bool RenderProcessHostImpl::Init() {
@@ -39,10 +39,10 @@ index dde9fb6174be8a0da70cf29d5428ef31035a39f7..e044bc3739ad21c3d9704ddfa56116fa
          std::make_unique<RendererSandboxedProcessLauncherDelegate>();
 +#endif
  #endif
-     auto snapshot_files = GetV8SnapshotFilesToPreload(*cmd_line);
      // Spawn the child process asynchronously to avoid blocking the UI thread.
+     // As long as there's no renderer prefix, we can use the zygote process
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
-index 9c0e928067d86121ee3732440c80e84dcbbe0dd9..b5c84dc74cf71bc226787c9609dd2c99915710fb 100644
+index e8d6ef94664bb37996871c0cc0db7c815783b786..0d56fa0aebee80883019a100900119972bf02edd 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 @@ -25,6 +25,9 @@ namespace content {
@@ -66,7 +66,7 @@ index 9c0e928067d86121ee3732440c80e84dcbbe0dd9..b5c84dc74cf71bc226787c9609dd2c99
      dynamic_code_can_be_disabled_ = true;
      return;
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
-index 29d99ad59af67a9ac1206c059c8236da93c582a1..b4d09173d836bc9f666d7e3733e8b515cef8eb87 100644
+index 463df70c55df932427c761a67dbc89d7657f9703..d6d8094e31129eb7ca1f0bf36523d48204281795 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
@@ -82,7 +82,7 @@ index 29d99ad59af67a9ac1206c059c8236da93c582a1..b4d09173d836bc9f666d7e3733e8b515
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
 @@ -29,6 +34,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
- #endif  // defined(OS_MAC)
+ #endif  // BUILDFLAG(IS_MAC)
  
    sandbox::mojom::Sandbox GetSandboxType() override;
 +
@@ -92,4 +92,4 @@ index 29d99ad59af67a9ac1206c059c8236da93c582a1..b4d09173d836bc9f666d7e3733e8b515
 +#endif
  };
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch
index 62922abc391ad..6502a2a7c5d37 100644
--- a/patches/chromium/ui_gtk_public_header.patch
+++ b/patches/chromium/ui_gtk_public_header.patch
@@ -6,10 +6,10 @@ Subject: ui_gtk_public_header.patch
 Allow electron to depend on //ui/gtk/gtk_util.h
 
 diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
-index db29cdca6f02fb8ca9dd0f25e13ed902589adc25..6fa1496b4d529ccf7e4e543579462f990aae5ede 100644
+index 46a78cf2658ab261c40f7c42135a2e89d0d152d1..7bd8da917e554e3c0523711e33fd196dd6e9805b 100644
 --- a/ui/gtk/BUILD.gn
 +++ b/ui/gtk/BUILD.gn
-@@ -39,7 +39,7 @@ generate_stubs("gtk_stubs") {
+@@ -69,7 +69,7 @@ generate_stubs("gtk_stubs") {
  }
  
  component("gtk") {
@@ -18,9 +18,9 @@ index db29cdca6f02fb8ca9dd0f25e13ed902589adc25..6fa1496b4d529ccf7e4e543579462f99
  
    sources = [
      "gtk_color_mixers.cc",
-@@ -53,7 +53,6 @@ component("gtk") {
-     "gtk_ui_factory.cc",
-     "gtk_ui_platform.h",
+@@ -85,7 +85,6 @@ component("gtk") {
+     "gtk_ui_platform_stub.cc",
+     "gtk_ui_platform_stub.h",
      "gtk_util.cc",
 -    "gtk_util.h",
      "input_method_context_impl_gtk.cc",
diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
index 99dfa2d8a8c8a..b3d8608dc3a5c 100644
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@@ -6,18 +6,18 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.
 
 diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-index 833c20796bd9404e4f5d7ca738fce97143d33fac..f4bc4f94e7eb5014f7c2844d6486fbc1bc88892f 100644
+index a0d6f0353bb387e6eca9f2b13ab1d40996234110..8548abdfae14d630794abc1033f9b9eda59f771b 100644
 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-@@ -6,6 +6,7 @@
- 
+@@ -7,6 +7,7 @@
+ #include "build/build_config.h"
  #include "content/public/common/content_switches.h"
  #include "sandbox/policy/mojom/sandbox.mojom.h"
 +#include "sandbox/policy/switches.h"
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
  #include "base/win/windows_version.h"
-@@ -62,6 +63,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
+@@ -63,6 +64,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
  ZygoteHandle PpapiPluginSandboxedProcessLauncherDelegate::GetZygote() {
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
diff --git a/patches/chromium/v8_context_snapshot_generator.patch b/patches/chromium/v8_context_snapshot_generator.patch
index e878445e6d584..6e7f5ad9c9de6 100644
--- a/patches/chromium/v8_context_snapshot_generator.patch
+++ b/patches/chromium/v8_context_snapshot_generator.patch
@@ -7,10 +7,10 @@ v8_context_snapshot_generator is a build time executable.
 The patch adds the config.
 
 diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index d868696dbf28bfcb2a1dceda20057c5043819b91..985943ba31b31b3604072493a666979e111a3213 100644
+index a06eae4ab3217210f997126f7dcc318785cdb759..9484ccd615817459f17daf76ff9f82e88cfacbdd 100644
 --- a/tools/v8_context_snapshot/BUILD.gn
 +++ b/tools/v8_context_snapshot/BUILD.gn
-@@ -120,6 +120,7 @@ if (use_v8_context_snapshot) {
+@@ -114,6 +114,7 @@ if (use_v8_context_snapshot) {
        configs += [
          "//v8:external_startup_data",
          ":disable_icf",
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 6a8ee000ba377..1d4dc49b73551 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,12 +9,12 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 676c77b2ac7be7445d92db3fcfc94b5ec4915696..303a0e00f8c797be63c92c6ae122d3b06d561f34 100644
+index 74e6928041145fd6f37ec4ce7acc6be0649b944d..3eaf29f3ab74de6159bba1578ba0810bd9467922 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2971,6 +2971,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
-                            params.renderer_initiated_creation,
-                            params.main_frame_name, GetOriginalOpener());
+@@ -2983,6 +2983,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+       site_instance.get(), params.renderer_initiated_creation,
+       params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
  
 +  if (params.view && params.delegate_view) {
 +    view_.reset(params.view);
@@ -26,7 +26,7 @@ index 676c77b2ac7be7445d92db3fcfc94b5ec4915696..303a0e00f8c797be63c92c6ae122d3b0
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2981,6 +2988,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
+@@ -2993,6 +3000,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
@@ -35,7 +35,7 @@ index 676c77b2ac7be7445d92db3fcfc94b5ec4915696..303a0e00f8c797be63c92c6ae122d3b0
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index ccbad7b5ea7c26e58d9a8d2208f534ae686364ec..d59f80df234872e0e7a89c9283e820a49c30b0e4 100644
+index 1b21d5241ea671e4ead260f170e6a0512efea89a..ac9bce453ff812679d8c77d661729ea681977061 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 770598601bbce..cf119b4d99398 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index e8a5b04582da86f6ec0004c32f3b622c7599510e..1f9cd4e4c1d7be6d51b490c4b909e86b0bd2c057 100644
+index 1aa844b66d149be252f4757ed656cc6bccb2ac8b..b03507679029ccb3beb3a8984b1449afead539c6 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -880,10 +880,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -881,10 +881,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // TODO(https://crbug.com/1266953): There are some known gaps caused by
    // comparing `RenderViewHost` IDs, as `RenderViewHost` ID is not really a
    // strong signal for page identity.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 0a2b571d8fa2e..9ce1e6240c9ed 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 165d6b8eb5cb0ce949c71c1707687960c49a4ebb..35a40c4b493ec4e57bff4d4701c18e55afc5841c 100644
+index 365b6eb2efc2f09725a9a53b79e83a50bded1c75..0d456ac4b4e832bc64bc1adb8952ce13f084564d 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6004,6 +6004,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6035,6 +6035,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 57bafdd8b09ee..cf2a22e34d0a1 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 4352aada84d7fe5abbc2f3320a3a643e838774dc..b6d5fe0a21e9343d82323a9f7c06f9b5891316cc 100644
+index 3c5b962a3ca5baffe525898d7f417f5fd3687a0b..3c85714b68adda07615cf13740a7257561ecc6f9 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -363,6 +363,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -26,10 +26,10 @@ index 4352aada84d7fe5abbc2f3320a3a643e838774dc..b6d5fe0a21e9343d82323a9f7c06f9b5
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index df9f357a597c7d5990058e7c3ab26b32cc4e7252..f72f927bfcd9fe42e49682b12b361ae8a877ace8 100644
+index b4e37bbdd3a80c8d6255d4b536bedbff1d4202a0..e793b0c25f2900d949a7473c3f29c620ffd80408 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -925,6 +925,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -924,6 +924,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,7 +43,7 @@ index df9f357a597c7d5990058e7c3ab26b32cc4e7252..f72f927bfcd9fe42e49682b12b361ae8
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index cba574c571ded199c70374ffe01bad5f88b5902f..7801b60329802c92e6b6103ccc74d6871584c9b2 100644
+index 2191ab72dcaccf50ddbc700ded63f66b95de856d..b4f6e7a468661c272a4cef338e1c171f7247191f 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -207,6 +207,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -55,7 +55,7 @@ index cba574c571ded199c70374ffe01bad5f88b5902f..7801b60329802c92e6b6103ccc74d687
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index f545c18c2e142a46481b1669bb726b60d9815600..14bd8c3436602689e44e3c718388406a7de6b211 100644
+index 6acdee7c9eb8e5368401ba804f9a359e5c7b2b70..c72c142a8b4591b12ff2b3a10a143658c6dcfff3 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
 @@ -713,6 +713,7 @@ class BLINK_PLATFORM_EXPORT Platform {
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index aa34b13457d37..e0a940cc8e788 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index b6d5fe0a21e9343d82323a9f7c06f9b5891316cc..f141ba30ac0cfd1c35fb89dc513b92c5f41f6d74 100644
+index 3c85714b68adda07615cf13740a7257561ecc6f9..6cc354acc6f8d253827a799f86fb9d4aba92aa1b 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -363,6 +363,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -35,10 +35,10 @@ index b6d5fe0a21e9343d82323a9f7c06f9b5891316cc..f141ba30ac0cfd1c35fb89dc513b92c5
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index f72f927bfcd9fe42e49682b12b361ae8a877ace8..73e4853cb335722b2aaf7d98a8ed4b2ff4ece0ab 100644
+index e793b0c25f2900d949a7473c3f29c620ffd80408..5b25349e735aa5b32745428d5b19b5cf2454dfc1 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -937,6 +937,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -936,6 +936,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,7 +52,7 @@ index f72f927bfcd9fe42e49682b12b361ae8a877ace8..73e4853cb335722b2aaf7d98a8ed4b2f
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 7801b60329802c92e6b6103ccc74d6871584c9b2..df5c449ac011104cbce52b737729c4f9af2b2f9e 100644
+index b4f6e7a468661c272a4cef338e1c171f7247191f..c70667d616ac3a64fba7c5d2ba315d2c40cc5463 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -207,6 +207,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,7 +65,7 @@ index 7801b60329802c92e6b6103ccc74d6871584c9b2..df5c449ac011104cbce52b737729c4f9
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 14bd8c3436602689e44e3c718388406a7de6b211..46551fcbb671ae7f6f5528afa7ea62bb199a3dbf 100644
+index c72c142a8b4591b12ff2b3a10a143658c6dcfff3..03d0a3e596f3d0e5582d4a34aa51a3e5e97210d6 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
 @@ -713,6 +713,8 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -78,13 +78,13 @@ index 14bd8c3436602689e44e3c718388406a7de6b211..46551fcbb671ae7f6f5528afa7ea62bb
    virtual bool AllowScriptExtensionForServiceWorker(
        const WebSecurityOrigin& script_origin) {
 diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
-index 1efbaf0adb1fd6c0ef332f015d8b09d130e4bd3f..033438ccc8db0ef396922ac23b7f3bd80fcc5cde 100644
+index 03288c7b1897ee2c18b80677ee5837246d36568a..fc10bbf3d92c7f88c734d8ecfb20dbc4b72ae200 100644
 --- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
 @@ -257,6 +257,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
    V8PerContextData* per_context_data = script_state_->PerContextData();
-   ignore_result(per_context_data->ConstructorForType(
-       global_scope_->GetWrapperTypeInfo()));
+   std::ignore =
+       per_context_data->ConstructorForType(global_scope_->GetWrapperTypeInfo());
 +  Platform::Current()->WorkerScriptReadyForEvaluation(script_state_->GetContext());
    // Inform V8 that origin trial information is now connected with the context,
    // and V8 can extend the context with origin trial features.
diff --git a/patches/config.json b/patches/config.json
index e9a2297ba10f2..b9764a0be7684 100644
--- a/patches/config.json
+++ b/patches/config.json
@@ -9,6 +9,10 @@
 
   "src/electron/patches/node": "src/third_party/electron_node",
 
+  "src/electron/patches/nan": "src/third_party/nan",
+
+  "src/electron/patches/perfetto": "src/third_party/perfetto",
+
   "src/electron/patches/squirrel.mac": "src/third_party/squirrel.mac",
 
   "src/electron/patches/Mantle": "src/third_party/squirrel.mac/vendor/Mantle",
diff --git a/patches/nan/.patches b/patches/nan/.patches
new file mode 100644
index 0000000000000..5a0539df8d7b2
--- /dev/null
+++ b/patches/nan/.patches
@@ -0,0 +1 @@
+use_new_constructor_for_scriptorigin.patch
diff --git a/patches/nan/use_new_constructor_for_scriptorigin.patch b/patches/nan/use_new_constructor_for_scriptorigin.patch
new file mode 100644
index 0000000000000..dfa36b750afc2
--- /dev/null
+++ b/patches/nan/use_new_constructor_for_scriptorigin.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Fri, 28 Jan 2022 13:46:07 -0800
+Subject: use new constructor for ScriptOrigin
+
+https://chromium-review.googlesource.com/c/v8/v8/+/3395880
+
+diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
+index 64c857996c4626f3a447bdb796d4d581a37d9299..95a12f9521b8c9bed0e5eed85b6e56917069ea09 100644
+--- a/test/cpp/nannew.cpp
++++ b/test/cpp/nannew.cpp
+@@ -248,7 +248,7 @@ NAN_METHOD(testScript) {
+ 
+ #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
+   (V8_MAJOR_VERSION == 8 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 9))
+-  ScriptOrigin origin(New("foo").ToLocalChecked(), 5);
++  ScriptOrigin origin(v8::Isolate::GetCurrent(), New("foo").ToLocalChecked(), 5);
+ #else
+   ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
+ #endif
+diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
+index 5b54c0cedaaa824be71b8c6fee948139a34d3310..f0aa65cc80741d57ba6675f7d5d5908b24f601c5 100644
+--- a/test/cpp/news.cpp
++++ b/test/cpp/news.cpp
+@@ -114,7 +114,7 @@ NAN_METHOD(NewScript) {
+ }
+ 
+ NAN_METHOD(NewScript2) {
+-  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
++  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
+   v8::Local<UnboundScript> script =
+       New<UnboundScript>(
+           New("2+4").ToLocalChecked()
+@@ -131,7 +131,7 @@ NAN_METHOD(CompileScript) {
+ }
+ 
+ NAN_METHOD(CompileScript2) {
+-  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
++  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
+   v8::Local<BoundScript> script =
+       CompileScript(New("2+4").ToLocalChecked(), origin).ToLocalChecked();
+   info.GetReturnValue().Set(
diff --git a/patches/node/.patches b/patches/node/.patches
index 1343e5cda9701..7824d1d885c8f 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -27,3 +27,4 @@ test_add_fixture_trim_option.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
 fix_don_t_create_console_window_when_creating_process.patch
+fix_serdes_test.patch
diff --git a/patches/node/fix_serdes_test.patch b/patches/node/fix_serdes_test.patch
new file mode 100644
index 0000000000000..ec2452c0ae5ee
--- /dev/null
+++ b/patches/node/fix_serdes_test.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Fri, 28 Jan 2022 13:50:21 -0800
+Subject: fix serdes test
+
+The V8 wire format version changed.
+
+diff --git a/test/parallel/test-v8-serdes.js b/test/parallel/test-v8-serdes.js
+index 4dffedd3c32b4b1b6eb75e46f8bfb447260046bb..586698129680cef29595c39e77c7d1c186f3d60a 100644
+--- a/test/parallel/test-v8-serdes.js
++++ b/test/parallel/test-v8-serdes.js
+@@ -155,7 +155,7 @@ const hostObject = new (internalBinding('js_stream').JSStream)();
+ }
+ 
+ {
+-  const buf = Buffer.from('ff0d6f2203666f6f5e007b01', 'hex');
++  const buf = Buffer.from('ff0e6f2203666f6f5e007b01', 'hex');
+ 
+   const des = new v8.DefaultDeserializer(buf);
+   des.readHeader();
+@@ -166,13 +166,13 @@ const hostObject = new (internalBinding('js_stream').JSStream)();
+   ser.writeValue(des.readValue());
+ 
+   assert.deepStrictEqual(buf, ser.releaseBuffer());
+-  assert.strictEqual(des.getWireFormatVersion(), 0x0d);
++  assert.strictEqual(des.getWireFormatVersion(), 0x0e);
+ }
+ 
+ {
+   // Unaligned Uint16Array read, with padding in the underlying array buffer.
+   let buf = Buffer.alloc(32 + 9);
+-  buf.write('ff0d5c0404addeefbe', 32, 'hex');
++  buf.write('ff0e5c0404addeefbe', 32, 'hex');
+   buf = buf.slice(32);
+ 
+   const expectedResult = os.endianness() === 'LE' ?
diff --git a/patches/perfetto/.patches b/patches/perfetto/.patches
new file mode 100644
index 0000000000000..f96cd9f9d7559
--- /dev/null
+++ b/patches/perfetto/.patches
@@ -0,0 +1 @@
+define_ssize_t_to_be_intptr_t_to_match_libuv.patch
diff --git a/patches/perfetto/define_ssize_t_to_be_intptr_t_to_match_libuv.patch b/patches/perfetto/define_ssize_t_to_be_intptr_t_to_match_libuv.patch
new file mode 100644
index 0000000000000..b48b0e2e37343
--- /dev/null
+++ b/patches/perfetto/define_ssize_t_to_be_intptr_t_to_match_libuv.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Fri, 28 Jan 2022 15:07:54 -0800
+Subject: define ssize_t to be intptr_t to match libuv
+
+This definition conflicts with libuv's: https://github.com/libuv/libuv/blob/bb0b4bb783da45ca995d8fb3d5dec0ed84133446/include/uv/win.h#L26-L31
+
+Breaks the build on 32-bit windows.
+
+diff --git a/include/perfetto/ext/base/sys_types.h b/include/perfetto/ext/base/sys_types.h
+index 999a1522f4397def080ad0056ff3f626e2f0cdbe..a3e24ae047a2185b66136184e95427e6e849194f 100644
+--- a/include/perfetto/ext/base/sys_types.h
++++ b/include/perfetto/ext/base/sys_types.h
+@@ -32,11 +32,7 @@ using uid_t = unsigned int;
+ using pid_t = int;
+ #endif  // !GCC
+ 
+-#if defined(_WIN64)
+-using ssize_t = int64_t;
+-#else
+-using ssize_t = long;
+-#endif  // _WIN64
++using ssize_t = intptr_t;
+ 
+ #endif  // OS_WIN
+ 
diff --git a/patches/v8/.patches b/patches/v8/.patches
index 5d74c796bcf93..1e5615f3ce254 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -6,4 +6,4 @@ workaround_an_undefined_symbol_error.patch
 do_not_export_private_v8_symbols_on_windows.patch
 fix_build_deprecated_attirbute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
-fix_use_allocationtype_kold_in_v8_scriptormodule_legacy_lifetime.patch
+revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index b006ad66ddbb8..e70c8c148c892 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 5fef5805939ced748e03b34c1e365a00d6a5834d..623b4d792c04c5d7978fe7c16c92e21499294a5f 100644
+index ce150e6a007bb87c7ce956cc4f918b13c829585b..b4e04dce1ec52cd787c3a6de9abe09aae55ecc09 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -575,7 +575,7 @@ config("internal_config") {
+@@ -579,7 +579,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index 5fef5805939ced748e03b34c1e365a00d6a5834d..623b4d792c04c5d7978fe7c16c92e214
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5660,7 +5660,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5688,7 +5688,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 5fef5805939ced748e03b34c1e365a00d6a5834d..623b4d792c04c5d7978fe7c16c92e214
  
      deps = [
        ":v8_libbase",
-@@ -5698,6 +5698,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5726,6 +5726,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index a708140339fbe..f6f43c064a0ea 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 880e198be36cdfefb1acc37612c65022551c5d4c..f7e18fabb020827c5c194609db68555c10ac1cc8 100644
+index 0e3370e84503dcdece061dd073b337f774b2d2da..7b8eb622c50a081c8fc3a365f1f4c7e017084e06 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9141,7 +9141,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9068,7 +9068,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index 880e198be36cdfefb1acc37612c65022551c5d4c..f7e18fabb020827c5c194609db68555c
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index cf3f1dce5571353cb90bb5997c489b0f202951f9..f54f60489385a25c5bce4e3d38da19ee9df6ada4 100644
+index aefbbd9b31e0db74c33858842ff4856eb9962706..7d348738a40d6e27b55b18aea7e8fea553834fd7 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6132,9 +6132,9 @@ void Heap::TearDown() {
+@@ -6111,9 +6111,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 1ef0f366c945e..afd95ed8484b8 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 46cff2d17ff0e189b84a180805c008818a20fd3a..de269d03d3376f1fe31809d9c2079860724b731a 100644
+index 24e073885a1e6d2d203e55fd57b92e9943aff385..f1bb6cad8c608a6371e5ed4eb88ce0c47acb66bd 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -575,6 +575,10 @@ config("internal_config") {
+@@ -579,6 +579,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index c26ad60031d16..441102542267d 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 2baa10a2b35cd247cec53ee63feb5280bc05db6f..803789169eb3305b0827b221acfb7f425c120fa8 100644
+index 499d5a9d1cf9e321212bda7c94c15ed1ded7aa30..19e89e906f4cc480bc8a03b9ca7ee9e8f1f907fa 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -886,7 +886,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -897,7 +897,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 04d14f07aefcc..b9d9606081e56 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 623b4d792c04c5d7978fe7c16c92e21499294a5f..46cff2d17ff0e189b84a180805c008818a20fd3a 100644
+index b4e04dce1ec52cd787c3a6de9abe09aae55ecc09..24e073885a1e6d2d203e55fd57b92e9943aff385 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5672,7 +5672,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5700,7 +5700,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
index f33bcb58dccc2..ad3c1b6198b4c 100644
--- a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
@@ -9,7 +9,7 @@ higher versions, but native module compiling with this version
 will have an issue.
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 1242d4289ceb937e2679408ca7ee734c0c342bf0..50f59293e3fc617ac7b6f964ae091e92391c8a38 100644
+index b16ab3ff88d1054d12af4de3ad0018c97c0b7fcc..c9963b43c121964c0c37c858adb228cd090d5c2a 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -452,10 +452,13 @@ path. Add it with -I<path> to the command line
diff --git a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
index 781e0ed36f7ce..ce960703ace71 100644
--- a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
+++ b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
@@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
 when support is synchronized across both v8 and node.
 
 diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
-index 57d8773b7be9a04ab0b27ddac9aac1da2254c550..cf3c4ee7422728822e62f25d0092f3c0da07914b 100644
+index cd760b9e67820c6ab69164992bccf19411cf1db6..f28258bf1b797c2a2d904e25802a17b14ad0c19a 100644
 --- a/src/objects/js-array-buffer.cc
 +++ b/src/objects/js-array-buffer.cc
 @@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {
@@ -32,5 +32,5 @@ index 57d8773b7be9a04ab0b27ddac9aac1da2254c550..cf3c4ee7422728822e62f25d0092f3c0
 +  //     !backing_store->is_wasm_memory() && !backing_store->is_resizable(),
 +  //     backing_store->byte_length() == backing_store->max_byte_length());
    DCHECK(!was_detached());
-   DCHECK(IsValidBackingStorePointer(backing_store->buffer_start()));
    Isolate* isolate = GetIsolate();
+ 
diff --git a/patches/v8/fix_use_allocationtype_kold_in_v8_scriptormodule_legacy_lifetime.patch b/patches/v8/fix_use_allocationtype_kold_in_v8_scriptormodule_legacy_lifetime.patch
deleted file mode 100644
index 8f8790ddeec93..0000000000000
--- a/patches/v8/fix_use_allocationtype_kold_in_v8_scriptormodule_legacy_lifetime.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <khammond@slack-corp.com>
-Date: Tue, 4 Jan 2022 14:55:00 -0800
-Subject: fix: use allocationtype kold in v8 scriptormodule legacy lifetime
-
-Changed in this CL: https://chromium-review.googlesource.com/c/v8/v8/+/3211575
-Upstream proposed fix: https://chromium-review.googlesource.com/c/v8/v8/+/3354087
-
-Enabling V8_SCRIPTORMODULE_LEGACY_LIFETIME is necessary to fix ESM in
-Node.js, but Blink expects old allocations so we change this in the
-interim while Node.js works to remove their usage of WeakRefs to
-ScriptOrModule.
-
-This patch can be removed when the upsteam fix is merged, or
-when support is added in Node.js
-
-diff --git a/src/heap/factory-base.cc b/src/heap/factory-base.cc
-index ff1056ee57d1fade0e851c08010a81cde64d48b3..1fbf8ecbec0458106afea1b5ba4273ccfb5d80f4 100644
---- a/src/heap/factory-base.cc
-+++ b/src/heap/factory-base.cc
-@@ -250,7 +250,7 @@ Handle<Script> FactoryBase<Impl>::NewScriptWithId(
-   // Create and initialize script object.
-   ReadOnlyRoots roots = read_only_roots();
- #ifdef V8_SCRIPTORMODULE_LEGACY_LIFETIME
--  Handle<ArrayList> list = NewArrayList(0);
-+  Handle<ArrayList> list = NewArrayList(0, AllocationType::kOld);
- #endif
-   Handle<Script> script = handle(
-       NewStructInternal<Script>(SCRIPT_TYPE, AllocationType::kOld), isolate());
-@@ -286,8 +286,10 @@ Handle<Script> FactoryBase<Impl>::NewScriptWithId(
- }
- 
- template <typename Impl>
--Handle<ArrayList> FactoryBase<Impl>::NewArrayList(int size) {
--  Handle<FixedArray> fixed_array = NewFixedArray(size + ArrayList::kFirstIndex);
-+Handle<ArrayList> FactoryBase<Impl>::NewArrayList(int size,
-+                                                  AllocationType allocation) {
-+  Handle<FixedArray> fixed_array =
-+      NewFixedArray(size + ArrayList::kFirstIndex, allocation);
-   fixed_array->set_map_no_write_barrier(read_only_roots().array_list_map());
-   Handle<ArrayList> result = Handle<ArrayList>::cast(fixed_array);
-   result->SetLength(0);
-diff --git a/src/heap/factory-base.h b/src/heap/factory-base.h
-index c3aa816d0ba3079889201dee17d10283fbcaa8fc..2a8eae50c947fb5db8585ddc504e9b83dae09a44 100644
---- a/src/heap/factory-base.h
-+++ b/src/heap/factory-base.h
-@@ -157,7 +157,8 @@ class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE) FactoryBase
-   Handle<Script> NewScriptWithId(Handle<PrimitiveHeapObject> source,
-                                  int script_id);
- 
--  Handle<ArrayList> NewArrayList(int size);
-+  Handle<ArrayList> NewArrayList(
-+      int size, AllocationType allocation = AllocationType::kYoung);
- 
-   Handle<SharedFunctionInfo> NewSharedFunctionInfoForLiteral(
-       FunctionLiteral* literal, Handle<Script> script, bool is_toplevel);
diff --git a/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
new file mode 100644
index 0000000000000..1f31407e9b39c
--- /dev/null
+++ b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Thu, 27 Jan 2022 13:01:36 -0800
+Subject: Revert "fix(cppgc): removed deleted cstors in CppHeapCreateParams"
+
+This reverts commit a66b09e5510d62ff469e72b1a8ff7f0ead1bf0f6.
+
+diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
+index 73f6364a442af4538cd0178435c27fc8eac62fe7..63d52651b997a5331b381f77761a78ebfa56287d 100644
+--- a/include/v8-cppgc.h
++++ b/include/v8-cppgc.h
+@@ -77,6 +77,9 @@ struct WrapperDescriptor final {
+ };
+ 
+ struct V8_EXPORT CppHeapCreateParams {
++  CppHeapCreateParams(const CppHeapCreateParams&) = delete;
++  CppHeapCreateParams& operator=(const CppHeapCreateParams&) = delete;
++
+   std::vector<std::unique_ptr<cppgc::CustomSpaceBase>> custom_spaces;
+   WrapperDescriptor wrapper_descriptor;
+ };
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index 85328960aa3cc..4226bc8f1acae 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index fd5cd326ecde55e364338bea88f8b9f24b3510ab..e60cca0ee50c4ba3688af5aa081570a62fa37e9b 100644
+index ac7a46a895dd914f48038f36738c40ccfbd5c63f..e9f7bc7d022d05b6b62caf171d4e457119256831 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
 @@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@@ -39,10 +39,10 @@ index fd5cd326ecde55e364338bea88f8b9f24b3510ab..e60cca0ee50c4ba3688af5aa081570a6
                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
 diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
-index df8fadf1f1bf029b8b5d94ed9f6ec428c05b90bc..4cfc5877b0474e30d0f88a7448361b7682244b04 100644
+index f9e991a57b3294b0ed786b8a0b3f540d9ab5cd49..3352d8d5f3f1e4971498aafd45b9dbac447a1b4b 100644
 --- a/src/codegen/arm64/assembler-arm64.h
 +++ b/src/codegen/arm64/assembler-arm64.h
-@@ -2121,11 +2121,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2119,11 +2119,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
      return rm.code() << Rm_offset;
    }
  
@@ -55,7 +55,7 @@ index df8fadf1f1bf029b8b5d94ed9f6ec428c05b90bc..4cfc5877b0474e30d0f88a7448361b76
  
    static Instr Ra(CPURegister ra) {
      DCHECK_NE(ra.code(), kSPRegInternalCode);
-@@ -2149,15 +2145,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2147,15 +2143,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
  
    // These encoding functions allow the stack pointer to be encoded, and
    // disallow the zero register.
diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc
index fb45801a8ced5..14e0c0c372833 100644
--- a/shell/app/electron_content_client.cc
+++ b/shell/app/electron_content_client.cc
@@ -88,9 +88,9 @@ bool IsWidevineAvailable(
     // TODO(crbug.com/767941): Push persistent-license support info here once
     // we check in a new CDM that supports it on Linux.
     session_types_supported->insert(media::CdmSessionType::kTemporary);
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS)
     session_types_supported->insert(media::CdmSessionType::kPersistentLicense);
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS)
 
     modes_supported->insert(media::EncryptionMode::kCenc);
 
diff --git a/shell/app/electron_crash_reporter_client.cc b/shell/app/electron_crash_reporter_client.cc
index 87dfdc344fde5..245c55c90a13a 100644
--- a/shell/app/electron_crash_reporter_client.cc
+++ b/shell/app/electron_crash_reporter_client.cc
@@ -25,15 +25,15 @@
 #include "electron/electron_version.h"
 #include "shell/common/electron_paths.h"
 
-#if defined(OS_POSIX) && !defined(OS_MAC)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
 #include "components/version_info/version_info_values.h"
 #endif
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "base/debug/dump_without_crashing.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/strings/string_util_win.h"
 #endif
 
@@ -96,7 +96,7 @@ ElectronCrashReporterClient::ElectronCrashReporterClient() = default;
 
 ElectronCrashReporterClient::~ElectronCrashReporterClient() = default;
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void ElectronCrashReporterClient::SetCrashReporterClientIdFromGUID(
     const std::string& client_guid) {
   crash_keys::SetMetricsClientIdFromGUID(client_guid);
@@ -127,7 +127,7 @@ base::FilePath ElectronCrashReporterClient::GetReporterLogFilename() {
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void ElectronCrashReporterClient::GetProductNameAndVersion(
     const std::wstring& exe_path,
     std::wstring* product_name,
@@ -139,7 +139,7 @@ void ElectronCrashReporterClient::GetProductNameAndVersion(
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool ElectronCrashReporterClient::GetCrashDumpLocation(
     std::wstring* crash_dir_str) {
   base::FilePath crash_dir;
@@ -173,7 +173,7 @@ bool ElectronCrashReporterClient::GetCollectStatsConsent() {
   return collect_stats_consent_;
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool ElectronCrashReporterClient::ReportingIsEnforcedByPolicy(
     bool* breakpad_enabled) {
   return false;
@@ -195,11 +195,11 @@ void ElectronCrashReporterClient::GetProcessSimpleAnnotations(
   (*annotations)["ver"] = ELECTRON_VERSION_STRING;
 }
 
-#if defined(OS_LINUX) || defined(OS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
 bool ElectronCrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
   return false;
 }
-#endif  // OS_LINUX
+#endif
 
 std::string ElectronCrashReporterClient::GetUploadUrl() {
   return upload_url_;
diff --git a/shell/app/electron_crash_reporter_client.h b/shell/app/electron_crash_reporter_client.h
index bfe039e6a1943..5944d1559b971 100644
--- a/shell/app/electron_crash_reporter_client.h
+++ b/shell/app/electron_crash_reporter_client.h
@@ -31,7 +31,7 @@ class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
       const std::map<std::string, std::string>& annotations);
 
   // crash_reporter::CrashReporterClient implementation.
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   void SetCrashReporterClientIdFromGUID(
       const std::string& client_guid) override;
   void GetProductNameAndVersion(const char** product_name,
@@ -42,7 +42,7 @@ class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
   base::FilePath GetReporterLogFilename() override;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   void GetProductNameAndVersion(const std::wstring& exe_path,
                                 std::wstring* product_name,
                                 std::wstring* version,
@@ -50,7 +50,7 @@ class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
                                 std::wstring* channel_name) override;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool GetCrashDumpLocation(std::wstring* crash_dir) override;
 #else
   bool GetCrashDumpLocation(base::FilePath* crash_dir) override;
@@ -66,11 +66,11 @@ class ElectronCrashReporterClient : public crash_reporter::CrashReporterClient {
   void GetProcessSimpleAnnotations(
       std::map<std::string, std::string>* annotations) override;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled) override;
 #endif
 
-#if defined(OS_MAC) || defined(OS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
   bool ShouldMonitorCrashHandlerExpensively() override;
 #endif
 
diff --git a/shell/app/electron_library_main.h b/shell/app/electron_library_main.h
index d847ee074eb43..36fc713272e8e 100644
--- a/shell/app/electron_library_main.h
+++ b/shell/app/electron_library_main.h
@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 #include "electron/buildflags/buildflags.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 extern "C" {
 __attribute__((visibility("default"))) int ElectronMain(int argc, char* argv[]);
 
@@ -18,6 +18,6 @@ __attribute__((visibility("default"))) int ElectronInitializeICUandStartNode(
     char* argv[]);
 #endif
 }
-#endif  // OS_MAC
+#endif
 
 #endif  // ELECTRON_SHELL_APP_ELECTRON_LIBRARY_MAIN_H_
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 54d2969ae5a71..707e4b90097da 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -43,16 +43,16 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "shell/app/electron_main_delegate_mac.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/child/v8_crashpad_support_win.h"
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "base/nix/xdg_util.h"
 #include "components/crash/core/app/breakpad_linux.h"
 #include "v8/include/v8-wasm-trap-handler-posix.h"
@@ -88,11 +88,11 @@ bool IsBrowserProcess(base::CommandLine* cmd) {
 // and resources loaded.
 bool SubprocessNeedsResourceBundle(const std::string& process_type) {
   return
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
       // The zygote process opens the resources for the renderers.
       process_type == ::switches::kZygoteProcess ||
 #endif
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       // Mac needs them too for scrollbar related images and for sandbox
       // profiles.
       process_type == ::switches::kGpuProcess ||
@@ -102,7 +102,7 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
       process_type == ::switches::kUtilityProcess;
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void InvalidParameterHandler(const wchar_t*,
                              const wchar_t*,
                              const wchar_t*,
@@ -139,7 +139,7 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       create_dir = true;
       break;
     case DIR_USER_CACHE: {
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
       int parent_key = base::DIR_CACHE;
 #else
       // On Windows, there's no OS-level centralized location for caches, so
@@ -153,7 +153,7 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       create_dir = true;
       break;
     }
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
     case DIR_APP_DATA: {
       auto env = base::Environment::Create();
       cur = base::nix::GetXDGDirectory(
@@ -161,7 +161,7 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       break;
     }
 #endif
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     case DIR_RECENT:
       if (!platform_util::GetFolderPath(DIR_RECENT, &cur))
         return false;
@@ -169,7 +169,7 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       break;
 #endif
     case DIR_APP_LOGS:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       if (!base::PathService::Get(base::DIR_HOME, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("Library"));
@@ -211,7 +211,7 @@ std::string LoadResourceBundle(const std::string& locale) {
 
   // Load other resource files.
   base::FilePath pak_dir;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   pak_dir =
       base::mac::FrameworkBundlePath().Append(FILE_PATH_LITERAL("Resources"));
 #else
@@ -238,14 +238,14 @@ const size_t ElectronMainDelegate::kNonWildcardDomainNonPortSchemesSize =
 bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
   auto* command_line = base::CommandLine::ForCurrentProcess();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   v8_crashpad_support::SetUp();
 
   // On Windows the terminal returns immediately, so we add a new line to
   // prevent output in the same line as the prompt.
   if (IsBrowserProcess(command_line))
     std::wcout << std::endl;
-#endif  // !defined(OS_WIN)
+#endif  // !BUILDFLAG(IS_WIN)
 
   auto env = base::Environment::Create();
 
@@ -268,13 +268,13 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
       kNonWildcardDomainNonPortSchemes, kNonWildcardDomainNonPortSchemesSize);
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   OverrideChildProcessPath();
   OverrideFrameworkBundlePath();
   SetUpBundleOverrides();
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Ignore invalid parameter errors.
   _set_invalid_parameter_handler(InvalidParameterHandler);
   // Disable the ActiveVerifier, which is used by Chrome to track possible
@@ -285,7 +285,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
     base::win::PinUser32();
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Check for --no-sandbox parameter when running as root.
   if (getuid() == 0 && IsSandboxEnabled(command_line))
     LOG(FATAL) << "Running as root without --"
@@ -327,7 +327,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
                                                  user_data_dir, false, true);
   }
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   // For windows we call InitLogging later, after the sandbox is initialized.
   //
   // On Linux, we force a "preinit" in the zygote (i.e. never log to a default
@@ -352,7 +352,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
     LoadResourceBundle(locale);
   }
 
-#if defined(OS_WIN) || (defined(OS_MAC) && !defined(MAS_BUILD))
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_MAC) && !defined(MAS_BUILD))
   // In the main process, we wait for JS to call crashReporter.start() before
   // initializing crashpad. If we're in the renderer, we want to initialize it
   // immediately at boot.
@@ -362,7 +362,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
   }
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != ::switches::kZygoteProcess && !process_type.empty()) {
     ElectronCrashReporterClient::Create();
@@ -390,7 +390,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
     // Allow file:// URIs to read other file:// URIs by default.
     command_line->AppendSwitch(::switches::kAllowFileAccessFromFiles);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     // Enable AVFoundation.
     command_line->AppendSwitch("enable-avfoundation");
 #endif
@@ -398,7 +398,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
 }
 
 void ElectronMainDelegate::SandboxInitialized(const std::string& process_type) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   logging::InitElectronLogging(*base::CommandLine::ForCurrentProcess(),
                                /* is_preinit = */ process_type.empty());
 #endif
@@ -409,7 +409,7 @@ void ElectronMainDelegate::PreBrowserMain() {
   // flags and we need to make sure the feature list is initialized before the
   // service manager reads the features.
   InitializeFeatureList();
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   RegisterAtomCrApp();
 #endif
 }
@@ -462,7 +462,7 @@ bool ElectronMainDelegate::ShouldLockSchemeRegistry() {
   return false;
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void ElectronMainDelegate::ZygoteForked() {
   // Needs to be called after we have DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
@@ -485,6 +485,6 @@ void ElectronMainDelegate::ZygoteForked() {
   // Reset the command line for the newly spawned process.
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
 }
-#endif  // defined(OS_LINUX)
+#endif  // BUILDFLAG(IS_LINUX)
 
 }  // namespace electron
diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
index afe218de95955..255df5c235d8f 100644
--- a/shell/app/electron_main_delegate.h
+++ b/shell/app/electron_main_delegate.h
@@ -45,12 +45,12 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
       content::MainFunctionParams main_function_params) override;
   bool ShouldCreateFeatureList() override;
   bool ShouldLockSchemeRegistry() override;
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   void ZygoteForked() override;
 #endif
 
  private:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void OverrideChildProcessPath();
   void OverrideFrameworkBundlePath();
   void SetUpBundleOverrides();
diff --git a/shell/app/electron_main_linux.cc b/shell/app/electron_main_linux.cc
index 7f886cd77bc90..d06bded3f8391 100644
--- a/shell/app/electron_main_linux.cc
+++ b/shell/app/electron_main_linux.cc
@@ -18,20 +18,13 @@
 #include "shell/common/electron_command_line.h"
 #include "shell/common/electron_constants.h"
 
-namespace {
-
-ALLOW_UNUSED_TYPE bool IsEnvSet(const char* name) {
-  char* indicator = getenv(name);
-  return indicator && indicator[0] != '\0';
-}
-
-}  // namespace
-
 int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (electron::fuses::IsRunAsNodeEnabled() && IsEnvSet(electron::kRunAsNode)) {
+  char* indicator = getenv(electron::kRunAsNode);
+  if (electron::fuses::IsRunAsNodeEnabled() && indicator &&
+      indicator[0] != '\0') {
     base::i18n::InitializeICU();
     base::AtExitManager atexit_manager;
     return electron::NodeMain(argc, argv);
diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc
index 164dd9704698b..6180a4d80bb22 100644
--- a/shell/app/electron_main_mac.cc
+++ b/shell/app/electron_main_mac.cc
@@ -20,7 +20,7 @@
 
 namespace {
 
-ALLOW_UNUSED_TYPE bool IsEnvSet(const char* name) {
+bool IsEnvSet(const char* name) {
   char* indicator = getenv(name);
   return indicator && indicator[0] != '\0';
 }
diff --git a/shell/app/electron_main_win.cc b/shell/app/electron_main_win.cc
index 0d73818a91082..38f654e5f047f 100644
--- a/shell/app/electron_main_win.cc
+++ b/shell/app/electron_main_win.cc
@@ -44,7 +44,7 @@ namespace {
 const char kUserDataDir[] = "user-data-dir";
 const char kProcessType[] = "type";
 
-ALLOW_UNUSED_TYPE bool IsEnvSet(const char* name) {
+bool IsEnvSet(const char* name) {
   size_t required_size;
   getenv_s(&required_size, nullptr, 0, name);
   return required_size != 0;
diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc
index fbc714e2e7ca2..0a9e56def15e9 100644
--- a/shell/app/node_main.cc
+++ b/shell/app/node_main.cc
@@ -30,11 +30,11 @@
 #include "shell/common/node_bindings.h"
 #include "shell/common/node_includes.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "components/crash/core/app/breakpad_linux.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "chrome/child/v8_crashpad_support_win.h"
 #endif
 
@@ -65,7 +65,7 @@ int SetNodeCliFlags() {
   args.emplace_back("electron");
 
   for (const auto& arg : argv) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     const auto& option = base::WideToUTF8(arg);
 #else
     const auto& option = arg;
@@ -100,7 +100,7 @@ void ClearCrashKeyStub(const std::string& key) {}
 
 namespace electron {
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void CrashReporterStart(gin_helper::Dictionary options) {
   std::string submit_url;
   bool upload_to_server = true;
@@ -140,7 +140,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
 int NodeMain(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   v8_crashpad_support::SetUp();
 #endif
 
@@ -148,7 +148,7 @@ int NodeMain(int argc, char* argv[]) {
   ElectronCrashReporterClient::Create();
 #endif
 
-#if defined(OS_WIN) || (defined(OS_MAC) && !defined(MAS_BUILD))
+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_MAC) && !defined(MAS_BUILD))
   crash_reporter::InitializeCrashpad(false, "node");
 #endif
 
@@ -225,7 +225,7 @@ int NodeMain(int argc, char* argv[]) {
 
       // Setup process.crashReporter in child node processes
       gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
       reporter.SetMethod("start", &CrashReporterStart);
 #endif
 
diff --git a/shell/app/uv_stdio_fix.cc b/shell/app/uv_stdio_fix.cc
index c4a7ee98e2469..e92a619faa7cc 100644
--- a/shell/app/uv_stdio_fix.cc
+++ b/shell/app/uv_stdio_fix.cc
@@ -8,11 +8,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <cstdio>
-
-// Copied from //base/ignore_result.h to avoid taking a dependency on //base on
-// macOS.
-template <typename T>
-inline void ignore_result(const T&) {}
+#include <tuple>
 
 void FixStdioStreams() {
   // libuv may mark stdin/stdout/stderr as close-on-exec, which interferes
@@ -24,9 +20,9 @@ void FixStdioStreams() {
   // For details see https://github.com/libuv/libuv/issues/2062
   struct stat st;
   if (fstat(STDIN_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "r", stdin));
+    std::ignore = freopen("/dev/null", "r", stdin);
   if (fstat(STDOUT_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "w", stdout));
+    std::ignore = freopen("/dev/null", "w", stdout);
   if (fstat(STDERR_FILENO, &st) < 0 && errno == EBADF)
-    ignore_result(freopen("/dev/null", "w", stderr));
+    std::ignore = freopen("/dev/null", "w", stderr);
 }
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 56e82fda66704..0cc858e644d93 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -32,6 +32,7 @@
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/content_switches.h"
+#include "crypto/crypto_buildflags.h"
 #include "media/audio/audio_manager.h"
 #include "net/dns/public/dns_over_https_server_config.h"
 #include "net/dns/public/util.h"
@@ -70,12 +71,12 @@
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/strings/utf_string_conversions.h"
 #include "shell/browser/ui/win/jump_list.h"
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include <CoreFoundation/CoreFoundation.h>
 #include "shell/browser/ui/cocoa/electron_bundle_mover.h"
 #endif
@@ -84,7 +85,7 @@ using electron::Browser;
 
 namespace gin {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 template <>
 struct Converter<electron::ProcessIntegrityLevel> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@@ -346,7 +347,7 @@ struct Converter<JumpListResult> {
 };
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 template <>
 struct Converter<Browser::LaunchItem> {
   static bool FromV8(v8::Isolate* isolate,
@@ -390,7 +391,7 @@ struct Converter<Browser::LoginItemSettings> {
     dict.Get("openAsHidden", &(out->open_as_hidden));
     dict.Get("path", &(out->path));
     dict.Get("args", &(out->args));
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     dict.Get("enabled", &(out->enabled));
     dict.Get("name", &(out->name));
 #endif
@@ -405,7 +406,7 @@ struct Converter<Browser::LoginItemSettings> {
     dict.Set("restoreState", val.restore_state);
     dict.Set("wasOpenedAtLogin", val.opened_at_login);
     dict.Set("wasOpenedAsHidden", val.opened_as_hidden);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     dict.Set("launchItems", val.launch_items);
     dict.Set("executableWillLaunchAtLogin",
              val.executable_will_launch_at_login);
@@ -475,7 +476,7 @@ int GetPathConstant(const std::string& name) {
   else if (name == "userData")
     return chrome::DIR_USER_DATA;
   else if (name == "cache")
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
     return base::DIR_CACHE;
 #else
     return base::DIR_ROAMING_APP_DATA;
@@ -506,7 +507,7 @@ int GetPathConstant(const std::string& name) {
     return chrome::DIR_USER_PICTURES;
   else if (name == "videos")
     return chrome::DIR_USER_VIDEOS;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   else if (name == "recent")
     return electron::DIR_RECENT;
 #endif
@@ -597,7 +598,7 @@ void OnClientCertificateSelected(
   }
 }
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
 int ImportIntoCertStore(CertificateManagerModel* model, base::Value options) {
   std::string file_data, cert_path;
   std::u16string password;
@@ -706,7 +707,7 @@ void App::OnWillFinishLaunching() {
 }
 
 void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Set the application name for audio streams shown in external
   // applications. Only affects pulseaudio currently.
   media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
@@ -740,7 +741,7 @@ void App::OnAccessibilitySupportChanged() {
   Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 void App::OnWillContinueUserActivity(bool* prevent_default,
                                      const std::string& type) {
   if (Emit("will-continue-activity", type)) {
@@ -940,7 +941,7 @@ void App::ChildProcessLaunched(int process_type,
                                base::ProcessHandle handle,
                                const std::string& service_name,
                                const std::string& name) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   auto metrics = base::ProcessMetrics::CreateProcessMetrics(
       handle, content::BrowserChildProcessHost::GetPortProvider());
 #else
@@ -962,7 +963,7 @@ void App::SetAppPath(const base::FilePath& app_path) {
   app_path_ = app_path;
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
                          absl::optional<base::FilePath> custom_path) {
   if (custom_path.has_value()) {
@@ -998,7 +999,7 @@ bool App::IsPackaged() {
   base::FilePath::StringType base_name =
       base::ToLowerASCII(exe_path.BaseName().value());
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return base_name != FILE_PATH_LITERAL("electron.exe");
 #else
   return base_name != FILE_PATH_LITERAL("electron");
@@ -1031,7 +1032,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower,
 }
 
 void App::SetDesktopName(const std::string& desktop_name) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   auto env = base::Environment::Create();
   env->SetVar("CHROME_DESKTOP", desktop_name);
 #endif
@@ -1043,7 +1044,7 @@ std::string App::GetLocale() {
 
 std::string App::GetLocaleCountryCode() {
   std::string region;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   WCHAR locale_name[LOCALE_NAME_MAX_LENGTH] = {0};
 
   if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SISO3166CTRYNAME,
@@ -1054,7 +1055,7 @@ std::string App::GetLocaleCountryCode() {
                       sizeof(locale_name) / sizeof(WCHAR))) {
     base::WideToUTF8(locale_name, wcslen(locale_name), &region);
   }
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   CFLocaleRef locale = CFLocaleCopyCurrent();
   CFStringRef value = CFStringRef(
       static_cast<CFTypeRef>(CFLocaleGetValue(locale, kCFLocaleCountryCode)));
@@ -1155,7 +1156,7 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) {
 
   blink::CloneableMessage additional_data_message;
   args->GetNext(&additional_data_message);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool app_is_sandboxed =
       IsSandboxEnabled(base::CommandLine::ForCurrentProcess());
   process_singleton_ = std::make_unique<ProcessSingleton>(
@@ -1278,7 +1279,7 @@ Browser::LoginItemSettings App::GetLoginItemSettings(gin::Arguments* args) {
   return Browser::Get()->GetLoginItemSettings(options);
 }
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
 void App::ImportCertificate(gin_helper::ErrorThrower thrower,
                             base::Value options,
                             net::CompletionOnceCallback callback) {
@@ -1313,7 +1314,7 @@ void App::OnCertificateManagerModelCreated(
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 v8::Local<v8::Value> App::GetJumpListSettings() {
   JumpList jump_list(Browser::Get()->GetAppUserModelID());
 
@@ -1369,7 +1370,7 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
 
   return result;
 }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
                                         gin::Arguments* args) {
@@ -1418,7 +1419,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
         process_metric.second->metrics->GetPlatformIndependentCPUUsage() /
             processor_count);
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
     cpu_dict.Set("idleWakeupsPerSecond",
                  process_metric.second->metrics->GetIdleWakeupsPerSecond());
 #else
@@ -1443,7 +1444,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
       pid_dict.Set("name", process_metric.second->name);
     }
 
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
     auto memory_info = process_metric.second->GetMemoryInfo();
 
     gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate);
@@ -1454,7 +1455,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
         "peakWorkingSetSize",
         static_cast<double>(memory_info.peak_working_set_size >> 10));
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     memory_dict.Set("privateBytes",
                     static_cast<double>(memory_info.private_bytes >> 10));
 #endif
@@ -1462,9 +1463,9 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
     pid_dict.Set("memory", memory_dict);
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     pid_dict.Set("sandboxed", process_metric.second->IsSandboxed());
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     auto integrity_level = process_metric.second->GetIntegrityLevel();
     auto sandboxed = ProcessMetric::IsSandboxed(integrity_level);
     pid_dict.Set("integrityLevel", integrity_level);
@@ -1499,7 +1500,7 @@ v8::Local<v8::Promise> App::GetGPUInfo(v8::Isolate* isolate,
 
   auto* const info_mgr = GPUInfoManager::GetInstance();
   if (info_type == "complete") {
-#if defined(OS_WIN) || defined(OS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
     info_mgr->FetchCompleteInfo(std::move(promise));
 #else
     info_mgr->FetchBasicInfo(std::move(promise));
@@ -1541,7 +1542,7 @@ void App::SetUserAgentFallback(const std::string& user_agent) {
   ElectronBrowserClient::Get()->SetUserAgent(user_agent);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 bool App::IsRunningUnderARM64Translation() const {
   USHORT processMachine = 0;
@@ -1566,7 +1567,7 @@ std::string App::GetUserAgentFallback() {
   return ElectronBrowserClient::Get()->GetUserAgent();
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool App::MoveToApplicationsFolder(gin_helper::ErrorThrower thrower,
                                    gin::Arguments* args) {
   return ElectronBundleMover::Move(thrower, args);
@@ -1732,7 +1733,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
                  base::BindRepeating(&Browser::AddRecentDocument, browser))
       .SetMethod("clearRecentDocuments",
                  base::BindRepeating(&Browser::ClearRecentDocuments, browser))
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       .SetMethod("setAppUserModelId",
                  base::BindRepeating(&Browser::SetAppUserModelID, browser))
 #endif
@@ -1745,7 +1746,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetMethod(
           "removeAsDefaultProtocolClient",
           base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
       .SetMethod(
           "getApplicationInfoForProtocol",
           base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
@@ -1762,7 +1763,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
                  base::BindRepeating(&Browser::SetLoginItemSettings, browser))
       .SetMethod("isEmojiPanelSupported",
                  base::BindRepeating(&Browser::IsEmojiPanelSupported, browser))
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod("hide", base::BindRepeating(&Browser::Hide, browser))
       .SetMethod("show", base::BindRepeating(&Browser::Show, browser))
       .SetMethod("setUserActivity",
@@ -1784,7 +1785,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
                  base::BindRepeating(&Browser::SetAboutPanelOptions, browser))
       .SetMethod("showAboutPanel",
                  base::BindRepeating(&Browser::ShowAboutPanel, browser))
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod(
           "isSecureKeyboardEntryEnabled",
           base::BindRepeating(&Browser::IsSecureKeyboardEntryEnabled, browser))
@@ -1792,17 +1793,17 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
           "setSecureKeyboardEntryEnabled",
           base::BindRepeating(&Browser::SetSecureKeyboardEntryEnabled, browser))
 #endif
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
       .SetMethod("showEmojiPanel",
                  base::BindRepeating(&Browser::ShowEmojiPanel, browser))
 #endif
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       .SetMethod("setUserTasks",
                  base::BindRepeating(&Browser::SetUserTasks, browser))
       .SetMethod("getJumpListSettings", &App::GetJumpListSettings)
       .SetMethod("setJumpList", &App::SetJumpList)
 #endif
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
       .SetMethod("isUnityRunning",
                  base::BindRepeating(&Browser::IsUnityRunning, browser))
 #endif
@@ -1815,7 +1816,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetMethod("setDesktopName", &App::SetDesktopName)
       .SetMethod("getLocale", &App::GetLocale)
       .SetMethod("getLocaleCountryCode", &App::GetLocaleCountryCode)
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
       .SetMethod("importCertificate", &App::ImportCertificate)
 #endif
       .SetMethod("hasSingleInstanceLock", &App::HasSingleInstanceLock)
@@ -1838,12 +1839,12 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetMethod("startAccessingSecurityScopedResource",
                  &App::StartAccessingSecurityScopedResource)
 #endif
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetProperty("dock", &App::GetDockAPI)
       .SetProperty("runningUnderRosettaTranslation",
                    &App::IsRunningUnderRosettaTranslation)
 #endif
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
       .SetProperty("runningUnderARM64Translation",
                    &App::IsRunningUnderARM64Translation)
 #endif
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index c0de967f140f5..d6bd52ada971f 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -16,6 +16,7 @@
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/render_process_host.h"
+#include "crypto/crypto_buildflags.h"
 #include "gin/handle.h"
 #include "net/base/completion_once_callback.h"
 #include "net/base/completion_repeating_callback.h"
@@ -29,7 +30,7 @@
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/promise.h"
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
 #include "shell/browser/certificate_manager_model.h"
 #endif
 
@@ -39,7 +40,7 @@ class FilePath;
 
 namespace electron {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 enum class JumpListResult : int;
 #endif
 
@@ -64,7 +65,7 @@ class App : public ElectronBrowserClient::Delegate,
       v8::Isolate* isolate) override;
   const char* GetTypeName() override;
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
   void OnCertificateManagerModelCreated(
       base::Value options,
       net::CompletionOnceCallback callback,
@@ -99,7 +100,7 @@ class App : public ElectronBrowserClient::Delegate,
   void OnAccessibilitySupportChanged() override;
   void OnPreMainMessageLoopRun() override;
   void OnPreCreateThreads() override;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void OnWillContinueUserActivity(bool* prevent_default,
                                   const std::string& type) override;
   void OnDidFailToContinueUserActivity(const std::string& type,
@@ -208,7 +209,7 @@ class App : public ElectronBrowserClient::Delegate,
   void SetAccessibilitySupportEnabled(gin_helper::ErrorThrower thrower,
                                       bool enabled);
   Browser::LoginItemSettings GetLoginItemSettings(gin::Arguments* args);
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
   void ImportCertificate(gin_helper::ErrorThrower thrower,
                          base::Value options,
                          net::CompletionOnceCallback callback);
@@ -224,7 +225,7 @@ class App : public ElectronBrowserClient::Delegate,
   void SetUserAgentFallback(const std::string& user_agent);
   std::string GetUserAgentFallback();
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void SetActivationPolicy(gin_helper::ErrorThrower thrower,
                            const std::string& policy);
   bool MoveToApplicationsFolder(gin_helper::ErrorThrower, gin::Arguments* args);
@@ -234,7 +235,7 @@ class App : public ElectronBrowserClient::Delegate,
   v8::Global<v8::Value> dock_;
 #endif
 
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   bool IsRunningUnderARM64Translation() const;
 #endif
 
@@ -243,17 +244,17 @@ class App : public ElectronBrowserClient::Delegate,
       gin::Arguments* args);
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Get the current Jump List settings.
   v8::Local<v8::Value> GetJumpListSettings();
 
   // Set or remove a custom Jump List for the application.
   JumpListResult SetJumpList(v8::Local<v8::Value> val, gin::Arguments* args);
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
   std::unique_ptr<ProcessSingleton> process_singleton_;
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
   std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
 #endif
 
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
index 03c20ee0e760a..704fceeae40c3 100644
--- a/shell/browser/api/electron_api_base_window.cc
+++ b/shell/browser/api/electron_api_base_window.cc
@@ -32,12 +32,12 @@
 #include "shell/browser/native_window_views.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "shell/browser/ui/win/taskbar_host.h"
 #include "ui/base/win/shell.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 namespace gin {
 
 template <>
@@ -305,7 +305,7 @@ void BaseWindow::OnSystemContextMenu(int x, int y, bool* prevent_default) {
   }
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void BaseWindow::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
   if (IsWindowMessageHooked(message)) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
@@ -875,7 +875,7 @@ void BaseWindow::SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   window_->SetVibrancy(type);
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 std::string BaseWindow::GetAlwaysOnTopLevel() {
   return window_->GetAlwaysOnTopLevel();
 }
@@ -1028,7 +1028,7 @@ bool BaseWindow::IsModal() const {
 }
 
 bool BaseWindow::SetThumbarButtons(gin_helper::Arguments* args) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   std::vector<TaskbarHost::ThumbarButton> buttons;
   if (!args->GetNext(&buttons)) {
     args->ThrowError();
@@ -1055,18 +1055,18 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
                                           on_error))
     return;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   static_cast<NativeWindowViews*>(window_.get())
       ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
                 native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   static_cast<NativeWindowViews*>(window_.get())
       ->SetIcon(native_image->image().AsImageSkia());
 #endif
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool BaseWindow::HookWindowMessage(UINT message,
                                    const MessageCallback& callback) {
   messages_callback_map_[message] = callback;
@@ -1266,12 +1266,12 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
                  &BaseWindow::SetVisibleOnAllWorkspaces)
       .SetMethod("isVisibleOnAllWorkspaces",
                  &BaseWindow::IsVisibleOnAllWorkspaces)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod("_getAlwaysOnTopLevel", &BaseWindow::GetAlwaysOnTopLevel)
       .SetMethod("setAutoHideCursor", &BaseWindow::SetAutoHideCursor)
 #endif
       .SetMethod("setVibrancy", &BaseWindow::SetVibrancy)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod("setTrafficLightPosition",
                  &BaseWindow::SetTrafficLightPosition)
       .SetMethod("getTrafficLightPosition",
@@ -1280,7 +1280,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("_setTouchBarItems", &BaseWindow::SetTouchBar)
       .SetMethod("_refreshTouchBarItem", &BaseWindow::RefreshTouchBarItem)
       .SetMethod("_setEscapeTouchBarItem", &BaseWindow::SetEscapeTouchBarItem)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod("selectPreviousTab", &BaseWindow::SelectPreviousTab)
       .SetMethod("selectNextTab", &BaseWindow::SelectNextTab)
       .SetMethod("mergeAllWindows", &BaseWindow::MergeAllWindows)
@@ -1312,7 +1312,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
 #if defined(TOOLKIT_VIEWS)
       .SetMethod("setIcon", &BaseWindow::SetIcon)
 #endif
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       .SetMethod("hookWindowMessage", &BaseWindow::HookWindowMessage)
       .SetMethod("isWindowMessageHooked", &BaseWindow::IsWindowMessageHooked)
       .SetMethod("unhookWindowMessage", &BaseWindow::UnhookWindowMessage)
diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
index 04ae990ab153a..e70202e0e7c61 100644
--- a/shell/browser/api/electron_api_base_window.h
+++ b/shell/browser/api/electron_api_base_window.h
@@ -86,7 +86,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
                             const base::DictionaryValue& details) override;
   void OnNewWindowForTab() override;
   void OnSystemContextMenu(int x, int y, bool* prevent_default) override;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;
 #endif
 
@@ -193,7 +193,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void SetAutoHideCursor(bool auto_hide);
   virtual void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::string GetAlwaysOnTopLevel();
   void SetWindowButtonVisibility(bool visible);
   bool GetWindowButtonVisibility() const;
@@ -234,7 +234,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
                    v8::Local<v8::Value> icon,
                    NativeImage::OnConvertError on_error);
 #endif
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   typedef base::RepeatingCallback<void(v8::Local<v8::Value>,
                                        v8::Local<v8::Value>)>
       MessageCallback;
@@ -264,7 +264,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
                        weak_factory_.GetWeakPtr(), eventName));
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   typedef std::map<UINT, MessageCallback> MessageCallbackMap;
   MessageCallbackMap messages_callback_map_;
 #endif
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index 01c1d9992eb02..5df4b474b244a 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -41,7 +41,7 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
   options.Get(options::kTransparent, &transparent);
 
   std::string vibrancy_type;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   options.Get(options::kVibrancyType, &vibrancy_type);
 #endif
 
@@ -109,7 +109,7 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
   // Install the content view after BaseWindow's JS code is initialized.
   SetContentView(gin::CreateHandle<View>(isolate, web_contents_view.get()));
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   OverrideNSWindowContentView(
       web_contents->inspectable_web_contents()->GetView());
 #endif
@@ -219,7 +219,7 @@ void BrowserWindow::OnSetContentBounds(const gfx::Rect& rect) {
 
 void BrowserWindow::OnActivateContents() {
   // Hide the auto-hide menu when webContents is focused.
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
   if (IsMenuBarAutoHide() && IsMenuBarVisible())
     window()->SetMenuBarVisibility(false);
 #endif
@@ -294,7 +294,7 @@ void BrowserWindow::OnWindowFocus() {
   // focus/blur events might be emitted while closing window.
   if (api_web_contents_) {
     web_contents()->RestoreFocus();
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
     if (!api_web_contents_->IsDevToolsOpened())
       web_contents()->Focus();
 #endif
@@ -304,7 +304,7 @@ void BrowserWindow::OnWindowFocus() {
 }
 
 void BrowserWindow::OnWindowIsKeyChanged(bool is_key) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   auto* rwhv = web_contents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetActive(is_key);
@@ -313,7 +313,7 @@ void BrowserWindow::OnWindowIsKeyChanged(bool is_key) {
 }
 
 void BrowserWindow::OnWindowResize() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (!draggable_regions_.empty()) {
     UpdateDraggableRegions(draggable_regions_);
   } else {
@@ -326,7 +326,7 @@ void BrowserWindow::OnWindowResize() {
 }
 
 void BrowserWindow::OnWindowLeaveFullScreen() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (web_contents()->IsFullscreen())
     web_contents()->ExitFullscreen(true);
 #endif
@@ -392,21 +392,21 @@ void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
 void BrowserWindow::SetBrowserView(v8::Local<v8::Value> value) {
   BaseWindow::ResetBrowserViews();
   BaseWindow::AddBrowserView(value);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   UpdateDraggableRegions(draggable_regions_);
 #endif
 }
 
 void BrowserWindow::AddBrowserView(v8::Local<v8::Value> value) {
   BaseWindow::AddBrowserView(value);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   UpdateDraggableRegions(draggable_regions_);
 #endif
 }
 
 void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
   BaseWindow::RemoveBrowserView(value);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   UpdateDraggableRegions(draggable_regions_);
 #endif
 }
@@ -414,14 +414,14 @@ void BrowserWindow::RemoveBrowserView(v8::Local<v8::Value> value) {
 void BrowserWindow::SetTopBrowserView(v8::Local<v8::Value> value,
                                       gin_helper::Arguments* args) {
   BaseWindow::SetTopBrowserView(value, args);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   UpdateDraggableRegions(draggable_regions_);
 #endif
 }
 
 void BrowserWindow::ResetBrowserViews() {
   BaseWindow::ResetBrowserViews();
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   UpdateDraggableRegions(draggable_regions_);
 #endif
 }
diff --git a/shell/browser/api/electron_api_browser_window.h b/shell/browser/api/electron_api_browser_window.h
index 296ed2b3f8c2e..d1793fd3edde1 100644
--- a/shell/browser/api/electron_api_browser_window.h
+++ b/shell/browser/api/electron_api_browser_window.h
@@ -101,7 +101,7 @@ class BrowserWindow : public BaseWindow,
   v8::Local<v8::Value> GetWebContents(v8::Isolate* isolate);
 
  private:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void OverrideNSWindowContentView(InspectableWebContentsView* webView);
 #endif
 
diff --git a/shell/browser/api/electron_api_crash_reporter.cc b/shell/browser/api/electron_api_crash_reporter.cc
index 75bc4bbb52993..7740441b3a0bc 100644
--- a/shell/browser/api/electron_api_crash_reporter.cc
+++ b/shell/browser/api/electron_api_crash_reporter.cc
@@ -38,7 +38,7 @@
 #include "third_party/crashpad/crashpad/client/crashpad_info.h"  // nogncheck
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "base/containers/span.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
@@ -51,13 +51,13 @@
 
 namespace {
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 std::map<std::string, std::string>& GetGlobalCrashKeysMutable() {
   static base::NoDestructor<std::map<std::string, std::string>>
       global_crash_keys;
   return *global_crash_keys;
 }
-#endif  // defined(OS_LINUX)
+#endif  // BUILDFLAG(IS_LINUX)
 
 bool g_crash_reporter_initialized = false;
 
@@ -81,7 +81,7 @@ bool IsCrashReporterEnabled() {
   return g_crash_reporter_initialized;
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 const std::map<std::string, std::string>& GetGlobalCrashKeys() {
   return GetGlobalCrashKeysMutable();
 }
@@ -150,7 +150,7 @@ void Start(const std::string& submit_url,
       is_node_process
           ? "node"
           : command_line->GetSwitchValueASCII(::switches::kProcessType);
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (::crash_reporter::IsCrashpadEnabled()) {
     for (const auto& pair : extra)
       electron::crash_keys::SetCrashKey(pair.first, pair.second);
@@ -174,7 +174,7 @@ void Start(const std::string& submit_url,
       electron::crash_keys::SetCrashKey(pair.first, pair.second);
     breakpad::InitCrashReporter(process_type);
   }
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   for (const auto& pair : extra)
     electron::crash_keys::SetCrashKey(pair.first, pair.second);
   ::crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
@@ -182,7 +182,7 @@ void Start(const std::string& submit_url,
     crashpad::CrashpadInfo::GetCrashpadInfo()
         ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   for (const auto& pair : extra)
     electron::crash_keys::SetCrashKey(pair.first, pair.second);
   base::FilePath user_data_dir;
@@ -210,7 +210,7 @@ void GetUploadedReports(
 }
 #else
 scoped_refptr<UploadList> CreateCrashUploadList() {
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   return base::MakeRefCounted<CrashUploadListCrashpad>();
 #else
   base::FilePath crash_dir_path;
@@ -231,7 +231,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
     result = base::MakeRefCounted<CombiningUploadList>(std::move(uploaders));
   }
   return result;
-#endif  // defined(OS_MAC) || defined(OS_WIN)
+#endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 }
 
 v8::Local<v8::Value> GetUploadedReports(v8::Isolate* isolate) {
diff --git a/shell/browser/api/electron_api_crash_reporter.h b/shell/browser/api/electron_api_crash_reporter.h
index 48f540287f9ef..598c343c03c69 100644
--- a/shell/browser/api/electron_api_crash_reporter.h
+++ b/shell/browser/api/electron_api_crash_reporter.h
@@ -17,7 +17,7 @@ namespace crash_reporter {
 
 bool IsCrashReporterEnabled();
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 const std::map<std::string, std::string>& GetGlobalCrashKeys();
 std::string GetClientId();
 #endif
diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc
index d608d87d96f50..00721e52bfcf8 100644
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -24,11 +24,11 @@
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
 #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
 #include "ui/display/win/display_info.h"
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace gin {
 
@@ -74,7 +74,7 @@ void DesktopCapturer::StartHandling(bool capture_window,
                                     const gfx::Size& thumbnail_size,
                                     bool fetch_window_icons) {
   fetch_window_icons_ = fetch_window_icons;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (content::desktop_capture::CreateDesktopCaptureOptions()
           .allow_directx_capturer()) {
     // DxgiDuplicatorController should be alive in this scope according to
@@ -82,7 +82,7 @@ void DesktopCapturer::StartHandling(bool capture_window,
     auto duplicator = webrtc::DxgiDuplicatorController::Instance();
     using_directx_capturer_ = webrtc::ScreenCapturerWinDirectx::IsSupported();
   }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
   // clear any existing captured sources.
   captured_sources_.clear();
@@ -143,7 +143,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
       screen_sources.emplace_back(
           DesktopCapturer::Source{list->GetSource(i), std::string()});
     }
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // Gather the same unique screen IDs used by the electron.screen API in
     // order to provide an association between it and
     // desktopCapturer/getUserMedia. This is only required when using the
@@ -176,12 +176,12 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
         source.display_id = base::NumberToString(device_id);
       }
     }
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
     // On Mac, the IDs across the APIs match.
     for (auto& source : screen_sources) {
       source.display_id = base::NumberToString(source.media_list_source.id.id);
     }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
     // TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome
     // only supports capturing the entire desktop on Linux. Revisit this if
     // individual screen support is added.
diff --git a/shell/browser/api/electron_api_desktop_capturer.h b/shell/browser/api/electron_api_desktop_capturer.h
index b31686e853ff0..85b0eaa191195 100644
--- a/shell/browser/api/electron_api_desktop_capturer.h
+++ b/shell/browser/api/electron_api_desktop_capturer.h
@@ -70,9 +70,9 @@ class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
   bool capture_window_ = false;
   bool capture_screen_ = false;
   bool fetch_window_icons_ = false;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool using_directx_capturer_ = false;
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
   base::WeakPtrFactory<DesktopCapturer> weak_ptr_factory_{this};
 };
diff --git a/shell/browser/api/electron_api_dialog.cc b/shell/browser/api/electron_api_dialog.cc
index f5e47ad4c6b15..1932dc5c94e93 100644
--- a/shell/browser/api/electron_api_dialog.cc
+++ b/shell/browser/api/electron_api_dialog.cc
@@ -97,7 +97,7 @@ void Initialize(v8::Local<v8::Object> exports,
   dict.SetMethod("showOpenDialog", &ShowOpenDialog);
   dict.SetMethod("showSaveDialogSync", &ShowSaveDialogSync);
   dict.SetMethod("showSaveDialog", &ShowSaveDialog);
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   dict.SetMethod("showCertificateTrustDialog",
                  &certificate_trust::ShowCertificateTrust);
 #endif
diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc
index 868936ca3c009..e3daf615a6172 100644
--- a/shell/browser/api/electron_api_global_shortcut.cc
+++ b/shell/browser/api/electron_api_global_shortcut.cc
@@ -18,7 +18,7 @@
 #include "shell/common/gin_converters/callback_converter.h"
 #include "shell/common/node_includes.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "base/mac/mac_util.h"
 #endif
 
@@ -27,7 +27,7 @@ using extensions::GlobalShortcutListener;
 
 namespace {
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
   if (base::mac::IsAtLeastOS10_14()) {
     if (Command::IsMediaKey(accelerator)) {
@@ -103,7 +103,7 @@ bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
         .ThrowError("globalShortcut cannot be used before the app is ready");
     return false;
   }
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (Command::IsMediaKey(accelerator)) {
     if (RegisteringMediaKeyForUntrustedClient(accelerator))
       return false;
@@ -130,7 +130,7 @@ void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
   if (accelerator_callback_map_.erase(accelerator) == 0)
     return;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (Command::IsMediaKey(accelerator) &&
       !MapHasMediaKeys(accelerator_callback_map_)) {
     GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(true);
diff --git a/shell/browser/api/electron_api_in_app_purchase.cc b/shell/browser/api/electron_api_in_app_purchase.cc
index e0beb0fa3d6c2..ef80526286c67 100644
--- a/shell/browser/api/electron_api_in_app_purchase.cc
+++ b/shell/browser/api/electron_api_in_app_purchase.cc
@@ -141,7 +141,7 @@ namespace api {
 
 gin::WrapperInfo InAppPurchase::kWrapperInfo = {gin::kEmbedderNativeGin};
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 // static
 gin::Handle<InAppPurchase> InAppPurchase::Create(v8::Isolate* isolate) {
   return gin::CreateHandle(isolate, new InAppPurchase());
@@ -223,7 +223,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   v8::Isolate* isolate = context->GetIsolate();
   gin_helper::Dictionary dict(isolate, exports);
   dict.Set("inAppPurchase", InAppPurchase::Create(isolate));
diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc
index 1540bbb0691b8..b77b46d3541e5 100644
--- a/shell/browser/api/electron_api_menu.cc
+++ b/shell/browser/api/electron_api_menu.cc
@@ -19,7 +19,7 @@
 #include "shell/common/node_includes.h"
 #include "ui/base/models/image_model.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 
 namespace gin {
 
@@ -54,7 +54,7 @@ Menu::Menu(gin::Arguments* args)
     : model_(std::make_unique<ElectronMenuModel>(this)) {
   model_->AddObserver(this);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   gin_helper::Dictionary options;
   if (args->GetNext(&options)) {
     ElectronMenuModel::SharingItem item;
@@ -117,7 +117,7 @@ bool Menu::ShouldRegisterAcceleratorForCommandId(int command_id) const {
                           command_id);
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool Menu::GetSharingItemForCommandId(
     int command_id,
     ElectronMenuModel::SharingItem* item) const {
@@ -296,7 +296,7 @@ v8::Local<v8::ObjectTemplate> Menu::FillObjectTemplate(
       .SetMethod("popupAt", &Menu::PopupAt)
       .SetMethod("closePopupAt", &Menu::ClosePopupAt)
       .SetMethod("_getAcceleratorTextAt", &Menu::GetAcceleratorTextAtForTesting)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
       .SetMethod("_getUserAcceleratorAt", &Menu::GetUserAcceleratorAt)
 #endif
       .Build();
@@ -318,7 +318,7 @@ void Initialize(v8::Local<v8::Object> exports,
 
   gin_helper::Dictionary dict(isolate, exports);
   dict.Set("Menu", Menu::GetConstructor(context));
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   dict.SetMethod("setApplicationMenu", &Menu::SetApplicationMenu);
   dict.SetMethod("sendActionToFirstResponder",
                  &Menu::SendActionToFirstResponder);
diff --git a/shell/browser/api/electron_api_menu.h b/shell/browser/api/electron_api_menu.h
index 5841862bda78f..09756a1a773a0 100644
--- a/shell/browser/api/electron_api_menu.h
+++ b/shell/browser/api/electron_api_menu.h
@@ -36,7 +36,7 @@ class Menu : public gin::Wrappable<Menu>,
   // gin::Wrappable
   static gin::WrapperInfo kWrapperInfo;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Set the global menubar.
   static void SetApplicationMenu(Menu* menu);
 
@@ -68,7 +68,7 @@ class Menu : public gin::Wrappable<Menu>,
       bool use_default_accelerator,
       ui::Accelerator* accelerator) const override;
   bool ShouldRegisterAcceleratorForCommandId(int command_id) const override;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   bool GetSharingItemForCommandId(
       int command_id,
       ElectronMenuModel::SharingItem* item) const override;
diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc
index 1dd5c39f881a2..3eedde9666e91 100644
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -47,7 +47,7 @@ void NativeTheme::OnNativeThemeUpdated(ui::NativeTheme* theme) {
 void NativeTheme::SetThemeSource(ui::NativeTheme::ThemeSource override) {
   ui_theme_->set_theme_source(override);
   web_theme_->set_theme_source(override);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Update the macOS appearance setting for this new override value
   UpdateMacOSAppearanceForOverrideValue(override);
 #endif
@@ -67,14 +67,14 @@ bool NativeTheme::ShouldUseHighContrastColors() {
   return ui_theme_->UserHasContrastPreference();
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 const CFStringRef WhiteOnBlack = CFSTR("whiteOnBlack");
 const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess");
 #endif
 
 // TODO(MarshallOfSound): Implement for Linux
 bool NativeTheme::ShouldUseInvertedColorScheme() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   CFPreferencesAppSynchronize(UniversalAccessDomain);
   Boolean keyExistsAndHasValidFormat = false;
   Boolean is_inverted = CFPreferencesGetAppBooleanValue(
diff --git a/shell/browser/api/electron_api_native_theme.h b/shell/browser/api/electron_api_native_theme.h
index d66e7713ded05..cf092e0460961 100644
--- a/shell/browser/api/electron_api_native_theme.h
+++ b/shell/browser/api/electron_api_native_theme.h
@@ -38,7 +38,7 @@ class NativeTheme : public gin::Wrappable<NativeTheme>,
   ~NativeTheme() override;
 
   void SetThemeSource(ui::NativeTheme::ThemeSource override);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void UpdateMacOSAppearanceForOverrideValue(
       ui::NativeTheme::ThemeSource override);
 #endif
diff --git a/shell/browser/api/electron_api_power_monitor.cc b/shell/browser/api/electron_api_power_monitor.cc
index b26f1125897b3..258fc1464f999 100644
--- a/shell/browser/api/electron_api_power_monitor.cc
+++ b/shell/browser/api/electron_api_power_monitor.cc
@@ -42,7 +42,7 @@ namespace api {
 gin::WrapperInfo PowerMonitor::kWrapperInfo = {gin::kEmbedderNativeGin};
 
 PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   Browser::Get()->SetShutdownHandler(base::BindRepeating(
       &PowerMonitor::ShouldShutdown, base::Unretained(this)));
 #endif
@@ -50,7 +50,7 @@ PowerMonitor::PowerMonitor(v8::Isolate* isolate) {
   base::PowerMonitor::AddPowerStateObserver(this);
   base::PowerMonitor::AddPowerSuspendObserver(this);
 
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   InitPlatformSpecificMonitors();
 #endif
 }
@@ -79,7 +79,7 @@ void PowerMonitor::OnResume() {
   Emit("resume");
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void PowerMonitor::SetListeningForShutdown(bool is_listening) {
   if (is_listening) {
     // unretained is OK because we own power_observer_linux_
@@ -105,7 +105,7 @@ gin::ObjectTemplateBuilder PowerMonitor::GetObjectTemplateBuilder(
   auto builder =
       gin_helper::EventEmitterMixin<PowerMonitor>::GetObjectTemplateBuilder(
           isolate);
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   builder.SetMethod("setListeningForShutdown",
                     &PowerMonitor::SetListeningForShutdown);
 #endif
diff --git a/shell/browser/api/electron_api_power_monitor.h b/shell/browser/api/electron_api_power_monitor.h
index c277d3e2b2960..26ee40cc3ccd0 100644
--- a/shell/browser/api/electron_api_power_monitor.h
+++ b/shell/browser/api/electron_api_power_monitor.h
@@ -11,7 +11,7 @@
 #include "shell/common/gin_helper/pinnable.h"
 #include "ui/base/idle/idle.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "shell/browser/lib/power_observer_linux.h"
 #endif
 
@@ -41,14 +41,14 @@ class PowerMonitor : public gin::Wrappable<PowerMonitor>,
   explicit PowerMonitor(v8::Isolate* isolate);
   ~PowerMonitor() override;
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   void SetListeningForShutdown(bool);
 #endif
 
   // Called by native calles.
   bool ShouldShutdown();
 
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   void InitPlatformSpecificMonitors();
 #endif
 
@@ -59,7 +59,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonitor>,
   void OnSuspend() override;
   void OnResume() override;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Static callback invoked when a message comes in to our messaging window.
   static LRESULT CALLBACK WndProcStatic(HWND hwnd,
                                         UINT message,
@@ -81,7 +81,7 @@ class PowerMonitor : public gin::Wrappable<PowerMonitor>,
   HWND window_;
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   PowerObserverLinux power_observer_linux_{this};
 #endif
 };
diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc
index 1e4c30b4669aa..35a4951687286 100644
--- a/shell/browser/api/electron_api_screen.cc
+++ b/shell/browser/api/electron_api_screen.cc
@@ -20,7 +20,7 @@
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/display/win/screen_win.h"
 #endif
 
@@ -90,7 +90,7 @@ display::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
   return screen_->GetDisplayMatching(match_rect);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 static gfx::Rect ScreenToDIPRect(electron::NativeWindow* window,
                                  const gfx::Rect& rect) {
@@ -153,7 +153,7 @@ gin::ObjectTemplateBuilder Screen::GetObjectTemplateBuilder(
       .SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
       .SetMethod("getAllDisplays", &Screen::GetAllDisplays)
       .SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       .SetMethod("screenToDipPoint", &display::win::ScreenWin::ScreenToDIPPoint)
       .SetMethod("dipToScreenPoint", &display::win::ScreenWin::DIPToScreenPoint)
       .SetMethod("screenToDipRect", &ScreenToDIPRect)
diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc
index 07e2322048e99..58df58f502e9a 100644
--- a/shell/browser/api/electron_api_system_preferences.cc
+++ b/shell/browser/api/electron_api_system_preferences.cc
@@ -20,13 +20,13 @@ namespace api {
 gin::WrapperInfo SystemPreferences::kWrapperInfo = {gin::kEmbedderNativeGin};
 
 SystemPreferences::SystemPreferences() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   InitializeWindow();
 #endif
 }
 
 SystemPreferences::~SystemPreferences() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   Browser::Get()->RemoveObserver(this);
 #endif
 }
@@ -63,16 +63,16 @@ gin::ObjectTemplateBuilder SystemPreferences::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
   return gin_helper::EventEmitterMixin<
              SystemPreferences>::GetObjectTemplateBuilder(isolate)
-#if defined(OS_WIN) || defined(OS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
       .SetMethod("getColor", &SystemPreferences::GetColor)
       .SetMethod("getAccentColor", &SystemPreferences::GetAccentColor)
       .SetMethod("getMediaAccessStatus",
                  &SystemPreferences::GetMediaAccessStatus)
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       .SetMethod("isAeroGlassEnabled", &SystemPreferences::IsAeroGlassEnabled)
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
       .SetMethod("postNotification", &SystemPreferences::PostNotification)
       .SetMethod("subscribeNotification",
                  &SystemPreferences::SubscribeNotification)
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index 8dbf35d591958..592df523a3fea 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -15,7 +15,7 @@
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/promise.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "shell/browser/browser.h"
 #include "shell/browser/browser_observer.h"
 #include "ui/gfx/sys_color_change_listener.h"
@@ -25,7 +25,7 @@ namespace electron {
 
 namespace api {
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 enum class NotificationCenterKind {
   kNSDistributedNotificationCenter = 0,
   kNSNotificationCenter,
@@ -36,7 +36,7 @@ enum class NotificationCenterKind {
 class SystemPreferences
     : public gin::Wrappable<SystemPreferences>,
       public gin_helper::EventEmitterMixin<SystemPreferences>
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     ,
       public BrowserObserver,
       public gfx::SysColorChangeListener
@@ -51,14 +51,14 @@ class SystemPreferences
       v8::Isolate* isolate) override;
   const char* GetTypeName() override;
 
-#if defined(OS_WIN) || defined(OS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
   std::string GetAccentColor();
   std::string GetColor(gin_helper::ErrorThrower thrower,
                        const std::string& color);
   std::string GetMediaAccessStatus(gin_helper::ErrorThrower thrower,
                                    const std::string& media_type);
 #endif
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool IsAeroGlassEnabled();
 
   void InitializeWindow();
@@ -69,7 +69,7 @@ class SystemPreferences
   // BrowserObserver:
   void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
 
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   using NotificationCallback = base::RepeatingCallback<
       void(const std::string&, base::DictionaryValue, const std::string&)>;
 
@@ -129,7 +129,7 @@ class SystemPreferences
   SystemPreferences();
   ~SystemPreferences() override;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   int DoSubscribeNotification(const std::string& name,
                               const NotificationCallback& callback,
                               NotificationCenterKind kind);
@@ -137,7 +137,7 @@ class SystemPreferences
 #endif
 
  private:
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Static callback invoked when a message comes in to our messaging window.
   static LRESULT CALLBACK WndProcStatic(HWND hwnd,
                                         UINT message,
diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc
index 72cd816638bde..f80d753ddf57c 100644
--- a/shell/browser/api/electron_api_tray.cc
+++ b/shell/browser/api/electron_api_tray.cc
@@ -82,7 +82,7 @@ gin::Handle<Tray> Tray::New(gin_helper::ErrorThrower thrower,
     return gin::Handle<Tray>();
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (!guid.has_value() && args->Length() > 1) {
     thrower.ThrowError("Invalid GUID format");
     return gin::Handle<Tray>();
@@ -196,7 +196,7 @@ void Tray::SetImage(v8::Isolate* isolate, v8::Local<v8::Value> image) {
   if (!NativeImage::TryConvertNativeImage(isolate, image, &native_image))
     return;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   tray_icon_->SetImage(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
   tray_icon_->SetImage(native_image->image());
@@ -211,7 +211,7 @@ void Tray::SetPressedImage(v8::Isolate* isolate, v8::Local<v8::Value> image) {
   if (!NativeImage::TryConvertNativeImage(isolate, image, &native_image))
     return;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   tray_icon_->SetPressedImage(
       native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)));
 #else
@@ -230,7 +230,7 @@ void Tray::SetTitle(const std::string& title,
                     gin::Arguments* args) {
   if (!CheckAlive())
     return;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   TrayIcon::TitleOptions title_options;
   if (options) {
     if (options->Get("fontType", &title_options.font_type)) {
@@ -258,7 +258,7 @@ void Tray::SetTitle(const std::string& title,
 std::string Tray::GetTitle() {
   if (!CheckAlive())
     return std::string();
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   return tray_icon_->GetTitle();
 #else
   return "";
@@ -268,7 +268,7 @@ std::string Tray::GetTitle() {
 void Tray::SetIgnoreDoubleClickEvents(bool ignore) {
   if (!CheckAlive())
     return;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   tray_icon_->SetIgnoreDoubleClickEvents(ignore);
 #endif
 }
@@ -276,7 +276,7 @@ void Tray::SetIgnoreDoubleClickEvents(bool ignore) {
 bool Tray::GetIgnoreDoubleClickEvents() {
   if (!CheckAlive())
     return false;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   return tray_icon_->GetIgnoreDoubleClickEvents();
 #else
   return false;
@@ -309,7 +309,7 @@ void Tray::DisplayBalloon(gin_helper::ErrorThrower thrower,
   options.Get("respectQuietTime", &balloon_options.respect_quiet_time);
 
   if (icon) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     balloon_options.icon = icon->GetHICON(
         GetSystemMetrics(balloon_options.large_icon ? SM_CXICON : SM_CXSMICON));
 #else
diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc
index 62675d2f3bf7b..212a2b6c16f8e 100644
--- a/shell/browser/api/electron_api_url_loader.cc
+++ b/shell/browser/api/electron_api_url_loader.cc
@@ -361,10 +361,12 @@ void SimpleURLLoaderWrapper::OnSSLCertificateError(
   std::move(response).Run(net_error);
 }
 
-void SimpleURLLoaderWrapper::OnClearSiteData(const GURL& url,
-                                             const std::string& header_value,
-                                             int32_t load_flags,
-                                             OnClearSiteDataCallback callback) {
+void SimpleURLLoaderWrapper::OnClearSiteData(
+    const GURL& url,
+    const std::string& header_value,
+    int32_t load_flags,
+    const absl::optional<net::CookiePartitionKey>& cookie_partition_key,
+    OnClearSiteDataCallback callback) {
   std::move(callback).Run();
 }
 void SimpleURLLoaderWrapper::OnLoadingStateUpdate(
diff --git a/shell/browser/api/electron_api_url_loader.h b/shell/browser/api/electron_api_url_loader.h
index 6726f2c4b41ae..9ab4d389418fc 100644
--- a/shell/browser/api/electron_api_url_loader.h
+++ b/shell/browser/api/electron_api_url_loader.h
@@ -86,10 +86,12 @@ class SimpleURLLoaderWrapper
       const scoped_refptr<net::SSLCertRequestInfo>& cert_info,
       mojo::PendingRemote<network::mojom::ClientCertificateResponder>
           client_cert_responder) override {}
-  void OnClearSiteData(const GURL& url,
-                       const std::string& header_value,
-                       int32_t load_flags,
-                       OnClearSiteDataCallback callback) override;
+  void OnClearSiteData(
+      const GURL& url,
+      const std::string& header_value,
+      int32_t load_flags,
+      const absl::optional<net::CookiePartitionKey>& cookie_partition_key,
+      OnClearSiteDataCallback callback) override;
   void OnLoadingStateUpdate(network::mojom::LoadInfoPtr info,
                             OnLoadingStateUpdateCallback callback) override;
   void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index a02d458dee929..85d2e7207efc0 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -14,7 +14,6 @@
 
 #include "base/containers/id_map.h"
 #include "base/files/file_util.h"
-#include "base/ignore_result.h"
 #include "base/json/json_reader.h"
 #include "base/no_destructor.h"
 #include "base/strings/utf_string_conversions.h"
@@ -144,17 +143,17 @@
 #include "shell/browser/osr/osr_web_contents_view.h"
 #endif
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 #include "ui/aura/window.h"
 #else
 #include "ui/base/cocoa/defaults_utils.h"
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 #include "ui/gfx/font_render_params.h"
 #endif
 
@@ -172,7 +171,7 @@
 #include "shell/browser/printing/print_preview_message_handler.h"
 #include "shell/browser/printing/print_view_manager_electron.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "printing/backend/win_helper.h"
 #endif
 #endif
@@ -390,14 +389,14 @@ void OnCapturePageDone(gin_helper::Promise<gfx::Image> promise,
 }
 
 absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   base::TimeDelta interval;
   if (ui::TextInsertionCaretBlinkPeriod(&interval))
     return interval;
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   if (auto* linux_ui = views::LinuxUI::instance())
     return linux_ui->GetCursorBlinkInterval();
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   const auto system_msec = ::GetCaretBlinkTime();
   if (system_msec != 0) {
     return (system_msec == INFINITE) ? base::TimeDelta()
@@ -412,14 +411,14 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
 // found on the network. We need to check this because Chromium does not do
 // sanity checking of device_name validity and so will crash on invalid names.
 bool IsDeviceNameValid(const std::u16string& device_name) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   base::ScopedCFTypeRef<CFStringRef> new_printer_id(
       base::SysUTF16ToCFStringRef(device_name));
   PMPrinter new_printer = PMPrinterCreateFromPrinterID(new_printer_id.get());
   bool printer_exists = new_printer != nullptr;
   PMRelease(new_printer);
   return printer_exists;
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   printing::ScopedPrinterHandle printer;
   return printer.OpenPrinterWithName(base::as_wcstr(device_name));
 #else
@@ -428,7 +427,7 @@ bool IsDeviceNameValid(const std::u16string& device_name) {
 }
 
 std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Blocking is needed here because Windows printer drivers are oftentimes
   // not thread-safe and have to be accessed on the UI thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ -463,7 +462,7 @@ std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
 // chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc:L36-L54
 scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
   // USER_VISIBLE because the result is displayed in the print preview dialog.
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   static constexpr base::TaskTraits kTraits = {
       base::MayBlock(), base::TaskPriority::USER_VISIBLE};
 #endif
@@ -471,7 +470,7 @@ scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
 #if defined(USE_CUPS)
   // CUPS is thread safe.
   return base::ThreadPool::CreateTaskRunner(kTraits);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   // Windows drivers are likely not thread-safe and need to be accessed on the
   // UI thread.
   return content::GetUIThreadTaskRunner(
@@ -579,15 +578,17 @@ PrefService* GetPrefService(content::WebContents* web_contents) {
 std::map<std::string, std::string> GetAddedFileSystemPaths(
     content::WebContents* web_contents) {
   auto* pref_service = GetPrefService(web_contents);
-  const base::DictionaryValue* file_system_paths_value =
+  const base::Value* file_system_paths_value =
       pref_service->GetDictionary(prefs::kDevToolsFileSystemPaths);
   std::map<std::string, std::string> result;
   if (file_system_paths_value) {
-    base::DictionaryValue::Iterator it(*file_system_paths_value);
-    for (; !it.IsAtEnd(); it.Advance()) {
+    const base::DictionaryValue* file_system_paths_dict;
+    file_system_paths_value->GetAsDictionary(&file_system_paths_dict);
+
+    for (auto it : file_system_paths_dict->DictItems()) {
       std::string type =
-          it.value().is_string() ? it.value().GetString() : std::string();
-      result[it.key()] = type;
+          it.second.is_string() ? it.second.GetString() : std::string();
+      result[it.first] = type;
     }
   }
   return result;
@@ -826,7 +827,7 @@ void WebContents::InitWithSessionAndOptions(
   accept_languages.pop_back();
   prefs->accept_languages = accept_languages;
 
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
   // Update font settings.
   static const gfx::FontRenderParams params(
       gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
@@ -1213,7 +1214,7 @@ bool WebContents::HandleKeyboardEvent(
   }
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 // NOTE: The macOS version of this function is found in
 // electron_api_web_contents_mac.mm, as it requires calling into objective-C
 // code.
@@ -1850,7 +1851,7 @@ void WebContents::ReadyToCommitNavigation(
   // Don't focus content in an inactive window.
   if (!owner_window())
     return;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (!owner_window()->IsActive())
     return;
 #else
@@ -2347,7 +2348,7 @@ void WebContents::ForcefullyCrashRenderer() {
 
   content::RenderProcessHost* rph = rwh->GetProcess();
   if (rph) {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
     // Instead we send an explicit IPC to crash on the renderer's IO thread.
     rph->ForceCrash();
@@ -2907,7 +2908,7 @@ void WebContents::StopFindInPage(content::StopFindAction action) {
 }
 
 void WebContents::ShowDefinitionForSelection() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   auto* const view = web_contents()->GetRenderWidgetHostView();
   if (view)
     view->ShowDefinitionForSelection();
@@ -2923,14 +2924,14 @@ void WebContents::CopyImageAt(int x, int y) {
 void WebContents::Focus() {
   // Focusing on WebContents does not automatically focus the window on macOS
   // and Linux, do it manually to match the behavior on Windows.
-#if defined(OS_MAC) || defined(OS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
   if (owner_window())
     owner_window()->Focus(true);
 #endif
   web_contents()->Focus();
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 bool WebContents::IsFocused() const {
   auto* view = web_contents()->GetRenderWidgetHostView();
   if (!view)
@@ -3077,7 +3078,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(gin::Arguments* args) {
     return handle;
   }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
   // If the view's renderer is suspended this may fail on Windows/Linux -
   // bail if so. See CopyFromSurface in
   // content/public/browser/render_widget_host_view.h.
@@ -3087,7 +3088,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(gin::Arguments* args) {
     promise.Resolve(gfx::Image());
     return handle;
   }
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   // Capture full page if user doesn't specify a |rect|.
   const gfx::Size view_size =
@@ -3121,8 +3122,8 @@ void WebContents::IncrementCapturerCount(gin::Arguments* args) {
   // get stayAwake arguments if they exist
   args->GetNext(&stay_awake);
 
-  ignore_result(
-      web_contents()->IncrementCapturerCount(size, stay_hidden, stay_awake));
+  std::ignore =
+      web_contents()->IncrementCapturerCount(size, stay_hidden, stay_awake);
 }
 
 void WebContents::DecrementCapturerCount(gin::Arguments* args) {
@@ -3644,8 +3645,7 @@ void WebContents::DevToolsAddFileSystem(
 
   auto* pref_service = GetPrefService(GetDevToolsWebContents());
   DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
-  update.Get()->SetWithoutPathExpansion(path.AsUTF8Unsafe(),
-                                        std::make_unique<base::Value>(type));
+  update.Get()->SetKey(path.AsUTF8Unsafe(), base::Value(type));
   inspectable_web_contents_->CallClientFunction(
       "DevToolsAPI.fileSystemAdded", nullptr, file_system_value.get(), nullptr);
 }
@@ -3750,13 +3750,13 @@ void WebContents::ColorPickedInEyeDropper(int r, int g, int b, int a) {
       "DevToolsAPI.eyeDropperPickedColor", &color, nullptr, nullptr);
 }
 
-#if defined(TOOLKIT_VIEWS) && !defined(OS_MAC)
+#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
 ui::ImageModel WebContents::GetDevToolsWindowIcon() {
   return owner_window() ? owner_window()->GetWindowAppIcon() : ui::ImageModel{};
 }
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void WebContents::GetDevToolsWindowWMClass(std::string* name,
                                            std::string* class_name) {
   *class_name = Browser::Get()->GetName();
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 93c7862ebce88..38169890b097a 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -715,10 +715,10 @@ class WebContents : public ExclusiveAccessContext,
   void DevToolsSetEyeDropperActive(bool active) override;
 
   // InspectableWebContentsViewDelegate:
-#if defined(TOOLKIT_VIEWS) && !defined(OS_MAC)
+#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
   ui::ImageModel GetDevToolsWindowIcon() override;
 #endif
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   void GetDevToolsWindowWMClass(std::string* name,
                                 std::string* class_name) override;
 #endif
diff --git a/shell/browser/api/electron_api_web_contents_view.cc b/shell/browser/api/electron_api_web_contents_view.cc
index cb89c927422e1..8e9e281cc8bb9 100644
--- a/shell/browser/api/electron_api_web_contents_view.cc
+++ b/shell/browser/api/electron_api_web_contents_view.cc
@@ -15,7 +15,7 @@
 #include "shell/common/gin_helper/object_template_builder.h"
 #include "shell/common/node_includes.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "shell/browser/ui/cocoa/delayed_native_view_host.h"
 #endif
 
@@ -25,7 +25,7 @@ namespace api {
 
 WebContentsView::WebContentsView(v8::Isolate* isolate,
                                  gin::Handle<WebContents> web_contents)
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     : View(new DelayedNativeViewHost(web_contents->inspectable_web_contents()
                                          ->GetView()
                                          ->GetNativeView())),
@@ -34,7 +34,7 @@ WebContentsView::WebContentsView(v8::Isolate* isolate,
 #endif
       web_contents_(isolate, web_contents.ToV8()),
       api_web_contents_(web_contents.get()) {
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
   // On macOS the View is a newly-created |DelayedNativeViewHost| and it is our
   // responsibility to delete it. On other platforms the View is created and
   // managed by InspectableWebContents.
diff --git a/shell/browser/api/gpu_info_enumerator.cc b/shell/browser/api/gpu_info_enumerator.cc
index 8237b81033bae..75b330a3264fc 100644
--- a/shell/browser/api/gpu_info_enumerator.cc
+++ b/shell/browser/api/gpu_info_enumerator.cc
@@ -69,8 +69,8 @@ void GPUInfoEnumerator::BeginVideoDecodeAcceleratorSupportedProfile() {
 
 void GPUInfoEnumerator::EndVideoDecodeAcceleratorSupportedProfile() {
   auto& top_value = value_stack.top();
-  top_value->SetDictionary(kVideoDecodeAcceleratorSupportedProfileKey,
-                           std::move(current));
+  top_value->SetKey(kVideoDecodeAcceleratorSupportedProfileKey,
+                    base::Value::FromUniquePtrValue(std::move(current)));
   current = std::move(top_value);
   value_stack.pop();
 }
@@ -82,8 +82,8 @@ void GPUInfoEnumerator::BeginVideoEncodeAcceleratorSupportedProfile() {
 
 void GPUInfoEnumerator::EndVideoEncodeAcceleratorSupportedProfile() {
   auto& top_value = value_stack.top();
-  top_value->SetDictionary(kVideoEncodeAcceleratorSupportedProfileKey,
-                           std::move(current));
+  top_value->SetKey(kVideoEncodeAcceleratorSupportedProfileKey,
+                    base::Value::FromUniquePtrValue(std::move(current)));
   current = std::move(top_value);
   value_stack.pop();
 }
@@ -95,8 +95,8 @@ void GPUInfoEnumerator::BeginImageDecodeAcceleratorSupportedProfile() {
 
 void GPUInfoEnumerator::EndImageDecodeAcceleratorSupportedProfile() {
   auto& top_value = value_stack.top();
-  top_value->SetDictionary(kImageDecodeAcceleratorSupportedProfileKey,
-                           std::move(current));
+  top_value->SetKey(kImageDecodeAcceleratorSupportedProfileKey,
+                    base::Value::FromUniquePtrValue(std::move(current)));
   current = std::move(top_value);
   value_stack.pop();
 }
@@ -108,7 +108,8 @@ void GPUInfoEnumerator::BeginAuxAttributes() {
 
 void GPUInfoEnumerator::EndAuxAttributes() {
   auto& top_value = value_stack.top();
-  top_value->SetDictionary(kAuxAttributesKey, std::move(current));
+  top_value->SetKey(kAuxAttributesKey,
+                    base::Value::FromUniquePtrValue(std::move(current)));
   current = std::move(top_value);
   value_stack.pop();
 }
@@ -120,7 +121,8 @@ void GPUInfoEnumerator::BeginOverlayInfo() {
 
 void GPUInfoEnumerator::EndOverlayInfo() {
   auto& top_value = value_stack.top();
-  top_value->SetDictionary(kOverlayInfo, std::move(current));
+  top_value->SetKey(kOverlayInfo,
+                    base::Value::FromUniquePtrValue(std::move(current)));
   current = std::move(top_value);
   value_stack.pop();
 }
diff --git a/shell/browser/api/gpuinfo_manager.cc b/shell/browser/api/gpuinfo_manager.cc
index 0719eb15bab4d..d797d0ec4a6da 100644
--- a/shell/browser/api/gpuinfo_manager.cc
+++ b/shell/browser/api/gpuinfo_manager.cc
@@ -31,7 +31,7 @@ GPUInfoManager::~GPUInfoManager() {
 // Based on
 // https://chromium.googlesource.com/chromium/src.git/+/69.0.3497.106/content/browser/gpu/gpu_data_manager_impl_private.cc#838
 bool GPUInfoManager::NeedsCompleteGpuInfoCollection() const {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return gpu_data_manager_->DxdiagDx12VulkanRequested() &&
          gpu_data_manager_->GetGPUInfo().dx_diagnostics.IsEmpty();
 #else
diff --git a/shell/browser/api/process_metric.cc b/shell/browser/api/process_metric.cc
index fd447fd43543c..b1a2a65052ee1 100644
--- a/shell/browser/api/process_metric.cc
+++ b/shell/browser/api/process_metric.cc
@@ -9,14 +9,14 @@
 
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 
 #include <psapi.h>
 #include "base/win/win_util.h"
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include <mach/mach.h>
 #include "base/process/port_provider_mac.h"
 #include "content/public/browser/browser_child_process_host.h"
@@ -46,7 +46,7 @@ absl::optional<mach_task_basic_info_data_t> GetTaskInfo(mach_port_t task) {
 
 }  // namespace
 
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
 namespace electron {
 
@@ -60,7 +60,7 @@ ProcessMetric::ProcessMetric(int type,
   this->service_name = service_name;
   this->name = name;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HANDLE duplicate_handle = INVALID_HANDLE_VALUE;
   ::DuplicateHandle(::GetCurrentProcess(), handle, ::GetCurrentProcess(),
                     &duplicate_handle, 0, false, DUPLICATE_SAME_ACCESS);
@@ -72,7 +72,7 @@ ProcessMetric::ProcessMetric(int type,
 
 ProcessMetric::~ProcessMetric() = default;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 ProcessMemoryInfo ProcessMetric::GetMemoryInfo() const {
   ProcessMemoryInfo result;
@@ -146,7 +146,7 @@ bool ProcessMetric::IsSandboxed(ProcessIntegrityLevel integrity_level) {
          integrity_level < ProcessIntegrityLevel::kMedium;
 }
 
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
 
 ProcessMemoryInfo ProcessMetric::GetMemoryInfo() const {
   ProcessMemoryInfo result;
@@ -167,6 +167,6 @@ bool ProcessMetric::IsSandboxed() const {
 #endif
 }
 
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
 }  // namespace electron
diff --git a/shell/browser/api/process_metric.h b/shell/browser/api/process_metric.h
index a6b91fff70cf7..07978f1c3895f 100644
--- a/shell/browser/api/process_metric.h
+++ b/shell/browser/api/process_metric.h
@@ -14,17 +14,17 @@
 
 namespace electron {
 
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
 struct ProcessMemoryInfo {
   size_t working_set_size = 0;
   size_t peak_working_set_size = 0;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   size_t private_bytes = 0;
 #endif
 };
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 enum class ProcessIntegrityLevel {
   kUnknown,
   kUntrusted,
@@ -48,14 +48,14 @@ struct ProcessMetric {
                 const std::string& name = std::string());
   ~ProcessMetric();
 
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
   ProcessMemoryInfo GetMemoryInfo() const;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   ProcessIntegrityLevel GetIntegrityLevel() const;
   static bool IsSandboxed(ProcessIntegrityLevel integrity_level);
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   bool IsSandboxed() const;
 #endif
 };
diff --git a/shell/browser/auto_updater.cc b/shell/browser/auto_updater.cc
index a2a1b4a627bda..b9a8932c3e0e0 100644
--- a/shell/browser/auto_updater.cc
+++ b/shell/browser/auto_updater.cc
@@ -16,7 +16,7 @@ void AutoUpdater::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
-#if !defined(OS_MAC) || defined(MAS_BUILD)
+#if !BUILDFLAG(IS_MAC) || defined(MAS_BUILD)
 std::string AutoUpdater::GetFeedURL() {
   return "";
 }
diff --git a/shell/browser/browser.cc b/shell/browser/browser.cc
index fd8bb0b726032..e94b1d65c229c 100644
--- a/shell/browser/browser.cc
+++ b/shell/browser/browser.cc
@@ -41,7 +41,7 @@ void RunQuitClosure(base::OnceClosure quit) {
 
 }  // namespace
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 Browser::LaunchItem::LaunchItem() = default;
 Browser::LaunchItem::~LaunchItem() = default;
 Browser::LaunchItem::LaunchItem(const LaunchItem& other) = default;
@@ -65,7 +65,7 @@ Browser* Browser::Get() {
   return ElectronBrowserMainParts::Get()->browser();
 }
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 void Browser::Focus(gin::Arguments* args) {
   // Focus on the first visible window.
   for (auto* const window : WindowList::GetWindows()) {
@@ -275,7 +275,7 @@ void Browser::OnWindowAllClosed() {
   }
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 void Browser::NewWindowForTab() {
   for (BrowserObserver& observer : observers_)
     observer.OnNewWindowForTab();
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
index a9bc9f777e744..4a69bbd75dcb6 100755
--- a/shell/browser/browser.h
+++ b/shell/browser/browser.h
@@ -18,13 +18,13 @@
 #include "shell/browser/window_list_observer.h"
 #include "shell/common/gin_helper/promise.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #include "base/files/file_path.h"
 #include "shell/browser/ui/win/taskbar_host.h"
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "ui/base/cocoa/secure_password_input.h"
 #endif
 
@@ -82,7 +82,7 @@ class Browser : public WindowListObserver {
   // Clear the recent documents list.
   void ClearRecentDocuments();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Set the application user model ID.
   void SetAppUserModelID(const std::wstring& name);
 #endif
@@ -101,7 +101,7 @@ class Browser : public WindowListObserver {
 
   std::u16string GetApplicationNameForProtocol(const GURL& url);
 
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
   // get the name, icon and path for an application
   v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,
                                                        const GURL& url);
@@ -111,7 +111,7 @@ class Browser : public WindowListObserver {
   bool SetBadgeCount(absl::optional<int> count);
   int GetBadgeCount();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   struct LaunchItem {
     std::wstring name;
     std::wstring path;
@@ -135,7 +135,7 @@ class Browser : public WindowListObserver {
     std::u16string path;
     std::vector<std::u16string> args;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // used in browser::setLoginItemSettings
     bool enabled = true;
     std::wstring name;
@@ -152,7 +152,7 @@ class Browser : public WindowListObserver {
   void SetLoginItemSettings(LoginItemSettings settings);
   LoginItemSettings GetLoginItemSettings(const LoginItemSettings& options);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Set the handler which decides whether to shutdown.
   void SetShutdownHandler(base::RepeatingCallback<bool()> handler);
 
@@ -227,16 +227,16 @@ class Browser : public WindowListObserver {
   // Set docks' icon.
   void DockSetIcon(v8::Isolate* isolate, v8::Local<v8::Value> icon);
 
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   void ShowAboutPanel();
   void SetAboutPanelOptions(base::DictionaryValue options);
 
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   void ShowEmojiPanel();
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   struct UserTask {
     base::FilePath program;
     std::wstring arguments;
@@ -258,12 +258,12 @@ class Browser : public WindowListObserver {
   // one from app's name.
   // The returned string managed by Browser, and should not be modified.
   PCWSTR GetAppUserModelID();
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Whether Unity launcher is running.
   bool IsUnityRunning();
-#endif  // defined(OS_LINUX)
+#endif  // BUILDFLAG(IS_LINUX)
 
   // Tell the application to open a file.
   bool OpenFile(const std::string& file_path);
@@ -271,13 +271,13 @@ class Browser : public WindowListObserver {
   // Tell the application to open a url.
   void OpenURL(const std::string& url);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Tell the application to create a new window for a tab.
   void NewWindowForTab();
 
   // Tell the application that application did become active
   void DidBecomeActive();
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   // Tell the application that application is activated with visible/invisible
   // windows.
@@ -302,7 +302,7 @@ class Browser : public WindowListObserver {
 
   void RemoveObserver(BrowserObserver* obs) { observers_.RemoveObserver(obs); }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Returns whether secure input is enabled
   bool IsSecureKeyboardEntryEnabled();
   void SetSecureKeyboardEntryEnabled(bool enabled);
@@ -355,18 +355,18 @@ class Browser : public WindowListObserver {
 
   std::unique_ptr<gin_helper::Promise<void>> ready_promise_;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::unique_ptr<ui::ScopedPasswordInputEnabler> password_input_enabler_;
   base::Time last_dock_show_;
 #endif
 
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
   base::Value about_panel_options_;
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   base::DictionaryValue about_panel_options_;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   void UpdateBadgeContents(HWND hwnd,
                            const absl::optional<std::string>& badge_content,
                            const std::string& badge_alt_string);
diff --git a/shell/browser/browser_linux.cc b/shell/browser/browser_linux.cc
index 93874ef38e95b..320ae7861a5ae 100644
--- a/shell/browser/browser_linux.cc
+++ b/shell/browser/browser_linux.cc
@@ -15,7 +15,7 @@
 #include "shell/browser/window_list.h"
 #include "shell/common/application_info.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "shell/browser/linux/unity_service.h"
 #include "ui/gtk/gtk_util.h"
 #endif
diff --git a/shell/browser/browser_observer.h b/shell/browser/browser_observer.h
index be9244f2f5e9a..5b82aa50fac5b 100644
--- a/shell/browser/browser_observer.h
+++ b/shell/browser/browser_observer.h
@@ -60,7 +60,7 @@ class BrowserObserver : public base::CheckedObserver {
   // Refer https://chromium-review.googlesource.com/c/chromium/src/+/2134864
   virtual void OnPreCreateThreads() {}
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // The browser wants to report that an user activity will resume. (macOS only)
   virtual void OnWillContinueUserActivity(bool* prevent_default,
                                           const std::string& type) {}
diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc
index 9080bdd3ff327..7ebb2202ae880 100644
--- a/shell/browser/browser_process_impl.cc
+++ b/shell/browser/browser_process_impl.cc
@@ -99,7 +99,7 @@ void BrowserProcessImpl::PostEarlyInitialization() {
   PrefServiceFactory prefs_factory;
   auto pref_registry = base::MakeRefCounted<PrefRegistrySimple>();
   PrefProxyConfigTrackerImpl::RegisterPrefs(pref_registry.get());
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   OSCrypt::RegisterLocalPrefs(pref_registry.get());
 #endif
 
diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h
index f2dade0867760..e7087415e6298 100644
--- a/shell/browser/browser_process_impl.h
+++ b/shell/browser/browser_process_impl.h
@@ -97,7 +97,7 @@ class BrowserProcessImpl : public BrowserProcess {
   void CreateDevToolsAutoOpener() override {}
   void set_background_mode_manager_for_test(
       std::unique_ptr<BackgroundModeManager> manager) override {}
-#if (defined(OS_WIN) || defined(OS_LINUX))
+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX))
   void StartAutoupdateTimer() override {}
 #endif
   void SetApplicationLocale(const std::string& locale) override;
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index dfc0043bd25ae..3931431cdf528 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -4,7 +4,7 @@
 
 #include "shell/browser/electron_browser_client.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <shlobj.h>
 #endif
 
@@ -50,9 +50,11 @@
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
+#include "crypto/crypto_buildflags.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/grit/electron_resources.h"
 #include "electron/shell/common/api/api.mojom.h"
+#include "extensions/browser/api/messaging/messaging_api_message_filter.h"
 #include "mojo/public/cpp/bindings/binder_map.h"
 #include "net/base/escape.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -112,15 +114,15 @@
 #include "ui/native_theme/native_theme.h"
 #include "v8/include/v8.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "sandbox/win/src/sandbox_policy.h"
 #endif
 
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
 #include "net/ssl/client_cert_store_nss.h"
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "net/ssl/client_cert_store_win.h"
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
 #include "net/ssl/client_cert_store_mac.h"
 #elif defined(USE_OPENSSL)
 #include "net/ssl/client_cert_store.h"
@@ -173,12 +175,12 @@
 #include "shell/browser/plugins/plugin_utils.h"
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "content/common/mac_helpers.h"
 #include "content/public/common/child_process_host.h"
 #endif
 
-#if defined(OS_LINUX) && !defined(MAS_BUILD)
+#if BUILDFLAG(IS_LINUX) && !defined(MAS_BUILD)
 #include "base/debug/leak_annotations.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "components/crash/core/app/breakpad_linux.h"  // nogncheck
@@ -186,7 +188,7 @@
 #include "components/crash/core/app/crashpad.h"        // nogncheck
 #endif
 
-#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE) && defined(OS_WIN)
+#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE) && BUILDFLAG(IS_WIN)
 #include "chrome/browser/ui/views/overlay/overlay_window_views.h"
 #include "shell/browser/browser.h"
 #include "ui/aura/window.h"
@@ -293,7 +295,7 @@ const extensions::Extension* GetEnabledExtensionFromEffectiveURL(
 }
 #endif  // BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
@@ -356,7 +358,7 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
 
   return -1;
 }
-#endif  // defined(OS_LINUX)
+#endif  // BUILDFLAG(IS_LINUX)
 
 }  // namespace
 
@@ -413,18 +415,19 @@ bool ElectronBrowserClient::IsRendererSubFrame(int process_id) const {
 void ElectronBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   // When a render process is crashed, it might be reused.
+#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   int process_id = host->GetID();
 
   auto* browser_context = host->GetBrowserContext();
-  ALLOW_UNUSED_LOCAL(browser_context);
 
-#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   host->AddFilter(
       new extensions::ExtensionMessageFilter(process_id, browser_context));
   host->AddFilter(new extensions::ExtensionsGuestViewMessageFilter(
       process_id, browser_context));
   host->AddFilter(
       new ElectronExtensionMessageFilter(process_id, browser_context));
+  host->AddFilter(
+      new extensions::MessagingAPIMessageFilter(process_id, browser_context));
 #endif
 
   // ensure the ProcessPreferences is removed later
@@ -506,7 +509,7 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
     base::FilePath child_path;
     base::FilePath program =
         base::MakeAbsoluteFilePath(command_line->GetProgram());
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     auto renderer_child_path = content::ChildProcessHost::GetChildPath(
         content::ChildProcessHost::CHILD_RENDERER);
     auto gpu_child_path = content::ChildProcessHost::GetChildPath(
@@ -540,7 +543,7 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
   std::string process_type =
       command_line->GetSwitchValueASCII(::switches::kProcessType);
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   bool enable_crash_reporter = false;
   if (crash_reporter::IsCrashpadEnabled()) {
     command_line->AppendSwitch(::switches::kEnableCrashpad);
@@ -603,7 +606,7 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
   }
 
   if (process_type == ::switches::kRendererProcess) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // Append --app-user-model-id.
     PWSTR current_app_id;
     if (SUCCEEDED(GetCurrentProcessExplicitAppUserModelID(&current_app_id))) {
@@ -747,7 +750,7 @@ std::unique_ptr<content::OverlayWindow>
 ElectronBrowserClient::CreateWindowForPictureInPicture(
     content::PictureInPictureWindowController* controller) {
   auto overlay_window = content::OverlayWindow::Create(controller);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
   if (!app_user_model_id.empty()) {
     auto* overlay_window_view =
@@ -874,12 +877,12 @@ void ElectronBrowserClient::SiteInstanceDeleting(
 std::unique_ptr<net::ClientCertStore>
 ElectronBrowserClient::CreateClientCertStore(
     content::BrowserContext* browser_context) {
-#if defined(USE_NSS_CERTS)
+#if BUILDFLAG(USE_NSS_CERTS)
   return std::make_unique<net::ClientCertStoreNSS>(
       net::ClientCertStoreNSS::PasswordDelegateFactory());
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   return std::make_unique<net::ClientCertStoreWin>();
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   return std::make_unique<net::ClientCertStoreMac>();
 #elif defined(USE_OPENSSL)
   return std::unique_ptr<net::ClientCertStore>();
@@ -921,7 +924,7 @@ ElectronBrowserClient::CreateBrowserMainParts(
   auto browser_main_parts =
       std::make_unique<ElectronBrowserMainParts>(std::move(params));
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   browser_main_parts_ = browser_main_parts.get();
 #endif
 
@@ -1007,6 +1010,7 @@ bool ElectronBrowserClient::HandleExternalProtocol(
     ui::PageTransition page_transition,
     bool has_user_gesture,
     const absl::optional<url::Origin>& initiating_origin,
+    content::RenderFrameHost* initiator_document,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
   base::PostTask(
       FROM_HERE, {BrowserThread::UI},
@@ -1193,6 +1197,7 @@ class FileURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
 void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
     int render_process_id,
     int render_frame_id,
+    const absl::optional<url::Origin>& request_initiator_origin,
     NonNetworkURLLoaderFactoryMap* factories) {
   auto* render_process_host =
       content::RenderProcessHost::FromID(render_process_id);
@@ -1263,6 +1268,21 @@ void ElectronBrowserClient::RegisterNonNetworkSubresourceURLLoaderFactories(
 #endif
 }
 
+void ElectronBrowserClient::
+    RegisterNonNetworkServiceWorkerUpdateURLLoaderFactories(
+        content::BrowserContext* browser_context,
+        NonNetworkURLLoaderFactoryMap* factories) {
+  DCHECK(browser_context);
+  DCHECK(factories);
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  factories->emplace(
+      extensions::kExtensionScheme,
+      extensions::CreateExtensionServiceWorkerScriptURLLoaderFactory(
+          browser_context));
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+}
+
 bool ElectronBrowserClient::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
     base::StringPiece scheme,
     bool is_embedded_origin_secure) {
@@ -1436,7 +1456,7 @@ void ElectronBrowserClient::OverrideURLLoaderFactoryParams(
       browser_context, origin, is_for_isolated_world, factory_params);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool ElectronBrowserClient::PreSpawnChild(sandbox::TargetPolicy* policy,
                                           sandbox::mojom::Sandbox sandbox_type,
                                           ChildSpawnFlags flags) {
@@ -1448,61 +1468,59 @@ bool ElectronBrowserClient::PreSpawnChild(sandbox::TargetPolicy* policy,
     return false;
   return true;
 }
-#endif  // defined(OS_WIN)
-
-void BindElectronBrowser(
-    mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser> receiver,
-    content::RenderFrameHost* frame_host) {
-  ElectronBrowserHandlerImpl::Create(frame_host, std::move(receiver));
-}
+#endif  // BUILDFLAG(IS_WIN)
 
-bool ElectronBrowserClient::BindAssociatedReceiverFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedInterfaceEndpointHandle* handle) {
-  if (interface_name == mojom::ElectronAutofillDriver::Name_) {
-    AutofillDriverFactory::BindAutofillDriver(
-        mojo::PendingAssociatedReceiver<mojom::ElectronAutofillDriver>(
-            std::move(*handle)),
-        render_frame_host);
-    return true;
-  }
-  if (interface_name == electron::mojom::ElectronBrowser::Name_) {
-    BindElectronBrowser(
-        mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser>(
-            std::move(*handle)),
-        render_frame_host);
-    return true;
-  }
+void ElectronBrowserClient::
+    RegisterAssociatedInterfaceBindersForRenderFrameHost(
+        content::RenderFrameHost&
+            render_frame_host,  // NOLINT(runtime/references)
+        blink::AssociatedInterfaceRegistry&
+            associated_registry) {  // NOLINT(runtime/references)
+  associated_registry.AddInterface(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser>
+             receiver) {
+        ElectronBrowserHandlerImpl::Create(render_frame_host,
+                                           std::move(receiver));
+      },
+      &render_frame_host));
+  associated_registry.AddInterface(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<mojom::ElectronAutofillDriver>
+             receiver) {
+        AutofillDriverFactory::BindAutofillDriver(std::move(receiver),
+                                                  render_frame_host);
+      },
+      &render_frame_host));
 #if BUILDFLAG(ENABLE_PRINTING)
-  if (interface_name == printing::mojom::PrintManagerHost::Name_) {
-    mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost> receiver(
-        std::move(*handle));
-    PrintViewManagerElectron::BindPrintManagerHost(std::move(receiver),
-                                                   render_frame_host);
-    return true;
-  }
+  associated_registry.AddInterface(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost>
+             receiver) {
+        PrintViewManagerElectron::BindPrintManagerHost(std::move(receiver),
+                                                       render_frame_host);
+      },
+      &render_frame_host));
 #endif
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  if (interface_name == extensions::mojom::LocalFrameHost::Name_) {
-    extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
-        mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>(
-            std::move(*handle)),
-        render_frame_host);
-    return true;
-  }
+  associated_registry.AddInterface(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>
+             receiver) {
+        extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
+            std::move(receiver), render_frame_host);
+      },
+      &render_frame_host));
 #endif
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-  if (interface_name == pdf::mojom::PdfService::Name_) {
-    pdf::PDFWebContentsHelper::BindPdfService(
-        mojo::PendingAssociatedReceiver<pdf::mojom::PdfService>(
-            std::move(*handle)),
-        render_frame_host);
-    return true;
-  }
+  associated_registry.AddInterface(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<pdf::mojom::PdfService> receiver) {
+        pdf::PDFWebContentsHelper::BindPdfService(std::move(receiver),
+                                                  render_frame_host);
+      },
+      &render_frame_host));
 #endif
-
-  return false;
 }
 
 std::string ElectronBrowserClient::GetApplicationLocale() {
@@ -1613,7 +1631,7 @@ void ElectronBrowserClient::RegisterBrowserInterfaceBindersForFrame(
 #endif
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void ElectronBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
@@ -1683,12 +1701,6 @@ content::BluetoothDelegate* ElectronBrowserClient::GetBluetoothDelegate() {
   return bluetooth_delegate_.get();
 }
 
-content::FontAccessDelegate* ElectronBrowserClient::GetFontAccessDelegate() {
-  if (!font_access_delegate_)
-    font_access_delegate_ = std::make_unique<ElectronFontAccessDelegate>();
-  return font_access_delegate_.get();
-}
-
 void BindBadgeServiceForServiceWorker(
     const content::ServiceWorkerVersionBaseInfo& info,
     mojo::PendingReceiver<blink::mojom::BadgeService> receiver) {
@@ -1711,7 +1723,7 @@ void ElectronBrowserClient::RegisterBrowserInterfaceBindersForServiceWorker(
 }
 
 device::GeolocationManager* ElectronBrowserClient::GetGeolocationManager() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   return browser_main_parts_->GetGeolocationManager();
 #else
   return nullptr;
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index b95624256dd68..5d5c48155189e 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -20,7 +20,6 @@
 #include "net/ssl/client_cert_identity.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
 #include "shell/browser/bluetooth/electron_bluetooth_delegate.h"
-#include "shell/browser/font/electron_font_access_delegate.h"
 #include "shell/browser/hid/electron_hid_delegate.h"
 #include "shell/browser/serial/electron_serial_delegate.h"
 #include "third_party/blink/public/mojom/badging/badging.mojom-forward.h"
@@ -85,7 +84,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   void RegisterBrowserInterfaceBindersForServiceWorker(
       mojo::BinderMapWithContext<const content::ServiceWorkerVersionBaseInfo&>*
           map) override;
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   void GetAdditionalMappedFilesForChildProcess(
       const base::CommandLine& command_line,
       int child_process_id,
@@ -97,8 +96,6 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
 
   content::SerialDelegate* GetSerialDelegate() override;
 
-  content::FontAccessDelegate* GetFontAccessDelegate() override;
-
   content::BluetoothDelegate* GetBluetoothDelegate() override;
 
   content::HidDelegate* GetHidDelegate() override;
@@ -198,6 +195,10 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   void RegisterNonNetworkSubresourceURLLoaderFactories(
       int render_process_id,
       int render_frame_id,
+      const absl::optional<url::Origin>& request_initiator_origin,
+      NonNetworkURLLoaderFactoryMap* factories) override;
+  void RegisterNonNetworkServiceWorkerUpdateURLLoaderFactories(
+      content::BrowserContext* browser_context,
       NonNetworkURLLoaderFactoryMap* factories) override;
   void CreateWebSocket(
       content::RenderFrameHost* frame,
@@ -230,15 +231,14 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
       const url::Origin& origin,
       bool is_for_isolated_world,
       network::mojom::URLLoaderFactoryParams* factory_params) override;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool PreSpawnChild(sandbox::TargetPolicy* policy,
                      sandbox::mojom::Sandbox sandbox_type,
                      ChildSpawnFlags flags) override;
 #endif
-  bool BindAssociatedReceiverFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedInterfaceEndpointHandle* handle) override;
+  void RegisterAssociatedInterfaceBindersForRenderFrameHost(
+      content::RenderFrameHost& render_frame_host,
+      blink::AssociatedInterfaceRegistry& associated_registry) override;
 
   bool HandleExternalProtocol(
       const GURL& url,
@@ -251,6 +251,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
       ui::PageTransition page_transition,
       bool has_user_gesture,
       const absl::optional<url::Origin>& initiating_origin,
+      content::RenderFrameHost* initiator_document,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory)
       override;
   std::unique_ptr<content::LoginDelegate> CreateLoginDelegate(
@@ -316,10 +317,9 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
 
   std::unique_ptr<ElectronSerialDelegate> serial_delegate_;
   std::unique_ptr<ElectronBluetoothDelegate> bluetooth_delegate_;
-  std::unique_ptr<ElectronFontAccessDelegate> font_access_delegate_;
   std::unique_ptr<ElectronHidDelegate> hid_delegate_;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   ElectronBrowserMainParts* browser_main_parts_ = nullptr;
 #endif
 };
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 5cabbb3af45ef..9a15edbdfddbe 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -17,6 +17,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "components/os_crypt/key_storage_config_linux.h"
 #include "components/os_crypt/os_crypt.h"
 #include "content/browser/browser_main_loop.h"  // nogncheck
 #include "content/public/browser/browser_thread.h"
@@ -61,7 +64,7 @@
 #include "ui/wm/core/wm_state.h"
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "base/environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
@@ -75,14 +78,14 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/display/win/dpi.h"
 #include "ui/gfx/system_fonts_win.h"
 #include "ui/strings/grit/app_locale_settings.h"
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "services/device/public/cpp/geolocation/geolocation_manager.h"
 #include "shell/browser/ui/cocoa/views_delegate_mac.h"
 #else
@@ -111,7 +114,7 @@ void Erase(T* container, typename T::iterator iter) {
   container->erase(iter);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 // gfx::Font callbacks
 void AdjustUIFont(gfx::win::FontAdjustment* font_adjustment) {
   l10n_util::NeedOverrideDefaultUIFont(&font_adjustment->font_family_override,
@@ -131,7 +134,7 @@ std::u16string MediaStringProvider(media::MessageId id) {
   switch (id) {
     case media::DEFAULT_AUDIO_DEVICE_NAME:
       return u"Default";
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     case media::COMMUNICATIONS_AUDIO_DEVICE_NAME:
       return u"Communications";
 #endif
@@ -140,7 +143,7 @@ std::u16string MediaStringProvider(media::MessageId id) {
   }
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 // GTK does not provide a way to check if current theme is dark, so we compare
 // the text and background luminosity to get a result.
 // This trick comes from FireFox.
@@ -158,7 +161,7 @@ void UpdateDarkThemeSetting() {
 
 }  // namespace
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 class DarkThemeObserver : public ui::NativeThemeObserver {
  public:
   DarkThemeObserver() = default;
@@ -208,10 +211,10 @@ int ElectronBrowserMainParts::GetExitCode() const {
 
 int ElectronBrowserMainParts::PreEarlyInitialization() {
   field_trial_list_ = std::make_unique<base::FieldTrialList>(nullptr);
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   HandleSIGCHLD();
 #endif
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   ui::OzonePlatform::PreEarlyInitialization();
 #endif
 
@@ -272,7 +275,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
 #if defined(USE_AURA)
   screen_ = views::CreateDesktopScreen();
   display::Screen::SetScreenInstance(screen_.get());
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   views::LinuxUI::instance()->UpdateDeviceScaleFactor();
 #endif
 #endif
@@ -283,13 +286,13 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   auto* command_line = base::CommandLine::ForCurrentProcess();
   std::string locale = command_line->GetSwitchValueASCII(::switches::kLang);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // The browser process only wants to support the language Cocoa will use,
   // so force the app locale to be overridden with that value. This must
   // happen before the ResourceBundle is loaded
   if (locale.empty())
     l10n_util::OverrideLocaleWithCocoaLocale();
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
   // which keys off of getenv("LC_ALL").
   // We must set this env first to make ui::ResourceBundle accept the custom
@@ -312,7 +315,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   ElectronBrowserClient::SetApplicationLocale(app_locale);
   fake_browser_process_->SetApplicationLocale(app_locale);
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Reset to the original LC_ALL since we should not be changing it.
   if (!locale.empty()) {
     if (lc_all)
@@ -328,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   // Force MediaCaptureDevicesDispatcher to be created on UI thread.
   MediaCaptureDevicesDispatcher::GetInstance();
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   ui::InitIdleMonitor();
 #endif
 
@@ -351,7 +354,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
   extensions_browser_client_.reset();
   extensions::ExtensionsBrowserClient::Set(nullptr);
 #endif
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   device::BluetoothAdapterFactory::Shutdown();
   bluez::DBusBluezManagerWrapperLinux::Shutdown();
 #endif
@@ -359,7 +362,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
 }
 
 void ElectronBrowserMainParts::ToolkitInitialized() {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   auto linux_ui = BuildGtkUi();
   linux_ui->Initialize();
   DCHECK(ui::LinuxInputMethodContextFactory::instance());
@@ -384,12 +387,12 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
   wm_state_ = std::make_unique<wm::WMState>();
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   gfx::win::SetAdjustFontCallback(&AdjustUIFont);
   gfx::win::SetGetMinimumFontSizeCallback(&GetMinimumFontSize);
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   views_delegate_ = std::make_unique<ViewsDelegateMac>();
 #else
   views_delegate_ = std::make_unique<ViewsDelegate>();
@@ -439,7 +442,7 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
     DevToolsManagerDelegate::StartHttpHandler();
   }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
   // The corresponding call in macOS is in ElectronApplicationDelegate.
   Browser::Get()->WillFinishLaunching();
   Browser::Get()->DidFinishLaunching(base::DictionaryValue());
@@ -459,14 +462,34 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
 }
 
 void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   auto shutdown_cb =
       base::BindOnce(base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
   ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
       std::move(shutdown_cb));
   bluez::DBusBluezManagerWrapperLinux::Initialize();
-#endif
-#if defined(OS_POSIX)
+
+  // Set up crypt config. This needs to be done before anything starts the
+  // network service, as the raw encryption key needs to be shared with the
+  // network service for encrypted cookie storage.
+  std::string app_name = electron::Browser::Get()->GetName();
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  std::unique_ptr<os_crypt::Config> config =
+      std::make_unique<os_crypt::Config>();
+  // Forward to os_crypt the flag to use a specific password store.
+  config->store = command_line.GetSwitchValueASCII(::switches::kPasswordStore);
+  config->product_name = app_name;
+  config->application_name = app_name;
+  config->main_thread_runner = base::ThreadTaskRunnerHandle::Get();
+  // c.f.
+  // https://source.chromium.org/chromium/chromium/src/+/master:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
+  config->should_use_preference =
+      command_line.HasSwitch(::switches::kEnableEncryptionSelection);
+  base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
+  OSCrypt::SetConfig(std::move(config));
+#endif
+#if BUILDFLAG(IS_POSIX)
   // Exit in response to SIGINT, SIGTERM, etc.
   InstallShutdownSignalHandlers(
       base::BindOnce(&Browser::Quit, base::Unretained(Browser::Get())),
@@ -475,7 +498,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
 }
 
 void ElectronBrowserMainParts::PostMainMessageLoopRun() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   FreeAppDelegate();
 #endif
 
@@ -504,25 +527,25 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
   fake_browser_process_->PostMainMessageLoopRun();
   content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
 #endif
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 void ElectronBrowserMainParts::PreCreateMainMessageLoop() {
   PreCreateMainMessageLoopCommon();
 }
 #endif
 
 void ElectronBrowserMainParts::PreCreateMainMessageLoopCommon() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   InitializeMainNib();
   RegisterURLHandler();
 #endif
   media::SetLocalizedStringProvider(MediaStringProvider);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto* local_state = g_browser_process->local_state();
   DCHECK(local_state);
 
@@ -540,7 +563,7 @@ ElectronBrowserMainParts::GetGeolocationControl() {
   return geolocation_control_.get();
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 device::GeolocationManager* ElectronBrowserMainParts::GetGeolocationManager() {
   return geolocation_manager_.get();
 }
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index 321949ee7e89e..d8e49529e5641 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -63,11 +63,11 @@ class ElectronExtensionsBrowserClient;
 class ViewsDelegate;
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 class ViewsDelegateMac;
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 class DarkThemeObserver;
 #endif
 
@@ -92,7 +92,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   // used to enable the location services once per client.
   device::mojom::GeolocationControl* GetGeolocationControl();
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   device::GeolocationManager* GetGeolocationManager();
 #endif
 
@@ -120,7 +120,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
  private:
   void PreCreateMainMessageLoopCommon();
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   // Set signal handlers.
   void HandleSIGCHLD();
   void InstallShutdownSignalHandlers(
@@ -128,13 +128,13 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void FreeAppDelegate();
   void RegisterURLHandler();
   void InitializeMainNib();
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::unique_ptr<ViewsDelegateMac> views_delegate_;
 #else
   std::unique_ptr<ViewsDelegate> views_delegate_;
@@ -145,7 +145,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   std::unique_ptr<display::Screen> screen_;
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Used to notify the native theme of changes to dark mode.
   std::unique_ptr<DarkThemeObserver> dark_theme_observer_;
 #endif
@@ -174,7 +174,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
 
   mojo::Remote<device::mojom::GeolocationControl> geolocation_control_;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::unique_ptr<device::GeolocationManager> geolocation_manager_;
 #endif
 
diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index ddf942637fa4c..f1a54d9a6f15c 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -5,11 +5,11 @@
 #include "shell/browser/electron_download_manager_delegate.h"
 
 #include <string>
+#include <tuple>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/ignore_result.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/thread_restrictions.h"
@@ -138,7 +138,7 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
         &ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone,
         base::Unretained(this), download_id, std::move(callback));
 
-    ignore_result(dialog_promise.Then(std::move(dialog_callback)));
+    std::ignore = dialog_promise.Then(std::move(dialog_callback));
     file_dialog::ShowSaveDialog(settings, std::move(dialog_promise));
   } else {
     std::move(callback).Run(path,
diff --git a/shell/browser/electron_gpu_client.cc b/shell/browser/electron_gpu_client.cc
index c7457849a710a..88a60949f28fa 100644
--- a/shell/browser/electron_gpu_client.cc
+++ b/shell/browser/electron_gpu_client.cc
@@ -6,7 +6,7 @@
 
 #include "base/environment.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -15,7 +15,7 @@ namespace electron {
 ElectronGpuClient::ElectronGpuClient() = default;
 
 void ElectronGpuClient::PreCreateMessageLoop() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto env = base::Environment::Create();
   if (env->HasVar("ELECTRON_DEFAULT_ERROR_MODE"))
     SetErrorMode(GetErrorMode() & ~SEM_NOGPFAULTERRORBOX);
diff --git a/shell/browser/electron_pdf_web_contents_helper_client.cc b/shell/browser/electron_pdf_web_contents_helper_client.cc
index 7d8bf09bb7b33..0ddf94fe49cb5 100644
--- a/shell/browser/electron_pdf_web_contents_helper_client.cc
+++ b/shell/browser/electron_pdf_web_contents_helper_client.cc
@@ -4,11 +4,22 @@
 
 #include "shell/browser/electron_pdf_web_contents_helper_client.h"
 
+#include "chrome/browser/pdf/pdf_frame_util.h"
+#include "content/public/browser/web_contents.h"
+
 ElectronPDFWebContentsHelperClient::ElectronPDFWebContentsHelperClient() =
     default;
 ElectronPDFWebContentsHelperClient::~ElectronPDFWebContentsHelperClient() =
     default;
 
+content::RenderFrameHost* ElectronPDFWebContentsHelperClient::FindPdfFrame(
+    content::WebContents* contents) {
+  content::RenderFrameHost* main_frame = contents->GetMainFrame();
+  content::RenderFrameHost* pdf_frame =
+      pdf_frame_util::FindPdfChildFrame(main_frame);
+  return pdf_frame ? pdf_frame : main_frame;
+}
+
 void ElectronPDFWebContentsHelperClient::UpdateContentRestrictions(
     content::WebContents* contents,
     int content_restrictions) {}
diff --git a/shell/browser/electron_pdf_web_contents_helper_client.h b/shell/browser/electron_pdf_web_contents_helper_client.h
index 22a5a203cbf4d..c4d559d1032f2 100644
--- a/shell/browser/electron_pdf_web_contents_helper_client.h
+++ b/shell/browser/electron_pdf_web_contents_helper_client.h
@@ -18,6 +18,8 @@ class ElectronPDFWebContentsHelperClient
 
  private:
   // pdf::PDFWebContentsHelperClient
+  content::RenderFrameHost* FindPdfFrame(
+      content::WebContents* contents) override;
   void UpdateContentRestrictions(content::WebContents* contents,
                                  int content_restrictions) override;
   void OnPDFHasUnsupportedFeature(content::WebContents* contents) override;
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index a7e832aa1b33f..a6902499aaf9f 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -332,7 +332,7 @@ bool ElectronPermissionManager::CheckDevicePermission(
         } else if (permission ==
                    static_cast<content::PermissionType>(
                        WebContentsPermissionHelper::PermissionType::SERIAL)) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
           if (device->FindStringKey(kDeviceInstanceIdKey) ==
               granted_device.FindStringKey(kDeviceInstanceIdKey))
             return true;
@@ -346,14 +346,14 @@ bool ElectronPermissionManager::CheckDevicePermission(
             continue;
           }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
           if (*device->FindStringKey(kUsbDriverKey) !=
               *granted_device.FindStringKey(kUsbDriverKey)) {
             continue;
           }
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
           return true;
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
         }
       }
     }
diff --git a/shell/browser/extensions/api/BUILD.gn b/shell/browser/extensions/api/BUILD.gn
index c253b1ea0c204..b8e116e1ed2b5 100644
--- a/shell/browser/extensions/api/BUILD.gn
+++ b/shell/browser/extensions/api/BUILD.gn
@@ -12,7 +12,6 @@ function_registration("api_registration") {
   sources = [
     "//electron/shell/common/extensions/api/cryptotoken_private.idl",
     "//electron/shell/common/extensions/api/extension.json",
-    "//electron/shell/common/extensions/api/i18n.json",
     "//electron/shell/common/extensions/api/resources_private.idl",
     "//electron/shell/common/extensions/api/tabs.json",
   ]
diff --git a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
index c2f486cccbe83..7001a5079c2a7 100644
--- a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -34,10 +34,10 @@
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "url/origin.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "device/fido/features.h"
 #include "device/fido/win/webauthn_api.h"
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 namespace extensions {
 
@@ -222,7 +222,7 @@ CryptotokenPrivateCanAppIdGetAttestationFunction::Run() {
     return RespondNow(OneArgument(base::Value(true)));
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // If the request was handled by the Windows WebAuthn API on a version of
   // Windows that shows an attestation permission prompt, don't show another
   // one.
@@ -237,7 +237,7 @@ CryptotokenPrivateCanAppIdGetAttestationFunction::Run() {
           WEBAUTHN_API_VERSION_2) {
     return RespondNow(OneArgument(base::Value(true)));
   }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
   // Otherwise, show a permission prompt and pass the user's decision back.
   const GURL app_id_url(app_id);
diff --git a/shell/browser/extensions/api/i18n/i18n_api.cc b/shell/browser/extensions/api/i18n/i18n_api.cc
deleted file mode 100644
index c1140d70b188c..0000000000000
--- a/shell/browser/extensions/api/i18n/i18n_api.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2020 Samuel Maddock <sam@samuelmaddock.com>.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "shell/browser/extensions/api/i18n/i18n_api.h"
-
-#include <string>
-#include <vector>
-
-#include "chrome/browser/browser_process.h"
-#include "shell/common/extensions/api/i18n.h"
-
-namespace GetAcceptLanguages = extensions::api::i18n::GetAcceptLanguages;
-
-namespace extensions {
-
-ExtensionFunction::ResponseAction I18nGetAcceptLanguagesFunction::Run() {
-  auto locale = g_browser_process->GetApplicationLocale();
-  std::vector<std::string> accept_languages = {locale};
-  return RespondNow(
-      ArgumentList(GetAcceptLanguages::Results::Create(accept_languages)));
-}
-
-}  // namespace extensions
diff --git a/shell/browser/extensions/api/i18n/i18n_api.h b/shell/browser/extensions/api/i18n/i18n_api.h
deleted file mode 100644
index 7744b7edd7076..0000000000000
--- a/shell/browser/extensions/api/i18n/i18n_api.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2020 Samuel Maddock <sam@samuelmaddock.com>.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_
-#define ELECTRON_SHELL_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_
-
-#include "extensions/browser/extension_function.h"
-
-namespace extensions {
-
-class I18nGetAcceptLanguagesFunction : public ExtensionFunction {
-  ~I18nGetAcceptLanguagesFunction() override {}
-  ResponseAction Run() override;
-  DECLARE_EXTENSION_FUNCTION("i18n.getAcceptLanguages", I18N_GETACCEPTLANGUAGES)
-};
-
-}  // namespace extensions
-
-#endif  // ELECTRON_SHELL_BROWSER_EXTENSIONS_API_I18N_I18N_API_H_
diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc
index dd012e3dfe9ac..20c2cf546ea52 100644
--- a/shell/browser/extensions/electron_extension_system.cc
+++ b/shell/browser/extensions/electron_extension_system.cc
@@ -212,8 +212,7 @@ void ElectronExtensionSystem::RegisterExtensionWithRequestContexts(
 }
 
 void ElectronExtensionSystem::UnregisterExtensionWithRequestContexts(
-    const std::string& extension_id,
-    const UnloadedExtensionReason reason) {}
+    const std::string& extension_id) {}
 
 const base::OneShotEvent& ElectronExtensionSystem::ready() const {
   return ready_;
diff --git a/shell/browser/extensions/electron_extension_system.h b/shell/browser/extensions/electron_extension_system.h
index 971f8df492944..52eb5272b0038 100644
--- a/shell/browser/extensions/electron_extension_system.h
+++ b/shell/browser/extensions/electron_extension_system.h
@@ -76,8 +76,7 @@ class ElectronExtensionSystem : public ExtensionSystem {
       const Extension* extension,
       base::OnceClosure callback) override;
   void UnregisterExtensionWithRequestContexts(
-      const std::string& extension_id,
-      const UnloadedExtensionReason reason) override;
+      const std::string& extension_id) override;
   const base::OneShotEvent& ready() const override;
   bool is_ready() const override;
   ContentVerifier* content_verifier() override;
diff --git a/shell/browser/extensions/electron_extensions_browser_api_provider.cc b/shell/browser/extensions/electron_extensions_browser_api_provider.cc
index 2c6c7977527ab..a675c10825683 100644
--- a/shell/browser/extensions/electron_extensions_browser_api_provider.cc
+++ b/shell/browser/extensions/electron_extensions_browser_api_provider.cc
@@ -4,9 +4,9 @@
 
 #include "shell/browser/extensions/electron_extensions_browser_api_provider.h"
 
+#include "extensions/browser/api/i18n/i18n_api.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "shell/browser/extensions/api/generated_api_registration.h"
-#include "shell/browser/extensions/api/i18n/i18n_api.h"
 #include "shell/browser/extensions/api/tabs/tabs_api.h"
 
 namespace extensions {
diff --git a/shell/browser/feature_list.cc b/shell/browser/feature_list.cc
index 0af770c30e052..47c057fdae4b2 100644
--- a/shell/browser/feature_list.cc
+++ b/shell/browser/feature_list.cc
@@ -32,17 +32,11 @@ void InitializeFeatureList() {
   disable_features +=
       std::string(",") + features::kSpareRendererForSitePerProcess.name;
 
-  // PlzServiceWorker breaks fetching service worker scripts for custom
-  // protocols or chrome-extension protocols due to a change in the URL loader
-  // used to fetch the script.
-  // TODO(MarshallOfSound): Re-enable and fix?
-  disable_features += std::string(",") + features::kPlzServiceWorker.name;
-
 #if !BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
   disable_features += std::string(",") + media::kPictureInPicture.name;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Disable async spellchecker suggestions for Windows, which causes
   // an empty suggestions list to be returned
   disable_features +=
diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc
index a4e8918b796e7..74466f5dc8678 100644
--- a/shell/browser/file_select_helper.cc
+++ b/shell/browser/file_select_helper.cc
@@ -108,14 +108,14 @@ void FileSelectHelper::FileSelectedWithExtraInfo(
   std::vector<ui::SelectedFileInfo> files;
   files.push_back(file);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   base::ThreadPool::PostTask(
       FROM_HERE,
       {base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
       base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMac, this, files));
 #else
   ConvertToFileChooserFileInfoList(files);
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 }
 
 void FileSelectHelper::MultiFilesSelected(
@@ -130,14 +130,14 @@ void FileSelectHelper::MultiFilesSelected(
 void FileSelectHelper::MultiFilesSelectedWithExtraInfo(
     const std::vector<ui::SelectedFileInfo>& files,
     void* params) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   base::ThreadPool::PostTask(
       FROM_HERE,
       {base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
       base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMac, this, files));
 #else
   ConvertToFileChooserFileInfoList(files);
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 }
 
 void FileSelectHelper::FileSelectionCanceled(void* params) {
diff --git a/shell/browser/file_select_helper.h b/shell/browser/file_select_helper.h
index 3c1e09e7db30e..793a63bd2323d 100644
--- a/shell/browser/file_select_helper.h
+++ b/shell/browser/file_select_helper.h
@@ -129,7 +129,7 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
   // callback is received from the enumeration code.
   void EnumerateDirectoryEnd();
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Must be called from a MayBlock() task. Each selected file that is a package
   // will be zipped, and the zip will be passed to the render view host in place
   // of the package.
@@ -145,7 +145,7 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
   // temporary destination, if the zip was successful. Otherwise returns an
   // empty path.
   static base::FilePath ZipPackage(const base::FilePath& path);
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   void ConvertToFileChooserFileInfoList(
       const std::vector<ui::SelectedFileInfo>& files);
diff --git a/shell/browser/font/electron_font_access_delegate.cc b/shell/browser/font/electron_font_access_delegate.cc
deleted file mode 100644
index 05e0b1d88cbca..0000000000000
--- a/shell/browser/font/electron_font_access_delegate.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2021 Microsoft, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include <utility>
-
-#include "shell/browser/font/electron_font_access_delegate.h"
-
-#include "base/task/post_task.h"
-#include "chrome/browser/browser_process.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/font_access_chooser.h"
-#include "content/public/browser/render_frame_host.h"
-
-class ElectronFontAccessChooser : public content::FontAccessChooser {
- public:
-  explicit ElectronFontAccessChooser(base::OnceClosure close_callback) {
-    base::PostTask(
-        FROM_HERE, {content::BrowserThread::UI},
-        base::BindOnce(
-            [](base::OnceClosure closure) { std::move(closure).Run(); },
-            std::move(close_callback)));
-  }
-  ~ElectronFontAccessChooser() override = default;
-};
-
-ElectronFontAccessDelegate::ElectronFontAccessDelegate() = default;
-ElectronFontAccessDelegate::~ElectronFontAccessDelegate() = default;
-
-std::unique_ptr<content::FontAccessChooser>
-ElectronFontAccessDelegate::RunChooser(
-    content::RenderFrameHost* frame,
-    const std::vector<std::string>& selection,
-    content::FontAccessChooser::Callback callback) {
-  // TODO(codebytere) : implement with proper permissions model.
-  return std::make_unique<ElectronFontAccessChooser>(base::BindOnce(
-      [](content::FontAccessChooser::Callback callback) {
-        std::move(callback).Run(
-            blink::mojom::FontEnumerationStatus::kUnimplemented, {});
-      },
-      std::move(callback)));
-}
diff --git a/shell/browser/font/electron_font_access_delegate.h b/shell/browser/font/electron_font_access_delegate.h
deleted file mode 100644
index 4cfe7c6365066..0000000000000
--- a/shell/browser/font/electron_font_access_delegate.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2021 Microsoft, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ELECTRON_SHELL_BROWSER_FONT_ELECTRON_FONT_ACCESS_DELEGATE_H_
-#define ELECTRON_SHELL_BROWSER_FONT_ELECTRON_FONT_ACCESS_DELEGATE_H_
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "content/public/browser/font_access_chooser.h"
-#include "content/public/browser/font_access_delegate.h"
-
-class ElectronFontAccessDelegate : public content::FontAccessDelegate {
- public:
-  ElectronFontAccessDelegate();
-  ~ElectronFontAccessDelegate() override;
-
-  // disable copy
-  ElectronFontAccessDelegate(const ElectronFontAccessDelegate&) = delete;
-  ElectronFontAccessDelegate& operator=(const ElectronFontAccessDelegate&) =
-      delete;
-
-  std::unique_ptr<content::FontAccessChooser> RunChooser(
-      content::RenderFrameHost* frame,
-      const std::vector<std::string>& selection,
-      content::FontAccessChooser::Callback callback) override;
-};
-
-#endif  // ELECTRON_SHELL_BROWSER_FONT_ELECTRON_FONT_ACCESS_DELEGATE_H_
diff --git a/shell/browser/font_defaults.cc b/shell/browser/font_defaults.cc
index 8baa987482d2a..89fd78281b369 100644
--- a/shell/browser/font_defaults.cc
+++ b/shell/browser/font_defaults.cc
@@ -41,7 +41,7 @@ const FontDefault kFontDefaults[] = {
     {prefs::kWebKitSansSerifFontFamily, IDS_SANS_SERIF_FONT_FAMILY},
     {prefs::kWebKitCursiveFontFamily, IDS_CURSIVE_FONT_FAMILY},
     {prefs::kWebKitFantasyFontFamily, IDS_FANTASY_FONT_FAMILY},
-#if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
     {prefs::kWebKitStandardFontFamilyJapanese,
      IDS_STANDARD_FONT_FAMILY_JAPANESE},
     {prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE},
@@ -65,13 +65,13 @@ const FontDefault kFontDefaults[] = {
     {prefs::kWebKitSansSerifFontFamilyTraditionalHan,
      IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN},
 #endif
-#if defined(OS_MAC) || defined(OS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
     {prefs::kWebKitCursiveFontFamilySimplifiedHan,
      IDS_CURSIVE_FONT_FAMILY_SIMPLIFIED_HAN},
     {prefs::kWebKitCursiveFontFamilyTraditionalHan,
      IDS_CURSIVE_FONT_FAMILY_TRADITIONAL_HAN},
 #endif
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS)
     {prefs::kWebKitStandardFontFamilyArabic, IDS_STANDARD_FONT_FAMILY_ARABIC},
     {prefs::kWebKitSerifFontFamilyArabic, IDS_SERIF_FONT_FAMILY_ARABIC},
     {prefs::kWebKitSansSerifFontFamilyArabic,
@@ -81,7 +81,7 @@ const FontDefault kFontDefaults[] = {
      IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN},
     {prefs::kWebKitFixedFontFamilyTraditionalHan,
      IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN},
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     {prefs::kWebKitFixedFontFamilyArabic, IDS_FIXED_FONT_FAMILY_ARABIC},
     {prefs::kWebKitSansSerifFontFamilyArabic,
      IDS_SANS_SERIF_FONT_FAMILY_ARABIC},
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index 0df90b5247593..69d7f5e921956 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -76,6 +76,13 @@ bool ElectronHidDelegate::HasDevicePermission(
                                               render_frame_host);
 }
 
+void ElectronHidDelegate::RevokeDevicePermission(
+    content::RenderFrameHost* render_frame_host,
+    const device::mojom::HidDeviceInfo& device) {
+  // TODO(jkleinsc) implement this for
+  // https://chromium-review.googlesource.com/c/chromium/src/+/3297868
+}
+
 device::mojom::HidManager* ElectronHidDelegate::GetHidManager(
     content::RenderFrameHost* render_frame_host) {
   auto* chooser_context = GetChooserContext(render_frame_host);
@@ -104,7 +111,9 @@ const device::mojom::HidDeviceInfo* ElectronHidDelegate::GetDeviceInfo(
   return chooser_context->GetDeviceInfo(guid);
 }
 
-bool ElectronHidDelegate::IsFidoAllowedForOrigin(const url::Origin& origin) {
+bool ElectronHidDelegate::IsFidoAllowedForOrigin(
+    content::RenderFrameHost* render_frame_host,
+    const url::Origin& origin) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableHidBlocklist);
 }
diff --git a/shell/browser/hid/electron_hid_delegate.h b/shell/browser/hid/electron_hid_delegate.h
index 348c32846f3b9..1b243c6ac15ee 100644
--- a/shell/browser/hid/electron_hid_delegate.h
+++ b/shell/browser/hid/electron_hid_delegate.h
@@ -36,6 +36,9 @@ class ElectronHidDelegate : public content::HidDelegate,
       content::RenderFrameHost* render_frame_host) override;
   bool HasDevicePermission(content::RenderFrameHost* render_frame_host,
                            const device::mojom::HidDeviceInfo& device) override;
+  void RevokeDevicePermission(
+      content::RenderFrameHost* render_frame_host,
+      const device::mojom::HidDeviceInfo& device) override;
   device::mojom::HidManager* GetHidManager(
       content::RenderFrameHost* render_frame_host) override;
   void AddObserver(content::RenderFrameHost* render_frame_host,
@@ -45,7 +48,8 @@ class ElectronHidDelegate : public content::HidDelegate,
   const device::mojom::HidDeviceInfo* GetDeviceInfo(
       content::RenderFrameHost* render_frame_host,
       const std::string& guid) override;
-  bool IsFidoAllowedForOrigin(const url::Origin& origin) override;
+  bool IsFidoAllowedForOrigin(content::RenderFrameHost* render_frame_host,
+                              const url::Origin& origin) override;
 
   // HidChooserContext::DeviceObserver:
   void OnDeviceAdded(const device::mojom::HidDeviceInfo&) override;
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 50a5eedd4bb90..69d0cd25b49e0 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -76,11 +76,6 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
  public:
   enum InitializationPolicy { kZeroInitialize, kDontInitialize };
 
-  base::PartitionOptions::LazyCommit lazy_commit =
-      base::FeatureList::IsEnabled(base::features::kPartitionAllocLazyCommit)
-          ? base::PartitionOptions::LazyCommit::kEnabled
-          : base::PartitionOptions::LazyCommit::kDisabled;
-
   ArrayBufferAllocator() {
     // Ref.
     // https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/renderer/platform/wtf/allocator/partitions.cc;l=94;drc=062c315a858a87f834e16a144c2c8e9591af2beb
@@ -89,8 +84,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
                       base::PartitionOptions::Quarantine::kAllowed,
                       base::PartitionOptions::Cookie::kAllowed,
                       base::PartitionOptions::BackupRefPtr::kDisabled,
-                      base::PartitionOptions::UseConfigurablePool::kNo,
-                      lazy_commit});
+                      base::PartitionOptions::UseConfigurablePool::kNo});
   }
 
   // Allocate() methods return null to signal allocation failure to V8, which
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index c35026a065a40..74ef7d1bf9e5e 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -21,7 +21,7 @@
 #include "shell/common/options_switches.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/base/win/shell.h"
 #include "ui/display/win/screen_win.h"
 #endif
@@ -44,7 +44,7 @@ struct Converter<electron::NativeWindow::TitleBarStyle> {
       return false;
     if (title_bar_style == "hidden") {
       *out = TitleBarStyle::kHidden;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     } else if (title_bar_style == "hiddenInset") {
       *out = TitleBarStyle::kHiddenInset;
     } else if (title_bar_style == "customButtonsOnHover") {
@@ -63,7 +63,7 @@ namespace electron {
 
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 gfx::Size GetExpandedWindowSize(const NativeWindow* window, gfx::Size size) {
   if (!window->transparent() || !ui::win::IsAeroGlassEnabled())
     return size;
@@ -105,7 +105,7 @@ NativeWindow::NativeWindow(const gin_helper::Dictionary& options,
       if (titlebar_overlay.Get(options::kOverlayHeight, &height))
         titlebar_overlay_height_ = height;
 
-#if !(defined(OS_WIN) || defined(OS_MAC))
+#if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC))
       DCHECK(false);
 #endif
     }
@@ -144,7 +144,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
   if (options.Get(options::kX, &x) && options.Get(options::kY, &y)) {
     SetPosition(gfx::Point(x, y));
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // FIXME(felixrieseberg): Dirty, dirty workaround for
     // https://github.com/electron/electron/issues/10862
     // Somehow, we need to call `SetBounds` twice to get
@@ -176,7 +176,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
   } else {
     SetSizeConstraints(size_constraints);
   }
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
   bool resizable;
   if (options.Get(options::kResizable, &resizable)) {
     SetResizable(resizable);
@@ -206,7 +206,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
   bool fullscreen = false;
   if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen) {
     // Disable fullscreen button if 'fullscreen' is specified to false.
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     fullscreenable = false;
 #endif
   }
@@ -224,7 +224,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
   if (options.Get(options::kKiosk, &kiosk) && kiosk) {
     SetKiosk(kiosk);
   }
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::string type;
   if (options.Get(options::kVibrancyType, &type)) {
     SetVibrancy(type);
@@ -355,7 +355,7 @@ gfx::Size NativeWindow::GetContentMinimumSize() const {
 
 gfx::Size NativeWindow::GetContentMaximumSize() const {
   gfx::Size maximum_size = GetContentSizeConstraints().GetMaximumSize();
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return GetContentSizeConstraints().HasMaximumSize()
              ? GetExpandedWindowSize(this, maximum_size)
              : maximum_size;
@@ -676,7 +676,7 @@ void NativeWindow::NotifyLayoutWindowControlsOverlay() {
   }
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void NativeWindow::NotifyWindowMessage(UINT message,
                                        WPARAM w_param,
                                        LPARAM l_param) {
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index 777b4a8507f0e..e7a4d193375cb 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -46,7 +46,7 @@ namespace electron {
 class ElectronMenuModel;
 class NativeBrowserView;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 typedef NSView* NativeWindowHandle;
 #else
 typedef gfx::AcceleratedWidget NativeWindowHandle;
@@ -138,7 +138,7 @@ class NativeWindow : public base::SupportsUserData,
   virtual void Invalidate() = 0;
   virtual void SetTitle(const std::string& title) = 0;
   virtual std::string GetTitle() = 0;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   virtual std::string GetAlwaysOnTopLevel() = 0;
   virtual void SetActive(bool is_key) = 0;
   virtual bool IsActive() const = 0;
@@ -209,7 +209,7 @@ class NativeWindow : public base::SupportsUserData,
   virtual void SetVibrancy(const std::string& type);
 
   // Traffic Light API
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   virtual void SetWindowButtonVisibility(bool visible) = 0;
   virtual bool GetWindowButtonVisibility() const = 0;
   virtual void SetTrafficLightPosition(absl::optional<gfx::Point> position) = 0;
@@ -308,7 +308,7 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowSystemContextMenu(int x, int y, bool* prevent_default);
   void NotifyLayoutWindowControlsOverlay();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);
 #endif
 
diff --git a/shell/browser/native_window_observer.h b/shell/browser/native_window_observer.h
index 572aca06ef0f3..64f06179ffede 100644
--- a/shell/browser/native_window_observer.h
+++ b/shell/browser/native_window_observer.h
@@ -11,7 +11,7 @@
 #include "base/values.h"
 #include "ui/base/window_open_disposition.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -98,7 +98,7 @@ class NativeWindowObserver : public base::CheckedObserver {
   virtual void OnSystemContextMenu(int x, int y, bool* prevent_default) {}
 
 // Called when window message received
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   virtual void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {}
 #endif
 
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 2c8b8d190d30c..2d3d866fa71dc 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -4,7 +4,7 @@
 
 #include "shell/browser/native_window_views.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <wrl/client.h>
 #endif
 
@@ -44,7 +44,7 @@
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "base/strings/string_util.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/linux/unity_service.h"
@@ -71,7 +71,7 @@
 #include "ui/base/ui_base_features.h"
 #endif
 
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
 #include "base/win/win_util.h"
 #include "content/public/common/color_parser.h"
 #include "shell/browser/ui/views/win_frame_view.h"
@@ -85,7 +85,7 @@
 
 namespace electron {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
 // Similar to the ones in display::win::ScreenWin, but with rounded values
 // These help to avoid problems that arise from unresizable windows where the
@@ -103,7 +103,7 @@ gfx::Rect ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
 
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 const LPCWSTR kUniqueTaskBarClassName = L"Shell_TrayWnd";
 
 void FlipWindowStyle(HWND handle, bool on, DWORD flag) {
@@ -165,7 +165,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   if (options.Get(options::kAutoHideMenuBar, &menu_bar_autohide))
     root_view_->SetAutoHideMenuBar(menu_bar_autohide);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // On Windows we rely on the CanResize() to indicate whether window can be
   // resized, and it should be set before window is created.
   options.Get(options::kResizable, &resizable_);
@@ -244,12 +244,12 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   if (options.Get(options::kFocusable, &focusable) && !focusable)
     params.activatable = views::Widget::InitParams::Activatable::kNo;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (parent)
     params.parent = parent->GetNativeWindow();
 
   params.native_widget = new ElectronDesktopNativeWidgetAura(this);
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   std::string name = Browser::Get()->GetName();
   // Set WM_WINDOW_ROLE.
   params.wm_role_name = "browser-window";
@@ -285,7 +285,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   }
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (parent)
     SetParentWindow(parent);
 #endif
@@ -324,7 +324,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
                   window_type);
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (!has_frame()) {
     // Set Window style so that we get a minimize and maximize animation when
     // frameless.
@@ -351,7 +351,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
     // we should check whether setting it in InitParams can work.
     widget()->set_frame_type(views::Widget::FrameType::kForceNative);
     widget()->FrameTypeChanged();
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // thickFrame also works for normal window.
     if (!thick_frame_)
       FlipWindowStyle(GetAcceleratedWidget(), false, WS_THICKFRAME);
@@ -369,7 +369,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
 
   widget()->CenterWindow(size);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Save initial window state.
   if (fullscreen)
     last_window_state_ = ui::SHOW_STATE_FULLSCREEN;
@@ -382,7 +382,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   if (window)
     window->AddPreTargetHandler(this);
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // On linux after the widget is initialized we might have to force set the
   // bounds if the bounds are smaller than the current display
   SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
@@ -407,7 +407,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
 NativeWindowViews::~NativeWindowViews() {
   widget()->RemoveObserver(this);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Disable mouse forwarding to relinquish resources, should any be held.
   SetForwardMouseMessages(false);
 #endif
@@ -507,7 +507,7 @@ void NativeWindowViews::Hide() {
     global_menu_bar_->OnWindowUnmapped();
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // When the window is removed from the taskbar via win.hide(),
   // the thumbnail buttons need to be set up again.
   // Ensure that when the window is hidden,
@@ -521,9 +521,9 @@ bool NativeWindowViews::IsVisible() {
 }
 
 bool NativeWindowViews::IsEnabled() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return ::IsWindowEnabled(GetAcceleratedWidget());
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
 #if defined(USE_X11)
   return !event_disabler_.get();
 #endif
@@ -562,7 +562,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable) {
     return;
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   ::EnableWindow(GetAcceleratedWidget(), enable);
 #elif defined(USE_X11)
   views::DesktopWindowTreeHostPlatform* tree_host =
@@ -578,7 +578,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable) {
 #endif
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 void NativeWindowViews::Maximize() {
   if (IsVisible())
     widget()->Maximize();
@@ -590,7 +590,7 @@ void NativeWindowViews::Maximize() {
 
 void NativeWindowViews::Unmaximize() {
   if (IsMaximized()) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     if (transparent()) {
       SetBounds(restore_bounds_, false);
       NotifyWindowUnmaximize();
@@ -606,7 +606,7 @@ bool NativeWindowViews::IsMaximized() {
   if (widget()->IsMaximized()) {
     return true;
   } else {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     if (transparent()) {
       // Compare the size of the window with the size of the display
       auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(
@@ -641,7 +641,7 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
   if (!IsFullScreenable())
     return;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // There is no native fullscreen state on Windows.
   bool leaving_fullscreen = IsFullscreen() && !fullscreen;
 
@@ -697,7 +697,7 @@ bool NativeWindowViews::IsFullscreen() const {
 }
 
 void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
   // On Linux and Windows the minimum and maximum size should be updated with
   // window size when window is not resizable.
   if (!resizable_) {
@@ -710,7 +710,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
 }
 
 gfx::Rect NativeWindowViews::GetBounds() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (IsMinimized())
     return widget()->GetRestoredBounds();
 #endif
@@ -723,7 +723,7 @@ gfx::Rect NativeWindowViews::GetContentBounds() {
 }
 
 gfx::Size NativeWindowViews::GetContentSize() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (IsMinimized())
     return NativeWindow::GetContentSize();
 #endif
@@ -738,7 +738,7 @@ gfx::Rect NativeWindowViews::GetNormalBounds() {
 void NativeWindowViews::SetContentSizeConstraints(
     const extensions::SizeConstraints& size_constraints) {
   NativeWindow::SetContentSizeConstraints(size_constraints);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Changing size constraints would force adding the WS_THICKFRAME style, so
   // do nothing if thickFrame is false.
   if (!thick_frame_)
@@ -767,7 +767,7 @@ void NativeWindowViews::SetResizable(bool resizable) {
           extensions::SizeConstraints(content_size, content_size));
     }
   }
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (has_frame() && thick_frame_)
     FlipWindowStyle(GetAcceleratedWidget(), resizable, WS_THICKFRAME);
 #endif
@@ -780,7 +780,7 @@ bool NativeWindowViews::MoveAbove(const std::string& sourceId) {
   if (id.type != content::DesktopMediaID::TYPE_WINDOW)
     return false;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   const HWND otherWindow = reinterpret_cast<HWND>(id.id);
   if (!::IsWindow(otherWindow))
     return false;
@@ -802,7 +802,7 @@ bool NativeWindowViews::MoveAbove(const std::string& sourceId) {
 void NativeWindowViews::MoveTop() {
 // TODO(julien.isorce): fix chromium in order to use existing
 // widget()->StackAtTop().
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   gfx::Point pos = GetPosition();
   gfx::Size size = GetSize();
   ::SetWindowPos(GetAcceleratedWidget(), HWND_TOP, pos.x(), pos.y(),
@@ -815,7 +815,7 @@ void NativeWindowViews::MoveTop() {
 }
 
 bool NativeWindowViews::IsResizable() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (has_frame())
     return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME;
 #endif
@@ -837,7 +837,7 @@ void NativeWindowViews::SetMovable(bool movable) {
 }
 
 bool NativeWindowViews::IsMovable() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return movable_;
 #else
   return true;  // Not implemented on Linux.
@@ -845,14 +845,14 @@ bool NativeWindowViews::IsMovable() {
 }
 
 void NativeWindowViews::SetMinimizable(bool minimizable) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
 #endif
   minimizable_ = minimizable;
 }
 
 bool NativeWindowViews::IsMinimizable() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MINIMIZEBOX;
 #else
   return true;  // Not implemented on Linux.
@@ -860,14 +860,14 @@ bool NativeWindowViews::IsMinimizable() {
 }
 
 void NativeWindowViews::SetMaximizable(bool maximizable) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
 #endif
   maximizable_ = maximizable;
 }
 
 bool NativeWindowViews::IsMaximizable() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MAXIMIZEBOX;
 #else
   return true;  // Not implemented on Linux.
@@ -890,7 +890,7 @@ bool NativeWindowViews::IsFullScreenable() {
 }
 
 void NativeWindowViews::SetClosable(bool closable) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
   if (closable) {
     EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED);
@@ -901,7 +901,7 @@ void NativeWindowViews::SetClosable(bool closable) {
 }
 
 bool NativeWindowViews::IsClosable() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
   MENUITEMINFO info;
   memset(&info, 0, sizeof(info));
@@ -911,7 +911,7 @@ bool NativeWindowViews::IsClosable() {
     return false;
   }
   return !(info.fState & MFS_DISABLED);
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   return true;
 #endif
 }
@@ -922,7 +922,7 @@ void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
   bool level_changed = z_order != widget()->GetZOrderLevel();
   widget()->SetZOrderLevel(z_order);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Reset the placement flag.
   behind_task_bar_ = false;
   if (z_order != ui::ZOrderLevel::kNormal) {
@@ -963,7 +963,7 @@ std::string NativeWindowViews::GetTitle() {
 }
 
 void NativeWindowViews::FlashFrame(bool flash) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // The Chromium's implementation has a bug stopping flash.
   if (!flash) {
     FLASHWINFO fwi;
@@ -979,7 +979,7 @@ void NativeWindowViews::FlashFrame(bool flash) {
 }
 
 void NativeWindowViews::SetSkipTaskbar(bool skip) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   Microsoft::WRL::ComPtr<ITaskbarList> taskbar;
   if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
                                 CLSCTX_INPROC_SERVER,
@@ -1015,8 +1015,8 @@ bool NativeWindowViews::IsKiosk() {
 }
 
 bool NativeWindowViews::IsTabletMode() const {
-#if defined(OS_WIN)
-  return base::win::IsWindows10TabletMode(GetAcceleratedWidget());
+#if BUILDFLAG(IS_WIN)
+  return base::win::IsWindows10OrGreaterTabletMode(GetAcceleratedWidget());
 #else
   return false;
 #endif
@@ -1033,7 +1033,7 @@ void NativeWindowViews::SetBackgroundColor(SkColor background_color) {
   // web views' background color.
   root_view_->SetBackground(views::CreateSolidBackground(background_color));
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Set the background color of native window.
   HBRUSH brush = CreateSolidBrush(skia::SkColorToCOLORREF(background_color));
   ULONG_PTR previous_brush =
@@ -1057,7 +1057,7 @@ bool NativeWindowViews::HasShadow() {
 }
 
 void NativeWindowViews::SetOpacity(const double opacity) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   const double boundedOpacity = base::clamp(opacity, 0.0, 1.0);
   HWND hwnd = GetAcceleratedWidget();
   if (!layered_) {
@@ -1078,7 +1078,7 @@ double NativeWindowViews::GetOpacity() {
 }
 
 void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
   if (ignore)
     ex_style |= (WS_EX_TRANSPARENT | WS_EX_LAYERED);
@@ -1117,7 +1117,7 @@ void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) {
 }
 
 void NativeWindowViews::SetContentProtection(bool enable) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HWND hwnd = GetAcceleratedWidget();
   DWORD affinity = enable ? WDA_EXCLUDEFROMCAPTURE : WDA_NONE;
   ::SetWindowDisplayAffinity(hwnd, affinity);
@@ -1134,7 +1134,7 @@ void NativeWindowViews::SetContentProtection(bool enable) {
 
 void NativeWindowViews::SetFocusable(bool focusable) {
   widget()->widget_delegate()->SetCanActivate(focusable);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
   if (focusable)
     ex_style &= ~WS_EX_NOACTIVATE;
@@ -1148,7 +1148,7 @@ void NativeWindowViews::SetFocusable(bool focusable) {
 
 bool NativeWindowViews::IsFocusable() {
   bool can_activate = widget()->widget_delegate()->CanActivate();
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
   bool no_activate = ex_style & WS_EX_NOACTIVATE;
   return !no_activate && can_activate;
@@ -1260,7 +1260,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
       x11::Atom::WM_TRANSIENT_FOR, x11::Atom::WINDOW,
       parent ? static_cast<x11::Window>(parent->GetAcceleratedWidget())
              : ui::GetX11RootWindow());
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   // To set parentship between windows into Windows is better to play with the
   //  owner instead of the parent, as Windows natively seems to do if a parent
   //  is specified at window creation time.
@@ -1295,9 +1295,9 @@ gfx::NativeWindow NativeWindowViews::GetNativeWindow() const {
 
 void NativeWindowViews::SetProgressBar(double progress,
                                        NativeWindow::ProgressState state) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   if (unity::IsRunning()) {
     unity::SetProgressFraction(progress);
   }
@@ -1306,7 +1306,7 @@ void NativeWindowViews::SetProgressBar(double progress,
 
 void NativeWindowViews::SetOverlayIcon(const gfx::Image& overlay,
                                        const std::string& description) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   SkBitmap overlay_bitmap = overlay.AsBitmap();
   taskbar_host_.SetOverlayIcon(GetAcceleratedWidget(), overlay_bitmap,
                                description);
@@ -1355,10 +1355,10 @@ content::DesktopMediaID NativeWindowViews::GetDesktopMediaID() const {
   const gfx::AcceleratedWidget accelerated_widget = GetAcceleratedWidget();
   content::DesktopMediaID::Id window_handle = content::DesktopMediaID::kNullId;
   content::DesktopMediaID::Id aura_id = content::DesktopMediaID::kNullId;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   window_handle =
       reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   window_handle = static_cast<uint32_t>(accelerated_widget);
 #endif
   aura::WindowTreeHost* const host =
@@ -1399,7 +1399,7 @@ gfx::Rect NativeWindowViews::ContentBoundsToWindowBounds(
     return bounds;
 
   gfx::Rect window_bounds(bounds);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (widget()->non_client_view()) {
     HWND hwnd = GetAcceleratedWidget();
     gfx::Rect dpi_bounds = DIPToScreenRect(hwnd, bounds);
@@ -1423,7 +1423,7 @@ gfx::Rect NativeWindowViews::WindowBoundsToContentBounds(
     return bounds;
 
   gfx::Rect content_bounds(bounds);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HWND hwnd = GetAcceleratedWidget();
   content_bounds.set_size(DIPToScreenRect(hwnd, content_bounds).size());
   RECT rect;
@@ -1449,7 +1449,7 @@ void NativeWindowViews::UpdateDraggableRegions(
   draggable_region_ = DraggableRegionsToSkRegion(regions);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
   // We are responsible for storing the images.
   window_icon_ = base::win::ScopedHICON(CopyIcon(window_icon));
@@ -1461,7 +1461,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HICON app_icon) {
   SendMessage(hwnd, WM_SETICON, ICON_BIG,
               reinterpret_cast<LPARAM>(app_icon_.get()));
 }
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
 void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
   auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
       GetAcceleratedWidget());
@@ -1529,9 +1529,9 @@ bool NativeWindowViews::CanMaximize() const {
 }
 
 bool NativeWindowViews::CanMinimize() const {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return minimizable_;
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   return true;
 #endif
 }
@@ -1578,7 +1578,7 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
 
 std::unique_ptr<views::NonClientFrameView>
 NativeWindowViews::CreateNonClientFrameView(views::Widget* widget) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto frame_view = std::make_unique<WinFrameView>();
   frame_view->Init(this, widget);
   return frame_view;
@@ -1605,7 +1605,7 @@ void NativeWindowViews::HandleKeyboardEvent(
   if (widget_destroyed_)
     return;
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
     NotifyWindowExecuteAppCommand(kBrowserBackward);
   else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
@@ -1624,7 +1624,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) {
   // Alt+Click should not toggle menu bar.
   root_view_->ResetAltState();
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (event->changed_button_flags() == ui::EF_BACK_MOUSE_BUTTON)
     NotifyWindowExecuteAppCommand(kBrowserBackward);
   else if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON)
@@ -1634,7 +1634,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) {
 
 ui::WindowShowState NativeWindowViews::GetRestoredState() {
   if (IsMaximized()) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     // Only restore Maximized state when window is NOT transparent style
     if (!transparent()) {
       return ui::SHOW_STATE_MAXIMIZED;
@@ -1651,7 +1651,7 @@ ui::WindowShowState NativeWindowViews::GetRestoredState() {
 }
 
 void NativeWindowViews::MoveBehindTaskBarIfNeeded() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (behind_task_bar_) {
     const HWND task_bar_hwnd = ::FindWindow(kUniqueTaskBarClassName, nullptr);
     ::SetWindowPos(GetAcceleratedWidget(), task_bar_hwnd, 0, 0, 0, 0,
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index caaa690da917a..db178209ad6a5 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -15,7 +15,7 @@
 #include "shell/common/api/api.mojom.h"
 #include "ui/views/widget/widget_observer.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "shell/browser/ui/win/taskbar_host.h"
 
@@ -35,7 +35,7 @@ class WindowStateWatcher;
 class EventDisabler;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 gfx::Rect ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds);
 #endif
 
@@ -153,7 +153,7 @@ class NativeWindowViews : public NativeWindow,
   void IncrementChildModals();
   void DecrementChildModals();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Catch-all message handling and filtering. Called before
   // HWNDMessageHandler's built-in handling, which may pre-empt some
   // expectations in Views/Aura if messages are consumed. Returns true if the
@@ -165,17 +165,17 @@ class NativeWindowViews : public NativeWindow,
                     LPARAM l_param,
                     LRESULT* result);
   void SetIcon(HICON small_icon, HICON app_icon);
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   void SetIcon(const gfx::ImageSkia& icon);
 #endif
 
   SkRegion* draggable_region() const { return draggable_region_.get(); }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   TaskbarHost& taskbar_host() { return taskbar_host_; }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool IsWindowControlsOverlayEnabled() const {
     return (title_bar_style_ == NativeWindowViews::TitleBarStyle::kHidden) &&
            titlebar_overlay_;
@@ -205,11 +205,11 @@ class NativeWindowViews : public NativeWindow,
   std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
       views::Widget* widget) override;
   void OnWidgetMove() override;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   bool ExecuteWindowsCommand(int command_id) override;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
   void SetForwardMouseMessages(bool forward);
   static LRESULT CALLBACK SubclassProc(HWND hwnd,
@@ -262,7 +262,7 @@ class NativeWindowViews : public NativeWindow,
   std::unique_ptr<EventDisabler> event_disabler_;
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 
   ui::WindowShowState last_window_state_;
 
diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index cf4eb4855f4c2..0b4706f1cc198 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -4,13 +4,14 @@
 
 #include <dwmapi.h>
 #include <shellapi.h>
+#include <wrl/client.h>
 
+#include "base/win/atl.h"  // Must be before UIAutomationCore.h
 #include "content/public/browser/browser_accessibility_state.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/views/root_view.h"
 #include "shell/common/electron_constants.h"
-#include "ui/base/win/accessibility_misc_utils.h"
 #include "ui/display/display.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/gfx/geometry/insets.h"
@@ -18,6 +19,7 @@
 #include "ui/views/widget/native_widget_private.h"
 
 // Must be included after other Windows headers.
+#include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 namespace electron {
diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc
index af5fac5ca5838..bfa2a7d0e4832 100644
--- a/shell/browser/net/asar/asar_url_loader.cc
+++ b/shell/browser/net/asar/asar_url_loader.cc
@@ -270,7 +270,8 @@ class AsarURLLoader : public network::mojom::URLLoader {
       head->headers->AddHeader(net::HttpRequestHeaders::kContentType,
                                head->mime_type.c_str());
     }
-    client_->OnReceiveResponse(std::move(head));
+    client_->OnReceiveResponse(std::move(head),
+                               mojo::ScopedDataPipeConsumerHandle());
     client_->OnStartLoadingResponseBody(std::move(consumer_handle));
 
     if (total_bytes_to_send == 0) {
diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc
index aa619de02079f..41bdf140b90a4 100644
--- a/shell/browser/net/electron_url_loader_factory.cc
+++ b/shell/browser/net/electron_url_loader_factory.cc
@@ -559,7 +559,8 @@ void ElectronURLLoaderFactory::StartLoadingStream(
     //
     // Note that We must submit a empty body otherwise NetworkService would
     // crash.
-    client_remote->OnReceiveResponse(std::move(head));
+    client_remote->OnReceiveResponse(std::move(head),
+                                     mojo::ScopedDataPipeConsumerHandle());
     mojo::ScopedDataPipeProducerHandle producer;
     mojo::ScopedDataPipeConsumerHandle consumer;
     if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
@@ -604,7 +605,8 @@ void ElectronURLLoaderFactory::SendContents(
 
   // Add header to ignore CORS.
   head->headers->AddHeader("Access-Control-Allow-Origin", "*");
-  client_remote->OnReceiveResponse(std::move(head));
+  client_remote->OnReceiveResponse(std::move(head),
+                                   mojo::ScopedDataPipeConsumerHandle());
 
   // Code below follows the pattern of data_url_loader_factory.cc.
   mojo::ScopedDataPipeProducerHandle producer;
diff --git a/shell/browser/net/network_context_service.cc b/shell/browser/net/network_context_service.cc
index 53c65a2625216..4bf9b02e0522b 100644
--- a/shell/browser/net/network_context_service.cc
+++ b/shell/browser/net/network_context_service.cc
@@ -23,11 +23,11 @@ namespace electron {
 namespace {
 
 bool ShouldTriggerNetworkDataMigration() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // On Windows, if sandbox enabled means data must be migrated.
   if (SystemNetworkContextManager::IsNetworkSandboxEnabled())
     return true;
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
   if (base::FeatureList::IsEnabled(features::kTriggerNetworkDataMigration))
     return true;
   return false;
diff --git a/shell/browser/net/node_stream_loader.cc b/shell/browser/net/node_stream_loader.cc
index 103399abab03c..c4d264a578390 100644
--- a/shell/browser/net/node_stream_loader.cc
+++ b/shell/browser/net/node_stream_loader.cc
@@ -59,7 +59,8 @@ void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
   }
 
   producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
-  client_->OnReceiveResponse(std::move(head));
+  client_->OnReceiveResponse(std::move(head),
+                             mojo::ScopedDataPipeConsumerHandle());
   client_->OnStartLoadingResponseBody(std::move(consumer));
 
   auto weak = weak_factory_.GetWeakPtr();
diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc
index 914c493f1914d..6eb27c8395083 100644
--- a/shell/browser/net/proxying_url_loader_factory.cc
+++ b/shell/browser/net/proxying_url_loader_factory.cc
@@ -242,7 +242,9 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnReceiveEarlyHints(
 }
 
 void ProxyingURLLoaderFactory::InProgressRequest::OnReceiveResponse(
-    network::mojom::URLResponseHeadPtr head) {
+    network::mojom::URLResponseHeadPtr head,
+    mojo::ScopedDataPipeConsumerHandle body) {
+  current_body_ = std::move(body);
   if (current_request_uses_header_client_) {
     // Use the headers we got from OnHeadersReceived as that'll contain
     // Set-Cookie if it existed.
@@ -673,7 +675,8 @@ void ProxyingURLLoaderFactory::InProgressRequest::ContinueToResponseStarted(
   proxied_client_receiver_.Resume();
 
   factory_->web_request_api()->OnResponseStarted(&info_.value(), request_);
-  target_client_->OnReceiveResponse(current_response_.Clone());
+  target_client_->OnReceiveResponse(current_response_.Clone(),
+                                    std::move(current_body_));
 }
 
 void ProxyingURLLoaderFactory::InProgressRequest::ContinueToBeforeRedirect(
diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h
index f45c9c943889c..35d8e89be9332 100644
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -88,7 +88,8 @@ class ProxyingURLLoaderFactory
     // network::mojom::URLLoaderClient:
     void OnReceiveEarlyHints(
         network::mojom::EarlyHintsPtr early_hints) override;
-    void OnReceiveResponse(network::mojom::URLResponseHeadPtr head) override;
+    void OnReceiveResponse(network::mojom::URLResponseHeadPtr head,
+                           mojo::ScopedDataPipeConsumerHandle body) override;
     void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
                            network::mojom::URLResponseHeadPtr head) override;
     void OnUploadProgress(int64_t current_position,
@@ -148,6 +149,7 @@ class ProxyingURLLoaderFactory
     network::mojom::URLLoaderPtr target_loader_;
 
     network::mojom::URLResponseHeadPtr current_response_;
+    mojo::ScopedDataPipeConsumerHandle current_body_;
     scoped_refptr<net::HttpResponseHeaders> override_headers_;
     GURL redirect_url_;
 
diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index 4a4e84ab851ea..dcfe4e4292cc5 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -42,23 +42,23 @@
 #include "shell/common/options_switches.h"
 #include "url/gurl.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "components/os_crypt/keychain_password_mac.h"
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "components/os_crypt/key_storage_config_linux.h"
 #endif
 
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 namespace {
 
 const char kNetworkServiceSandboxEnabled[] = "net.network_service_sandbox";
 
 }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 // The global instance of the SystemNetworkContextmanager.
 SystemNetworkContextManager* g_system_network_context_manager = nullptr;
@@ -67,9 +67,6 @@ network::mojom::HttpAuthStaticParamsPtr CreateHttpAuthStaticParams() {
   network::mojom::HttpAuthStaticParamsPtr auth_static_params =
       network::mojom::HttpAuthStaticParams::New();
 
-  auth_static_params->supported_schemes = {"basic", "digest", "ntlm",
-                                           "negotiate"};
-
   return auth_static_params;
 }
 
@@ -86,6 +83,8 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams() {
       command_line->HasSwitch(electron::switches::kEnableAuthNegotiatePort);
   auth_dynamic_params->ntlm_v2_enabled =
       !command_line->HasSwitch(electron::switches::kDisableNTLMv2);
+  auth_dynamic_params->allowed_schemes = {"basic", "digest", "ntlm",
+                                          "negotiate"};
 
   return auth_dynamic_params;
 }
@@ -233,12 +232,12 @@ void SystemNetworkContextManager::DeleteInstance() {
 // c.f.
 // https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/net/system_network_context_manager.cc;l=730-740;drc=15a616c8043551a7cb22c4f73a88e83afb94631c;bpv=1;bpt=1
 bool SystemNetworkContextManager::IsNetworkSandboxEnabled() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto* local_state = g_browser_process->local_state();
   if (local_state && local_state->HasPrefPath(kNetworkServiceSandboxEnabled)) {
     return local_state->GetBoolean(kNetworkServiceSandboxEnabled);
   }
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
   // If no policy is specified, then delegate to global sandbox configuration.
   return sandbox::policy::features::IsNetworkSandboxEnabled();
 }
@@ -298,52 +297,18 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
       additional_dns_query_types_enabled);
 
   std::string app_name = electron::Browser::Get()->GetName();
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   KeychainPassword::GetServiceName() = app_name + " Safe Storage";
   KeychainPassword::GetAccountName() = app_name;
 #endif
-#if defined(OS_LINUX)
-  // c.f.
-  // https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/net/system_network_context_manager.cc;l=515;drc=9d82515060b9b75fa941986f5db7390299669ef1;bpv=1;bpt=1
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-
-  auto config = std::make_unique<os_crypt::Config>();
-  config->store = command_line.GetSwitchValueASCII(::switches::kPasswordStore);
-  config->product_name = app_name;
-  config->application_name = app_name;
-  config->main_thread_runner = base::ThreadTaskRunnerHandle::Get();
-  // c.f.
-  // https://source.chromium.org/chromium/chromium/src/+/master:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
-  config->should_use_preference =
-      command_line.HasSwitch(::switches::kEnableEncryptionSelection);
-  base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
-#endif
 
   // The OSCrypt keys are process bound, so if network service is out of
   // process, send it the required key.
   if (content::IsOutOfProcessNetworkService() &&
       electron::fuses::IsCookieEncryptionEnabled()) {
-#if defined(OS_LINUX)
-    network::mojom::CryptConfigPtr network_crypt_config =
-        network::mojom::CryptConfig::New();
-    network_crypt_config->application_name = config->application_name;
-    network_crypt_config->product_name = config->product_name;
-    network_crypt_config->store = config->store;
-    network_crypt_config->should_use_preference = config->should_use_preference;
-    network_crypt_config->user_data_path = config->user_data_path;
-
-    network_service->SetCryptConfig(std::move(network_crypt_config));
-
-#else
     network_service->SetEncryptionKey(OSCrypt::GetRawEncryptionKey());
-#endif
   }
 
-#if defined(OS_LINUX)
-  OSCrypt::SetConfig(std::move(config));
-#endif
-
 #if DCHECK_IS_ON()
   electron::safestorage::SetElectronCryptoReady(true);
 #endif
diff --git a/shell/browser/net/url_pipe_loader.cc b/shell/browser/net/url_pipe_loader.cc
index 2d45be36117fa..b55dc3963dcfb 100644
--- a/shell/browser/net/url_pipe_loader.cc
+++ b/shell/browser/net/url_pipe_loader.cc
@@ -70,7 +70,8 @@ void URLPipeLoader::OnResponseStarted(
 
   producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
 
-  client_->OnReceiveResponse(response_head.Clone());
+  client_->OnReceiveResponse(response_head.Clone(),
+                             mojo::ScopedDataPipeConsumerHandle());
   client_->OnStartLoadingResponseBody(std::move(consumer));
 }
 
diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc
index c7fb26087e8cd..d3dc051753d34 100644
--- a/shell/browser/notifications/win/windows_toast_notification.cc
+++ b/shell/browser/notifications/win/windows_toast_notification.cc
@@ -12,6 +12,7 @@
 #include <wrl\wrappers\corewrappers.h>
 
 #include "base/environment.h"
+#include "base/logging.h"
 #include "base/strings/string_util_win.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
diff --git a/shell/browser/osr/osr_host_display_client.cc b/shell/browser/osr/osr_host_display_client.cc
index f77c01eb94473..9c0add137ac7c 100644
--- a/shell/browser/osr/osr_host_display_client.cc
+++ b/shell/browser/osr/osr_host_display_client.cc
@@ -15,7 +15,7 @@
 #include "third_party/skia/src/core/SkDevice.h"
 #include "ui/gfx/skia_util.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "skia/ext/skia_utils_win.h"
 #endif
 
@@ -97,7 +97,7 @@ void OffScreenHostDisplayClient::CreateLayeredWindowUpdater(
   layered_window_updater_->SetActive(active_);
 }
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 void OffScreenHostDisplayClient::DidCompleteSwapWithNewSize(
     const gfx::Size& size) {}
 #endif
diff --git a/shell/browser/osr/osr_host_display_client.h b/shell/browser/osr/osr_host_display_client.h
index 795cf53ce740b..ebeacd537832a 100644
--- a/shell/browser/osr/osr_host_display_client.h
+++ b/shell/browser/osr/osr_host_display_client.h
@@ -63,7 +63,7 @@ class OffScreenHostDisplayClient : public viz::HostDisplayClient {
   void SetActive(bool active);
 
  private:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void OnDisplayReceivedCALayerParams(
       const gfx::CALayerParams& ca_layer_params) override;
 #endif
@@ -72,7 +72,7 @@ class OffScreenHostDisplayClient : public viz::HostDisplayClient {
       mojo::PendingReceiver<viz::mojom::LayeredWindowUpdater> receiver)
       override;
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
 #endif
 
diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc
index 69a80127fa37e..f24cf051c5e96 100644
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -651,7 +651,7 @@ bool OffScreenRenderWidgetHostView::InstallTransparency() {
   return false;
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 void OffScreenRenderWidgetHostView::SetActive(bool active) {}
 
 void OffScreenRenderWidgetHostView::ShowDefinitionForSelection() {}
diff --git a/shell/browser/osr/osr_render_widget_host_view.h b/shell/browser/osr/osr_render_widget_host_view.h
index 7f310dedfc61b..874fd68268b3d 100644
--- a/shell/browser/osr/osr_render_widget_host_view.h
+++ b/shell/browser/osr/osr_render_widget_host_view.h
@@ -10,7 +10,9 @@
 #include <string>
 #include <vector>
 
-#if defined(OS_WIN)
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -38,7 +40,7 @@
 
 #include "components/viz/host/host_display_client.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/gfx/win/window_impl.h"
 #endif
 
@@ -101,7 +103,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
       bool request_unadjusted_movement) override;
   void UnlockMouse(void) override;
   void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void SetActive(bool active) override;
   void ShowDefinitionForSelection() override;
   void SpeakSelection() override;
@@ -113,7 +115,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
       const std::vector<std::string>& file_paths,
       blink::mojom::ShareService::ShareCallback callback) override;
   bool UpdateNSViewAndDisplay();
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   // content::RenderWidgetHostViewBase:
 
diff --git a/shell/browser/osr/osr_web_contents_view.cc b/shell/browser/osr/osr_web_contents_view.cc
index 7ce4bbcd35f92..e5fe20ce3b1ff 100644
--- a/shell/browser/osr/osr_web_contents_view.cc
+++ b/shell/browser/osr/osr_web_contents_view.cc
@@ -15,7 +15,7 @@ OffScreenWebContentsView::OffScreenWebContentsView(
     bool transparent,
     const OnPaintCallback& callback)
     : transparent_(transparent), callback_(callback) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   PlatformCreate();
 #endif
 }
@@ -24,7 +24,7 @@ OffScreenWebContentsView::~OffScreenWebContentsView() {
   if (native_window_)
     native_window_->RemoveObserver(this);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   PlatformDestroy();
 #endif
 }
@@ -66,7 +66,7 @@ gfx::Size OffScreenWebContentsView::GetSize() {
   return native_window_ ? native_window_->GetSize() : gfx::Size();
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 gfx::NativeView OffScreenWebContentsView::GetNativeView() const {
   if (!native_window_)
     return gfx::NativeView();
@@ -154,11 +154,11 @@ void OffScreenWebContentsView::SetOverscrollControllerEnabled(bool enabled) {}
 
 void OffScreenWebContentsView::OnCapturerCountChanged() {}
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool OffScreenWebContentsView::CloseTabAfterEventTrackingIfNeeded() {
   return false;
 }
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
 void OffScreenWebContentsView::StartDragging(
     const content::DropData& drop_data,
diff --git a/shell/browser/osr/osr_web_contents_view.h b/shell/browser/osr/osr_web_contents_view.h
index ccff07155b70e..3b3dd7bf6c395 100644
--- a/shell/browser/osr/osr_web_contents_view.h
+++ b/shell/browser/osr/osr_web_contents_view.h
@@ -14,7 +14,7 @@
 #include "shell/browser/osr/osr_render_widget_host_view.h"
 #include "third_party/blink/public/common/page/drag_mojom_traits.h"
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #ifdef __OBJC__
 @class OffScreenView;
 #else
@@ -64,7 +64,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
   void SetOverscrollControllerEnabled(bool enabled) override;
   void OnCapturerCountChanged() override;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   bool CloseTabAfterEventTrackingIfNeeded() override;
 #endif
 
@@ -82,7 +82,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
   int GetFrameRate() const;
 
  private:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   void PlatformCreate();
   void PlatformDestroy();
 #endif
@@ -99,7 +99,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
   // Weak refs.
   content::WebContents* web_contents_ = nullptr;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   OffScreenView* offScreenView_;
 #endif
 };
diff --git a/shell/browser/pref_store_delegate.h b/shell/browser/pref_store_delegate.h
index b3997f3e332eb..85ec92747130d 100644
--- a/shell/browser/pref_store_delegate.h
+++ b/shell/browser/pref_store_delegate.h
@@ -34,6 +34,7 @@ class PrefStoreDelegate : public PrefValueStore::Delegate {
   void Init(PrefStore* managed_prefs,
             PrefStore* supervised_user_prefs,
             PrefStore* extension_prefs,
+            PrefStore* standalone_browser_prefs,
             PrefStore* command_line_prefs,
             PrefStore* user_prefs,
             PrefStore* recommended_prefs,
diff --git a/shell/browser/protocol_registry.cc b/shell/browser/protocol_registry.cc
index 135f452caf744..9bd6c4ac1ebab 100644
--- a/shell/browser/protocol_registry.cc
+++ b/shell/browser/protocol_registry.cc
@@ -47,7 +47,7 @@ void ProtocolRegistry::RegisterURLLoaderFactories(
 bool ProtocolRegistry::RegisterProtocol(ProtocolType type,
                                         const std::string& scheme,
                                         const ProtocolHandler& handler) {
-  return base::TryEmplace(handlers_, scheme, type, handler).second;
+  return handlers_.try_emplace(scheme, type, handler).second;
 }
 
 bool ProtocolRegistry::UnregisterProtocol(const std::string& scheme) {
@@ -61,7 +61,7 @@ bool ProtocolRegistry::IsProtocolRegistered(const std::string& scheme) {
 bool ProtocolRegistry::InterceptProtocol(ProtocolType type,
                                          const std::string& scheme,
                                          const ProtocolHandler& handler) {
-  return base::TryEmplace(intercept_handlers_, scheme, type, handler).second;
+  return intercept_handlers_.try_emplace(scheme, type, handler).second;
 }
 
 bool ProtocolRegistry::UninterceptProtocol(const std::string& scheme) {
diff --git a/shell/browser/relauncher.cc b/shell/browser/relauncher.cc
index 20f9c76fdd890..d357824ba30d0 100644
--- a/shell/browser/relauncher.cc
+++ b/shell/browser/relauncher.cc
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <windows.h>
 #endif
 
@@ -19,7 +19,7 @@
 #include "content/public/common/main_function_params.h"
 #include "shell/common/electron_command_line.h"
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "base/posix/eintr_wrapper.h"
 #endif
 
@@ -27,7 +27,7 @@ namespace relauncher {
 
 namespace internal {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 const int kRelauncherSyncFD = STDERR_FILENO + 1;
 #endif
 
@@ -72,7 +72,7 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
 
   relaunch_argv.insert(relaunch_argv.end(), argv.begin(), argv.end());
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   int pipe_fds[2];
   if (HANDLE_EINTR(pipe(pipe_fds)) != 0) {
     PLOG(ERROR) << "pipe";
@@ -98,11 +98,11 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
 #endif
 
   base::LaunchOptions options;
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   options.fds_to_remap.push_back(
       std::make_pair(pipe_write_fd.get(), internal::kRelauncherSyncFD));
   base::Process process = base::LaunchProcess(relaunch_argv, options);
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   base::Process process = base::LaunchProcess(
       internal::ArgvToCommandLineString(relaunch_argv), options);
 #endif
@@ -114,7 +114,7 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
   // The relauncher process is now starting up, or has started up. The
   // original parent process continues.
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Synchronize with the relauncher process.
   StringType name = internal::GetWaitEventName(process.Pid());
   HANDLE wait_event = ::CreateEventW(NULL, TRUE, FALSE, name.c_str());
@@ -122,7 +122,7 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
     WaitForSingleObject(wait_event, 1000);
     CloseHandle(wait_event);
   }
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   pipe_write_fd.reset();  // close(pipe_fds[1]);
 
   // Synchronize with the relauncher process.
diff --git a/shell/browser/relauncher.h b/shell/browser/relauncher.h
index d3208843cc188..47106a2c0d7b5 100644
--- a/shell/browser/relauncher.h
+++ b/shell/browser/relauncher.h
@@ -31,7 +31,7 @@
 
 #include "base/command_line.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/process/process_handle.h"
 #endif
 
@@ -76,7 +76,7 @@ int RelauncherMain(const content::MainFunctionParams& main_parameters);
 
 namespace internal {
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 // The "magic" file descriptor that the relauncher process' write side of the
 // pipe shows up on. Chosen to avoid conflicting with stdin, stdout, and
 // stderr.
@@ -95,7 +95,7 @@ extern const CharType* kRelauncherTypeArg;
 // reporting.
 extern const CharType* kRelauncherArgSeparator;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 StringType GetWaitEventName(base::ProcessId pid);
 
 StringType ArgvToCommandLineString(const StringVector& argv);
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
index 49a57a4ffdf79..04156f3bee584 100644
--- a/shell/browser/serial/serial_chooser_context.cc
+++ b/shell/browser/serial/serial_chooser_context.cc
@@ -22,16 +22,16 @@ namespace electron {
 constexpr char kPortNameKey[] = "name";
 constexpr char kTokenKey[] = "token";
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 const char kDeviceInstanceIdKey[] = "device_instance_id";
 #else
 const char kVendorIdKey[] = "vendor_id";
 const char kProductIdKey[] = "product_id";
 const char kSerialNumberKey[] = "serial_number";
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 const char kUsbDriverKey[] = "usb_driver";
-#endif  // defined(OS_MAC)
-#endif  // defined(OS_WIN
+#endif  // BUILDFLAG(IS_MAC)
+#endif  // BUILDFLAG(IS_WIN)
 
 std::string EncodeToken(const base::UnguessableToken& token) {
   const uint64_t data[2] = {token.GetHighForSerialization(),
@@ -66,7 +66,7 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
     return value;
   }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Windows provides a handy device identifier which we can rely on to be
   // sufficiently stable for identifying devices across restarts.
   value.SetStringKey(kDeviceInstanceIdKey, port.device_instance_id);
@@ -78,11 +78,11 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
   DCHECK(port.serial_number);
   value.SetStringKey(kSerialNumberKey, *port.serial_number);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   DCHECK(port.usb_driver_name && !port.usb_driver_name->empty());
   value.SetStringKey(kUsbDriverKey, *port.usb_driver_name);
-#endif  // defined(OS_MAC)
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_MAC)
+#endif  // BUILDFLAG(IS_WIN)
   return value;
 }
 
@@ -126,7 +126,7 @@ bool SerialChooserContext::CanStorePersistentEntry(
   if (!port.display_name || port.display_name->empty())
     return false;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   return !port.device_instance_id.empty();
 #else
   if (!port.has_vendor_id || !port.has_product_id || !port.serial_number ||
@@ -134,7 +134,7 @@ bool SerialChooserContext::CanStorePersistentEntry(
     return false;
   }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // The combination of the standard USB vendor ID, product ID and serial
   // number properties should be enough to uniquely identify a device
   // however recent versions of macOS include built-in drivers for common
@@ -144,10 +144,10 @@ bool SerialChooserContext::CanStorePersistentEntry(
   // USB driver name allows us to distinguish between the two.
   if (!port.usb_driver_name || port.usb_driver_name->empty())
     return false;
-#endif  // defined(OS_MAC)
+#endif  // BUILDFLAG(IS_MAC)
 
   return true;
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 }
 
 device::mojom::SerialPortManager* SerialChooserContext::GetPortManager() {
diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h
index 0183b5877a514..657ee7b10016c 100644
--- a/shell/browser/serial/serial_chooser_context.h
+++ b/shell/browser/serial/serial_chooser_context.h
@@ -32,16 +32,16 @@ namespace electron {
 extern const char kHidVendorIdKey[];
 extern const char kHidProductIdKey[];
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 extern const char kDeviceInstanceIdKey[];
 #else
 extern const char kVendorIdKey[];
 extern const char kProductIdKey[];
 extern const char kSerialNumberKey[];
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 extern const char kUsbDriverKey[];
-#endif  // defined(OS_MAC)
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_MAC)
+#endif  // BUILDFLAG(IS_WIN)
 
 class SerialChooserContext : public KeyedService,
                              public device::mojom::SerialPortManagerClient {
diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc
index 94c7355188c3c..695d1f3161c66 100644
--- a/shell/browser/serial/serial_chooser_controller.cc
+++ b/shell/browser/serial/serial_chooser_controller.cc
@@ -41,11 +41,11 @@ struct Converter<device::mojom::SerialPortInfoPtr> {
     if (port->serial_number && !port->serial_number->empty()) {
       dict.Set("serialNumber", *port->serial_number);
     }
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     if (port->usb_driver_name && !port->usb_driver_name->empty()) {
       dict.Set("usbDriverName", *port->usb_driver_name);
     }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
     if (!port->device_instance_id.empty()) {
       dict.Set("deviceInstanceId", port->device_instance_id);
     }
diff --git a/shell/browser/ui/electron_menu_model.cc b/shell/browser/ui/electron_menu_model.cc
index 01e4f63ffd34e..23e0dd079327f 100644
--- a/shell/browser/ui/electron_menu_model.cc
+++ b/shell/browser/ui/electron_menu_model.cc
@@ -10,7 +10,7 @@
 
 namespace electron {
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 ElectronMenuModel::SharingItem::SharingItem() = default;
 ElectronMenuModel::SharingItem::SharingItem(SharingItem&&) = default;
 ElectronMenuModel::SharingItem::~SharingItem() = default;
@@ -87,7 +87,7 @@ bool ElectronMenuModel::WorksWhenHiddenAt(int index) const {
   return true;
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool ElectronMenuModel::GetSharingItemAt(int index, SharingItem* item) const {
   if (delegate_)
     return delegate_->GetSharingItemForCommandId(GetCommandIdAt(index), item);
diff --git a/shell/browser/ui/electron_menu_model.h b/shell/browser/ui/electron_menu_model.h
index 0fb9bcf57319a..355a3f7040927 100644
--- a/shell/browser/ui/electron_menu_model.h
+++ b/shell/browser/ui/electron_menu_model.h
@@ -21,7 +21,7 @@ namespace electron {
 
 class ElectronMenuModel : public ui::SimpleMenuModel {
  public:
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   struct SharingItem {
     SharingItem();
     SharingItem(SharingItem&&);
@@ -48,7 +48,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
 
     virtual bool ShouldCommandIdWorkWhenHidden(int command_id) const = 0;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     virtual bool GetSharingItemForCommandId(int command_id,
                                             SharingItem* item) const = 0;
 #endif
@@ -92,7 +92,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
                                   ui::Accelerator* accelerator) const;
   bool ShouldRegisterAcceleratorAt(int index) const;
   bool WorksWhenHiddenAt(int index) const;
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Return the SharingItem of menu item.
   bool GetSharingItemAt(int index, SharingItem* item) const;
   // Set/Get the SharingItem of this menu.
@@ -114,7 +114,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
  private:
   Delegate* delegate_;  // weak ref.
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   absl::optional<SharingItem> sharing_item_;
 #endif
 
diff --git a/shell/browser/ui/gtk/app_indicator_icon.cc b/shell/browser/ui/gtk/app_indicator_icon.cc
index 4f9f54f379f83..a6ccb75cb79c4 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.cc
+++ b/shell/browser/ui/gtk/app_indicator_icon.cc
@@ -15,6 +15,7 @@
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/hash/md5.h"
+#include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index f4cd47da9aeec..16d2cda33cf69 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -580,11 +580,11 @@ void InspectableWebContents::LoadCompleted() {
     SetIsDocked(DispatchCallback(), false);
   } else {
     if (dock_state_.empty()) {
-      const base::DictionaryValue* prefs =
+      const base::Value* prefs =
           pref_service_->GetDictionary(kDevToolsPreferences);
-      std::string current_dock_state;
-      prefs->GetString("currentDockState", &current_dock_state);
-      base::RemoveChars(current_dock_state, "\"", &dock_state_);
+      const std::string* current_dock_state =
+          prefs->FindStringKey("currentDockState");
+      base::RemoveChars(*current_dock_state, "\"", &dock_state_);
     }
     std::u16string javascript = base::UTF8ToUTF16(
         "UI.DockController.instance().setDockSide(\"" + dock_state_ + "\");");
diff --git a/shell/browser/ui/inspectable_web_contents_view.h b/shell/browser/ui/inspectable_web_contents_view.h
index aa0d194b7589c..11e9d84474702 100644
--- a/shell/browser/ui/inspectable_web_contents_view.h
+++ b/shell/browser/ui/inspectable_web_contents_view.h
@@ -33,7 +33,7 @@ class InspectableWebContentsView {
   }
   InspectableWebContentsViewDelegate* GetDelegate() const { return delegate_; }
 
-#if defined(TOOLKIT_VIEWS) && !defined(OS_MAC)
+#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
   // Returns the container control, which has devtools view attached.
   virtual views::View* GetView() = 0;
 
diff --git a/shell/browser/ui/inspectable_web_contents_view_delegate.h b/shell/browser/ui/inspectable_web_contents_view_delegate.h
index e8155d25577c6..21a8e6daf2b16 100644
--- a/shell/browser/ui/inspectable_web_contents_view_delegate.h
+++ b/shell/browser/ui/inspectable_web_contents_view_delegate.h
@@ -24,7 +24,7 @@ class InspectableWebContentsViewDelegate {
   // Returns the icon of devtools window.
   virtual ui::ImageModel GetDevToolsWindowIcon();
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Called when creating devtools window.
   virtual void GetDevToolsWindowWMClass(std::string* name,
                                         std::string* class_name) {}
diff --git a/shell/browser/ui/tray_icon.h b/shell/browser/ui/tray_icon.h
index ff7040aa64426..6654c69ac35b6 100644
--- a/shell/browser/ui/tray_icon.h
+++ b/shell/browser/ui/tray_icon.h
@@ -20,7 +20,7 @@ class TrayIcon {
  public:
   static TrayIcon* Create(absl::optional<UUID> guid);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   using ImageType = HICON;
 #else
   using ImageType = const gfx::Image&;
@@ -44,7 +44,7 @@ class TrayIcon {
   // status icon (e.g. Ubuntu Unity).
   virtual void SetToolTip(const std::string& tool_tip) = 0;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Set/Get flag determining whether to ignore double click events.
   virtual void SetIgnoreDoubleClickEvents(bool ignore) = 0;
   virtual bool GetIgnoreDoubleClickEvents() = 0;
@@ -63,7 +63,7 @@ class TrayIcon {
 
   struct BalloonOptions {
     IconType icon_type = IconType::kCustom;
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     HICON icon = nullptr;
 #else
     gfx::Image icon;
diff --git a/shell/browser/ui/views/autofill_popup_view.cc b/shell/browser/ui/views/autofill_popup_view.cc
index f6e15a82c068b..8cd73243d254b 100644
--- a/shell/browser/ui/views/autofill_popup_view.cc
+++ b/shell/browser/ui/views/autofill_popup_view.cc
@@ -305,7 +305,7 @@ void AutofillPopupView::OnMouseExited(const ui::MouseEvent& event) {
 void AutofillPopupView::OnMouseMoved(const ui::MouseEvent& event) {
   // A synthesized mouse move will be sent when the popup is first shown.
   // Don't preview a suggestion if the mouse happens to be hovering there.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (base::Time::Now() - show_time_ <= base::Milliseconds(50))
     return;
 #else
diff --git a/shell/browser/ui/views/electron_views_delegate.cc b/shell/browser/ui/views/electron_views_delegate.cc
index 140c22b1d5c94..6f7859f2246fc 100644
--- a/shell/browser/ui/views/electron_views_delegate.cc
+++ b/shell/browser/ui/views/electron_views_delegate.cc
@@ -9,7 +9,7 @@
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ -17,7 +17,7 @@
 
 namespace {
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 bool IsDesktopEnvironmentUnity() {
   auto env = base::Environment::Create();
   base::nix::DesktopEnvironment desktop_env =
@@ -53,7 +53,7 @@ void ViewsDelegate::NotifyMenuItemFocused(const std::u16string& menu_name,
                                           int item_count,
                                           bool has_submenu) {}
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
   return nullptr;
 }
@@ -85,7 +85,7 @@ void ViewsDelegate::OnBeforeWidgetInit(
 }
 
 bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // On Ubuntu Unity, the system always provides a title bar for maximized
   // windows.
   if (!maximized)
diff --git a/shell/browser/ui/views/electron_views_delegate.h b/shell/browser/ui/views/electron_views_delegate.h
index 67b3561734640..a92cf1ec3d574 100644
--- a/shell/browser/ui/views/electron_views_delegate.h
+++ b/shell/browser/ui/views/electron_views_delegate.h
@@ -39,13 +39,13 @@ class ViewsDelegate : public views::ViewsDelegate {
                              int item_count,
                              bool has_submenu) override;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HICON GetDefaultWindowIcon() const override;
   HICON GetSmallWindowIcon() const override;
   bool IsWindowInMetro(gfx::NativeWindow window) const override;
   int GetAppbarAutohideEdges(HMONITOR monitor,
                              base::OnceClosure callback) override;
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
   gfx::ImageSkia* GetDefaultWindowIcon() const override;
 #endif
   std::unique_ptr<views::NonClientFrameView> CreateDefaultNonClientFrameView(
@@ -58,7 +58,7 @@ class ViewsDelegate : public views::ViewsDelegate {
   bool WindowManagerProvidesTitleBar(bool maximized) override;
 
  private:
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   using AppbarAutohideEdgeMap = std::map<HMONITOR, int>;
 
   // Callback on main thread with the edges. |returned_edges| is the value that
diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.cc b/shell/browser/ui/views/inspectable_web_contents_view_views.cc
index b6b8ebd8185bd..35a32fd505158 100644
--- a/shell/browser/ui/views/inspectable_web_contents_view_views.cc
+++ b/shell/browser/ui/views/inspectable_web_contents_view_views.cc
@@ -184,7 +184,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool docked, bool activate) {
     params.delegate = devtools_window_delegate_;
     params.bounds = inspectable_web_contents()->GetDevToolsBounds();
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
     params.wm_role_name = "devtools";
     if (GetDelegate())
       GetDelegate()->GetDevToolsWindowWMClass(&params.wm_class_name,
diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index 6d2b471445c38..829eed6a5dbf1 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -12,11 +12,11 @@
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 #include "ui/gtk/gtk_util.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/gfx/color_utils.h"
 #endif
 
@@ -209,7 +209,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& event) {
 
 void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
   if (theme) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
     background_color_ = gtk::GetBgColor("GtkMenuBar#menubar");
     enabled_color_ =
         gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
@@ -241,7 +241,7 @@ void MenuBar::UpdateViewColors() {
   // set child colors
   if (menu_model_ == nullptr)
     return;
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   const auto& textColor =
       window_->IsFocused() ? enabled_color_ : disabled_color_;
   for (auto* child : GetChildrenInZOrder()) {
@@ -252,7 +252,7 @@ void MenuBar::UpdateViewColors() {
     button->SetTextColor(views::Button::STATE_HOVERED, textColor);
     button->SetUnderlineColor(textColor);
   }
-#elif defined(OS_WIN)
+#elif BUILDFLAG(IS_WIN)
   for (auto* child : GetChildrenInZOrder()) {
     auto* button = static_cast<SubmenuButton*>(child);
     button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
diff --git a/shell/browser/ui/views/menu_bar.h b/shell/browser/ui/views/menu_bar.h
index 359609145c71b..4ef178538a6ca 100644
--- a/shell/browser/ui/views/menu_bar.h
+++ b/shell/browser/ui/views/menu_bar.h
@@ -79,7 +79,7 @@ class MenuBar : public views::AccessiblePaneView,
   View* FindAccelChild(char16_t key);
 
   SkColor background_color_;
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   SkColor enabled_color_;
   SkColor disabled_color_;
 #endif
diff --git a/shell/browser/ui/views/root_view.cc b/shell/browser/ui/views/root_view.cc
index 64728f55a6c07..eb452faadfe39 100644
--- a/shell/browser/ui/views/root_view.cc
+++ b/shell/browser/ui/views/root_view.cc
@@ -15,7 +15,7 @@ namespace electron {
 namespace {
 
 // The menu bar height in pixels.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 const int kMenuBarHeight = 20;
 #else
 const int kMenuBarHeight = 25;
diff --git a/shell/browser/ui/views/submenu_button.cc b/shell/browser/ui/views/submenu_button.cc
index 7aec6f173d16d..2f8c4b63c09b1 100644
--- a/shell/browser/ui/views/submenu_button.cc
+++ b/shell/browser/ui/views/submenu_button.cc
@@ -22,7 +22,7 @@ SubmenuButton::SubmenuButton(PressedCallback callback,
                              const SkColor& background_color)
     : views::MenuButton(callback, gfx::RemoveAccelerator(title)),
       background_color_(background_color) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Dont' use native style border.
   SetBorder(CreateDefaultBorder());
 #endif
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index 2fdadf960c3c1..e54772a0bfce2 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -32,7 +32,7 @@
 #include "third_party/blink/public/mojom/v8_cache_options.mojom.h"
 #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/gfx/switches.h"
 #endif
 
@@ -165,7 +165,7 @@ void WebContentsPreferences::Clear() {
   preload_path_ = absl::nullopt;
   v8_cache_options_ = blink::mojom::V8CacheOptions::kDefault;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   scroll_bounce_ = false;
 #endif
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
@@ -276,7 +276,7 @@ void WebContentsPreferences::Merge(
 
   web_preferences.Get("v8CacheOptions", &v8_cache_options_);
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   web_preferences.Get(options::kScrollBounce, &scroll_bounce_);
 #endif
 
@@ -369,7 +369,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
     command_line->AppendSwitch(::switches::kNoZygote);
   }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Enable scroll bounce.
   if (scroll_bounce_)
     command_line->AppendSwitch(switches::kScrollBounce);
diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h
index 58da686541879..912540ac0aad0 100644
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -133,7 +133,7 @@ class WebContentsPreferences
   absl::optional<base::FilePath> preload_path_;
   blink::mojom::V8CacheOptions v8_cache_options_;
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   bool scroll_bounce_;
 #endif
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
diff --git a/shell/browser/window_list.cc b/shell/browser/window_list.cc
index 9d39f678f8477..45f166cb0bd86 100644
--- a/shell/browser/window_list.cc
+++ b/shell/browser/window_list.cc
@@ -94,7 +94,7 @@ void WindowList::RemoveObserver(WindowListObserver* observer) {
 void WindowList::CloseAllWindows() {
   std::vector<base::WeakPtr<NativeWindow>> weak_windows =
       ConvertToWeakPtrVector(GetInstance()->windows_);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   std::reverse(weak_windows.begin(), weak_windows.end());
 #endif
   for (const auto& window : weak_windows) {
diff --git a/shell/browser/zoom_level_delegate.cc b/shell/browser/zoom_level_delegate.cc
index 148e2ff3a2e66..bbe8ce0daee38 100644
--- a/shell/browser/zoom_level_delegate.cc
+++ b/shell/browser/zoom_level_delegate.cc
@@ -58,14 +58,14 @@ void ZoomLevelDelegate::SetDefaultZoomLevelPref(double level) {
     return;
 
   DictionaryPrefUpdate update(pref_service_, kPartitionDefaultZoomLevel);
-  update->SetDouble(partition_key_, level);
+  update->SetDoubleKey(partition_key_, level);
   host_zoom_map_->SetDefaultZoomLevel(level);
 }
 
 double ZoomLevelDelegate::GetDefaultZoomLevelPref() const {
   double default_zoom_level = 0.0;
 
-  const base::DictionaryValue* default_zoom_level_dictionary =
+  const base::Value* default_zoom_level_dictionary =
       pref_service_->GetDictionary(kPartitionDefaultZoomLevel);
   // If no default has been previously set, the default returned is the
   // value used to initialize default_zoom_level in this function.
@@ -84,17 +84,18 @@ void ZoomLevelDelegate::OnZoomLevelChanged(
 
   double level = change.zoom_level;
   DictionaryPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
-  base::DictionaryValue* host_zoom_dictionaries = update.Get();
+  base::Value* host_zoom_dictionaries = update.Get();
   DCHECK(host_zoom_dictionaries);
 
   bool modification_is_removal =
       blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
 
-  base::DictionaryValue* host_zoom_dictionary = nullptr;
-  if (!host_zoom_dictionaries->GetDictionary(partition_key_,
-                                             &host_zoom_dictionary)) {
-    host_zoom_dictionary = host_zoom_dictionaries->SetDictionary(
-        partition_key_, std::make_unique<base::DictionaryValue>());
+  base::Value* host_zoom_dictionary =
+      host_zoom_dictionaries->FindDictKey(partition_key_);
+  if (!host_zoom_dictionary) {
+    host_zoom_dictionaries->SetKey(partition_key_,
+                                   base::Value(base::Value::Type::DICTIONARY));
+    host_zoom_dictionary = host_zoom_dictionaries->FindDictKey(partition_key_);
   }
 
   if (modification_is_removal)
@@ -133,12 +134,13 @@ void ZoomLevelDelegate::ExtractPerHostZoomLevels(
   // have an empty host.
   {
     DictionaryPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
-    base::DictionaryValue* host_zoom_dictionaries = update.Get();
-    base::DictionaryValue* sanitized_host_zoom_dictionary = nullptr;
-    host_zoom_dictionaries->GetDictionary(partition_key_,
-                                          &sanitized_host_zoom_dictionary);
-    for (const std::string& s : keys_to_remove)
-      sanitized_host_zoom_dictionary->RemoveKey(s);
+    base::Value* host_zoom_dictionaries = update.Get();
+    base::Value* sanitized_host_zoom_dictionary =
+        host_zoom_dictionaries->FindDictKey(partition_key_);
+    if (sanitized_host_zoom_dictionary) {
+      for (const std::string& s : keys_to_remove)
+        sanitized_host_zoom_dictionary->RemoveKey(s);
+    }
   }
 }
 
@@ -153,15 +155,16 @@ void ZoomLevelDelegate::InitHostZoomMap(content::HostZoomMap* host_zoom_map) {
 
   // Initialize the HostZoomMap with per-host zoom levels from the persisted
   // zoom-level preference values.
-  const base::DictionaryValue* host_zoom_dictionaries =
+  const base::Value* host_zoom_dictionaries =
       pref_service_->GetDictionary(kPartitionPerHostZoomLevels);
-  const base::DictionaryValue* host_zoom_dictionary = nullptr;
-  if (host_zoom_dictionaries->GetDictionary(partition_key_,
-                                            &host_zoom_dictionary)) {
+  const base::Value* host_zoom_dictionary =
+      host_zoom_dictionaries->FindDictKey(partition_key_);
+  if (host_zoom_dictionary) {
     // Since we're calling this before setting up zoom_subscription_ below we
     // don't need to worry that host_zoom_dictionary is indirectly affected
-    // by calls to HostZoomMap::SetZoomLevelForHost().
-    ExtractPerHostZoomLevels(host_zoom_dictionary);
+    // by calls to HostZoomMap::SExtractPerHostZoomLevelsetZoomLevelForHost().
+    ExtractPerHostZoomLevels(
+        &base::Value::AsDictionaryValue(*host_zoom_dictionary));
   }
   zoom_subscription_ =
       host_zoom_map_->AddZoomLevelChangedCallback(base::BindRepeating(
diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc
index a4e90885fb9c3..a130d0eb39a43 100644
--- a/shell/common/api/electron_api_clipboard.cc
+++ b/shell/common/api/electron_api_clipboard.cc
@@ -56,7 +56,7 @@ std::string Clipboard::Read(const std::string& format_string) {
       ui::ClipboardFormatType::CustomPlatformType(format_string));
   bool rawFormatAvailable = clipboard->IsFormatAvailable(
       rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr);
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (!rawFormatAvailable) {
     rawFormatAvailable = clipboard->IsFormatAvailable(
         rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr);
@@ -72,7 +72,7 @@ std::string Clipboard::Read(const std::string& format_string) {
   custom_format_names =
       clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
                                             /* data_dst = */ nullptr);
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (custom_format_names.find(format_string) == custom_format_names.end()) {
     custom_format_names =
         clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,
@@ -150,7 +150,7 @@ std::u16string Clipboard::ReadText(gin_helper::Arguments* args) {
                                    type, /* data_dst = */ nullptr)) {
     clipboard->ReadText(type, /* data_dst = */ nullptr, &data);
   } else {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::PlainTextAType(),
                                      type,
                                      /* data_dst = */ nullptr)) {
@@ -249,7 +249,7 @@ void Clipboard::WriteImage(const gfx::Image& image,
   }
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 void Clipboard::WriteFindText(const std::u16string& text) {}
 std::u16string Clipboard::ReadFindText() {
   return std::u16string();
diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index eb2006ca33349..3543a13585509 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -42,7 +42,7 @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_util.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "shell/common/asar/archive.h"
 #include "ui/gfx/icon_util.h"
@@ -78,14 +78,14 @@ base::FilePath NormalizePath(const base::FilePath& path) {
   }
 }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool IsTemplateFilename(const base::FilePath& path) {
   return (base::MatchPattern(path.value(), "*Template.*") ||
           base::MatchPattern(path.value(), "*Template@*x.*"));
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
   // If file is in asar archive, we extract it to a temp file so LoadImage can
   // load it.
@@ -112,7 +112,7 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
   AdjustAmountOfExternalAllocatedMemory(true);
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
     : hicon_path_(hicon_path), isolate_(isolate) {
   // Use the 256x256 icon as fallback icon.
@@ -149,7 +149,7 @@ bool NativeImage::TryConvertNativeImage(v8::Isolate* isolate,
   if (gin::ConvertFromV8(isolate, image, &icon_path)) {
     *native_image = NativeImage::CreateFromPath(isolate, icon_path).get();
     if ((*native_image)->image().IsEmpty()) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       const auto img_path = base::WideToUTF8(icon_path.value());
 #else
       const auto img_path = icon_path.value();
@@ -178,7 +178,7 @@ bool NativeImage::TryConvertNativeImage(v8::Isolate* isolate,
   return true;
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 HICON NativeImage::GetHICON(int size) {
   auto iter = hicons_.find(size);
   if (iter != hicons_.end())
@@ -287,7 +287,7 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
 
 v8::Local<v8::Value> NativeImage::GetNativeHandle(
     gin_helper::ErrorThrower thrower) {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (IsEmpty())
     return node::Buffer::New(thrower.isolate(), 0).ToLocalChecked();
 
@@ -416,7 +416,7 @@ void NativeImage::AddRepresentation(const gin_helper::Dictionary& options) {
   }
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 void NativeImage::SetTemplateImage(bool setAsTemplate) {}
 
 bool NativeImage::IsTemplateImage() {
@@ -460,7 +460,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromPath(
     v8::Isolate* isolate,
     const base::FilePath& path) {
   base::FilePath image_path = NormalizePath(path);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (image_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
     return gin::CreateHandle(isolate, new NativeImage(isolate, image_path));
   }
@@ -469,7 +469,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromPath(
   electron::util::PopulateImageSkiaRepsFromPath(&image_skia, image_path);
   gfx::Image image(image_skia);
   gin::Handle<NativeImage> handle = Create(isolate, image);
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (IsTemplateFilename(image_path))
     handle->SetTemplateImage(true);
 #endif
@@ -566,7 +566,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromDataURL(v8::Isolate* isolate,
   return CreateEmpty(isolate);
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 gin::Handle<NativeImage> NativeImage::CreateFromNamedImage(gin::Arguments* args,
                                                            std::string name) {
   return CreateEmpty(args->isolate());
@@ -637,7 +637,7 @@ void Initialize(v8::Local<v8::Object> exports,
   native_image.SetMethod("createFromDataURL", &NativeImage::CreateFromDataURL);
   native_image.SetMethod("createFromNamedImage",
                          &NativeImage::CreateFromNamedImage);
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
   native_image.SetMethod("createThumbnailFromPath",
                          &NativeImage::CreateThumbnailFromPath);
 #endif
diff --git a/shell/common/api/electron_api_native_image.h b/shell/common/api/electron_api_native_image.h
index 11bfd45ee7631..a322631f9cfe2 100644
--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -15,7 +15,7 @@
 #include "shell/common/gin_helper/error_thrower.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/files/file_path.h"
 #include "base/win/scoped_gdi_object.h"
 #endif
@@ -46,7 +46,7 @@ namespace api {
 class NativeImage : public gin::Wrappable<NativeImage> {
  public:
   NativeImage(v8::Isolate* isolate, const gfx::Image& image);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path);
 #endif
   ~NativeImage() override;
@@ -78,7 +78,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
                                                     const GURL& url);
   static gin::Handle<NativeImage> CreateFromNamedImage(gin::Arguments* args,
                                                        std::string name);
-#if !defined(OS_LINUX)
+#if !BUILDFLAG(IS_LINUX)
   static v8::Local<v8::Promise> CreateThumbnailFromPath(
       v8::Isolate* isolate,
       const base::FilePath& path,
@@ -99,7 +99,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
       v8::Isolate* isolate) override;
   const char* GetTypeName() override;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   HICON GetHICON(int size);
 #endif
 
@@ -128,7 +128,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
   // Determine if the image is a template image.
   bool IsTemplateImage();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   base::FilePath hicon_path_;
   std::map<int, base::win::ScopedHICON> hicons_;
 #endif
diff --git a/shell/common/api/electron_api_shell.cc b/shell/common/api/electron_api_shell.cc
index a6222f7f7e024..20fd7929ee540 100644
--- a/shell/common/api/electron_api_shell.cc
+++ b/shell/common/api/electron_api_shell.cc
@@ -14,7 +14,7 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/platform_util.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/shortcut.h"
 
@@ -29,11 +29,11 @@ struct Converter<base::win::ShortcutOperation> {
     if (!ConvertFromV8(isolate, val, &operation))
       return false;
     if (operation.empty() || operation == "create")
-      *out = base::win::SHORTCUT_CREATE_ALWAYS;
+      *out = base::win::ShortcutOperation::kCreateAlways;
     else if (operation == "update")
-      *out = base::win::SHORTCUT_UPDATE_EXISTING;
+      *out = base::win::ShortcutOperation::kUpdateExisting;
     else if (operation == "replace")
-      *out = base::win::SHORTCUT_REPLACE_EXISTING;
+      *out = base::win::ShortcutOperation::kReplaceExisting;
     else
       return false;
     return true;
@@ -104,10 +104,11 @@ v8::Local<v8::Promise> TrashItem(v8::Isolate* isolate,
   return handle;
 }
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool WriteShortcutLink(const base::FilePath& shortcut_path,
                        gin_helper::Arguments* args) {
-  base::win::ShortcutOperation operation = base::win::SHORTCUT_CREATE_ALWAYS;
+  base::win::ShortcutOperation operation =
+      base::win::ShortcutOperation::kCreateAlways;
   args->GetNext(&operation);
   gin::Dictionary options = gin::Dictionary::CreateEmpty(args->isolate());
   if (!args->GetNext(&options)) {
@@ -173,7 +174,7 @@ void Initialize(v8::Local<v8::Object> exports,
   dict.SetMethod("openExternal", &OpenExternal);
   dict.SetMethod("trashItem", &TrashItem);
   dict.SetMethod("beep", &platform_util::Beep);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   dict.SetMethod("writeShortcutLink", &WriteShortcutLink);
   dict.SetMethod("readShortcutLink", &ReadShortcutLink);
 #endif
diff --git a/shell/common/api/electron_bindings.cc b/shell/common/api/electron_bindings.cc
index 7beff0572347a..50509dec3401a 100644
--- a/shell/common/api/electron_bindings.cc
+++ b/shell/common/api/electron_bindings.cc
@@ -65,7 +65,7 @@ void ElectronBindings::BindProcess(v8::Isolate* isolate,
   process->SetReadOnly("mas", true);
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (IsRunningInDesktopBridge())
     process->SetReadOnly("windowsStore", true);
 #endif
@@ -77,7 +77,7 @@ void ElectronBindings::BindTo(v8::Isolate* isolate,
   BindProcess(isolate, &dict, metrics_.get());
 
   dict.SetMethod("takeHeapSnapshot", &TakeHeapSnapshot);
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   dict.SetMethod("setFdLimit", &base::IncreaseFdLimitTo);
 #endif
   dict.SetMethod("activateUvLoop",
@@ -190,7 +190,7 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
 
   // See Chromium's "base/process/process_metrics.h" for an explanation.
   int free =
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       mem_info.avail_phys;
 #else
       mem_info.free;
@@ -198,7 +198,7 @@ v8::Local<v8::Value> ElectronBindings::GetSystemMemoryInfo(
   dict.Set("free", free);
 
   // NB: These return bogus values on macOS
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
   dict.Set("swapTotal", mem_info.swap_total);
   dict.Set("swapFree", mem_info.swap_free);
 #endif
@@ -267,7 +267,7 @@ void ElectronBindings::DidReceiveMemoryDump(
     if (target_pid == dump.pid()) {
       gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
       const auto& osdump = dump.os_dump();
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
       dict.Set("residentSet", osdump.resident_set_kb);
 #endif
       dict.Set("private", osdump.private_footprint_kb);
@@ -295,7 +295,7 @@ v8::Local<v8::Value> ElectronBindings::GetCPUUsage(
 
   // NB: This will throw NOTIMPLEMENTED() on Windows
   // For backwards compatibility, we'll return 0
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   dict.Set("idleWakeupsPerSecond", metrics->GetIdleWakeupsPerSecond());
 #else
   dict.Set("idleWakeupsPerSecond", 0);
diff --git a/shell/common/application_info.h b/shell/common/application_info.h
index 95482bb6768a2..f541e88c17a95 100644
--- a/shell/common/application_info.h
+++ b/shell/common/application_info.h
@@ -5,7 +5,9 @@
 #ifndef ELECTRON_SHELL_COMMON_APPLICATION_INFO_H_
 #define ELECTRON_SHELL_COMMON_APPLICATION_INFO_H_
 
-#if defined(OS_WIN)
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_WIN)
 #include "shell/browser/win/scoped_hstring.h"
 #endif
 
@@ -23,7 +25,7 @@ std::string GetApplicationVersion();
 // Returns the user agent of Electron.
 std::string GetApplicationUserAgent();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 PCWSTR GetRawAppUserModelID();
 bool GetAppUserModelID(ScopedHString* app_id);
 void SetAppUserModelID(const std::wstring& name);
diff --git a/shell/common/asar/archive.cc b/shell/common/asar/archive.cc
index c6f0b1c2a607e..411ba5d61e80c 100644
--- a/shell/common/asar/archive.cc
+++ b/shell/common/asar/archive.cc
@@ -22,7 +22,7 @@
 #include "shell/common/asar/asar_util.h"
 #include "shell/common/asar/scoped_temporary_file.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <io.h>
 #endif
 
@@ -30,7 +30,7 @@ namespace asar {
 
 namespace {
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 const char kSeparators[] = "\\/";
 #else
 const char kSeparators[] = "/";
@@ -124,7 +124,7 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
     info->executable = executable.value();
   }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   if (load_integrity &&
       electron::fuses::IsEmbeddedAsarIntegrityValidationEnabled()) {
     if (auto* integrity = node->FindDictKey("integrity")) {
@@ -178,15 +178,15 @@ Archive::Archive(const base::FilePath& path)
     : initialized_(false), path_(path), file_(base::File::FILE_OK) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   file_.Initialize(path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   fd_ = _open_osfhandle(reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0);
-#elif defined(OS_POSIX)
+#elif BUILDFLAG(IS_POSIX)
   fd_ = file_.GetPlatformFile();
 #endif
 }
 
 Archive::~Archive() {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   if (fd_ != -1) {
     _close(fd_);
     // Don't close the handle since we already closed the fd.
@@ -247,7 +247,7 @@ bool Archive::Init() {
     return false;
   }
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   // Validate header signature if required and possible
   if (electron::fuses::IsEmbeddedAsarIntegrityValidationEnabled() &&
       RelativePath().has_value()) {
@@ -285,7 +285,7 @@ bool Archive::Init() {
   return true;
 }
 
-#if !defined(OS_MAC)
+#if !BUILDFLAG(IS_MAC)
 absl::optional<IntegrityPayload> Archive::HeaderIntegrity() const {
   return absl::nullopt;
 }
@@ -400,7 +400,7 @@ bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
                                info.integrity))
     return false;
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
   if (info.executable) {
     // chmod a+x temp_file;
     base::SetPosixFilePermissions(temp_file->path(), 0755);
diff --git a/shell/common/asar/asar_util.cc b/shell/common/asar/asar_util.cc
index 1eaf8f88063e9..f74e9e9ea6e5c 100644
--- a/shell/common/asar/asar_util.cc
+++ b/shell/common/asar/asar_util.cc
@@ -71,7 +71,7 @@ std::shared_ptr<Archive> GetOrCreateAsarArchive(const base::FilePath& path) {
   // if we can create it, return it
   auto archive = std::make_shared<Archive>(path);
   if (archive->Init()) {
-    base::TryEmplace(map, lower, path, archive);
+    map.try_emplace(lower, path, archive);
     return archive;
   }
 
diff --git a/shell/common/asar/scoped_temporary_file.cc b/shell/common/asar/scoped_temporary_file.cc
index 283a534e855eb..a3152cf73b7c6 100644
--- a/shell/common/asar/scoped_temporary_file.cc
+++ b/shell/common/asar/scoped_temporary_file.cc
@@ -21,7 +21,7 @@ ScopedTemporaryFile::~ScopedTemporaryFile() {
     // On Windows it is very likely the file is already in use (because it is
     // mostly used for Node native modules), so deleting it now will halt the
     // program.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     base::DeleteFileAfterReboot(path_);
 #else
     base::DeleteFile(path_);
@@ -37,7 +37,7 @@ bool ScopedTemporaryFile::Init(const base::FilePath::StringType& ext) {
   if (!base::CreateTemporaryFile(&path_))
     return false;
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Keep the original extension.
   if (!ext.empty()) {
     base::FilePath new_path = path_.AddExtension(ext);
diff --git a/shell/common/crash_keys.cc b/shell/common/crash_keys.cc
index 326477559e70c..16e11125b21e5 100644
--- a/shell/common/crash_keys.cc
+++ b/shell/common/crash_keys.cc
@@ -29,7 +29,7 @@ namespace crash_keys {
 
 namespace {
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 // Breakpad has a flawed system of calculating the number of chunks
 // we add 127 bytes to force an extra chunk
 constexpr size_t kMaxCrashKeyValueSize = 20479;
@@ -55,7 +55,7 @@ std::deque<std::string>& GetExtraCrashKeyNames() {
 }  // namespace
 
 constexpr uint32_t kMaxCrashKeyNameLength = 40;
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 static_assert(kMaxCrashKeyNameLength <=
                   crash_reporter::internal::kCrashKeyStorageKeySize,
               "max crash key name length above what breakpad supports");
@@ -124,7 +124,7 @@ bool IsRunningAsNode() {
 }  // namespace
 
 void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   if (command_line.HasSwitch(switches::kGlobalCrashKeys)) {
     std::vector<std::pair<std::string, std::string>> global_crash_keys;
     base::SplitStringIntoKeyValuePairs(
@@ -156,11 +156,11 @@ void SetPlatformCrashKey() {
   // TODO(nornagon): this is redundant with the 'plat' key that
   // //components/crash already includes. Remove it.
   static crash_reporter::CrashKeyString<8> platform_key("platform");
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   platform_key.Set("win32");
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   platform_key.Set("darwin");
-#elif defined(OS_LINUX)
+#elif BUILDFLAG(IS_LINUX)
   platform_key.Set("linux");
 #else
   platform_key.Set("unknown");
diff --git a/shell/common/electron_command_line.cc b/shell/common/electron_command_line.cc
index 765c199b92be4..bc50114cdbacb 100644
--- a/shell/common/electron_command_line.cc
+++ b/shell/common/electron_command_line.cc
@@ -18,7 +18,7 @@ void ElectronCommandLine::Init(int argc, base::CommandLine::CharType** argv) {
 
   // NOTE: uv_setup_args does nothing on Windows, so we don't need to call it.
   // Otherwise we'd have to convert the arguments from UTF16.
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   // Hack around with the argv pointer. Used for process.title = "blah"
   argv = uv_setup_args(argc, argv);
 #endif
@@ -26,7 +26,7 @@ void ElectronCommandLine::Init(int argc, base::CommandLine::CharType** argv) {
   argv_.assign(argv, argv + argc);
 }
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 // static
 void ElectronCommandLine::InitializeFromCommandLine() {
   argv_ = base::CommandLine::ForCurrentProcess()->argv();
diff --git a/shell/common/electron_command_line.h b/shell/common/electron_command_line.h
index 32f09608f2899..b6c910016be84 100644
--- a/shell/common/electron_command_line.h
+++ b/shell/common/electron_command_line.h
@@ -22,7 +22,7 @@ class ElectronCommandLine {
 
   static void Init(int argc, base::CommandLine::CharType** argv);
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // On Linux the command line has to be read from base::CommandLine since
   // it is using zygote.
   static void InitializeFromCommandLine();
diff --git a/shell/common/electron_paths.h b/shell/common/electron_paths.h
index 438f49d2b846c..6854e97d6ae48 100644
--- a/shell/common/electron_paths.h
+++ b/shell/common/electron_paths.h
@@ -7,13 +7,13 @@
 
 #include "base/base_paths.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/base_paths_win.h"
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
 #include "base/base_paths_mac.h"
 #endif
 
-#if defined(OS_POSIX)
+#if BUILDFLAG(IS_POSIX)
 #include "base/base_paths_posix.h"
 #endif
 
@@ -25,11 +25,11 @@ enum {
   DIR_USER_CACHE = PATH_START,  // Directory where user cache can be written.
   DIR_APP_LOGS,                 // Directory where app logs live
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   DIR_RECENT,  // Directory where recent files live
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   DIR_APP_DATA,  // Application Data directory under the user profile.
 #endif
 
@@ -37,9 +37,9 @@ enum {
 
   PATH_END,  // End of new paths. Those that follow redirect to base::DIR_*
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   DIR_APP_DATA = base::DIR_ROAMING_APP_DATA,
-#elif defined(OS_MAC)
+#elif BUILDFLAG(IS_MAC)
   DIR_APP_DATA = base::DIR_APP_DATA,
 #endif
 };
diff --git a/shell/common/extensions/api/BUILD.gn b/shell/common/extensions/api/BUILD.gn
index b3d656841158e..778486e2e0202 100644
--- a/shell/common/extensions/api/BUILD.gn
+++ b/shell/common/extensions/api/BUILD.gn
@@ -38,7 +38,6 @@ generated_json_strings("generated_api_json_strings") {
   sources = [
     "cryptotoken_private.idl",
     "extension.json",
-    "i18n.json",
     "resources_private.idl",
     "tabs.json",
   ]
@@ -56,7 +55,6 @@ generated_json_strings("generated_api_json_strings") {
 generated_types("generated_api_types") {
   sources = [
     "cryptotoken_private.idl",
-    "i18n.json",
     "resources_private.idl",
     "tabs.json",
   ]
diff --git a/shell/common/extensions/electron_extensions_client.cc b/shell/common/extensions/electron_extensions_client.cc
index 54fab425b0c53..c2f9a573701ce 100644
--- a/shell/common/extensions/electron_extensions_client.cc
+++ b/shell/common/extensions/electron_extensions_client.cc
@@ -131,7 +131,7 @@ const GURL& ElectronExtensionsClient::GetWebstoreUpdateURL() const {
   return webstore_update_url_;
 }
 
-bool ElectronExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
+bool ElectronExtensionsClient::IsBlocklistUpdateURL(const GURL& url) const {
   return false;
 }
 
diff --git a/shell/common/extensions/electron_extensions_client.h b/shell/common/extensions/electron_extensions_client.h
index ebc05b0ed0893..c69a875b5dcb7 100644
--- a/shell/common/extensions/electron_extensions_client.h
+++ b/shell/common/extensions/electron_extensions_client.h
@@ -51,7 +51,7 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient {
   bool IsScriptableURL(const GURL& url, std::string* error) const override;
   const GURL& GetWebstoreBaseURL() const override;
   const GURL& GetWebstoreUpdateURL() const override;
-  bool IsBlacklistUpdateURL(const GURL& url) const override;
+  bool IsBlocklistUpdateURL(const GURL& url) const override;
 
  private:
   ScriptingAllowlist scripting_allowlist_;
diff --git a/shell/common/gin_converters/base_converter.h b/shell/common/gin_converters/base_converter.h
index f44c64941e0ff..fa86334f3de18 100644
--- a/shell/common/gin_converters/base_converter.h
+++ b/shell/common/gin_converters/base_converter.h
@@ -29,7 +29,7 @@ struct Converter<base::TerminationStatus> {
         return gin::ConvertToV8(isolate, "launch-failed");
       case base::TERMINATION_STATUS_OOM:
         return gin::ConvertToV8(isolate, "oom");
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
       case base::TERMINATION_STATUS_INTEGRITY_FAILURE:
         return gin::ConvertToV8(isolate, "integrity-failure");
 #endif
diff --git a/shell/common/gin_converters/guid_converter.h b/shell/common/gin_converters/guid_converter.h
index 592dab149a62c..ec18678fa2c6d 100644
--- a/shell/common/gin_converters/guid_converter.h
+++ b/shell/common/gin_converters/guid_converter.h
@@ -9,7 +9,7 @@
 
 #include "gin/converter.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 // c.f.:
 // https://chromium-review.googlesource.com/c/chromium/src/+/3076480
 // REFGUID is currently incorrectly inheriting its type
@@ -27,7 +27,7 @@
 #include "base/win/win_util.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 typedef GUID UUID;
 #else
 typedef struct {
@@ -41,7 +41,7 @@ struct Converter<UUID> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      UUID* out) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     std::string guid;
     if (!gin::ConvertFromV8(isolate, val, &guid))
       return false;
@@ -67,7 +67,7 @@ struct Converter<UUID> {
 #endif
   }
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, UUID val) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     const GUID GUID_NULL = {};
     if (val == GUID_NULL) {
       return StringToV8(isolate, "");
diff --git a/shell/common/gin_converters/std_converter.h b/shell/common/gin_converters/std_converter.h
index 23e44e856ce35..bc52e9ca8239b 100644
--- a/shell/common/gin_converters/std_converter.h
+++ b/shell/common/gin_converters/std_converter.h
@@ -11,7 +11,7 @@
 
 #include "gin/converter.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "base/strings/string_util_win.h"
 #endif
 
@@ -24,7 +24,7 @@ v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate, T&& input) {
       isolate, std::forward<T>(input));
 }
 
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+#if !BUILDFLAG(IS_LINUX) && !defined(OS_FREEBSD)
 template <>
 struct Converter<unsigned long> {  // NOLINT(runtime/int)
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
@@ -186,7 +186,7 @@ struct Converter<std::map<K, V>> {
   }
 };
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 template <>
 struct Converter<std::wstring> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
diff --git a/shell/common/gin_helper/callback.h b/shell/common/gin_helper/callback.h
index a00fa5b541424..5f40f57c78c94 100644
--- a/shell/common/gin_helper/callback.h
+++ b/shell/common/gin_helper/callback.h
@@ -50,7 +50,7 @@ struct V8FunctionInvoker<v8::Local<v8::Value>(ArgTypes...)> {
       return v8::Null(isolate);
     gin_helper::MicrotasksScope microtasks_scope(isolate, true);
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
-    v8::Local<v8::Context> context = holder->CreationContext();
+    v8::Local<v8::Context> context = holder->GetCreationContextChecked();
     v8::Context::Scope context_scope(context);
     std::vector<v8::Local<v8::Value>> args{
         gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};
@@ -74,7 +74,7 @@ struct V8FunctionInvoker<void(ArgTypes...)> {
       return;
     gin_helper::MicrotasksScope microtasks_scope(isolate, true);
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
-    v8::Local<v8::Context> context = holder->CreationContext();
+    v8::Local<v8::Context> context = holder->GetCreationContextChecked();
     v8::Context::Scope context_scope(context);
     std::vector<v8::Local<v8::Value>> args{
         gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};
@@ -97,7 +97,7 @@ struct V8FunctionInvoker<ReturnType(ArgTypes...)> {
       return ret;
     gin_helper::MicrotasksScope microtasks_scope(isolate, true);
     v8::Local<v8::Function> holder = function.NewHandle(isolate);
-    v8::Local<v8::Context> context = holder->CreationContext();
+    v8::Local<v8::Context> context = holder->GetCreationContextChecked();
     v8::Context::Scope context_scope(context);
     std::vector<v8::Local<v8::Value>> args{
         gin::ConvertToV8(isolate, std::forward<ArgTypes>(raw))...};
diff --git a/shell/common/keyboard_util.cc b/shell/common/keyboard_util.cc
index 1bc2d665c6c49..6116e1811925b 100644
--- a/shell/common/keyboard_util.cc
+++ b/shell/common/keyboard_util.cc
@@ -25,7 +25,7 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(
              str == "meta") {
     return ui::VKEY_COMMAND;
   } else if (str == "commandorcontrol" || str == "cmdorctrl") {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
     return ui::VKEY_COMMAND;
 #else
     return ui::VKEY_CONTROL;
@@ -210,108 +210,108 @@ ui::KeyboardCode KeyboardCodeFromCharCode(char16_t c, bool* shifted) {
 
     case ')':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '0':
       return ui::VKEY_0;
     case '!':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '1':
       return ui::VKEY_1;
     case '@':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '2':
       return ui::VKEY_2;
     case '#':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '3':
       return ui::VKEY_3;
     case '$':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '4':
       return ui::VKEY_4;
     case '%':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '5':
       return ui::VKEY_5;
     case '^':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '6':
       return ui::VKEY_6;
     case '&':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '7':
       return ui::VKEY_7;
     case '*':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '8':
       return ui::VKEY_8;
     case '(':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '9':
       return ui::VKEY_9;
 
     case ':':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case ';':
       return ui::VKEY_OEM_1;
     case '+':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '=':
       return ui::VKEY_OEM_PLUS;
     case '<':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case ',':
       return ui::VKEY_OEM_COMMA;
     case '_':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '-':
       return ui::VKEY_OEM_MINUS;
     case '>':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '.':
       return ui::VKEY_OEM_PERIOD;
     case '?':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '/':
       return ui::VKEY_OEM_2;
     case '~':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '`':
       return ui::VKEY_OEM_3;
     case '{':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '[':
       return ui::VKEY_OEM_4;
     case '|':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '\\':
       return ui::VKEY_OEM_5;
     case '}':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case ']':
       return ui::VKEY_OEM_6;
     case '"':
       *shifted = true;
-      FALLTHROUGH;
+      [[fallthrough]];
     case '\'':
       return ui::VKEY_OEM_7;
 
diff --git a/shell/common/logging.cc b/shell/common/logging.cc
index d69c4a77febd4..a74702c7e5a93 100644
--- a/shell/common/logging.cc
+++ b/shell/common/logging.cc
@@ -67,6 +67,15 @@ LoggingDestination DetermineLoggingDestination(
   if (!enable_logging)
     return LOG_NONE;
 
+  bool also_log_to_stderr = false;
+#if !defined(NDEBUG)
+  std::string also_log_to_stderr_str;
+  if (base::Environment::Create()->GetVar("ELECTRON_ALSO_LOG_TO_STDERR",
+                                          &also_log_to_stderr_str) &&
+      !also_log_to_stderr_str.empty())
+    also_log_to_stderr = true;
+#endif
+
   // --enable-logging logs to stderr, --enable-logging=file logs to a file.
   // NB. this differs from Chromium, in which --enable-logging logs to a file
   // and --enable-logging=stderr logs to stderr, because that's how Electron
@@ -82,7 +91,7 @@ LoggingDestination DetermineLoggingDestination(
   // given.
   if (HasExplicitLogFile(command_line) ||
       (logging_destination == "file" && !is_preinit))
-    return LOG_TO_FILE;
+    return LOG_TO_FILE | (also_log_to_stderr ? LOG_TO_STDERR : 0);
   return LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR;
 }
 
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 51c553eaa306a..b29e4bcccd19f 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -221,7 +221,7 @@ void SetNodeCliFlags() {
   args.emplace_back("electron");
 
   for (const auto& arg : argv) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
     const auto& option = base::WideToUTF8(arg);
 #else
     const auto& option = arg;
@@ -301,7 +301,7 @@ namespace electron {
 namespace {
 
 base::FilePath GetResourcesPath() {
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
   return MainApplicationBundlePath().Append("Contents").Append("Resources");
 #else
   auto* command_line = base::CommandLine::ForCurrentProcess();
@@ -367,7 +367,7 @@ void NodeBindings::Initialize() {
   // Open node's error reporting system for browser process.
   node::g_upstream_node_mode = false;
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
   // Get real command line in renderer process forked by zygote.
   if (browser_env_ != BrowserEnvironment::kBrowser)
     ElectronCommandLine::InitializeFromCommandLine();
@@ -396,7 +396,7 @@ void NodeBindings::Initialize() {
   if (exit_code != 0)
     exit(exit_code);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // uv_init overrides error mode to suppress the default crash dialog, bring
   // it back if user wants to show it.
   if (browser_env_ == BrowserEnvironment::kBrowser ||
@@ -410,7 +410,7 @@ void NodeBindings::Initialize() {
 node::Environment* NodeBindings::CreateEnvironment(
     v8::Handle<v8::Context> context,
     node::MultiIsolatePlatform* platform) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto& atom_args = ElectronCommandLine::argv();
   std::vector<std::string> args(atom_args.size());
   std::transform(atom_args.cbegin(), atom_args.cend(), args.begin(),
@@ -574,7 +574,7 @@ void NodeBindings::LoadEnvironment(node::Environment* env) {
 }
 
 void NodeBindings::PrepareMessageLoop() {
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   int handle = uv_backend_fd(uv_loop_);
 
   // If the backend fd hasn't changed, don't proceed.
diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h
index 9789d0b687a65..64519d340b5a1 100644
--- a/shell/common/node_bindings.h
+++ b/shell/common/node_bindings.h
@@ -161,7 +161,7 @@ class NodeBindings {
   // Isolate data used in creating the environment
   node::IsolateData* isolate_data_ = nullptr;
 
-#if !defined(OS_WIN)
+#if !BUILDFLAG(IS_WIN)
   int handle_ = -1;
 #endif
 
diff --git a/shell/common/platform_util.h b/shell/common/platform_util.h
index dd59a212c4fb7..ba8f9652dba29 100644
--- a/shell/common/platform_util.h
+++ b/shell/common/platform_util.h
@@ -42,17 +42,17 @@ void TrashItem(const base::FilePath& full_path,
 
 void Beep();
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 // SHGetFolderPath calls not covered by Chromium
 bool GetFolderPath(int key, base::FilePath* result);
 #endif
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 bool GetLoginItemEnabled();
 bool SetLoginItemEnabled(bool enabled);
 #endif
 
-#if defined(OS_LINUX)
+#if BUILDFLAG(IS_LINUX)
 // Returns a success flag.
 // Unlike libgtkui, does *not* use "chromium-browser.desktop" as a fallback.
 bool GetDesktopName(std::string* setme);
diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc
index 722aee0b17a6e..0d86d7cf1c28a 100644
--- a/shell/common/platform_util_linux.cc
+++ b/shell/common/platform_util_linux.cc
@@ -14,6 +14,7 @@
 #include "base/containers/contains.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/no_destructor.h"
 #include "base/posix/eintr_wrapper.h"
diff --git a/shell/common/skia_util.cc b/shell/common/skia_util.cc
index ad0d8c00c95fa..63f42a13ab41c 100644
--- a/shell/common/skia_util.cc
+++ b/shell/common/skia_util.cc
@@ -23,7 +23,7 @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_util.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "ui/gfx/icon_util.h"
 #endif
 
@@ -151,7 +151,7 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
         image, path.InsertBeforeExtensionASCII(pair.name), pair.scale);
   return succeed;
 }
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
   // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
   SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);
diff --git a/shell/common/skia_util.h b/shell/common/skia_util.h
index 148aa4d34ae14..76830d8443689 100644
--- a/shell/common/skia_util.h
+++ b/shell/common/skia_util.h
@@ -37,7 +37,7 @@ bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
                             size_t size,
                             double scale_factor);
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon);
 #endif
 
diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc
index 598a6e98b0895..f1e93b724e993 100644
--- a/shell/renderer/api/electron_api_context_bridge.cc
+++ b/shell/renderer/api/electron_api_context_bridge.cc
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/feature_list.h"
-#include "base/ignore_result.h"
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
@@ -280,12 +279,12 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
         std::move(global_catch_source_context),
         std::move(global_catch_destination_context));
 
-    ignore_result(source_promise->Then(
+    std::ignore = source_promise->Then(
         source_context,
         gin::ConvertToV8(destination_context->GetIsolate(), std::move(then_cb))
             .As<v8::Function>(),
         gin::ConvertToV8(destination_context->GetIsolate(), std::move(catch_cb))
-            .As<v8::Function>()));
+            .As<v8::Function>());
 
     object_cache->CacheProxiedObject(value, proxied_promise_handle);
     return v8::MaybeLocal<v8::Value>(proxied_promise_handle);
@@ -538,8 +537,8 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
             }
 
             v8::PropertyDescriptor desc(getter_proxy, setter_proxy);
-            ignore_result(proxy.GetHandle()->DefineProperty(
-                destination_context, key.As<v8::Name>(), desc));
+            std::ignore = proxy.GetHandle()->DefineProperty(
+                destination_context, key.As<v8::Name>(), desc);
           }
           continue;
         }
diff --git a/shell/renderer/electron_api_service_impl.cc b/shell/renderer/electron_api_service_impl.cc
index 558588d7c8af8..7c39544973936 100644
--- a/shell/renderer/electron_api_service_impl.cc
+++ b/shell/renderer/electron_api_service_impl.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/environment.h"
-#include "base/ignore_result.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "gin/data_object_builder.h"
@@ -75,7 +74,7 @@ void InvokeIpcCallback(v8::Local<v8::Context> context,
   auto callback_value = ipcNative->Get(context, callback_key).ToLocalChecked();
   DCHECK(callback_value->IsFunction());  // set by init.ts
   auto callback = callback_value.As<v8::Function>();
-  ignore_result(callback->Call(context, ipcNative, args.size(), args.data()));
+  std::ignore = callback->Call(context, ipcNative, args.size(), args.data());
 }
 
 void EmitIPCEvent(v8::Local<v8::Context> context,
diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc
index b83c092aaa12f..c1f1ae7a61c28 100644
--- a/shell/renderer/electron_sandboxed_renderer_client.cc
+++ b/shell/renderer/electron_sandboxed_renderer_client.cc
@@ -4,12 +4,12 @@
 
 #include "shell/renderer/electron_sandboxed_renderer_client.h"
 
+#include <tuple>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/ignore_result.h"
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
 #include "base/process/process_metrics.h"
@@ -124,7 +124,7 @@ void InvokeHiddenCallback(v8::Handle<v8::Context> context,
   auto callback_value = binding->Get(context, callback_key).ToLocalChecked();
   DCHECK(callback_value->IsFunction());  // set by sandboxed_renderer/init.js
   auto callback = callback_value.As<v8::Function>();
-  ignore_result(callback->Call(context, binding, 0, nullptr));
+  std::ignore = callback->Call(context, binding, 0, nullptr);
 }
 
 }  // namespace
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index e0838f1eaf986..2c23069159eb8 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -48,11 +48,11 @@
 #include "third_party/blink/public/web/web_view.h"
 #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"  // nogncheck
 
-#if defined(OS_MAC)
+#if BUILDFLAG(IS_MAC)
 #include "base/strings/sys_string_conversions.h"
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include <shlobj.h>
 #endif
 
@@ -235,7 +235,7 @@ void RendererClientBase::RenderThreadStarted() {
   blink::WebSecurityPolicy::RegisterURLSchemeAsAllowingServiceWorkers("file");
   blink::SchemeRegistry::RegisterURLSchemeAsSupportingFetchAPI("file");
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   // Set ApplicationUserModelID in renderer process.
   std::wstring app_id =
       command_line->GetSwitchValueNative(switches::kAppUserModelId);
diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc
index 6cdcf513103ef..c53e537dad067 100644
--- a/shell/utility/electron_content_utility_client.cc
+++ b/shell/utility/electron_content_utility_client.cc
@@ -17,26 +17,22 @@
 #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
 #include "services/service_manager/public/cpp/service.h"
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h"
 #include "chrome/services/util_win/util_read_icon.h"
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "components/services/print_compositor/print_compositor_impl.h"
 #include "components/services/print_compositor/public/mojom/print_compositor.mojom.h"  // nogncheck
 #endif  // BUILDFLAG(ENABLE_PRINTING)
 
-#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
+#if BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN)
 #include "chrome/services/printing/pdf_to_emf_converter_factory.h"
 #endif
 
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN)
-#include "chrome/utility/printing_handler.h"
-#endif
-
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
-    (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN))
+    (BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN))
 #include "chrome/services/printing/printing_service.h"
 #include "chrome/services/printing/public/mojom/printing_service.mojom.h"
 #endif
@@ -46,14 +42,14 @@ namespace electron {
 namespace {
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
-    (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN))
+    (BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN))
 auto RunPrintingService(
     mojo::PendingReceiver<printing::mojom::PrintingService> receiver) {
   return std::make_unique<printing::PrintingService>(std::move(receiver));
 }
 #endif
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 auto RunWindowsIconReader(
     mojo::PendingReceiver<chrome::mojom::UtilReadIcon> receiver) {
   return std::make_unique<UtilReadIcon>(std::move(receiver));
@@ -78,11 +74,7 @@ auto RunProxyResolver(
 
 }  // namespace
 
-ElectronContentUtilityClient::ElectronContentUtilityClient() {
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN)
-  printing_handler_ = std::make_unique<printing::PrintingHandler>();
-#endif
-}
+ElectronContentUtilityClient::ElectronContentUtilityClient() = default;
 
 ElectronContentUtilityClient::~ElectronContentUtilityClient() = default;
 
@@ -91,7 +83,7 @@ ElectronContentUtilityClient::~ElectronContentUtilityClient() = default;
 // chrome_content_utility_client.cc?sq=package:chromium&dr=CSs&g=0&l=142
 void ElectronContentUtilityClient::ExposeInterfacesToBrowser(
     mojo::BinderMap* binders) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   auto& cmd_line = *base::CommandLine::ForCurrentProcess();
   auto sandbox_type = sandbox::policy::SandboxTypeFromCommandLine(cmd_line);
   utility_process_running_elevated_ =
@@ -101,7 +93,7 @@ void ElectronContentUtilityClient::ExposeInterfacesToBrowser(
   // If our process runs with elevated privileges, only add elevated Mojo
   // interfaces to the BinderMap.
   if (!utility_process_running_elevated_) {
-#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)
+#if BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN)
     binders->Add(
         base::BindRepeating(printing::PdfToEmfConverterFactory::Create),
         base::ThreadTaskRunnerHandle::Get());
@@ -111,7 +103,7 @@ void ElectronContentUtilityClient::ExposeInterfacesToBrowser(
 
 void ElectronContentUtilityClient::RegisterMainThreadServices(
     mojo::ServiceFactory& services) {
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
   services.Add(RunWindowsIconReader);
 #endif
 
@@ -120,7 +112,7 @@ void ElectronContentUtilityClient::RegisterMainThreadServices(
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
-    (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN))
+    (BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN))
   services.Add(RunPrintingService);
 #endif
 }
diff --git a/shell/utility/electron_content_utility_client.h b/shell/utility/electron_content_utility_client.h
index 1c17e5ca0654e..a3f5b87fc7955 100644
--- a/shell/utility/electron_content_utility_client.h
+++ b/shell/utility/electron_content_utility_client.h
@@ -12,10 +12,6 @@
 #include "mojo/public/cpp/bindings/binder_map.h"
 #include "printing/buildflags/buildflags.h"
 
-namespace printing {
-class PrintingHandler;
-}
-
 namespace mojo {
 class ServiceFactory;
 }
@@ -37,10 +33,6 @@ class ElectronContentUtilityClient : public content::ContentUtilityClient {
   void RegisterIOThreadServices(mojo::ServiceFactory& services) override;
 
  private:
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN)
-  std::unique_ptr<printing::PrintingHandler> printing_handler_;
-#endif
-
   // True if the utility process runs with elevated privileges.
   bool utility_process_running_elevated_ = false;
 };
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 9406eddc749b9..f4337d224bdb1 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -1519,7 +1519,7 @@ describe('app module', () => {
     describe('when app.enableSandbox() is called', () => {
       it('adds --enable-sandbox to all renderer processes', done => {
         const appPath = path.join(fixturesPath, 'api', 'mixed-sandbox-app');
-        appProcess = cp.spawn(process.execPath, [appPath, '--app-enable-sandbox']);
+        appProcess = cp.spawn(process.execPath, [appPath, '--app-enable-sandbox'], { stdio: 'inherit' });
 
         server.once('error', error => { done(error); });
 
@@ -1544,7 +1544,7 @@ describe('app module', () => {
     describe('when the app is launched with --enable-sandbox', () => {
       it('adds --enable-sandbox to all renderer processes', done => {
         const appPath = path.join(fixturesPath, 'api', 'mixed-sandbox-app');
-        appProcess = cp.spawn(process.execPath, [appPath, '--enable-sandbox']);
+        appProcess = cp.spawn(process.execPath, [appPath, '--enable-sandbox'], { stdio: 'inherit' });
 
         server.once('error', error => { done(error); });
 
diff --git a/spec-main/api-content-tracing-spec.ts b/spec-main/api-content-tracing-spec.ts
index af9ff01eb8dcc..7f36fc18da9f5 100644
--- a/spec-main/api-content-tracing-spec.ts
+++ b/spec-main/api-content-tracing-spec.ts
@@ -4,8 +4,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { ifdescribe, delay } from './spec-helpers';
 
-// FIXME: The tests are skipped on arm/arm64.
-ifdescribe(!(['arm', 'arm64'].includes(process.arch)))('contentTracing', () => {
+// FIXME: The tests are skipped on arm/arm64 and ia32.
+ifdescribe(!(['arm', 'arm64', 'ia32'].includes(process.arch)))('contentTracing', () => {
   const record = async (options: TraceConfig | TraceCategoriesAndOptions, outputFilePath: string | undefined, recordTimeInMilliseconds = 1e1) => {
     await app.whenReady();
 
diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
index 980c289cb1e7f..4ffaa3e047d68 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec-main/api-protocol-spec.ts
@@ -764,7 +764,10 @@ describe('protocol module', () => {
       await expect(contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.notjs', {scope: './'})`)).to.be.rejected();
     });
 
-    it('should be able to register service worker for custom scheme', async () => {
+    // TODO(nornagon): I'm not sure why this isn't working, but I'm choosing to
+    // disable this test for now to land the roll. See
+    // https://github.com/electron/electron/issues/32664.
+    it.skip('should be able to register service worker for custom scheme', async () => {
       await contents.loadURL(`${serviceWorkerScheme}://${v4()}.com`);
       await contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.js', {scope: './'})`);
     });
diff --git a/spec-main/extensions-spec.ts b/spec-main/extensions-spec.ts
index d3b62f9aa79db..daef4622d8b84 100644
--- a/spec-main/extensions-spec.ts
+++ b/spec-main/extensions-spec.ts
@@ -210,7 +210,7 @@ describe('chrome extensions', () => {
     });
     it('getAcceptLanguages()', async () => {
       const result = await exec('getAcceptLanguages');
-      expect(result).to.be.an('array').and.deep.equal(['en-US']);
+      expect(result).to.be.an('array').and.deep.equal(['en-US', 'en']);
     });
     it('getMessage()', async () => {
       const result = await exec('getMessage');
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 2ded4b0fdedcc..0b649d1bd77ad 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -1083,7 +1083,10 @@ describe('<webview> tag', function () {
     });
   });
 
-  describe('<webview>.capturePage()', () => {
+  // TODO(nornagon): this seems to have become much less reliable as of
+  // https://github.com/electron/electron/pull/32419. Tracked at
+  // https://github.com/electron/electron/issues/32705.
+  describe.skip('<webview>.capturePage()', () => {
     before(function () {
       // TODO(miniak): figure out why this is failing on windows
       if (process.platform === 'win32') {

From cd7dc52c53aab0548df3c47f28ad816ec348edc9 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:00:42 -0800
Subject: [PATCH 024/811] Bump v19.0.0-nightly.20220210

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..1da529c028564 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220210
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..ed6baacd7b44f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220210",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..ac08c5ce7e059 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220210
+ PRODUCTVERSION 19,0,0,20220210
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ceab6a146a8dc6588c4f34719f2e0e069270eabd Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 07:02:10 -0800
Subject: [PATCH 025/811] Revert "Bump v19.0.0-nightly.20220210"

This reverts commit cd7dc52c53aab0548df3c47f28ad816ec348edc9.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1da529c028564..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220210
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index ed6baacd7b44f..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220210",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ac08c5ce7e059..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220210
- PRODUCTVERSION 19,0,0,20220210
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4fa3310887490938d35514522eae09157da88663 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <khammond@slack-corp.com>
Date: Thu, 10 Feb 2022 17:43:14 -0800
Subject: [PATCH 026/811] build: add stack_trace.h to main delegate (#32854)

* build: add stack_trace.h to main delegate

* build: trigger circleci

* build: free up a tiny bit more space

* build: disable use_thin_lto

* fixup build/args/all.gn

Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 .circleci/build_config.yml          | 61 ++++++++++++++---------------
 build/args/all.gn                   |  3 ++
 shell/app/electron_main_delegate.cc |  1 +
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index ff88d9a5188c6..17129a46072e6 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -349,10 +349,10 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         sudo mkdir -p $TMPDIR/del-target
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          # Remount the root volume as writable, don't ask questions plz
-          sudo mount -uw /
-        fi
+
+        # Remount the root volume as writable, don't ask questions plz
+        sudo mount -uw /
+
         tmpify() {
           if [ -d "$1" ]; then
             sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
@@ -394,33 +394,32 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         tmpify /usr/local/Homebrew
         sudo rm -rf $TMPDIR/del-target
 
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          sudo rm -rf "/System/Library/Desktop Pictures"
-          sudo rm -rf /System/Library/Templates/Data
-          sudo rm -rf /System/Library/Speech/Voices
-          sudo rm -rf "/System/Library/Screen Savers"
-          sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
-          sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
-          sudo rm -rf /System/Volumes/Data/Library/Java
-          sudo rm -rf /System/Volumes/Data/Library/Ruby
-          sudo rm -rf /System/Volumes/Data/Library/Printers
-          sudo rm -rf /System/iOSSupport
-          sudo rm -rf /System/Applications/*.app
-          sudo rm -rf /System/Applications/Utilities/*.app
-          sudo rm -rf /System/Library/LinguisticData
-          sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
-          # sudo rm -rf /System/Library/Fonts/*
-          # sudo rm -rf /System/Library/PreferencePanes
-          sudo rm -rf /System/Library/AssetsV2/*
-          sudo rm -rf /Applications/Safari.app
-          sudo rm -rf ~/project/src/build/linux
-          sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
-          sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
-
-          # lipo off some huge binaries arm64 versions to save space
-          strip_arm_deep $(xcode-select -p)/../SharedFrameworks
-          strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
-        fi
+        sudo rm -rf "/System/Library/Desktop Pictures"
+        sudo rm -rf /System/Library/Templates/Data
+        sudo rm -rf /System/Library/Speech/Voices
+        sudo rm -rf "/System/Library/Screen Savers"
+        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
+        sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
+        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/
+        sudo rm -rf /System/Volumes/Data/Library/Java
+        sudo rm -rf /System/Volumes/Data/Library/Ruby
+        sudo rm -rf /System/Volumes/Data/Library/Printers
+        sudo rm -rf /System/iOSSupport
+        sudo rm -rf /System/Applications/*.app
+        sudo rm -rf /System/Applications/Utilities/*.app
+        sudo rm -rf /System/Library/LinguisticData
+        sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
+        # sudo rm -rf /System/Library/Fonts/*
+        # sudo rm -rf /System/Library/PreferencePanes
+        sudo rm -rf /System/Library/AssetsV2/*
+        sudo rm -rf /Applications/Safari.app
+        sudo rm -rf ~/project/src/build/linux
+        sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
+        sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
+
+        # lipo off some huge binaries arm64 versions to save space
+        strip_arm_deep $(xcode-select -p)/../SharedFrameworks
+        strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
 
diff --git a/build/args/all.gn b/build/args/all.gn
index a346a9b3d4939..332a3660fd292 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -35,6 +35,9 @@ enable_pseudolocales = false
 
 is_cfi = false
 
+# This consumes a bit too much disk space on macOS
+use_thin_lto = false
+
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 707e4b90097da..caa13d764c7ba 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -11,6 +11,7 @@
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
+#include "base/debug/stack_trace.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"

From 0a120468c0ce58e71b04febed26d78fc39690852 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 17:46:57 -0800
Subject: [PATCH 027/811] Bump v19.0.0-nightly.20220210

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..1da529c028564 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220210
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..ed6baacd7b44f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220210",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..ac08c5ce7e059 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220210
+ PRODUCTVERSION 19,0,0,20220210
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8dfcf817e4182c48cd7e9d3471319c61224677e3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 20:37:02 -0800
Subject: [PATCH 028/811] Revert "Bump v19.0.0-nightly.20220210"

This reverts commit 0a120468c0ce58e71b04febed26d78fc39690852.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1da529c028564..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220210
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index ed6baacd7b44f..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220210",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ac08c5ce7e059..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220210
- PRODUCTVERSION 19,0,0,20220210
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 96c3179f32b48524dbc457b8a598f89b039b2486 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 05:00:51 -0800
Subject: [PATCH 029/811] Bump v19.0.0-nightly.20220211

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..fccdf9c07054e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220211
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..c3656be6e972b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220211",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..d9d1aa04ccd29 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220211
+ PRODUCTVERSION 19,0,0,20220211
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1e074605dc9327184b5c3e51bd7afe7c38707ac3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 09:47:06 -0800
Subject: [PATCH 030/811] Revert "Bump v19.0.0-nightly.20220211"

This reverts commit 96c3179f32b48524dbc457b8a598f89b039b2486.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index fccdf9c07054e..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220211
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index c3656be6e972b..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220211",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d9d1aa04ccd29..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220211
- PRODUCTVERSION 19,0,0,20220211
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8397bfbd16dc989ba02dee0d4b2bdf73c3f203bf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 05:01:42 -0800
Subject: [PATCH 031/811] Bump v19.0.0-nightly.20220214

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..2f9af87c34232 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220214
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..87ff66a308e2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220214",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..0e60134bab893 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220214
+ PRODUCTVERSION 19,0,0,20220214
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d36524c6401aeb1be6d6b9d7fdd04652c85f7115 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 06:25:11 -0800
Subject: [PATCH 032/811] Revert "Bump v19.0.0-nightly.20220214"

This reverts commit 8397bfbd16dc989ba02dee0d4b2bdf73c3f203bf.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 2f9af87c34232..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220214
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index 87ff66a308e2d..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220214",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 0e60134bab893..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220214
- PRODUCTVERSION 19,0,0,20220214
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 90f17e49455a96d84ce119960f4f9b0e33ce28c2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 05:01:28 -0800
Subject: [PATCH 033/811] Bump v19.0.0-nightly.20220215

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..1cb0501b1199a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220215
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..60c4fc3075bbc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220215",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..a9151e194b383 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220215
+ PRODUCTVERSION 19,0,0,20220215
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 512bb96dcbd085f8f3925350d0e15c2712cc71fa Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 09:36:37 -0800
Subject: [PATCH 034/811] Revert "Bump v19.0.0-nightly.20220215"

This reverts commit 90f17e49455a96d84ce119960f4f9b0e33ce28c2.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cb0501b1199a..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220215
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index 60c4fc3075bbc..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220215",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index a9151e194b383..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220215
- PRODUCTVERSION 19,0,0,20220215
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 600c37160b8811156997d55ab29b2943eb977b7a Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Tue, 15 Feb 2022 13:54:28 -0800
Subject: [PATCH 035/811] docs: fix relative link in developer documentation
 (#32844)

---
 docs/development/pull-requests.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/pull-requests.md b/docs/development/pull-requests.md
index 492b3caa6afd2..fa4b6dfbdf19b 100644
--- a/docs/development/pull-requests.md
+++ b/docs/development/pull-requests.md
@@ -180,7 +180,7 @@ $ git push origin my-branch
 ### Step 9: Opening the Pull Request
 
 From within GitHub, opening a new pull request will present you with a template
-that should be filled out. It can be found [here](../../.github/PULL_REQUEST_TEMPLATE.md).
+that should be filled out. It can be found [here](https://github.com/electron/electron/blob/main/.github/PULL_REQUEST_TEMPLATE.md).
 
 If you do not adequately complete this template, your PR may be delayed in being merged as maintainers
 seek more information or clarify ambiguities.

From c75ec2e689869354c96c811ae9d4bf7daecac2c8 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 16 Feb 2022 05:01:13 -0800
Subject: [PATCH 036/811] Bump v19.0.0-nightly.20220216

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..3683f47661db4 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220216
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..44c49732320cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220216",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..f1d69b7566baa 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220216
+ PRODUCTVERSION 19,0,0,20220216
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From cc0eb7b908344403bb14e9ebdd1422f38701c57f Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 16 Feb 2022 09:47:32 -0800
Subject: [PATCH 037/811] docs: update checklists (#32902)

---
 docs/tutorial/performance.md |  66 ++++----
 docs/tutorial/security.md    | 297 +++++++++++++++++++----------------
 2 files changed, 195 insertions(+), 168 deletions(-)

diff --git a/docs/tutorial/performance.md b/docs/tutorial/performance.md
index 99fefa7a4d460..f1648769ef4f1 100644
--- a/docs/tutorial/performance.md
+++ b/docs/tutorial/performance.md
@@ -1,3 +1,11 @@
+---
+title: Performance
+description: A set of guidelines for building performant Electron apps
+slug: performance
+hide_title: true
+toc_max_heading_level: 3
+---
+
 # Performance
 
 Developers frequently ask about strategies to optimize the performance of
@@ -49,7 +57,7 @@ at once, consider the [Chrome Tracing](https://www.chromium.org/developers/how-t
 * [Get Started With Analyzing Runtime Performance][chrome-devtools-tutorial]
 * [Talk: "Visual Studio Code - The First Second"][vscode-first-second]
 
-## Checklist
+## Checklist: Performance recommendations
 
 Chances are that your app could be a little leaner, faster, and generally less
 resource-hungry if you attempt these steps.
@@ -62,7 +70,7 @@ resource-hungry if you attempt these steps.
 6. [Unnecessary or blocking network requests](#6-unnecessary-or-blocking-network-requests)
 7. [Bundle your code](#7-bundle-your-code)
 
-## 1) Carelessly including modules
+### 1. Carelessly including modules
 
 Before adding a Node.js module to your application, examine said module. How
 many dependencies does that module include? What kind of resources does
@@ -70,7 +78,7 @@ it need to simply be called in a `require()` statement? You might find
 that the module with the most downloads on the NPM package registry or the most stars on GitHub
 is not in fact the leanest or smallest one available.
 
-### Why?
+#### Why?
 
 The reasoning behind this recommendation is best illustrated with a real-world
 example. During the early days of Electron, reliable detection of network
@@ -99,7 +107,7 @@ running Linux might be bad news for your app's performance. In this particular
 example, the correct solution was to use no module at all, and to instead use
 connectivity checks included in later versions of Chromium.
 
-### How?
+#### How?
 
 When considering a module, we recommend that you check:
 
@@ -128,7 +136,7 @@ In this example, on the author's machine, we saw that loading `request` took
 almost half a second, whereas `node-fetch` took dramatically less memory
 and less than 50ms.
 
-## 2) Loading and running code too soon
+### 2. Loading and running code too soon
 
 If you have expensive setup operations, consider deferring those. Inspect all
 the work being executed right after the application starts. Instead of firing
@@ -141,7 +149,7 @@ using the same strategy _and_ are using sizable modules that you do not
 immediately need, apply the same strategy and defer loading to a more
 opportune time.
 
-### Why?
+#### Why?
 
 Loading modules is a surprisingly expensive operation, especially on Windows.
 When your app starts, it should not make users wait for operations that are
@@ -157,14 +165,14 @@ immediately display the file to you without any code highlighting, prioritizing
 your ability to interact with the text. Once it has done that work, it will
 move on to code highlighting.
 
-### How?
+#### How?
 
 Let's consider an example and assume that your application is parsing files
 in the fictitious `.foo` format. In order to do that, it relies on the
 equally fictitious `foo-parser` module. In traditional Node.js development,
 you might write code that eagerly loads dependencies:
 
-```js
+```js title='parser.js'
 const fs = require('fs')
 const fooParser = require('foo-parser')
 
@@ -187,7 +195,7 @@ In the above example, we're doing a lot of work that's being executed as soon
 as the file is loaded. Do we need to get parsed files right away? Could we
 do this work a little later, when `getParsedFiles()` is actually called?
 
-```js
+```js title='parser.js'
 // "fs" is likely already being loaded, so the `require()` call is cheap
 const fs = require('fs')
 
@@ -223,7 +231,7 @@ module.exports = { parser }
 In short, allocate resources "just in time" rather than allocating them all
 when your app starts.
 
-## 3) Blocking the main process
+### 3. Blocking the main process
 
 Electron's main process (sometimes called "browser process") is special: It is
 the parent process to all your app's other processes and the primary process
@@ -235,7 +243,7 @@ Under no circumstances should you block this process and the UI thread with
 long-running operations. Blocking the UI thread means that your entire app
 will freeze until the main process is ready to continue processing.
 
-### Why?
+#### Why?
 
 The main process and its UI thread are essentially the control tower for major
 operations inside your app. When the operating system tells your app about a
@@ -246,31 +254,31 @@ the GPU process about that – once again going through the main process.
 Electron and Chromium are careful to put heavy disk I/O and CPU-bound operations
 onto new threads to avoid blocking the UI thread. You should do the same.
 
-### How?
+#### How?
 
 Electron's powerful multi-process architecture stands ready to assist you with
 your long-running tasks, but also includes a small number of performance traps.
 
-1) For long running CPU-heavy tasks, make use of
+1. For long running CPU-heavy tasks, make use of
 [worker threads][worker-threads], consider moving them to the BrowserWindow, or
 (as a last resort) spawn a dedicated process.
 
-2) Avoid using the synchronous IPC and the `remote` module as much as possible.
-While there are legitimate use cases, it is far too easy to unknowingly block
-the UI thread using the `remote` module.
+2. Avoid using the synchronous IPC and the `@electron/remote` module as much
+as possible. While there are legitimate use cases, it is far too easy to
+unknowingly block the UI thread.
 
-3) Avoid using blocking I/O operations in the main process. In short, whenever
+3. Avoid using blocking I/O operations in the main process. In short, whenever
 core Node.js modules (like `fs` or `child_process`) offer a synchronous or an
 asynchronous version, you should prefer the asynchronous and non-blocking
 variant.
 
-## 4) Blocking the renderer process
+### 4. Blocking the renderer process
 
 Since Electron ships with a current version of Chrome, you can make use of the
 latest and greatest features the Web Platform offers to defer or offload heavy
 operations in a way that keeps your app smooth and responsive.
 
-### Why?
+#### Why?
 
 Your app probably has a lot of JavaScript to run in the renderer process. The
 trick is to execute operations as quickly as possible without taking away
@@ -280,7 +288,7 @@ at 60fps.
 Orchestrating the flow of operations in your renderer's code is
 particularly useful if users complain about your app sometimes "stuttering".
 
-### How?
+#### How?
 
 Generally speaking, all advice for building performant web apps for modern
 browsers apply to Electron's renderers, too. The two primary tools at your
@@ -300,14 +308,14 @@ some caveats to consider – consult Electron's
 for any operation that requires a lot of CPU power for an extended period of
 time.
 
-## 5) Unnecessary polyfills
+### 5. Unnecessary polyfills
 
 One of Electron's great benefits is that you know exactly which engine will
 parse your JavaScript, HTML, and CSS. If you're re-purposing code that was
 written for the web at large, make sure to not polyfill features included in
 Electron.
 
-### Why?
+#### Why?
 
 When building a web application for today's Internet, the oldest environments
 dictate what features you can and cannot use. Even though Electron supports
@@ -323,7 +331,7 @@ It is rare for a JavaScript-based polyfill to be faster than the equivalent
 native feature in Electron. Do not slow down your Electron app by shipping your
 own version of standard web platform features.
 
-### How?
+#### How?
 
 Operate under the assumption that polyfills in current versions of Electron
 are unnecessary. If you have doubts, check [caniuse.com](https://caniuse.com/)
@@ -338,12 +346,12 @@ If you're using a transpiler/compiler like TypeScript, examine its configuration
 and ensure that you're targeting the latest ECMAScript version supported by
 Electron.
 
-## 6) Unnecessary or blocking network requests
+### 6. Unnecessary or blocking network requests
 
 Avoid fetching rarely changing resources from the internet if they could easily
 be bundled with your application.
 
-### Why?
+#### Why?
 
 Many users of Electron start with an entirely web-based app that they're
 turning into a desktop application. As web developers, we are used to loading
@@ -360,7 +368,7 @@ will take care of the rest.
 When building an Electron app, your users are better served if you download
 the fonts and include them in your app's bundle.
 
-### How?
+#### How?
 
 In an ideal world, your application wouldn't need the network to operate at
 all. To get there, you must understand what resources your app is downloading
@@ -387,21 +395,21 @@ without shipping an application update is a powerful strategy. For advanced
 control over how resources are being loaded, consider investing in
 [Service Workers][service-workers].
 
-## 7) Bundle your code
+### 7. Bundle your code
 
 As already pointed out in
 "[Loading and running code too soon](#2-loading-and-running-code-too-soon)",
 calling `require()` is an expensive operation. If you are able to do so,
 bundle your application's code into a single file.
 
-### Why?
+#### Why?
 
 Modern JavaScript development usually involves many files and modules. While
 that's perfectly fine for developing with Electron, we heavily recommend that
 you bundle all your code into one single file to ensure that the overhead
 included in calling `require()` is only paid once when your application loads.
 
-### How?
+#### How?
 
 There are numerous JavaScript bundlers out there and we know better than to
 anger the community by recommending one tool over another. We do however
diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index 1fd876827bd40..688dda5a68961 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -1,6 +1,24 @@
-# Security, Native Capabilities, and Your Responsibility
+---
+title: Security
+description: A set of guidelines for building secure Electron apps
+slug: security
+hide_title: true
+toc_max_heading_level: 3
+---
+# Security
+
+:::info Reporting security issues
+For information on how to properly disclose an Electron vulnerability,
+see [SECURITY.md](https://github.com/electron/electron/tree/main/SECURITY.md).
+
+For upstream Chromium vulnerabilities: Electron keeps up to date with alternating
+Chromium releases. For more information, see the
+[Electron Release Timelines](../tutorial/electron-timelines.md) document.
+:::
+
+## Preface
 
-As web developers, we usually enjoy the strong security net of the browser -
+As web developers, we usually enjoy the strong security net of the browser —
 the risks associated with the code we write are relatively small. Our websites
 are granted limited powers in a sandbox, and we trust that our users enjoy a
 browser built by a large team of engineers that is able to quickly respond to
@@ -17,20 +35,12 @@ With that in mind, be aware that displaying arbitrary content from untrusted
 sources poses a severe security risk that Electron is not intended to handle.
 In fact, the most popular Electron apps (Atom, Slack, Visual Studio Code, etc)
 display primarily local content (or trusted, secure remote content without Node
-integration) – if your application executes code from an online source, it is
+integration) — if your application executes code from an online source, it is
 your responsibility to ensure that the code is not malicious.
 
-## Reporting Security Issues
-
-For information on how to properly disclose an Electron vulnerability,
-see [SECURITY.md](https://github.com/electron/electron/tree/main/SECURITY.md)
-
-## Chromium Security Issues and Upgrades
+## General guidelines
 
-Electron keeps up to date with alternating Chromium releases. For more information,
-see the [Electron Release Cadence blog post](https://electronjs.org/blog/12-week-cadence).
-
-## Security Is Everyone's Responsibility
+### Security is everyone's responsibility
 
 It is important to remember that the security of your Electron application is
 the result of the overall security of the framework foundation
@@ -56,7 +66,7 @@ is your own code. Common web vulnerabilities, such as Cross-Site Scripting (XSS)
 have a higher security impact on Electron applications hence it is highly recommended
 to adopt secure software development best practices and perform security testing.
 
-## Isolation For Untrusted Content
+### Isolation for untrusted content
 
 A security issue exists whenever you receive code from an untrusted source (e.g.
 a remote server) and execute it locally. As an example, consider a remote
@@ -65,72 +75,74 @@ an attacker somehow manages to change said content (either by attacking the
 source directly, or by sitting between your app and the actual destination), they
 will be able to execute native code on the user's machine.
 
-> :warning: Under no circumstances should you load and execute remote code with
+:::warning
+Under no circumstances should you load and execute remote code with
 Node.js integration enabled. Instead, use only local files (packaged together
 with your application) to execute Node.js code. To display remote content, use
 the [`<webview>`][webview-tag] tag or [`BrowserView`][browser-view], make sure
 to disable the `nodeIntegration` and enable `contextIsolation`.
+:::
 
-## Electron Security Warnings
-
-From Electron 2.0 on, developers will see warnings and recommendations printed
-to the developer console. They only show up when the binary's name is Electron,
-indicating that a developer is currently looking at the console.
+:::info Electron security warnings
+Security warnings and recommendations are printed to the developer console.
+They only show up when the binary's name is Electron, indicating that a developer
+is currently looking at the console.
 
 You can force-enable or force-disable these warnings by setting
 `ELECTRON_ENABLE_SECURITY_WARNINGS` or `ELECTRON_DISABLE_SECURITY_WARNINGS` on
 either `process.env` or the `window` object.
+:::
 
-## Checklist: Security Recommendations
+## Checklist: Security recommendations
 
 You should at least follow these steps to improve the security of your application:
 
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
 3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
-4. [Enable sandboxing](#4-enable-sandboxing)
+4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
 7. [Define a `Content-Security-Policy`](#7-define-a-content-security-policy) and use restrictive rules (i.e. `script-src 'self'`)
-8. [Do not set `allowRunningInsecureContent` to `true`](#8-do-not-set-allowrunninginsecurecontent-to-true)
+8. [Do not enable `allowRunningInsecureContent`](#8-do-not-enable-allowrunninginsecurecontent)
 9. [Do not enable experimental features](#9-do-not-enable-experimental-features)
 10. [Do not use `enableBlinkFeatures`](#10-do-not-use-enableblinkfeatures)
-11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups)
+11. [`<webview>`: Do not use `allowpopups`](#11-do-not-use-allowpopups-for-webviews)
 12. [`<webview>`: Verify options and params](#12-verify-webview-options-before-creation)
 13. [Disable or limit navigation](#13-disable-or-limit-navigation)
 14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
-15. [Do not use `openExternal` with untrusted content](#15-do-not-use-openexternal-with-untrusted-content)
+15. [Do not use `shell.openExternal` with untrusted content](#15-do-not-use-shellopenexternal-with-untrusted-content)
 16. [Use a current version of Electron](#16-use-a-current-version-of-electron)
 
 To automate the detection of misconfigurations and insecure patterns, it is
 possible to use
-[electronegativity](https://github.com/doyensec/electronegativity). For
+[Electronegativity](https://github.com/doyensec/electronegativity). For
 additional details on potential weaknesses and implementation bugs when
 developing applications using Electron, please refer to this [guide for
-developers and auditors](https://doyensec.com/resources/us-17-Carettoni-Electronegativity-A-Study-Of-Electron-Security-wp.pdf)
+developers and auditors](https://doyensec.com/resources/us-17-Carettoni-Electronegativity-A-Study-Of-Electron-Security-wp.pdf).
 
-## 1) Only Load Secure Content
+### 1. Only load secure content
 
 Any resources not included with your application should be loaded using a
 secure protocol like `HTTPS`. In other words, do not use insecure protocols
 like `HTTP`. Similarly, we recommend the use of `WSS` over `WS`, `FTPS` over
 `FTP`, and so on.
 
-### Why?
+#### Why?
 
 `HTTPS` has three main benefits:
 
-1) It authenticates the remote server, ensuring your app connects to the correct
+1. It authenticates the remote server, ensuring your app connects to the correct
    host instead of an impersonator.
-2) It ensures data integrity, asserting that the data was not modified while in
+1. It ensures data integrity, asserting that the data was not modified while in
    transit between your application and the host.
-3) It encrypts the traffic between your user and the destination host, making it
+1. It encrypts the traffic between your user and the destination host, making it
    more difficult to eavesdrop on the information sent between your app and
    the host.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 browserWindow.loadURL('http://example.com')
 
@@ -138,7 +150,7 @@ browserWindow.loadURL('http://example.com')
 browserWindow.loadURL('https://example.com')
 ```
 
-```html
+```html title='index.html (Renderer Process)'
 <!-- Bad -->
 <script crossorigin src="http://example.com/react.js"></script>
 <link rel="stylesheet" href="http://example.com/style.css">
@@ -148,9 +160,11 @@ browserWindow.loadURL('https://example.com')
 <link rel="stylesheet" href="https://example.com/style.css">
 ```
 
-## 2) Do not enable Node.js Integration for Remote Content
+### 2. Do not enable Node.js integration for remote content
 
-_This recommendation is the default behavior in Electron since 5.0.0._
+:::info
+This recommendation is the default behavior in Electron since 5.0.0.
+:::
 
 It is paramount that you do not enable Node.js integration in any renderer
 ([`BrowserWindow`][browser-window], [`BrowserView`][browser-view], or
@@ -163,7 +177,7 @@ After this, you can grant additional permissions for specific hosts. For example
 if you are opening a BrowserWindow pointed at `https://example.com/`, you can
 give that website exactly the abilities it needs, but no more.
 
-### Why?
+#### Why?
 
 A cross-site-scripting (XSS) attack is more dangerous if an attacker can jump
 out of the renderer process and execute code on the user's computer.
@@ -172,12 +186,13 @@ power is usually limited to messing with the website that they are executed on.
 Disabling Node.js integration helps prevent an XSS from being escalated into a
 so-called "Remote Code Execution" (RCE) attack.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 const mainWindow = new BrowserWindow({
   webPreferences: {
+    contextIsolation: false,
     nodeIntegration: true,
     nodeIntegrationInWorker: true
   }
@@ -186,7 +201,7 @@ const mainWindow = new BrowserWindow({
 mainWindow.loadURL('https://example.com')
 ```
 
-```js
+```js title='main.js (Main Process)'
 // Good
 const mainWindow = new BrowserWindow({
   webPreferences: {
@@ -197,7 +212,7 @@ const mainWindow = new BrowserWindow({
 mainWindow.loadURL('https://example.com')
 ```
 
-```html
+```html title='index.html (Renderer Process)'
 <!-- Bad -->
 <webview nodeIntegration src="page.html"></webview>
 
@@ -208,21 +223,13 @@ mainWindow.loadURL('https://example.com')
 When disabling Node.js integration, you can still expose APIs to your website that
 do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
-API to remotely loaded content.
-
-In the following example preload script, the later loaded website will have
-access to a `window.readConfig()` method, but no Node.js features.
+API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).
 
-```js
-const { readFileSync } = require('fs')
-
-window.readConfig = () => {
-  const data = readFileSync('./config.json')
-  return data
-}
-```
+### 3. Enable Context Isolation for remote content
 
-## 3) Enable Context Isolation for Remote Content
+:::info
+This recommendation is the default behavior in Electron since 12.0.0.
+:::
 
 Context isolation is an Electron feature that allows developers to run code
 in preload scripts and in Electron APIs in a dedicated JavaScript context. In
@@ -235,48 +242,42 @@ to enable this behavior.
 Even when `nodeIntegration: false` is used, to truly enforce strong isolation
 and prevent the use of Node primitives `contextIsolation` **must** also be used.
 
-### Why & How?
-
+:::info
 For more information on what `contextIsolation` is and how to enable it please
 see our dedicated [Context Isolation](context-isolation.md) document.
+:::info
 
-## 4) Enable Sandboxing
+### 4. Enable process sandboxing
 
-[Sandboxing](sandbox.md) is a Chromium feature that uses the operating system to
+[Sandboxing](https://chromium.googlesource.com/chromium/src/+/HEAD/docs/design/sandbox.md)
+is a Chromium feature that uses the operating system to
 significantly limit what renderer processes have access to. You should enable
 the sandbox in all renderers. Loading, reading or processing any untrusted
 content in an unsandboxed process, including the main process, is not advised.
 
-### How?
-
-When creating a window, pass the `sandbox: true` option in `webPreferences`:
-
-```js
-const win = new BrowserWindow({
-  webPreferences: {
-    sandbox: true
-  }
-})
-```
+:::info
+For more information on what `contextIsolation` is and how to enable it please
+see our dedicated [Process Sandboxing](sandbox.md) document.
+:::info
 
-## 5) Handle Session Permission Requests From Remote Content
+### 5. Handle session permission requests from remote content
 
-You may have seen permission requests while using Chrome: They pop up whenever
+You may have seen permission requests while using Chrome: they pop up whenever
 the website attempts to use a feature that the user has to manually approve (
 like notifications).
 
 The API is based on the [Chromium permissions API](https://developer.chrome.com/extensions/permissions)
 and implements the same types of permissions.
 
-### Why?
+#### Why?
 
 By default, Electron will automatically approve all permission requests unless
 the developer has manually configured a custom handler. While a solid default,
 security-conscious developers might want to assume the very opposite.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 const { session } = require('electron')
 
 session
@@ -297,9 +298,11 @@ session
   })
 ```
 
-## 6) Do Not Disable WebSecurity
+### 6. Do not disable `webSecurity`
 
-_Recommendation is Electron's default_
+:::info
+This recommendation is Electron's default.
+:::
 
 You may have already guessed that disabling the `webSecurity` property on a
 renderer process ([`BrowserWindow`][browser-window],
@@ -308,15 +311,15 @@ security features.
 
 Do not disable `webSecurity` in production applications.
 
-### Why?
+#### Why?
 
 Disabling `webSecurity` will disable the same-origin policy and set
 `allowRunningInsecureContent` property to `true`. In other words, it allows
 the execution of insecure code from different domains.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 const mainWindow = new BrowserWindow({
   webPreferences: {
@@ -325,12 +328,12 @@ const mainWindow = new BrowserWindow({
 })
 ```
 
-```js
+```js title='main.js (Main Process)'
 // Good
 const mainWindow = new BrowserWindow()
 ```
 
-```html
+```html title='index.html (Renderer Process)'
 <!-- Bad -->
 <webview disablewebsecurity src="page.html"></webview>
 
@@ -338,13 +341,13 @@ const mainWindow = new BrowserWindow()
 <webview src="page.html"></webview>
 ```
 
-## 7) Define a Content Security Policy
+### 7. Define a Content Security Policy
 
 A Content Security Policy (CSP) is an additional layer of protection against
 cross-site-scripting attacks and data injection attacks. We recommend that they
 be enabled by any website you load inside Electron.
 
-### Why?
+#### Why?
 
 CSP allows the server serving content to restrict and control the resources
 Electron can load for that given web page. `https://example.com` should
@@ -352,6 +355,8 @@ be allowed to load scripts from the origins you defined while scripts from
 `https://evil.attacker.com` should not be allowed to run. Defining a CSP is an
 easy way to improve your application's security.
 
+#### How?
+
 The following CSP will allow Electron to execute scripts from the current
 website and from `apis.example.com`.
 
@@ -363,14 +368,14 @@ Content-Security-Policy: '*'
 Content-Security-Policy: script-src 'self' https://apis.example.com
 ```
 
-### CSP HTTP Header
+#### CSP HTTP headers
 
 Electron respects the [`Content-Security-Policy` HTTP header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy)
 which can be set using Electron's
 [`webRequest.onHeadersReceived`](../api/web-request.md#webrequestonheadersreceivedfilter-listener)
 handler:
 
-```javascript
+```javascript title='main.js (Main Process)'
 const { session } = require('electron')
 
 session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
@@ -383,20 +388,22 @@ session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
 })
 ```
 
-### CSP Meta Tag
+#### CSP meta tag
 
-CSP's preferred delivery mechanism is an HTTP header, however it is not possible
+CSP's preferred delivery mechanism is an HTTP header. However, it is not possible
 to use this method when loading a resource using the `file://` protocol. It can
-be useful in some cases, such as using the `file://` protocol, to set a policy
-on a page directly in the markup using a `<meta>` tag:
+be useful in some cases to set a policy on a page directly in the markup using a
+`<meta>` tag:
 
-```html
+```html title='index.html (Renderer Process)'
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'">
 ```
 
-## 8) Do Not Set `allowRunningInsecureContent` to `true`
+### 8. Do not enable `allowRunningInsecureContent`
 
-_Recommendation is Electron's default_
+:::info
+This recommendation is Electron's default.
+:::
 
 By default, Electron will not allow websites loaded over `HTTPS` to load and
 execute scripts, CSS, or plugins from insecure sources (`HTTP`). Setting the
@@ -405,15 +412,15 @@ property `allowRunningInsecureContent` to `true` disables that protection.
 Loading the initial HTML of a website over `HTTPS` and attempting to load
 subsequent resources via `HTTP` is also known as "mixed content".
 
-### Why?
+#### Why?
 
 Loading content over `HTTPS` assures the authenticity and integrity
 of the loaded resources while encrypting the traffic itself. See the section on
 [only displaying secure content](#1-only-load-secure-content) for more details.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 const mainWindow = new BrowserWindow({
   webPreferences: {
@@ -422,19 +429,21 @@ const mainWindow = new BrowserWindow({
 })
 ```
 
-```js
+```js title='main.js (Main Process)'
 // Good
 const mainWindow = new BrowserWindow({})
 ```
 
-## 9) Do Not Enable Experimental Features
+### 9. Do not enable experimental features
 
-_Recommendation is Electron's default_
+:::info
+This recommendation is Electron's default.
+:::
 
 Advanced users of Electron can enable experimental Chromium features using the
 `experimentalFeatures` property.
 
-### Why?
+#### Why?
 
 Experimental features are, as the name suggests, experimental and have not been
 enabled for all Chromium users. Furthermore, their impact on Electron as a whole
@@ -443,9 +452,9 @@ has likely not been tested.
 Legitimate use cases exist, but unless you know what you are doing, you should
 not enable this property.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 const mainWindow = new BrowserWindow({
   webPreferences: {
@@ -454,20 +463,22 @@ const mainWindow = new BrowserWindow({
 })
 ```
 
-```js
+```js title='main.js (Main Process)'
 // Good
 const mainWindow = new BrowserWindow({})
 ```
 
-## 10) Do Not Use `enableBlinkFeatures`
+### 10. Do not use `enableBlinkFeatures`
 
-_Recommendation is Electron's default_
+:::info
+This recommendation is Electron's default.
+:::
 
 Blink is the name of the rendering engine behind Chromium. As with
 `experimentalFeatures`, the `enableBlinkFeatures` property allows developers to
 enable features that have been disabled by default.
 
-### Why?
+#### Why?
 
 Generally speaking, there are likely good reasons if a feature was not enabled
 by default. Legitimate use cases for enabling specific features exist. As a
@@ -475,9 +486,9 @@ developer, you should know exactly why you need to enable a feature, what the
 ramifications are, and how it impacts the security of your application. Under
 no circumstances should you enable features speculatively.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 // Bad
 const mainWindow = new BrowserWindow({
   webPreferences: {
@@ -486,14 +497,16 @@ const mainWindow = new BrowserWindow({
 })
 ```
 
-```js
+```js title='main.js (Main Process)'
 // Good
 const mainWindow = new BrowserWindow()
 ```
 
-## 11) Do Not Use `allowpopups`
+### 11. Do not use `allowpopups` for WebViews
 
-_Recommendation is Electron's default_
+:::info
+This recommendation is Electron's default.
+:::
 
 If you are using [`<webview>`][webview-tag], you might need the pages and scripts
 loaded in your `<webview>` tag to open new windows. The `allowpopups` attribute
@@ -501,16 +514,16 @@ enables them to create new [`BrowserWindows`][browser-window] using the
 `window.open()` method. `<webview>` tags are otherwise not allowed to create new
 windows.
 
-### Why?
+#### Why?
 
 If you do not need popups, you are better off not allowing the creation of
 new [`BrowserWindows`][browser-window] by default. This follows the principle
 of minimally required access: Don't let a website create new popups unless
 you know it needs that feature.
 
-### How?
+#### How?
 
-```html
+```html title='index.html (Renderer Process)'
 <!-- Bad -->
 <webview allowpopups src="page.html"></webview>
 
@@ -518,7 +531,7 @@ you know it needs that feature.
 <webview src="page.html"></webview>
 ```
 
-## 12) Verify WebView Options Before Creation
+### 12. Verify WebView options before creation
 
 A WebView created in a renderer process that does not have Node.js integration
 enabled will not be able to enable integration itself. However, a WebView will
@@ -528,7 +541,7 @@ It is a good idea to control the creation of new [`<webview>`][webview-tag] tags
 from the main process and to verify that their webPreferences do not disable
 security features.
 
-### Why?
+#### Why?
 
 Since `<webview>` live in the DOM, they can be created by a script running on your
 website even if Node.js integration is otherwise disabled.
@@ -538,13 +551,13 @@ a renderer process. In most cases, developers do not need to disable any of
 those features - and you should therefore not allow different configurations
 for newly created [`<webview>`][webview-tag] tags.
 
-### How?
+#### How?
 
 Before a [`<webview>`][webview-tag] tag is attached, Electron will fire the
 `will-attach-webview` event on the hosting `webContents`. Use the event to
 prevent the creation of `webViews` with possibly insecure options.
 
-```js
+```js title='main.js (Main Process)'
 app.on('web-contents-created', (event, contents) => {
   contents.on('will-attach-webview', (event, webPreferences, params) => {
     // Strip away preload scripts if unused or verify their location is legitimate
@@ -562,16 +575,16 @@ app.on('web-contents-created', (event, contents) => {
 })
 ```
 
-Again, this list merely minimizes the risk, it does not remove it. If your goal
+Again, this list merely minimizes the risk, but does not remove it. If your goal
 is to display a website, a browser will be a more secure option.
 
-## 13) Disable or limit navigation
+### 13. Disable or limit navigation
 
 If your app has no need to navigate or only needs to navigate to known pages,
 it is a good idea to limit navigation outright to that known scope, disallowing
 any other kinds of navigation.
 
-### Why?
+#### Why?
 
 Navigation is a common attack vector. If an attacker can convince your app to
 navigate away from its current page, they can possibly force your app to open
@@ -584,7 +597,7 @@ A common attack pattern is that the attacker convinces your app's users to
 interact with the app in such a way that it navigates to one of the attacker's
 pages. This is usually done via links, plugins, or other user-generated content.
 
-### How?
+#### How?
 
 If your app has no need for navigation, you can call `event.preventDefault()`
 in a [`will-navigate`][will-navigate] handler. If you know which pages your app
@@ -595,7 +608,7 @@ We recommend that you use Node's parser for URLs. Simple string comparisons can
 sometimes be fooled - a `startsWith('https://example.com')` test would let
 `https://example.com.attacker.com` through.
 
-```js
+```js title='main.js (Main Process)'
 const URL = require('url').URL
 
 app.on('web-contents-created', (event, contents) => {
@@ -609,12 +622,12 @@ app.on('web-contents-created', (event, contents) => {
 })
 ```
 
-## 14) Disable or limit creation of new windows
+### 14. Disable or limit creation of new windows
 
 If you have a known set of windows, it's a good idea to limit the creation of
 additional windows in your app.
 
-### Why?
+#### Why?
 
 Much like navigation, the creation of new `webContents` is a common attack
 vector. Attackers attempt to convince your app to create new windows, frames,
@@ -627,7 +640,7 @@ security at no cost. This is commonly the case for apps that open one
 `BrowserWindow` and do not need to open an arbitrary number of additional
 windows at runtime.
 
-### How?
+#### How?
 
 [`webContents`][web-contents] will delegate to its [window open
 handler][window-open-handler] before creating new windows. The handler will
@@ -635,7 +648,7 @@ receive, amongst other parameters, the `url` the window was requested to open
 and the options used to create it. We recommend that you register a handler to
 monitor the creation of windows, and deny any unexpected window creation.
 
-```js
+```js title='main.js (Main Process)'
 const { shell } = require('electron')
 
 app.on('web-contents-created', (event, contents) => {
@@ -656,40 +669,40 @@ app.on('web-contents-created', (event, contents) => {
 })
 ```
 
-## 15) Do not use `openExternal` with untrusted content
+### 15. Do not use `shell.openExternal` with untrusted content
 
-Shell's [`openExternal`][open-external] allows opening a given protocol URI with
-the desktop's native utilities. On macOS, for instance, this function is similar
-to the `open` terminal command utility and will open the specific application
-based on the URI and filetype association.
+The shell module's [`openExternal`][open-external] API allows opening a given
+protocol URI with the desktop's native utilities. On macOS, for instance, this
+function is similar to the `open` terminal command utility and will open the
+specific application based on the URI and filetype association.
 
-### Why?
+#### Why?
 
 Improper use of [`openExternal`][open-external] can be leveraged to compromise
 the user's host. When openExternal is used with untrusted content, it can be
 leveraged to execute arbitrary commands.
 
-### How?
+#### How?
 
-```js
+```js title='main.js (Main Process)'
 //  Bad
 const { shell } = require('electron')
 shell.openExternal(USER_CONTROLLED_DATA_HERE)
 ```
 
-```js
+```js title='main.js (Main Process)'
 //  Good
 const { shell } = require('electron')
 shell.openExternal('https://example.com/index.html')
 ```
 
-## 16) Use a current version of Electron
+### 16. Use a current version of Electron
 
 You should strive for always using the latest available version of Electron.
 Whenever a new major version is released, you should attempt to update your
 app as quickly as possible.
 
-### Why?
+#### Why?
 
 An application built with an older version of Electron, Chromium, and Node.js
 is an easier target than an application that is using more recent versions of
@@ -705,6 +718,13 @@ to fix issues before publishing them. Your application will be more secure if
 it is running a recent version of Electron (and thus, Chromium and Node.js) for
 which potential security issues are not as widely known.
 
+#### How?
+
+Migrate your app one major version at a time, while referring to Electron's
+[Breaking Changes][breaking-changes] document to see if any code needs to
+be updated.
+
+[breaking-changes]: ../breaking-changes.md
 [browser-window]: ../api/browser-window.md
 [browser-view]: ../api/browser-view.md
 [webview-tag]: ../api/webview-tag.md
@@ -712,5 +732,4 @@ which potential security issues are not as widely known.
 [window-open-handler]: ../api/web-contents.md#contentssetwindowopenhandlerhandler
 [will-navigate]: ../api/web-contents.md#event-will-navigate
 [open-external]: ../api/shell.md#shellopenexternalurl-options
-[sandbox]: ../tutorial/sandbox.md
 [responsible-disclosure]: https://en.wikipedia.org/wiki/Responsible_disclosure

From b1777c5ad16bd9f270e4558682c99fe7d593bf73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 14:56:38 +0900
Subject: [PATCH 038/811] build(deps): bump pathval from 1.1.0 to 1.1.1 in
 /spec (#32859)

Bumps [pathval](https://github.com/chaijs/pathval) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/chaijs/pathval/releases)
- [Changelog](https://github.com/chaijs/pathval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chaijs/pathval/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: pathval
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/yarn.lock b/spec/yarn.lock
index 79ba3ebb64ecd..8fedf76dab98e 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -723,9 +723,9 @@ path-is-absolute@^1.0.0:
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pause-stream@^0.0.11:
   version "0.0.11"

From 34129b83a471cbe2aa4de153c1af084a1cd8be83 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 17 Feb 2022 06:56:53 +0100
Subject: [PATCH 039/811] chore: error catching in node_bindings (#32858)

---
 shell/common/node_bindings.cc | 37 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index b29e4bcccd19f..99b017dc425fe 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -462,8 +462,7 @@ node::Environment* NodeBindings::CreateEnvironment(
 
   args.insert(args.begin() + 1, init_script);
 
-  isolate_data_ =
-      node::CreateIsolateData(context->GetIsolate(), uv_loop_, platform);
+  isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform);
 
   node::Environment* env;
   uint64_t flags = node::EnvironmentFlags::kDefaultFlags |
@@ -476,25 +475,25 @@ node::Environment* NodeBindings::CreateEnvironment(
     // not to register its handler (overriding blinks) in non-browser processes.
     flags |= node::EnvironmentFlags::kNoRegisterESMLoader |
              node::EnvironmentFlags::kNoInitializeInspector;
-    v8::TryCatch try_catch(context->GetIsolate());
-    env = node::CreateEnvironment(
-        isolate_data_, context, args, exec_args,
-        static_cast<node::EnvironmentFlags::Flags>(flags));
-    DCHECK(env);
-
-    // This will only be caught when something has gone terrible wrong as all
-    // electron scripts are wrapped in a try {} catch {} by webpack
-    if (try_catch.HasCaught()) {
-      LOG(ERROR) << "Failed to initialize node environment in process: "
-                 << process_type;
-    }
-  } else {
-    env = node::CreateEnvironment(
-        isolate_data_, context, args, exec_args,
-        static_cast<node::EnvironmentFlags::Flags>(flags));
-    DCHECK(env);
   }
 
+  v8::TryCatch try_catch(isolate);
+  env = node::CreateEnvironment(
+      isolate_data_, context, args, exec_args,
+      static_cast<node::EnvironmentFlags::Flags>(flags));
+
+  if (try_catch.HasCaught()) {
+    std::string err_msg =
+        "Failed to initialize node environment in process: " + process_type;
+    v8::Local<v8::Message> message = try_catch.Message();
+    std::string msg;
+    if (!message.IsEmpty() && gin::ConvertFromV8(isolate, message->Get(), &msg))
+      err_msg += " , with error: " + msg;
+    LOG(ERROR) << err_msg;
+  }
+
+  DCHECK(env);
+
   // Clean up the global _noBrowserGlobals that we unironically injected into
   // the global scope
   if (browser_env_ != BrowserEnvironment::kBrowser) {

From fe43296f7fd11171ebd73c0e6d248b9c6da5279d Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 17 Feb 2022 06:58:21 +0100
Subject: [PATCH 040/811] chore: backport EPROTOTYPE fixes from libuv (#32856)

This commit backports three commits from libuv's 1.x branch to fix
issues with CPU going to 100% on macOS when EPROTOTYPE is returned.

See: https://github.com/libuv/libuv/commit/abb109f30f7c0b3615b75156376d2e886c365df8
See: https://github.com/libuv/libuv/commit/3a7b95593acaab9739404bd120baa62c2007a18a
See: https://github.com/libuv/libuv/commit/de24da8c111687a2871d528052f5442e9b371ca1
---
 patches/node/.patches                         |  3 +
 ...imum_supported_version_to_10_15_3406.patch | 25 +++++++
 ...ove_eprototype_error_workaround_3405.patch | 65 +++++++++++++++++++
 ...nslate_eprototype_to_econnreset_3413.patch | 44 +++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
 create mode 100644 patches/node/darwin_remove_eprototype_error_workaround_3405.patch
 create mode 100644 patches/node/darwin_translate_eprototype_to_econnreset_3413.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 7824d1d885c8f..55ddb7c5a2285 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -28,3 +28,6 @@ fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
 fix_don_t_create_console_window_when_creating_process.patch
 fix_serdes_test.patch
+darwin_remove_eprototype_error_workaround_3405.patch
+darwin_translate_eprototype_to_econnreset_3413.patch
+darwin_bump_minimum_supported_version_to_10_15_3406.patch
diff --git a/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch b/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
new file mode 100644
index 0000000000000..43023e3d02254
--- /dev/null
+++ b/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Tue, 8 Feb 2022 14:18:29 +0100
+Subject: darwin: bump minimum supported version to 10.15 (#3406)
+
+We can't realistically claim to support 10.7 or any version that Apple
+no longer supports so let's bump the baseline to something more
+realistic.
+
+Refs: https://github.com/libuv/libuv/pull/482
+Refs: https://github.com/libuv/libuv/pull/3405
+
+diff --git a/deps/uv/SUPPORTED_PLATFORMS.md b/deps/uv/SUPPORTED_PLATFORMS.md
+index 30e0ea617a6fcaa5b4b7c7c5b117652e61f367d3..dc57dfb12dc7ddf8d29308ac44f46084a933d5ca 100644
+--- a/deps/uv/SUPPORTED_PLATFORMS.md
++++ b/deps/uv/SUPPORTED_PLATFORMS.md
+@@ -3,7 +3,7 @@
+ |  System | Support type | Supported versions | Notes |
+ |---|---|---|---|
+ | GNU/Linux | Tier 1 | Linux >= 2.6.32 with glibc >= 2.12 | |
+-| macOS | Tier 1 | macOS >= 10.7 | |
++| macOS | Tier 1 | macOS >= 10.15 | Current and previous macOS release |
+ | Windows | Tier 1 | >= Windows 8 | VS 2015 and later are supported |
+ | FreeBSD | Tier 1 | >= 10 | |
+ | AIX | Tier 2 | >= 6 | Maintainers: @libuv/aix |
diff --git a/patches/node/darwin_remove_eprototype_error_workaround_3405.patch b/patches/node/darwin_remove_eprototype_error_workaround_3405.patch
new file mode 100644
index 0000000000000..60dc8b799e4b7
--- /dev/null
+++ b/patches/node/darwin_remove_eprototype_error_workaround_3405.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Sun, 9 Jan 2022 12:20:15 +0100
+Subject: darwin: remove EPROTOTYPE error workaround (#3405)
+
+It's been reported in the past that OS X 10.10, because of a race
+condition in the XNU kernel, sometimes returns a transient EPROTOTYPE
+error when trying to write to a socket. Libuv handles that by retrying
+the operation until it succeeds or fails with a different error.
+
+Recently it's been reported that current versions of the operating
+system formerly known as OS X fail permanently with EPROTOTYPE under
+certain conditions, resulting in an infinite loop.
+
+Because Apple isn't exactly forthcoming with bug fixes or even details,
+I'm opting to simply remove the workaround and have the error bubble up.
+
+Refs: https://github.com/libuv/libuv/pull/482
+
+diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
+index bc64fe8f44b26d9f4c0d4d0d282b65cdf11a531b..1af448e7691392c3f7794eed1905d9132394e207 100644
+--- a/deps/uv/src/unix/stream.c
++++ b/deps/uv/src/unix/stream.c
+@@ -58,20 +58,6 @@ struct uv__stream_select_s {
+   fd_set* swrite;
+   size_t swrite_sz;
+ };
+-
+-/* Due to a possible kernel bug at least in OS X 10.10 "Yosemite",
+- * EPROTOTYPE can be returned while trying to write to a socket that is
+- * shutting down. If we retry the write, we should get the expected EPIPE
+- * instead.
+- */
+-# define RETRY_ON_WRITE_ERROR(errno) (errno == EINTR || errno == EPROTOTYPE)
+-# define IS_TRANSIENT_WRITE_ERROR(errno, send_handle) \
+-    (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS || \
+-     (errno == EMSGSIZE && send_handle != NULL))
+-#else
+-# define RETRY_ON_WRITE_ERROR(errno) (errno == EINTR)
+-# define IS_TRANSIENT_WRITE_ERROR(errno, send_handle) \
+-    (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
+ #endif /* defined(__APPLE__) */
+ 
+ static void uv__stream_connect(uv_stream_t*);
+@@ -866,17 +852,17 @@ static int uv__try_write(uv_stream_t* stream,
+ 
+     do
+       n = sendmsg(uv__stream_fd(stream), &msg, 0);
+-    while (n == -1 && RETRY_ON_WRITE_ERROR(errno));
++    while (n == -1 && errno == EINTR);
+   } else {
+     do
+       n = uv__writev(uv__stream_fd(stream), iov, iovcnt);
+-    while (n == -1 && RETRY_ON_WRITE_ERROR(errno));
++    while (n == -1 && errno == EINTR);
+   }
+ 
+   if (n >= 0)
+     return n;
+ 
+-  if (IS_TRANSIENT_WRITE_ERROR(errno, send_handle))
++  if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
+     return UV_EAGAIN;
+ 
+   return UV__ERR(errno);
diff --git a/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch b/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch
new file mode 100644
index 0000000000000..903921bce934b
--- /dev/null
+++ b/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Wed, 12 Jan 2022 16:11:43 +0100
+Subject: darwin: translate EPROTOTYPE to ECONNRESET (#3413)
+
+macOS versions 10.10 and 10.15 - and presumbaly 10.11 to 10.14, too -
+have a bug where a race condition causes the kernel to return EPROTOTYPE
+because the socket isn't fully constructed.
+
+It's probably the result of the peer closing the connection and that is
+why libuv translates it to ECONNRESET.
+
+Previously, libuv retried until the EPROTOTYPE error went away but some
+VPN software causes the same behavior except the error is permanent, not
+transient, turning the retry mechanism into an infinite loop.
+
+Refs: https://github.com/libuv/libuv/pull/482
+Refs: https://github.com/libuv/libuv/pull/3405
+
+diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
+index 1af448e7691392c3f7794eed1905d9132394e207..9d22debf2bf5bd5912ade152e55a85ad652e3819 100644
+--- a/deps/uv/src/unix/stream.c
++++ b/deps/uv/src/unix/stream.c
+@@ -865,6 +865,20 @@ static int uv__try_write(uv_stream_t* stream,
+   if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
+     return UV_EAGAIN;
+ 
++#ifdef __APPLE__
++  /* macOS versions 10.10 and 10.15 - and presumbaly 10.11 to 10.14, too -
++   * have a bug where a race condition causes the kernel to return EPROTOTYPE
++   * because the socket isn't fully constructed. It's probably the result of
++   * the peer closing the connection and that is why libuv translates it to
++   * ECONNRESET. Previously, libuv retried until the EPROTOTYPE error went
++   * away but some VPN software causes the same behavior except the error is
++   * permanent, not transient, turning the retry mechanism into an infinite
++   * loop. See https://github.com/libuv/libuv/pull/482.
++   */
++  if (errno == EPROTOTYPE)
++    return UV_ECONNRESET;
++#endif  /* __APPLE__ */
++
+   return UV__ERR(errno);
+ }
+ 

From 84cf685e761b2dd22f064e0dbf33b290bbec5fc0 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 17 Feb 2022 06:59:13 +0100
Subject: [PATCH 041/811] fix: webContents.openDevTools({mode}) not working
 (#32829)

---
 patches/config.json                           |  2 +
 patches/devtools_frontend/.patches            |  1 +
 ...bals_to_allow_patching_devtools_dock.patch | 48 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 patches/devtools_frontend/.patches
 create mode 100644 patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch

diff --git a/patches/config.json b/patches/config.json
index b9764a0be7684..1f10e013b33b3 100644
--- a/patches/config.json
+++ b/patches/config.json
@@ -3,6 +3,8 @@
 
   "src/electron/patches/boringssl": "src/third_party/boringssl/src",
 
+  "src/electron/patches/devtools_frontend": "src/third_party/devtools-frontend/src",
+
   "src/electron/patches/webrtc": "src/third_party/webrtc",
 
   "src/electron/patches/v8":  "src/v8",
diff --git a/patches/devtools_frontend/.patches b/patches/devtools_frontend/.patches
new file mode 100644
index 0000000000000..4e822e64fd5fa
--- /dev/null
+++ b/patches/devtools_frontend/.patches
@@ -0,0 +1 @@
+fix_expose_globals_to_allow_patching_devtools_dock.patch
diff --git a/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
new file mode 100644
index 0000000000000..56bd33b8d6d47
--- /dev/null
+++ b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Wed, 9 Feb 2022 10:55:54 +0100
+Subject: fix: expose globals to allow patching Devtools dock
+
+Electron calls into UI.DockController.instance().setDockSide(side) in
+order to allow users to set the devtools dock position via
+webContents.openDevTools({ mode }). In https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3310870
+the globals which we used to enable this were removed, and so we need to
+re-expose them to fix this broken functionality. We should look to
+upstream a more durable approach to allowing us to do this, at which
+point this patch can be removed.
+
+diff --git a/front_end/entrypoints/shell/BUILD.gn b/front_end/entrypoints/shell/BUILD.gn
+index bf96adcaa42a2406cf1dd7cd2468802886aa4fd7..cd84442cab4a0da772dd37cd4e921041b3b6173a 100644
+--- a/front_end/entrypoints/shell/BUILD.gn
++++ b/front_end/entrypoints/shell/BUILD.gn
+@@ -31,6 +31,7 @@ devtools_entrypoint("shell") {
+     "../../ui/legacy/components/perf_ui:meta",
+     "../../ui/legacy/components/quick_open:meta",
+     "../../ui/legacy/components/source_frame:meta",
++    "../../ui/legacy:legacy",
+   ]
+ 
+   visibility = [
+diff --git a/front_end/entrypoints/shell/shell.ts b/front_end/entrypoints/shell/shell.ts
+index 89255a0927a647ca32d1a9508853425a3207b441..f0e1e32f80d79e400ad139818edce60aff6aeb89 100644
+--- a/front_end/entrypoints/shell/shell.ts
++++ b/front_end/entrypoints/shell/shell.ts
+@@ -20,6 +20,7 @@ import '../../models/logs/logs-meta.js';
+ import '../main/main-meta.js';
+ import '../../ui/legacy/components/perf_ui/perf_ui-meta.js';
+ import '../../ui/legacy/components/quick_open/quick_open-meta.js';
++import '../../ui/legacy/legacy-legacy.js';
+ import '../../core/sdk/sdk-meta.js';
+ import '../../ui/legacy/components/source_frame/source_frame-meta.js';
+ import '../../panels/console_counters/console_counters-meta.js';
+diff --git a/front_end/ui/legacy/BUILD.gn b/front_end/ui/legacy/BUILD.gn
+index fe7c150cf6ce24b10821fa5a91d55f82cf865222..7177d495ec9e2b31a641c7a531b63584c597cf97 100644
+--- a/front_end/ui/legacy/BUILD.gn
++++ b/front_end/ui/legacy/BUILD.gn
+@@ -182,5 +182,6 @@ devtools_entrypoint("legacy") {
+   visibility = [
+     "../..:legacy_entrypoints",
+     "../../legacy_test_runner/*",
++    "../../entrypoints/shell/*",
+   ]
+ }

From e08ced59790089b84cd7efa81a983155faa82c5f Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 17 Feb 2022 21:05:01 +0900
Subject: [PATCH 042/811] chore: update patch to fix CI (#32950)

---
 .../fix_expose_globals_to_allow_patching_devtools_dock.patch  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
index 56bd33b8d6d47..98510d24c4e2c 100644
--- a/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
+++ b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
@@ -36,10 +36,10 @@ index 89255a0927a647ca32d1a9508853425a3207b441..f0e1e32f80d79e400ad139818edce60a
  import '../../ui/legacy/components/source_frame/source_frame-meta.js';
  import '../../panels/console_counters/console_counters-meta.js';
 diff --git a/front_end/ui/legacy/BUILD.gn b/front_end/ui/legacy/BUILD.gn
-index fe7c150cf6ce24b10821fa5a91d55f82cf865222..7177d495ec9e2b31a641c7a531b63584c597cf97 100644
+index 8cefe7e1b0cd298ce52ea06186b43f3412115a4f..c03f52d42aef6e094a922d342276439f8628ff42 100644
 --- a/front_end/ui/legacy/BUILD.gn
 +++ b/front_end/ui/legacy/BUILD.gn
-@@ -182,5 +182,6 @@ devtools_entrypoint("legacy") {
+@@ -181,5 +181,6 @@ devtools_entrypoint("legacy") {
    visibility = [
      "../..:legacy_entrypoints",
      "../../legacy_test_runner/*",

From 36e730da9367b6e75e9fed882b9e8d652226919d Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 17 Feb 2022 13:57:23 -0800
Subject: [PATCH 043/811] build: use gen2 macOS resources for tests (#32935)

---
 .circleci/build_config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 17129a46072e6..fdb8161043356 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -54,7 +54,7 @@ executors:
         description: "macOS executor size"
         default: large
         type: enum
-        enum: ["medium", "large"]
+        enum: ["macos.x86.medium.gen2", "large"]
     macos:
       xcode: "12.4.0"
     resource_class: << parameters.size >>
@@ -1909,7 +1909,7 @@ jobs:
   osx-testing-x64-gn-check:
     executor:
       name: macos
-      size: medium
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
@@ -1990,7 +1990,7 @@ jobs:
   mas-testing-x64-gn-check:
     executor:
       name: macos
-      size: medium
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-machine-mac
       <<: *env-mas
@@ -2226,7 +2226,7 @@ jobs:
   osx-testing-x64-tests:
     executor:
       name: macos
-      size: medium
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2244,7 +2244,7 @@ jobs:
   mas-testing-x64-tests:
     executor:
       name: macos
-      size: medium
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping

From b1463d2da138dcbc20d87cf31b9807d697690592 Mon Sep 17 00:00:00 2001
From: Micha Hanselmann <micha.hanselmann@gmail.com>
Date: Fri, 18 Feb 2022 06:02:22 +0100
Subject: [PATCH 044/811] fix: stale renderer process on quit (#32888)

---
 shell/browser/electron_browser_main_parts.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 9a15edbdfddbe..82713b7d15288 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -458,7 +458,8 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
     std::unique_ptr<base::RunLoop>& run_loop) {
   js_env_->OnMessageLoopCreated();
   exit_code_ = content::RESULT_CODE_NORMAL_EXIT;
-  Browser::Get()->SetMainMessageLoopQuitClosure(run_loop->QuitClosure());
+  Browser::Get()->SetMainMessageLoopQuitClosure(
+      run_loop->QuitWhenIdleClosure());
 }
 
 void ElectronBrowserMainParts::PostCreateMainMessageLoop() {

From 101e17d6f32350d9b98fbea5e6d1884d6d2b84e4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 18 Feb 2022 09:08:21 -0800
Subject: [PATCH 045/811] Revert "Bump v19.0.0-nightly.20220216"

This reverts commit c75ec2e689869354c96c811ae9d4bf7daecac2c8.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3683f47661db4..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220216
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index 44c49732320cc..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220216",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f1d69b7566baa..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220216
- PRODUCTVERSION 19,0,0,20220216
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9168f65321cdc56b6f0a0555ba59470bc3214958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 10:18:58 +0900
Subject: [PATCH 046/811] build(deps): bump pathval from 1.1.0 to 1.1.1
 (#32861)

Bumps [pathval](https://github.com/chaijs/pathval) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/chaijs/pathval/releases)
- [Changelog](https://github.com/chaijs/pathval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chaijs/pathval/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: pathval
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5059edbeab68e..79eac186fb2ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5497,9 +5497,9 @@ path-type@^4.0.0:
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pbkdf2@^3.0.3:
   version "3.0.17"

From 683ff2ea02dd1e343b03f0c55cf8c30dbb8fa720 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 10:19:53 +0900
Subject: [PATCH 047/811] build(deps): bump ajv from 6.10.2 to 6.12.6 in /spec
 (#32863)

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.2 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.10.2...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec/yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/spec/yarn.lock b/spec/yarn.lock
index 8fedf76dab98e..fc6bccebb7505 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -20,11 +20,11 @@
     nan "^2.12.1"
 
 ajv@^6.5.5:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
@@ -355,15 +355,15 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
@@ -962,9 +962,9 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 

From faa392af28110a91b4cd018675331524d8e69048 Mon Sep 17 00:00:00 2001
From: Kev <kevslashnull@gmail.com>
Date: Mon, 21 Feb 2022 02:23:17 +0100
Subject: [PATCH 048/811] docs: fix broken link to GNOME notifications spec
 (#32934)

---
 docs/tutorial/notifications.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/notifications.md b/docs/tutorial/notifications.md
index 86a9551618ee1..59b4a8499276b 100644
--- a/docs/tutorial/notifications.md
+++ b/docs/tutorial/notifications.md
@@ -146,7 +146,7 @@ desktop environment that follows [Desktop Notifications
 Specification][notification-spec], including Cinnamon, Enlightenment, Unity,
 GNOME, KDE.
 
-[notification-spec]: https://developer.gnome.org/notification-spec/
+[notification-spec]: https://developer-old.gnome.org/notification-spec/
 [app-user-model-id]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx
 [set-app-user-model-id]: ../api/app.md#appsetappusermodelidid-windows
 [squirrel-events]: https://github.com/electron/windows-installer/blob/master/README.md#handling-squirrel-events

From 9d72c8b0ad2ee41541b01ce6594012b40d869f0b Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Sun, 20 Feb 2022 17:27:58 -0800
Subject: [PATCH 049/811] chore: add @electron/wg-security to patches/
 CODEOWNERS (#32963)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f65103393eb89..6bfa64f5a2483 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,7 +4,7 @@
 # https://git-scm.com/docs/gitignore
 
 # Upgrades WG
-/patches/                               @electron/wg-upgrades
+/patches/                               @electron/wg-upgrades @electron/wg-security
 DEPS                                    @electron/wg-upgrades
 
 # Releases WG

From bdad6335c4e18aecbb3c4f3176fc100e542f0477 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 21 Feb 2022 16:43:27 +0900
Subject: [PATCH 050/811] fix: command string for windows protocol handler
 (#32953)

---
 shell/browser/browser_win.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc
index 6cfc75f4a44ba..56a62ac32548f 100644
--- a/shell/browser/browser_win.cc
+++ b/shell/browser/browser_win.cc
@@ -67,7 +67,7 @@ bool GetProtocolLaunchPath(gin::Arguments* args, std::wstring* exe) {
   std::vector<std::wstring> launch_args;
   if (args->GetNext(&launch_args) && !launch_args.empty())
     *exe = base::StringPrintf(L"\"%ls\" \"%ls\" \"%%1\"", exe->c_str(),
-                              base::JoinString(launch_args, L" ").c_str());
+                              base::JoinString(launch_args, L"\"  \"").c_str());
   else
     *exe = base::StringPrintf(L"\"%ls\" \"%%1\"", exe->c_str());
   return true;

From 069cde09fbae94e18bb1e31ed6235c0761c08315 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 21 Feb 2022 01:23:55 -0800
Subject: [PATCH 051/811] fix: don't restore maximized BrowserWindow when
 calling showInactive (#32870)

---
 patches/chromium/.patches                     |  1 +
 ...ed_windows_when_calling_showinactive.patch | 42 +++++++++++++++++++
 spec-main/api-browser-window-spec.ts          | 16 +++++++
 3 files changed, 59 insertions(+)
 create mode 100644 patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 14c0fac52460a..22dc480ecc3b5 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -111,3 +111,4 @@ fix_aspect_ratio_with_max_size.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
 feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
+fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
diff --git a/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch b/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
new file mode 100644
index 0000000000000..17f355134d0f0
--- /dev/null
+++ b/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: David Sanders <dsanders11@ucsbalum.com>
+Date: Fri, 11 Feb 2022 22:37:39 +0000
+Subject: fix: don't restore maximized windows when calling ShowInactive
+
+This is a backport from Chromium of
+https://chromium-review.googlesource.com/c/chromium/src/+/3371573.
+
+diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
+index 067861bb743ee2f3c1916794d45efb7dd591b230..6507557bf5a47492343602607e0dbb7d8f88246d 100644
+--- a/ui/views/win/hwnd_message_handler.cc
++++ b/ui/views/win/hwnd_message_handler.cc
+@@ -664,9 +664,16 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
+     SetWindowPlacement(hwnd(), &placement);
+     native_show_state = SW_SHOWMAXIMIZED;
+   } else {
++    const bool is_maximized = IsMaximized();
++
++    // Use SW_SHOW/SW_SHOWNA instead of SW_SHOWNORMAL/SW_SHOWNOACTIVATE so that
++    // the window is not restored to its original position if it is maximized.
++    // This could be used unconditionally for ui::SHOW_STATE_INACTIVE, but
++    // cross-platform behavior when showing a minimized window is inconsistent,
++    // some platforms restore the position, some do not. See crbug.com/1296710
+     switch (show_state) {
+       case ui::SHOW_STATE_INACTIVE:
+-        native_show_state = SW_SHOWNOACTIVATE;
++        native_show_state = is_maximized ? SW_SHOWNA : SW_SHOWNOACTIVATE;
+         break;
+       case ui::SHOW_STATE_MAXIMIZED:
+         native_show_state = SW_SHOWMAXIMIZED;
+@@ -677,9 +684,9 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
+       case ui::SHOW_STATE_NORMAL:
+         if ((GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_TRANSPARENT) ||
+             (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE)) {
+-          native_show_state = SW_SHOWNOACTIVATE;
++          native_show_state = is_maximized ? SW_SHOWNA : SW_SHOWNOACTIVATE;
+         } else {
+-          native_show_state = SW_SHOWNORMAL;
++          native_show_state = is_maximized ? SW_SHOW : SW_SHOWNORMAL;
+         }
+         break;
+       case ui::SHOW_STATE_FULLSCREEN:
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 5f3657001ab8c..70d57977af6a0 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -735,6 +735,22 @@ describe('BrowserWindow module', () => {
         w.showInactive();
         expect(w.isFocused()).to.equal(false);
       });
+
+      // TODO(dsanders11): Enable for Linux once CI plays nice with these kinds of tests
+      ifit(process.platform !== 'linux')('should not restore maximized windows', async () => {
+        const maximize = emittedOnce(w, 'maximize');
+        const shown = emittedOnce(w, 'show');
+        w.maximize();
+        // TODO(dsanders11): The maximize event isn't firing on macOS for a window initially hidden
+        if (process.platform !== 'darwin') {
+          await maximize;
+        } else {
+          await delay(1000);
+        }
+        w.showInactive();
+        await shown;
+        expect(w.isMaximized()).to.equal(true);
+      });
     });
 
     describe('BrowserWindow.focus()', () => {

From 1e8da899a372c40eab6743fbff5ce846736d8927 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 21 Feb 2022 01:27:45 -0800
Subject: [PATCH 052/811] chore: fix typos (#32985)

---
 lib/browser/api/net.ts                                    | 2 +-
 shell/browser/api/electron_api_power_monitor_win.cc       | 2 +-
 shell/browser/api/electron_api_url_loader.cc              | 2 +-
 shell/browser/auto_updater_mac.mm                         | 2 +-
 shell/browser/browser_mac.mm                              | 4 ++--
 shell/browser/native_window_mac.mm                        | 8 ++++----
 shell/browser/native_window_views_win.cc                  | 2 +-
 shell/browser/ui/message_box_win.cc                       | 2 +-
 .../ui/win/electron_desktop_window_tree_host_win.cc       | 2 +-
 shell/common/gin_helper/function_template.h               | 2 +-
 shell/common/platform_util_linux.cc                       | 2 +-
 shell/renderer/electron_render_frame_observer.cc          | 4 ++--
 shell/renderer/electron_renderer_client.cc                | 4 ++--
 spec-main/index.js                                        | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/browser/api/net.ts b/lib/browser/api/net.ts
index 454505ede04f2..80351c0cdbaae 100644
--- a/lib/browser/api/net.ts
+++ b/lib/browser/api/net.ts
@@ -198,7 +198,7 @@ class ChunkedBodyStream extends Writable {
     this._downstream = pipe;
     if (this._pendingChunk) {
       const doneWriting = (maybeError: Error | void) => {
-        // If the underlying request has been aborted, we honeslty don't care about the error
+        // If the underlying request has been aborted, we honestly don't care about the error
         // all work should cease as soon as we abort anyway, this error is probably a
         // "mojo pipe disconnected" error (code=9)
         if (this._clientRequest._aborted) return;
diff --git a/shell/browser/api/electron_api_power_monitor_win.cc b/shell/browser/api/electron_api_power_monitor_win.cc
index bf1468cd97038..90f2cf97dfe26 100644
--- a/shell/browser/api/electron_api_power_monitor_win.cc
+++ b/shell/browser/api/electron_api_power_monitor_win.cc
@@ -42,7 +42,7 @@ void PowerMonitor::InitPlatformSpecificMonitors() {
   // Tel windows we want to be notified with session events
   WTSRegisterSessionNotification(window_, NOTIFY_FOR_THIS_SESSION);
 
-  // For Windows 8 and later, a new "connected standy" mode has been added and
+  // For Windows 8 and later, a new "connected standby" mode has been added and
   // we must explicitly register for its notifications.
   auto RegisterSuspendResumeNotification =
       reinterpret_cast<decltype(&::RegisterSuspendResumeNotification)>(
diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc
index 212a2b6c16f8e..97baf11d65624 100644
--- a/shell/browser/api/electron_api_url_loader.cc
+++ b/shell/browser/api/electron_api_url_loader.cc
@@ -490,7 +490,7 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
   int options = 0;
   if (!credentials_specified && !use_session_cookies) {
     // This is the default case, as well as the case when credentials is not
-    // specified and useSessionCoookies is false. credentials_mode will be
+    // specified and useSessionCookies is false. credentials_mode will be
     // kInclude, but cookies will be blocked.
     request->credentials_mode = network::mojom::CredentialsMode::kInclude;
     options |= network::mojom::kURLLoadOptionBlockAllCookies;
diff --git a/shell/browser/auto_updater_mac.mm b/shell/browser/auto_updater_mac.mm
index 3dbf49e2da8a9..c9e4542ffdfba 100644
--- a/shell/browser/auto_updater_mac.mm
+++ b/shell/browser/auto_updater_mac.mm
@@ -24,7 +24,7 @@
 
 namespace {
 
-// The gloal SQRLUpdater object.
+// The global SQRLUpdater object.
 SQRLUpdater* g_updater = nil;
 
 }  // namespace
diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index 357c6723e44ff..cdd3ba7711b4b 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -394,10 +394,10 @@ void RemoveFromLoginItems() {
 
 void Browser::DockHide() {
   // Transforming application state from UIElement to Foreground is an
-  // asyncronous operation, and unfortunately there is currently no way to know
+  // asynchronous operation, and unfortunately there is currently no way to know
   // when it is finished.
   // So if we call DockHide => DockShow => DockHide => DockShow in a very short
-  // time, we would triger a bug of macOS that, there would be multiple dock
+  // time, we would trigger a bug of macOS that, there would be multiple dock
   // icons of the app left in system.
   // To work around this, we make sure DockHide does nothing if it is called
   // immediately after DockShow. After some experiments, 1 second seems to be
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index bf78f78a2631a..3220741ec356c 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -51,7 +51,7 @@
 
 // This view would inform Chromium to resize the hosted views::View.
 //
-// The overrided methods should behave the same with BridgedContentView.
+// The overridden methods should behave the same with BridgedContentView.
 @interface ElectronAdaptedContentView : NSView {
  @private
   views::NativeWidgetMacNSWindowHost* bridge_host_;
@@ -373,7 +373,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
       if (traffic_light_position_) {
         [buttons_proxy_ setMargin:*traffic_light_position_];
       } else if (title_bar_style_ == TitleBarStyle::kHiddenInset) {
-        // For macOS >= 11, while this value does not match offical macOS apps
+        // For macOS >= 11, while this value does not match official macOS apps
         // like Safari or Notes, it matches titleBarStyle's old implementation
         // before Electron <= 12.
         [buttons_proxy_ setMargin:gfx::Point(12, 11)];
@@ -381,7 +381,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
       if (title_bar_style_ == TitleBarStyle::kCustomButtonsOnHover) {
         [buttons_proxy_ setShowOnHover:YES];
       } else {
-        // customButtonsOnHover does not show buttons initialiy.
+        // customButtonsOnHover does not show buttons initially.
         InternalSetWindowButtonVisibility(true);
       }
     }
@@ -562,7 +562,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     }
   }
 
-  // Deattach the window from the parent before.
+  // Detach the window from the parent before.
   if (parent())
     InternalSetParentWindow(parent(), false);
 
diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index 0b4706f1cc198..ab336f2e29866 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -473,7 +473,7 @@ LRESULT CALLBACK NativeWindowViews::SubclassProc(HWND hwnd,
       // windows can occur due to rapidly entering and leaving forwarding mode.
       // By consuming and ignoring the message, we're essentially telling
       // Chromium that we have not left the window despite somebody else getting
-      // the messages. As to why this is catched for the legacy window and not
+      // the messages. As to why this is caught for the legacy window and not
       // the actual browser window is simply that the legacy window somehow
       // makes use of these events; posting to the main window didn't work.
       if (window->forwarding_mouse_messages_) {
diff --git a/shell/browser/ui/message_box_win.cc b/shell/browser/ui/message_box_win.cc
index 724228e010189..ab494bd6d59ab 100644
--- a/shell/browser/ui/message_box_win.cc
+++ b/shell/browser/ui/message_box_win.cc
@@ -48,7 +48,7 @@ std::map<int, std::unique_ptr<HWND>>& GetDialogsMap() {
   return *dialogs;
 }
 
-// Speical HWND used by the dialogs map.
+// Special HWND used by the dialogs map.
 //
 // - ID is used but window has not been created yet.
 const HWND kHwndReserve = reinterpret_cast<HWND>(-1);
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 16e71fac12b39..3600e273ea73b 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -87,7 +87,7 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
   // Indenting the client area can fix this behavior.
   if (IsMaximized() && !native_window_view_->has_frame()) {
     // The insets would be eventually passed to WM_NCCALCSIZE, which takes
-    // the metrics under the DPI of _main_ monitor instead of current moniotr.
+    // the metrics under the DPI of _main_ monitor instead of current monitor.
     //
     // Please make sure you tested maximized frameless window under multiple
     // monitors with different DPIs before changing this code.
diff --git a/shell/common/gin_helper/function_template.h b/shell/common/gin_helper/function_template.h
index 025c917fbc34f..b5d8293213066 100644
--- a/shell/common/gin_helper/function_template.h
+++ b/shell/common/gin_helper/function_template.h
@@ -208,7 +208,7 @@ class Invoker<IndicesHolder<indices...>, ArgTypes...>
     // GCC thinks that create_flags is going unused, even though the
     // expansion above clearly makes use of it. Per jyasskin@, casting
     // to void is the commonly accepted way to convince the compiler
-    // that you're actually using a parameter/varible.
+    // that you're actually using a parameter/variable.
     (void)create_flags;
   }
 
diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc
index 0d86d7cf1c28a..9d58f8fc959f4 100644
--- a/shell/common/platform_util_linux.cc
+++ b/shell/common/platform_util_linux.cc
@@ -119,7 +119,7 @@ class ShowItemHelper {
       bool owned = false;
 
       if (!reader.PopBool(&owned)) {
-        LOG(ERROR) << "Failed to read " << kMethodNameHasOwner << " resposne";
+        LOG(ERROR) << "Failed to read " << kMethodNameHasOwner << " response";
       } else if (owned) {
         is_running = true;
       }
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index ba1a122868c64..4c763315f3539 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -82,7 +82,7 @@ void ElectronRenderFrameObserver::DidInstallConditionalFeatures(
     v8::Handle<v8::Context> context,
     int world_id) {
   // When a child window is created with window.open, its WebPreferences will
-  // be copied from its parent, and Chromium will intialize JS context in it
+  // be copied from its parent, and Chromium will initialize JS context in it
   // immediately.
   // Normally the WebPreferences is overriden in browser before navigation,
   // but this behavior bypasses the browser side navigation and the child
@@ -92,7 +92,7 @@ void ElectronRenderFrameObserver::DidInstallConditionalFeatures(
   // while "nodeIntegration=no" is passed.
   // We work around this issue by delaying the child window's initialization of
   // Node.js if this is the initial empty document, and only do it when the
-  // acutal page has started to load.
+  // actual page has started to load.
   auto* web_frame =
       static_cast<blink::WebLocalFrameImpl*>(render_frame_->GetWebFrame());
   if (web_frame->Opener() && web_frame->IsOnInitialEmptyDocument()) {
diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index c507bdcffccbb..f24c8073935fe 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -50,7 +50,7 @@ void ElectronRendererClient::RenderFrameCreated(
 void ElectronRendererClient::RunScriptsAtDocumentStart(
     content::RenderFrame* render_frame) {
   RendererClientBase::RunScriptsAtDocumentStart(render_frame);
-  // Inform the document start pharse.
+  // Inform the document start phase.
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   node::Environment* env = GetEnvironment(render_frame);
   if (env)
@@ -61,7 +61,7 @@ void ElectronRendererClient::RunScriptsAtDocumentStart(
 void ElectronRendererClient::RunScriptsAtDocumentEnd(
     content::RenderFrame* render_frame) {
   RendererClientBase::RunScriptsAtDocumentEnd(render_frame);
-  // Inform the document end pharse.
+  // Inform the document end phase.
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   node::Environment* env = GetEnvironment(render_frame);
   if (env)
diff --git a/spec-main/index.js b/spec-main/index.js
index 6579025ee7579..db24801e9d286 100644
--- a/spec-main/index.js
+++ b/spec-main/index.js
@@ -27,7 +27,7 @@ const { app, protocol } = require('electron');
 
 v8.setFlagsFromString('--expose_gc');
 app.commandLine.appendSwitch('js-flags', '--expose_gc');
-// Prevent the spec runner quiting when the first window closes
+// Prevent the spec runner quitting when the first window closes
 app.on('window-all-closed', () => null);
 
 // Use fake device for Media Stream to replace actual camera and microphone.

From 83a4ac184117c9b60732ba893be0d1212d9231d0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 05:04:50 -0800
Subject: [PATCH 053/811] Bump v19.0.0-nightly.20220221

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..6cd3cb0ed811a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220221
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..f6c49ed8e200c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220221",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..ca7e437884d88 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220221
+ PRODUCTVERSION 19,0,0,20220221
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 484a70f9b8fdaa5a946eeea4805a614156ec33f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 14:27:56 -0800
Subject: [PATCH 054/811] build(deps): bump ajv from 6.11.0 to 6.12.6 in
 /spec-main (#32864)

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.11.0 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.11.0...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec-main/yarn.lock | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/spec-main/yarn.lock b/spec-main/yarn.lock
index 6d02b0452d444..f4034d4e9be31 100644
--- a/spec-main/yarn.lock
+++ b/spec-main/yarn.lock
@@ -67,17 +67,7 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
-  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.12.3:
+ajv@^6.1.0, ajv@^6.12.3:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -364,9 +354,9 @@ extsprintf@^1.2.0:
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -943,9 +933,9 @@ uniq@^1.0.0:
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 

From fa7461685dfec20208b21b91accad641ec8c577d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 14:28:34 -0800
Subject: [PATCH 055/811] build(deps): bump ajv from 6.10.1 to 6.12.6 (#32865)

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.1 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.10.1...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 61 ++++++++++++-------------------------------------------
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 79eac186fb2ff..b03a8b7cbf371 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -870,40 +870,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
-  integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.10.0:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.12.2:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2841,15 +2811,10 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.1.1:
   version "3.2.4"
@@ -2864,9 +2829,9 @@ fast-glob@^3.1.1:
     picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
@@ -7714,9 +7679,9 @@ upath@^1.1.1:
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 

From e9b9835feb32189164de0a8bd67c85de5cee1895 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 22 Feb 2022 08:24:11 +0100
Subject: [PATCH 056/811] chore: fix out-of-date chromium patch (#33030)

---
 ...estore_maximized_windows_when_calling_showinactive.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch b/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
index 17f355134d0f0..4c2bbea2e5906 100644
--- a/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
+++ b/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
@@ -7,10 +7,10 @@ This is a backport from Chromium of
 https://chromium-review.googlesource.com/c/chromium/src/+/3371573.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 067861bb743ee2f3c1916794d45efb7dd591b230..6507557bf5a47492343602607e0dbb7d8f88246d 100644
+index 4be0e5b0ef187d68f054672bc3d1dc328057c58b..264a9109e42c23e9be6bf7269b3cfee2634b61e4 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -664,9 +664,16 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
+@@ -665,9 +665,16 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
      SetWindowPlacement(hwnd(), &placement);
      native_show_state = SW_SHOWMAXIMIZED;
    } else {
@@ -28,7 +28,7 @@ index 067861bb743ee2f3c1916794d45efb7dd591b230..6507557bf5a47492343602607e0dbb7d
          break;
        case ui::SHOW_STATE_MAXIMIZED:
          native_show_state = SW_SHOWMAXIMIZED;
-@@ -677,9 +684,9 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
+@@ -678,9 +685,9 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
        case ui::SHOW_STATE_NORMAL:
          if ((GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_TRANSPARENT) ||
              (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE)) {

From bcf060fab67fe1912d03ad253de98b3091b2a61b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 22 Feb 2022 10:52:23 -0800
Subject: [PATCH 057/811] Revert "Bump v19.0.0-nightly.20220221"

This reverts commit 83a4ac184117c9b60732ba893be0d1212d9231d0.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6cd3cb0ed811a..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220221
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index f6c49ed8e200c..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220221",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ca7e437884d88..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220221
- PRODUCTVERSION 19,0,0,20220221
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 41b2945ced7f93568fb3771ab6989d490214ab91 Mon Sep 17 00:00:00 2001
From: t57ser <seve@live.at>
Date: Wed, 23 Feb 2022 08:59:50 +0100
Subject: [PATCH 058/811] feat: add ability to configure if window should close
 when opener closes (#31314)

* feat: Added ability to configure if window should close when opener closes

* fix: check if embedder is destroyed

* fix: correctly take over closeWithOpener property

* chore: Added documentation

* Update docs/api/window-open.md

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

* chore: refactor

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>

* chore: changed property name from `closeWithOpener` to `outlivesOpener`

* dummy change to kick lint

* undo above

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
---
 docs/api/window-open.md             |  5 ++++
 lib/browser/api/web-contents.ts     | 45 ++++++++++++++++++++---------
 lib/browser/guest-window-manager.ts | 22 +++++++++-----
 typings/internal-electron.d.ts      |  2 +-
 4 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/docs/api/window-open.md b/docs/api/window-open.md
index a2cb76a2a569e..1925a5d1e7e5d 100644
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -73,6 +73,11 @@ creating the window. Note that this is more powerful than passing options
 through the feature string, as the renderer has more limited privileges in
 deciding security preferences than the main process.
 
+In addition to passing in `action` and `overrideBrowserWindowOptions`,
+`outlivesOpener` can be passed like: `{ action: 'allow', outlivesOpener: true,
+overrideBrowserWindowOptions: { ... } }`. If set to `true`, the newly created
+window will not close when the opener window closes. The default value is `false`.
+
 ### Native `Window` example
 
 ```javascript
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 5705cec695a07..4e2cd4acbda74 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -492,41 +492,51 @@ WebContents.prototype.loadURL = function (url, options) {
   return p;
 };
 
-WebContents.prototype.setWindowOpenHandler = function (handler: (details: Electron.HandlerDetails) => ({action: 'allow'} | {action: 'deny', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions})) {
+WebContents.prototype.setWindowOpenHandler = function (handler: (details: Electron.HandlerDetails) => ({action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions, outlivesOpener?: boolean})) {
   this._windowOpenHandler = handler;
 };
 
-WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event, details: Electron.HandlerDetails): BrowserWindowConstructorOptions | null {
+WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event, details: Electron.HandlerDetails): {browserWindowConstructorOptions: BrowserWindowConstructorOptions | null, outlivesOpener: boolean} {
+  const defaultResponse = {
+    browserWindowConstructorOptions: null,
+    outlivesOpener: false
+  };
   if (!this._windowOpenHandler) {
-    return null;
+    return defaultResponse;
   }
   const response = this._windowOpenHandler(details);
 
   if (typeof response !== 'object') {
     event.preventDefault();
     console.error(`The window open handler response must be an object, but was instead of type '${typeof response}'.`);
-    return null;
+    return defaultResponse;
   }
 
   if (response === null) {
     event.preventDefault();
     console.error('The window open handler response must be an object, but was instead null.');
-    return null;
+    return defaultResponse;
   }
 
   if (response.action === 'deny') {
     event.preventDefault();
-    return null;
+    return defaultResponse;
   } else if (response.action === 'allow') {
     if (typeof response.overrideBrowserWindowOptions === 'object' && response.overrideBrowserWindowOptions !== null) {
-      return response.overrideBrowserWindowOptions;
+      return {
+        browserWindowConstructorOptions: response.overrideBrowserWindowOptions,
+        outlivesOpener: typeof response.outlivesOpener === 'boolean' ? response.outlivesOpener : false
+      };
     } else {
-      return {};
+      return {
+        browserWindowConstructorOptions: {},
+        outlivesOpener: typeof response.outlivesOpener === 'boolean' ? response.outlivesOpener : false
+      };
     }
   } else {
     event.preventDefault();
     console.error('The window open handler response must be an object with an \'action\' property of \'allow\' or \'deny\'.');
-    return null;
+    return defaultResponse;
   }
 };
 
@@ -651,7 +661,8 @@ WebContents.prototype._init = function () {
         postBody,
         disposition
       };
-      const options = this._callWindowOpenHandler(event, details);
+      const result = this._callWindowOpenHandler(event, details);
+      const options = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {
         openGuestWindow({
           event,
@@ -660,12 +671,14 @@ WebContents.prototype._init = function () {
           referrer,
           postData,
           overrideBrowserWindowOptions: options || {},
-          windowOpenArgs: details
+          windowOpenArgs: details,
+          outlivesOpener: result.outlivesOpener
         });
       }
     });
 
     let windowOpenOverriddenOptions: BrowserWindowConstructorOptions | null = null;
+    let windowOpenOutlivesOpenerOption: boolean = false;
     this.on('-will-add-new-contents' as any, (event: ElectronInternal.Event, url: string, frameName: string, rawFeatures: string, disposition: Electron.HandlerDetails['disposition'], referrer: Electron.Referrer, postData: PostData) => {
       const postBody = postData ? {
         data: postData,
@@ -679,7 +692,9 @@ WebContents.prototype._init = function () {
         referrer,
         postBody
       };
-      windowOpenOverriddenOptions = this._callWindowOpenHandler(event, details);
+      const result = this._callWindowOpenHandler(event, details);
+      windowOpenOutlivesOpenerOption = result.outlivesOpener;
+      windowOpenOverriddenOptions = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {
         const secureOverrideWebPreferences = windowOpenOverriddenOptions ? {
           // Allow setting of backgroundColor as a webPreference even though
@@ -710,7 +725,10 @@ WebContents.prototype._init = function () {
       _userGesture: boolean, _left: number, _top: number, _width: number, _height: number, url: string, frameName: string,
       referrer: Electron.Referrer, rawFeatures: string, postData: PostData) => {
       const overriddenOptions = windowOpenOverriddenOptions || undefined;
+      const outlivesOpener = windowOpenOutlivesOpenerOption;
       windowOpenOverriddenOptions = null;
+      // false is the default
+      windowOpenOutlivesOpenerOption = false;
 
       if ((disposition !== 'foreground-tab' && disposition !== 'new-window' &&
            disposition !== 'background-tab')) {
@@ -730,7 +748,8 @@ WebContents.prototype._init = function () {
           url,
           frameName,
           features: rawFeatures
-        }
+        },
+        outlivesOpener
       });
     });
   }
diff --git a/lib/browser/guest-window-manager.ts b/lib/browser/guest-window-manager.ts
index 9815865f72499..baa446ab91dae 100644
--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -29,7 +29,7 @@ const getGuestWindowByFrameName = (name: string) => frameNamesToWindow.get(name)
  * user to preventDefault() on the passed event (which ends up calling
  * DestroyWebContents).
  */
-export function openGuestWindow ({ event, embedder, guest, referrer, disposition, postData, overrideBrowserWindowOptions, windowOpenArgs }: {
+export function openGuestWindow ({ event, embedder, guest, referrer, disposition, postData, overrideBrowserWindowOptions, windowOpenArgs, outlivesOpener }: {
   event: { sender: WebContents, defaultPrevented: boolean },
   embedder: WebContents,
   guest?: WebContents,
@@ -38,6 +38,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
   postData?: PostData,
   overrideBrowserWindowOptions?: BrowserWindowConstructorOptions,
   windowOpenArgs: WindowOpenArgs,
+  outlivesOpener: boolean,
 }): BrowserWindow | undefined {
   const { url, frameName, features } = windowOpenArgs;
   const { options: browserWindowOptions } = makeBrowserWindowOptions({
@@ -77,7 +78,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
     ...browserWindowOptions
   });
 
-  handleWindowLifecycleEvents({ embedder, frameName, guest: window });
+  handleWindowLifecycleEvents({ embedder, frameName, guest: window, outlivesOpener });
 
   embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, referrer, postData });
 
@@ -90,10 +91,11 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
  * too is the guest destroyed; this is Electron convention and isn't based in
  * browser behavior.
  */
-const handleWindowLifecycleEvents = function ({ embedder, guest, frameName }: {
+const handleWindowLifecycleEvents = function ({ embedder, guest, frameName, outlivesOpener }: {
   embedder: WebContents,
   guest: BrowserWindow,
-  frameName: string
+  frameName: string,
+  outlivesOpener: boolean
 }) {
   const closedByEmbedder = function () {
     guest.removeListener('closed', closedByUser);
@@ -101,9 +103,14 @@ const handleWindowLifecycleEvents = function ({ embedder, guest, frameName }: {
   };
 
   const closedByUser = function () {
-    embedder.removeListener('current-render-view-deleted' as any, closedByEmbedder);
+    // Embedder might have been closed
+    if (!embedder.isDestroyed() && !outlivesOpener) {
+      embedder.removeListener('current-render-view-deleted' as any, closedByEmbedder);
+    }
   };
-  embedder.once('current-render-view-deleted' as any, closedByEmbedder);
+  if (!outlivesOpener) {
+    embedder.once('current-render-view-deleted' as any, closedByEmbedder);
+  }
   guest.once('closed', closedByUser);
 
   if (frameName) {
@@ -163,7 +170,8 @@ function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs,
       handleWindowLifecycleEvents({
         embedder: event.sender,
         guest: newGuest,
-        frameName
+        frameName,
+        outlivesOpener: false
       });
     }
     return true;
diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts
index 666775c16a257..a0d645440652f 100644
--- a/typings/internal-electron.d.ts
+++ b/typings/internal-electron.d.ts
@@ -63,7 +63,7 @@ declare namespace Electron {
     equal(other: WebContents): boolean;
     browserWindowOptions: BrowserWindowConstructorOptions;
     _windowOpenHandler: ((details: Electron.HandlerDetails) => any) | null;
-    _callWindowOpenHandler(event: any, details: Electron.HandlerDetails): Electron.BrowserWindowConstructorOptions | null;
+    _callWindowOpenHandler(event: any, details: Electron.HandlerDetails): {browserWindowConstructorOptions: Electron.BrowserWindowConstructorOptions | null, outlivesOpener: boolean};
     _setNextChildWebPreferences(prefs: Partial<Electron.BrowserWindowConstructorOptions['webPreferences']> & Pick<Electron.BrowserWindowConstructorOptions, 'backgroundColor'>): void;
     _send(internal: boolean, channel: string, args: any): boolean;
     _sendToFrameInternal(frameId: number | [number, number], channel: string, ...args: any[]): boolean;

From 08e26175fdc8b7fb033e55c408181f2c0fa2940e Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 23 Feb 2022 11:33:42 +0100
Subject: [PATCH 059/811] fix: broken OSR transparent option (#32885)

---
 shell/browser/api/electron_api_web_contents.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 85d2e7207efc0..3873591e1dda3 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -767,8 +767,12 @@ WebContents::WebContents(v8::Isolate* isolate,
 #if BUILDFLAG(ENABLE_OSR)
     }
   } else if (IsOffScreen()) {
-    bool transparent = false;
-    options.Get(options::kTransparent, &transparent);
+    // webPreferences does not have a transparent option, so if the window needs
+    // to be transparent, that will be set at electron_api_browser_window.cc#L57
+    // and we then need to pull it back out and check it here.
+    std::string background_color;
+    options.GetHidden(options::kBackgroundColor, &background_color);
+    bool transparent = ParseHexColor(background_color) == SK_ColorTRANSPARENT;
 
     content::WebContents::CreateParams params(session->browser_context());
     auto* view = new OffScreenWebContentsView(

From 5b2d3910c1749f5faaeaec15d1051a2582c32596 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 05:00:59 -0800
Subject: [PATCH 060/811] Bump v19.0.0-nightly.20220223

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..b51128a4c6e21 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220223
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..0a29b50a9164e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220223",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..2ef24596652a7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220223
+ PRODUCTVERSION 19,0,0,20220223
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 268cd31e38f4d8b0ba81de27c73b7b1424ec9157 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 23 Feb 2022 16:27:54 +0100
Subject: [PATCH 061/811] fix: DCHECK when calling app.exit() (#33035)

---
 shell/browser/window_list.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/window_list.cc b/shell/browser/window_list.cc
index 45f166cb0bd86..a2555e5a111e7 100644
--- a/shell/browser/window_list.cc
+++ b/shell/browser/window_list.cc
@@ -109,7 +109,7 @@ void WindowList::DestroyAllWindows() {
       ConvertToWeakPtrVector(GetInstance()->windows_);
 
   for (const auto& window : weak_windows) {
-    if (window)
+    if (window && !window->IsClosed())
       window->CloseImmediately();
   }
 }

From da54cfcb3ea82b1844fe5f3c530cc2ab888ecaa4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 23 Feb 2022 10:12:10 -0800
Subject: [PATCH 062/811] Revert "Bump v19.0.0-nightly.20220223"

This reverts commit 5b2d3910c1749f5faaeaec15d1051a2582c32596.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b51128a4c6e21..0b4738720b15b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220223
\ No newline at end of file
+19.0.0-nightly.20220209
\ No newline at end of file
diff --git a/package.json b/package.json
index 0a29b50a9164e..3fbd34c144201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220223",
+  "version": "19.0.0-nightly.20220209",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2ef24596652a7..3dff29f890f46 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220223
- PRODUCTVERSION 19,0,0,20220223
+ FILEVERSION 19,0,0,20220209
+ PRODUCTVERSION 19,0,0,20220209
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8cf345660c35d88bfad0b9fff25f3974482df2f2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Feb 2022 05:01:41 -0800
Subject: [PATCH 063/811] Bump v19.0.0-nightly.20220224

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0b4738720b15b..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220209
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fbd34c144201..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220209",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3dff29f890f46..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220209
- PRODUCTVERSION 19,0,0,20220209
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c5a2af7811e35acf67651725d1099b15de0c6ee4 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 24 Feb 2022 20:03:59 +0100
Subject: [PATCH 064/811] fix: tray garbage collection (#33040)

---
 shell/browser/api/electron_api_tray.cc | 7 +++++--
 shell/browser/api/electron_api_tray.h  | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc
index f80d753ddf57c..312fec8b09ddf 100644
--- a/shell/browser/api/electron_api_tray.cc
+++ b/shell/browser/api/electron_api_tray.cc
@@ -89,8 +89,10 @@ gin::Handle<Tray> Tray::New(gin_helper::ErrorThrower thrower,
   }
 #endif
 
-  return gin::CreateHandle(thrower.isolate(),
-                           new Tray(args->isolate(), image, guid));
+  auto handle = gin::CreateHandle(args->isolate(),
+                                  new Tray(args->isolate(), image, guid));
+  handle->Pin(args->isolate());
+  return handle;
 }
 
 void Tray::OnClicked(const gfx::Rect& bounds,
@@ -180,6 +182,7 @@ void Tray::OnDragEnded() {
 }
 
 void Tray::Destroy() {
+  Unpin();
   menu_.Reset();
   tray_icon_.reset();
 }
diff --git a/shell/browser/api/electron_api_tray.h b/shell/browser/api/electron_api_tray.h
index 19a28eef23713..8c4870b11ad89 100644
--- a/shell/browser/api/electron_api_tray.h
+++ b/shell/browser/api/electron_api_tray.h
@@ -19,6 +19,7 @@
 #include "shell/common/gin_helper/cleaned_up_at_exit.h"
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
+#include "shell/common/gin_helper/pinnable.h"
 
 namespace gfx {
 class Image;
@@ -38,6 +39,7 @@ class Tray : public gin::Wrappable<Tray>,
              public gin_helper::EventEmitterMixin<Tray>,
              public gin_helper::Constructible<Tray>,
              public gin_helper::CleanedUpAtExit,
+             public gin_helper::Pinnable<Tray>,
              public TrayIconObserver {
  public:
   // gin_helper::Constructible

From 067cc8ae2b04ba40918a5f0c38f356c6e9cdfc7e Mon Sep 17 00:00:00 2001
From: Ruslan <62350279+2BC-Wasabi@users.noreply.github.com>
Date: Thu, 24 Feb 2022 22:59:29 +0200
Subject: [PATCH 065/811] Update main.js (#33039)

---
 docs/fiddles/ipc/pattern-2/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/fiddles/ipc/pattern-2/main.js b/docs/fiddles/ipc/pattern-2/main.js
index 6f53c4adcce62..743c7c4d2d312 100644
--- a/docs/fiddles/ipc/pattern-2/main.js
+++ b/docs/fiddles/ipc/pattern-2/main.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow, ipcMain} = require('electron')
+const {app, BrowserWindow, ipcMain,dialog} = require('electron')
 const path = require('path')
 
 async function handleFileOpen() {

From d5539ce83425db395d254fd770bee35c4d31b25d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 05:01:49 -0800
Subject: [PATCH 066/811] Bump v19.0.0-nightly.20220225

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..68779bb0052c7 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220225
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..d1ee8d687ba0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220225",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..a61ef9fe72780 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220225
+ PRODUCTVERSION 19,0,0,20220225
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c1a667c931355fdb21b85ddfce9d9b32096dacd3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 07:09:17 -0800
Subject: [PATCH 067/811] Revert "Bump v19.0.0-nightly.20220225"

This reverts commit d5539ce83425db395d254fd770bee35c4d31b25d.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 68779bb0052c7..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220225
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index d1ee8d687ba0c..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220225",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index a61ef9fe72780..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220225
- PRODUCTVERSION 19,0,0,20220225
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3da598015bccb8f9ab6833d1163c2fe2b0f2b058 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 13:17:35 -0500
Subject: [PATCH 068/811] chore: bump chromium to 100.0.4894.0 (main) (#32852)

* chore: bump chromium in DEPS to 100.0.4880.0

* resolve conflicts

* chore: update patches

* fix patch

* PIP20: add a new DocumentOverlayWindowViews subtype

https://chromium-review.googlesource.com/c/chromium/src/+/3252789

* Clean up PictureInPictureWindowManager::EnterPictureInPicture()

https://chromium-review.googlesource.com/c/chromium/src/+/3424145

* Remove StoragePartitionId.

https://chromium-review.googlesource.com/c/chromium/src/+/2811120

* Remove FLoC code

https://chromium-review.googlesource.com/c/chromium/src/+/3424359

* media: Make AddSupportedKeySystems() Async

https://chromium-review.googlesource.com/c/chromium/src/+/3430502

* [Extensions] Move some l10n file util methods to //extensions/browser

https://chromium-review.googlesource.com/c/chromium/src/+/3408192

* chore: IWYU

* Reland "webhid: Grant permissions for policy-allowed devices"

https://chromium-review.googlesource.com/c/chromium/src/+/3444147

* Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N.

https://chromium-review.googlesource.com/c/chromium/src/+/3435727
https://chromium-review.googlesource.com/c/chromium/src/+/3440910
https://chromium-review.googlesource.com/c/chromium/src/+/3440088

* [text blink period] Cache blink period instead of fetching from defaults

https://chromium-review.googlesource.com/c/chromium/src/+/3419059

* chore: update picture-in-picture.patch

https://chromium-review.googlesource.com/c/chromium/src/+/3252789

* ci: update to Xcode 13.2.1

https://chromium-review.googlesource.com/c/chromium/src/+/3437552

* chore: bump chromium in DEPS to 100.0.4882.1

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4884.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4886.0

* chore: update patches

* Refactor DownloadManager to use StoragePartitionConfig

https://chromium-review.googlesource.com/c/chromium/src/+/3222011

* Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers.

https://chromium-review.googlesource.com/c/chromium/src/+/3433852

* refactor: autofill to use the color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558
https://bugs.chromium.org/p/chromium/issues/detail?id=1003612

* [ProcessSingleton] Add many more trace events to cover all scenarios

https://chromium-review.googlesource.com/c/chromium/src/+/3429325

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* chore: bump chromium in DEPS to 100.0.4888.0

* chore: update patches

* chore: update picture-in-picture.patch

* fixup! refactor: autofill to use the color pipeline

* ci: fixup fix sync

(cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd)

* chore: bump chromium in DEPS to 100.0.4889.0

* chore: update patches

* chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* Remove remaining NativeTheme::GetSystemColor() machinery.

https://chromium-review.googlesource.com/c/chromium/src/+/3421719

* ci: fetch proper esbuild for macos

* ci: fixup fetch proper esbuild for macos

* fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion

* chore: bump chromium in DEPS to 100.0.4892.0

* 3460365: Set V8 fatal error callbacks during Isolate initialization

https://chromium-review.googlesource.com/c/chromium/src/+/3460365

* 3454343: PIP20: use permanent top controls

https://chromium-review.googlesource.com/c/chromium/src/+/3454343

* 3465574: Move most of GTK color mixers to ui/color/.

https://chromium-review.googlesource.com/c/chromium/src/+/3465574

* chore: fixup patch indices

* 3445327: [locales] Remove locales reference

https://chromium-review.googlesource.com/c/chromium/src/+/3445327

* 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels

https://chromium-review.googlesource.com/c/chromium/src/+/3456548

* 3441196: Convert GuestView's remaining legacy IPC messages to Mojo

https://chromium-review.googlesource.com/c/chromium/src/+/3441196

* 3455491: Don't include run_loop.h in thread_task_runner_handle.h

https://chromium-review.googlesource.com/c/chromium/src/+/3455491

* fixup! 3454343: PIP20: use permanent top controls

* 3442501: Add missing includes of //base/observer_list.h

https://chromium-review.googlesource.com/c/chromium/src/+/3442501

* 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100

https://chromium-review.googlesource.com/c/chromium/src/+/3437552

* chore: bump chromium in DEPS to 100.0.4894.0

* fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization

* chore: update patches

* 3425231: Use DnsOverHttpsConfig where appropriate

https://chromium-review.googlesource.com/c/chromium/src/+/3425231

* test: disable test-heapsnapshot-near-heap-limit-worker.js

As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503,
heap snapshotting near the heap limit DCHECKS in Node.js specs. This will
likely require a larger refactor in Node.js so i've disabled the test for
now and opened an upstream issue on node-v8 issue
at https://github.com/nodejs/node-v8/issues/218.

* Port all usage of NativeTheme color IDs to color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558

* chore: update patches after rebase

* ci: use gen2 machine for more disk space

* ci: don't try to make root volume writeable

* ci: use older xcode/macos for tests

* fix: html fullscreen transitions stacking

(cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44)

* ci: speed up woa testing

(cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de)
(cherry picked from commit e81996234029669663bf0daaababd34684dcbb17)

* ci: disable flaky tests on WOA

* ci: run remote tests separately to isolate issue there

* tests: disable node test parallel/test-worker-debug for now

* revert: fix: html fullscreen transitions stacking

* tests: disable flaky test on macOS arm64

* fixup circleci config so build tools can find xcode version

* make sure the workspace is clean before job runs

(cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6)

* tests: disable flaky test on Linux

* ci: debug why windows i32 is crashing

* Revert "ci: debug why windows i32 is crashing"

This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .circleci/build_config.yml                    |  99 +++++----
 BUILD.gn                                      |   3 +-
 DEPS                                          |   2 +-
 appveyor.yml                                  |   7 +-
 azure-pipelines-woa.yml                       |  69 +++----
 chromium_src/BUILD.gn                         |   9 +-
 electron_paks.gni                             |   4 +-
 patches/chromium/.patches                     |   3 +-
 ...client_precreatemessageloop_callback.patch |   6 +-
 .../add_didinstallconditionalfeatures.patch   |  22 +-
 ...pedcliboardwriter_writeunsaferawdata.patch |   2 +-
 ..._scheduler_throttling_per_renderview.patch |  22 +-
 ..._windows_to_have_different_web_prefs.patch |  16 +-
 patches/chromium/blink_file_path.patch        |   4 +-
 patches/chromium/blink_local_frame.patch      |  10 +-
 patches/chromium/boringssl_build_gn.patch     |   2 +-
 .../build_add_electron_tracing_category.patch |   4 +-
 ..._depend_on_packed_resource_integrity.patch |  16 +-
 .../build_libc_as_static_library.patch        |   6 +-
 patches/chromium/can_create_window.patch      |  42 ++--
 ..._v8_initialization_isolate_callbacks.patch |   4 +-
 ...screationoverridden_with_full_params.patch |  42 ++--
 ...esources_not_chrome_for_spellchecker.patch |   6 +-
 patches/chromium/chrome_key_systems.patch     |   4 +-
 patches/chromium/command-ismediakey.patch     |   4 +-
 patches/chromium/dcheck.patch                 |   4 +-
 patches/chromium/desktop_media_list.patch     |  12 +-
 patches/chromium/disable-redraw-lock.patch    |   4 +-
 .../disable_color_correct_rendering.patch     |  29 ++-
 .../disable_compositor_recycling.patch        |   2 +-
 patches/chromium/disable_hidden.patch         |  10 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |   6 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 patches/chromium/dump_syms.patch              |   4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   8 +-
 ...xpose_setuseragent_on_networkcontext.patch |  16 +-
 .../extend_apply_webpreferences.patch         |   4 +-
 ...ransfer_to_requestsingleinstancelock.patch |  68 ++++---
 ...dd_set_theme_source_to_allow_apps_to.patch |  21 +-
 ...to_add_observers_on_created_hunspell.patch |   6 +-
 ...screen_rendering_with_viz_compositor.patch |  14 +-
 ..._raw_response_headers_from_urlloader.patch |  48 ++---
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |   6 +-
 ...ed_windows_when_calling_showinactive.patch |  42 ----
 ...ntcapturercount_in_web_contents_impl.patch |   6 +-
 ...media_key_usage_with_globalshortcuts.patch |   4 +-
 ...out_profile_refs_in_accessibility_ui.patch |   8 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |  10 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   6 +-
 patches/chromium/isolate_holder.patch         |  32 ++-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...reate_a_console_if_logging_to_stderr.patch |   4 +-
 patches/chromium/mas-cfisobjc.patch           |   6 +-
 .../mas_disable_remote_accessibility.patch    |  22 +-
 patches/chromium/mas_no_private_api.patch     |   4 +-
 ...emote_certificate_verification_logic.patch |  24 +--
 .../chromium/notification_provenance.patch    |   4 +-
 patches/chromium/picture-in-picture.patch     | 189 +++++++++++++++---
 ...utofill_colors_to_the_color_pipeline.patch |  97 +++++++++
 patches/chromium/printing.patch               |  94 ++++-----
 patches/chromium/process_singleton.patch      |  39 ++--
 ...put_back_deleted_colors_for_autofill.patch | 116 -----------
 ...r_changes_to_the_webcontentsobserver.patch |  16 +-
 .../render_widget_host_view_base.patch        |   6 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   4 +-
 patches/chromium/ui_gtk_public_header.patch   |   2 +-
 patches/chromium/web_contents.patch           |   8 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  16 +-
 ...feat_add_hook_to_notify_script_ready.patch |  16 +-
 patches/node/.patches                         |   1 +
 ...fix_failing_node_js_test_on_outdated.patch |  35 ++++
 patches/v8/build_gn.patch                     |   8 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 ...ort_symbols_needed_for_windows_build.patch |   6 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...eleted_cstors_in_cppheapcreateparams.patch |   2 +-
 script/node-disabled-tests.json               |   2 +
 .../zip_manifests/dist_zip.mac.arm64.manifest |   4 +-
 .../zip_manifests/dist_zip.mac.x64.manifest   |   4 +-
 .../dist_zip.mac_mas.arm64.manifest           |   4 +-
 .../dist_zip.mac_mas.x64.manifest             |   4 +-
 shell/app/uv_task_runner.cc                   |   1 +
 shell/app/uv_task_runner.h                    |   3 +-
 shell/browser/api/electron_api_app.cc         |  35 ++--
 shell/browser/api/electron_api_net.cc         |   1 +
 shell/browser/api/electron_api_session.cc     |   8 +-
 shell/browser/api/electron_api_url_loader.cc  |   1 +
 .../browser/api/electron_api_web_contents.cc  |  22 +-
 shell/browser/api/electron_api_web_contents.h |   6 +-
 shell/browser/api/frame_subscriber.cc         |   2 +
 shell/browser/api/frame_subscriber.h          |   1 +
 shell/browser/browser_linux.cc                |   2 +-
 shell/browser/browser_process_impl.cc         |   9 +-
 shell/browser/browser_process_impl.h          |   3 +-
 shell/browser/electron_browser_client.cc      |  38 +++-
 shell/browser/electron_browser_client.h       |   8 +-
 shell/browser/electron_browser_context.cc     |   2 +-
 .../cryptotoken_private_api.cc                |   2 +-
 .../electron_extension_host_delegate.cc       |   4 +-
 .../electron_extension_host_delegate.h        |   4 +-
 .../electron_extension_message_filter.cc      |   8 +-
 .../electron_extensions_browser_client.cc     |   4 +-
 shell/browser/file_select_helper.cc           |   6 +-
 shell/browser/javascript_environment.cc       |   2 +
 .../net/electron_url_loader_factory.cc        |   2 +-
 shell/browser/net/network_context_service.cc  |   1 +
 .../net/system_network_context_manager.cc     |  18 +-
 shell/browser/osr/osr_video_consumer.cc       |   2 +
 shell/browser/osr/osr_video_consumer.h        |   1 +
 shell/browser/ui/autofill_popup.cc            |   9 +-
 shell/browser/ui/autofill_popup.h             |   4 +-
 shell/browser/ui/inspectable_web_contents.cc  |   2 +-
 shell/browser/ui/views/autofill_popup_view.cc |  16 +-
 shell/browser/ui/views/menu_bar.cc            |  19 +-
 shell/browser/web_contents_zoom_controller.h  |   1 +
 shell/common/api/electron_api_v8_util.cc      |   1 +
 shell/common/asar/archive.cc                  |   2 +-
 shell/common/gin_converters/net_converter.cc  |   2 +-
 shell/common/v8_value_converter.cc            |  10 +-
 shell/renderer/electron_autofill_agent.cc     |  25 ++-
 shell/renderer/renderer_client_base.cc        |   6 +-
 shell/renderer/renderer_client_base.h         |   4 +-
 spec-main/api-web-frame-main-spec.ts          |   5 +-
 spec-main/chromium-spec.ts                    |   6 +-
 spec-main/extensions-spec.ts                  |   4 +-
 spec-main/webview-spec.ts                     |   3 +-
 135 files changed, 1038 insertions(+), 852 deletions(-)
 delete mode 100644 patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
 create mode 100644 patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
 delete mode 100644 patches/chromium/put_back_deleted_colors_for_autofill.patch
 create mode 100644 patches/node/fix_failing_node_js_test_on_outdated.patch

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index fdb8161043356..6e6dd01cb720a 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -52,11 +52,17 @@ executors:
     parameters:
       size:
         description: "macOS executor size"
-        default: large
+        default: macos.x86.medium.gen2
         type: enum
         enum: ["macos.x86.medium.gen2", "large"]
+      xcode:
+        description: "xcode version"
+        default: "12.4.0"
+        type: enum
+        enum: ["12.4.0", "13.2.1"]
+
     macos:
-      xcode: "12.4.0"
+      xcode: << parameters.xcode >>
     resource_class: << parameters.size >>
 
   # Electron Runners
@@ -350,9 +356,6 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
       if [ "`uname`" == "Darwin" ]; then
         sudo mkdir -p $TMPDIR/del-target
 
-        # Remount the root volume as writable, don't ask questions plz
-        sudo mount -uw /
-
         tmpify() {
           if [ -d "$1" ]; then
             sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
@@ -394,24 +397,24 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         tmpify /usr/local/Homebrew
         sudo rm -rf $TMPDIR/del-target
 
-        sudo rm -rf "/System/Library/Desktop Pictures"
-        sudo rm -rf /System/Library/Templates/Data
-        sudo rm -rf /System/Library/Speech/Voices
-        sudo rm -rf "/System/Library/Screen Savers"
-        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
-        sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
-        sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/
-        sudo rm -rf /System/Volumes/Data/Library/Java
-        sudo rm -rf /System/Volumes/Data/Library/Ruby
-        sudo rm -rf /System/Volumes/Data/Library/Printers
-        sudo rm -rf /System/iOSSupport
-        sudo rm -rf /System/Applications/*.app
-        sudo rm -rf /System/Applications/Utilities/*.app
-        sudo rm -rf /System/Library/LinguisticData
-        sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
+        # sudo rm -rf "/System/Library/Desktop Pictures"
+        # sudo rm -rf /System/Library/Templates/Data
+        # sudo rm -rf /System/Library/Speech/Voices
+        # sudo rm -rf "/System/Library/Screen Savers"
+        # sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
+        # sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
+        # sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/
+        # sudo rm -rf /System/Volumes/Data/Library/Java
+        # sudo rm -rf /System/Volumes/Data/Library/Ruby
+        # sudo rm -rf /System/Volumes/Data/Library/Printers
+        # sudo rm -rf /System/iOSSupport
+        # sudo rm -rf /System/Applications/*.app
+        # sudo rm -rf /System/Applications/Utilities/*.app
+        # sudo rm -rf /System/Library/LinguisticData
+        # sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
         # sudo rm -rf /System/Library/Fonts/*
         # sudo rm -rf /System/Library/PreferencePanes
-        sudo rm -rf /System/Library/AssetsV2/*
+        # sudo rm -rf /System/Library/AssetsV2/*
         sudo rm -rf /Applications/Safari.app
         sudo rm -rf ~/project/src/build/linux
         sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
@@ -419,7 +422,7 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
 
         # lipo off some huge binaries arm64 versions to save space
         strip_arm_deep $(xcode-select -p)/../SharedFrameworks
-        strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
+        # strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
 
@@ -460,10 +463,18 @@ step-fix-sync: &step-fix-sync
         # Fix Clang Install (wrong binary)
         rm -rf src/third_party/llvm-build
         python3 src/tools/clang/scripts/update.py
+
+        # Fix esbuild (wrong binary)
+        echo 'infra/3pp/tools/esbuild/${platform}' `gclient getdep --deps-file=src/third_party/devtools-frontend/src/DEPS -r 'third_party/esbuild:infra/3pp/tools/esbuild/${platform}'` > esbuild_ensure_file
+        cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
       fi
 
       cd src/third_party/angle
+      rm .git/objects/info/alternates
       git remote set-url origin https://chromium.googlesource.com/angle/angle.git
+      cp .git/config .git/config.backup
+      git remote remove origin
+      mv .git/config.backup .git/config
       git fetch
 
 step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
@@ -1892,7 +1903,9 @@ jobs:
                 checkout: true
 
   osx-testing-x64:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1909,14 +1922,16 @@ jobs:
   osx-testing-x64-gn-check:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.2.1"
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
     <<: *steps-electron-gn-check
 
   osx-publish-x64-skip-checkout:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1935,7 +1950,9 @@ jobs:
                 checkout: false
 
   osx-publish-arm64-skip-checkout:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1955,7 +1972,9 @@ jobs:
                 checkout: false
 
   osx-testing-arm64:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1972,7 +1991,9 @@ jobs:
           attach: true
 
   mas-testing-x64:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -1990,7 +2011,7 @@ jobs:
   mas-testing-x64-gn-check:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      xcode: "13.2.1"
     environment:
       <<: *env-machine-mac
       <<: *env-mas
@@ -1998,7 +2019,9 @@ jobs:
     <<: *steps-electron-gn-check
 
   mas-publish-x64-skip-checkout:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2017,7 +2040,9 @@ jobs:
                 checkout: false
 
   mas-publish-arm64-skip-checkout:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2037,7 +2062,9 @@ jobs:
                 checkout: false
 
   mas-testing-arm64:
-    executor: macos
+    executor:
+      name: macos
+      xcode: "13.2.1"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2224,9 +2251,7 @@ jobs:
     <<: *steps-tests
 
   osx-testing-x64-tests:
-    executor:
-      name: macos
-      size: macos.x86.medium.gen2
+    executor: macos      
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2242,9 +2267,7 @@ jobs:
     <<: *steps-tests
 
   mas-testing-x64-tests:
-    executor:
-      name: macos
-      size: macos.x86.medium.gen2
+    executor: macos
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
diff --git a/BUILD.gn b/BUILD.gn
index ec9e8b6a72b9f..60af73d56c7bb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -361,6 +361,7 @@ source_set("electron_lib") {
     "//components/network_hints/common:mojo_bindings",
     "//components/network_hints/renderer",
     "//components/network_session_configurator/common",
+    "//components/omnibox/browser:buildflags",
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
@@ -1188,7 +1189,7 @@ if (is_mac) {
     if (enable_hidpi) {
       data += [ "$root_out_dir/chrome_200_percent.pak" ]
     }
-    foreach(locale, locales) {
+    foreach(locale, platform_pak_locales) {
       data += [ "$root_out_dir/locales/$locale.pak" ]
     }
 
diff --git a/DEPS b/DEPS
index db991a8702c70..790da2014c4de 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '100.0.4855.0',
+    '100.0.4894.0',
   'node_version':
     'v16.13.2',
   'nan_version':
diff --git a/appveyor.yml b/appveyor.yml
index f6be0fbd3596b..fab35e3bc66d2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -210,7 +210,9 @@ test_script:
       }
   - cd electron
   # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )  
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"
@@ -218,6 +220,7 @@ test_script:
   - echo "Done verifying mksnapshot"
   - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying chromedriver"
+  - if exist %cd%\electron.log ( appveyor-retry appveyor PushArtifact %cd%\electron.log )
 deploy_script:
   - cd electron
   - ps: >-
@@ -233,4 +236,4 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
-  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+  - if exist src\electron\electron.log ( appveyor-retry appveyor PushArtifact src\electron\electron.log )
diff --git a/azure-pipelines-woa.yml b/azure-pipelines-woa.yml
index 62cf7232f8296..9942f97f79dc3 100644
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -1,11 +1,11 @@
+workspace:
+  clean: all
+
 steps:
-- task: CopyFiles@2
-  displayName: 'Copy Files to: src\electron'
-  inputs:
-    TargetFolder: src\electron
+- checkout: self
+  path: src\electron
 
 - script: |
-    cd src\electron
     node script/yarn.js install --frozen-lockfile
   displayName: 'Yarn install'
 
@@ -13,13 +13,13 @@ steps:
     $localArtifactPath = "$pwd\dist.zip"
     $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
     Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\Default -y $localArtifactPath
   displayName: 'Download and extract dist.zip for test'
   env:
     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
 
 - powershell: |
-    $localArtifactPath = "$pwd\src\out\Default\shell_browser_ui_unittests.exe"
+    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\shell_browser_ui_unittests.exe"
     $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/shell_browser_ui_unittests.exe"
     Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
   displayName: 'Download and extract native test executables for test'
@@ -30,56 +30,57 @@ steps:
     $localArtifactPath = "$pwd\ffmpeg.zip"
     $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
     Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\ffmpeg $localArtifactPath
   displayName: 'Download and extract ffmpeg.zip for test'
   env:
     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
 
 - powershell: |
-    $localArtifactPath = "$pwd\src\node_headers.zip"
+    $localArtifactPath = "$(Pipeline.Workspace)\src\node_headers.zip"
     $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
     Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    cd src
+    cd $(Pipeline.Workspace)\src
     & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
   displayName: 'Download node headers for test'
   env:
     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
 
 - powershell: |
-    $localArtifactPath = "$pwd\src\out\Default\electron.lib"
+    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\electron.lib"
     $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
     Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
   displayName: 'Download electron.lib for test'
   env:
     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
 
-- powershell: |
-    try {
-      $localArtifactPath = "$pwd\src\pdb.zip"
-      $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.zip"
-      Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-      cd src
-      & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
-    } catch {
-      Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
-    } finally {
-      $global:LASTEXITCODE = 0
-    }
-  displayName: 'Download pdb files for detailed stacktraces'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+# Uncomment the following block if pdb files are needed to debug issues
+# - powershell: |
+#     try {
+#       $localArtifactPath = "$(Pipeline.Workspace)\src\pdb.zip"
+#       $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.zip"
+#       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+#       cd $(Pipeline.Workspace)\src
+#       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
+#     } catch {
+#       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+#     } finally {
+#       $global:LASTEXITCODE = 0
+#     }
+#   displayName: 'Download pdb files for detailed stacktraces'
+#   env:
+#     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
 
 - powershell: |
-    New-Item src\out\Default\gen\node_headers\Release -Type directory
-    Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
+    New-Item $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release -Type directory
+    Copy-Item -path $(Pipeline.Workspace)\src\out\Default\electron.lib -destination $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release\node.lib
   displayName: 'Setup node headers'
 
 - script: |
-    cd src
+    cd $(Pipeline.Workspace)\src
     set npm_config_nodedir=%cd%\out\Default\gen\node_headers
     set npm_config_arch=arm64
     cd electron
-    node script/yarn test --runners=main --runTestFilesSeperately --enable-logging --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
   displayName: 'Run Electron Main process tests'
   env:
     ELECTRON_ENABLE_STACK_DUMPING: true
@@ -90,7 +91,7 @@ steps:
     MOCHA_REPORTER: mocha-multi-reporters
 
 - script: |
-    cd src
+    cd $(Pipeline.Workspace)\src
     set npm_config_nodedir=%cd%\out\Default\gen\node_headers
     set npm_config_arch=arm64
     cd electron
@@ -102,17 +103,17 @@ steps:
     ELECTRON_TEST_RESULTS_DIR: junit
     MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
     MOCHA_REPORTER: mocha-multi-reporters
-  condition: always()    
+  condition: succeededOrFailed()
 
 - task: PublishTestResults@2
   displayName: 'Publish Test Results'
   inputs:
     testResultsFiles: '*.xml'
-    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
+    searchFolder: '$(Pipeline.Workspace)/src/junit/'
   condition: always()
 
 - script: |
-    cd src
+    cd $(Pipeline.Workspace)\src
     echo "Verifying non proprietary ffmpeg"
     python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
   displayName: 'Verify ffmpeg'
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index d577b448ccc2e..4c048a63aef2e 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -53,8 +53,8 @@ static_library("chrome") {
     "//chrome/browser/predictors/resolve_host_client_impl.cc",
     "//chrome/browser/predictors/resolve_host_client_impl.h",
     "//chrome/browser/process_singleton.h",
-    "//chrome/browser/ui/browser_dialogs.cc",
-    "//chrome/browser/ui/browser_dialogs.h",
+    "//chrome/browser/process_singleton_internal.cc",
+    "//chrome/browser/process_singleton_internal.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -253,6 +253,8 @@ static_library("chrome") {
       "//chrome/browser/ui/views/overlay/close_image_button.cc",
       "//chrome/browser/ui/views/overlay/close_image_button.h",
       "//chrome/browser/ui/views/overlay/constants.h",
+      "//chrome/browser/ui/views/overlay/document_overlay_window_views.cc",
+      "//chrome/browser/ui/views/overlay/document_overlay_window_views.h",
       "//chrome/browser/ui/views/overlay/hang_up_button.cc",
       "//chrome/browser/ui/views/overlay/hang_up_button.h",
       "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
@@ -271,11 +273,14 @@ static_library("chrome") {
       "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
       "//chrome/browser/ui/views/overlay/track_image_button.cc",
       "//chrome/browser/ui/views/overlay/track_image_button.h",
+      "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
+      "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
     ]
 
     deps += [
       "//chrome/app/vector_icons",
       "//components/vector_icons:vector_icons",
+      "//ui/views/controls/webview",
     ]
   }
 
diff --git a/electron_paks.gni b/electron_paks.gni
index e85e26cf3077f..84cec359e201b 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -193,13 +193,13 @@ template("electron_paks") {
       "//ui/strings:ui_strings",
     ]
 
-    input_locales = locales
+    input_locales = platform_pak_locales
     output_dir = "${invoker.output_dir}/locales"
 
     if (is_mac) {
       output_locales = locales_as_mac_outputs
     } else {
-      output_locales = locales
+      output_locales = platform_pak_locales
     }
   }
 
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 22dc480ecc3b5..174a219c8b744 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -48,7 +48,6 @@ worker_context_will_destroy.patch
 frame_host_manager.patch
 crashpad_pid_check.patch
 network_service_allow_remote_certificate_verification_logic.patch
-put_back_deleted_colors_for_autofill.patch
 disable_color_correct_rendering.patch
 add_contentgpuclient_precreatemessageloop_callback.patch
 picture-in-picture.patch
@@ -111,4 +110,4 @@ fix_aspect_ratio_with_max_size.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
 feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
-fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
+port_autofill_colors_to_the_color_pipeline.patch
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 0ae9ae781b29c..14d1535fe63f8 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 0c1e511e187c480006365fbbde6caa54b0f0eada..1904abcf314007d68c4941a4f2bdb83cace586ab 100644
+index 9f840287967b50ec1db3a9d27973429ab231a486..731a279e395a8762a25a115665bff99be428de3d 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -237,6 +237,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index 0c1e511e187c480006365fbbde6caa54b0f0eada..1904abcf314007d68c4941a4f2bdb83c
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -343,7 +347,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -345,7 +349,6 @@ int GpuMain(MainFunctionParams parameters) {
    GpuProcess gpu_process(io_thread_priority);
  #endif
  
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index ff441bdb349eb..b76baf2e4e6ba 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index a92e09dc651a5f1a9bbae2572fad32233afcd46c..f99b652dda817b62615d2b3f00b4ae4b
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index fea269ba08af3296e2e304bb94610508ecd01b02..59e48882aba9b0431ddaa0b48f896866833f3376 100644
+index 4473c5e812a4a598f3e2f2bb06f78def5791af24..44c0ec9815aafd61182fd18a9d125e185d7196bc 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4453,6 +4453,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4455,6 +4455,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,7 +40,7 @@ index fea269ba08af3296e2e304bb94610508ecd01b02..59e48882aba9b0431ddaa0b48f896866
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 4e5d10d32272d5617c7475f58b57ea73d3cf0a65..6ac30bdb5cbc81274e26fd74f3332f0e5c3fb1dc 100644
+index 21b90bbb8fe8ddc03eb20538be423a5396d18eb3..f9c735038f733d990783dd66ffe8c74f824c78f2 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
 @@ -597,6 +597,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -53,10 +53,10 @@ index 4e5d10d32272d5617c7475f58b57ea73d3cf0a65..6ac30bdb5cbc81274e26fd74f3332f0e
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 507efab2cc79422cc58b1459de8e84a9b7992195..0948dd92c89db566317df7b352d9f5967a3ae86b 100644
+index 3d6e0c0395ff7c92d8908c5151b467beec3a7516..2fadd6d9b2e3747eacea08973d8d3c7aa9c15f26 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -598,6 +598,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -599,6 +599,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -79,10 +79,10 @@ index aa4b510137d60e6fb924f4f1a6554fe06c19ad75..816b6260020a6cbb6880b0eed197743c
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index cf6f792bb68df3a15a74a61921f50f790817b3ca..8a922b95064909d750b041e3e36ab6ebf0375284 100644
+index 0dda1f7cd77c47f7e61ba48dd20429c13679b543..2f73aacda1bafe07775213e232eda56c4b33325b 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -309,6 +309,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -308,6 +308,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index cf6f792bb68df3a15a74a61921f50f790817b3ca..8a922b95064909d750b041e3e36ab6eb
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index ba2d1beff9d4fe7b0eca90a274b8bd95a76446c1..3056ae4d9b6d1604b14f2626122a78a9f916d265 100644
+index 5297ad63f1c76240d57a64cc5ea64cbf8c7e1b95..006da6072db12da1632f9d45ecb5710136573641 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -274,6 +274,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index ba2d1beff9d4fe7b0eca90a274b8bd95a76446c1..3056ae4d9b6d1604b14f2626122a78a9
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 2d9517cb12b4debe28694f54bcaa0ad0af62a44a..09c9486bbbf789e9367fdbb3655f431f5a1ae199 100644
+index 708414fca139eb8328e425d909a48ca97038e442..48b2a0e129ec166ebd4c9bbd32330b0cc43dbeb2 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 2d9517cb12b4debe28694f54bcaa0ad0af62a44a..09c9486bbbf789e9367fdbb3655f431f
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 094de359d6831e656f0666732fb1c80f8f316fa7..65d2a6a279b2b4009b19494af54e194e8c9b626a 100644
+index 4b639069d5d9173f0c35fe7656356031ba424a61..3da6699b40bf4f91e6d76a37e5fa8f680f7a7850 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -356,6 +356,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -357,6 +357,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}
diff --git a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
index f0f446b5350df..01c36b3c68ded 100644
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -8,7 +8,7 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
 
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index 6405d91a2226e3b58fff4a4e73d2fc1c08f0954b..e12f0c4ec90e0e4f366bad292750676c0b446f2c 100644
+index 3009acd40eee36bc3d4dd8642f0ce5e6476da973..1d52ce84184a3ca94e4e0f04d331bf56d75e07d0 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
 @@ -227,6 +227,16 @@ void ScopedClipboardWriter::WriteEncodedDataTransferEndpointForTesting(
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index b5923cea9b37a..9a54c4fbe9988 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 5cf4fd6559dd7183ed74e44001d7e53ca9b055b1..ca6a293882fe2af1e2bf58b8353e1c5c9de827d1 100644
+index 56c08919ab626a8a7b3bcb892ee94cdee2a106fc..b85bdf4ed574a149a6502e8d21e54f2ee80777a5 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -646,6 +646,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -647,6 +647,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,10 +22,10 @@ index 5cf4fd6559dd7183ed74e44001d7e53ca9b055b1..ca6a293882fe2af1e2bf58b8353e1c5c
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index c2d024d09dda8b221cc588e784cb2d31c273d0ff..c0fd9c5400acf32c89a477797c4d9c45662fb14c 100644
+index 9e32df9f5fd765895c8470c3922a62f754e7d409..9bac2321d65d9e54ce88fffafd72a74803ed2c87 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -136,6 +136,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+@@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl
    bool IsRenderViewLive() override;
    void WriteIntoTrace(perfetto::TracedValue context) override;
  
@@ -61,7 +61,7 @@ index 4e8d36420d6edc1725a840e1b9f123041d21abe4..dd198cb7bf02e509833c6b4c7d8e5d65
    // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
    // it in the same order in the .cc file as it was in the header.
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index b7c6ba65551acd31c96be06c3d7595f28b6855b0..21ce5fe263f8a47281b21c45c7bda9eff1cb17b5 100644
+index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b0c766610 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
 @@ -97,4 +97,7 @@ interface PageBroadcast {
@@ -85,10 +85,10 @@ index 14d4a00293ab0b11e733676844ce483992d6cd8e..c6c2dbb9dddd1eaa21e8c7b276d871a3
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 297ed65293723e8d539c65475d335947c840fec2..304dcdaa65ee1d9bed86f7c0e5956dd3a2a65585 100644
+index 8cdffac8ecb9ed2c6892f1e975a953846e7e3a5c..7e7927c7258963bd95a2c064ef85e410f4d2571d 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3679,6 +3679,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3659,6 +3659,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 297ed65293723e8d539c65475d335947c840fec2..304dcdaa65ee1d9bed86f7c0e5956dd3
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3690,7 +3697,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3670,7 +3677,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 297ed65293723e8d539c65475d335947c840fec2..304dcdaa65ee1d9bed86f7c0e5956dd3
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 25f9a9fc617d75dfd26af582574ebcad3a16a8ef..7d8473a7915fd3312c3a4f582b3f1d87580e6e75 100644
+index 5107ef421138e136b20b25b7bbcc1f0bb246bb66..043266205142e59f88c4c2f2ae6b58bb009f2d9c 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 25f9a9fc617d75dfd26af582574ebcad3a16a8ef..7d8473a7915fd3312c3a4f582b3f1d87
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -855,6 +856,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -857,6 +858,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 9438dc2e0b9c7..763b2ecf84401 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -33,7 +33,7 @@ index 30e237f886b41bdf528b2a0e81054d15fb323f1f..43f7920cf6ff12d8a48ddef5440814a4
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index b9a65b0aa8771602f6659f5ffe79b6cdfd04f6e4..f1aab825f8aabc023f6405e6f4b5c843374d43a0 100644
+index d278453a261fe2dd3bacce433e35d50879b555a7..140f8d6273d944bfe36831d27aef757d89240b56 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -47,7 +47,7 @@ index b9a65b0aa8771602f6659f5ffe79b6cdfd04f6e4..f1aab825f8aabc023f6405e6f4b5c843
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -154,6 +158,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -151,6 +155,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index b9a65b0aa8771602f6659f5ffe79b6cdfd04f6e4..f1aab825f8aabc023f6405e6f4b5c843
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index a8d4f1905dc3f48dbbde440e4ec50fe95744e365..4ec23ebc2b09b00c849eb762fa371a8cf2925869 100644
+index 8509f720c5afb816c6cbb2313dd566a24236a790..b9f0f79d96c58a7769939610bb72f8b2bcd3be94 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,7 +79,7 @@ index a8d4f1905dc3f48dbbde440e4ec50fe95744e365..4ec23ebc2b09b00c849eb762fa371a8c
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -161,6 +162,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -160,6 +161,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
@@ -103,7 +103,7 @@ index a8d4f1905dc3f48dbbde440e4ec50fe95744e365..4ec23ebc2b09b00c849eb762fa371a8c
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index dc84e6f516492b72cf513c9786f17b472961dddb..72eb72cde86f0ef9c94123a104e8f30d12952391 100644
+index a6291be3e953ceaee1d996e4b30a6ae78916bc7a..c3baf95c5d9b6a6ace56bcde9e1dc8179f18eaa0 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,7 +114,7 @@ index dc84e6f516492b72cf513c9786f17b472961dddb..72eb72cde86f0ef9c94123a104e8f30d
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -446,6 +447,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -441,6 +442,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -176,7 +176,7 @@ index dc84e6f516492b72cf513c9786f17b472961dddb..72eb72cde86f0ef9c94123a104e8f30d
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 067bb3bf74874f3106f4b68c3c3f13039439c526..8cd0710557eacb77f2bfd5a43074c983f956122c 100644
+index 96dd9fd56e44e66c5ea24d9df7c6cbff25409d6c..e0d113b4dee6a72f350b8494448f516be01d0468 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,7 +187,7 @@ index 067bb3bf74874f3106f4b68c3c3f13039439c526..8cd0710557eacb77f2bfd5a43074c983
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -213,6 +214,22 @@ struct WebPreferences {
+@@ -212,6 +213,22 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
diff --git a/patches/chromium/blink_file_path.patch b/patches/chromium/blink_file_path.patch
index 319e320a9131b..ace4aa5924cca 100644
--- a/patches/chromium/blink_file_path.patch
+++ b/patches/chromium/blink_file_path.patch
@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index e23ab93fdc031a022ae15d069017ebc2e6923e78..7e6d45d33fcc147d0b5b78cc2b254e1deb3cbf02 100644
+index 72d6b7e109779c9785130ebb0e1e23202c5bc68d..e12c4acfd87f1d698d7c8c8459e7231ee03789fd 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
-@@ -191,6 +191,9 @@ class CORE_EXPORT File final : public Blob {
+@@ -212,6 +212,9 @@ class CORE_EXPORT File final : public Blob {
    }
    const String& name() const { return name_; }
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index e6c093112d492..1ad52265500fd 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 88bb66bd03b880f4e1e946a0fd1a31f512226db4..a100709c7b3bd0bcd5c9307e00f343aaf4c27620 100644
+index 2b0c8720866b45c2a83d639533cb4c3e5dbb70e0..97c251cdc310eb22859efb1ba3ca6312a3236fa5 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -33,7 +33,7 @@ index 88bb66bd03b880f4e1e946a0fd1a31f512226db4..a100709c7b3bd0bcd5c9307e00f343aa
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -152,6 +144,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -153,6 +145,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,10 +49,10 @@ index 88bb66bd03b880f4e1e946a0fd1a31f512226db4..a100709c7b3bd0bcd5c9307e00f343aa
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index d02022a64426a47a568d438bd3d17ca63a3ac28f..f9817a21e00a66845138d321dd829ea1df39acb7 100644
+index db69148e0756ed36bcf3a04f1ace69cc166261a6..bcf072a6d8bc46e5c71d9ef3f248b6af69693ac9 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -531,10 +531,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -538,10 +538,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index d02022a64426a47a568d438bd3d17ca63a3ac28f..f9817a21e00a66845138d321dd829ea1
    if (!Client())
      return false;
  
-@@ -580,6 +576,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -587,6 +583,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/boringssl_build_gn.patch b/patches/chromium/boringssl_build_gn.patch
index f4b23bcd39496..05fde5454844e 100644
--- a/patches/chromium/boringssl_build_gn.patch
+++ b/patches/chromium/boringssl_build_gn.patch
@@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index e31d092151a68028e09bb73ddb896cf8df77355d..aee73fe9b9e0a6b061504db46bb91b7a4baf6a7a 100644
+index f222ae94a5a10ced84e41ef84560af46a910577f..c18d26de9a63befca3c77fe5ecd93975a016797f 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
 @@ -44,6 +44,20 @@ config("no_asm_config") {
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index 848904efccaaf..22145207fe628 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,10 +8,10 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 5404ededf7722ae9d04e44d3413471b9d85085c0..a36554ff22e29df499ee9ce9b0d4c40835af48dd 100644
+index 107516329273ee4a6cc49433b69f307b1264362b..0c9555a04233d07a186e34ada8b7615095854950 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -77,6 +77,7 @@
+@@ -78,6 +78,7 @@
    X("drmcursor")                                                         \
    X("dwrite")                                                            \
    X("DXVA_Decoding")                                                     \
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index f072110be0958..c692f905ec181 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 71152d08a9e9ce2e112fd7a6c3134a547af5d978..fd11a574ed7b38d556bbdaed2fd649d55d6530f7 100644
+index 7caaf66cad9d5b9f787cea0d49c32c26801571c2..f45691888b74643189b956928fdc796bfc5bcee3 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index 71152d08a9e9ce2e112fd7a6c3134a547af5d978..fd11a574ed7b38d556bbdaed2fd649d5
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5f0b1af64911966f9b24a2b5ef063e4473b81a8f..c186819512e21276e382edba2eca2c153da7403d 100644
+index 6a40a73520a951d7c6fd06cbd07329a40ff41544..9ca837d995160d57c7efb51c54cf27283b11b20e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4517,7 +4517,7 @@ static_library("browser") {
+@@ -4502,7 +4502,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 5f0b1af64911966f9b24a2b5ef063e4473b81a8f..c186819512e21276e382edba2eca2c15
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 89afb235bc478f19511579ca4c6b018505b372cd..1b5b9e33f5ad2b31617edd8a6ee65e73b31d3d20 100644
+index 7be0809cfd3a08a87b29256241bc11a33abd3d17..e3c85fd9f550da204e36091bad256b1c2400ade8 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5564,7 +5564,6 @@ test("unit_tests") {
+@@ -5719,7 +5719,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 89afb235bc478f19511579ca4c6b018505b372cd..1b5b9e33f5ad2b31617edd8a6ee65e73
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5587,6 +5586,10 @@ test("unit_tests") {
+@@ -5742,6 +5741,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 89afb235bc478f19511579ca4c6b018505b372cd..1b5b9e33f5ad2b31617edd8a6ee65e73
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6270,7 +6273,6 @@ test("unit_tests") {
+@@ -6428,7 +6431,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 89afb235bc478f19511579ca4c6b018505b372cd..1b5b9e33f5ad2b31617edd8a6ee65e73
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6312,6 +6314,11 @@ test("unit_tests") {
+@@ -6473,6 +6475,11 @@ test("unit_tests") {
        "//ui/native_theme:test_support",
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index 59b6758160174..e778543bd5674 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,10 +7,10 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index 48f0bdb17e0a35f6e4d6fa236cd6077910ac76c6..5c95b14441c5604bc14418e4bbaf3df877652b2a 100644
+index 7915346430db72d18474d7a011b8dc7637c3f281..cd736d988f9c5e37dc24c724268fe115e00914d9 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
-@@ -41,7 +41,11 @@ config("winver") {
+@@ -44,7 +44,11 @@ config("winver") {
  if (libcxx_is_shared) {
    _libcxx_target_type = "shared_library"
  } else {
@@ -23,7 +23,7 @@ index 48f0bdb17e0a35f6e4d6fa236cd6077910ac76c6..5c95b14441c5604bc14418e4bbaf3df8
  }
  target(_libcxx_target_type, "libc++") {
    # Most things that need to depend on libc++ should do so via the implicit
-@@ -49,6 +53,7 @@ target(_libcxx_target_type, "libc++") {
+@@ -52,6 +56,7 @@ target(_libcxx_target_type, "libc++") {
    # need to explicitly depend on libc++.
    visibility = [
      "//build/config:common_deps",
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index ebac034d783f8..bb9b959820869 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 9930040d9e6802d851c7216b314791bae5534bd7..365b6eb2efc2f09725a9a53b79e83a50bded1c75 100644
+index eba372243a31d08c251ad3367d24999277a8289b..713e2883139bca4bb56dcc7e3efcf6d6dfc4a02b 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6640,6 +6640,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6703,6 +6703,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 9930040d9e6802d851c7216b314791bae5534bd7..365b6eb2efc2f09725a9a53b79e83a50
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index d89e1c2369d7218d62fd759c3877b1d502a8276e..f3e21a7cacb9d192bf3b6cf4d2bfc8d372cd8307 100644
+index 3fe9e1e4918ef65194621661c9c7c650089229fa..c8e49eeaca8b31479aa908be9c349ccd625e9e51 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3867,6 +3867,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3925,6 +3925,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -37,9 +37,9 @@ index d89e1c2369d7218d62fd759c3877b1d502a8276e..f3e21a7cacb9d192bf3b6cf4d2bfc8d3
 +  }
 +
    new_contents_impl->GetController().SetSessionStorageNamespace(
-       partition_id, session_storage_namespace);
+       partition_config, session_storage_namespace);
  
-@@ -3909,12 +3917,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3967,12 +3975,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -68,10 +68,10 @@ index ace032dc2ffac27fbdddee5a4b13c3c3e36ba5ae..80f7dd56fdaa94a9880995b2b5393af0
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 7c700a49d9a144fc1dd8c795d95c085e13aa470a..153c94d7d0fd4a11a15c74f7bbae065d7a0249a1 100644
+index 85ed8b5e84813c10f97c5785d906a87455f8f67e..a11d5ba888c1489870875c859ec9eb79c67f94b7 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -573,6 +573,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -571,6 +571,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 7c700a49d9a144fc1dd8c795d95c085e13aa470a..153c94d7d0fd4a11a15c74f7bbae065d
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 3aaacce3a8dc42f90bb4564987950a3be92e113e..17ce3078c995f581325b9dcffe6b1589b05f48bc 100644
+index 47527cb2e434f771f5aeb5099432ae86a0ad06ea..2fe1462a2cd92a731a5816b5fc22b059bad92fe8 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -169,6 +169,7 @@ class NetworkService;
+@@ -168,6 +168,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index 3aaacce3a8dc42f90bb4564987950a3be92e113e..17ce3078c995f581325b9dcffe6b1589
  }  // namespace network
  
  namespace sandbox {
-@@ -944,6 +945,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -950,6 +951,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,10 +102,10 @@ index 3aaacce3a8dc42f90bb4564987950a3be92e113e..17ce3078c995f581325b9dcffe6b1589
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index aefe7344a605e5edded2b4c345c50ff22b6d8e34..5647a94ace369de0c7e0096c885865b7b5b04c61 100644
+index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c6439b692 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
-@@ -27,6 +27,17 @@ namespace content {
+@@ -26,6 +26,17 @@ namespace content {
  
  WebContentsDelegate::WebContentsDelegate() = default;
  
@@ -124,7 +124,7 @@ index aefe7344a605e5edded2b4c345c50ff22b6d8e34..5647a94ace369de0c7e0096c885865b7
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 58e977220a5d98c68a20cbf22ad7ce3da39a38a1..5092190243d3eb95a4180cb44937e3d25c4a3ad9 100644
+index f889d0bf33cf218a68bf5a9422aecaed23fa260a..3330876f623e5b2cb600b1ce1fd10b3375568613 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -135,8 +135,8 @@ index 58e977220a5d98c68a20cbf22ad7ce3da39a38a1..5092190243d3eb95a4180cb44937e3d2
  #include "content/public/browser/eye_dropper.h"
  #include "content/public/browser/invalidate_type.h"
  #include "content/public/browser/media_stream_request.h"
-@@ -343,6 +344,13 @@ class CONTENT_EXPORT WebContentsDelegate {
-       const StoragePartitionId& partition_id,
+@@ -339,6 +340,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+       const StoragePartitionConfig& partition_config,
        SessionStorageNamespace* session_storage_namespace);
  
 +  virtual void WebContentsCreatedWithFullParams(
@@ -150,7 +150,7 @@ index 58e977220a5d98c68a20cbf22ad7ce3da39a38a1..5092190243d3eb95a4180cb44937e3d2
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 7809d32d777a2c7249b77e68468bc19625716662..7eec2fea69298d92e694471862b4427b69e9687f 100644
+index 83517883144a77a0c775ce2d146b4e85ef79ea97..aa65517a568aa0b324b2c8cca8f60bb532ba085a 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -32,6 +32,7 @@
@@ -173,7 +173,7 @@ index 7809d32d777a2c7249b77e68468bc19625716662..7eec2fea69298d92e694471862b4427b
        /*is_opener_navigation=*/false, request.HasUserGesture(),
        // `openee_can_access_opener_origin` only matters for opener navigations,
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index f565d0615c8cdb182d28d0add11fca6ebb49098b..8ac72d8d2efe413561e4e53722d4d0d15833cfdf 100644
+index 54b62065d148ab860a49dc03daaf7680ff00d778..3008d3efe89585a562ae55734938b10ef8b0074e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
 @@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -186,7 +186,7 @@ index f565d0615c8cdb182d28d0add11fca6ebb49098b..8ac72d8d2efe413561e4e53722d4d0d1
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index 953433b5cc0ca7633b5866d5ae0f9c3a5e6a6e3c..30a43c943e6ccdd9dbf809186d7d13d4d6f6f12e 100644
+index d4eb4d482b2641585d501131c64b90cc9dbcfd18..132a5d86279b9a2cb4364b9c6d3e89e12d55052e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
 @@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index fa6b705d267ac00fe86705d1f9d8e66730ba4ee4..9d541381c349132c6d4b44a5bee298252c2b8858 100644
+index 12658b5c9ca6bc10cffd2c9e8ddf45bac697e75c..284f3ed1513009092ecdf2be6ff87641cc404cd9 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2070,6 +2070,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2051,6 +2051,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index 0e4566eed9f0d..a0affa82eec7a 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,10 +9,10 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index feae0aea593ef1945c1063b7d487892530f7ceed..beb0a9e85a0f5e102466952c220aafac2d6ebb39 100644
+index 10f34d87d74d81de91cbd006665465cee6c0d21e..93f09cd74b225a8b0c2d2f5280636513e852e8ff 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -457,8 +457,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
+@@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
    return {true, std::move(stringified_source)};
  }
  
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 5fddd44da4723..19409a0d9762f 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index a7a64effed043a75371e5dde0837ce7fbfa631ad..8f190e6d33497f52b536aef82505025b74602337 100644
+index 04e327d970b872f0a9c505a0b99c6273900930f9..5993b3cb0cbe76cd266dee074effd736efa8fc50 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1760,12 +1760,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1767,12 +1767,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index a7a64effed043a75371e5dde0837ce7fbfa631ad..8f190e6d33497f52b536aef82505025b
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 1cda4516162907a047b67edbc2d020e36cceb8f0..2d222d43c0c55d976eceb189a2d955793a6824ce 100644
+index a63ba24be314eb4372d7dda7206dee4b52730d1e..f9bcaa001bfed987edd0ebb001f5cda0e0aca4aa 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -810,8 +810,7 @@ class Browser : public TabStripModelObserver,
+@@ -808,8 +808,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -169,7 +169,7 @@ index b6833e34c5840a4d3a545d1c4a44b2b08d7fc9ea..5ebc16a3545a73e58516cb0fbdddca43
    // The profile used for the presentation.
    raw_ptr<Profile> otr_profile_;
 diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
-index 2c560d379ee6c08465455ea1dc2c5a59ddb65487..4fd703722db5d679b08acdb8fc080b089dd8c433 100644
+index ed23267cd9f28f4e02d8374177f0bb697547cc2a..a979719f75ab4c9b49775ec3df5eff13f4429a49 100644
 --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
 +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.cc
 @@ -70,8 +70,7 @@ class HatsNextWebDialog::HatsWebView : public views::WebView {
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2e91c4f052501e4067cf8fee21f2f3c2674f1c1a..74e6928041145fd6f37ec4ce7acc6be0649b944d 100644
+index 5c63a024827359ccf697d0b7fc8fa2092eb107b7..3da88b5831717c979373c064b4c1520c28d4fd98 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3815,8 +3815,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3873,8 +3873,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,10 +260,10 @@ index 2e91c4f052501e4067cf8fee21f2f3c2674f1c1a..74e6928041145fd6f37ec4ce7acc6be0
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 5647a94ace369de0c7e0096c885865b7b5b04c61..bf3e958a5f883c2408846f4954e58a30c76bee26 100644
+index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a8e0463b1 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
-@@ -135,8 +135,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
+@@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
      SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -274,10 +274,10 @@ index 5647a94ace369de0c7e0096c885865b7b5b04c61..bf3e958a5f883c2408846f4954e58a30
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 5092190243d3eb95a4180cb44937e3d25c4a3ad9..23a11de7c25b81e72c81db20caaa799191b70e45 100644
+index 3330876f623e5b2cb600b1ce1fd10b3375568613..a9f48c6577afef8876cd8304ff5a66405b7d8343 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
-@@ -322,8 +322,7 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -318,8 +318,7 @@ class CONTENT_EXPORT WebContentsDelegate {
        SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -288,7 +288,7 @@ index 5092190243d3eb95a4180cb44937e3d25c4a3ad9..23a11de7c25b81e72c81db20caaa7991
    // Allow delegate to creates a custom WebContents when
    // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index b1c4872e8139e4e6c7c38f94e6e1619ef1730bce..314a418c8d0ff43f115744a0229511dd409b48d6 100644
+index ce83daee0eb44d72caaf1e7e250ce0c3fadb827c..ed0b508a5d6cdd4433a8117ef2032ce8e1d99273 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 @@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@@ -302,7 +302,7 @@ index b1c4872e8139e4e6c7c38f94e6e1619ef1730bce..314a418c8d0ff43f115744a0229511dd
    // view is used for displaying embedded extension options, we want any
    // external links to be opened in a new tab, not in a new guest view so we
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
-index 0d6ab312e2bdfac8f1d75ecb5df990d3d158b288..edcdae5183d5a2bcca31b440870f40ed12d7e02c 100644
+index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e1002cf38cc 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
 @@ -58,8 +58,7 @@ class ExtensionOptionsGuest
@@ -316,7 +316,7 @@ index 0d6ab312e2bdfac8f1d75ecb5df990d3d158b288..edcdae5183d5a2bcca31b440870f40ed
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 2a8095bb93264360d2cdb0a54ff3330671905852..8a2745c318f865564368d5d3d90af61b5c20fb00 100644
+index 0b01120f6a6053ab03355c93216d703d0958aeab..a1c6c5a4b507bbf50668d7ed2febe97aca942c1d 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -388,8 +388,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -330,7 +330,7 @@ index 2a8095bb93264360d2cdb0a54ff3330671905852..8a2745c318f865564368d5d3d90af61b
  }
  
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index 1b388778aac1420769de8c411489e026abbc75a4..b21d262c7014097e35ee83289fab400ab9d3bdc5 100644
+index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec4844497334 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 @@ -171,8 +171,7 @@ class MimeHandlerViewGuest
@@ -344,10 +344,10 @@ index 1b388778aac1420769de8c411489e026abbc75a4..b21d262c7014097e35ee83289fab400a
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index c0fc74673903a0c54164bddb5be0c96f3f7b73a4..2466675e80708aa0ba27e0431cbfb2a277abde32 100644
+index 424c5f89440dccc29f3431e034d0a4fd4f647a00..8d40d0bd30fc28e841eedb3f34be3c033db62449 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -403,8 +403,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -402,8 +402,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -358,10 +358,10 @@ index c0fc74673903a0c54164bddb5be0c96f3f7b73a4..2466675e80708aa0ba27e0431cbfb2a2
    // can catch bad client behavior while not interfering with normal operation.
    constexpr size_t kMaxPendingWebContentsCount = 10;
 diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index ea50835c2f8631851659db6abb3ba779a5fcb6e0..14207edb850689c126b2d09eff8d8feb1246ebb7 100644
+index f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5b4bb72ed 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
-@@ -292,8 +292,7 @@ class FrameImpl : public fuchsia::web::Frame,
+@@ -307,8 +307,7 @@ class FrameImpl : public fuchsia::web::Frame,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -372,10 +372,10 @@ index ea50835c2f8631851659db6abb3ba779a5fcb6e0..14207edb850689c126b2d09eff8d8feb
                            int opener_render_process_id,
                            int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 4cb2c255877182406158258c0fb3e88e50f612c7..0f314be5d9d88b60b925a1e25db30408f0b26dff 100644
+index 2214ba7726f105e62bdc92bd0e6142ea9fa6ed72..2b9b804106317bfc914efacc7adfd282563e4c8b 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
-@@ -177,8 +177,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
+@@ -176,8 +176,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
index 15ec447216524..262ac6344b129 100644
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index f338d61091545f4319b6d5318d10eed5c9b02af3..5f0b1af64911966f9b24a2b5ef063e4473b81a8f 100644
+index ec55c3f97988a7de06a738e61e389ba07712ad4e..6a40a73520a951d7c6fd06cbd07329a40ff41544 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7038,6 +7038,7 @@ static_library("browser") {
+@@ -7088,6 +7088,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",
@@ -44,7 +44,7 @@ index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0
    ]
  }
 diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 491315f1fd94332a1895c2286618cb0e8ed1544b..303d29d577a87ea07005fb87f562eef79b36cd8f 100644
+index 26f86d67c32b2a022698ae5ea5509912d2ccfacb..d48844d49308d67ee7bfa823335c7443173badbe 100644
 --- a/components/language/core/browser/language_prefs.cc
 +++ b/components/language/core/browser/language_prefs.cc
 @@ -22,7 +22,7 @@
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index bc53b898840d5..e1eba13e55ffa 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 27474164dafdff0f79820e748c776b6a4372387c..ed21a9c1854a443947a1b3965c5fc2910b9d3fb6 100644
+index 0cdaa37db5a4c992c8051a6e4370f61b3e4559a3..58108239e1b5aad967eff63d8eed10a560726c6e 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
@@ -20,7 +20,7 @@ index 27474164dafdff0f79820e748c776b6a4372387c..ed21a9c1854a443947a1b3965c5fc291
  #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
  #include "components/cdm/renderer/widevine_key_system_properties.h"
  #include "content/public/renderer/render_thread.h"
-@@ -206,12 +208,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -230,12 +232,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
  
  // Returns persistent-license session support.
  EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch
index 0e8697f5c67d6..3a7e3c694cc04 100644
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -87,10 +87,10 @@ index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add7
    // Create an observer that registers a hot key for |accelerator|.
    std::unique_ptr<gfx::SingletonHwndHotKeyObserver> observer =
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index 3cad85ec824d81ef43796a5c7e4f013dcfd5bf0a..d352b23f4a42b10e77a61de71069083f20f99136 100644
+index 4e9e4f4d21fbe650d8f32254a3b450074a038751..ac923f436cbdd6ded0629da4e4c659d94258e55b 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
-@@ -290,6 +290,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
+@@ -296,6 +296,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
        case ui::VKEY_MEDIA_STOP:
          system_media_controls_->SetIsStopEnabled(should_enable);
          break;
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 335184a63282a..5374f0423050e 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index 8a68c53e35dafce5fced1ad2c7ff5dad83ffbf3c..ee615d3eb03232b34f5acbb58490c7de9ad08cfd 100644
+index 183503c7d9891b7e651f0cac4b2dc97157b61928..1630a0a49a4b88ceda0ee14980236dc614b42c67 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -495,8 +495,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
+@@ -511,8 +511,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                 ->GetPageScaleConstraintsSet()
                                 .FinalConstraints()
                                 .initial_scale;
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index a900bf03618c0..de4da5324bf23 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,10 +82,10 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 91da584747d5afc3f07e51ae77b002d91c4ff7ac..bbf37f733a6e1831017f171edf162ab8aac3f0a4 100644
+index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b2743eaed90 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
  #include "chrome/browser/media/webrtc/desktop_media_list.h"
@@ -94,8 +94,8 @@ index 91da584747d5afc3f07e51ae77b002d91c4ff7ac..bbf37f733a6e1831017f171edf162ab8
  #include "content/public/browser/browser_task_traits.h"
  #include "content/public/browser/browser_thread.h"
  #include "content/public/common/content_features.h"
-@@ -95,8 +95,9 @@ gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr<webrtc::DesktopFrame> frame,
- }
+@@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
+ #endif  // BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_MAC)
 +// Refs https://github.com/electron/electron/pull/30507
@@ -105,7 +105,7 @@ index 91da584747d5afc3f07e51ae77b002d91c4ff7ac..bbf37f733a6e1831017f171edf162ab8
  #endif
  
  }  // namespace
-@@ -274,6 +275,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
+@@ -415,6 +416,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
        FROM_HERE,
        base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                       media_list_));
@@ -115,7 +115,7 @@ index 91da584747d5afc3f07e51ae77b002d91c4ff7ac..bbf37f733a6e1831017f171edf162ab8
  }
  
  void NativeDesktopMediaList::Worker::OnCaptureResult(
-@@ -435,6 +439,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
+@@ -628,6 +632,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
          FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
                                    base::Unretained(worker_.get()),
                                    std::move(native_ids), thumbnail_size_));
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 8d5fab8db9350..678825807237a 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 302915bac66a484f495c97e2602406a50b058014..7b46b19458ab03037fd02ac9a7f21a7b321843f1 100644
+index bf32a083d0f0873e112debe0e88ab1be8125a417..8ca72461bb7b42f1bc0da249a36f0fcf9ab6f13c 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -37,7 +37,7 @@ index 302915bac66a484f495c97e2602406a50b058014..7b46b19458ab03037fd02ac9a7f21a7b
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -979,6 +984,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -986,6 +991,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 49d1fef1cdd0c..dac0d9fbd0df3 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,22 +20,21 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 2c6e923952c7d8c1e411e3dedb149712a0e64025..0034d9998133920a2cd074b1f5562b58976d6d49 100644
+index 61ab59e0d97a392ae18c1d7ad7dd606b5cd1c567..2a899818ebb67ba4fc06ccbcff3ee03f6b83c0e6 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1891,6 +1891,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
- 
- gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace(
+@@ -1882,6 +1882,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+ TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
+   TargetColorParams params;
 +  if (!settings_.enable_color_correct_rendering) {
-+    return {};
++    return params;
 +  }
-+
-   constexpr gfx::ColorSpace srgb = gfx::ColorSpace::CreateSRGB();
  
    // If we are likely to software composite the resource, we use sRGB because
+   // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 86180d4f001a7f849553a4bd5401d69fe4f1bec2..953b1f4f24e55e127af5fcb5fb3c4e1e3f23429d 100644
+index 64f1a3a3cb8d82235ff04f5c01a7cf571d8ba00c..ffa8d1a53870663647e423975f00e5650c6ab579 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
 @@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -81,7 +80,7 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 963154eeda506350b71e3243ef172061efc8d4fb..daaea93f536759b67b4fffbca7c26479ceb04fcd 100644
+index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b949187690aca71c 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -87,6 +87,9 @@
@@ -229,7 +228,7 @@ index 963154eeda506350b71e3243ef172061efc8d4fb..daaea93f536759b67b4fffbca7c26479
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 926ea905b775c0706fd1b882f37b88b646b8b154..691eb2c5f7a26ea2b213b6378ab600b6b047531d 100644
+index f5d73922086b5b27907fd393d4d4204a574c3b25..5b09f5ef5f04b519ed4148498c82d003c9fd6c91 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -241,10 +240,10 @@ index 926ea905b775c0706fd1b882f37b88b646b8b154..691eb2c5f7a26ea2b213b6378ab600b6
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 30a0c9216a206042a9769bdeda015eaf00e3cc49..e94e895aa31ab98e28137e793a8f298ed3146f5a 100644
+index ac9570fa3d9cb3b0026f70465e5b21ac7778c3df..acc0e121e7746da397cfab07b3707de7ae9a3143 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -193,6 +193,7 @@
+@@ -194,6 +194,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
  #include "ui/display/display_switches.h"
@@ -252,7 +251,7 @@ index 30a0c9216a206042a9769bdeda015eaf00e3cc49..e94e895aa31ab98e28137e793a8f298e
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3281,6 +3282,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3283,6 +3284,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -293,7 +292,7 @@ index 6260d73068636f4a8d4c73c161a4ffe165b267d0..2686ef0dfb7d8b667647d11fece5aa8e
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 2f4fbbdd8059b2915b4848f95db925f1dbb1fb08..3fc675e4e56b3e658d70475800a938a7ce283567 100644
+index 49ef0d352cfb6163499fa42416187595c7011a68..d5bc620847872fcba96f6941be529428755d83a2 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
@@ -304,7 +303,7 @@ index 2f4fbbdd8059b2915b4848f95db925f1dbb1fb08..3fc675e4e56b3e658d70475800a938a7
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
  
-@@ -177,6 +178,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
+@@ -184,6 +185,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 3f08e39d4e1bb..23daa8d150e30 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 2c5f09db5e86855c33a79fb8c9f0a6ed770634e6..1c59ce6de1ce68b24e0372826cc67a891b4c2384 100644
+index 58002d37ba340f84f47e2522c0d7bf7c1a64c5d2..bc0a73f08e77bf13eb1cafa55f955e6083071104 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -510,7 +510,11 @@
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 02ee885d5cbd6..755b0eb4b9951 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 7436238cd110ef8c414e8be3d8ff07511b6223f4..4b0b2b0dc0900627aee38de021ec10cbdc9b3cb4 100644
+index 03e318b14025f3c971d471351068986f8a1dd14d..59437e69e25fe85cffc9b558dec2284123ac48be 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -803,6 +803,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,10 +20,10 @@ index 7436238cd110ef8c414e8be3d8ff07511b6223f4..4b0b2b0dc0900627aee38de021ec10cb
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 785cf70788ddb65712c45bc32281141e8a623b13..831a85653eb89b79ccc638400be6cfe10369b14b 100644
+index 5cc97c9c8305bf23b7cdf39ea68c304fac20b479..a6a65a251711394a33fb02bd66c2eeb7b559f711 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -874,6 +874,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -877,6 +877,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
    void OnLocalSurfaceIdChanged(
        const cc::RenderFrameMetadata& metadata) override;
  
@@ -34,10 +34,10 @@ index 785cf70788ddb65712c45bc32281141e8a623b13..831a85653eb89b79ccc638400be6cfe1
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 20d613c480ce54f99e04dd49fe27af10056beee4..4a421fc2c244cf56d329ff66d0e9e17b0f0a5987 100644
+index a819dcf960a4c70c0c8cd57710971de2c41e13ca..bbc3671c3fa8e058b8f107d601233735c0822297 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -595,7 +595,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -619,7 +619,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index f58b76cc978b2..6bd042bd527b8 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -49,7 +49,7 @@ index 4bfe2501309e832dc9962d5f4642c6b7c782f83d..c45f1207be984fae9aee2cc5b9a7c405
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 5aee160aec0160f37d61005ec3b71accb58b2eaa..bc73591dd8b66c304fa42b3349bbbf6f82ed13ad 100644
+index c965c9764ad38a8b52b727ca98fe41f00ab6707d..7d44c4e63b2b4ccf595b5e2a0212fb6c4eb2b5bd 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -29,6 +29,7 @@
@@ -69,8 +69,8 @@ index 5aee160aec0160f37d61005ec3b71accb58b2eaa..bc73591dd8b66c304fa42b3349bbbf6f
    internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
  #endif
  
-@@ -127,7 +128,7 @@ DWORD __stdcall ThreadFunc(void* params) {
-         PlatformThread::CurrentId());
+@@ -125,7 +126,7 @@ DWORD __stdcall ThreadFunc(void* params) {
+                                                    PlatformThread::CurrentId());
    }
  
 -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 0adfe2ccb420e..017e3d5431128 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 59e48882aba9b0431ddaa0b48f896866833f3376..d4360bc18858d77aa079dbbafc563d2fa03f29e8 100644
+index 44c0ec9815aafd61182fd18a9d125e185d7196bc..a77c39adfc687d43004341d4ca9e6fa676c814f5 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2392,7 +2392,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2394,7 +2394,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/dump_syms.patch b/patches/chromium/dump_syms.patch
index ea1020c34ac9c..43e274d4c5e8b 100644
--- a/patches/chromium/dump_syms.patch
+++ b/patches/chromium/dump_syms.patch
@@ -8,10 +8,10 @@ this but it is not a blocker for releasing Electron.  This patch removes
 tthe hard fail on dylib resolve failure from dump_syms
 
 diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
-index e68039d78f1de03f7ffc68017cbb9f948f67f440..b1811df7b5e6252bc71dd0f11ad6bf02858387f4 100755
+index 99395610be5e50a4c65890b9edaa48510043a8a8..dae758a19460bc22b1bcdc8c7e84dfb42f8f50eb 100755
 --- a/components/crash/content/tools/generate_breakpad_symbols.py
 +++ b/components/crash/content/tools/generate_breakpad_symbols.py
-@@ -206,7 +206,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path):
+@@ -204,7 +204,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path):
              'ERROR: failed to resolve %s, exe_path %s, loader_path %s, '
              'rpaths %s' % (m.group(1), exe_path, loader_path,
                             ', '.join(rpaths))), file=sys.stderr)
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index 42e510ac79568..a124b5b3d2ae1 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 7323cb11296e9383db68753d9fc43203b5632e19..95349fc9016eda37668edcd742336364346d89f6 100644
+index a1de50d6b0f699d0651c369cafafdd5bb542242d..65b9f5e5f81e8ef8b591ef2e027e095df11c0d7b 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -529,7 +529,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
+@@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
  }
  
  void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
@@ -19,10 +19,10 @@ index 7323cb11296e9383db68753d9fc43203b5632e19..95349fc9016eda37668edcd742336364
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 7b46b19458ab03037fd02ac9a7f21a7b321843f1..40a81cb293469cb5ec1bd5ab5195fd8e1b0812dc 100644
+index 8ca72461bb7b42f1bc0da249a36f0fcf9ab6f13c..9ca11a19e66e34585b4b11e89cc3b789a4389b5e 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -929,8 +929,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index a0ae92e9a1788..429dd72387ef7 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index b3008accd63bd6694a44761c4d00a0927fad90ad..d61c2e0031b0aa22c5c5822e8433ef4b4366afed 100644
+index ca62a13420aa9c114c00054bbe1215f96285a4e9..01be46b1eaed2aadfd24eac9d102da99521b175c 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1356,6 +1356,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1331,6 +1331,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index b3008accd63bd6694a44761c4d00a0927fad90ad..d61c2e0031b0aa22c5c5822e8433ef4b
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 486a151f6923fd0069ce5aaaffe6559cb60a88ec..589ee590edea4a6fb995fb73be36d035336f6e3a 100644
+index e412608e7720004462c48698c8ec39602b2b900e..46c00e0da6beb0c2e689475fc4b9927085414e1a 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -277,6 +277,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -282,6 +282,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 486a151f6923fd0069ce5aaaffe6559cb60a88ec..589ee590edea4a6fb995fb73be36d035
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 89c00d7ab1510ebdbce49876fcd5f94c5096b3c9..41da1b6fac783be22ab2f3abc25aaa7687049048 100644
+index fa56cfed3703664232843ad26028096d95dca253..9852498e93939796e7ba6f80efcc7b2d827187ac 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1049,6 +1049,9 @@ interface NetworkContext {
+@@ -1067,6 +1067,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,10 +77,10 @@ index 89c00d7ab1510ebdbce49876fcd5f94c5096b3c9..41da1b6fac783be22ab2f3abc25aaa76
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index 309a96ff77d06f9456fd3faec02b869c8a55c7f7..998b5b04bc98cfd048fe929bf3b99bbfcdbbfb9a 100644
+index d143a82b1fd021bb03b760b91e87c7714f5395b9..3c18369ff3ab80430e21caac03373605dad64a88 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
-@@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
+@@ -136,6 +136,7 @@ class TestNetworkContext : public mojom::NetworkContext {
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override {}
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index e11b55274afd2..b0c806866f56a 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 304dcdaa65ee1d9bed86f7c0e5956dd3a2a65585..17ff3cdf79ec48f444640bc18df47f81aa4eba28 100644
+index 7e7927c7258963bd95a2c064ef85e410f4d2571d..05353bda1169df38499e6f789bb632307d7bcfde 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -158,6 +158,7 @@
@@ -23,7 +23,7 @@ index 304dcdaa65ee1d9bed86f7c0e5956dd3a2a65585..17ff3cdf79ec48f444640bc18df47f81
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1797,6 +1798,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1776,6 +1777,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index 251704d5cd8cc..fd11a39b225c8 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -96,10 +96,10 @@ index 8f94cc300b58e8a94b6ca155aa3cf370bcb948d8..4340376f323d24e5e2c5897a81c6a9eb
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e455dfd03 100644
+index 47e60bfd8239d4a2e292b835c49132bdbb751555..9861a884a15e79b36833e6df58897141acdc6718 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -147,7 +147,7 @@ const char kACKToken[] = "ACK";
+@@ -148,7 +148,7 @@ const char kACKToken[] = "ACK";
  const char kShutdownToken[] = "SHUTDOWN";
  const char kTokenDelimiter = '\0';
  const int kMaxMessageLength = 32 * 1024;
@@ -108,7 +108,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
  
  bool g_disable_prompt = false;
  bool g_skip_is_chrome_process_check = false;
-@@ -627,6 +627,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -614,6 +614,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -116,7 +116,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
                       SocketReader* reader);
  
   private:
-@@ -651,6 +652,9 @@ class ProcessSingleton::LinuxWatcher
+@@ -638,6 +639,9 @@ class ProcessSingleton::LinuxWatcher
    // The ProcessSingleton that owns us.
    ProcessSingleton* const parent_;
  
@@ -126,7 +126,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
    std::set<std::unique_ptr<SocketReader>, base::UniquePtrComparator> readers_;
  };
  
-@@ -681,16 +685,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -668,16 +672,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -154,7 +154,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
      LOG(WARNING) << "Not handling interprocess notification as browser"
                      " is shutting down";
      // Send back "SHUTDOWN" message, so that the client process can start up
-@@ -700,6 +709,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
+@@ -687,6 +696,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
    }
  }
  
@@ -177,7 +177,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
  void ProcessSingleton::LinuxWatcher::RemoveSocketReader(SocketReader* reader) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
    DCHECK(reader);
-@@ -735,7 +760,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -722,7 +747,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
@@ -187,7 +187,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
    const size_t kMinMessageLength = base::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -765,10 +791,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -752,10 +778,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -217,7 +217,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -797,8 +841,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -784,8 +828,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -231,7 +231,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -915,7 +963,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -904,7 +952,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -241,7 +241,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -925,11 +974,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -914,11 +963,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();
@@ -263,7 +263,7 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
    // Send the message
    if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
      // Try to kill the other process, because it might have been dead.
-@@ -969,6 +1028,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -960,6 +1019,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
        linux_ui->NotifyWindowManagerStartupComplete();
  #endif
  
@@ -282,18 +282,18 @@ index 81fb8994c53fb16d7c96de008c96127d0b85b8f9..b56577857c54a245ba8554df164a184e
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648c27a2a34 100644
+index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d0c912034 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
+ #include "base/strings/string_number_conversions.h"
  #include "base/strings/utf_string_conversions.h"
  #include "base/time/time.h"
- #include "base/trace_event/trace_event.h"
 +#include "base/timer/timer.h"
+ #include "base/trace_event/base_tracing.h"
  #include "base/win/registry.h"
  #include "base/win/scoped_handle.h"
- #include "base/win/windows_version.h"
-@@ -44,6 +45,14 @@
+@@ -45,6 +46,14 @@
  namespace {
  
  const char kLockfile[] = "lockfile";
@@ -308,7 +308,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
  
  // A helper class that acquires the given |mutex| while the AutoLockMutex is in
  // scope.
-@@ -98,10 +107,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
+@@ -80,10 +89,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
  
  bool ParseCommandLine(const COPYDATASTRUCT* cds,
                        base::CommandLine* parsed_command_line,
@@ -323,7 +323,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
    static const int min_message_size = 7;
    if (cds->cbData < min_message_size * sizeof(wchar_t) ||
        cds->cbData % sizeof(wchar_t) != 0) {
-@@ -151,11 +162,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+@@ -133,11 +144,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
      const std::wstring cmd_line =
          msg.substr(second_null + 1, third_null - second_null);
      *parsed_command_line = base::CommandLine::FromString(cmd_line);
@@ -406,7 +406,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
  bool ProcessLaunchNotification(
      const ProcessSingleton::NotificationCallback& notification_callback,
      UINT message,
-@@ -167,16 +249,23 @@ bool ProcessLaunchNotification(
+@@ -151,16 +233,23 @@ bool ProcessLaunchNotification(
  
    // Handle the WM_COPYDATA message from another process.
    const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
@@ -434,7 +434,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
    return true;
  }
  
-@@ -273,9 +362,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -254,9 +343,13 @@ bool ProcessSingleton::EscapeVirtualization(
  ProcessSingleton::ProcessSingleton(
      const std::string& program_name,
      const base::FilePath& user_data_dir,
@@ -449,7 +449,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
        program_name_(program_name),
        is_app_sandboxed_(is_app_sandboxed),
        is_virtualized_(false),
-@@ -290,6 +383,37 @@ ProcessSingleton::~ProcessSingleton() {
+@@ -271,6 +364,37 @@ ProcessSingleton::~ProcessSingleton() {
      ::CloseHandle(lock_file_);
  }
  
@@ -486,8 +486,8 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
 +
  // Code roughly based on Mozilla.
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-   if (is_virtualized_)
-@@ -300,8 +424,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+   TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
+@@ -283,8 +407,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
      return PROCESS_NONE;
    }
  
@@ -498,7 +498,7 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
        return PROCESS_NOTIFIED;
      case chrome::NOTIFY_FAILED:
        remote_window_ = NULL;
-@@ -431,6 +556,18 @@ bool ProcessSingleton::Create() {
+@@ -422,6 +547,18 @@ bool ProcessSingleton::Create() {
            << "Lock file can not be created! Error code: " << error;
  
        if (lock_file_ != INVALID_HANDLE_VALUE) {
@@ -516,8 +516,8 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
 +
          // Set the window's title to the path of our user data directory so
          // other Chrome instances can decide if they should forward to us.
-         bool result =
-@@ -457,6 +594,7 @@ bool ProcessSingleton::Create() {
+         TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
+@@ -449,6 +586,7 @@ bool ProcessSingleton::Create() {
  }
  
  void ProcessSingleton::Cleanup() {
@@ -526,10 +526,10 @@ index 679350dd08ca0211653ea669405e3f4f86c2fc0f..16ad742721e9c5af13224f74e864e648
  
  void ProcessSingleton::OverrideShouldKillRemoteProcessCallbackForTesting(
 diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
-index b4fec8878c37b9d157ea768e3b6d99399a988c75..e1cb0f21f752aaeee2c360ce9c5fd08bfede26e3 100644
+index b64ed1d155a30582e48c9cdffcee9d0f25a53a6a..ce851d09d501ebcc6d6c4065e746e869d5275b2b 100644
 --- a/chrome/browser/win/chrome_process_finder.cc
 +++ b/chrome/browser/win/chrome_process_finder.cc
-@@ -34,7 +34,9 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
+@@ -36,9 +36,10 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
    return base::win::MessageWindow::FindWindow(user_data_dir.value());
  }
  
@@ -537,11 +537,13 @@ index b4fec8878c37b9d157ea768e3b6d99399a988c75..e1cb0f21f752aaeee2c360ce9c5fd08b
 +NotifyChromeResult AttemptToNotifyRunningChrome(
 +    HWND remote_window,
 +    const base::span<const uint8_t> additional_data) {
+   TRACE_EVENT0("startup", "AttemptToNotifyRunningChrome");
+-
    DCHECK(remote_window);
    DWORD process_id = 0;
    DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
-@@ -42,7 +44,8 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
-     return NOTIFY_FAILED;
+@@ -50,7 +51,8 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
+   }
  
    // Send the command line to the remote chrome window.
 -  // Format is "START\0<<<current directory>>>\0<<<commandline>>>".
@@ -549,8 +551,8 @@ index b4fec8878c37b9d157ea768e3b6d99399a988c75..e1cb0f21f752aaeee2c360ce9c5fd08b
 +  // "START\0<current-directory>\0<command-line>\0<additional-data-length>\0<additional-data>".
    std::wstring to_send(L"START\0", 6);  // want the NULL in the string.
    base::FilePath cur_dir;
-   if (!base::GetCurrentDirectory(&cur_dir))
-@@ -53,6 +56,22 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
+   if (!base::GetCurrentDirectory(&cur_dir)) {
+@@ -64,6 +66,22 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
        base::CommandLine::ForCurrentProcess()->GetCommandLineString());
    to_send.append(L"\0", 1);  // Null separator.
  
diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
index 9bf184662af7e..fbd9cec05e06c 100644
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@@ -13,11 +13,11 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.
 
 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index 93879cdb8d8001458f6283625232515bd214847d..1a729eb08de5d9f0b2fdbaad1eec95b7234a2f71 100644
+index 5376b01ad03c346ecc1c5d47ff125103dbc05eb8..a60ce1d4fe6b7132d7adac1a7687c7185d1abee3 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
-@@ -152,6 +152,8 @@ absl::optional<SkColor> NativeTheme::GetColorProviderColor(
- }
+@@ -114,6 +114,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
+ NativeTheme::~NativeTheme() = default;
  
  bool NativeTheme::ShouldUseDarkColors() const {
 +  if (theme_source() == ThemeSource::kForcedLight) return false;
@@ -26,13 +26,14 @@ index 93879cdb8d8001458f6283625232515bd214847d..1a729eb08de5d9f0b2fdbaad1eec95b7
  }
  
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index 8ddda2eae1ce7578c8987e632b21dd0b6c20c554..cca14f9cf49e667a0f2def788097b4eabb4761f9 100644
+index e46bc2cf64ca554c0e21a4e0851ad092f504e080..0ffe583d56ddc3abec8c848c1cd5dbc3623acb5b 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -406,6 +406,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
-   SkColor GetUnprocessedSystemColor(ColorId color_id,
-                                     ColorScheme color_scheme) const;
+@@ -389,6 +389,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
+       scoped_refptr<ColorProviderManager::InitializerSupplier> custom_theme)
+       const;
  
++
 +  enum ThemeSource {
 +    kSystem,
 +    kForcedDark,
@@ -52,7 +53,7 @@ index 8ddda2eae1ce7578c8987e632b21dd0b6c20c554..cca14f9cf49e667a0f2def788097b4ea
    // Returns a shared instance of the native theme that should be used for web
    // rendering. Do not use it in a normal application context (i.e. browser).
    // The returned object should not be deleted by the caller. This function is
-@@ -591,6 +607,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -558,6 +575,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
    bool forced_colors_ = false;
    PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
    PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
@@ -61,10 +62,10 @@ index 8ddda2eae1ce7578c8987e632b21dd0b6c20c554..cca14f9cf49e667a0f2def788097b4ea
    SEQUENCE_CHECKER(sequence_checker_);
  };
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index 5f809b71c635abd3679ee593850e521a14cb62f5..b5ba2d7cd65742ceabaaad96a8ec0db8d661ad32 100644
+index 6b9fb74004eba57fdff396124214356f4bcf0852..70807b315f805baab2574148520323ce78f624cb 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -681,6 +681,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
+@@ -618,6 +618,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
    // ...unless --force-dark-mode was specified in which case caveat emptor.
    if (InForcedColorsMode() && !IsForcedDarkMode())
      return false;
diff --git a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
index c63f9b05541ce..d3448ffcc3b40 100644
--- a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+++ b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
@@ -7,10 +7,10 @@ Subject: feat: allow embedders to add observers on created hunspell
 This patch is used by Electron to implement spellchecker events.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index f841d5847fd107f551e4823ae0690e2e17225ba9..475590da5273c218353c9721b35a9b50be248a47 100644
+index 80e5807fecbca3d3d3105522418c5f4b4d103f57..002204dbe0b9598b61141cab33b7befdfac077f8 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.cc
 +++ b/chrome/browser/spellchecker/spellcheck_service.cc
-@@ -467,6 +467,9 @@ void SpellcheckService::LoadDictionaries() {
+@@ -469,6 +469,9 @@ void SpellcheckService::LoadDictionaries() {
          std::make_unique<SpellcheckHunspellDictionary>(
              dictionary, platform_spellcheck_language, context_, this));
      hunspell_dictionaries_.back()->AddObserver(this);
@@ -20,7 +20,7 @@ index f841d5847fd107f551e4823ae0690e2e17225ba9..475590da5273c218353c9721b35a9b50
      hunspell_dictionaries_.back()->Load();
    }
  
-@@ -519,6 +522,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
+@@ -521,6 +524,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
           (!hunspell_dictionaries_.empty() || enable_if_uninitialized);
  }
  
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index a0987afbf7cf9..d2675bfa80b29 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 826714570d1ee1bfc10043597cd6cd00543318d1..d3223035f33db5f39fd4d6b6e8d99da57bb0e7cb 100644
+index eff91b68cf4b72de41b7b2ad09c029b8b5dcf3c6..c736f772e3714c6a80703c41c8a2f0dab36b166d 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -139,6 +139,8 @@ viz_component("service") {
@@ -499,10 +499,10 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index 5362650a4f9bfa038f38f3490c50a7ddbd8d0e0e..106d98decdbb2cbb768388017dae5b4c4f00d777 100644
+index 4b6712b2a4f3c56a6d243ff9d93539505a5c7b86..7f62362ab27abd3497d23e8db8c8bb5a2e3392f9 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -48,7 +48,8 @@ RootCompositorFrameSinkImpl::Create(
+@@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(
        params->gpu_compositing, params->widget, params->renderer_settings);
    auto output_surface = output_surface_provider->CreateOutputSurface(
        params->widget, params->gpu_compositing, display_client.get(),
@@ -534,10 +534,10 @@ index 0e3af0f9280abe8560393325b400ad2543ed0556..7fe490e55a4bb8a183d0d241188ea15a
        compositor_data.display_client->GetBoundRemote(resize_task_runner_);
  
 diff --git a/services/viz/privileged/mojom/compositing/display_private.mojom b/services/viz/privileged/mojom/compositing/display_private.mojom
-index 9f7583e42405760bbe5994c87c4347a7d5a36fbe..c383f93ee22388cb4524119d0bead31973fdc705 100644
+index b2f873919d68633103d115d7d9550a098c1a254c..8e38831a6df15d37e5fb87d63613b7dbdcefacc4 100644
 --- a/services/viz/privileged/mojom/compositing/display_private.mojom
 +++ b/services/viz/privileged/mojom/compositing/display_private.mojom
-@@ -94,7 +94,6 @@ interface DisplayClient {
+@@ -102,7 +102,6 @@ interface DisplayClient {
  
    // Creates a LayeredWindowUpdater implementation to draw into a layered
    // window.
@@ -569,7 +569,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 383aff3755d4b086759099de8b81808de8d4bf0e..ecba52d0e92d6f8989b1b2c2e851645940dcc2af 100644
+index 8b74e1d2a463156f62e983f535ff68a53215f648..6ef04da46c8b097b01d5ee40dcadf222d7a7870c 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -81,6 +81,7 @@ class DisplayPrivate;
@@ -607,7 +607,7 @@ index 383aff3755d4b086759099de8b81808de8d4bf0e..ecba52d0e92d6f8989b1b2c2e8516459
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -453,6 +467,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -467,6 +481,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index c7a6f0aae7741..9dc1207d32dff 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -17,10 +17,10 @@ headers, moving forward we should find a way in upstream to provide
 access to these headers for loader clients created on the browser process.
 
 diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
-index f14c99863eb3f31ebc9ffd30a55f7536585fb561..d1f11d2d13445c9814d2e7227e5e02001377329b 100644
+index 87868727a78223baef9ffd2591f49fced240ef4e..f6a6ff28f33e2d1c065f2abeb96733b2d28a6ea1 100644
 --- a/services/network/public/cpp/resource_request.cc
 +++ b/services/network/public/cpp/resource_request.cc
-@@ -234,6 +234,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
+@@ -233,6 +233,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
           do_not_prompt_for_login == request.do_not_prompt_for_login &&
           is_main_frame == request.is_main_frame &&
           transition_type == request.transition_type &&
@@ -29,10 +29,10 @@ index f14c99863eb3f31ebc9ffd30a55f7536585fb561..d1f11d2d13445c9814d2e7227e5e0200
           upgrade_if_insecure == request.upgrade_if_insecure &&
           is_revalidating == request.is_revalidating &&
 diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
-index 7c835d244420afe1c9ab6eac267c8789fb2afb01..564caebc55e1338e7124731d639cd6f01aebf595 100644
+index 8b9a7b36f53a4cfcd159ac18c06d1724072013c8..ef0191bae8a07e531ae129cf32b22f4930c5e266 100644
 --- a/services/network/public/cpp/resource_request.h
 +++ b/services/network/public/cpp/resource_request.h
-@@ -157,6 +157,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
+@@ -156,6 +156,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
    bool do_not_prompt_for_login = false;
    bool is_main_frame = false;
    int transition_type = 0;
@@ -41,10 +41,10 @@ index 7c835d244420afe1c9ab6eac267c8789fb2afb01..564caebc55e1338e7124731d639cd6f0
    bool upgrade_if_insecure = false;
    bool is_revalidating = false;
 diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
-index 9fefb0ca05e8f461d22b7f9875cc722232ccaed4..9c020bd1272ad2894f0b5af4c504d551b9927af0 100644
+index 1fcf54cac11c38352e14774cd08bcaa162443e9c..5356da11391d52a8f9aaa57a27616cee6dc0f2b6 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.cc
 +++ b/services/network/public/cpp/url_request_mojom_traits.cc
-@@ -210,6 +210,7 @@ bool StructTraits<
+@@ -209,6 +209,7 @@ bool StructTraits<
    out->do_not_prompt_for_login = data.do_not_prompt_for_login();
    out->is_main_frame = data.is_main_frame();
    out->transition_type = data.transition_type();
@@ -53,10 +53,10 @@ index 9fefb0ca05e8f461d22b7f9875cc722232ccaed4..9c020bd1272ad2894f0b5af4c504d551
    out->upgrade_if_insecure = data.upgrade_if_insecure();
    out->is_revalidating = data.is_revalidating();
 diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
-index 53b1cd261ec419dd68906186a3da651fe792ede0..5945e6d9749ad2a888edfa0c4b00377a7190881b 100644
+index 1b8dbc0538d0af843e40edc41505d08f9034f97b..270822eb756090f8a74f34823009942ed21e8616 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.h
 +++ b/services/network/public/cpp/url_request_mojom_traits.h
-@@ -272,6 +272,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
+@@ -269,6 +269,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
    static int32_t transition_type(const network::ResourceRequest& request) {
      return request.transition_type;
    }
@@ -67,10 +67,10 @@ index 53b1cd261ec419dd68906186a3da651fe792ede0..5945e6d9749ad2a888edfa0c4b00377a
      return request.previews_state;
    }
 diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
-index 27477d595fd22dc49329631a0b52ebdaafe1edb1..a4fd22381738648040cd72dce747285f5fcb698a 100644
+index 79b5d03ded03ced9e6ff4d17d10935004bfb0062..923883fd010f9621c790dd5381a7e1f0cb36e740 100644
 --- a/services/network/public/mojom/url_request.mojom
 +++ b/services/network/public/mojom/url_request.mojom
-@@ -318,6 +318,9 @@ struct URLRequest {
+@@ -312,6 +312,9 @@ struct URLRequest {
    // about this.
    int32 transition_type;
  
@@ -81,18 +81,18 @@ index 27477d595fd22dc49329631a0b52ebdaafe1edb1..a4fd22381738648040cd72dce747285f
    // browser decide.
    // Note: this is an enum of type PreviewsState.
 diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
-index 80f26b62b25bd6aa46886e3112b2ffd2698693fe..e72cab84db36eec86309160d4f7416ee431f5e34 100644
+index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d602ac3397 100644
 --- a/services/network/public/mojom/url_response_head.mojom
 +++ b/services/network/public/mojom/url_response_head.mojom
-@@ -7,6 +7,7 @@ module network.mojom;
- import "mojo/public/mojom/base/time.mojom";
+@@ -8,6 +8,7 @@ import "mojo/public/mojom/base/time.mojom";
  import "mojo/public/mojom/base/unguessable_token.mojom";
  import "services/network/public/mojom/fetch_api.mojom";
+ import "services/network/public/mojom/ip_address_space.mojom";
 +import "services/network/public/mojom/http_raw_headers.mojom";
  import "services/network/public/mojom/ip_endpoint.mojom";
  import "services/network/public/mojom/load_timing_info.mojom";
  import "services/network/public/mojom/network_param.mojom";
-@@ -28,6 +29,9 @@ struct URLResponseHead {
+@@ -29,6 +30,9 @@ struct URLResponseHead {
    // The response headers or NULL if the URL type does not support headers.
    HttpResponseHeaders headers;
  
@@ -103,18 +103,18 @@ index 80f26b62b25bd6aa46886e3112b2ffd2698693fe..e72cab84db36eec86309160d4f7416ee
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 59a89d471326069e183cdcc42af862fe19d7448e..39cd96d5e5785879bd3d82fb4c71fdf80c48e5ee 100644
+index 5c5aeeda64b244ab1f58556f28d2ca3c133d03a8..2f9aa4d49693a22507f668b2738c54be59802b8f 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -541,6 +541,7 @@ URLLoader::URLLoader(
-       peer_closed_handle_watcher_(FROM_HERE,
+@@ -469,6 +469,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
+       per_factory_corb_state_(context.GetMutableCorbState()),
 +      report_raw_headers_(request.report_raw_headers),
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -699,7 +700,7 @@ URLLoader::URLLoader(
+@@ -636,7 +637,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,10 +123,10 @@ index 59a89d471326069e183cdcc42af862fe19d7448e..39cd96d5e5785879bd3d82fb4c71fdf8
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1349,6 +1350,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
-   response_ = network::mojom::URLResponseHead::New();
-   PopulateResourceResponse(url_request_.get(), is_load_timing_enabled_,
-                            options_, response_.get());
+@@ -1395,6 +1396,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+   }
+ 
+   response_ = BuildResponseHead();
 +  if (raw_response_headers_ && report_raw_headers_) {
 +    std::vector<network::mojom::HttpRawHeaderPairPtr> header_array;
 +    size_t iterator = 0;
@@ -144,10 +144,10 @@ index 59a89d471326069e183cdcc42af862fe19d7448e..39cd96d5e5785879bd3d82fb4c71fdf8
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index fcc47a2389c5172e3c674e413baa857183e0f2f8..af952b03ca87c4022400ba93d2e1fb8d3759960a 100644
+index 98fe2512671e43a4e0da6e9b9ff714d7204fc3a8..bf8751c1b37a678f73ec8e11c86e1eb1287443e4 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -503,6 +503,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -506,6 +506,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 2d62e04b8fe76..195ea7ae74d67 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 40a81cb293469cb5ec1bd5ab5195fd8e1b0812dc..4be0e5b0ef187d68f054672bc3d1dc328057c58b 100644
+index 9ca11a19e66e34585b4b11e89cc3b789a4389b5e..264a9109e42c23e9be6bf7269b3cfee2634b61e4 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3574,6 +3574,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3581,6 +3581,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index f1f422de76bd9..7db4c0911e37d 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.js b/chrome/browser/resources/pdf/pdf_viewer.js
-index 4d45dfa892fec8857dabdd70e3c09c46b784ef44..d9b72b9298494df57e2ad53738a213226a7c45e4 100644
+index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b66399eb9 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.js
 +++ b/chrome/browser/resources/pdf/pdf_viewer.js
-@@ -959,25 +959,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -966,25 +966,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -47,7 +47,7 @@ index 4d45dfa892fec8857dabdd70e3c09c46b784ef44..d9b72b9298494df57e2ad53738a21322
    }
  
    /**
-@@ -1104,30 +1091,13 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -1111,30 +1098,13 @@ export class PDFViewerElement extends PDFViewerBaseElement {
      if (!fileName.toLowerCase().endsWith('.pdf')) {
        fileName = fileName + '.pdf';
      }
diff --git a/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch b/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
deleted file mode 100644
index 4c2bbea2e5906..0000000000000
--- a/patches/chromium/fix_don_t_restore_maximized_windows_when_calling_showinactive.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Sanders <dsanders11@ucsbalum.com>
-Date: Fri, 11 Feb 2022 22:37:39 +0000
-Subject: fix: don't restore maximized windows when calling ShowInactive
-
-This is a backport from Chromium of
-https://chromium-review.googlesource.com/c/chromium/src/+/3371573.
-
-diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 4be0e5b0ef187d68f054672bc3d1dc328057c58b..264a9109e42c23e9be6bf7269b3cfee2634b61e4 100644
---- a/ui/views/win/hwnd_message_handler.cc
-+++ b/ui/views/win/hwnd_message_handler.cc
-@@ -665,9 +665,16 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
-     SetWindowPlacement(hwnd(), &placement);
-     native_show_state = SW_SHOWMAXIMIZED;
-   } else {
-+    const bool is_maximized = IsMaximized();
-+
-+    // Use SW_SHOW/SW_SHOWNA instead of SW_SHOWNORMAL/SW_SHOWNOACTIVATE so that
-+    // the window is not restored to its original position if it is maximized.
-+    // This could be used unconditionally for ui::SHOW_STATE_INACTIVE, but
-+    // cross-platform behavior when showing a minimized window is inconsistent,
-+    // some platforms restore the position, some do not. See crbug.com/1296710
-     switch (show_state) {
-       case ui::SHOW_STATE_INACTIVE:
--        native_show_state = SW_SHOWNOACTIVATE;
-+        native_show_state = is_maximized ? SW_SHOWNA : SW_SHOWNOACTIVATE;
-         break;
-       case ui::SHOW_STATE_MAXIMIZED:
-         native_show_state = SW_SHOWMAXIMIZED;
-@@ -678,9 +685,9 @@ void HWNDMessageHandler::Show(ui::WindowShowState show_state,
-       case ui::SHOW_STATE_NORMAL:
-         if ((GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_TRANSPARENT) ||
-             (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE)) {
--          native_show_state = SW_SHOWNOACTIVATE;
-+          native_show_state = is_maximized ? SW_SHOWNA : SW_SHOWNOACTIVATE;
-         } else {
--          native_show_state = SW_SHOWNORMAL;
-+          native_show_state = is_maximized ? SW_SHOW : SW_SHOWNORMAL;
-         }
-         break;
-       case ui::SHOW_STATE_FULLSCREEN:
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 614da08c32ba8..458f2e257efd7 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index d2a50feea97add9d9c309e8066305caf9105c547..e6fe6ebd7f86df1e5193305a827ac938b822a1ab 100644
+index 7440f2025701ccde0ade36cda22467dd0614109b..3c6ee78454dc9154a37ec9046e382878ffda0c82 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1816,7 +1816,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1830,7 +1830,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,7 +21,7 @@ index d2a50feea97add9d9c309e8066305caf9105c547..e6fe6ebd7f86df1e5193305a827ac938
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index ac9bce453ff812679d8c77d661729ea681977061..7cef50818b3587e033f5cfeea324df17547dfa6e 100644
+index cd1b44d4ff5ce8924749ba9e41b3f599108bb8fd..72bc509b0506fafd026aa858864623886142b5f0 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
index fa0cd24e666d4..2986f58de269f 100644
--- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
+++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
@@ -59,7 +59,7 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
    // true if register successfully, or false if 1) the specificied |accelerator|
    // has been registered by another caller or other native applications, or
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index d352b23f4a42b10e77a61de71069083f20f99136..36e9109a2eeb14983aa80905d09499ff68daeaf9 100644
+index ac923f436cbdd6ded0629da4e4c659d94258e55b..7e603dd5bad2a60b1bd7d9df569a10e838d797bc 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
 @@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
@@ -76,7 +76,7 @@ index d352b23f4a42b10e77a61de71069083f20f99136..36e9109a2eeb14983aa80905d09499ff
        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
      return false;
    }
-@@ -232,18 +237,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+@@ -238,18 +243,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
  #endif
  
    if (system_media_controls_) {
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 0b4c2c4aff7fe..0559a3d4c4528 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,7 +7,7 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index 7a8ca6523bfd1ce237da9dce7fce03a6acb8b75e..c485572aa06e4b750468b8e23816fbcbf0515757 100644
+index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a65560d9e 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
 @@ -20,7 +20,10 @@
@@ -53,12 +53,12 @@ index 7a8ca6523bfd1ce237da9dce7fce03a6acb8b75e..c485572aa06e4b750468b8e23816fbcb
        content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
    bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
 @@ -236,7 +243,7 @@ void HandleAccessibilityRequestCallback(
-   data.SetBoolean(kViewsAccessibility,
+   data.SetBoolKey(kViewsAccessibility,
                    features::IsAccessibilityTreeForViewsEnabled());
  
 -  bool show_internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
 +  bool show_internal = true;
-   data.SetString(kInternal, show_internal ? kOn : kOff);
+   data.SetStringKey(kInternal, show_internal ? kOn : kOff);
  
    std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
 @@ -271,11 +278,11 @@ void HandleAccessibilityRequestCallback(
@@ -97,7 +97,7 @@ index 7a8ca6523bfd1ce237da9dce7fce03a6acb8b75e..c485572aa06e4b750468b8e23816fbcb
    std::string accessibility_contents =
 -      web_contents->DumpAccessibilityTree(internal, property_filters);
 +      web_contents->DumpAccessibilityTree(true, property_filters);
-   result->SetString(kTreeField, accessibility_contents);
+   result->SetStringKey(kTreeField, accessibility_contents);
    FireWebUIListener(request_type, *(result.get()));
  }
 @@ -627,6 +638,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index c3d77fe580024..481bd633fe47e 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index be63f30c49416be34766f75553ccb229687651a9..25f27103e7757b4b2ded2ea534e38f10a13ae33c 100644
+index 1ca418461788e5b7d58c14b03c456d2c21f1305b..7a65b6713e3d0547f1990f8c59d0d11459532477 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3029,6 +3029,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3089,6 +3089,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index be63f30c49416be34766f75553ccb229687651a9..25f27103e7757b4b2ded2ea534e38f10
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 17ce3078c995f581325b9dcffe6b1589b05f48bc..986643109673cb62379ed822845f3c3050ab14aa 100644
+index 2fe1462a2cd92a731a5816b5fc22b059bad92fe8..a4dfa54a7844983262cc0fa635433131382e4d14 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -274,6 +274,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -275,6 +275,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index af18bf7aa9a6a..5043b8a49a854 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -7,10 +7,10 @@ We don't use gin to create the V8 platform, because we need to inject Node
 things.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 0cd4077a0b534f089318e1ebffb9eb25214c3a42..f1ea1dfd740f4b9cf5f7cb7fd6bd445fb06e0100 100644
+index 00190da513499e6275d19bd99b6502db246cd33d..f273749bd026abb287ba33e03208a286e80a57a1 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -117,9 +117,10 @@ IsolateHolder::~IsolateHolder() {
+@@ -121,9 +121,10 @@ IsolateHolder::~IsolateHolder() {
  void IsolateHolder::Initialize(ScriptMode mode,
                                 v8::ArrayBuffer::Allocator* allocator,
                                 const intptr_t* reference_table,
@@ -24,10 +24,10 @@ index 0cd4077a0b534f089318e1ebffb9eb25214c3a42..f1ea1dfd740f4b9cf5f7cb7fd6bd445f
    g_reference_table = reference_table;
  }
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 78133f9b34327c311c69620af621eba3d7f2cbf9..a965545de342811e468594fab4d792fc5c4daf32 100644
+index 1e36669dfb275b8a7c4913c8465bd299c548ed3a..178023d52c9e8ef716ee215e7a243b1800357818 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
-@@ -100,7 +100,8 @@ class GIN_EXPORT IsolateHolder {
+@@ -102,7 +102,8 @@ class GIN_EXPORT IsolateHolder {
    static void Initialize(ScriptMode mode,
                           v8::ArrayBuffer::Allocator* allocator,
                           const intptr_t* reference_table = nullptr,
@@ -38,7 +38,7 @@ index 78133f9b34327c311c69620af621eba3d7f2cbf9..a965545de342811e468594fab4d792fc
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 1447b3828da1e50bd00f4a4975a2b4ce76a2c6ac..abdc2d491cd317d38cb4e7608681ea97bb5b8aab 100644
+index f411bbde031d18bd3e0322ce154ccfd8eace930d..5db96b7402de70d1b4eba8b12a51fbc89fcb7fb6 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
 @@ -342,12 +342,14 @@ void SetFlags(IsolateHolder::ScriptMode mode,
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index f735f131ced7f..e595534ffa59e 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 1f84d9e87539d5d2d480f293732259d110a2d019..6d6111d61d52eed8950b98698393ef5811cf950f 100644
+index 77f77f2deb13fc1c02903fc436028cce2d051cf0..25223130a82b22ad46eddf7e133c6085c5c843d3 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -917,6 +917,11 @@
+@@ -952,6 +952,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index 3fe0c64a017ec..52f3cc0d8a50e 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index 54a3e170f5131ee03892410a0c883d4da4dd885a..1653e392630913dab5db84a7aafff0dfe36d1f71 100644
+index dd65850ec1352b764a9661b37e7c7b5e7d256016..89094825f858dcd91298dbaf26b370ca57eb4836 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 5bc432556d651..6682f1b87ea4a 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 93bebfd9d25f4617bbbba559f62d9d75fe98d3eb..d0970adddd97f98d94d4d904d2cbcaa846a3ec5d 100755
+index ee41efe814da161cafb49229e1f02c8b82749e7c..494bbdeea2725e4b1218ba534fd126203012c100 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
-@@ -298,6 +298,8 @@ def main():
+@@ -298,6 +298,8 @@ def GetDefaultHostOs():
        'win32': 'win',
    }
    default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
@@ -22,4 +22,4 @@ index 93bebfd9d25f4617bbbba559f62d9d75fe98d3eb..d0970adddd97f98d94d4d904d2cbcaa8
 +    default_host_os = 'mac'
    if default_host_os == 'mac' and platform.machine() == 'arm64':
      default_host_os = 'mac-arm64'
- 
+   return default_host_os
diff --git a/patches/chromium/isolate_holder.patch b/patches/chromium/isolate_holder.patch
index 6169c420417da..bcf1ff58add19 100644
--- a/patches/chromium/isolate_holder.patch
+++ b/patches/chromium/isolate_holder.patch
@@ -15,42 +15,38 @@ for us to register the isolate in between Isolate::Allocate and
 Isolate::Initialize.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index f1ea1dfd740f4b9cf5f7cb7fd6bd445fb06e0100..85a01a45bdd721e8f776a0d8f820452299614279 100644
+index f273749bd026abb287ba33e03208a286e80a57a1..0159cd61a8e95d6cca51cdc855f1dea3ec965d6b 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -57,7 +57,8 @@ IsolateHolder::IsolateHolder(
-     IsolateType isolate_type,
-     IsolateCreationMode isolate_creation_mode,
+@@ -59,7 +59,8 @@ IsolateHolder::IsolateHolder(
      v8::CreateHistogramCallback create_histogram_callback,
--    v8::AddHistogramSampleCallback add_histogram_sample_callback)
-+    v8::AddHistogramSampleCallback add_histogram_sample_callback,
+     v8::AddHistogramSampleCallback add_histogram_sample_callback,
+     v8::FatalErrorCallback fatal_error_callback,
+-    v8::OOMErrorCallback oom_error_callback)
++    v8::OOMErrorCallback oom_error_callback,
 +    v8::Isolate* isolate)
      : access_mode_(access_mode), isolate_type_(isolate_type) {
    CHECK(Initialized())
        << "You need to invoke gin::IsolateHolder::Initialize first";
-@@ -68,7 +69,11 @@ IsolateHolder::IsolateHolder(
+@@ -70,7 +71,7 @@ IsolateHolder::IsolateHolder(
    v8::ArrayBuffer::Allocator* allocator = g_array_buffer_allocator;
    DCHECK(allocator);
  
 -  isolate_ = v8::Isolate::Allocate();
-+  if (!isolate) {
-+    isolate_ = v8::Isolate::Allocate();
-+  } else {
-+    isolate_ = isolate;
-+  }
++  isolate_ = isolate ? isolate : v8::Isolate::Allocate();
    isolate_data_ = std::make_unique<PerIsolateData>(isolate_, allocator,
                                                     access_mode_, task_runner);
    if (isolate_creation_mode == IsolateCreationMode::kCreateSnapshot) {
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index a965545de342811e468594fab4d792fc5c4daf32..94d1d45eb766ee1e2a2910124e46969edf264ae9 100644
+index 178023d52c9e8ef716ee215e7a243b1800357818..979fdc27efbe69c276894e0dc82e53ac2c4db7b4 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
-@@ -82,7 +82,8 @@ class GIN_EXPORT IsolateHolder {
-       IsolateType isolate_type,
-       IsolateCreationMode isolate_creation_mode = IsolateCreationMode::kNormal,
+@@ -84,7 +84,8 @@ class GIN_EXPORT IsolateHolder {
        v8::CreateHistogramCallback create_histogram_callback = nullptr,
--      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr);
-+      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr,
+       v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr,
+       v8::FatalErrorCallback fatal_error_callback = nullptr,
+-      v8::OOMErrorCallback oom_error_callback = nullptr);
++      v8::OOMErrorCallback oom_error_callback = nullptr,
 +      v8::Isolate* isolate = nullptr);
    IsolateHolder(const IsolateHolder&) = delete;
    IsolateHolder& operator=(const IsolateHolder&) = delete;
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index 4bdf572786992..b960942083b87 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 5a365936031e60fea77a5015414958756dc64ee7..104c1a5848ef0fa8b75b32a1243c52193d8a2d91 100644
+index 9d22238878e3204dd1d866d2bb085d5311dca36a..e3610815fd942e631a61089ca5eeba07edd7213c 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -245,11 +245,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -249,11 +249,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
index b931eda611b74..6cf5df78a02c3 100644
--- a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
+++ b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -9,10 +9,10 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index bf4cbe990cb4db54f3836551ce2a5739ccdd8a65..6b1157bdc900beaea47f458d4ac62982cba72978 100644
+index 332b7d026e0365a66d5f4f275a90b48d0f2db5aa..3813fe1a3b2e95af5e213201ab3ea08a656e01c3 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -379,8 +379,12 @@ RunContentProcess(ContentMainParams params,
+@@ -381,8 +381,12 @@ RunContentProcess(ContentMainParams params,
  
  #if BUILDFLAG(IS_WIN)
      // Route stdio to parent console (if any) or create one.
diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch
index 390a3957727c5..88035201b5109 100644
--- a/patches/chromium/mas-cfisobjc.patch
+++ b/patches/chromium/mas-cfisobjc.patch
@@ -6,7 +6,7 @@ Subject: mas: avoid usage of _CFIsObjC
 Removes usage of the _CFIsObjC private API.
 
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 11fa4bb6714518b98321d5e10919de3e01403efd..c9232593c08be04cb62fe7163a240cbed4f6e464 100644
+index bd26c088c2340f0c88227837fc797b1ed8157768..6e133c11acb7ea2570e6295b0788edc1606afbc2 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
 @@ -31,12 +31,6 @@
@@ -22,7 +22,7 @@ index 11fa4bb6714518b98321d5e10919de3e01403efd..c9232593c08be04cb62fe7163a240cbe
  #endif
  }  // extern "C"
  
-@@ -328,8 +322,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+@@ -317,8 +311,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -32,7 +32,7 @@ index 11fa4bb6714518b98321d5e10919de3e01403efd..c9232593c08be04cb62fe7163a240cbe
    return ns_val;
  }
  
-@@ -400,9 +393,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+@@ -389,9 +382,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 653dc841ac895..21bddfec34c2b 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,10 +44,10 @@ index 9734fb620a9a4010083af41a9e5cea038556eef5..05c95fb9b15f5ccbfecaee29d360dd27
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 1db44af73aba9f14aba348f83bf0f808412429b0..e89f05c94a55824aef573fc5cbc6fc29e57c6585 100644
+index fedefafc9837f681ad1c3fc48d06a333fea893e2..f07a090c24382c9330e8bd8baa3de47ec76da956 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -560,10 +560,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -561,10 +561,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -114,7 +114,7 @@ index 80d639b4a9eb7fa9265da4977782d125b72db719..5f82a49f6336cf89c8d404f8aef7b103
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed770634e6 100644
+index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c1a64c5d2 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -253,8 +253,10 @@
@@ -128,7 +128,7 @@ index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1499,8 +1501,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1498,8 +1500,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed
    return [GetInProcessNSView() window];
  }
  
-@@ -1544,9 +1548,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1543,9 +1547,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2039,12 +2045,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2038,12 +2044,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,7 +167,7 @@ index 02db7286cf2e31edce3876b9e970e6754ba8f90c..2c5f09db5e86855c33a79fb8c9f0a6ed
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index cf452160a6504379136712fdda8e7d68ed22b94c..2c0a36f1cd4fd25eddb70ac03f6c45832531e350 100644
+index 37f37c3a8e8a00cf9d4b8959ac2d97fe31629ad8..fa06bafbbaa69a20ce5a3260ca92947cb2bb9228 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -317,6 +317,13 @@ component("base") {
@@ -205,7 +205,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index 03c2f1a992984995b5805dad12cc855775e223d9..14fb49999bc7be5c538b80c99651dab12bc6d2f6 100644
+index 1964f624abc96c54645d1697b598799cfd9a2a00..30580103974b99dcaed2adb0b460b1af17658927 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
 @@ -31,7 +31,9 @@
@@ -233,7 +233,7 @@ index 03c2f1a992984995b5805dad12cc855775e223d9..14fb49999bc7be5c538b80c99651dab1
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index 946de814ec91afe047697c07c73edad6ffc42a78..9d5d58991bd1f16803ba470766416d4f8e409944 100644
+index b77478d96caba7e94c198e9cc8cdd7a6b78e6b25..79af41886c66b51219b69282db17497c5af702d5 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 @@ -294,14 +294,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -259,7 +259,7 @@ index 946de814ec91afe047697c07c73edad6ffc42a78..9d5d58991bd1f16803ba470766416d4f
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1271,6 +1279,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1275,6 +1283,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index 946de814ec91afe047697c07c73edad6ffc42a78..9d5d58991bd1f16803ba470766416d4f
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1278,14 +1287,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1282,14 +1291,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index a45b0eb6bd148..02127ca0ad5c1 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -139,10 +139,10 @@ index 3f7dce0281f7b5a540d7b9377ef14a8a6aa9a2fa..11d8419791f3e45d5242081422d452d4
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index b19e09806e1e1863dd07bb9cf70628e951cd68a9..289e869b5efea09af5172f0b1c5cbd80eddd78cd 100644
+index 6ffc09426b92b0623957f4a5f547865f49e29546..45cf4e11a77c175d61c2ffe69009802596c97e25 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
-@@ -174,6 +174,12 @@ source_set("audio") {
+@@ -175,6 +175,12 @@ source_set("audio") {
        "mac/scoped_audio_unit.cc",
        "mac/scoped_audio_unit.h",
      ]
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 053a68b0b3d18..d4aaf27702eea 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,12 +7,12 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a0927fad90ad 100644
+index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f96285a4e9 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -123,6 +123,11 @@
- #include "services/network/web_transport.h"
+@@ -126,6 +126,11 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "url/gurl.h"
  
 +// Electron
 +#include "net/cert/caching_cert_verifier.h"
@@ -22,7 +22,7 @@ index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a092
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -437,6 +442,79 @@ bool GetFullDataFilePath(
+@@ -433,6 +438,79 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -102,7 +102,7 @@ index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a092
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -674,6 +752,13 @@ void NetworkContext::SetClient(
+@@ -671,6 +749,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -116,7 +116,7 @@ index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a092
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2173,6 +2258,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2226,6 +2311,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -127,10 +127,10 @@ index 3b2c642dbe29e55b6f9c4ce4a85e9aab332f3136..b3008accd63bd6694a44761c4d00a092
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index f69a86f90a6a9055cfc7d4a613e82c0260582688..486a151f6923fd0069ce5aaaffe6559cb60a88ec 100644
+index 6de81678e62d6921d0df5944ab01705402caa568..e412608e7720004462c48698c8ec39602b2b900e 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -101,6 +101,7 @@ class DomainReliabilityMonitor;
+@@ -105,6 +105,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -138,7 +138,7 @@ index f69a86f90a6a9055cfc7d4a613e82c0260582688..486a151f6923fd0069ce5aaaffe6559c
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -216,6 +217,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -220,6 +221,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -147,7 +147,7 @@ index f69a86f90a6a9055cfc7d4a613e82c0260582688..486a151f6923fd0069ce5aaaffe6559c
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -769,6 +772,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -793,6 +796,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    CertVerifierWithTrustAnchors* cert_verifier_with_trust_anchors_ = nullptr;
  #endif
  
@@ -157,7 +157,7 @@ index f69a86f90a6a9055cfc7d4a613e82c0260582688..486a151f6923fd0069ce5aaaffe6559c
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index d7c10e5a55bf0db67c113e0f46094de3c3b3d158..89c00d7ab1510ebdbce49876fcd5f94c5096b3c9 100644
+index 9cd06ee552f8e592dd9efd1e73b10e5998559c04..fa56cfed3703664232843ad26028096d95dca253 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
 @@ -277,6 +277,17 @@ struct NetworkContextFilePaths {
@@ -178,7 +178,7 @@ index d7c10e5a55bf0db67c113e0f46094de3c3b3d158..89c00d7ab1510ebdbce49876fcd5f94c
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -792,6 +803,9 @@ interface NetworkContext {
+@@ -807,6 +818,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 196c6f8d617db..fbb057eaf0f80 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -131,10 +131,10 @@ index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df6
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index b95a062670467c93d01828962a9a592e3193811c..064b5642425290f1d9ab82f75b22fd43973ebf5b 100644
+index a1a3683b8da459a5859a2953536f3400a7fda213..602525302cfdd89bf2ddc2924076e7349de7562a 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2124,7 +2124,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2125,7 +2125,7 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index 3c5ac87ef3497..22bc937a11a4c 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -47,6 +47,115 @@ index 0c1fa8676d00240e60ddd037664a409d1c9619dd..64d21f1878c3433324fc61353a10ee21
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
+diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
+index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d42815d9f4 100644
+--- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
++++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
+@@ -20,6 +20,7 @@
+ #include "base/timer/timer.h"
+ #include "build/build_config.h"
+ #include "chrome/app/vector_icons/vector_icons.h"
++#if 0
+ #include "chrome/browser/command_updater_delegate.h"
+ #include "chrome/browser/command_updater_impl.h"
+ #include "chrome/browser/profiles/profile.h"
+@@ -28,14 +29,15 @@
+ #include "chrome/browser/ui/browser_finder.h"
+ #include "chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h"
+ #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
++#endif
+ #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
+ #include "chrome/browser/ui/views/overlay/close_image_button.h"
+ #include "chrome/browser/ui/views/overlay/resize_handle_button.h"
+-#include "chrome/grit/generated_resources.h"
+ #include "components/omnibox/browser/location_bar_model_impl.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "content/public/browser/document_picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
++#include "electron/grit/electron_resources.h"
+ #include "content/public/common/content_constants.h"
+ #include "media/base/media_switches.h"
+ #include "media/base/video_util.h"
+@@ -57,7 +59,7 @@
+ #include "ui/aura/window.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN)
++#if 0
+ #include "chrome/browser/shell_integration_win.h"
+ #include "ui/aura/window.h"
+ #include "ui/aura/window_tree_host.h"
+@@ -91,7 +93,7 @@ T* AddChildView(std::vector<std::unique_ptr<views::View>>* views,
+ }  // namespace
+ 
+ OverlayLocationBarViewProxy::~OverlayLocationBarViewProxy() = default;
+-
++#if 0
+ class OverlayLocationBarViewImpl : public OverlayLocationBarViewProxy,
+                                    public ChromeLocationBarModelDelegate,
+                                    public LocationBarView::Delegate,
+@@ -149,7 +151,7 @@ class OverlayLocationBarViewImpl : public OverlayLocationBarViewProxy,
+   const std::unique_ptr<LocationBarModelImpl> location_bar_model_;
+   CommandUpdaterImpl command_updater_;
+ };
+-
++#endif
+ // static
+ std::unique_ptr<DocumentOverlayWindowViews> DocumentOverlayWindowViews::Create(
+     content::DocumentPictureInPictureWindowController* controller,
+@@ -185,7 +187,7 @@ std::unique_ptr<DocumentOverlayWindowViews> DocumentOverlayWindowViews::Create(
+   overlay_window->Init(std::move(params));
+   overlay_window->OnRootViewReady();
+ 
+-#if BUILDFLAG(IS_WIN)
++#if 0
+   std::wstring app_user_model_id;
+   Browser* browser =
+       chrome::FindBrowserWithWebContents(controller->GetWebContents());
+@@ -260,12 +262,6 @@ views::View* DocumentOverlayWindowViews::GetControlsContainerView() const {
+   return controls_container_view_;
+ }
+ 
+-const ui::ThemeProvider* DocumentOverlayWindowViews::GetThemeProvider() const {
+-  // FIXME: is there a way to use a dark theme just for this window?
+-  DCHECK(profile_for_theme_);
+-  return &ThemeService::GetThemeProviderForProfile(profile_for_theme_);
+-}
+-
+ void DocumentOverlayWindowViews::SetUpViews() {
+   // The window content consists of the fixed-height controls_container_view at
+   // the top which is a box layout, and the remainder of the view is filled with
+@@ -281,6 +277,7 @@ void DocumentOverlayWindowViews::SetUpViews() {
+   //   +-------------------------------------+
+ 
+   content::WebContents* pip_contents = controller_->GetChildWebContents();
++#if 0
+   auto* profile =
+       Profile::FromBrowserContext(pip_contents->GetBrowserContext());
+   profile_for_theme_ = profile;
+@@ -291,8 +288,8 @@ void DocumentOverlayWindowViews::SetUpViews() {
+     location_bar_view_proxy_ = std::make_unique<OverlayLocationBarViewImpl>(
+         profile, controller_->GetWebContents());
+   }
+-
+-  auto web_view = std::make_unique<views::WebView>(profile);
++#endif
++  auto web_view = std::make_unique<views::WebView>();
+   DVLOG(2) << __func__ << ": content WebView=" << web_view.get();
+   web_view->SetWebContents(pip_contents);
+ 
+diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.h b/chrome/browser/ui/views/overlay/document_overlay_window_views.h
+index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd616e5d6aca 100644
+--- a/chrome/browser/ui/views/overlay/document_overlay_window_views.h
++++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.h
+@@ -55,7 +55,6 @@ class DocumentOverlayWindowViews : public OverlayWindowViews,
+   bool IsVisible() const override;
+   void OnNativeWidgetMove() override;
+   void OnNativeWidgetDestroyed() override;
+-  const ui::ThemeProvider* GetThemeProvider() const override;
+ 
+   // OverlayWindowViews
+   bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
 diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
 index 8e54570ea4c83483eedee4c781f0498ba07bc3dd..b1eb0b2f1a3dfb71e1f5d3917c67e66ac2b27d22 100644
 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc
@@ -61,32 +170,27 @@ index 8e54570ea4c83483eedee4c781f0498ba07bc3dd..b1eb0b2f1a3dfb71e1f5d3917c67e66a
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 6636961b18c71de0477407e6bebc64b091144afd..674cd9100f6ce4e8811e04b459da9f98fb07af3d 100644
+index d96a4937e6ff6bbf4311673b4c91e9f0e957832a..a06cae5f50eb671fc05bd3d41ae4d218a649e991 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-@@ -16,9 +16,11 @@
+@@ -14,13 +14,15 @@
+ #include "base/time/time.h"
  #include "base/timer/timer.h"
  #include "build/build_config.h"
- #include "chrome/app/vector_icons/vector_icons.h"
 +#if 0
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
-+#endif
- #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
- #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
- #include "chrome/browser/ui/views/overlay/close_image_button.h"
-@@ -29,7 +31,8 @@
- #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
- #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
- #include "chrome/browser/ui/views/overlay/track_image_button.h"
 -#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
-+#include "components/url_formatter/url_formatter.h"
++#endif
  #include "components/vector_icons/vector_icons.h"
  #include "content/public/browser/picture_in_picture_window_controller.h"
  #include "content/public/browser/web_contents.h"
-@@ -58,7 +61,7 @@
++#include "electron/grit/electron_resources.h"
+ #include "ui/base/hit_test.h"
+ #include "ui/display/display.h"
+ #include "ui/display/screen.h"
+@@ -36,7 +38,7 @@
  #include "ui/aura/window.h"
  #endif
  
@@ -95,17 +199,8 @@ index 6636961b18c71de0477407e6bebc64b091144afd..674cd9100f6ce4e8811e04b459da9f98
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-@@ -251,7 +254,7 @@ std::unique_ptr<OverlayWindowViews> OverlayWindowViews::Create(
-   overlay_window->Init(std::move(params));
-   overlay_window->OnRootViewReady();
- 
--#if BUILDFLAG(IS_WIN)
-+#if 0
-   std::wstring app_user_model_id;
-   Browser* browser =
-       chrome::FindBrowserWithWebContents(controller->GetWebContents());
 diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index 2a1dcf30751d1c22831e4c2eed43e90ea539b535..113bce8bff4984f673c09d4cad5b98c7ce40a311 100644
+index ad413df822af98f4f80a460c6e464cf5237d5ac4..821b75400a7a4921e59a414516739c6de5a66df7 100644
 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
 @@ -6,7 +6,7 @@
@@ -182,3 +277,49 @@ index d5690233eb85d9f2992ae90461c0d1fd83730d84..d32ee40d1dc7a0004d534540189179b2
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
+diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+index d25bffe434d866760d1efc4dd972b6ba4946acd0..2819bcefb83b6b4cb10114b7ad1df881ccade58d 100644
+--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
++++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+@@ -15,9 +15,11 @@
+ #include "base/timer/timer.h"
+ #include "build/build_config.h"
+ #include "chrome/app/vector_icons/vector_icons.h"
++#if 0
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
++#endif
+ #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
+ #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
+ #include "chrome/browser/ui/views/overlay/close_image_button.h"
+@@ -28,10 +30,10 @@
+ #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
+ #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
+ #include "chrome/browser/ui/views/overlay/track_image_button.h"
+-#include "chrome/grit/generated_resources.h"
+ #include "components/vector_icons/vector_icons.h"
+ #include "content/public/browser/video_picture_in_picture_window_controller.h"
+ #include "content/public/browser/web_contents.h"
++#include "electron/grit/electron_resources.h"
+ #include "media/base/media_switches.h"
+ #include "media/base/video_util.h"
+ #include "third_party/skia/include/core/SkColor.h"
+@@ -53,7 +55,7 @@
+ #include "ui/aura/window.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN)
++#if 0
+ #include "chrome/browser/shell_integration_win.h"
+ #include "ui/aura/window.h"
+ #include "ui/aura/window_tree_host.h"
+@@ -127,7 +129,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
+   overlay_window->Init(std::move(params));
+   overlay_window->OnRootViewReady();
+ 
+-#if BUILDFLAG(IS_WIN)
++#if 0
+   std::wstring app_user_model_id;
+   Browser* browser =
+       chrome::FindBrowserWithWebContents(controller->GetWebContents());
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
new file mode 100644
index 0000000000000..686010806fc75
--- /dev/null
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -0,0 +1,97 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Mon, 14 Feb 2022 19:24:36 +0900
+Subject: Port autofill colors to the color pipeline.
+
+https://chromium-review.googlesource.com/c/chromium/src/+/1652925 removed colors as they are no longer
+needed in chromium but our autofill implementation uses them.  This patch can be removed if we refactor
+our autofill implementation to work like Chromium's.
+
+diff --git a/ui/color/color_id.h b/ui/color/color_id.h
+index 1b9518366ba6c44421a86565ea3eba80e14b6c43..203ac8902eda26262f4178985ee565874bf879b8 100644
+--- a/ui/color/color_id.h
++++ b/ui/color/color_id.h
+@@ -121,6 +121,10 @@
+   E_CPONLY(kColorPwaSecurityChipForegroundSecure) \
+   E_CPONLY(kColorPwaToolbarBackground) \
+   E_CPONLY(kColorPwaToolbarForeground) \
++  E_CPONLY(kColorResultsTableNormalBackground) \
++  E_CPONLY(kColorResultsTableHoveredBackground) \
++  E_CPONLY(kColorResultsTableNormalText) \
++  E_CPONLY(kColorResultsTableDimmedText) \
+   E_CPONLY(kColorSeparator) \
+   E_CPONLY(kColorShadowBase) \
+   E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
+@@ -173,6 +177,7 @@
+   E_CPONLY(kColorTreeNodeForeground) \
+   E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
+   E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
++  E_CPONLY(kColorUnfocusedBorder) \
+   E_CPONLY(kColorWindowBackground)
+ 
+ #if BUILDFLAG(IS_CHROMEOS)
+diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
+index 1d8415814c6245e3f2dfd01de7a2de11f09cdc7a..6db48efe454820e242b862edbfaf4d40cf16eb9d 100644
+--- a/ui/color/ui_color_mixer.cc
++++ b/ui/color/ui_color_mixer.cc
+@@ -141,6 +141,17 @@ void AddUiColorMixer(ColorProvider* provider,
+       kColorPwaSecurityChipForeground};
+   mixer[kColorPwaToolbarBackground] = {kColorEndpointBackground};
+   mixer[kColorPwaToolbarForeground] = {kColorEndpointForeground};
++  mixer[kColorResultsTableNormalBackground] = {SK_ColorWHITE};
++  mixer[kColorResultsTableHoveredBackground] =
++      SetAlpha(kColorResultsTableNormalText, 0x0D);
++  mixer[kColorResultsTableNormalText] = {SK_ColorBLACK};
++  mixer[kColorResultsTableDimmedText] = {SkColorSetRGB(0x64, 0x64, 0x64)};
++  if (dark_mode) {
++    mixer[kColorResultsTableNormalBackground] = {SkColorSetRGB(0x28, 0x28, 0x28)};
++    mixer[kColorResultsTableNormalText] = {SK_ColorWHITE};
++    mixer[kColorResultsTableDimmedText] =
++      SetAlpha(kColorResultsTableNormalText, 0x80);
++  }
+   mixer[kColorSeparator] = {kColorMidground};
+   mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
+   mixer[kColorShadowValueAmbientShadowElevationThree] =
+@@ -216,6 +227,7 @@ void AddUiColorMixer(ColorProvider* provider,
+   mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
+   mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
+       kColorTreeNodeForegroundSelectedFocused};
++  mixer[kColorUnfocusedBorder] = {kColorMidground};
+   mixer[kColorWindowBackground] = {kColorPrimaryBackground};
+ }
+ 
+diff --git a/ui/color/win/native_color_mixers_win.cc b/ui/color/win/native_color_mixers_win.cc
+index 5faab22f665829e04cc07125f2486b9cb35f1f56..9776dbcc576c62ee44cbdd0d59542856363fb8f4 100644
+--- a/ui/color/win/native_color_mixers_win.cc
++++ b/ui/color/win/native_color_mixers_win.cc
+@@ -136,16 +136,22 @@ void AddNativeUiColorMixer(ColorProvider* provider,
+       SetAlpha(kColorNotificationInputForeground, gfx::kGoogleGreyAlpha700);
+   mixer[kColorSliderTrack] = AlphaBlend(
+       kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
++  mixer[kColorResultsTableHoveredBackground] = AlphaBlend(
++      kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
++  mixer[kColorResultsTableDimmedText] = AlphaBlend(
++      kColorNativeWindowText, kColorNativeWindow, gfx::kGoogleGreyAlpha600);
+ 
+   // Window Background
+   mixer[kColorBubbleFooterBackground] = {kColorNativeWindow};
+   mixer[kColorTooltipBackground] = {kColorNativeWindow};
+   mixer[kColorButtonBackgroundProminentDisabled] = {kColorNativeWindow};
++  mixer[kColorResultsTableNormalBackground] = {kColorNativeWindow};
+ 
+   // Window Text
+   mixer[kColorTableGroupingIndicator] = {kColorNativeWindowText};
+   mixer[kColorThrobber] = {kColorNativeWindowText};
+   mixer[kColorTooltipForeground] = {kColorNativeWindowText};
++  mixer[kColorResultsTableNormalText] = {kColorNativeWindowText};
+ 
+   // Hyperlinks
+   mixer[kColorLinkForeground] = {kColorNativeHotlight};
+@@ -179,6 +185,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
+   mixer[kColorTextfieldForeground] = {kColorNativeBtnText};
+   mixer[kColorTextfieldForegroundPlaceholder] = {kColorNativeBtnText};
+   mixer[kColorTextfieldForegroundDisabled] = {kColorNativeBtnText};
++  mixer[kColorUnfocusedBorder] = {kColorNativeBtnText};
+ 
+   // Highlight/Selected Background
+   mixer[kColorButtonBorder] = {kColorNativeHighlight};
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 6b72c3846a61b..86e14be4b6659 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
-index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f57c192940 100644
+index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644
 --- a/chrome/browser/printing/print_job.cc
 +++ b/chrome/browser/printing/print_job.cc
-@@ -88,6 +88,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
+@@ -89,6 +89,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
    return base::FeatureList::IsEnabled(features::kPrintWithReducedRasterization);
  }
  
@@ -22,7 +22,7 @@ index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f5
  PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
    // TODO(thestig): Figure out why crbug.com/1083911 occurred, which is likely
    // because `web_contents` was null. As a result, this section has many more
-@@ -96,6 +97,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
+@@ -97,6 +98,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
        web_contents ? web_contents->GetBrowserContext() : nullptr;
    return context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
  }
@@ -30,7 +30,7 @@ index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f5
  
  #endif  // BUILDFLAG(IS_WIN)
  
-@@ -355,8 +357,10 @@ void PrintJob::StartPdfToEmfConversion(
+@@ -356,8 +358,10 @@ void PrintJob::StartPdfToEmfConversion(
  
    const PrintSettings& settings = document()->settings();
  
@@ -42,7 +42,7 @@ index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f5
  
    using RenderMode = PdfRenderSettings::Mode;
    RenderMode mode = print_with_reduced_rasterization
-@@ -446,8 +450,10 @@ void PrintJob::StartPdfToPostScriptConversion(
+@@ -447,8 +451,10 @@ void PrintJob::StartPdfToPostScriptConversion(
    if (ps_level2) {
      mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
    } else {
@@ -55,10 +55,10 @@ index fb0418a0c5337345c67b3692d16871047e0d1b11..a5cceb8c68a05240394479c79f8304f5
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
-index f922dc5c61ec85e6102a8e92b1b7096382dec6f0..477db7fa8517df9d4b09467ea569af3fe4c4f78c 100644
+index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471c359553b 100644
 --- a/chrome/browser/printing/print_job.h
 +++ b/chrome/browser/printing/print_job.h
-@@ -257,6 +257,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
+@@ -261,6 +261,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
   public:
    // Event type.
    enum Type {
@@ -69,7 +69,7 @@ index f922dc5c61ec85e6102a8e92b1b7096382dec6f0..477db7fa8517df9d4b09467ea569af3f
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index fc26fd8f32e4c1edd3ca41baf0e9cdd482b25c03..aeaa88bee6b4ce499c361e1b2e93bf5fb0fd31ea 100644
+index 7dbb9aea759e4a80a4ef3133eeffcd952bbe6d50..62fbaa0e24dff2037f47ef4ccf09993aa79b3ef8 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,13 +20,13 @@
@@ -113,10 +113,10 @@ index fc26fd8f32e4c1edd3ca41baf0e9cdd482b25c03..aeaa88bee6b4ce499c361e1b2e93bf5f
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index f8e48861a2964da636afd767c0034d782ee52d6e..174d51d3b6d9f0131be36cf80199b27875d23960 100644
+index 457749cf31578666304c30a5df1b8428629caafe..21c4a76411ee06775fb5bbb2d5a2ac17911d1c2a 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -209,7 +209,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -225,7 +225,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -126,7 +126,7 @@ index f8e48861a2964da636afd767c0034d782ee52d6e..174d51d3b6d9f0131be36cf80199b278
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2e220f675 100644
+index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd0828b8a1 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -29,10 +29,10 @@
@@ -150,8 +150,8 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"
-@@ -110,6 +111,8 @@ crosapi::mojom::PrintJobPtr PrintJobToMojom(int job_id,
- #endif
+@@ -81,6 +82,8 @@ using PrintSettingsCallback =
+     base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
 +  LOG(ERROR) << "Invalid printer settings " << message;
@@ -159,7 +159,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -118,6 +121,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -89,6 +92,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -167,7 +167,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -217,7 +221,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -188,7 +192,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -178,7 +178,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -270,6 +276,7 @@ void ScriptedPrintReplyOnIO(
+@@ -241,6 +247,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -186,7 +186,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -279,8 +286,9 @@ void ScriptedPrintReplyOnIO(
+@@ -250,8 +257,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -197,7 +197,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -319,12 +327,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -290,12 +298,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -212,7 +212,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -332,7 +342,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -303,7 +313,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -224,7 +224,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -355,7 +368,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -326,7 +339,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
    // go in `ReleasePrintJob()`.
  
    SetPrintingRFH(rfh);
@@ -235,7 +235,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -499,7 +514,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -470,7 +485,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -245,7 +245,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
    if (!content::RenderProcessHost::FromID(process_id)) {
-@@ -507,16 +523,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -478,16 +494,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -269,7 +269,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -630,12 +649,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -601,12 +620,13 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -284,7 +284,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
-@@ -653,18 +673,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -624,18 +644,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -306,7 +306,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -674,6 +696,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -645,6 +667,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -314,7 +314,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -699,7 +722,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -670,7 +693,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -323,7 +323,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
      return;
    }
    int process_id = render_process_host->GetID();
-@@ -722,7 +745,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -693,7 +716,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -331,7 +331,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  #endif
  
    ReleasePrinterQuery();
-@@ -737,6 +759,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -708,6 +730,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -343,7 +343,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -747,8 +774,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -718,8 +745,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -354,7 +354,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -816,6 +845,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -779,6 +808,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -366,7 +366,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -877,7 +911,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -840,7 +874,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -378,7 +378,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    if (!weak_this)
      return false;
  
-@@ -952,6 +989,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -915,6 +952,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    content::RenderFrameHost* rfh = printing_rfh_;
    printing_rfh_ = nullptr;
  
@@ -392,7 +392,7 @@ index c759b7a7c9d197f4760a2d86f976a965a44abf9a..2d528020ba6c6411e6fd6d47ea1dd6d2
    if (!print_job_)
      return;
  
-@@ -1001,7 +1045,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -964,7 +1008,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -483,10 +483,10 @@ index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625c9209ba9 100644
+index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9c832bf5a 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
-@@ -39,6 +39,7 @@
+@@ -40,6 +40,7 @@
  #include "printing/metafile_skia.h"
  #include "printing/mojom/print.mojom.h"
  #include "printing/print_job_constants.h"
@@ -494,7 +494,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1253,7 +1254,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1254,7 +1255,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -504,7 +504,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
      if (!weak_this)
        return;
  
-@@ -1284,7 +1286,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1285,7 +1287,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -513,7 +513,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1299,7 +1301,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1300,7 +1302,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -522,7 +522,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1330,7 +1332,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1331,7 +1333,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -532,7 +532,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1377,6 +1380,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1378,6 +1381,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -541,7 +541,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
    print_preview_context_.OnPrintPreview();
  
    if (print_preview_context_.IsForArc()) {
-@@ -1914,7 +1919,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1915,7 +1920,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -551,7 +551,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1929,7 +1935,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1930,7 +1936,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -562,7 +562,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1937,7 +1945,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1938,7 +1946,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -571,7 +571,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1956,8 +1964,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1957,8 +1965,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -588,7 +588,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2205,36 +2220,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2206,36 +2221,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -652,7 +652,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2378,7 +2408,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2380,7 +2410,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -661,7 +661,7 @@ index eca58f84556152ef813283332f47b08f721693ac..ca415069a57932b3883d9975da3b0625
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2623,18 +2653,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
+@@ -2625,18 +2655,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index 4fa2ecbd96c66..58d5bc201d4af 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -75,7 +75,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..8f94cc300b58e8a94b6ca155aa3cf370
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d0b85b8f9 100644
+index c9f26ea2d2ea16484d416fdce095ec1b8b885991..47e60bfd8239d4a2e292b835c49132bdbb751555 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -53,6 +53,7 @@
@@ -94,7 +94,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  #include "base/threading/platform_thread.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "base/time/time.h"
-@@ -97,9 +99,11 @@
+@@ -98,9 +100,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -106,7 +106,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  
  #if defined(TOOLKIT_VIEWS) && \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -348,6 +352,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+@@ -349,6 +353,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -116,7 +116,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -367,6 +374,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -368,6 +375,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -124,7 +124,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -407,6 +415,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -408,6 +416,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -146,7 +146,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -788,6 +811,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -775,6 +798,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -157,7 +157,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -956,6 +983,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -947,6 +974,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -178,7 +178,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1055,14 +1096,32 @@ bool ProcessSingleton::Create() {
+@@ -1046,14 +1087,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -216,7 +216,7 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1105,10 +1164,13 @@ bool ProcessSingleton::Create() {
+@@ -1096,10 +1155,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
@@ -235,12 +235,12 @@ index c546c80e8d1d8e88a2d32a390eb8dbef32bf4b72..81fb8994c53fb16d7c96de008c96127d
    return true;
  }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f86c2fc0f 100644
+index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac53287f2d7 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -27,7 +27,9 @@
- #include "base/win/windows_version.h"
+@@ -28,7 +28,9 @@
  #include "base/win/wmi.h"
+ #include "chrome/browser/process_singleton_internal.h"
  #include "chrome/browser/shell_integration.h"
 +#if 0
  #include "chrome/browser/ui/simple_message_box.h"
@@ -248,11 +248,12 @@ index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f
  #include "chrome/browser/win/chrome_process_finder.h"
  #include "chrome/common/chrome_constants.h"
  #include "chrome/common/chrome_paths.h"
-@@ -179,10 +181,15 @@ bool ProcessLaunchNotification(
+@@ -163,11 +165,16 @@ bool ProcessLaunchNotification(
  }
  
  bool DisplayShouldKillMessageBox() {
 +#if 0
+   TRACE_EVENT0("startup", "ProcessSingleton:DisplayShouldKillMessageBox");
    return chrome::ShowQuestionMessageBoxSync(
               NULL, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
               l10n_util::GetStringUTF16(IDS_BROWSER_HUNGBROWSER_MESSAGE)) !=
@@ -263,8 +264,8 @@ index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f
 +  return false;
  }
  
- void SendRemoteProcessInteractionResultHistogram(
-@@ -264,9 +271,13 @@ bool ProcessSingleton::EscapeVirtualization(
+ // Function was copied from Process::Terminate.
+@@ -245,9 +252,13 @@ bool ProcessSingleton::EscapeVirtualization(
  }
  
  ProcessSingleton::ProcessSingleton(
@@ -278,7 +279,7 @@ index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f
        is_virtualized_(false),
        lock_file_(INVALID_HANDLE_VALUE),
        user_data_dir_(user_data_dir),
-@@ -371,11 +382,14 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -361,13 +372,16 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
    return PROFILE_IN_USE;
  }
  
@@ -289,12 +290,14 @@ index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f
  // isn't one, create a message window with its title set to the profile
  // directory path.
  bool ProcessSingleton::Create() {
+   TRACE_EVENT0("startup", "ProcessSingleton::Create");
+ 
 -  static const wchar_t kMutexName[] = L"Local\\ChromeProcessSingletonStartup!";
 +  std::wstring mutexName = base::UTF8ToWide("Local\\" + program_name_ + "ProcessSingletonStartup");
  
    remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
    if (!remote_window_ && !EscapeVirtualization(user_data_dir_)) {
-@@ -384,7 +398,7 @@ bool ProcessSingleton::Create() {
+@@ -376,7 +390,7 @@ bool ProcessSingleton::Create() {
      // access. As documented, it's clearer to NOT request ownership on creation
      // since it isn't guaranteed we will get it. It is better to create it
      // without ownership and explicitly get the ownership afterward.
@@ -303,7 +306,7 @@ index 1df74f5299b1b3bdd180034a6895796dc4b2ec60..679350dd08ca0211653ea669405e3f4f
      if (!only_me.IsValid()) {
        DPLOG(FATAL) << "CreateMutex failed";
        return false;
-@@ -423,6 +437,17 @@ bool ProcessSingleton::Create() {
+@@ -415,6 +429,17 @@ bool ProcessSingleton::Create() {
              window_.CreateNamed(base::BindRepeating(&ProcessLaunchNotification,
                                                      notification_callback_),
                                  user_data_dir_.value());
diff --git a/patches/chromium/put_back_deleted_colors_for_autofill.patch b/patches/chromium/put_back_deleted_colors_for_autofill.patch
deleted file mode 100644
index 5a88aa521ea7e..0000000000000
--- a/patches/chromium/put_back_deleted_colors_for_autofill.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: John Kleinschmidt <jkleinsc@github.com>
-Date: Thu, 20 Jun 2019 16:49:25 -0400
-Subject: put_back_deleted_colors_for_autofill.patch
-
-https://chromium-review.googlesource.com/c/chromium/src/+/1652925 removed colors as they are no longer
-needed in chromium but our autofill implementation uses them.  This patch can be removed if we refactor
-our autofill implementation to work like Chromium's.
-
-diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
-index e798a3156ffbea9e8bddc33e3e1373df949b385d..571767dcb702e876835e767e4a4a8588b0639a96 100644
---- a/ui/native_theme/common_theme.cc
-+++ b/ui/native_theme/common_theme.cc
-@@ -32,6 +32,7 @@ absl::optional<SkColor> GetHighContrastColor(
-     NativeTheme::ColorScheme color_scheme) {
-   switch (color_id) {
-     case NativeTheme::kColorId_MenuSeparatorColor:
-+    case NativeTheme::kColorId_UnfocusedBorderColor:
-       return color_scheme == NativeTheme::ColorScheme::kDark ? SK_ColorWHITE
-                                                              : SK_ColorBLACK;
-     case NativeTheme::kColorId_FocusedBorderColor:
-@@ -53,6 +54,15 @@ absl::optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id,
-       return gfx::kGoogleBlue400;
-     case NativeTheme::kColorId_MenuSeparatorColor:
-       return gfx::kGoogleGrey800;
-+
-+    // Results Tables
-+    case NativeTheme::kColorId_ResultsTableNormalBackground:
-+      return SkColorSetRGB(0x28, 0x28, 0x28);
-+    case NativeTheme::kColorId_ResultsTableNormalText:
-+      return SK_ColorWHITE;
-+    case NativeTheme::kColorId_ResultsTableDimmedText:
-+      return SkColorSetA(base_theme->GetSystemColor(NativeTheme::kColorId_ResultsTableNormalText), 0x80);
-+
-     case NativeTheme::kColorId_ProminentButtonColor:
-       return gfx::kGoogleBlue300;
-     case NativeTheme::kColorId_WindowBackground:
-@@ -67,6 +77,8 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
-                         NativeTheme::ColorScheme color_scheme) {
-   switch (color_id) {
-     // Border
-+    case NativeTheme::kColorId_UnfocusedBorderColor:
-+      return gfx::kGoogleGrey300;
-     case NativeTheme::kColorId_FocusedBorderColor:
-       return gfx::kGoogleBlue500;
- 
-@@ -114,6 +126,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
-     case NativeTheme::kColorId_WindowBackground:
-       return SK_ColorWHITE;
- 
-+    // Results Tables
-+    case NativeTheme::kColorId_ResultsTableNormalBackground:
-+      return SK_ColorWHITE;
-+    case NativeTheme::kColorId_ResultsTableHoveredBackground:
-+      return SkColorSetA(base_theme->GetSystemColor(
-+                             NativeTheme::kColorId_ResultsTableNormalText),
-+                         0x0D);
-+    case NativeTheme::kColorId_ResultsTableNormalText:
-+      return SK_ColorBLACK;
-+    case NativeTheme::kColorId_ResultsTableDimmedText:
-+      return SkColorSetRGB(0x64, 0x64, 0x64);
-+
-     case NativeTheme::kColorId_NumColors:
-       // Keeping the kColorId_NumColors case instead of using the default case
-       // allows ColorId additions to trigger compile error for an incomplete
-diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h
-index e53194c75dce367b11ae1835427ee5529cdbcf13..4381a93e6c70ae4ca0556844f0303000987fbef5 100644
---- a/ui/native_theme/native_theme_color_id.h
-+++ b/ui/native_theme/native_theme_color_id.h
-@@ -10,12 +10,18 @@
- #define NATIVE_THEME_CROSS_PLATFORM_COLOR_IDS                                  \
-   OP(kColorId_DefaultIconColor),                                               \
-   OP(kColorId_FocusedBorderColor),                                             \
-+  OP(kColorId_UnfocusedBorderColor),                                           \
-   OP(kColorId_FocusedMenuItemBackgroundColor),                                 \
-   OP(kColorId_MenuBackgroundColor),                                            \
-   OP(kColorId_MenuIconColor),                                                  \
-   OP(kColorId_MenuSeparatorColor),                                             \
-   OP(kColorId_ProminentButtonColor),                                           \
-   OP(kColorId_TextOnProminentButtonColor),                                     \
-+  /* Results Tables, such as the omnibox */                                    \
-+  OP(kColorId_ResultsTableNormalBackground),                                   \
-+  OP(kColorId_ResultsTableHoveredBackground),                                  \
-+  OP(kColorId_ResultsTableNormalText),                                         \
-+  OP(kColorId_ResultsTableDimmedText),                                         \
-   OP(kColorId_ThrobberSpinningColor),                                          \
-   OP(kColorId_ThrobberWaitingColor),                                           \
-   OP(kColorId_WindowBackground)
-diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index e30e7a26e5c2d8a109c837e683d4f108537043f3..5f809b71c635abd3679ee593850e521a14cb62f5 100644
---- a/ui/native_theme/native_theme_win.cc
-+++ b/ui/native_theme/native_theme_win.cc
-@@ -627,10 +627,23 @@ absl::optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
-     case kColorId_ThrobberWaitingColor:
-       return system_colors_[SystemThemeColor::kGrayText];
- 
-+    // Results Tables
-+    case kColorId_ResultsTableNormalBackground:
-+      return system_colors_[SystemThemeColor::kWindow];
-+    case kColorId_ResultsTableHoveredBackground:
-+      return color_utils::AlphaBlend(system_colors_[SystemThemeColor::kWindowText],
-+                                     system_colors_[SystemThemeColor::kWindow], 0.25f);
-+    case kColorId_ResultsTableNormalText:
-+      return system_colors_[SystemThemeColor::kWindowText];
-+    case kColorId_ResultsTableDimmedText:
-+      return color_utils::AlphaBlend(system_colors_[SystemThemeColor::kWindowText],
-+                                     system_colors_[SystemThemeColor::kWindow], 0.5f);
-+
-     case kColorId_MenuBackgroundColor:
-       return system_colors_[SystemThemeColor::kButtonFace];
- 
-     case kColorId_MenuSeparatorColor:
-+    case kColorId_UnfocusedBorderColor:
-     case kColorId_FocusedBorderColor:
-       return system_colors_[SystemThemeColor::kButtonText];
- 
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 1d450b2a20b49..ec5cabb02673a 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 4b0b2b0dc0900627aee38de021ec10cbdc9b3cb4..12c15f92d9c4db4e100b7183a654ec199f64b25b 100644
+index 59437e69e25fe85cffc9b558dec2284123ac48be..d3af2aed32f6047cbb86bd2b4ce1df9fee80437c 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2082,6 +2082,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 4b0b2b0dc0900627aee38de021ec10cbdc9b3cb4..12c15f92d9c4db4e100b7183a654ec19
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index f3e21a7cacb9d192bf3b6cf4d2bfc8d372cd8307..2e91c4f052501e4067cf8fee21f2f3c2674f1c1a 100644
+index c8e49eeaca8b31479aa908be9c349ccd625e9e51..5c63a024827359ccf697d0b7fc8fa2092eb107b7 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4418,6 +4418,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4486,6 +4486,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index f3e21a7cacb9d192bf3b6cf4d2bfc8d372cd8307..2e91c4f052501e4067cf8fee21f2f3c2
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 822e00b20a272480a3df4c67be7b6ff93375fd15..d2a50feea97add9d9c309e8066305caf9105c547 100644
+index 85b426a7552cf925157a76fcd1ed7de47cd27a54..7440f2025701ccde0ade36cda22467dd0614109b 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -963,6 +963,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -965,6 +965,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
        blink::mojom::FrameVisibility visibility) override;
    void SendScreenRects() override;
    TextInputManager* GetTextInputManager() override;
@@ -71,7 +71,7 @@ index 822e00b20a272480a3df4c67be7b6ff93375fd15..d2a50feea97add9d9c309e8066305caf
        RenderWidgetHostImpl* render_widget_host) override;
    bool IsShowingContextMenuOnPage() const override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index 469b98f8405d24b9a13e559a56b9f239bbebd17f..82f61584e1786546cfcb469edfdfe8821c67b67c 100644
+index b68d706fe204c3e8d65b2bf523950840c0398db2..8852a8da29bc9b7f9b832ad392741751f46e3fd7 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
 @@ -13,6 +13,7 @@
@@ -82,7 +82,7 @@ index 469b98f8405d24b9a13e559a56b9f239bbebd17f..82f61584e1786546cfcb469edfdfe882
  #include "content/public/browser/allow_service_worker_result.h"
  #include "content/public/browser/reload_type.h"
  #include "content/public/browser/render_frame_host.h"
-@@ -533,6 +534,9 @@ class CONTENT_EXPORT WebContentsObserver {
+@@ -527,6 +528,9 @@ class CONTENT_EXPORT WebContentsObserver {
    // Invoked when the primary main frame changes size.
    virtual void PrimaryMainFrameWasResized(bool width_changed) {}
  
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index f20ba81bc3111..24054daa57a97 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 1eb2b692c59d33b109085e594badb7fe8284dda5..1b36c21890541ab056ba7a5c403e14a75ce39be3 100644
+index 5fd8cb63f589dd204c2477f2375ec1d3716b55f0..85e52f7a99fe350da05270cf6fde0fe82a1bec40 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -649,6 +649,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -660,6 +660,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index 1eb2b692c59d33b109085e594badb7fe8284dda5..1b36c21890541ab056ba7a5c403e14a7
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 0c21c3b6e2a4b76d9cb27d7857778dfcb273616e..849bc53f18c30338462acc89e59ab7a7045faa75 100644
+index abdd3cf7d93ab9a1f80351d38ddcee52664414da..98da92a6d31103dfa0a48e278c3a15ee0533791e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 5d09097b66026..6ed6e2f5790a2 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 67a430b99e98e21383d3851e0c54fa3d9affbdcd..71152d08a9e9ce2e112fd7a6c3134a547af5d978 100644
+index 04546cad2b3e6355d667fe725b85836f128f0df7..7caaf66cad9d5b9f787cea0d49c32c26801571c2 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1586,7 +1586,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1591,7 +1591,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 67a430b99e98e21383d3851e0c54fa3d9affbdcd..71152d08a9e9ce2e112fd7a6c3134a54
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1614,6 +1614,12 @@ if (!is_android) {
+@@ -1619,6 +1619,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index a714e9ca7e5d7..0a1e41b6d04e2 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 03f9fac83207248d6c99326b6a5c17b3555e7725..e211b83624c4cc691e29dc6c47a2a74f8a41f4b4 100644
+index 0b42cba8667225c25df2405d99efe119a26c3585..ee8b42500499dc6a1700bc38e5b75976bb408490 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1304,7 +1304,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1344,7 +1344,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index d18ff7c274509..dd479d4ad0215 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 064b5642425290f1d9ab82f75b22fd43973ebf5b..30a0c9216a206042a9769bdeda015eaf00e3cc49 100644
+index 602525302cfdd89bf2ddc2924076e7349de7562a..ac9570fa3d9cb3b0026f70465e5b21ac7778c3df 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1835,9 +1835,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1836,9 +1836,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch
index 6502a2a7c5d37..f54224072007c 100644
--- a/patches/chromium/ui_gtk_public_header.patch
+++ b/patches/chromium/ui_gtk_public_header.patch
@@ -6,7 +6,7 @@ Subject: ui_gtk_public_header.patch
 Allow electron to depend on //ui/gtk/gtk_util.h
 
 diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
-index 46a78cf2658ab261c40f7c42135a2e89d0d152d1..7bd8da917e554e3c0523711e33fd196dd6e9805b 100644
+index 4093df78da0bbb1d8df743942f364cf728ad3414..2f31d99b207ffc3531b5334b5a01239cc1fefb35 100644
 --- a/ui/gtk/BUILD.gn
 +++ b/ui/gtk/BUILD.gn
 @@ -69,7 +69,7 @@ generate_stubs("gtk_stubs") {
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 1d4dc49b73551..849e94be20ccd 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 74e6928041145fd6f37ec4ce7acc6be0649b944d..3eaf29f3ab74de6159bba1578ba0810bd9467922 100644
+index 3da88b5831717c979373c064b4c1520c28d4fd98..cf3ea07bb7d708f9078c46af2c4583215f9cd189 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -2983,6 +2983,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3040,6 +3040,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 74e6928041145fd6f37ec4ce7acc6be0649b944d..3eaf29f3ab74de6159bba1578ba0810b
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -2993,6 +3000,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3050,6 +3057,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
@@ -35,7 +35,7 @@ index 74e6928041145fd6f37ec4ce7acc6be0649b944d..3eaf29f3ab74de6159bba1578ba0810b
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 1b21d5241ea671e4ead260f170e6a0512efea89a..ac9bce453ff812679d8c77d661729ea681977061 100644
+index ad5c13965f1ccc078de5f25b08d51ed43e37f259..cd1b44d4ff5ce8924749ba9e41b3f599108bb8fd 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index cf119b4d99398..67d32c0a23bbd 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 1aa844b66d149be252f4757ed656cc6bccb2ac8b..b03507679029ccb3beb3a8984b1449afead539c6 100644
+index eff6616ef019ea8b661b878cc5fccd1e4b9217aa..9aff1848395dc41311df575dd7cbf0771271ed03 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -881,10 +881,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -890,10 +890,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // TODO(https://crbug.com/1266953): There are some known gaps caused by
    // comparing `RenderViewHost` IDs, as `RenderViewHost` ID is not really a
    // strong signal for page identity.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 9ce1e6240c9ed..af32042b3d84e 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 365b6eb2efc2f09725a9a53b79e83a50bded1c75..0d456ac4b4e832bc64bc1adb8952ce13f084564d 100644
+index 713e2883139bca4bb56dcc7e3efcf6d6dfc4a02b..be2721cc6dc0582a05c74ac3d50c123666d7d5a3 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6035,6 +6035,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6102,6 +6102,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index cf2a22e34d0a1..099e2f15e3205 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 3c5b962a3ca5baffe525898d7f417f5fd3687a0b..3c85714b68adda07615cf13740a7257561ecc6f9 100644
+index 63ead7f8ab838693bade7163ddebd1787cc82344..8512a66eda07202b6c6faea049736fd8f16c93db 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -363,6 +363,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -361,6 +361,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -26,10 +26,10 @@ index 3c5b962a3ca5baffe525898d7f417f5fd3687a0b..3c85714b68adda07615cf13740a72575
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index b4e37bbdd3a80c8d6255d4b536bedbff1d4202a0..e793b0c25f2900d949a7473c3f29c620ffd80408 100644
+index a64d78c9d8112610af6a17c8f8b8b9124b9d40a3..0bd64497495cfd8eee5e7cae3eca69937f2e79e0 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -924,6 +924,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -932,6 +932,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index b4e37bbdd3a80c8d6255d4b536bedbff1d4202a0..e793b0c25f2900d949a7473c3f29c620
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 2191ab72dcaccf50ddbc700ded63f66b95de856d..b4f6e7a468661c272a4cef338e1c171f7247191f 100644
+index 10c96d3915e64ebebd283c70292b33e22612b8eb..9fa6853a2945e2a34ed319f874f356a4afd72dd3 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -207,6 +207,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -208,6 +208,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -55,10 +55,10 @@ index 2191ab72dcaccf50ddbc700ded63f66b95de856d..b4f6e7a468661c272a4cef338e1c171f
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 6acdee7c9eb8e5368401ba804f9a359e5c7b2b70..c72c142a8b4591b12ff2b3a10a143658c6dcfff3 100644
+index d188491afffbd259d4287b0668a9d1cec291934a..2fe5234832f8a3510326171e1ccf5dbfeca49fc9 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -713,6 +713,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -720,6 +720,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index e0a940cc8e788..8c14560076af0 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 3c85714b68adda07615cf13740a7257561ecc6f9..6cc354acc6f8d253827a799f86fb9d4aba92aa1b 100644
+index 8512a66eda07202b6c6faea049736fd8f16c93db..afe767350c8878da38ab2b566fa89bcb831f8716 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -363,6 +363,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -361,6 +361,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -35,10 +35,10 @@ index 3c85714b68adda07615cf13740a7257561ecc6f9..6cc354acc6f8d253827a799f86fb9d4a
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index e793b0c25f2900d949a7473c3f29c620ffd80408..5b25349e735aa5b32745428d5b19b5cf2454dfc1 100644
+index 0bd64497495cfd8eee5e7cae3eca69937f2e79e0..9ab68aabff203127dba5a0ccdf16fa62f3ef4c40 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -936,6 +936,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -944,6 +944,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index e793b0c25f2900d949a7473c3f29c620ffd80408..5b25349e735aa5b32745428d5b19b5cf
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index b4f6e7a468661c272a4cef338e1c171f7247191f..c70667d616ac3a64fba7c5d2ba315d2c40cc5463 100644
+index 9fa6853a2945e2a34ed319f874f356a4afd72dd3..87f9190d227e501a648dbbaa350bbb105601fbfb 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -207,6 +207,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -208,6 +208,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -65,10 +65,10 @@ index b4f6e7a468661c272a4cef338e1c171f7247191f..c70667d616ac3a64fba7c5d2ba315d2c
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index c72c142a8b4591b12ff2b3a10a143658c6dcfff3..03d0a3e596f3d0e5582d4a34aa51a3e5e97210d6 100644
+index 2fe5234832f8a3510326171e1ccf5dbfeca49fc9..b36a118861b2efae6ae28ef0e7f14db5d284b929 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -713,6 +713,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -720,6 +720,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/node/.patches b/patches/node/.patches
index 55ddb7c5a2285..0346bf4bde829 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -31,3 +31,4 @@ fix_serdes_test.patch
 darwin_remove_eprototype_error_workaround_3405.patch
 darwin_translate_eprototype_to_econnreset_3413.patch
 darwin_bump_minimum_supported_version_to_10_15_3406.patch
+fix_failing_node_js_test_on_outdated.patch
diff --git a/patches/node/fix_failing_node_js_test_on_outdated.patch b/patches/node/fix_failing_node_js_test_on_outdated.patch
new file mode 100644
index 0000000000000..d1018e0b112a6
--- /dev/null
+++ b/patches/node/fix_failing_node_js_test_on_outdated.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Wed, 16 Feb 2022 13:33:41 +0100
+Subject: fix: failing Node.js test on outdated
+ CurrentValueSerializerFormatVersion
+
+Corrects for a test that started failing as of https://chromium-review.googlesource.com/c/v8/v8/+/3417189
+becuase V8 updated the return value of CurrentValueSerializerFormatVersion()
+from 14 to 15, and Node.js still expected 14 (0x0e).
+
+This patch can be removed as soon as Node.js updates to a version of V8
+containing the above CL.
+
+diff --git a/test/parallel/test-v8-serdes.js b/test/parallel/test-v8-serdes.js
+index 586698129680cef29595c39e77c7d1c186f3d60a..43a3d9dd5907af6aa11b902b01f6ef7539768fbb 100644
+--- a/test/parallel/test-v8-serdes.js
++++ b/test/parallel/test-v8-serdes.js
+@@ -155,7 +155,7 @@ const hostObject = new (internalBinding('js_stream').JSStream)();
+ }
+ 
+ {
+-  const buf = Buffer.from('ff0e6f2203666f6f5e007b01', 'hex');
++  const buf = Buffer.from('ff0f6f2203666f6f5e007b01', 'hex');
+ 
+   const des = new v8.DefaultDeserializer(buf);
+   des.readHeader();
+@@ -166,7 +166,7 @@ const hostObject = new (internalBinding('js_stream').JSStream)();
+   ser.writeValue(des.readValue());
+ 
+   assert.deepStrictEqual(buf, ser.releaseBuffer());
+-  assert.strictEqual(des.getWireFormatVersion(), 0x0e);
++  assert.strictEqual(des.getWireFormatVersion(), 0x0f);
+ }
+ 
+ {
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index e70c8c148c892..13649f1c4acc8 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index ce150e6a007bb87c7ce956cc4f918b13c829585b..b4e04dce1ec52cd787c3a6de9abe09aae55ecc09 100644
+index fb68d0ec4d121aaac31fd6e4c317a59976ef034c..dbbe9ae10bebdd71f441fda00c7dbfa187603a84 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -579,7 +579,7 @@ config("internal_config") {
+@@ -598,7 +598,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index ce150e6a007bb87c7ce956cc4f918b13c829585b..b4e04dce1ec52cd787c3a6de9abe09aa
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5688,7 +5688,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5733,7 +5733,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index ce150e6a007bb87c7ce956cc4f918b13c829585b..b4e04dce1ec52cd787c3a6de9abe09aa
  
      deps = [
        ":v8_libbase",
-@@ -5726,6 +5726,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5771,6 +5771,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index f6f43c064a0ea..b4231609ce27d 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 0e3370e84503dcdece061dd073b337f774b2d2da..7b8eb622c50a081c8fc3a365f1f4c7e017084e06 100644
+index e6797c92a52ab7805261ace2156a39fe368bd747..1aed7cad8b7dfff9fc7b1f93040c3eda33693af3 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9068,7 +9068,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9097,7 +9097,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index 0e3370e84503dcdece061dd073b337f774b2d2da..7b8eb622c50a081c8fc3a365f1f4c7e0
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index aefbbd9b31e0db74c33858842ff4856eb9962706..7d348738a40d6e27b55b18aea7e8fea553834fd7 100644
+index 8e4ad43c1957f4ed555327588c41d049824c1dc5..54cf3b263ac5654b370897b951aa0be8f8d566e5 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6111,9 +6111,9 @@ void Heap::TearDown() {
+@@ -6235,9 +6235,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index afd95ed8484b8..59cf1289c5fab 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 24e073885a1e6d2d203e55fd57b92e9943aff385..f1bb6cad8c608a6371e5ed4eb88ce0c47acb66bd 100644
+index c784f859ba874b9a79be3dd9c69d306b8a590660..93158da71e2e7dd1aecc421664d4d21687cb38a6 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -579,6 +579,10 @@ config("internal_config") {
+@@ -598,6 +598,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index 441102542267d..4068e9b55533e 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 499d5a9d1cf9e321212bda7c94c15ed1ded7aa30..19e89e906f4cc480bc8a03b9ca7ee9e8f1f907fa 100644
+index 48f595a24ec7ead3076e1d44afb4f18b7bb810c3..df7cb44387a42fa173ce68ee8464d6abc050986f 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -897,7 +897,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -886,7 +886,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
@@ -19,7 +19,7 @@ index 499d5a9d1cf9e321212bda7c94c15ed1ded7aa30..19e89e906f4cc480bc8a03b9ca7ee9e8
    explicit inline Relocatable(Isolate* isolate);
    inline virtual ~Relocatable();
 diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
-index 45682e45e906fe9556bef578d5386cdf4e73d71a..569c632f6933ca7aec3ac239258207dede3e2d5e 100644
+index ec304170542f8a6053c60cbebb22c536cb56ac6c..be8f33d5e8bc2ff388f199dacebd408ccd32dda5 100644
 --- a/src/objects/ordered-hash-table.h
 +++ b/src/objects/ordered-hash-table.h
 @@ -64,7 +64,7 @@ namespace internal {
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index b9d9606081e56..ae318986f9b8a 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index b4e04dce1ec52cd787c3a6de9abe09aae55ecc09..24e073885a1e6d2d203e55fd57b92e9943aff385 100644
+index dbbe9ae10bebdd71f441fda00c7dbfa187603a84..c784f859ba874b9a79be3dd9c69d306b8a590660 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5700,7 +5700,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5745,7 +5745,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
index 1f31407e9b39c..bf4935b108d45 100644
--- a/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
+++ b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
@@ -6,7 +6,7 @@ Subject: Revert "fix(cppgc): removed deleted cstors in CppHeapCreateParams"
 This reverts commit a66b09e5510d62ff469e72b1a8ff7f0ead1bf0f6.
 
 diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
-index 73f6364a442af4538cd0178435c27fc8eac62fe7..63d52651b997a5331b381f77761a78ebfa56287d 100644
+index 201773f59ddd3ce2ed61fe08cb58786aeed605cc..7761d87fd0a325a53d398bafcdeadd6a87f4f1c2 100644
 --- a/include/v8-cppgc.h
 +++ b/include/v8-cppgc.h
 @@ -77,6 +77,9 @@ struct WrapperDescriptor final {
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index d4461b066b294..28368dce775d1 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -26,6 +26,7 @@
   "parallel/test-crypto-padding-aes256",
   "parallel/test-crypto-secure-heap",
   "parallel/test-fs-utimes-y2K38",
+  "parallel/test-heapsnapshot-near-heap-limit-worker.js",
   "parallel/test-http2-clean-output",
   "parallel/test-https-agent-session-reuse",
   "parallel/test-https-options-boolean-check",
@@ -116,6 +117,7 @@
   "parallel/test-webcrypto-rsa-pss-params",
   "parallel/test-webcrypto-sign-verify-node-dsa",
   "parallel/test-webcrypto-x25519-x448",
+  "parallel/test-worker-debug",
   "parallel/test-worker-stdio",
   "parallel/test-zlib-unused-weak",
   "report/test-report-fatal-error",
diff --git a/script/zip_manifests/dist_zip.mac.arm64.manifest b/script/zip_manifests/dist_zip.mac.arm64.manifest
index 62931d9f1bb20..91ed477f54512 100644
--- a/script/zip_manifests/dist_zip.mac.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac.arm64.manifest
@@ -21,7 +21,9 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
diff --git a/script/zip_manifests/dist_zip.mac.x64.manifest b/script/zip_manifests/dist_zip.mac.x64.manifest
index 2739a55201510..e411bc46d62d3 100644
--- a/script/zip_manifests/dist_zip.mac.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac.x64.manifest
@@ -21,7 +21,9 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
index e7d34c0fb6bf6..20ca9e4428da2 100644
--- a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
@@ -18,7 +18,9 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.x64.manifest b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
index 1775dab8addaa..c3a864ce25578 100644
--- a/script/zip_manifests/dist_zip.mac_mas.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
@@ -18,7 +18,9 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
diff --git a/shell/app/uv_task_runner.cc b/shell/app/uv_task_runner.cc
index f98ddce8737bd..24bcf863bfa86 100644
--- a/shell/app/uv_task_runner.cc
+++ b/shell/app/uv_task_runner.cc
@@ -6,6 +6,7 @@
 
 #include "base/location.h"
 #include "base/stl_util.h"
+#include "base/time/time.h"
 #include "shell/app/uv_task_runner.h"
 
 namespace electron {
diff --git a/shell/app/uv_task_runner.h b/shell/app/uv_task_runner.h
index e56d55fdbaaae..825240f250923 100644
--- a/shell/app/uv_task_runner.h
+++ b/shell/app/uv_task_runner.h
@@ -13,7 +13,8 @@
 
 namespace base {
 class Location;
-}
+class TimeDelta;
+}  // namespace base
 
 namespace electron {
 
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 0cc858e644d93..d2de05d363ff2 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -34,7 +34,7 @@
 #include "content/public/common/content_switches.h"
 #include "crypto/crypto_buildflags.h"
 #include "media/audio/audio_manager.h"
-#include "net/dns/public/dns_over_https_server_config.h"
+#include "net/dns/public/dns_over_https_config.h"
 #include "net/dns/public/util.h"
 #include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -1640,18 +1640,14 @@ void ConfigureHostResolver(v8::Isolate* isolate,
     }
     default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
   }
-  std::string server_method;
-  std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
+
+  net::DnsOverHttpsConfig doh_config;
   if (!default_doh_templates.empty() &&
       secure_dns_mode != net::SecureDnsMode::kOff) {
-    for (base::StringPiece server_template :
-         SplitStringPiece(default_doh_templates, " ", base::TRIM_WHITESPACE,
-                          base::SPLIT_WANT_NONEMPTY)) {
-      if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
-              std::string(server_template))) {
-        dns_over_https_servers.push_back(server_config.value());
-      }
-    }
+    auto maybe_doh_config =
+        net::DnsOverHttpsConfig::FromString(default_doh_templates);
+    if (maybe_doh_config.has_value())
+      doh_config = maybe_doh_config.value();
   }
 
   bool enable_built_in_resolver =
@@ -1677,17 +1673,20 @@ void ConfigureHostResolver(v8::Isolate* isolate,
       thrower.ThrowTypeError("secureDnsServers must be an array of strings");
       return;
     }
-    dns_over_https_servers.clear();
+
+    // Validate individual server templates prior to batch-assigning to
+    // doh_config.
     for (const std::string& server_template : secure_dns_server_strings) {
-      if (auto server_config =
-              net::DnsOverHttpsServerConfig::FromString(server_template)) {
-        dns_over_https_servers.push_back(server_config.value());
-      } else {
+      absl::optional<net::DnsOverHttpsConfig> server_config =
+          net::DnsOverHttpsConfig::FromString(server_template);
+      if (!server_config.has_value()) {
         thrower.ThrowTypeError(std::string("not a valid DoH template: ") +
                                server_template);
         return;
       }
     }
+    doh_config = *net::DnsOverHttpsConfig::FromStrings(
+        std::move(secure_dns_server_strings));
   }
 
   if (opts.Has("enableAdditionalDnsQueryTypes") &&
@@ -1700,8 +1699,8 @@ void ConfigureHostResolver(v8::Isolate* isolate,
   // Configure the stub resolver. This must be done after the system
   // NetworkContext is created, but before anything has the chance to use it.
   content::GetNetworkService()->ConfigureStubHostResolver(
-      enable_built_in_resolver, secure_dns_mode,
-      std::move(dns_over_https_servers), additional_dns_query_types_enabled);
+      enable_built_in_resolver, secure_dns_mode, doh_config,
+      additional_dns_query_types_enabled);
 }
 
 // static
diff --git a/shell/browser/api/electron_api_net.cc b/shell/browser/api/electron_api_net.cc
index 6f87534dbad07..564fe440d604a 100644
--- a/shell/browser/api/electron_api_net.cc
+++ b/shell/browser/api/electron_api_net.cc
@@ -6,6 +6,7 @@
 
 #include "gin/handle.h"
 #include "net/base/network_change_notifier.h"
+#include "net/http/http_util.h"
 #include "services/network/public/cpp/features.h"
 #include "shell/browser/api/electron_api_url_loader.h"
 #include "shell/common/gin_helper/dictionary.h"
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index 1322378fb20d7..d0a0d4c408e92 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -261,9 +261,11 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
                         const base::Time& start_time,
                         uint32_t id) {
   download_manager->CreateDownloadItem(
-      base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
-      GURL(), absl::nullopt, mime_type, mime_type, start_time, base::Time(),
-      etag, last_modified, offset, length, std::string(),
+      base::GenerateGUID(), id, path, path, url_chain, GURL(),
+      content::StoragePartitionConfig::CreateDefault(
+          download_manager->GetBrowserContext()),
+      GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
+      base::Time(), etag, last_modified, offset, length, std::string(),
       download::DownloadItem::INTERRUPTED,
       download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
       download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),
diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc
index 97baf11d65624..86a7eb0cc3f92 100644
--- a/shell/browser/api/electron_api_url_loader.cc
+++ b/shell/browser/api/electron_api_url_loader.cc
@@ -17,6 +17,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/system/data_pipe_producer.h"
 #include "net/base/load_flags.h"
+#include "net/http/http_util.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 3873591e1dda3..0da1f050e7695 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -390,9 +390,10 @@ void OnCapturePageDone(gin_helper::Promise<gfx::Image> promise,
 
 absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
 #if BUILDFLAG(IS_MAC)
-  base::TimeDelta interval;
-  if (ui::TextInsertionCaretBlinkPeriod(&interval))
-    return interval;
+  absl::optional<base::TimeDelta> system_value(
+      ui::TextInsertionCaretBlinkPeriodFromDefaults());
+  if (system_value)
+    return *system_value;
 #elif BUILDFLAG(IS_LINUX)
   if (auto* linux_ui = views::LinuxUI::instance())
     return linux_ui->GetCursorBlinkInterval();
@@ -1086,7 +1087,7 @@ content::WebContents* WebContents::CreateCustomWebContents(
     const GURL& opener_url,
     const std::string& frame_name,
     const GURL& target_url,
-    const content::StoragePartitionId& partition_id,
+    const content::StoragePartitionConfig& partition_config,
     content::SessionStorageNamespace* session_storage_namespace) {
   return nullptr;
 }
@@ -2773,7 +2774,7 @@ void WebContents::Print(gin::Arguments* args) {
         continue;
       }
     }
-    if (!page_range_list.GetList().empty())
+    if (!page_range_list.GetListDeprecated().empty())
       settings.SetPath(printing::kSettingPageRange, std::move(page_range_list));
   }
 
@@ -3530,12 +3531,10 @@ bool WebContents::TakeFocus(content::WebContents* source, bool reverse) {
 }
 
 content::PictureInPictureResult WebContents::EnterPictureInPicture(
-    content::WebContents* web_contents,
-    const viz::SurfaceId& surface_id,
-    const gfx::Size& natural_size) {
+    content::WebContents* web_contents) {
 #if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
-  return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture(
-      web_contents, surface_id, natural_size);
+  return PictureInPictureWindowManager::GetInstance()
+      ->EnterVideoPictureInPicture(web_contents);
 #else
   return content::PictureInPictureResult::kNotSupported;
 #endif
@@ -3687,7 +3686,8 @@ void WebContents::DevToolsIndexPath(
   std::unique_ptr<base::Value> parsed_excluded_folders =
       base::JSONReader::ReadDeprecated(excluded_folders_message);
   if (parsed_excluded_folders && parsed_excluded_folders->is_list()) {
-    for (const base::Value& folder_path : parsed_excluded_folders->GetList()) {
+    for (const base::Value& folder_path :
+         parsed_excluded_folders->GetListDeprecated()) {
       if (folder_path.is_string())
         excluded_folders.push_back(folder_path.GetString());
     }
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 38169890b097a..b034167631fa3 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -500,7 +500,7 @@ class WebContents : public ExclusiveAccessContext,
       const GURL& opener_url,
       const std::string& frame_name,
       const GURL& target_url,
-      const content::StoragePartitionId& partition_id,
+      const content::StoragePartitionConfig& partition_config,
       content::SessionStorageNamespace* session_storage_namespace) override;
   void WebContentsCreatedWithFullParams(
       content::WebContents* source_contents,
@@ -689,9 +689,7 @@ class WebContents : public ExclusiveAccessContext,
   bool IsFullscreenForTabOrPending(const content::WebContents* source) override;
   bool TakeFocus(content::WebContents* source, bool reverse) override;
   content::PictureInPictureResult EnterPictureInPicture(
-      content::WebContents* web_contents,
-      const viz::SurfaceId&,
-      const gfx::Size& natural_size) override;
+      content::WebContents* web_contents) override;
   void ExitPictureInPicture() override;
 
   // InspectableWebContentsDelegate:
diff --git a/shell/browser/api/frame_subscriber.cc b/shell/browser/api/frame_subscriber.cc
index 22cbf77a34027..1718525f27abe 100644
--- a/shell/browser/api/frame_subscriber.cc
+++ b/shell/browser/api/frame_subscriber.cc
@@ -145,6 +145,8 @@ void FrameSubscriber::OnFrameCaptured(
   Done(content_rect, bitmap);
 }
 
+void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}
+
 void FrameSubscriber::OnStopped() {}
 
 void FrameSubscriber::OnLog(const std::string& message) {}
diff --git a/shell/browser/api/frame_subscriber.h b/shell/browser/api/frame_subscriber.h
index 2ce392b5dea62..0a6a003927622 100644
--- a/shell/browser/api/frame_subscriber.h
+++ b/shell/browser/api/frame_subscriber.h
@@ -59,6 +59,7 @@ class FrameSubscriber : public content::WebContentsObserver,
       const gfx::Rect& content_rect,
       mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
           callbacks) override;
+  void OnFrameWithEmptyRegionCapture() override;
   void OnStopped() override;
   void OnLog(const std::string& message) override;
 
diff --git a/shell/browser/browser_linux.cc b/shell/browser/browser_linux.cc
index 320ae7861a5ae..f47a46e8dd5c8 100644
--- a/shell/browser/browser_linux.cc
+++ b/shell/browser/browser_linux.cc
@@ -207,7 +207,7 @@ void Browser::ShowAboutPanel() {
 
   if ((val = opts.FindListKey("authors"))) {
     std::vector<const char*> cstrs;
-    for (const auto& authorVal : val->GetList()) {
+    for (const auto& authorVal : val->GetListDeprecated()) {
       if (authorVal.is_string()) {
         cstrs.push_back(authorVal.GetString().c_str());
       }
diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc
index 7ebb2202ae880..5f0bdc532ab6d 100644
--- a/shell/browser/browser_process_impl.cc
+++ b/shell/browser/browser_process_impl.cc
@@ -255,11 +255,6 @@ BrowserProcessImpl::subresource_filter_ruleset_service() {
   return nullptr;
 }
 
-federated_learning::FlocSortingLshClustersService*
-BrowserProcessImpl::floc_sorting_lsh_clusters_service() {
-  return nullptr;
-}
-
 component_updater::ComponentUpdateService*
 BrowserProcessImpl::component_updater() {
   return nullptr;
@@ -294,6 +289,10 @@ SerialPolicyAllowedPorts* BrowserProcessImpl::serial_policy_allowed_ports() {
   return nullptr;
 }
 
+HidPolicyAllowedDevices* BrowserProcessImpl::hid_policy_allowed_devices() {
+  return nullptr;
+}
+
 void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) {
   locale_ = locale;
 }
diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h
index e7087415e6298..3a135cade0cbb 100644
--- a/shell/browser/browser_process_impl.h
+++ b/shell/browser/browser_process_impl.h
@@ -82,8 +82,6 @@ class BrowserProcessImpl : public BrowserProcess {
   safe_browsing::SafeBrowsingService* safe_browsing_service() override;
   subresource_filter::RulesetService* subresource_filter_ruleset_service()
       override;
-  federated_learning::FlocSortingLshClustersService*
-  floc_sorting_lsh_clusters_service() override;
   component_updater::ComponentUpdateService* component_updater() override;
   MediaFileSystemRegistry* media_file_system_registry() override;
   WebRtcLogUploader* webrtc_log_uploader() override;
@@ -93,6 +91,7 @@ class BrowserProcessImpl : public BrowserProcess {
       override;
   resource_coordinator::TabManager* GetTabManager() override;
   SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
+  HidPolicyAllowedDevices* hid_policy_allowed_devices() override;
   void CreateDevToolsProtocolHandler() override {}
   void CreateDevToolsAutoOpener() override {}
   void set_background_mode_manager_for_test(
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 3931431cdf528..096dcabb56c4f 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -154,7 +154,7 @@
 #include "extensions/browser/extension_protocols.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_browser_client.h"
-#include "extensions/browser/guest_view/extensions_guest_view_message_filter.h"
+#include "extensions/browser/guest_view/extensions_guest_view.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/process_manager.h"
@@ -189,7 +189,8 @@
 #endif
 
 #if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE) && BUILDFLAG(IS_WIN)
-#include "chrome/browser/ui/views/overlay/overlay_window_views.h"
+#include "chrome/browser/ui/views/overlay/document_overlay_window_views.h"
+#include "chrome/browser/ui/views/overlay/video_overlay_window_views.h"
 #include "shell/browser/browser.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ -422,8 +423,6 @@ void ElectronBrowserClient::RenderProcessWillLaunch(
 
   host->AddFilter(
       new extensions::ExtensionMessageFilter(process_id, browser_context));
-  host->AddFilter(new extensions::ExtensionsGuestViewMessageFilter(
-      process_id, browser_context));
   host->AddFilter(
       new ElectronExtensionMessageFilter(process_id, browser_context));
   host->AddFilter(
@@ -746,15 +745,33 @@ bool ElectronBrowserClient::CanCreateWindow(
 }
 
 #if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
-std::unique_ptr<content::OverlayWindow>
-ElectronBrowserClient::CreateWindowForPictureInPicture(
-    content::PictureInPictureWindowController* controller) {
-  auto overlay_window = content::OverlayWindow::Create(controller);
+std::unique_ptr<content::VideoOverlayWindow>
+ElectronBrowserClient::CreateWindowForVideoPictureInPicture(
+    content::VideoPictureInPictureWindowController* controller) {
+  auto overlay_window = content::VideoOverlayWindow::Create(controller);
 #if BUILDFLAG(IS_WIN)
   std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
   if (!app_user_model_id.empty()) {
     auto* overlay_window_view =
-        static_cast<OverlayWindowViews*>(overlay_window.get());
+        static_cast<VideoOverlayWindowViews*>(overlay_window.get());
+    ui::win::SetAppIdForWindow(app_user_model_id,
+                               overlay_window_view->GetNativeWindow()
+                                   ->GetHost()
+                                   ->GetAcceleratedWidget());
+  }
+#endif
+  return overlay_window;
+}
+
+std::unique_ptr<content::DocumentOverlayWindow>
+ElectronBrowserClient::CreateWindowForDocumentPictureInPicture(
+    content::DocumentPictureInPictureWindowController* controller) {
+  auto overlay_window = content::DocumentOverlayWindow::Create(controller);
+#if BUILDFLAG(IS_WIN)
+  std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
+  if (!app_user_model_id.empty()) {
+    auto* overlay_window_view =
+        static_cast<DocumentOverlayWindowViews*>(overlay_window.get());
     ui::win::SetAppIdForWindow(app_user_model_id,
                                overlay_window_view->GetNativeWindow()
                                    ->GetHost()
@@ -1591,6 +1608,9 @@ void ElectronBrowserClient::ExposeInterfacesToRenderer(
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   associated_registry->AddInterface(base::BindRepeating(
       &extensions::EventRouter::BindForRenderer, render_process_host->GetID()));
+  associated_registry->AddInterface(
+      base::BindRepeating(&extensions::ExtensionsGuestView::CreateForExtensions,
+                          render_process_host->GetID()));
 #endif
 }
 
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index 5d5c48155189e..730fc07e687e8 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -153,8 +153,12 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
                        bool opener_suppressed,
                        bool* no_javascript_access) override;
 #if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
-  std::unique_ptr<content::OverlayWindow> CreateWindowForPictureInPicture(
-      content::PictureInPictureWindowController* controller) override;
+  std::unique_ptr<content::VideoOverlayWindow>
+  CreateWindowForVideoPictureInPicture(
+      content::VideoPictureInPictureWindowController* controller) override;
+  std::unique_ptr<content::DocumentOverlayWindow>
+  CreateWindowForDocumentPictureInPicture(
+      content::DocumentPictureInPictureWindowController* controller) override;
 #endif
   void GetAdditionalAllowedSchemesForFileSystem(
       std::vector<std::string>* additional_schemes) override;
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index 48f5e9c08a6a3..bdd2eb4d19c0c 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -220,7 +220,7 @@ void ElectronBrowserContext::InitPrefs() {
   auto* current_dictionaries =
       prefs()->Get(spellcheck::prefs::kSpellCheckDictionaries);
   // No configured dictionaries, the default will be en-US
-  if (current_dictionaries->GetList().empty()) {
+  if (current_dictionaries->GetListDeprecated().empty()) {
     std::string default_code = spellcheck::GetCorrespondingSpellCheckLanguage(
         base::i18n::GetConfiguredLocale());
     if (!default_code.empty()) {
diff --git a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
index 7001a5079c2a7..f30b1bd24a62e 100644
--- a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -58,7 +58,7 @@ bool ContainsAppIdByHash(const base::ListValue& list,
     return false;
   }
 
-  for (const auto& i : list.GetList()) {
+  for (const auto& i : list.GetListDeprecated()) {
     const std::string& s = i.GetString();
     if (s.find('/') == std::string::npos) {
       // No slashes mean that this is a webauthn RP ID, not a U2F AppID.
diff --git a/shell/browser/extensions/electron_extension_host_delegate.cc b/shell/browser/extensions/electron_extension_host_delegate.cc
index ada5337f863c7..d4d81e7794787 100644
--- a/shell/browser/extensions/electron_extension_host_delegate.cc
+++ b/shell/browser/extensions/electron_extension_host_delegate.cc
@@ -71,9 +71,7 @@ bool ElectronExtensionHostDelegate::CheckMediaAccessPermission(
 
 content::PictureInPictureResult
 ElectronExtensionHostDelegate::EnterPictureInPicture(
-    content::WebContents* web_contents,
-    const viz::SurfaceId& surface_id,
-    const gfx::Size& natural_size) {
+    content::WebContents* web_contents) {
   NOTREACHED();
   return content::PictureInPictureResult();
 }
diff --git a/shell/browser/extensions/electron_extension_host_delegate.h b/shell/browser/extensions/electron_extension_host_delegate.h
index 5c1f8761b6d93..078d1696e2565 100644
--- a/shell/browser/extensions/electron_extension_host_delegate.h
+++ b/shell/browser/extensions/electron_extension_host_delegate.h
@@ -41,9 +41,7 @@ class ElectronExtensionHostDelegate : public ExtensionHostDelegate {
                                   blink::mojom::MediaStreamType type,
                                   const Extension* extension) override;
   content::PictureInPictureResult EnterPictureInPicture(
-      content::WebContents* web_contents,
-      const viz::SurfaceId& surface_id,
-      const gfx::Size& natural_size) override;
+      content::WebContents* web_contents) override;
   void ExitPictureInPicture() override;
 };
 
diff --git a/shell/browser/extensions/electron_extension_message_filter.cc b/shell/browser/extensions/electron_extension_message_filter.cc
index 4ddd1b4fab504..688c76c024f04 100644
--- a/shell/browser/extensions/electron_extension_message_filter.cc
+++ b/shell/browser/extensions/electron_extension_message_filter.cc
@@ -21,9 +21,9 @@
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/l10n_file_util.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
-#include "extensions/common/file_util.h"
 #include "extensions/common/manifest_handlers/default_locale_handler.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
 #include "extensions/common/message_bundle.h"
@@ -104,8 +104,8 @@ void ElectronExtensionMessageFilter::OnGetExtMessageBundle(
   if (default_locale.empty()) {
     // A little optimization: send the answer here to avoid an extra thread hop.
     std::unique_ptr<extensions::MessageBundle::SubstitutionMap> dictionary_map(
-        extensions::file_util::LoadNonLocalizedMessageBundleSubstitutionMap(
-            extension_id));
+        extensions::l10n_file_util::
+            LoadNonLocalizedMessageBundleSubstitutionMap(extension_id));
     ExtensionHostMsg_GetMessageBundle::WriteReplyParams(reply_msg,
                                                         *dictionary_map);
     Send(reply_msg);
@@ -147,7 +147,7 @@ void ElectronExtensionMessageFilter::OnGetExtMessageBundleAsync(
     extension_l10n_util::GzippedMessagesPermission gzip_permission,
     IPC::Message* reply_msg) {
   std::unique_ptr<extensions::MessageBundle::SubstitutionMap> dictionary_map(
-      extensions::file_util::LoadMessageBundleSubstitutionMapFromPaths(
+      extensions::l10n_file_util::LoadMessageBundleSubstitutionMapFromPaths(
           extension_paths, main_extension_id, default_locale, gzip_permission));
 
   ExtensionHostMsg_GetMessageBundle::WriteReplyParams(reply_msg,
diff --git a/shell/browser/extensions/electron_extensions_browser_client.cc b/shell/browser/extensions/electron_extensions_browser_client.cc
index ba0584fffd202..26007fc9069dd 100644
--- a/shell/browser/extensions/electron_extensions_browser_client.cc
+++ b/shell/browser/extensions/electron_extensions_browser_client.cc
@@ -310,8 +310,8 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
     return;
   }
 
-  auto event = std::make_unique<extensions::Event>(histogram_value, event_name,
-                                                   std::move(*args).TakeList());
+  auto event = std::make_unique<extensions::Event>(
+      histogram_value, event_name, std::move(*args).TakeListDeprecated());
   auto& context_map = ElectronBrowserContext::browser_context_map();
   for (auto const& entry : context_map) {
     if (entry.second) {
diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc
index 74466f5dc8678..6980915f6358b 100644
--- a/shell/browser/file_select_helper.cc
+++ b/shell/browser/file_select_helper.cc
@@ -21,7 +21,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -165,10 +164,7 @@ void FileSelectHelper::OnListFile(
 void FileSelectHelper::LaunchConfirmationDialog(
     const base::FilePath& path,
     std::vector<ui::SelectedFileInfo> selected_files) {
-  ShowFolderUploadConfirmationDialog(
-      path,
-      base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
-      std::move(selected_files), web_contents_);
+  ConvertToFileChooserFileInfoList(std::move(selected_files));
 }
 
 void FileSelectHelper::OnListDone(int error) {
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 69d0cd25b49e0..0a40c5ca356fd 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -156,6 +156,8 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
                       gin::IsolateHolder::IsolateCreationMode::kNormal,
                       nullptr,
                       nullptr,
+                      nullptr,
+                      nullptr,
                       isolate_),
       locker_(isolate_) {
   isolate_->Enter();
diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc
index 41bdf140b90a4..eb7b97952fcd0 100644
--- a/shell/browser/net/electron_url_loader_factory.cc
+++ b/shell/browser/net/electron_url_loader_factory.cc
@@ -122,7 +122,7 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
         head->headers->AddHeader(iter.first, iter.second.GetString());
       } else if (iter.second.is_list()) {
         // key: [values...]
-        for (const auto& item : iter.second.GetList()) {
+        for (const auto& item : iter.second.GetListDeprecated()) {
           if (item.is_string())
             head->headers->AddHeader(iter.first, item.GetString());
         }
diff --git a/shell/browser/net/network_context_service.cc b/shell/browser/net/network_context_service.cc
index 4bf9b02e0522b..be8f3403dc81a 100644
--- a/shell/browser/net/network_context_service.cc
+++ b/shell/browser/net/network_context_service.cc
@@ -11,6 +11,7 @@
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/shared_cors_origin_access_list.h"
 #include "electron/fuses.h"
+#include "net/http/http_util.h"
 #include "net/net_buildflags.h"
 #include "services/network/network_service.h"
 #include "services/network/public/cpp/cors/origin_access_list.h"
diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index dcfe4e4292cc5..d1f474d59ead7 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -25,7 +25,7 @@
 #include "content/public/common/network_service_util.h"
 #include "electron/fuses.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
-#include "net/dns/public/dns_over_https_server_config.h"
+#include "net/dns/public/dns_over_https_config.h"
 #include "net/dns/public/util.h"
 #include "net/net_buildflags.h"
 #include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
@@ -273,18 +273,11 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
     }
     default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
   }
-  std::string server_method;
-  std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
+
+  net::DnsOverHttpsConfig doh_config;
   if (!default_doh_templates.empty() &&
       default_secure_dns_mode != net::SecureDnsMode::kOff) {
-    for (base::StringPiece server_template :
-         SplitStringPiece(default_doh_templates, " ", base::TRIM_WHITESPACE,
-                          base::SPLIT_WANT_NONEMPTY)) {
-      if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
-              std::string(server_template))) {
-        dns_over_https_servers.push_back(server_config.value());
-      }
-    }
+    doh_config = *net::DnsOverHttpsConfig::FromString(default_doh_templates);
   }
 
   bool additional_dns_query_types_enabled = true;
@@ -293,8 +286,7 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
   // NetworkContext is created, but before anything has the chance to use it.
   content::GetNetworkService()->ConfigureStubHostResolver(
       base::FeatureList::IsEnabled(features::kAsyncDns),
-      default_secure_dns_mode, std::move(dns_over_https_servers),
-      additional_dns_query_types_enabled);
+      default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
 
   std::string app_name = electron::Browser::Get()->GetName();
 #if BUILDFLAG(IS_MAC)
diff --git a/shell/browser/osr/osr_video_consumer.cc b/shell/browser/osr/osr_video_consumer.cc
index ec88dd1acae2e..aeb60a7b5b28e 100644
--- a/shell/browser/osr/osr_video_consumer.cc
+++ b/shell/browser/osr/osr_video_consumer.cc
@@ -121,6 +121,8 @@ void OffScreenVideoConsumer::OnFrameCaptured(
   callback_.Run(*update_rect, bitmap);
 }
 
+void OffScreenVideoConsumer::OnFrameWithEmptyRegionCapture() {}
+
 void OffScreenVideoConsumer::OnStopped() {}
 
 void OffScreenVideoConsumer::OnLog(const std::string& message) {}
diff --git a/shell/browser/osr/osr_video_consumer.h b/shell/browser/osr/osr_video_consumer.h
index 4a6598563c3aa..c6687965441e8 100644
--- a/shell/browser/osr/osr_video_consumer.h
+++ b/shell/browser/osr/osr_video_consumer.h
@@ -43,6 +43,7 @@ class OffScreenVideoConsumer : public viz::mojom::FrameSinkVideoConsumer {
       const gfx::Rect& content_rect,
       mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
           callbacks) override;
+  void OnFrameWithEmptyRegionCapture() override;
   void OnStopped() override;
   void OnLog(const std::string& message) override;
 
diff --git a/shell/browser/ui/autofill_popup.cc b/shell/browser/ui/autofill_popup.cc
index 7d9f759bb9fd1..dc40be4b03be1 100644
--- a/shell/browser/ui/autofill_popup.cc
+++ b/shell/browser/ui/autofill_popup.cc
@@ -15,6 +15,8 @@
 #include "shell/browser/ui/autofill_popup.h"
 #include "shell/common/api/api.mojom.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "ui/color/color_id.h"
+#include "ui/color/color_provider.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
@@ -310,11 +312,10 @@ const gfx::FontList& AutofillPopup::GetLabelFontListForRow(int index) const {
   return smaller_font_list_;
 }
 
-ui::NativeTheme::ColorId AutofillPopup::GetBackgroundColorIDForRow(
-    int index) const {
+ui::ColorId AutofillPopup::GetBackgroundColorIDForRow(int index) const {
   return (view_ && index == view_->GetSelectedLine())
-             ? ui::NativeTheme::kColorId_ResultsTableHoveredBackground
-             : ui::NativeTheme::kColorId_ResultsTableNormalBackground;
+             ? ui::kColorResultsTableHoveredBackground
+             : ui::kColorResultsTableNormalBackground;
 }
 
 int AutofillPopup::GetLineCount() {
diff --git a/shell/browser/ui/autofill_popup.h b/shell/browser/ui/autofill_popup.h
index 56a7b0d28c758..a7e43f9d8f7d9 100644
--- a/shell/browser/ui/autofill_popup.h
+++ b/shell/browser/ui/autofill_popup.h
@@ -9,8 +9,8 @@
 
 #include "content/public/browser/render_frame_host.h"
 #include "shell/browser/ui/views/autofill_popup_view.h"
+#include "ui/color/color_id.h"
 #include "ui/gfx/font_list.h"
-#include "ui/native_theme/native_theme.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ -54,7 +54,7 @@ class AutofillPopup : public views::ViewObserver {
   gfx::Rect GetRowBounds(int i);
   const gfx::FontList& GetValueFontListForRow(int index) const;
   const gfx::FontList& GetLabelFontListForRow(int index) const;
-  ui::NativeTheme::ColorId GetBackgroundColorIDForRow(int index) const;
+  ui::ColorId GetBackgroundColorIDForRow(int index) const;
 
   int GetLineCount();
   std::u16string GetValueAt(int i);
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index 16d2cda33cf69..b7e939c35d45f 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -1023,7 +1023,7 @@ void InspectableWebContents::HandleMessageFromDevToolsFrontend(
   int id = message.FindIntKey(kFrontendHostId).value_or(0);
   std::vector<base::Value> params_list;
   if (params)
-    params_list = std::move(*params).TakeList();
+    params_list = std::move(*params).TakeListDeprecated();
   embedder_message_dispatcher_->Dispatch(
       base::BindRepeating(&InspectableWebContents::SendMessageAck,
                           weak_factory_.GetWeakPtr(), id),
diff --git a/shell/browser/ui/views/autofill_popup_view.cc b/shell/browser/ui/views/autofill_popup_view.cc
index 8cd73243d254b..fbe475d5b7e9d 100644
--- a/shell/browser/ui/views/autofill_popup_view.cc
+++ b/shell/browser/ui/views/autofill_popup_view.cc
@@ -13,6 +13,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/color/color_provider.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
@@ -88,8 +89,7 @@ void AutofillPopupView::Show() {
 
   SetBorder(views::CreateSolidBorder(
       kPopupBorderThickness,
-      GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::kColorId_UnfocusedBorderColor)));
+      GetColorProvider()->GetColor(ui::kColorUnfocusedBorder)));
 
   DoUpdateBoundsAndRedrawPopup();
   GetWidget()->Show();
@@ -167,7 +167,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
   if (!popup_)
     return;
 
-  canvas->FillRect(entry_rect, GetNativeTheme()->GetSystemColor(
+  canvas->FillRect(entry_rect, GetColorProvider()->GetColor(
                                    popup_->GetBackgroundColorIDForRow(index)));
 
   const bool is_rtl = base::i18n::IsRTL();
@@ -185,8 +185,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
 
   canvas->DrawStringRectWithFlags(
       popup_->GetValueAt(index), popup_->GetValueFontListForRow(index),
-      GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::kColorId_ResultsTableNormalText),
+      GetColorProvider()->GetColor(ui::kColorResultsTableNormalText),
       gfx::Rect(value_x_align_left, value_rect.y(), value_width,
                 value_rect.height()),
       text_align);
@@ -201,8 +200,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
 
     canvas->DrawStringRectWithFlags(
         popup_->GetLabelAt(index), popup_->GetLabelFontListForRow(index),
-        GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_ResultsTableDimmedText),
+        GetColorProvider()->GetColor(ui::kColorResultsTableDimmedText),
         gfx::Rect(label_x_align_left, entry_rect.y(), label_width,
                   entry_rect.height()),
         text_align);
@@ -252,8 +250,8 @@ void AutofillPopupView::OnPaint(gfx::Canvas* canvas) {
   }
 #endif
 
-  draw_canvas->DrawColor(GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_ResultsTableNormalBackground));
+  draw_canvas->DrawColor(
+      GetColorProvider()->GetColor(ui::kColorResultsTableNormalBackground));
   OnPaintBorder(draw_canvas);
 
   for (int i = 0; i < popup_->GetLineCount(); ++i) {
diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index 829eed6a5dbf1..e56094075b275 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -8,6 +8,7 @@
 
 #include "shell/browser/native_window.h"
 #include "shell/browser/ui/views/submenu_button.h"
+#include "ui/color/color_provider.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
@@ -34,10 +35,13 @@ const char MenuBar::kViewClassName[] = "ElectronMenuBar";
 MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
     : background_color_(kDefaultColor), window_(window), root_view_(root_view) {
   const ui::NativeTheme* theme = root_view_->GetNativeTheme();
-  if (theme) {
-    RefreshColorCache(theme);
-  }
+  RefreshColorCache(theme);
   UpdateViewColors();
+#if BUILDFLAG(IS_WIN)
+  SetBackground(
+      views::CreateThemedSolidBackground(this, ui::kColorMenuBackground));
+  background_color_ = GetBackground()->get_color();
+#endif
   SetFocusBehavior(FocusBehavior::ALWAYS);
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kHorizontal));
@@ -156,9 +160,7 @@ bool MenuBar::SetPaneFocusAndFocusDefault() {
 void MenuBar::OnThemeChanged() {
   views::AccessiblePaneView::OnThemeChanged();
   const ui::NativeTheme* theme = root_view_->GetNativeTheme();
-  if (theme) {
-    RefreshColorCache(theme);
-  }
+  RefreshColorCache(theme);
   UpdateViewColors();
 }
 
@@ -215,9 +217,6 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
         gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
     disabled_color_ = gtk::GetFgColor(
         "GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
-#else
-    background_color_ =
-        ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
 #endif
   }
 }
@@ -235,8 +234,10 @@ void MenuBar::RebuildChildren() {
 }
 
 void MenuBar::UpdateViewColors() {
+#if BUILDFLAG(IS_LINUX)
   // set menubar background color
   SetBackground(views::CreateSolidBackground(background_color_));
+#endif
 
   // set child colors
   if (menu_model_ == nullptr)
diff --git a/shell/browser/web_contents_zoom_controller.h b/shell/browser/web_contents_zoom_controller.h
index 9e9feddaa1737..2df6f229842bb 100644
--- a/shell/browser/web_contents_zoom_controller.h
+++ b/shell/browser/web_contents_zoom_controller.h
@@ -5,6 +5,7 @@
 #ifndef ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
 #define ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
 
+#include "base/observer_list.h"
 #include "base/observer_list_types.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_contents_observer.h"
diff --git a/shell/common/api/electron_api_v8_util.cc b/shell/common/api/electron_api_v8_util.cc
index b4a95d228cf35..8c55a47919b79 100644
--- a/shell/common/api/electron_api_v8_util.cc
+++ b/shell/common/api/electron_api_v8_util.cc
@@ -5,6 +5,7 @@
 #include <utility>
 
 #include "base/hash/hash.h"
+#include "base/run_loop.h"
 #include "electron/buildflags/buildflags.h"
 #include "shell/common/api/electron_api_key_weak_map.h"
 #include "shell/common/gin_converters/content_converter.h"
diff --git a/shell/common/asar/archive.cc b/shell/common/asar/archive.cc
index 411ba5d61e80c..709950fd65841 100644
--- a/shell/common/asar/archive.cc
+++ b/shell/common/asar/archive.cc
@@ -138,7 +138,7 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
         integrity_payload.hash = *hash;
         integrity_payload.block_size =
             static_cast<uint32_t>(block_size.value());
-        for (auto& value : blocks->GetList()) {
+        for (auto& value : blocks->GetListDeprecated()) {
           if (auto* block = value.GetIfString()) {
             integrity_payload.blocks.push_back(*block);
           } else {
diff --git a/shell/common/gin_converters/net_converter.cc b/shell/common/gin_converters/net_converter.cc
index 27cee52efb42c..d2b93166b3647 100644
--- a/shell/common/gin_converters/net_converter.cc
+++ b/shell/common/gin_converters/net_converter.cc
@@ -317,7 +317,7 @@ bool Converter<scoped_refptr<network::ResourceRequestBody>>::FromV8(
   if (!ConvertFromV8(isolate, val, list.get()))
     return false;
   *out = base::MakeRefCounted<network::ResourceRequestBody>();
-  for (size_t i = 0; i < list->GetList().size(); ++i) {
+  for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) {
     base::DictionaryValue* dict = nullptr;
     std::string type;
     if (!list->GetDictionary(i, &dict))
diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc
index f90d64c5c60a3..00235ec21057d 100644
--- a/shell/common/v8_value_converter.cc
+++ b/shell/common/v8_value_converter.cc
@@ -204,14 +204,14 @@ v8::Local<v8::Value> V8ValueConverter::ToV8ValueImpl(
 v8::Local<v8::Value> V8ValueConverter::ToV8Array(
     v8::Isolate* isolate,
     const base::ListValue* val) const {
-  v8::Local<v8::Array> result(v8::Array::New(isolate, val->GetList().size()));
+  v8::Local<v8::Array> result(
+      v8::Array::New(isolate, val->GetListDeprecated().size()));
   auto context = isolate->GetCurrentContext();
 
-  for (size_t i = 0; i < val->GetList().size(); ++i) {
-    const base::Value* child = nullptr;
-    val->Get(i, &child);
+  for (size_t i = 0; i < val->GetListDeprecated().size(); ++i) {
+    const base::Value& child = val->GetListDeprecated()[i];
 
-    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, child);
+    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &child);
 
     v8::TryCatch try_catch(isolate);
     result->Set(context, static_cast<uint32_t>(i), child_v8).Check();
diff --git a/shell/renderer/electron_autofill_agent.cc b/shell/renderer/electron_autofill_agent.cc
index 9d8282079a412..ff3ae3deceb56 100644
--- a/shell/renderer/electron_autofill_agent.cc
+++ b/shell/renderer/electron_autofill_agent.cc
@@ -136,9 +136,10 @@ void AutofillAgent::ShowSuggestions(const blink::WebFormControlElement& element,
                                     const ShowSuggestionsOptions& options) {
   if (!element.IsEnabled() || element.IsReadOnly())
     return;
-  const blink::WebInputElement* input_element = ToWebInputElement(&element);
-  if (input_element) {
-    if (!input_element->IsTextField())
+  const blink::WebInputElement input_element =
+      element.DynamicTo<blink::WebInputElement>();
+  if (!input_element.IsNull()) {
+    if (!input_element.IsTextField())
       return;
   }
 
@@ -154,9 +155,8 @@ void AutofillAgent::ShowSuggestions(const blink::WebFormControlElement& element,
 
   std::vector<std::u16string> data_list_values;
   std::vector<std::u16string> data_list_labels;
-  if (input_element) {
-    GetDataListSuggestions(*input_element, &data_list_values,
-                           &data_list_labels);
+  if (!input_element.IsNull()) {
+    GetDataListSuggestions(input_element, &data_list_values, &data_list_labels);
     TrimStringVectorForIPC(&data_list_values);
     TrimStringVectorForIPC(&data_list_labels);
   }
@@ -191,8 +191,10 @@ void AutofillAgent::ShowPopup(const blink::WebFormControlElement& element,
 void AutofillAgent::AcceptDataListSuggestion(const std::u16string& suggestion) {
   auto element = render_frame()->GetWebFrame()->GetDocument().FocusedElement();
   if (element.IsFormControlElement()) {
-    ToWebInputElement(&element)->SetAutofillValue(
-        blink::WebString::FromUTF16(suggestion));
+    blink::WebInputElement input_element =
+        element.DynamicTo<blink::WebInputElement>();
+    if (!input_element.IsNull())
+      input_element.SetAutofillValue(blink::WebString::FromUTF16(suggestion));
   }
 }
 
@@ -204,9 +206,10 @@ void AutofillAgent::DoFocusChangeComplete() {
   if (focused_node_was_last_clicked_ && was_focused_before_now_) {
     ShowSuggestionsOptions options;
     options.autofill_on_empty_values = true;
-    auto* input_element = ToWebInputElement(&element);
-    if (input_element)
-      ShowSuggestions(*input_element, options);
+    blink::WebInputElement input_element =
+        element.DynamicTo<blink::WebInputElement>();
+    if (!input_element.IsNull())
+      ShowSuggestions(input_element, options);
   }
 
   was_focused_before_now_ = true;
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index 2c23069159eb8..98f79468c5445 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -326,10 +326,10 @@ bool RendererClientBase::OverrideCreatePlugin(
   return true;
 }
 
-void RendererClientBase::AddSupportedKeySystems(
-    std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
+void RendererClientBase::GetSupportedKeySystems(
+    media::GetSupportedKeySystemsCB cb) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
-  key_systems_provider_.AddSupportedKeySystems(key_systems);
+  key_systems_provider_.GetSupportedKeySystems(std::move(cb));
 #endif
 }
 
diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h
index 56e53ab764cf6..d830c6db5f88f 100644
--- a/shell/renderer/renderer_client_base.h
+++ b/shell/renderer/renderer_client_base.h
@@ -104,9 +104,7 @@ class RendererClientBase : public content::ContentRendererClient
   bool OverrideCreatePlugin(content::RenderFrame* render_frame,
                             const blink::WebPluginParams& params,
                             blink::WebPlugin** plugin) override;
-  void AddSupportedKeySystems(
-      std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
-      override;
+  void GetSupportedKeySystems(media::GetSupportedKeySystemsCB cb) override;
   bool IsKeySystemsUpdateNeeded() override;
   void DidSetUserAgent(const std::string& user_agent) override;
   bool IsPluginHandledExternally(content::RenderFrame* render_frame,
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index 94f3bd59827e3..49545c4eaf992 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -6,7 +6,7 @@ import { BrowserWindow, WebFrameMain, webFrameMain, ipcMain } from 'electron/mai
 import { closeAllWindows } from './window-helpers';
 import { emittedOnce, emittedNTimes } from './events-helpers';
 import { AddressInfo } from 'net';
-import { waitUntil } from './spec-helpers';
+import { ifit, waitUntil } from './spec-helpers';
 
 describe('webFrameMain module', () => {
   const fixtures = path.resolve(__dirname, '..', 'spec-main', 'fixtures');
@@ -201,7 +201,8 @@ describe('webFrameMain module', () => {
       w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
     });
 
-    it('throws upon accessing properties when disposed', async () => {
+    // TODO(jkleinsc) fix this flaky test on linux
+    ifit(process.platform !== 'linux')('throws upon accessing properties when disposed', async () => {
       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
       const { mainFrame } = w.webContents;
       w.destroy();
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index f2df2aa34c94f..80920d99b631c 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -820,7 +820,8 @@ describe('chromium features', () => {
       expect(typeofProcessGlobal).to.equal('undefined');
     });
 
-    it('disables JavaScript when it is disabled on the parent window', async () => {
+    // TODO(jkleinsc) fix this flaky test on WOA
+    ifit(process.platform !== 'win32' || process.arch !== 'arm64')('disables JavaScript when it is disabled on the parent window', async () => {
       const w = new BrowserWindow({ show: true, webPreferences: { nodeIntegration: true } });
       w.webContents.loadFile(path.resolve(__dirname, 'fixtures', 'blank.html'));
       const windowUrl = require('url').format({
@@ -1614,7 +1615,8 @@ describe('iframe using HTML fullscreen API while window is OS-fullscreened', ()
     expect(width).to.equal(0);
   });
 
-  it('can fullscreen from in-process iframes', async () => {
+  // TODO(jkleinsc) fix this flaky test on WOA
+  ifit(process.platform !== 'win32' || process.arch !== 'arm64')('can fullscreen from in-process iframes', async () => {
     const fullscreenChange = emittedOnce(ipcMain, 'fullscreenChange');
     w.loadFile(path.join(fixturesPath, 'pages', 'fullscreen-ipif.html'));
     await fullscreenChange;
diff --git a/spec-main/extensions-spec.ts b/spec-main/extensions-spec.ts
index daef4622d8b84..5c382d53e03b3 100644
--- a/spec-main/extensions-spec.ts
+++ b/spec-main/extensions-spec.ts
@@ -7,6 +7,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as WebSocket from 'ws';
 import { emittedOnce, emittedNTimes, emittedUntil } from './events-helpers';
+import { ifit } from './spec-helpers';
 
 const uuid = require('uuid');
 
@@ -502,7 +503,8 @@ describe('chrome extensions', () => {
       });
     };
 
-    it('loads a devtools extension', async () => {
+    // TODO(jkleinsc) fix this flaky test on WOA
+    ifit(process.platform !== 'win32' || process.arch !== 'arm64')('loads a devtools extension', async () => {
       const customSession = session.fromPartition(`persist:${uuid.v4()}`);
       customSession.loadExtension(path.join(fixtures, 'extensions', 'devtools-extension'));
       const winningMessage = emittedOnce(ipcMain, 'winning');
diff --git a/spec-main/webview-spec.ts b/spec-main/webview-spec.ts
index c6cd59bde06fa..01b93a66e2307 100644
--- a/spec-main/webview-spec.ts
+++ b/spec-main/webview-spec.ts
@@ -436,7 +436,8 @@ describe('<webview> tag', function () {
 
     afterEach(closeAllWindows);
 
-    it('should make parent frame element fullscreen too', async () => {
+    // TODO(jkleinsc) fix this test on arm64 macOS.  It causes the tests following it to fail/be flaky
+    ifit(process.platform !== 'darwin' || process.arch !== 'arm64')('should make parent frame element fullscreen too', async () => {
       const [w, webview] = await loadWebViewWindow();
       expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.false();
 

From 998c85af131b28c9f7e37b4833e96760a9cd6bf1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 05:00:53 -0800
Subject: [PATCH 069/811] Bump v19.0.0-nightly.20220228

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..caf0f88d626a1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220228
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..873d16c36ec2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220228",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..6cad93bff94d6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220228
+ PRODUCTVERSION 19,0,0,20220228
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1e50f7d2b64832aa98e5adcddd9af20d7ed72783 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Mon, 28 Feb 2022 11:46:52 -0800
Subject: [PATCH 070/811] docs: consolidate info docs (#32964)

* docs: consolidate info docs

* fill in table

* more newlines to admonitions

* update china mirror thing
---
 README.md                            |  35 ++++---
 docs/README.md                       |   1 -
 docs/development/issues.md           |   2 +-
 docs/tutorial/electron-timelines.md  | 122 +++++++++++++++++++------
 docs/tutorial/electron-versioning.md |  11 ++-
 docs/tutorial/support.md             | 131 +--------------------------
 6 files changed, 135 insertions(+), 167 deletions(-)

diff --git a/README.md b/README.md
index f0af41e5940b3..00bb29edb3c9f 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,17 @@ For more installation options and troubleshooting tips, see
 [installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
 [Electron versioning](docs/tutorial/electron-versioning.md).
 
+## Platform support
+
+Each Electron release provides binaries for macOS, Windows, and Linux.
+
+* macOS (El Capitan and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
+* Windows (Windows 7 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8.
+* Linux: The prebuilt binaries of Electron are built on Ubuntu 18.04. They have also been verified to work on:
+  * Ubuntu 14.04 and newer
+  * Fedora 24 and newer
+  * Debian 8 and newer
+
 ## Quick start & Electron Fiddle
 
 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
@@ -54,12 +65,10 @@ npm start
 
 ## Resources for learning Electron
 
-- [electronjs.org/docs](https://electronjs.org/docs) - All of Electron's documentation
-- [electron/fiddle](https://github.com/electron/fiddle) - A tool to build, run, and package small Electron experiments
-- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - A very basic starter Electron app
-- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - Sample starter apps created by the community
-- [electron/simple-samples](https://github.com/electron/simple-samples) - Small applications with ideas for taking them further
-- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - An Electron app that teaches you how to use Electron
+* [electronjs.org/docs](https://electronjs.org/docs) - All of Electron's documentation
+* [electron/fiddle](https://github.com/electron/fiddle) - A tool to build, run, and package small Electron experiments
+* [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - A very basic starter Electron app
+* [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - Sample starter apps created by the community
 
 ## Programmatic usage
 
@@ -80,11 +89,15 @@ const child = proc.spawn(electron)
 
 ### Mirrors
 
-- [China](https://npmmirror.com/mirrors/electron)
+* [China](https://npm.taobao.org/mirrors/electron)
+
+See the [Advanced Installation Instructions](https://www.electronjs.org/docs/latest/tutorial/installation#mirror) to learn how to use a custom mirror.
 
-## Documentation Translations
+## Documentation translations
 
-Find documentation translations in [electron/i18n](https://github.com/electron/i18n).
+We crowdsource translations for our documentation via [Crowdin](https://crowdin.com/project/electron).
+We currently accept translations for Chinese (Simplified), French, German, Japanese, Portuguese,
+Russian, and Spanish.
 
 ## Contributing
 
@@ -93,10 +106,10 @@ If you are interested in reporting/fixing issues and contributing directly to th
 ## Community
 
 Info on reporting bugs, getting help, finding third-party tools and sample apps,
-and more can be found in the [support document](docs/tutorial/support.md#finding-support).
+and more can be found on the [Community page](https://www.electronjs.org/community).
 
 ## License
 
 [MIT](https://github.com/electron/electron/blob/main/LICENSE)
 
-When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
+When using Electron logos, make sure to follow [OpenJS Foundation Trademark Policy](https://openjsf.org/wp-content/uploads/sites/84/2021/01/OpenJS-Foundation-Trademark-Policy-2021-01-12.docx.pdf).
diff --git a/docs/README.md b/docs/README.md
index 261c67c5941ce..5e5f763ccdf7d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -64,7 +64,6 @@ an issue:
   * [Automated Testing](tutorial/automated-testing.md)
   * [REPL](tutorial/repl.md)
 * [Distribution](tutorial/application-distribution.md)
-  * [Supported Platforms](tutorial/support.md#supported-platforms)
   * [Code Signing](tutorial/code-signing.md)
   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
   * [Windows Store](tutorial/windows-store-guide.md)
diff --git a/docs/development/issues.md b/docs/development/issues.md
index ec0ad5dc04f36..1eb530111c7a8 100644
--- a/docs/development/issues.md
+++ b/docs/development/issues.md
@@ -24,7 +24,7 @@ contribute:
 
 ## Asking for General Help
 
-["Finding Support"](../tutorial/support.md#finding-support) has a
+[The Electron website](https://electronjs.org/community) has a
 list of resources for getting programming help, reporting security issues,
 contributing, and more. Please use the issue tracker for bugs only!
 
diff --git a/docs/tutorial/electron-timelines.md b/docs/tutorial/electron-timelines.md
index 16418ab398c51..80ac4ca66eeb4 100644
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -1,30 +1,100 @@
-# Electron Release Timelines
+# Electron Releases
 
-Special notes:
+Electron frequently releases major versions alongside every other Chromium release.
+This document focuses on the release cadence and version support policy.
+For a more in-depth guide on our git branches and how Electron uses semantic versions,
+check out our [Electron Versioning](./electron-versioning.md) doc.
+
+## Timeline
+
+| Electron | Alpha | Beta | Stable | Chrome | Node | Supported |
+| ------- | ----- | ------- | ------ | ------ | ---- | ---- |
+| 2.0.0 | -- | 2018-Feb-21 | 2018-May-01 | M61 | v8.9 | 🚫 |
+| 3.0.0 | -- | 2018-Jun-21 | 2018-Sep-18 | M66 | v10.2 | 🚫 |
+| 4.0.0 | -- | 2018-Oct-11 | 2018-Dec-20 | M69 | v10.11 | 🚫 |
+| 5.0.0 | -- | 2019-Jan-22 | 2019-Apr-24 | M73 | v12.0 | 🚫 |
+| 6.0.0 | -- | 2019-May-01 | 2019-Jul-30 | M76 | v12.4 | 🚫 |
+| 7.0.0 | -- | 2019-Aug-01 | 2019-Oct-22 | M78 | v12.8 | 🚫 |
+| 8.0.0 | -- | 2019-Oct-24 | 2020-Feb-04 | M80 | v12.13 | 🚫 |
+| 9.0.0 | -- | 2020-Feb-06 | 2020-May-19 | M83 | v12.14 | 🚫 |
+| 10.0.0 | -- | 2020-May-21 | 2020-Aug-25 | M85 | v12.16 | 🚫 |
+| 11.0.0 | -- | 2020-Aug-27 | 2020-Nov-17 | M87 | v12.18 | 🚫 |
+| 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 | 🚫 |
+| 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 | 🚫 |
+| 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
+| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | ✅ |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
+| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | TBD | ✅ |
+| 19.0.0 | 2022-Mar-31 | 2022-Apr-30 | 2022-May-24 | M102 | TBD | ✅ |
+
+**Notes:**
 
 * The `-beta.1` and `stable` dates are our solid release dates.
-* We strive for weekly beta releases, however we often release more betas than scheduled.
+* We strive for weekly beta releases, but we often release more betas than scheduled.
 * All dates are our goals but there may be reasons for adjusting the stable deadline, such as security bugs.
-* Take a look at the [5.0.0 Timeline blog post](https://electronjs.org/blog/electron-5-0-timeline) for info about publicizing our release dates.
-* Since Electron 6.0, we've been targeting every other Chromium version and releasing our stable on the same day as Chrome stable. You can reference Chromium's release schedule [here](https://chromiumdash.appspot.com/schedule). See [Electron's new release cadence blog post](https://www.electronjs.org/blog/12-week-cadence) for more details on our release schedule.
-* Starting in Electron 16.0, we will release on an 8-week cadence. See [Electron's new 8-week cadence blog post](https://www.electronjs.org/blog/8-week-cadence) for more details.
-
-| Electron | Alpha | Beta | Stable | Chrome | Node |
-| ------- | ----- | ------- | ------ | ------ | ---- |
-| 2.0.0 | -- | 2018-Feb-21 | 2018-May-01 | M61 | v8.9 |
-| 3.0.0 | -- | 2018-Jun-21 | 2018-Sep-18 | M66 | v10.2 |
-| 4.0.0 | -- | 2018-Oct-11 | 2018-Dec-20 | M69 | v10.11 |
-| 5.0.0 | -- | 2019-Jan-22 | 2019-Apr-24 | M73 | v12.0 |
-| 6.0.0 | -- | 2019-May-01 | 2019-Jul-30 | M76 | v12.4 |
-| 7.0.0 | -- | 2019-Aug-01 | 2019-Oct-22 | M78 | v12.8 |
-| 8.0.0 | -- | 2019-Oct-24 | 2020-Feb-04 | M80 | v12.13 |
-| 9.0.0 | -- | 2020-Feb-06 | 2020-May-19 | M83 | v12.14 |
-| 10.0.0 | -- | 2020-May-21 | 2020-Aug-25 | M85 | v12.16 |
-| 11.0.0 | -- | 2020-Aug-27 | 2020-Nov-17 | M87 | v12.18 |
-| 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 |
-| 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 |
-| 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 |
-| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 |
-| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 |
-| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | TBD |
+
+**Historical changes:**
+
+* Since Electron 5, Electron has been publicizing its release dates ([see blog post](https://electronjs.org/blog/electron-5-0-timeline)).
+* Since Electron 6, Electron major versions have been targeting every other Chromium major version. Each Electron stable should happen on the same day as Chrome stable ([see blog post](https://www.electronjs.org/blog/12-week-cadence)). When this was announced
+* Since Electron 16, Electron has been releasing major versions on an 8-week cadence in accordance to Chrome's change to a 4-week release cadence ([see blog post](https://www.electronjs.org/blog/8-week-cadence).
+
+:::info Chrome release dates
+
+Chromium has the own public release schedule [here](https://chromiumdash.appspot.com/schedule).
+
+:::
+
+## Version support policy
+
+:::info
+
+Beginning in September 2021 (Electron 15), the Electron team
+will temporarily support the latest **four** stable major versions. This
+extended support is intended to help Electron developers transition to
+the [new 8-week release cadence](https://electronjs.org/blog/8-week-cadence),
+and will continue until the release of Electron 19. At that time,
+the Electron team will drop support back to the latest three stable major versions.
+
+:::
+
+The latest three *stable* major versions are supported by the Electron team.
+For example, if the latest release is 6.1.x, then the 5.0.x as well
+as the 4.2.x series are supported. We only support the latest minor release
+for each stable release series. This means that in the case of a security fix,
+6.1.x will receive the fix, but we will not release a new version of 6.0.x.
+
+The latest stable release unilaterally receives all fixes from `main`,
+and the version prior to that receives the vast majority of those fixes
+as time and bandwidth warrants. The oldest supported release line will receive
+only security fixes directly.
+
+### Breaking API changes
+
+When an API is changed or removed in a way that breaks existing functionality, the
+previous functionality will be supported for a minimum of two major versions when
+possible before being removed. For example, if a function takes three arguments,
+and that number is reduced to two in major version 10, the three-argument version would
+continue to work until, at minimum, major version 12. Past the minimum two-version
+threshold, we will attempt to support backwards compatibility beyond two versions
+until the maintainers feel the maintenance burden is too high to continue doing so.
+
+### End-of-life
+
+When a release branch reaches the end of its support cycle, the series
+will be deprecated in NPM and a final end-of-support release will be
+made. This release will add a warning to inform that an unsupported
+version of Electron is in use.
+
+These steps are to help app developers learn when a branch they're
+using becomes unsupported, but without being excessively intrusive
+to end users.
+
+If an application has exceptional circumstances and needs to stay
+on an unsupported series of Electron, developers can silence the
+end-of-support warning by omitting the final release from the app's
+`package.json` `devDependencies`. For example, since the 1-6-x series
+ended with an end-of-support 1.6.18 release, developers could choose
+to stay in the 1-6-x series without warnings with `devDependency` of
+`"electron": 1.6.0 - 1.6.17`.
diff --git a/docs/tutorial/electron-versioning.md b/docs/tutorial/electron-versioning.md
index f450feeb1968d..7e473bffd3940 100644
--- a/docs/tutorial/electron-versioning.md
+++ b/docs/tutorial/electron-versioning.md
@@ -48,7 +48,7 @@ Stabilization branches are branches that run parallel to `main`, taking in only
 
 Since Electron 8, stabilization branches are always **major** version lines, and named against the following template `$MAJOR-x-y` e.g. `8-x-y`.  Prior to that we used **minor** version lines and named them as `$MAJOR-$MINOR-x` e.g. `2-0-x`.
 
-We allow for multiple stabilization branches to exist simultaneously, one for each supported version. For more details on which versions are supported, see our [Electron Release Timelines](./electron-timelines.md) doc.
+We allow for multiple stabilization branches to exist simultaneously, one for each supported version. For more details on which versions are supported, see our [Electron Releases](./electron-timelines.md) doc.
 
 ![Multiple Stability Branches](../images/versioning-sketch-2.png)
 
@@ -107,6 +107,15 @@ A few examples of how various SemVer ranges will pick up new releases:
 
 ![Semvers and Releases](../images/versioning-sketch-7.png)
 
+### Backport request process
+
+All supported release lines will accept external pull requests to backport
+fixes previously merged to `main`, though this may be on a case-by-case
+basis for some older supported lines. All contested decisions around release
+line backports will be resolved by the
+[Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases)
+as an agenda item at their weekly meeting the week the backport PR is raised.
+
 ## Feature flags
 
 Feature flags are a common practice in Chromium, and are well-established in the web-development ecosystem. In the context of Electron, a feature flag or **soft branch** must have the following properties:
diff --git a/docs/tutorial/support.md b/docs/tutorial/support.md
index d7a51f57140c4..fa48f555e5040 100644
--- a/docs/tutorial/support.md
+++ b/docs/tutorial/support.md
@@ -1,128 +1,5 @@
-# Electron Support
+# This doc has moved!
 
-## Finding Support
-
-If you have a security concern,
-please see the [security document](https://github.com/electron/electron/tree/main/SECURITY.md).
-
-If you're looking for programming help,
-for answers to questions,
-or to join in discussion with other developers who use Electron,
-you can interact with the community in these locations:
-
-* [Electron's Discord server](https://discord.com/invite/APGC3k5yaH) has channels for:
-  * Getting help
-  * Ecosystem apps like [Electron Forge](https://github.com/electron-userland/electron-forge) and [Electron Fiddle](https://github.com/electron/fiddle)
-  * Sharing ideas with other Electron app developers
-  * And more!
-* [`electron`](https://discuss.atom.io/c/electron) category on the Atom forums
-* `#electron` channel on [Atom's Slack](https://discuss.atom.io/t/join-us-on-slack/16638?source_topic_id=25406)
-* [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
-* [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
-* [`electron-kr`](https://electron-kr.github.io/electron-kr) *(Korean)*
-* [`electron-jp`](https://electron-jp.slack.com) *(Japanese)*
-* [`electron-tr`](https://electron-tr.herokuapp.com) *(Turkish)*
-* [`electron-id`](https://electron-id.slack.com) *(Indonesia)*
-* [`electron-pl`](https://electronpl.github.io) *(Poland)*
-
-If you'd like to contribute to Electron,
-see the [contributing document](https://github.com/electron/electron/blob/main/CONTRIBUTING.md).
-
-If you've found a bug in a [supported version](#supported-versions) of Electron,
-please report it with the [issue tracker](../development/issues.md).
-
-[awesome-electron](https://github.com/sindresorhus/awesome-electron)
-is a community-maintained list of useful example apps,
-tools and resources.
-
-## Supported Versions
-
-_**Note:** Beginning in September 2021 with Electron 15, the Electron team
-will temporarily support the latest **four** stable major versions. This
-extended support is intended to help Electron developers transition to
-the [new eight week release cadence](https://electronjs.org/blog/8-week-cadence), and will continue until May 2022, with
-the release of Electron 19. At that time, the Electron team will drop support
-back to the latest three stable major versions._
-
-The latest three *stable* major versions are supported by the Electron team.
-For example, if the latest release is 6.1.x, then the 5.0.x as well
-as the 4.2.x series are supported.  We only support the latest minor release
-for each stable release series.  This means that in the case of a security fix
-6.1.x will receive the fix, but we will not release a new version of 6.0.x.
-
-The latest stable release unilaterally receives all fixes from `main`,
-and the version prior to that receives the vast majority of those fixes
-as time and bandwidth warrants. The oldest supported release line will receive
-only security fixes directly.
-
-All supported release lines will accept external pull requests to backport
-fixes previously merged to `main`, though this may be on a case-by-case
-basis for some older supported lines. All contested decisions around release
-line backports will be resolved by the [Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases) as an agenda item at their weekly meeting the week the backport PR is raised.
-
-When an API is changed or removed in a way that breaks existing functionality, the
-previous functionality will be supported for a minimum of two major versions when
-possible before being removed. For example, if a function takes three arguments,
-and that number is reduced to two in major version 10, the three-argument version would
-continue to work until, at minimum, major version 12. Past the minimum two-version
-threshold, we will attempt to support backwards compatibility beyond two versions
-until the maintainers feel the maintenance burden is too high to continue doing so.
-
-### Currently supported versions
-
-* 19.x.y
-* 18.x.y
-* 17.x.y
-* 16.x.y
-
-### End-of-life
-
-When a release branch reaches the end of its support cycle, the series
-will be deprecated in NPM and a final end-of-support release will be
-made. This release will add a warning to inform that an unsupported
-version of Electron is in use.
-
-These steps are to help app developers learn when a branch they're
-using becomes unsupported, but without being excessively intrusive
-to end users.
-
-If an application has exceptional circumstances and needs to stay
-on an unsupported series of Electron, developers can silence the
-end-of-support warning by omitting the final release from the app's
-`package.json` `devDependencies`. For example, since the 1-6-x series
-ended with an end-of-support 1.6.18 release, developers could choose
-to stay in the 1-6-x series without warnings with `devDependency` of
-`"electron": 1.6.0 - 1.6.17`.
-
-## Supported Platforms
-
-Following platforms are supported by Electron:
-
-### macOS
-
-Only 64bit binaries are provided for macOS, and the minimum macOS version
-supported is macOS 10.11 (El Capitan).
-
-Native support for Apple Silicon (`arm64`) devices was added in Electron 11.0.0.
-
-### Windows
-
-Windows 7 and later are supported, older operating systems are not supported
-(and do not work).
-
-Both `ia32` (`x86`) and `x64` (`amd64`) binaries are provided for Windows.
-[Native support for Windows on Arm (`arm64`) devices was added in Electron 6.0.8.](windows-arm.md).
-Running apps packaged with previous versions is possible using the ia32 binary.
-
-### Linux
-
-The prebuilt binaries of Electron are built on Ubuntu 18.04.
-
-Whether the prebuilt binary can run on a distribution depends on whether the
-distribution includes the libraries that Electron is linked to on the building
-platform, so only Ubuntu 18.04 is guaranteed to work, but following platforms
-are also verified to be able to run the prebuilt binaries of Electron:
-
-* Ubuntu 14.04 and newer
-* Fedora 24 and newer
-* Debian 8 and newer
+* For information on supported releases, see the [Electron Releases](./electron-timelines.md) doc.
+* For community support on Electron, see the [Community page](https://www.electronjs.org/community).
+* For platform support info, see the [README](https://github.com/electron/electron/blob/main/README.md).

From 283fa2b79d44cd18b9d4865edaf65a3e107207ce Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 28 Feb 2022 23:59:27 +0100
Subject: [PATCH 071/811] fix: macOS tray icon alternate images (#33026)

---
 shell/browser/ui/tray_icon_cocoa.mm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm
index 382ed5df7c97f..0a37e4fea727e 100644
--- a/shell/browser/ui/tray_icon_cocoa.mm
+++ b/shell/browser/ui/tray_icon_cocoa.mm
@@ -93,6 +93,15 @@ - (void)setImage:(NSImage*)image {
 
 - (void)setAlternateImage:(NSImage*)image {
   [[statusItem_ button] setAlternateImage:image];
+
+  // We need to change the button type here because the default button type for
+  // NSStatusItem, NSStatusBarButton, does not display alternate content when
+  // clicked. NSButtonTypeMomentaryChange displays its alternate content when
+  // clicked and returns to its normal content when the user releases it, which
+  // is the behavior users would expect when clicking a button with an alternate
+  // image set.
+  [[statusItem_ button] setButtonType:NSButtonTypeMomentaryChange];
+  [self updateDimensions];
 }
 
 - (void)setIgnoreDoubleClickEvents:(BOOL)ignore {

From 7cb62bfc22c5919d76b9800432d3c776a0266f72 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Tue, 1 Mar 2022 14:14:11 -0800
Subject: [PATCH 072/811] test: BrowserWindow backgroundColor and transparency
 (#31017)

* test: BrowserWindow backgroundColor

* test: allow similar colors

* test: disable linux capturing

* refactor: split screen capture from reading pixel color
---
 spec-main/api-browser-window-spec.ts          | 65 ++++++++++++++
 .../fixtures/pages/half-background-color.html | 20 +++++
 spec-main/screen-helpers.ts                   | 87 +++++++++++++++++++
 3 files changed, 172 insertions(+)
 create mode 100644 spec-main/fixtures/pages/half-background-color.html
 create mode 100644 spec-main/screen-helpers.ts

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 70d57977af6a0..8c9c45e60282b 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -12,6 +12,7 @@ import { app, BrowserWindow, BrowserView, dialog, ipcMain, OnBeforeSendHeadersLi
 import { emittedOnce, emittedUntil, emittedNTimes } from './events-helpers';
 import { ifit, ifdescribe, defer, delay } from './spec-helpers';
 import { closeWindow, closeAllWindows } from './window-helpers';
+import { areColorsSimilar, captureScreen, CHROMA_COLOR_HEX, getPixelColor } from './screen-helpers';
 
 const features = process._linkedBinding('electron_common_features');
 const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
@@ -4872,5 +4873,69 @@ describe('BrowserWindow module', () => {
       w.setBounds(newBounds);
       expect(w.getBounds()).to.deep.equal(newBounds);
     });
+
+    // Linux doesn't return any capture sources.
+    ifit(process.platform !== 'linux')('should not display a visible background', async () => {
+      const display = screen.getPrimaryDisplay();
+
+      const backgroundWindow = new BrowserWindow({
+        ...display.bounds,
+        frame: false,
+        backgroundColor: CHROMA_COLOR_HEX,
+        hasShadow: false
+      });
+
+      await backgroundWindow.loadURL('about:blank');
+
+      const foregroundWindow = new BrowserWindow({
+        ...display.bounds,
+        show: true,
+        transparent: true,
+        frame: false,
+        hasShadow: false
+      });
+
+      foregroundWindow.loadFile(path.join(__dirname, 'fixtures', 'pages', 'half-background-color.html'));
+      await emittedOnce(foregroundWindow, 'ready-to-show');
+
+      const screenCapture = await captureScreen();
+      const leftHalfColor = getPixelColor(screenCapture, {
+        x: display.size.width / 4,
+        y: display.size.height / 2
+      });
+      const rightHalfColor = getPixelColor(screenCapture, {
+        x: display.size.width - (display.size.width / 4),
+        y: display.size.height / 2
+      });
+
+      expect(areColorsSimilar(leftHalfColor, CHROMA_COLOR_HEX)).to.be.true();
+      expect(areColorsSimilar(rightHalfColor, '#ff0000')).to.be.true();
+    });
+  });
+
+  describe('"backgroundColor" option', () => {
+    afterEach(closeAllWindows);
+
+    // Linux doesn't return any capture sources.
+    ifit(process.platform !== 'linux')('should display the set color', async () => {
+      const display = screen.getPrimaryDisplay();
+
+      const w = new BrowserWindow({
+        ...display.bounds,
+        show: true,
+        backgroundColor: CHROMA_COLOR_HEX
+      });
+
+      w.loadURL('about:blank');
+      await emittedOnce(w, 'ready-to-show');
+
+      const screenCapture = await captureScreen();
+      const centerColor = getPixelColor(screenCapture, {
+        x: display.size.width / 2,
+        y: display.size.height / 2
+      });
+
+      expect(areColorsSimilar(centerColor, CHROMA_COLOR_HEX)).to.be.true();
+    });
   });
 });
diff --git a/spec-main/fixtures/pages/half-background-color.html b/spec-main/fixtures/pages/half-background-color.html
new file mode 100644
index 0000000000000..07e5ccdcadf90
--- /dev/null
+++ b/spec-main/fixtures/pages/half-background-color.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <style>
+      #main {
+        position: fixed;
+        left: 50%;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-color: #ff0000;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="main"></div>
+  </body>
+</html>
diff --git a/spec-main/screen-helpers.ts b/spec-main/screen-helpers.ts
new file mode 100644
index 0000000000000..26fbcb8ea2b08
--- /dev/null
+++ b/spec-main/screen-helpers.ts
@@ -0,0 +1,87 @@
+import * as path from 'path';
+import * as fs from 'fs';
+import { screen, desktopCapturer, NativeImage } from 'electron';
+
+const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+
+/** Chroma key green. */
+export const CHROMA_COLOR_HEX = '#00b140';
+
+/**
+ * Capture the screen at the given point.
+ *
+ * NOTE: Not yet supported on Linux in CI due to empty sources list.
+ */
+export const captureScreen = async (point: Electron.Point = { x: 0, y: 0 }): Promise<NativeImage> => {
+  const display = screen.getDisplayNearestPoint(point);
+  const sources = await desktopCapturer.getSources({ types: ['screen'], thumbnailSize: display.size });
+  // Toggle to save screen captures for debugging.
+  const DEBUG_CAPTURE = false;
+  if (DEBUG_CAPTURE) {
+    for (const source of sources) {
+      await fs.promises.writeFile(path.join(fixtures, `screenshot_${source.display_id}.png`), source.thumbnail.toPNG());
+    }
+  }
+  const screenCapture = sources.find(source => source.display_id === `${display.id}`);
+  // Fails when HDR is enabled on Windows.
+  // https://bugs.chromium.org/p/chromium/issues/detail?id=1247730
+  if (!screenCapture) {
+    const displayIds = sources.map(source => source.display_id);
+    throw new Error(`Unable to find screen capture for display '${display.id}'\n\tAvailable displays: ${displayIds.join(', ')}`);
+  }
+  return screenCapture.thumbnail;
+};
+
+const formatHexByte = (val: number): string => {
+  const str = val.toString(16);
+  return str.length === 2 ? str : `0${str}`;
+};
+
+/**
+ * Get the hex color at the given pixel coordinate in an image.
+ */
+export const getPixelColor = (image: Electron.NativeImage, point: Electron.Point): string => {
+  const pixel = image.crop({ ...point, width: 1, height: 1 });
+  // TODO(samuelmaddock): NativeImage.toBitmap() should return the raw pixel
+  // color, but it sometimes differs. Why is that?
+  const [b, g, r] = pixel.toBitmap();
+  return `#${formatHexByte(r)}${formatHexByte(g)}${formatHexByte(b)}`;
+};
+
+const hexToRgba = (hexColor: string) => {
+  const match = hexColor.match(/^#([0-9a-fA-F]{6,8})$/);
+  if (!match) return;
+
+  const colorStr = match[1];
+  return [
+    parseInt(colorStr.substring(0, 2), 16),
+    parseInt(colorStr.substring(2, 4), 16),
+    parseInt(colorStr.substring(4, 6), 16),
+    parseInt(colorStr.substring(6, 8), 16) || 0xFF
+  ];
+};
+
+/** Calculate euclidian distance between colors. */
+const colorDistance = (hexColorA: string, hexColorB: string) => {
+  const colorA = hexToRgba(hexColorA);
+  const colorB = hexToRgba(hexColorB);
+  if (!colorA || !colorB) return -1;
+  return Math.sqrt(
+    Math.pow(colorB[0] - colorA[0], 2) +
+    Math.pow(colorB[1] - colorA[1], 2) +
+    Math.pow(colorB[2] - colorA[2], 2)
+  );
+};
+
+/**
+ * Determine if colors are similar based on distance. This can be useful when
+ * comparing colors which may differ based on lossy compression.
+ */
+export const areColorsSimilar = (
+  hexColorA: string,
+  hexColorB: string,
+  distanceThreshold = 90
+): boolean => {
+  const distance = colorDistance(hexColorA, hexColorB);
+  return distance <= distanceThreshold;
+};

From 306147ddf5e529e0455caa51101a7e6870f23196 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 1 Mar 2022 14:16:37 -0800
Subject: [PATCH 073/811] fix: disable partition alloc on mac (#33114)

---
 patches/chromium/.patches                     |  1 +
 ...build_disable_partition_alloc_on_mac.patch | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 patches/chromium/build_disable_partition_alloc_on_mac.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 174a219c8b744..65d9285761986 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -111,3 +111,4 @@ fix_dont_delete_SerialPortManager_on_main_thread.patch
 feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
+build_disable_partition_alloc_on_mac.patch
diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch
new file mode 100644
index 0000000000000..944a1f80f3927
--- /dev/null
+++ b/patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <vertedinde@electronjs.org>
+Date: Tue, 1 Mar 2022 12:07:25 -0800
+Subject: build: disable partition alloc on mac
+
+Enabling partition alloc caused a crash when spawning
+a child process. This patch disables partition alloc for mac,
+and can be removed when the crash in fork is resolved.
+Related issue: https://github.com/electron/electron/issues/32718
+
+diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
+index 56acfed89ec4ad4ee568a1b517923efa4b4e9c1f..a1da35a84f896d158ac88368ff6d95025a23ff95 100644
+--- a/base/allocator/allocator.gni
++++ b/base/allocator/allocator.gni
+@@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
+ 
+ # - NaCl: No plans to support it.
+ # - iOS: not done yet.
+-_is_partition_alloc_platform = !is_nacl && !is_ios
++_is_partition_alloc_platform = !is_nacl && !is_ios && !is_mac
+ 
+ # Under Windows Debug the allocator shim is not compatible with CRT.
+ #     NaCl in particular does seem to link some binaries statically

From ebd80a06022c6208c350ea9c70047caa422012ee Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 1 Mar 2022 14:20:07 -0800
Subject: [PATCH 074/811] fix: max window size defaults to 0 (#33025)

---
 shell/browser/native_window.cc | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 74ef7d1bf9e5e..6e42c30304943 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -161,16 +161,25 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
   // On Linux and Window we may already have maximum size defined.
   extensions::SizeConstraints size_constraints(
       use_content_size ? GetContentSizeConstraints() : GetSizeConstraints());
+
   int min_width = size_constraints.GetMinimumSize().width();
   int min_height = size_constraints.GetMinimumSize().height();
   options.Get(options::kMinWidth, &min_width);
   options.Get(options::kMinHeight, &min_height);
   size_constraints.set_minimum_size(gfx::Size(min_width, min_height));
-  int max_width = size_constraints.GetMaximumSize().width();
-  int max_height = size_constraints.GetMaximumSize().height();
-  options.Get(options::kMaxWidth, &max_width);
-  options.Get(options::kMaxHeight, &max_height);
-  size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
+
+  gfx::Size max_size = size_constraints.GetMaximumSize();
+  int max_width = max_size.width() > 0 ? max_size.width() : INT_MAX;
+  int max_height = max_size.height() > 0 ? max_size.height() : INT_MAX;
+  bool have_max_width = options.Get(options::kMaxWidth, &max_width);
+  bool have_max_height = options.Get(options::kMaxHeight, &max_height);
+
+  // By default the window has a default maximum size that prevents it
+  // from being resized larger than the screen, so we should only set this
+  // if th user has passed in values.
+  if (have_max_height || have_max_width || !max_size.IsEmpty())
+    size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
+
   if (use_content_size) {
     SetContentSizeConstraints(size_constraints);
   } else {

From 318c91b78cf59f6bc5594b83724feb12159c2405 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 16:48:02 -0800
Subject: [PATCH 075/811] Revert "Bump v19.0.0-nightly.20220228"

This reverts commit 998c85af131b28c9f7e37b4833e96760a9cd6bf1.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index caf0f88d626a1..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220228
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index 873d16c36ec2b..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220228",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6cad93bff94d6..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220228
- PRODUCTVERSION 19,0,0,20220228
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d9bf02d9b64c56009703e754513486f1c84a74df Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 05:01:04 -0800
Subject: [PATCH 076/811] Bump v19.0.0-nightly.20220302

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..df13fb751cdbc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220302
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..6aa18a88567d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220302",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..c72320eb30844 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220302
+ PRODUCTVERSION 19,0,0,20220302
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c040305db4f94f12495a95ddbb1636e0c67a1937 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 08:56:25 -0800
Subject: [PATCH 077/811] Revert "Bump v19.0.0-nightly.20220302"

This reverts commit d9bf02d9b64c56009703e754513486f1c84a74df.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index df13fb751cdbc..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220302
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index 6aa18a88567d1..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220302",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c72320eb30844..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220302
- PRODUCTVERSION 19,0,0,20220302
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f71a6db3fff711b27b4b4120343e2a568ca42cc1 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Wed, 2 Mar 2022 16:57:26 -0800
Subject: [PATCH 078/811] ci: disable use-thin-lto on Mac only (#33115)

* build: remove use_thin_lto = false

* ci: enabling if things get really bad (all darwin)

* build: lol don't enable that

* build: add patch to disable thin lto for mac
---
 build/args/all.gn                             |  3 ---
 patches/chromium/.patches                     |  1 +
 .../build_disable_thin_lto_on_mac.patch       | 22 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 patches/chromium/build_disable_thin_lto_on_mac.patch

diff --git a/build/args/all.gn b/build/args/all.gn
index 332a3660fd292..a346a9b3d4939 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -35,9 +35,6 @@ enable_pseudolocales = false
 
 is_cfi = false
 
-# This consumes a bit too much disk space on macOS
-use_thin_lto = false
-
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 65d9285761986..995bb12ffa7c7 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -112,3 +112,4 @@ feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
+build_disable_thin_lto_on_mac.patch
diff --git a/patches/chromium/build_disable_thin_lto_on_mac.patch b/patches/chromium/build_disable_thin_lto_on_mac.patch
new file mode 100644
index 0000000000000..f5ffa86766c1a
--- /dev/null
+++ b/patches/chromium/build_disable_thin_lto_on_mac.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <vertedinde@electronjs.org>
+Date: Tue, 1 Mar 2022 11:31:59 -0800
+Subject: build: disable thin lto on mac
+
+Ths build disables thin lto for mac, in order to preserve
+disk space on mac without breaking win-ia32.
+The patch can be removed when we have more disk space on CircleCI
+
+diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
+index 9d25c10587c7ab4e2053f8f69aef3f135ef8e9f9..8d8b8d13c62da1fdd051019c8b726de7d1783113 100644
+--- a/build/config/compiler/compiler.gni
++++ b/build/config/compiler/compiler.gni
+@@ -74,7 +74,7 @@ declare_args() {
+   use_thin_lto =
+       is_cfi ||
+       (is_clang && is_official_build && chrome_pgo_phase != 1 &&
+-       (is_linux || is_win || is_mac ||
++       (is_linux || is_win ||
+         (is_android && target_os != "chromeos") ||
+         ((is_chromeos_ash || is_chromeos_lacros) && is_chromeos_device)))
+ 

From 89725f31bf014dfc076d7df1083c8875d7914a70 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Mar 2022 05:02:08 -0800
Subject: [PATCH 079/811] Bump v19.0.0-nightly.20220303

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..3ad593042d37d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220303
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..3206ab236ea60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220303",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..fd2efd8528395 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220303
+ PRODUCTVERSION 19,0,0,20220303
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 62366aeb95f0ec352abd4fdf320d8fc4e65d7bf7 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Thu, 3 Mar 2022 09:56:00 -0800
Subject: [PATCH 080/811] docs: remove platform notices from tutorial titles
 (#32937)

* docs: remove platform notices from tutorial titles

* Update docs/tutorial/launch-app-from-url-in-another-app.md

Co-authored-by: Mark Lee <malept@users.noreply.github.com>

Co-authored-by: Mark Lee <malept@users.noreply.github.com>
---
 docs/tutorial/in-app-purchases.md                 |  9 ++++++++-
 .../launch-app-from-url-in-another-app.md         |  6 +++---
 docs/tutorial/linux-desktop-actions.md            | 11 +++++++++--
 docs/tutorial/macos-dock.md                       | 15 ++++++++-------
 docs/tutorial/progress-bar.md                     |  9 ++++++++-
 docs/tutorial/recent-documents.md                 |  9 ++++++++-
 docs/tutorial/represented-file.md                 |  9 ++++++++-
 docs/tutorial/windows-taskbar.md                  |  9 ++++++++-
 8 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/docs/tutorial/in-app-purchases.md b/docs/tutorial/in-app-purchases.md
index d4a27c854f6c5..ced192ba296cc 100644
--- a/docs/tutorial/in-app-purchases.md
+++ b/docs/tutorial/in-app-purchases.md
@@ -1,4 +1,11 @@
-# In-App Purchases (macOS)
+---
+title: In-App Purchases
+description: Add in-app purchases to your Mac App Store (MAS) application
+slug: in-app-purchases
+hide_title: true
+---
+
+# In-App Purchases
 
 ## Preparing
 
diff --git a/docs/tutorial/launch-app-from-url-in-another-app.md b/docs/tutorial/launch-app-from-url-in-another-app.md
index d02b28075d514..d99c1f9503342 100644
--- a/docs/tutorial/launch-app-from-url-in-another-app.md
+++ b/docs/tutorial/launch-app-from-url-in-another-app.md
@@ -1,11 +1,11 @@
 ---
-title: Launching Your Electron App From a URL In Another App
-description: This guide will take you through the process of setting your electron app as the default handler for a specific protocol.
+title: Deep Links
+description: Set your Electron app as the default handler for a specific protocol.
 slug: launch-app-from-url-in-another-app
 hide_title: true
 ---
 
-# Launching Your Electron App From A URL In Another App
+# Deep Links
 
 ## Overview
 
diff --git a/docs/tutorial/linux-desktop-actions.md b/docs/tutorial/linux-desktop-actions.md
index 5fa3c5abedaba..7f09d0a4e5255 100644
--- a/docs/tutorial/linux-desktop-actions.md
+++ b/docs/tutorial/linux-desktop-actions.md
@@ -1,4 +1,11 @@
-# Desktop Launcher Actions (Linux)
+---
+title: Desktop Launcher Actions
+description: Add actions to the system launcher on Linux environments.
+slug: linux-desktop-actions
+hide_title: true
+---
+
+# Desktop Launcher Actions
 
 ## Overview
 
@@ -42,4 +49,4 @@ parameters. You can find them in your application in the global variable
 
 [unity-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher
 [audacious-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles?action=AttachFile&do=get&target=shortcuts.png
-[spec]: https://specifications.freedesktop.org/desktop-entry-spec/1.1/ar01s11.html
+[spec]: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
diff --git a/docs/tutorial/macos-dock.md b/docs/tutorial/macos-dock.md
index 0a080e763d01f..38cfcb48e6240 100644
--- a/docs/tutorial/macos-dock.md
+++ b/docs/tutorial/macos-dock.md
@@ -1,4 +1,11 @@
-# Dock (macOS)
+---
+title: Dock
+description: Configure your application's Dock presence on macOS.
+slug: macos-dock
+hide_title: true
+---
+
+# Dock
 
 Electron has APIs to configure the app's icon in the macOS Dock. A macOS-only
 API exists to create a custom dock menu, but Electron also uses the app dock
@@ -16,12 +23,6 @@ To set your custom dock menu, you need to use the
 [`app.dock.setMenu`](../api/dock.md#docksetmenumenu-macos) API,
 which is only available on macOS.
 
-## Example
-
-Starting with a working application from the
- [Quick Start Guide](quick-start.md), update the `main.js` file with the
- following lines:
-
 ```javascript fiddle='docs/fiddles/features/macos-dock-menu'
 const { app, BrowserWindow, Menu } = require('electron')
 
diff --git a/docs/tutorial/progress-bar.md b/docs/tutorial/progress-bar.md
index 58bdab8e8def7..9df75ab96e8b5 100644
--- a/docs/tutorial/progress-bar.md
+++ b/docs/tutorial/progress-bar.md
@@ -1,4 +1,11 @@
-# Taskbar Progress Bar (Windows & macOS)
+---
+title: Progress Bars
+description: Provide progress information to users outside of a BrowserWindow.
+slug: progress-bar
+hide_title: true
+---
+
+# Progress Bars
 
 ## Overview
 
diff --git a/docs/tutorial/recent-documents.md b/docs/tutorial/recent-documents.md
index 8923b177806bb..f1ca0c3251cb8 100644
--- a/docs/tutorial/recent-documents.md
+++ b/docs/tutorial/recent-documents.md
@@ -1,4 +1,11 @@
-# Recent Documents (Windows & macOS)
+---
+title: Recent Documents
+description: Provide a list of recent documents via Windows JumpList or macOS Dock
+slug: recent-documents
+hide_title: true
+---
+
+# Recent Documents
 
 ## Overview
 
diff --git a/docs/tutorial/represented-file.md b/docs/tutorial/represented-file.md
index 7d703a37b4ff3..a4d94d20154b1 100644
--- a/docs/tutorial/represented-file.md
+++ b/docs/tutorial/represented-file.md
@@ -1,4 +1,11 @@
-# Representing Files in a BrowserWindow (macOS)
+---
+title: Representing Files in a BrowserWindow
+description: Set a represented file in the macOS title bar.
+slug: represented-file
+hide_title: true
+---
+
+# Representing Files in a BrowserWindow
 
 ## Overview
 
diff --git a/docs/tutorial/windows-taskbar.md b/docs/tutorial/windows-taskbar.md
index 1d88846a13a18..444c712b3607b 100644
--- a/docs/tutorial/windows-taskbar.md
+++ b/docs/tutorial/windows-taskbar.md
@@ -1,4 +1,11 @@
-# Taskbar Customization (Windows)
+---
+title: Taskbar Customization
+description: Customize the look and feel of your app's Windows taskbar presence.
+slug: windows-taskbar
+hide_title: true
+---
+
+# Taskbar Customization
 
 ## Overview
 

From 41c81ed066116e8649548a90661c9c8f830b288c Mon Sep 17 00:00:00 2001
From: Alvin Philips <alvinphilips257@gmail.com>
Date: Fri, 4 Mar 2022 05:05:51 +0530
Subject: [PATCH 081/811] docs: Updated list numbering (#32991)

* docs: Updated list numbering

The steps to package and distribute an application using electron had incorrect numbering

* Indented text within ordered list sections

* Removed single space

* Fixed indentation
---
 docs/tutorial/quick-start.md | 86 ++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 91c3317d336d6..d7252ac16bfdc 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -463,46 +463,46 @@ The fastest way to distribute your newly created app is using
 1. Add Electron Forge as a development dependency of your app, and use its `import` command to set up
 Forge's scaffolding:
 
-```sh npm2yarn
-npm install --save-dev @electron-forge/cli
-npx electron-forge import
-
-✔ Checking your system
-✔ Initializing Git Repository
-✔ Writing modified package.json file
-✔ Installing dependencies
-✔ Writing modified package.json file
-✔ Fixing .gitignore
-
-We have ATTEMPTED to convert your app to be in a format that electron-forge understands.
-
-Thanks for using "electron-forge"!!!
-```
-
-1. Create a distributable using Forge's `make` command:
-
-```sh npm2yarn
-npm run make
-
-> my-electron-app@1.0.0 make /my-electron-app
-> electron-forge make
-
-✔ Checking your system
-✔ Resolving Forge Config
-We need to package your application before we can make it
-✔ Preparing to Package Application for arch: x64
-✔ Preparing native dependencies
-✔ Packaging Application
-Making for the following targets: zip
-✔ Making for target: zip - On platform: darwin - For arch: x64
-```
-
-Electron Forge creates the `out` folder where your package will be located:
-
-```plain
-// Example for macOS
-out/
-├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
-├── ...
-└── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
-```
+   ```sh npm2yarn
+   npm install --save-dev @electron-forge/cli
+   npx electron-forge import
+
+   ✔ Checking your system
+   ✔ Initializing Git Repository
+   ✔ Writing modified package.json file
+   ✔ Installing dependencies
+   ✔ Writing modified package.json file
+   ✔ Fixing .gitignore
+
+   We have ATTEMPTED to convert your app to be in a format that electron-forge understands.
+
+   Thanks for using "electron-forge"!!!
+   ```
+
+2. Create a distributable using Forge's `make` command:
+
+   ```sh npm2yarn
+   npm run make
+
+   > my-electron-app@1.0.0 make /my-electron-app
+   > electron-forge make
+
+   ✔ Checking your system
+   ✔ Resolving Forge Config
+   We need to package your application before we can make it
+   ✔ Preparing to Package Application for arch: x64
+   ✔ Preparing native dependencies
+   ✔ Packaging Application
+   Making for the following targets: zip
+   ✔ Making for target: zip - On platform: darwin - For arch: x64
+   ```
+
+   Electron Forge creates the `out` folder where your package will be located:
+
+   ```plain
+   // Example for macOS
+   out/
+   ├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
+   ├── ...
+   └── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
+   ```

From 3663f8e0ae8f4f4a7a4825f5cde48ad96791f27b Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Thu, 3 Mar 2022 16:57:21 -0800
Subject: [PATCH 082/811] ci: use larger machine for docs only check (#33141)

---
 .circleci/build_config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 6e6dd01cb720a..0175d1fd97e90 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -1552,11 +1552,9 @@ commands:
 jobs:
   # Layer 0: Docs. Standalone.
   ts-compile-doc-change:
-    executor:
-      name: linux-docker
-      size: medium
+    executor: linux-docker
     environment:
-      <<: *env-linux-medium
+      <<: *env-linux-2xlarge
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-ts-compile-for-doc-change

From 7beffb51fc984a68018ba454434871b939d7ea65 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Sat, 5 Mar 2022 15:55:12 -0800
Subject: [PATCH 083/811] Revert "Bump v19.0.0-nightly.20220303"

This reverts commit 89725f31bf014dfc076d7df1083c8875d7914a70.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3ad593042d37d..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220303
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index 3206ab236ea60..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220303",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index fd2efd8528395..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220303
- PRODUCTVERSION 19,0,0,20220303
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b43f7702c8acf15051b9745efd72bcfdb897fcd2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 05:01:43 -0800
Subject: [PATCH 084/811] Bump v19.0.0-nightly.20220307

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..2a242a4934c89 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220307
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..b7620087e0bad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220307",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..edb1d40954d8e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220307
+ PRODUCTVERSION 19,0,0,20220307
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f45aaea537411c124b8f8a782d335633d08b2137 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 7 Mar 2022 06:18:58 -0800
Subject: [PATCH 085/811] test: disable newly added tests on WOA (#33143)

* tests: disable newly added tests on WOA

* test: also disable test on arm64 macOS
---
 spec-main/api-browser-window-spec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 8c9c45e60282b..1e9405e0aa3c8 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4874,8 +4874,8 @@ describe('BrowserWindow module', () => {
       expect(w.getBounds()).to.deep.equal(newBounds);
     });
 
-    // Linux doesn't return any capture sources.
-    ifit(process.platform !== 'linux')('should not display a visible background', async () => {
+    // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
+    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('should not display a visible background', async () => {
       const display = screen.getPrimaryDisplay();
 
       const backgroundWindow = new BrowserWindow({
@@ -4916,8 +4916,8 @@ describe('BrowserWindow module', () => {
   describe('"backgroundColor" option', () => {
     afterEach(closeAllWindows);
 
-    // Linux doesn't return any capture sources.
-    ifit(process.platform !== 'linux')('should display the set color', async () => {
+    // Linux/WOA doesn't return any capture sources.
+    ifit(process.platform !== 'linux' && (process.platform !== 'win32' || process.arch !== 'arm64'))('should display the set color', async () => {
       const display = screen.getPrimaryDisplay();
 
       const w = new BrowserWindow({

From 94a85cb191a4a4a3e3c91de35e88322b1d72deab Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 09:23:13 -0800
Subject: [PATCH 086/811] Revert "Bump v19.0.0-nightly.20220307"

This reverts commit b43f7702c8acf15051b9745efd72bcfdb897fcd2.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 2a242a4934c89..a6a5f8ce0ccfc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220307
\ No newline at end of file
+19.0.0-nightly.20220224
\ No newline at end of file
diff --git a/package.json b/package.json
index b7620087e0bad..7a4f69d852f58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220307",
+  "version": "19.0.0-nightly.20220224",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index edb1d40954d8e..d08e9317043cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220307
- PRODUCTVERSION 19,0,0,20220307
+ FILEVERSION 19,0,0,20220224
+ PRODUCTVERSION 19,0,0,20220224
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a1c01ded9c988c082ec51bc76a33b547216e39e3 Mon Sep 17 00:00:00 2001
From: Micha Hanselmann <micha.hanselmann@gmail.com>
Date: Mon, 7 Mar 2022 11:49:50 -0800
Subject: [PATCH 087/811] fix: really strip crashpad handler binary (#33126)

---
 script/lib/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lib/config.py b/script/lib/config.py
index 67eed8ddb10f0..9ef44a43fe3d9 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -15,7 +15,7 @@
 
 LINUX_BINARIES = [
   'chrome-sandbox',
-  'crashpad_handler',
+  'chrome_crashpad_handler',
   'electron',
   'libEGL.so',
   'libGLESv2.so',

From 0ff1727ec09003fced33dad2e2e3145bd8ece79e Mon Sep 17 00:00:00 2001
From: Chuion <71601036+chuion@users.noreply.github.com>
Date: Tue, 8 Mar 2022 06:04:58 +0800
Subject: [PATCH 088/811] docs: fix missing dependencies in ipc patterns
 (#33082)

---
 docs/fiddles/ipc/pattern-2/main.js | 2 +-
 docs/fiddles/ipc/pattern-3/main.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/fiddles/ipc/pattern-2/main.js b/docs/fiddles/ipc/pattern-2/main.js
index 743c7c4d2d312..5492a7d159297 100644
--- a/docs/fiddles/ipc/pattern-2/main.js
+++ b/docs/fiddles/ipc/pattern-2/main.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow, ipcMain,dialog} = require('electron')
+const {app, BrowserWindow, ipcMain, dialog} = require('electron')
 const path = require('path')
 
 async function handleFileOpen() {
diff --git a/docs/fiddles/ipc/pattern-3/main.js b/docs/fiddles/ipc/pattern-3/main.js
index 13d7a1ab60cfb..357aa64e0fb43 100644
--- a/docs/fiddles/ipc/pattern-3/main.js
+++ b/docs/fiddles/ipc/pattern-3/main.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow, Menu} = require('electron')
+const {app, BrowserWindow, Menu, ipcMain} = require('electron')
 const path = require('path')
 
 function createWindow () {

From 12aa991df2acd9e62f5c17325e5e81fa6dfffd74 Mon Sep 17 00:00:00 2001
From: Makonede <61922615+Makonede@users.noreply.github.com>
Date: Mon, 7 Mar 2022 14:17:12 -0800
Subject: [PATCH 089/811] Fix a typo (#33042)

---
 docs/api/browser-window.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 140eaaa2284a0..bc407ede48021 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -64,7 +64,7 @@ win.loadURL('https://github.com')
 ```
 
 Note that even for apps that use `ready-to-show` event, it is still recommended
-to set `backgroundColor` to make app feel more native.
+to set `backgroundColor` to make the app feel more native.
 
 ## Parent and child windows
 

From 3d9b9b97cfcfe34411e359d504e9b8a772622d56 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 7 Mar 2022 15:47:58 -0800
Subject: [PATCH 090/811] build: put v8_context_snapshot_generator.dSYM in its
 own zip file (#33183)

---
 script/release/release.js          | 4 ++++
 script/release/uploaders/upload.py | 7 ++++++-
 script/zip-symbols.py              | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/script/release/release.js b/script/release/release.js
index e10311e4faa8d..3527f39ce2bd3 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -107,9 +107,11 @@ function assetsForVersion (version, validatingRelease) {
     `chromedriver-${version}-win32-x64.zip`,
     `chromedriver-${version}-win32-arm64.zip`,
     `electron-${version}-darwin-x64-dsym.zip`,
+    `electron-${version}-darwin-x64-dsym-snapshot.zip`,
     `electron-${version}-darwin-x64-symbols.zip`,
     `electron-${version}-darwin-x64.zip`,
     `electron-${version}-darwin-arm64-dsym.zip`,
+    `electron-${version}-darwin-arm64-dsym-snapshot.zip`,
     `electron-${version}-darwin-arm64-symbols.zip`,
     `electron-${version}-darwin-arm64.zip`,
     `electron-${version}-linux-arm64-symbols.zip`,
@@ -122,9 +124,11 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-linux-x64-symbols.zip`,
     `electron-${version}-linux-x64.zip`,
     `electron-${version}-mas-x64-dsym.zip`,
+    `electron-${version}-mas-x64-dsym-snapshot.zip`,
     `electron-${version}-mas-x64-symbols.zip`,
     `electron-${version}-mas-x64.zip`,
     `electron-${version}-mas-arm64-dsym.zip`,
+    `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
     `electron-${version}-win32-ia32-pdb.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index b021f91dadf9d..8b86a1d4884ea 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -33,6 +33,8 @@
 DIST_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
 SYMBOLS_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
 DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
+DSYM_SNAPSHOT_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
+                                  'dsym-snapshot')
 PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
 DEBUG_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'debug')
 TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
@@ -88,6 +90,10 @@ def main():
     dsym_zip = os.path.join(OUT_DIR, DSYM_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
+
+    dsym_snaphot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
+    upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
     pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
@@ -154,7 +160,6 @@ def main():
         'toolchain_profile.json')
     upload_electron(release, toolchain_profile_zip, args)
 
-
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
   parser.add_argument('-v', '--version', help='Specify the version',
diff --git a/script/zip-symbols.py b/script/zip-symbols.py
index 99ce7f6b52baa..23521e823053f 100755
--- a/script/zip-symbols.py
+++ b/script/zip-symbols.py
@@ -33,9 +33,17 @@ def main():
     dsym_name = 'dsym.zip'
     with scoped_cwd(args.build_dir):
       dsyms = glob.glob('*.dSYM')
+      snapshot_dsyms = ['v8_context_snapshot_generator.dSYM']
+      for dsym in snapshot_dsyms:
+        if (dsym in dsyms):
+          dsyms.remove(dsym)
       dsym_zip_file = os.path.join(args.build_dir, dsym_name)
       print('Making dsym zip: ' + dsym_zip_file)
       make_zip(dsym_zip_file, licenses, dsyms)
+      dsym_snapshot_name = 'dsym-snapshot.zip'
+      dsym_snapshot_zip_file = os.path.join(args.build_dir, dsym_snapshot_name)
+      print('Making dsym snapshot zip: ' + dsym_snapshot_zip_file)
+      make_zip(dsym_snapshot_zip_file, licenses, snapshot_dsyms)
       if len(dsyms) > 0 and 'DELETE_DSYMS_AFTER_ZIP' in os.environ:
         execute(['rm', '-rf'] + dsyms)
   elif PLATFORM == 'win32':

From aa8119515f87d87716345cf454da5113e700ab69 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 7 Mar 2022 16:52:40 -0800
Subject: [PATCH 091/811] fix: gracefully fail if app.configureHostResolver is
 called before ready (#33062)

---
 shell/browser/api/electron_api_app.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index d2de05d363ff2..bcc96086557f8 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -1630,6 +1630,11 @@ v8::Local<v8::Value> App::GetDockAPI(v8::Isolate* isolate) {
 void ConfigureHostResolver(v8::Isolate* isolate,
                            const gin_helper::Dictionary& opts) {
   gin_helper::ErrorThrower thrower(isolate);
+  if (!Browser::Get()->is_ready()) {
+    thrower.ThrowError(
+        "configureHostResolver cannot be called before the app is ready");
+    return;
+  }
   net::SecureDnsMode secure_dns_mode = net::SecureDnsMode::kOff;
   std::string default_doh_templates;
   if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {

From a5a4818b67174e91860b36aa717ee63d6058fb64 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 7 Mar 2022 18:40:28 -0800
Subject: [PATCH 092/811] chore: add ignore revs file for GH blame UI (#33171)

---
 .git-blame-ignore-revs | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000..198363a8ae8fb
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,5 @@
+# Atom --> Electron rename
+d9321f4df751fa32813fab1b6387bbd61bd681d0
+34c4c8d5088fa183f56baea28809de6f2a427e02
+# Enable JS Semicolons
+5d657dece4102e5e5304d42e8004b6ad64c0fcda

From a20216de7a1fe71057862aa429484e5f8af35537 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Mar 2022 05:01:16 -0800
Subject: [PATCH 093/811] Bump v19.0.0-nightly.20220308

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a6a5f8ce0ccfc..49ae2ccc9e679 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220224
\ No newline at end of file
+19.0.0-nightly.20220308
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a4f69d852f58..7012c583db14e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220224",
+  "version": "19.0.0-nightly.20220308",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d08e9317043cd..8d84f50990408 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220224
- PRODUCTVERSION 19,0,0,20220224
+ FILEVERSION 19,0,0,20220308
+ PRODUCTVERSION 19,0,0,20220308
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3bc3896ee75df30883be05e064d6cbd7d74dd609 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevin@rstudio.com>
Date: Tue, 8 Mar 2022 11:15:05 -0800
Subject: [PATCH 094/811] docs: fix documented return value for
 getFocusedWebContents (#33170)

---
 docs/api/web-contents.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index d4a1233c5976a..64af596682384 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -35,7 +35,7 @@ for all windows, webviews, opened devtools, and devtools extension background pa
 
 ### `webContents.getFocusedWebContents()`
 
-Returns `WebContents` - The web contents that is focused in this application, otherwise
+Returns `WebContents` | null - The web contents that is focused in this application, otherwise
 returns `null`.
 
 ### `webContents.fromId(id)`

From b96f15bfc262edd88d5df8c3684484c894d08ce5 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 8 Mar 2022 20:38:15 +0100
Subject: [PATCH 095/811] fix: patches to use BUILDFLAG(IS_WIN) /
 BUILDFLAG(IS_MAC) checks (#33160)

---
 ...ransfer_to_requestsingleinstancelock.patch |  6 +++---
 ...screen_rendering_with_viz_compositor.patch | 20 ++++++++++---------
 ...media_key_usage_with_globalshortcuts.patch |  6 +++---
 patches/chromium/process_singleton.patch      | 10 +++++-----
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index fd11a39b225c8..a609f4e83a6de 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -19,7 +19,7 @@ instance, but also so the second instance can send back additional
 data to the first instance if needed.
 
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 8f94cc300b58e8a94b6ca155aa3cf370bcb948d8..4340376f323d24e5e2c5897a81c6a9ebf13adab4 100644
+index 5a64220aaf1309832dc0ad543e353de67fe0a779..a568dd10d1ef8679d66f4cdc6a471c251cbcd4eb 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -18,6 +18,7 @@
@@ -49,7 +49,7 @@ index 8f94cc300b58e8a94b6ca155aa3cf370bcb948d8..4340376f323d24e5e2c5897a81c6a9eb
 +                                   const std::vector<const uint8_t> additional_data,
 +                                   const NotificationAckCallback& ack_callback)>;
  
- #if defined(OS_WIN)
+ #if BUILDFLAG(IS_WIN)
    ProcessSingleton(const std::string& program_name,
                     const base::FilePath& user_data_dir,
 +                   const base::span<const uint8_t> additional_data,
@@ -96,7 +96,7 @@ index 8f94cc300b58e8a94b6ca155aa3cf370bcb948d8..4340376f323d24e5e2c5897a81c6a9eb
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 47e60bfd8239d4a2e292b835c49132bdbb751555..9861a884a15e79b36833e6df58897141acdc6718 100644
+index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65ddbfc332 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -148,7 +148,7 @@ const char kACKToken[] = "ACK";
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index d2675bfa80b29..231ad6fe4f48e 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -226,10 +226,10 @@ index a480befb5d8db36e7e281d5033aeef0bea83d220..4e54acc897d08c87bccc3b44f68634e2
  
 diff --git a/components/viz/service/display_embedder/software_output_device_proxy.cc b/components/viz/service/display_embedder/software_output_device_proxy.cc
 new file mode 100644
-index 0000000000000000000000000000000000000000..4efea02f80f8b6818291321a7c63f0f4815a5b98
+index 0000000000000000000000000000000000000000..88aba74877a6490e08e357266b1ce8461b5b6dff
 --- /dev/null
 +++ b/components/viz/service/display_embedder/software_output_device_proxy.cc
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,158 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -239,6 +239,7 @@ index 0000000000000000000000000000000000000000..4efea02f80f8b6818291321a7c63f0f4
 +#include "base/memory/unsafe_shared_memory_region.h"
 +#include "base/threading/thread_checker.h"
 +#include "base/trace_event/trace_event.h"
++#include "build/build_config.h"
 +#include "components/viz/common/resources/resource_sizes.h"
 +#include "components/viz/service/display_embedder/output_device_backing.h"
 +#include "mojo/public/cpp/system/platform_handle.h"
@@ -247,7 +248,7 @@ index 0000000000000000000000000000000000000000..4efea02f80f8b6818291321a7c63f0f4
 +#include "third_party/skia/include/core/SkCanvas.h"
 +#include "ui/gfx/skia_util.h"
 +
-+#if defined(OS_WIN)
++#if BUILDFLAG(IS_WIN)
 +#include "skia/ext/skia_utils_win.h"
 +#include "ui/gfx/gdi_util.h"
 +#include "ui/gfx/win/hwnd_util.h"
@@ -389,10 +390,10 @@ index 0000000000000000000000000000000000000000..4efea02f80f8b6818291321a7c63f0f4
 +}  // namespace viz
 diff --git a/components/viz/service/display_embedder/software_output_device_proxy.h b/components/viz/service/display_embedder/software_output_device_proxy.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..fbc517e164d9bf33256c1ecbe86e31744375097e
+index 0000000000000000000000000000000000000000..a80258d6165e45a3c3d2b551158ff7d2a5778a7c
 --- /dev/null
 +++ b/components/viz/service/display_embedder/software_output_device_proxy.h
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,93 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -400,20 +401,21 @@ index 0000000000000000000000000000000000000000..fbc517e164d9bf33256c1ecbe86e3174
 +#ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_
 +#define COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_
 +
-+#if defined(OS_WIN)
-+#include <windows.h>
-+#endif
-+
 +#include <memory>
 +
 +#include "base/memory/shared_memory_mapping.h"
 +#include "base/threading/thread_checker.h"
++#include "build/build_config.h"
 +#include "components/viz/host/host_display_client.h"
 +#include "components/viz/service/display/software_output_device.h"
 +#include "components/viz/service/viz_service_export.h"
 +#include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
 +#include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
 +
++#if BUILDFLAG(IS_WIN)
++#include <windows.h>
++#endif
++
 +namespace viz {
 +
 +// Shared base class for SoftwareOutputDevice implementations.
diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
index 2986f58de269f..7460a09ea3beb 100644
--- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
+++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
@@ -59,7 +59,7 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
    // true if register successfully, or false if 1) the specificied |accelerator|
    // has been registered by another caller or other native applications, or
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index ac923f436cbdd6ded0629da4e4c659d94258e55b..7e603dd5bad2a60b1bd7d9df569a10e838d797bc 100644
+index ac923f436cbdd6ded0629da4e4c659d94258e55b..43f9531075bcef87de8e60f24071f49fe4cd0891 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
 @@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
@@ -68,9 +68,9 @@ index ac923f436cbdd6ded0629da4e4c659d94258e55b..7e603dd5bad2a60b1bd7d9df569a10e8
    // Tell the underlying MediaKeysListener to listen for the key.
 -  if (should_start_watching && media_keys_listener_ &&
 +  if (
-+#if defined(OS_MAC)
++#if BUILDFLAG(IS_MAC)
 +      !media_key_handling_enabled_ &&
-+#endif  // defined(OS_MAC)
++#endif  // BUILDFLAG(IS_MAC)
 +      should_start_watching &&
 +      media_keys_listener_ &&
        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index 58d5bc201d4af..565c00742ba81 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -24,14 +24,14 @@ This patch adds a few changes to the Chromium code:
    before the browser thread is ready.
 
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..8f94cc300b58e8a94b6ca155aa3cf370bcb948d8 100644
+index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de67fe0a779 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -102,12 +102,19 @@ class ProcessSingleton {
        base::RepeatingCallback<bool(const base::CommandLine& command_line,
                                     const base::FilePath& current_directory)>;
  
-+#if defined(OS_WIN)
++#if BUILDFLAG(IS_WIN)
 +  ProcessSingleton(const std::string& program_name,
 +                   const base::FilePath& user_data_dir,
 +                   bool is_sandboxed,
@@ -75,7 +75,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..8f94cc300b58e8a94b6ca155aa3cf370
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index c9f26ea2d2ea16484d416fdce095ec1b8b885991..47e60bfd8239d4a2e292b835c49132bdbb751555 100644
+index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -53,6 +53,7 @@
@@ -129,7 +129,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..47e60bfd8239d4a2e292b835c49132bd
  }
  
 +bool IsAppSandboxed() {
-+#if defined(OS_MAC)
++#if BUILDFLAG(IS_MAC)
 +  // NB: There is no sane API for this, we have to just guess by
 +  // reading tea leaves
 +  base::FilePath home_dir;
@@ -140,7 +140,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..47e60bfd8239d4a2e292b835c49132bd
 +  return home_dir.value().find("Library/Containers") != std::string::npos;
 +#else
 +  return false;
-+#endif  // defined(OS_MAC)
++#endif  // BUILDFLAG(IS_MAC)
 +}
 +
  bool ConnectSocket(ScopedSocket* socket,

From 076bc58b2a15ff18ab07d67e23864aa7b4a4a9eb Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 8 Mar 2022 11:40:25 -0800
Subject: [PATCH 096/811] fix: crash when showin item in folder on DevTools
 (#33024)

---
 shell/browser/ui/inspectable_web_contents.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index b7e939c35d45f..150b2fcba242c 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -175,6 +175,10 @@ GURL GetDevToolsURL(bool can_dock) {
   return GURL(url_string);
 }
 
+void OnOpenItemComplete(const base::FilePath& path, const std::string& result) {
+  platform_util::ShowItemInFolder(path);
+}
+
 constexpr base::TimeDelta kInitialBackoffDelay = base::Milliseconds(250);
 constexpr base::TimeDelta kMaxBackoffDelay = base::Seconds(10);
 
@@ -737,9 +741,8 @@ void InspectableWebContents::ShowItemInFolder(
     return;
 
   base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
-
-  // Pass empty callback here; we can ignore errors
-  platform_util::OpenPath(path, platform_util::OpenCallback());
+  platform_util::OpenPath(path.DirName(),
+                          base::BindOnce(&OnOpenItemComplete, path));
 }
 
 void InspectableWebContents::SaveToFile(const std::string& url,

From e41c3e960dd3a53c1f423c746b7079abb4359841 Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Tue, 8 Mar 2022 14:06:20 -0700
Subject: [PATCH 097/811] fix: non-client mouse events on WCO-enabled windows
 (#32871)

---
 patches/chromium/.patches                     |  1 +
 ...king_and_message_bubbling_on_windows.patch | 61 +++++++++++++++++++
 .../electron_desktop_window_tree_host_win.cc  | 17 ------
 .../electron_desktop_window_tree_host_win.h   |  1 -
 4 files changed, 62 insertions(+), 18 deletions(-)
 create mode 100644 patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 995bb12ffa7c7..545165e4e06ad 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -113,3 +113,4 @@ fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
 build_disable_thin_lto_on_mac.patch
+fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
diff --git a/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
new file mode 100644
index 0000000000000..86a3c0fbc97be
--- /dev/null
+++ b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: clavin <cwatford@slack-corp.com>
+Date: Fri, 11 Feb 2022 15:05:42 -0700
+Subject: fix: non-client mouse tracking and message bubbling on windows
+
+It is not known why, but for some reason calling |DefWindowProc| on the parent
+window handle causes a WM_NCMOUSELEAVE (non-client mouse exit) message to be
+sent to the parent window, even though |TrackMouseEvent| is never called on it.
+
+This patch also adds some boilerplate for properly tracking non-client mouse
+messages in the legacy window handle layer.
+
+These conditions are regularly hit with WCO-enabled windows on Windows.
+
+diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.cc b/content/browser/renderer_host/legacy_render_widget_host_win.cc
+index 4a894ef70eeb1d8489049aef552c9bae4f24ae62..f5049d730a850f2947023f976b25fb772e42107a 100644
+--- a/content/browser/renderer_host/legacy_render_widget_host_win.cc
++++ b/content/browser/renderer_host/legacy_render_widget_host_win.cc
+@@ -288,12 +288,12 @@ LRESULT LegacyRenderWidgetHostHWND::OnMouseRange(UINT message,
+                                                  WPARAM w_param,
+                                                  LPARAM l_param,
+                                                  BOOL& handled) {
+-  if (message == WM_MOUSEMOVE) {
++  if (message == WM_MOUSEMOVE || message == WM_NCMOUSEMOVE) {
+     if (!mouse_tracking_enabled_) {
+       mouse_tracking_enabled_ = true;
+       TRACKMOUSEEVENT tme;
+       tme.cbSize = sizeof(tme);
+-      tme.dwFlags = TME_LEAVE;
++      tme.dwFlags = message == WM_NCMOUSEMOVE ? TME_NONCLIENT | TME_LEAVE : TME_LEAVE;
+       tme.hwndTrack = hwnd();
+       tme.dwHoverTime = 0;
+       TrackMouseEvent(&tme);
+@@ -319,12 +319,11 @@ LRESULT LegacyRenderWidgetHostHWND::OnMouseRange(UINT message,
+         message, w_param, l_param, &msg_handled);
+     handled = msg_handled;
+     // If the parent did not handle non client mouse messages, we call
+-    // DefWindowProc on the message with the parent window handle. This
+-    // ensures that WM_SYSCOMMAND is generated for the parent and we are
+-    // out of the picture.
++    // DefWindowProc on the message. This ensures that WM_SYSCOMMAND is
++    // generated.
+     if (!handled &&
+          (message >= WM_NCMOUSEMOVE && message <= WM_NCXBUTTONDBLCLK)) {
+-      ret = ::DefWindowProc(GetParent(), message, w_param, l_param);
++      ret = ::DefWindowProc(hwnd(), message, w_param, l_param);
+       handled = TRUE;
+     }
+   }
+diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.h b/content/browser/renderer_host/legacy_render_widget_host_win.h
+index 79dffd981f4d461f30bd3796cfba1457eda3a89d..ae378ce95f90989fd0e74c38b57f5f7dc0a1ee29 100644
+--- a/content/browser/renderer_host/legacy_render_widget_host_win.h
++++ b/content/browser/renderer_host/legacy_render_widget_host_win.h
+@@ -105,6 +105,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
+     MESSAGE_HANDLER_EX(WM_NCHITTEST, OnNCHitTest)
+     MESSAGE_RANGE_HANDLER(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK,
+                           OnMouseRange)
++    MESSAGE_HANDLER_EX(WM_NCMOUSELEAVE, OnMouseLeave)
+     MESSAGE_HANDLER_EX(WM_NCCALCSIZE, OnNCCalcSize)
+     MESSAGE_HANDLER_EX(WM_SIZE, OnSize)
+     MESSAGE_HANDLER_EX(WM_DESTROY, OnDestroy)
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 3600e273ea73b..2e4e5bc9502e4 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -99,21 +99,4 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
   return false;
 }
 
-bool ElectronDesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
-  // Call the default implementation of this method to get the event to its
-  // proper handler.
-  bool handled = views::DesktopWindowTreeHostWin::HandleMouseEvent(event);
-
-  // On WCO-enabled windows, we need to mark non-client mouse moved events as
-  // handled so they don't incorrectly propogate back to the OS.
-  if (native_window_view_->IsWindowControlsOverlayEnabled() &&
-      event->type() == ui::ET_MOUSE_MOVED &&
-      (event->flags() & ui::EF_IS_NON_CLIENT) != 0) {
-    event->SetHandled();
-    handled = true;
-  }
-
-  return handled;
-}
-
 }  // namespace electron
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
index 8c7be1175a193..3fd831aae1ed0 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
@@ -36,7 +36,6 @@ class ElectronDesktopWindowTreeHostWin
   bool GetDwmFrameInsetsInPixels(gfx::Insets* insets) const override;
   bool GetClientAreaInsets(gfx::Insets* insets,
                            HMONITOR monitor) const override;
-  bool HandleMouseEvent(ui::MouseEvent* event) override;
 
  private:
   NativeWindowViews* native_window_view_;  // weak ref

From 27527fe5ca790dc7061c6e816cc8b6ff72fe56d0 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 8 Mar 2022 15:39:53 -0800
Subject: [PATCH 098/811] feat: warn that preloads will be sandboxed by default
 in v20 (#32868)

---
 docs/breaking-changes.md        | 19 +++++++++++++++++++
 lib/browser/api/web-contents.ts |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index e603146d0372e..6d561f87bd75e 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -12,6 +12,25 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
+## Planned Breaking API Changes (20.0)
+
+### Default Changed: renderers without `nodeIntegration: true` are sandboxed by default
+
+Previously, renderers that specified a preload script defaulted to being
+unsandboxed. This meant that by default, preload scripts had access to Node.js.
+In Electron 20, this default has changed. Beginning in Electron 20, renderers
+will be sandboxed by default, unless `nodeIntegration: true` or `sandbox: false`
+is specified.
+
+If your preload scripts do not depend on Node, no action is needed. If your
+preload scripts _do_ depend on Node, either refactor them to remove Node usage
+from the renderer, or explicitly specify `sandbox: false` for the relevant
+renderers.
+
+## Planned Breaking API Changes (19.0)
+
+*None (yet)*
+
 ## Planned Breaking API Changes (18.0)
 
 ### Removed: `nativeWindowOpen`
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 4e2cd4acbda74..cafe85cae4364 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -1,4 +1,4 @@
-import { app, ipcMain, session, webFrameMain } from 'electron/main';
+import { app, ipcMain, session, webFrameMain, deprecate } from 'electron/main';
 import type { BrowserWindowConstructorOptions, LoadURLOptions } from 'electron/main';
 
 import * as url from 'url';
@@ -570,6 +570,10 @@ const loggingEnabled = () => {
 
 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
+  const prefs = this.getLastWebPreferences() || {};
+  if (!prefs.nodeIntegration && (prefs.preload != null || prefs.preloadURL != null) && prefs.sandbox == null) {
+    deprecate.log('The default sandbox option for windows without nodeIntegration is changing. Presently, by default, when a window has a preload script, it defaults to being unsandboxed. In Electron 20, this default will be changing, and all windows that have nodeIntegration: false (which is the default) will be sandboxed by default. If your preload script doesn\'t use Node, no action is needed. If your preload script does use Node, either refactor it to move Node usage to the main process, or specify sandbox: false in your WebPreferences.');
+  }
   // Read off the ID at construction time, so that it's accessible even after
   // the underlying C++ WebContents is destroyed.
   const id = this.id;

From 373a9053199f8881cdec7d44b8f3524d68ae8223 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 8 Mar 2022 17:17:43 -0800
Subject: [PATCH 099/811] fix: settings not persisting across devtools loads
 (#33120)

* fix: settings not persisting across devtools loads

* chore: remove redundant RegisterPreference impl
---
 shell/browser/ui/inspectable_web_contents.cc | 119 +------------------
 shell/browser/ui/inspectable_web_contents.h  |   5 +-
 2 files changed, 5 insertions(+), 119 deletions(-)

diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index 150b2fcba242c..4779ee6c77f1e 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -86,13 +86,6 @@ const char kChromeUIDevToolsRemoteFrontendPath[] = "serve_file";
 const char kDevToolsBoundsPref[] = "electron.devtools.bounds";
 const char kDevToolsZoomPref[] = "electron.devtools.zoom";
 const char kDevToolsPreferences[] = "electron.devtools.preferences";
-const char kDevToolsSyncPreferences[] = "electron.devtools.sync_preferences";
-const char kDevToolsSyncedPreferencesSyncEnabled[] =
-    "electron.devtools.synced_preferences_sync_enabled";
-const char kDevToolsSyncedPreferencesSyncDisabled[] =
-    "electron.devtools.synced_preferences_sync_disabled";
-const char kSyncDevToolsPreferencesFrontendName[] = "electron.sync_preferences";
-const bool kSyncDevToolsPreferencesDefault = false;
 
 const char kFrontendHostId[] = "id";
 const char kFrontendHostMethod[] = "method";
@@ -346,10 +339,6 @@ void InspectableWebContents::RegisterPrefs(PrefRegistrySimple* registry) {
                                    RectToDictionary(gfx::Rect(0, 0, 800, 600)));
   registry->RegisterDoublePref(kDevToolsZoomPref, 0.);
   registry->RegisterDictionaryPref(kDevToolsPreferences);
-  registry->RegisterDictionaryPref(kDevToolsSyncedPreferencesSyncEnabled);
-  registry->RegisterDictionaryPref(kDevToolsSyncedPreferencesSyncDisabled);
-  registry->RegisterBooleanPref(kDevToolsSyncPreferences,
-                                kSyncDevToolsPreferencesDefault);
 }
 
 InspectableWebContents::InspectableWebContents(
@@ -867,85 +856,19 @@ void InspectableWebContents::SendJsonRequest(DispatchCallback callback,
   std::move(callback).Run(nullptr);
 }
 
-void InspectableWebContents::RegisterPreference(
-    const std::string& name,
-    const RegisterOptions& options) {
-  // kSyncDevToolsPreferenceFrontendName is not stored in any of the relevant
-  // dictionaries. Skip registration.
-  if (name == kSyncDevToolsPreferencesFrontendName)
-    return;
-
-  if (options.sync_mode == RegisterOptions::SyncMode::kSync) {
-    synced_setting_names_.insert(name);
-  }
-
-  // Setting might have had a different sync status in the past. Move the
-  // setting to the correct dictionary.
-  const char* dictionary_to_remove_from =
-      options.sync_mode == RegisterOptions::SyncMode::kSync
-          ? kDevToolsPreferences
-          : GetDictionaryNameForSyncedPrefs();
-  const std::string* settings_value =
-      pref_service_->GetDictionary(dictionary_to_remove_from)
-          ->FindStringKey(name);
-  if (!settings_value) {
-    return;
-  }
-
-  const char* dictionary_to_insert_into =
-      GetDictionaryNameForSettingsName(name);
-  // Settings already moved to the synced dictionary on a different device have
-  // precedence.
-  const std::string* already_synced_value =
-      pref_service_->GetDictionary(dictionary_to_insert_into)
-          ->FindStringKey(name);
-  if (dictionary_to_insert_into == kDevToolsPreferences ||
-      !already_synced_value) {
-    DictionaryPrefUpdate insert_update(pref_service_,
-                                       dictionary_to_insert_into);
-    insert_update.Get()->SetKey(name, base::Value(*settings_value));
-  }
-
-  DictionaryPrefUpdate remove_update(pref_service_, dictionary_to_remove_from);
-  remove_update.Get()->RemoveKey(name);
-}
-
 void InspectableWebContents::GetPreferences(DispatchCallback callback) {
-  base::Value settings(base::Value::Type::DICTIONARY);
-  settings.SetBoolKey(kSyncDevToolsPreferencesFrontendName,
-                      pref_service_->GetBoolean(kDevToolsSyncPreferences));
-  settings.MergeDictionary(pref_service_->GetDictionary(kDevToolsPreferences));
-  settings.MergeDictionary(
-      pref_service_->GetDictionary(GetDictionaryNameForSyncedPrefs()));
-
-  std::move(callback).Run(&settings);
+  const base::Value* prefs = pref_service_->GetDictionary(kDevToolsPreferences);
+  std::move(callback).Run(prefs);
 }
 
 void InspectableWebContents::GetPreference(DispatchCallback callback,
                                            const std::string& name) {
-  // Handle kSyncDevToolsPreferencesFrontendName
-  if (name == kSyncDevToolsPreferencesFrontendName) {
-    base::Value pref =
-        base::Value(pref_service_->GetBoolean(kDevToolsSyncPreferences));
-    std::move(callback).Run(&pref);
-    return;
-  }
-
-  // Check dev tools prefs
   if (auto* pref =
           pref_service_->GetDictionary(kDevToolsPreferences)->FindKey(name)) {
     std::move(callback).Run(pref);
     return;
   }
 
-  // Check synced prefs
-  if (auto* pref =
-          pref_service_->GetDictionary(GetDictionaryNameForSyncedPrefs())
-              ->FindKey(name)) {
-    std::move(callback).Run(pref);
-    return;
-  }
-
   // Pref wasn't found, return an empty value
   base::Value no_pref;
   std::move(callback).Run(&no_pref);
@@ -953,41 +876,21 @@ void InspectableWebContents::GetPreference(DispatchCallback callback,
 
 void InspectableWebContents::SetPreference(const std::string& name,
                                            const std::string& value) {
-  if (name == kSyncDevToolsPreferencesFrontendName) {
-    pref_service_->SetBoolean(kDevToolsSyncPreferences, value == "true");
-    return;
-  }
-  DictionaryPrefUpdate update(pref_service_,
-                              GetDictionaryNameForSettingsName(name));
+  DictionaryPrefUpdate update(pref_service_, kDevToolsPreferences);
   update.Get()->SetKey(name, base::Value(value));
 }
 
 void InspectableWebContents::RemovePreference(const std::string& name) {
-  if (name == kSyncDevToolsPreferencesFrontendName) {
-    pref_service_->SetBoolean(kDevToolsSyncPreferences,
-                              kSyncDevToolsPreferencesDefault);
-    return;
-  }
-  DictionaryPrefUpdate update(pref_service_,
-                              GetDictionaryNameForSettingsName(name));
+  DictionaryPrefUpdate update(pref_service_, kDevToolsPreferences);
   update.Get()->RemoveKey(name);
 }
 
 void InspectableWebContents::ClearPreferences() {
-  pref_service_->SetBoolean(kDevToolsSyncPreferences,
-                            kSyncDevToolsPreferencesDefault);
   DictionaryPrefUpdate unsynced_update(pref_service_, kDevToolsPreferences);
   unsynced_update.Get()->DictClear();
-  DictionaryPrefUpdate sync_enabled_update(
-      pref_service_, kDevToolsSyncedPreferencesSyncEnabled);
-  sync_enabled_update.Get()->DictClear();
-  DictionaryPrefUpdate sync_disabled_update(
-      pref_service_, kDevToolsSyncedPreferencesSyncDisabled);
-  sync_disabled_update.Get()->DictClear();
 }
 
 void InspectableWebContents::GetSyncInformation(DispatchCallback callback) {
-  // TODO(anyone): do we want devtool syncing in Electron?
   base::Value result(base::Value::Type::DICTIONARY);
   result.SetBoolKey("isSyncActive", false);
   std::move(callback).Run(&result);
@@ -1172,18 +1075,4 @@ void InspectableWebContents::SendMessageAck(int request_id,
   CallClientFunction("DevToolsAPI.embedderMessageAck", &id_value, arg, nullptr);
 }
 
-const char* InspectableWebContents::GetDictionaryNameForSettingsName(
-    const std::string& name) const {
-  return synced_setting_names_.contains(name)
-             ? kDevToolsSyncedPreferencesSyncEnabled
-             : kDevToolsPreferences;
-}
-
-const char* InspectableWebContents::GetDictionaryNameForSyncedPrefs() const {
-  const bool isDevToolsSyncEnabled =
-      pref_service_->GetBoolean(kDevToolsSyncPreferences);
-  return isDevToolsSyncEnabled ? kDevToolsSyncedPreferencesSyncEnabled
-                               : kDevToolsSyncedPreferencesSyncDisabled;
-}
-
 }  // namespace electron
diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
index ba50d83b8aef4..bfc6cbae896d5 100644
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -140,7 +140,7 @@ class InspectableWebContents
                        const std::string& browser_id,
                        const std::string& url) override;
   void RegisterPreference(const std::string& name,
-                          const RegisterOptions& options) override;
+                          const RegisterOptions& options) override {}
   void GetPreferences(DispatchCallback callback) override;
   void GetPreference(DispatchCallback callback,
                      const std::string& name) override;
@@ -198,9 +198,6 @@ class InspectableWebContents
 
   void SendMessageAck(int request_id, const base::Value* arg1);
 
-  const char* GetDictionaryNameForSettingsName(const std::string& name) const;
-  const char* GetDictionaryNameForSyncedPrefs() const;
-
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   void AddDevToolsExtensionsToClient();
 #endif

From 865a29ed17d498335790c2c6998578e1e76c5513 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 9 Mar 2022 05:00:38 -0800
Subject: [PATCH 100/811] Bump v19.0.0-nightly.20220309

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 49ae2ccc9e679..22d94b6c5b151 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220308
\ No newline at end of file
+19.0.0-nightly.20220309
\ No newline at end of file
diff --git a/package.json b/package.json
index 7012c583db14e..1e1905a55217f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220308",
+  "version": "19.0.0-nightly.20220309",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 8d84f50990408..771f39264ebaf 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220308
- PRODUCTVERSION 19,0,0,20220308
+ FILEVERSION 19,0,0,20220309
+ PRODUCTVERSION 19,0,0,20220309
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ebfcf89a0b554804fc8707215752a1130dc10182 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 9 Mar 2022 07:15:50 -0800
Subject: [PATCH 101/811] fix: propagate
 unsafely-treat-insecure-origin-as-secure to renderer children (#33189)

* fix: propagate unsafely-treat-insecure-origin-as-secure to renderer children

* fix build
---
 shell/browser/electron_browser_client.cc | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 096dcabb56c4f..04e31a63b754d 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -21,6 +21,7 @@
 #include "base/no_destructor.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
+#include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -63,6 +64,8 @@
 #include "printing/buildflags/buildflags.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
 #include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/is_potentially_trustworthy.h"
+#include "services/network/public/cpp/network_switches.h"
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "shell/app/electron_crash_reporter_client.h"
@@ -361,6 +364,21 @@ int GetCrashSignalFD(const base::CommandLine& command_line) {
 }
 #endif  // BUILDFLAG(IS_LINUX)
 
+void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
+  // |allowlist| combines pref/policy + cmdline switch in the browser process.
+  // For renderer and utility (e.g. NetworkService) processes the switch is the
+  // only available source, so below the combined (pref/policy + cmdline)
+  // allowlist of secure origins is injected into |cmdline| for these other
+  // processes.
+  std::vector<std::string> allowlist =
+      network::SecureOriginAllowlist::GetInstance().GetCurrentAllowlist();
+  if (!allowlist.empty()) {
+    cmdline->AppendSwitchASCII(
+        network::switches::kUnsafelyTreatInsecureOriginAsSecure,
+        base::JoinString(allowlist, ","));
+  }
+}
+
 }  // namespace
 
 // static
@@ -602,6 +620,10 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
     command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                    kCommonSwitchNames,
                                    base::size(kCommonSwitchNames));
+    if (process_type == ::switches::kUtilityProcess ||
+        content::RenderProcessHost::FromID(process_id)) {
+      MaybeAppendSecureOriginsAllowlistSwitch(command_line);
+    }
   }
 
   if (process_type == ::switches::kRendererProcess) {

From 86e746c36b20c54c8e77d3d65bc9470b247b232c Mon Sep 17 00:00:00 2001
From: Harry Hopkinson <63599884+Harry-Hopkinson@users.noreply.github.com>
Date: Wed, 9 Mar 2022 21:28:54 +0000
Subject: [PATCH 102/811] Formatted C++ Files According to the clang-format
 file. (#33158)

---
 spec-main/fixtures/native-addon/uv-dlopen/foo.cpp  |  3 +--
 spec-main/fixtures/native-addon/uv-dlopen/main.cpp | 12 ++++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spec-main/fixtures/native-addon/uv-dlopen/foo.cpp b/spec-main/fixtures/native-addon/uv-dlopen/foo.cpp
index 00beb974c1a72..7e2438f5006d2 100644
--- a/spec-main/fixtures/native-addon/uv-dlopen/foo.cpp
+++ b/spec-main/fixtures/native-addon/uv-dlopen/foo.cpp
@@ -1,2 +1 @@
-extern "C"
-void foo() { }
\ No newline at end of file
+extern "C" void foo() {}
\ No newline at end of file
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/main.cpp b/spec-main/fixtures/native-addon/uv-dlopen/main.cpp
index 4d34850a6254c..5edef8a0ea627 100644
--- a/spec-main/fixtures/native-addon/uv-dlopen/main.cpp
+++ b/spec-main/fixtures/native-addon/uv-dlopen/main.cpp
@@ -8,22 +8,26 @@ napi_value TestLoadLibrary(napi_env env, napi_callback_info info) {
   napi_value argv;
   napi_status status;
   status = napi_get_cb_info(env, info, &argc, &argv, NULL, NULL);
-  if (status != napi_ok) napi_fatal_error(NULL, 0, NULL, 0);
+  if (status != napi_ok)
+    napi_fatal_error(NULL, 0, NULL, 0);
 
   char lib_path[256];
   status = napi_get_value_string_utf8(env, argv, lib_path, 256, NULL);
-  if (status != napi_ok) napi_fatal_error(NULL, 0, NULL, 0);
+  if (status != napi_ok)
+    napi_fatal_error(NULL, 0, NULL, 0);
 
   uv_lib_t lib;
   auto uv_status = uv_dlopen(lib_path, &lib);
   if (uv_status == 0) {
     napi_value result;
     status = napi_get_boolean(env, true, &result);
-    if (status != napi_ok) napi_fatal_error(NULL, 0, NULL, 0);
+    if (status != napi_ok)
+      napi_fatal_error(NULL, 0, NULL, 0);
     return result;
   } else {
     status = napi_throw_error(env, NULL, uv_dlerror(&lib));
-    if (status != napi_ok) napi_fatal_error(NULL, 0, NULL, 0);
+    if (status != napi_ok)
+      napi_fatal_error(NULL, 0, NULL, 0);
   }
 }
 

From e589e9b259ecad5a2f2f47f0b8d40618d1c54601 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 9 Mar 2022 14:30:42 -0800
Subject: [PATCH 103/811] fix: fire show event when BrowserWindow shown via
 maximize() (#32979)

---
 shell/browser/native_window_views.cc     |  6 ++++--
 shell/browser/native_window_views_win.cc |  7 ++++---
 spec-main/api-browser-window-spec.ts     | 23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 2d3d866fa71dc..a5c58964016c3 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -580,11 +580,13 @@ void NativeWindowViews::SetEnabledInternal(bool enable) {
 
 #if BUILDFLAG(IS_LINUX)
 void NativeWindowViews::Maximize() {
-  if (IsVisible())
+  if (IsVisible()) {
     widget()->Maximize();
-  else
+  } else {
     widget()->native_widget_private()->Show(ui::SHOW_STATE_MAXIMIZED,
                                             gfx::Rect());
+    NotifyWindowShow();
+  }
 }
 #endif
 
diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index ab336f2e29866..01d88048af794 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -178,12 +178,13 @@ HHOOK NativeWindowViews::mouse_hook_ = NULL;
 void NativeWindowViews::Maximize() {
   // Only use Maximize() when window is NOT transparent style
   if (!transparent()) {
-    if (IsVisible())
+    if (IsVisible()) {
       widget()->Maximize();
-    else
+    } else {
       widget()->native_widget_private()->Show(ui::SHOW_STATE_MAXIMIZED,
                                               gfx::Rect());
-    return;
+      NotifyWindowShow();
+    }
   } else {
     restore_bounds_ = GetBounds();
     auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 1e9405e0aa3c8..1ed8734711f33 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3526,6 +3526,29 @@ describe('BrowserWindow module', () => {
     });
   });
 
+  // TODO(dsanders11): Enable once maximize event works on Linux again on CI
+  ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => {
+    afterEach(closeAllWindows);
+    // TODO(dsanders11): Disabled on macOS, see https://github.com/electron/electron/issues/32947
+    ifit(process.platform !== 'darwin')('should show the window if it is not currently shown', async () => {
+      const w = new BrowserWindow({ show: false });
+      const hidden = emittedOnce(w, 'hide');
+      const shown = emittedOnce(w, 'show');
+      const maximize = emittedOnce(w, 'maximize');
+      expect(w.isVisible()).to.be.false('visible');
+      w.maximize();
+      await maximize;
+      expect(w.isVisible()).to.be.true('visible');
+      // Even if the window is already maximized
+      w.hide();
+      await hidden;
+      expect(w.isVisible()).to.be.false('visible');
+      w.maximize();
+      await shown; // Ensure a 'show' event happens when it becomes visible
+      expect(w.isVisible()).to.be.true('visible');
+    });
+  });
+
   describe('BrowserWindow.unmaximize()', () => {
     afterEach(closeAllWindows);
     it('should restore the previous window position', () => {

From b888d9cd17d41a7b7a2e2bf61429fc1f5d3c94e4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 05:01:04 -0800
Subject: [PATCH 104/811] Bump v19.0.0-nightly.20220310

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 22d94b6c5b151..89c7c89ddc4e6 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220309
\ No newline at end of file
+19.0.0-nightly.20220310
\ No newline at end of file
diff --git a/package.json b/package.json
index 1e1905a55217f..c77e759c18349 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220309",
+  "version": "19.0.0-nightly.20220310",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 771f39264ebaf..383de0f2e49e2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220309
- PRODUCTVERSION 19,0,0,20220309
+ FILEVERSION 19,0,0,20220310
+ PRODUCTVERSION 19,0,0,20220310
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From dc63b8e7f478ad87bcde0406508c1fbbcf4b872c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Mar 2022 05:01:42 -0800
Subject: [PATCH 105/811] Bump v19.0.0-nightly.20220311

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 89c7c89ddc4e6..ade03cdbecc4b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220310
\ No newline at end of file
+19.0.0-nightly.20220311
\ No newline at end of file
diff --git a/package.json b/package.json
index c77e759c18349..728b3d3653861 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220310",
+  "version": "19.0.0-nightly.20220311",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 383de0f2e49e2..696f4f46d9069 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220310
- PRODUCTVERSION 19,0,0,20220310
+ FILEVERSION 19,0,0,20220311
+ PRODUCTVERSION 19,0,0,20220311
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From bbb79880f7016c156c8fad3c08b59caa0eedd8a7 Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Fri, 11 Mar 2022 22:49:51 +0530
Subject: [PATCH 106/811] chore: cherry-pick 2ed58f4 from chromium (#33109)

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3492658
Fixes: https://github.com/electron/electron/issues/33049
Signed-off-by: Darshan Sen <raisinten@gmail.com>

Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 patches/chromium/.patches                     |  1 +
 ...e_incorrect_width_height_adjustments.patch | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 patches/chromium/remove_incorrect_width_height_adjustments.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 545165e4e06ad..c470189487c06 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -114,3 +114,4 @@ port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
 build_disable_thin_lto_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
+remove_incorrect_width_height_adjustments.patch
diff --git a/patches/chromium/remove_incorrect_width_height_adjustments.patch b/patches/chromium/remove_incorrect_width_height_adjustments.patch
new file mode 100644
index 0000000000000..4fce52ba6e282
--- /dev/null
+++ b/patches/chromium/remove_incorrect_width_height_adjustments.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bruce Dawson <brucedawson@chromium.org>
+Date: Mon, 28 Feb 2022 19:07:41 +0000
+Subject: Remove incorrect width/height adjustments
+
+In late 2016 a change which fixed some problems around window sizing
+when attaching or detaching additional displays was landed, which fixed
+some genuine bugs. Unfortunately it included a subtraction of 1 from the
+width and height of the Chrome window. I couldn't find any discussion of
+this size adjustment and I think that it was just a misunderstanding of
+how window rectangles work (inclusive versus exclusive extents).
+
+This size adjustment causes non-maximized Chrome windows to shrink every
+time a monitor is added or removed. The problematic commit was found
+by the bug-filer through a bisect of more than four years of Chrome
+history - I'm just landing the fix that they suggested.
+
+Bug: 1300415
+Change-Id: Ief124f584a91aa9cc3f10704b0cc1e83356dea5b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3492658
+Reviewed-by: Allen Bauer <kylixrd@chromium.org>
+Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#975872}
+
+diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
+index 264a9109e42c23e9be6bf7269b3cfee2634b61e4..86f06d2a2c9588a2210a9f78f47e73f1b7c5e329 100644
+--- a/ui/views/win/hwnd_message_handler.cc
++++ b/ui/views/win/hwnd_message_handler.cc
+@@ -2834,8 +2834,8 @@ void HWNDMessageHandler::OnWindowPosChanging(WINDOWPOS* window_pos) {
+       // (Win+Shift+Arrows). See crbug.com/656001.
+       window_rect.left = window_pos->x;
+       window_rect.top = window_pos->y;
+-      window_rect.right = window_pos->x + window_pos->cx - 1;
+-      window_rect.bottom = window_pos->y + window_pos->cy - 1;
++      window_rect.right = window_pos->x + window_pos->cx;
++      window_rect.bottom = window_pos->y + window_pos->cy;
+     }
+ 
+     HMONITOR monitor;

From cdc27a3793958de4a2c06e7fce16244b6f0cb354 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Fri, 11 Mar 2022 11:35:48 -0800
Subject: [PATCH 107/811] fix: prevent UAF crash in setCertificateVerifyProc
 (#33204)

---
 ...xpose_setuseragent_on_networkcontext.patch |  4 +-
 ...emote_certificate_verification_logic.patch | 80 +++++++++++--------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index 429dd72387ef7..b30988fba7e9c 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index ca62a13420aa9c114c00054bbe1215f96285a4e9..01be46b1eaed2aadfd24eac9d102da99521b175c 100644
+index 20373c0e86852446569c401c4a993512cb388fc7..9b6dbdad1a17148303ddecaada17a57d4ea22bb2 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1331,6 +1331,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1343,6 +1343,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index d4aaf27702eea..d524259dd9428 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f96285a4e9 100644
+index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512cb388fc7 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -126,6 +126,11 @@
@@ -22,12 +22,38 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f9
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -433,6 +438,79 @@ bool GetFullDataFilePath(
+@@ -433,6 +438,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
 +class RemoteCertVerifier : public net::CertVerifier {
 + public:
++  class Request : public net::CertVerifier::Request {
++   public:
++    Request() {}
++    ~Request() override = default;
++    void OnRemoteResponse(
++        const RequestParams& params,
++        net::CertVerifyResult* verify_result,
++        int error_from_upstream,
++        net::CompletionOnceCallback callback,
++        int error_from_client,
++        const net::CertVerifyResult& verify_result_from_client) {
++      if (error_from_client == net::ERR_ABORTED) {
++        // use the default
++        std::move(callback).Run(error_from_upstream);
++      } else {
++        // use the override
++        verify_result->Reset();
++        verify_result->verified_cert = verify_result_from_client.verified_cert;
++        std::move(callback).Run(error_from_client);
++      }
++    }
++    base::WeakPtr<Request> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
++   private:
++    base::WeakPtrFactory<Request> weak_factory_{this};
++  };
++
 +  RemoteCertVerifier(std::unique_ptr<net::CertVerifier> upstream): upstream_(std::move(upstream)) {
 +  }
 +  ~RemoteCertVerifier() override = default;
@@ -44,20 +70,14 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f9
 +  int Verify(const RequestParams& params,
 +             net::CertVerifyResult* verify_result,
 +             net::CompletionOnceCallback callback,
-+             std::unique_ptr<Request>* out_req,
++             std::unique_ptr<CertVerifier::Request>* out_req,
 +             const net::NetLogWithSource& net_log) override {
 +    out_req->reset();
 +
 +    net::CompletionOnceCallback callback2 = base::BindOnce(
 +        &RemoteCertVerifier::OnRequestFinished, base::Unretained(this),
-+        params, std::move(callback), verify_result);
-+    int result = upstream_->Verify(params, verify_result,
-+                                   std::move(callback2), out_req, net_log);
-+    if (result != net::ERR_IO_PENDING) {
-+      // Synchronous completion
-+    }
-+
-+    return result;
++        params, std::move(callback), verify_result, out_req);
++    return upstream_->Verify(params, verify_result, std::move(callback2), out_req, net_log);
 +  }
 +
 +
@@ -65,35 +85,27 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f9
 +    upstream_->SetConfig(config);
 +  }
 +
-+  void OnRequestFinished(const RequestParams& params, net::CompletionOnceCallback callback, net::CertVerifyResult* verify_result, int error) {
++  void OnRequestFinished(const RequestParams& params,
++                         net::CompletionOnceCallback callback,
++                         net::CertVerifyResult* verify_result,
++                         std::unique_ptr<CertVerifier::Request>* out_req,
++                         int error) {
 +    if (client_.is_bound()) {
++      // We take a weak pointer to the request because deletion of the request
++      // is what signals cancellation. Thus if the request is cancelled, the
++      // callback won't be called, thus avoiding UAF, because |verify_result|
++      // is freed when the request is cancelled.
++      *out_req = std::make_unique<Request>();
++      base::WeakPtr<Request> weak_req = static_cast<Request*>(out_req->get())->GetWeakPtr();
 +      client_->Verify(error, *verify_result, params.certificate(),
 +          params.hostname(), params.flags(), params.ocsp_response(),
-+          base::BindOnce(&RemoteCertVerifier::OnRemoteResponse,
-+            base::Unretained(this), params, verify_result, error,
-+            std::move(callback)));
++          base::BindOnce(&Request::OnRemoteResponse,
++            weak_req, params, verify_result, error, std::move(callback)));
 +    } else {
 +      std::move(callback).Run(error);
 +    }
 +  }
 +
-+  void OnRemoteResponse(
-+      const RequestParams& params,
-+      net::CertVerifyResult* verify_result,
-+      int error,
-+      net::CompletionOnceCallback callback,
-+      int error2,
-+      const net::CertVerifyResult& verify_result2) {
-+    if (error2 == net::ERR_ABORTED) {
-+      // use the default
-+      std::move(callback).Run(error);
-+    } else {
-+      // use the override
-+      verify_result->Reset();
-+      verify_result->verified_cert = verify_result2.verified_cert;
-+      std::move(callback).Run(error2);
-+    }
-+  }
 + private:
 +  std::unique_ptr<net::CertVerifier> upstream_;
 +  mojo::Remote<mojom::CertVerifierClient> client_;
@@ -102,7 +114,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f9
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -671,6 +749,13 @@ void NetworkContext::SetClient(
+@@ -671,6 +761,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -116,7 +128,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..ca62a13420aa9c114c00054bbe1215f9
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2226,6 +2311,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2226,6 +2323,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)

From f37295325668e50c80fbc00b406f0b4660cc93cd Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Sat, 12 Mar 2022 15:28:10 -0800
Subject: [PATCH 108/811] fix: cppgc/node collisions in renderer process
 (#33252)

* fix: cppgc/node collisions in renderer process

* Update be_compatible_with_cppgc.patch
---
 patches/node/.patches                       |  1 +
 patches/node/be_compatible_with_cppgc.patch | 97 +++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 patches/node/be_compatible_with_cppgc.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 0346bf4bde829..7a36ac8cbf7a6 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -32,3 +32,4 @@ darwin_remove_eprototype_error_workaround_3405.patch
 darwin_translate_eprototype_to_econnreset_3413.patch
 darwin_bump_minimum_supported_version_to_10_15_3406.patch
 fix_failing_node_js_test_on_outdated.patch
+be_compatible_with_cppgc.patch
diff --git a/patches/node/be_compatible_with_cppgc.patch b/patches/node/be_compatible_with_cppgc.patch
new file mode 100644
index 0000000000000..3bbc3ce0bde16
--- /dev/null
+++ b/patches/node/be_compatible_with_cppgc.patch
@@ -0,0 +1,97 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Fri, 11 Mar 2022 11:17:29 -0800
+Subject: be compatible with cppgc
+
+This fixes a crash that happens sporadically when Node is used in the same V8
+Isolate as Blink. For example:
+
+#
+# Fatal error in ../../v8/src/objects/js-objects-inl.h, line 306
+# Debug check failed: static_cast<unsigned>(index) < static_cast<unsigned>(GetEmbedderFieldCount()) (1 vs. 1).
+#
+#
+#
+#FailureMessage Object: 0x7ffee46fd1c0
+0   Electron Framework                  0x00000001181c78d9 base::debug::CollectStackTrace(void**, unsigned long) + 9
+1   Electron Framework                  0x00000001180ea633 base::debug::StackTrace::StackTrace() + 19
+2   Electron Framework                  0x000000011a04decd gin::(anonymous namespace)::PrintStackTrace() + 45
+3   Electron Framework                  0x0000000119a9b416 V8_Fatal(char const*, int, char const*, ...) + 326
+4   Electron Framework                  0x0000000119a9aeb5 v8::base::(anonymous namespace)::DefaultDcheckHandler(char const*, int, char const*) + 21
+5   Electron Framework                  0x000000011530763f v8::internal::JSObject::GetEmbedderFieldOffset(int) + 207
+6   Electron Framework                  0x00000001155f68e6 v8::internal::LocalEmbedderHeapTracer::EmbedderWriteBarrier(v8::internal::Heap*, v8::internal::JSObject) + 150
+7   Electron Framework                  0x00000001152cd34f v8::Object::SetAlignedPointerInInternalField(int, void*) + 639
+8   Electron Framework                  0x000000011d18df35 node::BaseObject::BaseObject(node::Environment*, v8::Local<v8::Object>) + 101
+9   Electron Framework                  0x000000011d347b6e node::crypto::DiffieHellman::DiffieHellman(node::Environment*, v8::Local<v8::Object>) + 14
+10  Electron Framework                  0x000000011d348413 node::crypto::DiffieHellman::New(v8::FunctionCallbackInfo<v8::Value> const&) + 147
+[...]
+
+This crash happens because this V8 isolate has cppgc enabled. When cppgc is
+enabled, V8 assumes that the first embedder field is a "type" pointer, the
+first 16 bits of which are the embedder ID. Node did not adhere to this
+requirement. Sometimes--mostly, even--this worked _by accident_. If the first
+field in the BaseObject was a pointer to a bit of memory that happened to
+contain the two-byte little-endian value 0x0001, however, V8 would take that to
+mean that the object was a Blink object[1], and attempt to read the pointer in
+the second embedder slot, which would result in a CHECK.
+
+This change adds an "embedder id" pointer as the first embedder field in all
+Node-managed objects. This ensures that cppgc will always skip over Node
+objects.
+
+This patch should be upstreamed to Node.
+
+[1]: https://source.chromium.org/chromium/chromium/src/+/main:gin/public/gin_embedders.h;l=20;drc=5a758a97032f0b656c3c36a3497560762495501a
+
+See also: https://source.chromium.org/chromium/chromium/src/+/main:v8/include/v8-cppgc.h;l=70-76;drc=5a758a97032f0b656c3c36a3497560762495501a
+
+diff --git a/src/base_object-inl.h b/src/base_object-inl.h
+index bb1e8d4b46bce3bf08f730ac5d43f7113d17ae39..6da0669943fc6465ffc47a1c8c3dadfea6beb1c9 100644
+--- a/src/base_object-inl.h
++++ b/src/base_object-inl.h
+@@ -32,10 +32,21 @@
+ 
+ namespace node {
+ 
++namespace {
++// This just has to be different from the Chromium ones:
++// https://source.chromium.org/chromium/chromium/src/+/main:gin/public/gin_embedders.h;l=18-23;drc=5a758a97032f0b656c3c36a3497560762495501a
++// Otherwise, when Node is loaded in an isolate which uses cppgc, cppgc will
++// misinterpret the data stored in the embedder fields and try to garbage
++// collect them.
++static uint16_t kNodeEmbedderId = 0x90de;
++}
++
+ BaseObject::BaseObject(Environment* env, v8::Local<v8::Object> object)
+     : persistent_handle_(env->isolate(), object), env_(env) {
+   CHECK_EQ(false, object.IsEmpty());
+-  CHECK_GT(object->InternalFieldCount(), 0);
++  CHECK_GT(object->InternalFieldCount(), BaseObject::kSlot);
++  object->SetAlignedPointerInInternalField(BaseObject::kWrapperType,
++      &kNodeEmbedderId);
+   object->SetAlignedPointerInInternalField(
+       BaseObject::kSlot,
+       static_cast<void*>(this));
+@@ -151,7 +162,8 @@ bool BaseObject::IsWeakOrDetached() const {
+ void BaseObject::LazilyInitializedJSTemplateConstructor(
+     const v8::FunctionCallbackInfo<v8::Value>& args) {
+   DCHECK(args.IsConstructCall());
+-  DCHECK_GT(args.This()->InternalFieldCount(), 0);
++  DCHECK_GT(args.This()->InternalFieldCount(), BaseObject::kSlot);
++  args.This()->SetAlignedPointerInInternalField(BaseObject::kWrapperType, &kNodeEmbedderId);
+   args.This()->SetAlignedPointerInInternalField(BaseObject::kSlot, nullptr);
+ }
+ 
+diff --git a/src/base_object.h b/src/base_object.h
+index d46a0f216009c63f45c440fc352b54d1ac4a08d8..81913c0d7762bf499ee19aaa3b63b986ca370bb4 100644
+--- a/src/base_object.h
++++ b/src/base_object.h
+@@ -40,7 +40,7 @@ class TransferData;
+ 
+ class BaseObject : public MemoryRetainer {
+  public:
+-  enum InternalFields { kSlot, kInternalFieldCount };
++  enum InternalFields { kWrapperType, kSlot, kInternalFieldCount };
+ 
+   // Associates this object with `object`. It uses the 0th internal field for
+   // that, and in particular aborts if there is no such field.

From 039c061d07821b2d77781320a0bdf60d2e1b938a Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 14 Mar 2022 10:19:15 +0100
Subject: [PATCH 109/811] fix: add missing [[maybe_unused]] to IsEnvSet
 (#33224)

---
 shell/app/electron_main_mac.cc | 2 +-
 shell/app/electron_main_win.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc
index 6180a4d80bb22..c0f9576fff7fe 100644
--- a/shell/app/electron_main_mac.cc
+++ b/shell/app/electron_main_mac.cc
@@ -20,7 +20,7 @@
 
 namespace {
 
-bool IsEnvSet(const char* name) {
+[[maybe_unused]] bool IsEnvSet(const char* name) {
   char* indicator = getenv(name);
   return indicator && indicator[0] != '\0';
 }
diff --git a/shell/app/electron_main_win.cc b/shell/app/electron_main_win.cc
index 38f654e5f047f..2be51c27b2478 100644
--- a/shell/app/electron_main_win.cc
+++ b/shell/app/electron_main_win.cc
@@ -44,7 +44,7 @@ namespace {
 const char kUserDataDir[] = "user-data-dir";
 const char kProcessType[] = "type";
 
-bool IsEnvSet(const char* name) {
+[[maybe_unused]] bool IsEnvSet(const char* name) {
   size_t required_size;
   getenv_s(&required_size, nullptr, 0, name);
   return required_size != 0;

From 4bdb50eeee95bd1853123e974b369c5fd1303843 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 06:02:37 -0700
Subject: [PATCH 110/811] Bump v19.0.0-nightly.20220314

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index ade03cdbecc4b..bc4cd4e3cdf14 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220311
\ No newline at end of file
+19.0.0-nightly.20220314
\ No newline at end of file
diff --git a/package.json b/package.json
index 728b3d3653861..3e50d9ef1202f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220311",
+  "version": "19.0.0-nightly.20220314",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 696f4f46d9069..1bd4cadec9b11 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220311
- PRODUCTVERSION 19,0,0,20220311
+ FILEVERSION 19,0,0,20220314
+ PRODUCTVERSION 19,0,0,20220314
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 75339dccb39381c4692b53d5e3a0655ff0f9ec43 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 15 Mar 2022 06:01:15 -0700
Subject: [PATCH 111/811] Bump v19.0.0-nightly.20220315

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index bc4cd4e3cdf14..16a9535edbe36 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220314
\ No newline at end of file
+19.0.0-nightly.20220315
\ No newline at end of file
diff --git a/package.json b/package.json
index 3e50d9ef1202f..5097dcc2d0927 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220314",
+  "version": "19.0.0-nightly.20220315",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1bd4cadec9b11..d4ee0781fa344 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220314
- PRODUCTVERSION 19,0,0,20220314
+ FILEVERSION 19,0,0,20220315
+ PRODUCTVERSION 19,0,0,20220315
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 73828910152cb67c849635ccf513dbe107b63ca3 Mon Sep 17 00:00:00 2001
From: Aryan Shridhar <53977614+aryanshridhar@users.noreply.github.com>
Date: Tue, 15 Mar 2022 22:41:40 +0530
Subject: [PATCH 112/811] docs: reword sentence for better understanding
 (#33265)

---
 docs/tutorial/process-model.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/process-model.md b/docs/tutorial/process-model.md
index 6b7737ec50b84..bfbb941486f55 100644
--- a/docs/tutorial/process-model.md
+++ b/docs/tutorial/process-model.md
@@ -40,7 +40,7 @@ to `require` modules and use all of Node.js APIs.
 
 ### Window management
 
-The main process' primary purpose is to create and manage application windows with the
+The primary purpose of the main process is to create and manage application windows with the
 [`BrowserWindow`][browser-window] module.
 
 Each instance of the `BrowserWindow` class creates an application window that loads

From c8a3a00017d5eaca4e017a22d63acaebeb1e24d4 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 15 Mar 2022 10:45:56 -0700
Subject: [PATCH 113/811] fix: race condition where webContents can be nullptr
 during re-focus and a multi-window close sequence (#33063)

* fix: race condition where webContents can be nullptr during re-focus and a multi-window close sequence

* chore: update electron_inspectable_web_contents_view.mm
---
 .../browser/ui/cocoa/electron_inspectable_web_contents_view.mm  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
index e4b797a001a1e..3f86dca5158e5 100644
--- a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
+++ b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
@@ -266,6 +266,8 @@ - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
       inspectableWebContentsView_->inspectable_web_contents();
   DCHECK(inspectable_web_contents);
   auto* webContents = inspectable_web_contents->GetWebContents();
+  if (!webContents)
+    return;
   auto* webContentsView = webContents->GetNativeView().GetNativeNSView();
 
   NSView* view = [notification object];

From 37a904c299c4d7bde4b2b5007a52043bca383868 Mon Sep 17 00:00:00 2001
From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
Date: Tue, 15 Mar 2022 17:48:25 +0000
Subject: [PATCH 114/811] docs: specify default for BrowserWindow's center
 option (#33264)

---
 docs/api/browser-window.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index bc407ede48021..768d27284104e 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -146,7 +146,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `useContentSize` boolean (optional) - The `width` and `height` would be used as web
     page's size, which means the actual window's size will include window
     frame's size and be slightly larger. Default is `false`.
-  * `center` boolean (optional) - Show window in the center of the screen.
+  * `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
   * `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
   * `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
   * `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.

From 2657383ea7c21c3229cba7924d9b3ef5904453b7 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 15 Mar 2022 21:34:53 +0100
Subject: [PATCH 115/811] feat: allow setting code cache directory (#31154)

* feat: allow setting code cache directory

* chore: address review feedback

* chore: update docs

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

* chore: rewrite with base::Contains

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

Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 docs/api/session.md                       | 14 ++++++++
 shell/browser/api/electron_api_session.cc | 42 +++++++++++++++++++++++
 shell/browser/api/electron_api_session.h  |  2 ++
 spec-main/api-session-spec.ts             | 14 ++++++++
 4 files changed, 72 insertions(+)

diff --git a/docs/api/session.md b/docs/api/session.md
index 2517fd178d2e0..8bb1ad5ab3c5c 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -868,6 +868,20 @@ this session just before normal `preload` scripts run.
 Returns `string[]` an array of paths to preload scripts that have been
 registered.
 
+#### `ses.setCodeCachePath(path)`
+
+* `path` String - Absolute path to store the v8 generated JS code cache from the renderer.
+
+Sets the directory to store the generated JS [code cache](https://v8.dev/blog/code-caching-for-devs) for this session. The directory is not required to be created by the user before this call, the runtime will create if it does not exist otherwise will use the existing directory. If directory cannot be created, then code cache will not be used and all operations related to code cache will fail silently inside the runtime. By default, the directory will be `Code Cache` under the
+respective user data folder.
+
+#### `ses.clearCodeCaches(options)`
+
+* `options` Object
+  * `urls` String[] (optional) - An array of url corresponding to the resource whose generated code cache needs to be removed. If the list is empty then all entries in the cache directory will be removed.
+
+Returns `Promise<void>` - resolves when the code cache clear operation is complete.
+
 #### `ses.setSpellCheckerEnabled(enable)`
 
 * `enable` boolean
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index d0a0d4c408e92..ac6b38cdb58f4 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -28,6 +28,7 @@
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/proxy_config/proxy_prefs.h"
+#include "content/browser/code_cache/generated_code_cache_context.h"  // nogncheck
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item_utils.h"
@@ -976,6 +977,45 @@ v8::Local<v8::Value> Session::GetPath(v8::Isolate* isolate) {
   return gin::ConvertToV8(isolate, browser_context_->GetPath());
 }
 
+void Session::SetCodeCachePath(gin::Arguments* args) {
+  base::FilePath code_cache_path;
+  auto* storage_partition = browser_context_->GetDefaultStoragePartition();
+  auto* code_cache_context = storage_partition->GetGeneratedCodeCacheContext();
+  if (code_cache_context) {
+    if (!args->GetNext(&code_cache_path) || !code_cache_path.IsAbsolute()) {
+      args->ThrowTypeError(
+          "Absolute path must be provided to store code cache.");
+      return;
+    }
+    code_cache_context->Initialize(
+        code_cache_path, 0 /* allows disk_cache to choose the size */);
+  }
+}
+
+v8::Local<v8::Promise> Session::ClearCodeCaches(
+    const gin_helper::Dictionary& options) {
+  auto* isolate = JavascriptEnvironment::GetIsolate();
+  gin_helper::Promise<void> promise(isolate);
+  v8::Local<v8::Promise> handle = promise.GetHandle();
+
+  std::set<GURL> url_list;
+  base::RepeatingCallback<bool(const GURL&)> url_matcher = base::NullCallback();
+  if (options.Get("urls", &url_list) && !url_list.empty()) {
+    url_matcher = base::BindRepeating(
+        [](const std::set<GURL>& url_list, const GURL& url) {
+          return base::Contains(url_list, url);
+        },
+        url_list);
+  }
+
+  browser_context_->GetDefaultStoragePartition()->ClearCodeCaches(
+      base::Time(), base::Time::Max(), url_matcher,
+      base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
+                     std::move(promise)));
+
+  return handle;
+}
+
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
 base::Value Session::GetSpellCheckerLanguages() {
   return browser_context_->prefs()
@@ -1203,6 +1243,8 @@ gin::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
       .SetMethod("preconnect", &Session::Preconnect)
       .SetMethod("closeAllConnections", &Session::CloseAllConnections)
       .SetMethod("getStoragePath", &Session::GetPath)
+      .SetMethod("setCodeCachePath", &Session::SetCodeCachePath)
+      .SetMethod("clearCodeCaches", &Session::ClearCodeCaches)
       .SetProperty("cookies", &Session::Cookies)
       .SetProperty("netLog", &Session::NetLog)
       .SetProperty("protocol", &Session::Protocol)
diff --git a/shell/browser/api/electron_api_session.h b/shell/browser/api/electron_api_session.h
index aedf234d38a58..e9b69380dfaf9 100644
--- a/shell/browser/api/electron_api_session.h
+++ b/shell/browser/api/electron_api_session.h
@@ -127,6 +127,8 @@ class Session : public gin::Wrappable<Session>,
   void Preconnect(const gin_helper::Dictionary& options, gin::Arguments* args);
   v8::Local<v8::Promise> CloseAllConnections();
   v8::Local<v8::Value> GetPath(v8::Isolate* isolate);
+  void SetCodeCachePath(gin::Arguments* args);
+  v8::Local<v8::Promise> ClearCodeCaches(const gin_helper::Dictionary& options);
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
   base::Value GetSpellCheckerLanguages();
   void SetSpellCheckerLanguages(gin_helper::ErrorThrower thrower,
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index 223d826d7eb84..f504d0db6d464 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -1121,6 +1121,20 @@ describe('session module', () => {
     });
   });
 
+  describe('session.setCodeCachePath()', () => {
+    it('throws when relative or empty path is provided', () => {
+      expect(() => {
+        session.defaultSession.setCodeCachePath('../fixtures');
+      }).to.throw('Absolute path must be provided to store code cache.');
+      expect(() => {
+        session.defaultSession.setCodeCachePath('');
+      }).to.throw('Absolute path must be provided to store code cache.');
+      expect(() => {
+        session.defaultSession.setCodeCachePath(path.join(app.getPath('userData'), 'test-code-cache'));
+      }).to.not.throw();
+    });
+  });
+
   describe('ses.setSSLConfig()', () => {
     it('can disable cipher suites', async () => {
       const ses = session.fromPartition('' + Math.random());

From fc7f38c7ce3e78f84d931d353de3329695887577 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 16 Mar 2022 03:51:56 -0700
Subject: [PATCH 116/811] docs: remove "marked" from
 process.getBlinkMemoryInfo() (#33263)

---
 docs/api/process.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api/process.md b/docs/api/process.md
index 194619e01c0ab..4573899912997 100644
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -178,7 +178,6 @@ Returns an object with V8 heap statistics. Note that all statistics are reported
 Returns `Object`:
 
 * `allocated` Integer - Size of all allocated objects in Kilobytes.
-* `marked` Integer - Size of all marked objects in Kilobytes.
 * `total` Integer - Total allocated space in Kilobytes.
 
 Returns an object with Blink memory information.

From a5382b7780e8966e144b026cda23ab9677ccc429 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 16 Mar 2022 06:02:33 -0700
Subject: [PATCH 117/811] Bump v19.0.0-nightly.20220316

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 16a9535edbe36..a3fb7e2f9cea8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220315
\ No newline at end of file
+19.0.0-nightly.20220316
\ No newline at end of file
diff --git a/package.json b/package.json
index 5097dcc2d0927..b2b2ab389a8c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220315",
+  "version": "19.0.0-nightly.20220316",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d4ee0781fa344..d462bc89974f0 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220315
- PRODUCTVERSION 19,0,0,20220315
+ FILEVERSION 19,0,0,20220316
+ PRODUCTVERSION 19,0,0,20220316
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 02fe2455216578815d6300ba2a44d462a840142d Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 16 Mar 2022 07:56:20 -0700
Subject: [PATCH 118/811] docs: webFrame.insertCSS should mention options arg
 (#33274)

---
 docs/api/web-frame.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index 9384fe2c98613..b59d98c54cb60 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -110,9 +110,11 @@ webFrame.setSpellCheckProvider('en-US', {
 })
 ```
 
-### `webFrame.insertCSS(css)`
+#### `webFrame.insertCSS(css[, options])`
 
-* `css` string - CSS source code.
+* `css` string
+* `options` Object (optional)
+  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
 
 Returns `string` - A key for the inserted CSS that can later be used to remove
 the CSS via `webFrame.removeInsertedCSS(key)`.

From b27401172033e7c8fac38d3b2d784fe8f9a481b2 Mon Sep 17 00:00:00 2001
From: Abhay Gupta <51379307+akgupta0777@users.noreply.github.com>
Date: Wed, 16 Mar 2022 08:01:29 -0700
Subject: [PATCH 119/811] fix: fiddle ipc code pattern 3 (#33262)

---
 docs/fiddles/ipc/pattern-3/renderer.js | 2 +-
 docs/tutorial/ipc.md                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/fiddles/ipc/pattern-3/renderer.js b/docs/fiddles/ipc/pattern-3/renderer.js
index 3b184add08ba2..04fd4bca890a3 100644
--- a/docs/fiddles/ipc/pattern-3/renderer.js
+++ b/docs/fiddles/ipc/pattern-3/renderer.js
@@ -4,5 +4,5 @@ window.electronAPI.handleCounter((event, value) => {
     const oldValue = Number(counter.innerText)
     const newValue = oldValue + value
     counter.innerText = newValue
-    event.reply('counter-value', newValue)
+    event.sender.send('counter-value', newValue)
 })
diff --git a/docs/tutorial/ipc.md b/docs/tutorial/ipc.md
index 0189e0db7e806..5d3fc2ffec29b 100644
--- a/docs/tutorial/ipc.md
+++ b/docs/tutorial/ipc.md
@@ -379,7 +379,7 @@ module that uses the `webContents.send` API to send an IPC message from the main
 target renderer.
 
 ```javascript {11-26} title='main.js (Main Process)'
-const {app, BrowserWindow, Menu} = require('electron')
+const {app, BrowserWindow, Menu, ipcMain} = require('electron')
 const path = require('path')
 
 function createWindow () {
@@ -519,7 +519,7 @@ window.electronAPI.onUpdateCounter((event, value) => {
   const oldValue = Number(counter.innerText)
   const newValue = oldValue + value
   counter.innerText = newValue
-  event.reply('counter-value', newValue)
+  event.sender.send('counter-value', newValue)
 })
 ```
 

From cf3ee7be56dad64858a243581eac0644d4653488 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 16 Mar 2022 10:40:47 -0700
Subject: [PATCH 120/811] build: drop pywin32 usage (#26186)

* build: drop pywin32 usage

* chore: ignore extra output on AppVeyor
---
 build/profile_toolchain.py | 87 ++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 32 deletions(-)

diff --git a/build/profile_toolchain.py b/build/profile_toolchain.py
index d8874dded572b..4251315e0a16a 100755
--- a/build/profile_toolchain.py
+++ b/build/profile_toolchain.py
@@ -1,9 +1,12 @@
-from __future__ import with_statement
+from __future__ import unicode_literals
+
 import contextlib
 import sys
 import os
 import optparse
 import json
+import re
+import subprocess
 
 sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
 
@@ -33,36 +36,56 @@ def calculate_hash(root):
         return CalculateHash('.', None)
 
 def windows_installed_software():
-    import win32com.client
-    strComputer = "."
-    objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
-    objSWbemServices = objWMIService.ConnectServer(strComputer, "root\cimv2")
-    colItems = objSWbemServices.ExecQuery("Select * from Win32_Product")
-    items = []
-
-    for objItem in colItems:
-        item = {}
-        if objItem.Caption:
-            item['caption'] = objItem.Caption
-        if objItem.Caption:
-            item['description'] = objItem.Description
-        if objItem.InstallDate:
-            item['install_date'] = objItem.InstallDate
-        if objItem.InstallDate2:
-            item['install_date_2'] = objItem.InstallDate2
-        if objItem.InstallLocation:
-            item['install_location'] = objItem.InstallLocation
-        if objItem.Name:
-            item['name'] = objItem.Name
-        if objItem.SKUNumber:
-            item['sku_number'] = objItem.SKUNumber
-        if objItem.Vendor:
-            item['vendor'] = objItem.Vendor
-        if objItem.Version:
-            item['version'] = objItem.Version
-        items.append(item)
-
-    return items
+    powershell_command = [
+        "Get-CimInstance",
+        "-Namespace",
+        "root\cimv2",
+        "-Class",
+        "Win32_product",
+        "|",
+        "Select",
+        "vendor,",
+        "description,",
+        "@{l='install_location';e='InstallLocation'},",
+        "@{l='install_date';e='InstallDate'},",
+        "@{l='install_date_2';e='InstallDate2'},",
+        "caption,",
+        "version,",
+        "name,",
+        "@{l='sku_number';e='SKUNumber'}",
+        "|",
+        "ConvertTo-Json",
+    ]
+
+    proc = subprocess.Popen(
+        ["powershell.exe", "-Command", "-"],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    stdout, _ = proc.communicate(" ".join(powershell_command).encode("utf-8"))
+
+    if proc.returncode != 0:
+        raise RuntimeError("Failed to get list of installed software")
+
+    # On AppVeyor there's other output related to PSReadline,
+    # so grab only the JSON output and ignore everything else
+    json_match = re.match(
+        r".*(\[.*{.*}.*\]).*", stdout.decode("utf-8"), re.DOTALL
+    )
+
+    if not json_match:
+        raise RuntimeError(
+            "Couldn't find JSON output for list of installed software"
+        )
+
+    # Filter out missing keys
+    return list(
+        map(
+            lambda info: {k: info[k] for k in info if info[k]},
+            json.loads(json_match.group(1)),
+        )
+    )
 
 
 def windows_profile():
@@ -89,7 +112,7 @@ def windows_profile():
 
 def main(options):
     if sys.platform == 'win32':
-        with open(options.output_json, 'wb') as f:
+        with open(options.output_json, 'w') as f:
             json.dump(windows_profile(), f)
     else:
         raise OSError("Unsupported OS")

From 652680e8012983b1d8b9118b48297df4c1d9a939 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 16 Mar 2022 10:54:30 -0700
Subject: [PATCH 121/811] fix: ensure external memory adjustments are balanced
 (#33266)

---
 shell/common/api/electron_api_native_image.cc | 17 +++++++++++------
 shell/common/api/electron_api_native_image.h  |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index 3543a13585509..0dbda357a755c 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -109,7 +109,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
 
 NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
     : image_(image), isolate_(isolate) {
-  AdjustAmountOfExternalAllocatedMemory(true);
+  UpdateExternalAllocatedMemoryUsage();
 }
 
 #if BUILDFLAG(IS_WIN)
@@ -120,22 +120,27 @@ NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
   electron::util::ReadImageSkiaFromICO(&image_skia, GetHICON(256));
   image_ = gfx::Image(image_skia);
 
-  AdjustAmountOfExternalAllocatedMemory(true);
+  UpdateExternalAllocatedMemoryUsage();
 }
 #endif
 
 NativeImage::~NativeImage() {
-  AdjustAmountOfExternalAllocatedMemory(false);
+  isolate_->AdjustAmountOfExternalAllocatedMemory(-memory_usage_);
 }
 
-void NativeImage::AdjustAmountOfExternalAllocatedMemory(bool add) {
+void NativeImage::UpdateExternalAllocatedMemoryUsage() {
+  int32_t new_memory_usage = 0;
+
   if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
     auto* const image_skia = image_.ToImageSkia();
     if (!image_skia->isNull()) {
-      int64_t size = image_skia->bitmap()->computeByteSize();
-      isolate_->AdjustAmountOfExternalAllocatedMemory(add ? size : -size);
+      new_memory_usage = image_skia->bitmap()->computeByteSize();
     }
   }
+
+  isolate_->AdjustAmountOfExternalAllocatedMemory(new_memory_usage -
+                                                  memory_usage_);
+  memory_usage_ = new_memory_usage;
 }
 
 // static
diff --git a/shell/common/api/electron_api_native_image.h b/shell/common/api/electron_api_native_image.h
index a322631f9cfe2..7be02ad27b7af 100644
--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -121,7 +121,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
   float GetAspectRatio(const absl::optional<float> scale_factor);
   void AddRepresentation(const gin_helper::Dictionary& options);
 
-  void AdjustAmountOfExternalAllocatedMemory(bool add);
+  void UpdateExternalAllocatedMemoryUsage();
 
   // Mark the image as template image.
   void SetTemplateImage(bool setAsTemplate);
@@ -136,6 +136,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
   gfx::Image image_;
 
   v8::Isolate* isolate_;
+  int32_t memory_usage_ = 0;
 };
 
 }  // namespace api

From b2c5623a13c91a561704b46480b6c3a7a51f2db7 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Thu, 17 Mar 2022 02:54:45 +0900
Subject: [PATCH 122/811] fix: crash when destroying node env with pending
 promises (#33280)

* fix: crash when destroying node env with pending promises

* chore: add spec
---
 shell/renderer/electron_renderer_client.cc    | 19 ++++++++-----
 shell/renderer/web_worker_observer.cc         |  9 ++++--
 .../fs-promises-renderer-crash/index.html     | 17 +++++++++++
 .../fs-promises-renderer-crash/index.js       | 28 +++++++++++++++++++
 4 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html
 create mode 100644 spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js

diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index f24c8073935fe..2c80080172c1f 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -151,17 +151,22 @@ void ElectronRendererClient::WillReleaseScriptContext(
   if (env == node_bindings_->uv_env())
     node_bindings_->set_uv_env(nullptr);
 
-  // Destroy the node environment.  We only do this if node support has been
-  // enabled for sub-frames to avoid a change-of-behavior / introduce crashes
-  // for existing users.
-  // We also do this if we have disable electron site instance overrides to
-  // avoid memory leaks
-  auto prefs = render_frame->GetBlinkPreferences();
-  gin_helper::MicrotasksScope microtasks_scope(env->isolate());
+  // Destroying the node environment will also run the uv loop,
+  // Node.js expects `kExplicit` microtasks policy and will run microtasks
+  // checkpoints after every call into JavaScript. Since we use a different
+  // policy in the renderer - switch to `kExplicit` and then drop back to the
+  // previous policy value.
+  v8::Isolate* isolate = context->GetIsolate();
+  auto old_policy = isolate->GetMicrotasksPolicy();
+  DCHECK_EQ(v8::MicrotasksScope::GetCurrentDepth(isolate), 0);
+  isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
+
   node::FreeEnvironment(env);
   if (env == node_bindings_->uv_env())
     node::FreeIsolateData(node_bindings_->isolate_data());
 
+  isolate->SetMicrotasksPolicy(old_policy);
+
   // ElectronBindings is tracking node environments.
   electron_bindings_->EnvironmentDestroyed(env);
 }
diff --git a/shell/renderer/web_worker_observer.cc b/shell/renderer/web_worker_observer.cc
index 287be9ead13f0..ca929bf9e4bb9 100644
--- a/shell/renderer/web_worker_observer.cc
+++ b/shell/renderer/web_worker_observer.cc
@@ -37,8 +37,13 @@ WebWorkerObserver::WebWorkerObserver()
 
 WebWorkerObserver::~WebWorkerObserver() {
   lazy_tls.Pointer()->Set(nullptr);
-  gin_helper::MicrotasksScope microtasks_scope(
-      node_bindings_->uv_env()->isolate());
+  // Destroying the node environment will also run the uv loop,
+  // Node.js expects `kExplicit` microtasks policy and will run microtasks
+  // checkpoints after every call into JavaScript. Since we use a different
+  // policy in the renderer - switch to `kExplicit`
+  v8::Isolate* isolate = node_bindings_->uv_env()->isolate();
+  DCHECK_EQ(v8::MicrotasksScope::GetCurrentDepth(isolate), 0);
+  isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
   node::FreeEnvironment(node_bindings_->uv_env());
   node::FreeIsolateData(node_bindings_->isolate_data());
 }
diff --git a/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html b/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html
new file mode 100644
index 0000000000000..9721dac6ed821
--- /dev/null
+++ b/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.html
@@ -0,0 +1,17 @@
+<html>
+<body>
+<script>
+const fs = require('fs');
+const { ipcRenderer } = require('electron');
+
+async function readFile(path) {
+    await fs.promises.readFile(path);
+}
+
+ipcRenderer.on('reload', (_, path) => {
+    readFile(path);
+    window.location.reload();
+});
+</script>
+</body>
+</html>
diff --git a/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js b/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js
new file mode 100644
index 0000000000000..4c74ba39f74d6
--- /dev/null
+++ b/spec-main/fixtures/crash-cases/fs-promises-renderer-crash/index.js
@@ -0,0 +1,28 @@
+const { app, BrowserWindow, ipcMain } = require('electron');
+const path = require('path');
+
+app.whenReady().then(() => {
+  let reloadCount = 0;
+  const win = new BrowserWindow({
+    show: false,
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false
+    }
+  });
+
+  win.loadFile('index.html');
+
+  win.webContents.on('render-process-gone', () => {
+    process.exit(1);
+  });
+
+  win.webContents.on('did-finish-load', () => {
+    if (reloadCount > 2) {
+      setImmediate(() => app.quit());
+    } else {
+      reloadCount += 1;
+      win.webContents.send('reload', path.join(__dirname, '..', '..', 'cat.pdf'));
+    }
+  });
+});

From e9044860766affd5ded7baa3b44da6d4b9fe89e0 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 16 Mar 2022 16:23:14 -0700
Subject: [PATCH 123/811] fix: BrowserWindow.fromWebContents should work in
 browser-window-created (#33257)

---
 shell/common/gin_helper/trackable_object.h |  2 +-
 spec-main/api-browser-window-spec.ts       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/shell/common/gin_helper/trackable_object.h b/shell/common/gin_helper/trackable_object.h
index 309e412e8a6f6..7f5b45c75fbcb 100644
--- a/shell/common/gin_helper/trackable_object.h
+++ b/shell/common/gin_helper/trackable_object.h
@@ -117,11 +117,11 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
   ~TrackableObject() override { RemoveFromWeakMap(); }
 
   void InitWith(v8::Isolate* isolate, v8::Local<v8::Object> wrapper) override {
-    gin_helper::WrappableBase::InitWith(isolate, wrapper);
     if (!weak_map_) {
       weak_map_ = new electron::KeyWeakMap<int32_t>;
     }
     weak_map_->Set(isolate, weak_map_id_, wrapper);
+    gin_helper::WrappableBase::InitWith(isolate, wrapper);
   }
 
  private:
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 1ed8734711f33..89ff468ec5202 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1816,6 +1816,18 @@ describe('BrowserWindow module', () => {
       expect(BrowserWindow.fromWebContents(webviewContents)!.id).to.equal(w.id);
       await p;
     });
+
+    it('is usable immediately on browser-window-created', async () => {
+      const w = new BrowserWindow({ show: false });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('window.open(""); null');
+      const [win, winFromWebContents] = await new Promise((resolve) => {
+        app.once('browser-window-created', (e, win) => {
+          resolve([win, BrowserWindow.fromWebContents(win.webContents)]);
+        });
+      });
+      expect(winFromWebContents).to.equal(win);
+    });
   });
 
   describe('BrowserWindow.openDevTools()', () => {

From 4342b7ff555a1707ab18f7a71da01ae27ef29cd1 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 16 Mar 2022 16:23:41 -0700
Subject: [PATCH 124/811] chore: remove awkward semi-documented preloadURL
 WebPreference (#33228)

---
 docs/api/web-contents.md                  |  3 ---
 docs/api/webview-tag.md                   |  3 ---
 docs/tutorial/security.md                 |  1 -
 lib/browser/guest-view-manager.ts         |  3 ++-
 shell/browser/api/electron_api_net.cc     | 13 +++++++++++++
 shell/browser/web_contents_preferences.cc |  9 ---------
 shell/common/options_switches.cc          |  3 ---
 shell/common/options_switches.h           |  1 -
 spec/static/main.js                       |  1 -
 typings/internal-ambient.d.ts             |  1 +
 typings/internal-electron.d.ts            |  1 -
 11 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 64af596682384..35ce46b590cc9 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -820,9 +820,6 @@ This event can be used to configure `webPreferences` for the `webContents`
 of a `<webview>` before it's loaded, and provides the ability to set settings
 that can't be set via `<webview>` attributes.
 
-**Note:** The specified `preload` script option will appear as `preloadURL`
-(not `preload`) in the `webPreferences` object emitted with this event.
-
 #### Event: 'did-attach-webview'
 
 Returns:
diff --git a/docs/api/webview-tag.md b/docs/api/webview-tag.md
index fd90e8b5d5660..c2eab361cfd94 100644
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -158,9 +158,6 @@ When the guest page doesn't have node integration this script will still have
 access to all Node APIs, but global objects injected by Node will be deleted
 after this script has finished executing.
 
-**Note:** This option will appear as `preloadURL` (not `preload`) in
-the `webPreferences` specified to the `will-attach-webview` event.
-
 ### `httpreferrer`
 
 ```html
diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index 688dda5a68961..d267a61a47d00 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -562,7 +562,6 @@ app.on('web-contents-created', (event, contents) => {
   contents.on('will-attach-webview', (event, webPreferences, params) => {
     // Strip away preload scripts if unused or verify their location is legitimate
     delete webPreferences.preload
-    delete webPreferences.preloadURL
 
     // Disable Node.js integration
     webPreferences.nodeIntegration = false
diff --git a/lib/browser/guest-view-manager.ts b/lib/browser/guest-view-manager.ts
index c973586e807d5..c9c4585de28e4 100644
--- a/lib/browser/guest-view-manager.ts
+++ b/lib/browser/guest-view-manager.ts
@@ -15,6 +15,7 @@ interface GuestInstance {
 
 const webViewManager = process._linkedBinding('electron_browser_web_view_manager');
 const eventBinding = process._linkedBinding('electron_browser_event');
+const netBinding = process._linkedBinding('electron_browser_net');
 
 const supportedWebViewEvents = Object.keys(webViewEvents);
 
@@ -49,7 +50,7 @@ function makeWebPreferences (embedder: Electron.WebContents, params: Record<stri
   };
 
   if (params.preload) {
-    webPreferences.preloadURL = params.preload;
+    webPreferences.preload = netBinding.fileURLToFilePath(params.preload);
   }
 
   // Security options that guest will always inherit from embedder
diff --git a/shell/browser/api/electron_api_net.cc b/shell/browser/api/electron_api_net.cc
index 564fe440d604a..cf84a4b8a7137 100644
--- a/shell/browser/api/electron_api_net.cc
+++ b/shell/browser/api/electron_api_net.cc
@@ -5,11 +5,15 @@
 #include <string>
 
 #include "gin/handle.h"
+#include "net/base/filename_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_util.h"
 #include "services/network/public/cpp/features.h"
 #include "shell/browser/api/electron_api_url_loader.h"
+#include "shell/common/gin_converters/file_path_converter.h"
+#include "shell/common/gin_converters/gurl_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
+#include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/object_template_builder.h"
 
 #include "shell/common/node_includes.h"
@@ -28,6 +32,14 @@ bool IsValidHeaderValue(std::string header_value) {
   return net::HttpUtil::IsValidHeaderValue(header_value);
 }
 
+base::FilePath FileURLToFilePath(v8::Isolate* isolate, const GURL& url) {
+  base::FilePath path;
+  if (!net::FileURLToFilePath(url, &path))
+    gin_helper::ErrorThrower(isolate).ThrowError(
+        "Failed to convert URL to file path");
+  return path;
+}
+
 using electron::api::SimpleURLLoaderWrapper;
 
 void Initialize(v8::Local<v8::Object> exports,
@@ -41,6 +53,7 @@ void Initialize(v8::Local<v8::Object> exports,
   dict.SetMethod("isValidHeaderName", &IsValidHeaderName);
   dict.SetMethod("isValidHeaderValue", &IsValidHeaderValue);
   dict.SetMethod("createURLLoader", &SimpleURLLoaderWrapper::Create);
+  dict.SetMethod("fileURLToFilePath", &FileURLToFilePath);
 }
 
 }  // namespace
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index e54772a0bfce2..c7bdcbf362241 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -258,15 +258,6 @@ void WebContentsPreferences::Merge(
     } else {
       LOG(ERROR) << "preload script must have absolute path.";
     }
-  } else if (web_preferences.Get(options::kPreloadURL, &preload_url_str)) {
-    // Translate to file path if there is "preload-url" option.
-    base::FilePath preload;
-    GURL preload_url(preload_url_str);
-    if (net::FileURLToFilePath(preload_url, &preload)) {
-      preload_path_ = preload;
-    } else {
-      LOG(ERROR) << "preload url must be file:// protocol.";
-    }
   }
 
   std::string type;
diff --git a/shell/common/options_switches.cc b/shell/common/options_switches.cc
index 5ae559c437eb9..94ffb637ff124 100644
--- a/shell/common/options_switches.cc
+++ b/shell/common/options_switches.cc
@@ -120,9 +120,6 @@ const char kPreloadScript[] = "preload";
 
 const char kPreloadScripts[] = "preloadScripts";
 
-// Like --preload, but the passed argument is an URL.
-const char kPreloadURL[] = "preloadURL";
-
 // Enable the node integration.
 const char kNodeIntegration[] = "nodeIntegration";
 
diff --git a/shell/common/options_switches.h b/shell/common/options_switches.h
index cfe8a4a191ccc..d8f4819067911 100644
--- a/shell/common/options_switches.h
+++ b/shell/common/options_switches.h
@@ -66,7 +66,6 @@ extern const char kOverlayHeight[];
 extern const char kZoomFactor[];
 extern const char kPreloadScript[];
 extern const char kPreloadScripts[];
-extern const char kPreloadURL[];
 extern const char kNodeIntegration[];
 extern const char kContextIsolation[];
 extern const char kExperimentalFeatures[];
diff --git a/spec/static/main.js b/spec/static/main.js
index 28ec06f524cc7..675c90fb42a9f 100644
--- a/spec/static/main.js
+++ b/spec/static/main.js
@@ -155,7 +155,6 @@ ipcMain.on('disable-preload-on-next-will-attach-webview', (event, id) => {
   event.sender.once('will-attach-webview', (event, webPreferences, params) => {
     params.src = `file://${path.join(__dirname, '..', 'fixtures', 'pages', 'webview-stripped-preload.html')}`;
     delete webPreferences.preload;
-    delete webPreferences.preloadURL;
   });
 });
 
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 92d707c8edacc..c3b73935a2999 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -222,6 +222,7 @@ declare namespace NodeJS {
       isOnline(): boolean;
       isValidHeaderName: (headerName: string) => boolean;
       isValidHeaderValue: (headerValue: string) => boolean;
+      fileURLToFilePath: (url: string) => string;
       Net: any;
       net: any;
       createURLLoader(options: CreateURLLoaderOptions): URLLoader;
diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts
index a0d645440652f..49568925fa80b 100644
--- a/typings/internal-electron.d.ts
+++ b/typings/internal-electron.d.ts
@@ -97,7 +97,6 @@ declare namespace Electron {
 
   interface WebPreferences {
     disablePopups?: boolean;
-    preloadURL?: string;
     embedder?: Electron.WebContents;
     type?: 'backgroundPage' | 'window' | 'browserView' | 'remote' | 'webview' | 'offscreen';
   }

From df8fd1b269ace37e7ad62ffa9ac8895bca463ef6 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Thu, 17 Mar 2022 00:13:48 -0700
Subject: [PATCH 125/811] build: fix build by removing usage of removed
 preloadUrl (#33319)

---
 lib/browser/api/web-contents.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index cafe85cae4364..a8abf03fa6360 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -571,7 +571,7 @@ const loggingEnabled = () => {
 // Add JavaScript wrappers for WebContents class.
 WebContents.prototype._init = function () {
   const prefs = this.getLastWebPreferences() || {};
-  if (!prefs.nodeIntegration && (prefs.preload != null || prefs.preloadURL != null) && prefs.sandbox == null) {
+  if (!prefs.nodeIntegration && prefs.preload != null && prefs.sandbox == null) {
     deprecate.log('The default sandbox option for windows without nodeIntegration is changing. Presently, by default, when a window has a preload script, it defaults to being unsandboxed. In Electron 20, this default will be changing, and all windows that have nodeIntegration: false (which is the default) will be sandboxed by default. If your preload script doesn\'t use Node, no action is needed. If your preload script does use Node, either refactor it to move Node usage to the main process, or specify sandbox: false in your WebPreferences.');
   }
   // Read off the ID at construction time, so that it's accessible even after

From ce8e248b60b2ae6547eb037a8b22e93a5edeb699 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Thu, 17 Mar 2022 01:40:00 -0700
Subject: [PATCH 126/811] docs: remove unused images (#33310)

---
 docs/images/message-notification-renderer.png | Bin 10471 -> 0 bytes
 docs/images/online-event-detection.png        | Bin 45114 -> 0 bytes
 docs/images/tutorial-release-schedule.svg     |  97 ------------------
 3 files changed, 97 deletions(-)
 delete mode 100644 docs/images/message-notification-renderer.png
 delete mode 100644 docs/images/online-event-detection.png
 delete mode 100644 docs/images/tutorial-release-schedule.svg

diff --git a/docs/images/message-notification-renderer.png b/docs/images/message-notification-renderer.png
deleted file mode 100644
index 87c8a876a2b4f77c238abfeaa7aa6fc9f6cb9fac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10471
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

diff --git a/docs/images/online-event-detection.png b/docs/images/online-event-detection.png
deleted file mode 100644
index 4f16489a7271c530ec68872087ceddb1f84c1f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45114
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
Ae*gdg

diff --git a/docs/images/tutorial-release-schedule.svg b/docs/images/tutorial-release-schedule.svg
deleted file mode 100644
index 6fa6539167894..0000000000000
--- a/docs/images/tutorial-release-schedule.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<svg width="520" height="220" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <marker id="arrow" viewBox="-1 0 12 10" refX="10.5" refY="5" markerWidth="8" markerHeight="8" orient="auto">
-    <path d="M 0 0 L 10 5 L 0 10"/>
-  </marker>
-  <g transform="translate(0,40)">
-    <!-- master -->
-    <text x="60" y="30" text-anchor="end" alignment-baseline="middle">master</text>
-    <path d="M70 30 H 500" stroke-width="2" stroke="black"/>
-    <!-- v2.0 -->
-    <g>
-      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">2.0</text>
-      <circle cx="120" cy="60" r="5"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v2.0.0-beta0</text>
-      <circle cx="200" cy="60" r="5"/>
-      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v2.0.0</text>
-    </g>
-    <!-- v2.1 -->
-    <g transform="translate(130,0)">
-      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">2.1</text>
-      <circle cx="120" cy="60" r="5"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v2.1.0-beta0</text>
-      <circle cx="160" cy="60" r="5"/>
-      <text x="150" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 160,60)">v2.1.0-beta1</text>
-      <circle cx="200" cy="60" r="5"/>
-      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v2.1.0</text>
-    </g>
-    <!-- v3.0 -->
-    <g transform="translate(260,0)">
-      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">3.0</text>
-      <circle cx="120" cy="60" r="5"/>
-      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v3.0.0-beta0</text>
-      <circle cx="200" cy="60" r="5"/>
-      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v3.0.0</text>
-    </g>
-    <!-- Bug fixes -->
-    <g transform="translate(160,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
-      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
-    </g>
-    <g transform="translate(260,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
-      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
-    </g>
-    <g transform="translate(280,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
-      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
-    </g>
-    <g transform="translate(400,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
-      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
-    </g>
-    <g transform="translate(430,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
-      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
-    </g>
-    <!-- Features -->
-    <g transform="translate(130,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
-    </g>
-    <g transform="translate(200,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
-    </g>
-    <g transform="translate(340,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
-    </g>
-    <!-- Chromium update -->
-    <g transform="translate(310,30)">
-      <circle cx="0" cy="0" r="3"/>
-      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)"><tspan>chromium</tspan><tspan dy="10" x="10">update</tspan></text>
-    </g>
-    <!-- Timeline -->
-    <g transform="translate(100,160)">
-      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
-      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
-    </g>
-    <g transform="translate(230,160)">
-      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
-      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
-    </g>
-    <g transform="translate(360,160)">
-      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
-      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file

From 7acb513ba675aee12bdf52cf5ca8c3d162a93ef4 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Thu, 17 Mar 2022 05:45:55 -0700
Subject: [PATCH 127/811] docs: update links to Chromium source (#33309)

---
 docs/api/app.md                                | 4 ++--
 docs/api/client-request.md                     | 2 +-
 docs/api/command-line-switches.md              | 4 ++--
 docs/api/content-tracing.md                    | 2 +-
 docs/api/session.md                            | 2 +-
 docs/api/structures/protocol-response.md       | 2 +-
 docs/api/structures/trace-config.md            | 8 ++++----
 docs/api/web-contents.md                       | 2 +-
 docs/development/build-instructions-gn.md      | 6 +++---
 docs/development/build-instructions-windows.md | 2 +-
 docs/glossary.md                               | 2 +-
 docs/tutorial/sandbox.md                       | 2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 60eb2ee7785c2..b8c4780b22853 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -714,7 +714,7 @@ Overrides the current application's name.
 ### `app.getLocale()`
 
 Returns `string` - The current application locale, fetched using Chromium's `l10n_util` library.
-Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/master:ui/base/l10n/l10n_util.cc).
+Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/main:ui/base/l10n/l10n_util.cc).
 
 To set the locale, you'll want to use a command line switch at app startup, which may be found [here](command-line-switches.md).
 
@@ -1093,7 +1093,7 @@ Activation policy types:
 
 Imports the certificate in pkcs12 format into the platform certificate store.
 `callback` is called with the `result` of import operation, a value of `0`
-indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
 
 ### `app.configureHostResolver(options)`
 
diff --git a/docs/api/client-request.md b/docs/api/client-request.md
index 12f1ce1157e5b..81410a281816f 100644
--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -185,7 +185,7 @@ the first write will throw an error. If the passed value is not a `string`, its
 
 Certain headers are restricted from being set by apps. These headers are
 listed below. More information on restricted headers can be found in
-[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/master:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
+[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/main:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
 
 * `Content-Length`
 * `Host`
diff --git a/docs/api/command-line-switches.md b/docs/api/command-line-switches.md
index f395379c063fa..d628b0549c1dd 100644
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -274,8 +274,8 @@ By default inspector websocket url is available in stderr and under /json/list e
 [ready]: app.md#event-ready
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
-[logging]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h
+[logging]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h
 [node-cli]: https://nodejs.org/api/cli.html
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [ready]: app.md#event-ready
-[severities]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h?q=logging::LogSeverity&ss=chromium
+[severities]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h?q=logging::LogSeverity&ss=chromium
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index 91e3ca43a2560..ec8e3f7979701 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -36,7 +36,7 @@ Returns `Promise<string[]>` - resolves with an array of category groups once all
 
 Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
-categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).
+categories](https://chromium.googlesource.com/chromium/src/+/main/base/trace_event/builtin_categories.h).
 
 > **NOTE:** Electron adds a non-default tracing category called `"electron"`.
 > This category can be used to capture Electron-specific tracing events.
diff --git a/docs/api/session.md b/docs/api/session.md
index 8bb1ad5ab3c5c..5dc29aba9b6d7 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -567,7 +567,7 @@ the original network configuration.
     * `errorCode` Integer - Error code.
   * `callback` Function
     * `verificationResult` Integer - Value can be one of certificate error codes
-    from [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+    from [here](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
     Apart from the certificate error codes, the following special codes can be used.
       * `0` - Indicates success and disables Certificate Transparency verification.
       * `-2` - Indicates failure.
diff --git a/docs/api/structures/protocol-response.md b/docs/api/structures/protocol-response.md
index a20873ebb3b46..21a863240fabb 100644
--- a/docs/api/structures/protocol-response.md
+++ b/docs/api/structures/protocol-response.md
@@ -31,4 +31,4 @@
 * `uploadData` [ProtocolResponseUploadData](protocol-response-upload-data.md) (optional) - The data used as upload data. This is only
   used for URL responses when `method` is `"POST"`.
 
-[net-error]: https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h
+[net-error]: https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h
diff --git a/docs/api/structures/trace-config.md b/docs/api/structures/trace-config.md
index d5b3795f228fd..4160b7121ca57 100644
--- a/docs/api/structures/trace-config.md
+++ b/docs/api/structures/trace-config.md
@@ -8,7 +8,7 @@
 * `enable_argument_filter` boolean (optional) - if true, filter event data
   according to a specific list of events that have been manually vetted to not
   include any PII. See [the implementation in
-  Chromium][trace_event_args_whitelist.cc] for specifics.
+  Chromium][trace_event_args_allowlist.cc] for specifics.
 * `included_categories` string[] (optional) - a list of tracing categories to
   include. Can include glob-like patterns using `*` at the end of the category
   name. See [tracing categories][] for the list of categories.
@@ -45,7 +45,7 @@ An example TraceConfig that roughly matches what Chrome DevTools records:
 }
 ```
 
-[tracing categories]: https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h
-[memory-infra docs]: https://chromium.googlesource.com/chromium/src/+/master/docs/memory-infra/memory_infra_startup_tracing.md#the-advanced-way
-[trace_event_args_whitelist.cc]: https://chromium.googlesource.com/chromium/src/+/master/services/tracing/public/cpp/trace_event_args_whitelist.cc
+[tracing categories]: https://chromium.googlesource.com/chromium/src/+/main/base/trace_event/builtin_categories.h
+[memory-infra docs]: https://chromium.googlesource.com/chromium/src/+/main/docs/memory-infra/memory_infra_startup_tracing.md#the-advanced-way
+[trace_event_args_allowlist.cc]: https://chromium.googlesource.com/chromium/src/+/main/services/tracing/public/cpp/trace_event_args_allowlist.cc
 [histogram]: https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 35ce46b590cc9..bdfa225332567 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -92,7 +92,7 @@ Returns:
 * `frameRoutingId` Integer
 
 This event is like `did-finish-load` but emitted when the load failed.
-The full list of error codes and their meaning is available [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+The full list of error codes and their meaning is available [here](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
 
 #### Event: 'did-fail-provisional-load'
 
diff --git a/docs/development/build-instructions-gn.md b/docs/development/build-instructions-gn.md
index 70b5c48ed857c..cd955743df3b9 100644
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -196,12 +196,12 @@ If you test other combinations and find them to work, please update this documen
 See the GN reference for allowable values of [`target_os`][target_os values]
 and [`target_cpu`][target_cpu values].
 
-[target_os values]: https://gn.googlesource.com/gn/+/master/docs/reference.md#built_in-predefined-variables-target_os_the-desired-operating-system-for-the-build-possible-values
-[target_cpu values]: https://gn.googlesource.com/gn/+/master/docs/reference.md#built_in-predefined-variables-target_cpu_the-desired-cpu-architecture-for-the-build-possible-values
+[target_os values]: https://gn.googlesource.com/gn/+/main/docs/reference.md#built_in-predefined-variables-target_os_the-desired-operating-system-for-the-build-possible-values
+[target_cpu values]: https://gn.googlesource.com/gn/+/main/docs/reference.md#built_in-predefined-variables-target_cpu_the-desired-cpu-architecture-for-the-build-possible-values
 
 #### Windows on Arm (experimental)
 
-To cross-compile for Windows on Arm, [follow Chromium's guide](https://chromium.googlesource.com/chromium/src/+/refs/heads/master/docs/windows_build_instructions.md#Visual-Studio) to get the necessary dependencies, SDK and libraries, then build with `ELECTRON_BUILDING_WOA=1` in your environment before running `gclient sync`.
+To cross-compile for Windows on Arm, [follow Chromium's guide](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/windows_build_instructions.md#Visual-Studio) to get the necessary dependencies, SDK and libraries, then build with `ELECTRON_BUILDING_WOA=1` in your environment before running `gclient sync`.
 
 ```bat
 set ELECTRON_BUILDING_WOA=1
diff --git a/docs/development/build-instructions-windows.md b/docs/development/build-instructions-windows.md
index 49e436197d851..b827a713784b2 100644
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -9,7 +9,7 @@ Follow the guidelines below for building **Electron itself** on Windows, for the
 * Windows 10 / Server 2012 R2 or higher
 * Visual Studio 2017 15.7.2 or higher - [download VS 2019 Community Edition for
   free](https://www.visualstudio.com/vs/)
-  * See [the Chromium build documentation](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md#visual-studio) for more details on which Visual Studio
+  * See [the Chromium build documentation](https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#visual-studio) for more details on which Visual Studio
   components are required.
   * If your Visual Studio is installed in a directory other than the default, you'll need to
   set a few environment variables to point the toolchains to your installation path.
diff --git a/docs/glossary.md b/docs/glossary.md
index a4bfa2a96071f..893c598c52b80 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -91,7 +91,7 @@ An IPC system for communicating intra- or inter-process, and that's important
 because Chrome is keen on being able to split its work into separate processes
 or not, depending on memory pressures etc.
 
-See https://chromium.googlesource.com/chromium/src/+/master/mojo/README.md
+See https://chromium.googlesource.com/chromium/src/+/main/mojo/README.md
 
 See also: [IPC](#ipc)
 
diff --git a/docs/tutorial/sandbox.md b/docs/tutorial/sandbox.md
index 0eb955c5da75f..db71727efb6cc 100644
--- a/docs/tutorial/sandbox.md
+++ b/docs/tutorial/sandbox.md
@@ -157,7 +157,7 @@ versions of Electron, we do not make a guarantee that every fix will be
 backported. Your best chance at staying secure is to be on the latest stable
 version of Electron.
 
-[sandbox]: https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md
+[sandbox]: https://chromium.googlesource.com/chromium/src/+/main/docs/design/sandbox.md
 [issue-28466]: https://github.com/electron/electron/issues/28466
 [browser-window]: ../api/browser-window.md
 [enable-sandbox]: ../api/app.md#appenablesandbox

From ac6ed62ab96a0a0717ce3259f9c02da4dff7285f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 17 Mar 2022 06:01:17 -0700
Subject: [PATCH 128/811] Bump v19.0.0-nightly.20220317

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a3fb7e2f9cea8..cd9d8360c400f 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220316
\ No newline at end of file
+19.0.0-nightly.20220317
\ No newline at end of file
diff --git a/package.json b/package.json
index b2b2ab389a8c3..678190af931e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220316",
+  "version": "19.0.0-nightly.20220317",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d462bc89974f0..f0020411c7dd5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220316
- PRODUCTVERSION 19,0,0,20220316
+ FILEVERSION 19,0,0,20220317
+ PRODUCTVERSION 19,0,0,20220317
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f2b06324b8836a4a3acc93c86f77a624c04b855b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 18 Mar 2022 06:01:12 -0700
Subject: [PATCH 129/811] Bump v19.0.0-nightly.20220318

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index cd9d8360c400f..e1b801e28d07d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220317
\ No newline at end of file
+19.0.0-nightly.20220318
\ No newline at end of file
diff --git a/package.json b/package.json
index 678190af931e5..90e4b2ae0145c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220317",
+  "version": "19.0.0-nightly.20220318",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f0020411c7dd5..14ba8ce3ae702 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220317
- PRODUCTVERSION 19,0,0,20220317
+ FILEVERSION 19,0,0,20220318
+ PRODUCTVERSION 19,0,0,20220318
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From e07c2b84d76e649478e44a81a445c4076c4e603f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Fri, 18 Mar 2022 19:50:05 -0700
Subject: [PATCH 130/811] fix: ensure ElectronBrowser mojo service is only
 bound to appropriate render frames (#33323)

* fix: ensure ElectronBrowser mojo service is only bound to authorized render frames

Notes: no-notes

* refactor: extract electron API IPC to its own mojo interface

* fix: just check main frame not primary main frame
---
 filenames.gni                                 |   6 +-
 .../browser/api/electron_api_web_contents.cc  |  13 +-
 shell/browser/api/electron_api_web_contents.h |  16 +-
 shell/browser/api/event.h                     |   2 +-
 .../browser/electron_api_ipc_handler_impl.cc  | 108 ++++++++++++++
 ...impl.h => electron_api_ipc_handler_impl.h} |  37 ++---
 shell/browser/electron_browser_client.cc      |  30 +++-
 .../browser/electron_browser_handler_impl.cc  | 141 ------------------
 ...ctron_web_contents_utility_handler_impl.cc |  83 +++++++++++
 ...ectron_web_contents_utility_handler_impl.h |  71 +++++++++
 shell/browser/web_contents_preferences.h      |   3 +
 shell/common/api/api.mojom                    |  28 ++--
 shell/common/gin_helper/event_emitter.cc      |   2 +-
 shell/common/gin_helper/event_emitter.h       |   2 +-
 .../renderer/api/electron_api_ipc_renderer.cc |  39 +++--
 shell/renderer/api/electron_api_web_frame.cc  |  14 +-
 .../electron_render_frame_observer.cc         |  15 +-
 17 files changed, 381 insertions(+), 229 deletions(-)
 create mode 100644 shell/browser/electron_api_ipc_handler_impl.cc
 rename shell/browser/{electron_browser_handler_impl.h => electron_api_ipc_handler_impl.h} (58%)
 delete mode 100644 shell/browser/electron_browser_handler_impl.cc
 create mode 100644 shell/browser/electron_web_contents_utility_handler_impl.cc
 create mode 100644 shell/browser/electron_web_contents_utility_handler_impl.h

diff --git a/filenames.gni b/filenames.gni
index 8e6da3eb657f4..eae36f790483d 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -350,6 +350,8 @@ filenames = {
     "shell/browser/child_web_contents_tracker.h",
     "shell/browser/cookie_change_notifier.cc",
     "shell/browser/cookie_change_notifier.h",
+    "shell/browser/electron_api_ipc_handler_impl.cc",
+    "shell/browser/electron_api_ipc_handler_impl.h",
     "shell/browser/electron_autofill_driver.cc",
     "shell/browser/electron_autofill_driver.h",
     "shell/browser/electron_autofill_driver_factory.cc",
@@ -358,8 +360,6 @@ filenames = {
     "shell/browser/electron_browser_client.h",
     "shell/browser/electron_browser_context.cc",
     "shell/browser/electron_browser_context.h",
-    "shell/browser/electron_browser_handler_impl.cc",
-    "shell/browser/electron_browser_handler_impl.h",
     "shell/browser/electron_browser_main_parts.cc",
     "shell/browser/electron_browser_main_parts.h",
     "shell/browser/electron_download_manager_delegate.cc",
@@ -376,6 +376,8 @@ filenames = {
     "shell/browser/electron_quota_permission_context.h",
     "shell/browser/electron_speech_recognition_manager_delegate.cc",
     "shell/browser/electron_speech_recognition_manager_delegate.h",
+    "shell/browser/electron_web_contents_utility_handler_impl.cc",
+    "shell/browser/electron_web_contents_utility_handler_impl.h",
     "shell/browser/electron_web_ui_controller_factory.cc",
     "shell/browser/electron_web_ui_controller_factory.h",
     "shell/browser/event_emitter_mixin.cc",
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 0da1f050e7695..f6d275e8f4c3b 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1751,7 +1751,7 @@ void WebContents::Message(bool internal,
   // webContents.emit('-ipc-message', new Event(), internal, channel,
   // arguments);
   EmitWithSender("-ipc-message", render_frame_host,
-                 electron::mojom::ElectronBrowser::InvokeCallback(), internal,
+                 electron::mojom::ElectronApiIPC::InvokeCallback(), internal,
                  channel, std::move(arguments));
 }
 
@@ -1759,7 +1759,7 @@ void WebContents::Invoke(
     bool internal,
     const std::string& channel,
     blink::CloneableMessage arguments,
-    electron::mojom::ElectronBrowser::InvokeCallback callback,
+    electron::mojom::ElectronApiIPC::InvokeCallback callback,
     content::RenderFrameHost* render_frame_host) {
   TRACE_EVENT1("electron", "WebContents::Invoke", "channel", channel);
   // webContents.emit('-ipc-invoke', new Event(), internal, channel, arguments);
@@ -1785,7 +1785,7 @@ void WebContents::ReceivePostMessage(
   v8::Local<v8::Value> message_value =
       electron::DeserializeV8Value(isolate, message);
   EmitWithSender("-ipc-ports", render_frame_host,
-                 electron::mojom::ElectronBrowser::InvokeCallback(), false,
+                 electron::mojom::ElectronApiIPC::InvokeCallback(), false,
                  channel, message_value, std::move(wrapped_ports));
 }
 
@@ -1793,7 +1793,7 @@ void WebContents::MessageSync(
     bool internal,
     const std::string& channel,
     blink::CloneableMessage arguments,
-    electron::mojom::ElectronBrowser::MessageSyncCallback callback,
+    electron::mojom::ElectronApiIPC::MessageSyncCallback callback,
     content::RenderFrameHost* render_frame_host) {
   TRACE_EVENT1("electron", "WebContents::MessageSync", "channel", channel);
   // webContents.emit('-ipc-message-sync', new Event(sender, message), internal,
@@ -1831,7 +1831,7 @@ void WebContents::MessageHost(const std::string& channel,
   TRACE_EVENT1("electron", "WebContents::MessageHost", "channel", channel);
   // webContents.emit('ipc-message-host', new Event(), channel, args);
   EmitWithSender("ipc-message-host", render_frame_host,
-                 electron::mojom::ElectronBrowser::InvokeCallback(), channel,
+                 electron::mojom::ElectronApiIPC::InvokeCallback(), channel,
                  std::move(arguments));
 }
 
@@ -3270,7 +3270,8 @@ void WebContents::SetTemporaryZoomLevel(double level) {
 }
 
 void WebContents::DoGetZoomLevel(
-    electron::mojom::ElectronBrowser::DoGetZoomLevelCallback callback) {
+    electron::mojom::ElectronWebContentsUtility::DoGetZoomLevelCallback
+        callback) {
   std::move(callback).Run(GetZoomLevel());
 }
 
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index b034167631fa3..996c90cbbbc39 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -355,7 +355,7 @@ class WebContents : public ExclusiveAccessContext,
   template <typename... Args>
   bool EmitWithSender(base::StringPiece name,
                       content::RenderFrameHost* sender,
-                      electron::mojom::ElectronBrowser::InvokeCallback callback,
+                      electron::mojom::ElectronApiIPC::InvokeCallback callback,
                       Args&&... args) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
@@ -399,7 +399,7 @@ class WebContents : public ExclusiveAccessContext,
     fullscreen_frame_ = rfh;
   }
 
-  // mojom::ElectronBrowser
+  // mojom::ElectronApiIPC
   void Message(bool internal,
                const std::string& channel,
                blink::CloneableMessage arguments,
@@ -407,9 +407,8 @@ class WebContents : public ExclusiveAccessContext,
   void Invoke(bool internal,
               const std::string& channel,
               blink::CloneableMessage arguments,
-              electron::mojom::ElectronBrowser::InvokeCallback callback,
+              electron::mojom::ElectronApiIPC::InvokeCallback callback,
               content::RenderFrameHost* render_frame_host);
-  void OnFirstNonEmptyLayout(content::RenderFrameHost* render_frame_host);
   void ReceivePostMessage(const std::string& channel,
                           blink::TransferableMessage message,
                           content::RenderFrameHost* render_frame_host);
@@ -417,7 +416,7 @@ class WebContents : public ExclusiveAccessContext,
       bool internal,
       const std::string& channel,
       blink::CloneableMessage arguments,
-      electron::mojom::ElectronBrowser::MessageSyncCallback callback,
+      electron::mojom::ElectronApiIPC::MessageSyncCallback callback,
       content::RenderFrameHost* render_frame_host);
   void MessageTo(int32_t web_contents_id,
                  const std::string& channel,
@@ -425,10 +424,15 @@ class WebContents : public ExclusiveAccessContext,
   void MessageHost(const std::string& channel,
                    blink::CloneableMessage arguments,
                    content::RenderFrameHost* render_frame_host);
+
+  // mojom::ElectronWebContentsUtility
+  void OnFirstNonEmptyLayout(content::RenderFrameHost* render_frame_host);
   void UpdateDraggableRegions(std::vector<mojom::DraggableRegionPtr> regions);
   void SetTemporaryZoomLevel(double level);
   void DoGetZoomLevel(
-      electron::mojom::ElectronBrowser::DoGetZoomLevelCallback callback);
+      electron::mojom::ElectronWebContentsUtility::DoGetZoomLevelCallback
+          callback);
+
   void SetImageAnimationPolicy(const std::string& new_policy);
 
   // Grants |origin| access to |device|.
diff --git a/shell/browser/api/event.h b/shell/browser/api/event.h
index 4a09575896e11..a9e4dec39e9d8 100644
--- a/shell/browser/api/event.h
+++ b/shell/browser/api/event.h
@@ -13,7 +13,7 @@ namespace gin_helper {
 
 class Event : public gin::Wrappable<Event> {
  public:
-  using InvokeCallback = electron::mojom::ElectronBrowser::InvokeCallback;
+  using InvokeCallback = electron::mojom::ElectronApiIPC::InvokeCallback;
 
   static gin::WrapperInfo kWrapperInfo;
 
diff --git a/shell/browser/electron_api_ipc_handler_impl.cc b/shell/browser/electron_api_ipc_handler_impl.cc
new file mode 100644
index 0000000000000..5a13fda3629e9
--- /dev/null
+++ b/shell/browser/electron_api_ipc_handler_impl.cc
@@ -0,0 +1,108 @@
+// Copyright (c) 2022 Slack Technologies, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/electron_api_ipc_handler_impl.h"
+
+#include <utility>
+
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
+
+namespace electron {
+ElectronApiIPCHandlerImpl::ElectronApiIPCHandlerImpl(
+    content::RenderFrameHost* frame_host,
+    mojo::PendingAssociatedReceiver<mojom::ElectronApiIPC> receiver)
+    : render_process_id_(frame_host->GetProcess()->GetID()),
+      render_frame_id_(frame_host->GetRoutingID()) {
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(frame_host);
+  DCHECK(web_contents);
+  content::WebContentsObserver::Observe(web_contents);
+
+  receiver_.Bind(std::move(receiver));
+  receiver_.set_disconnect_handler(base::BindOnce(
+      &ElectronApiIPCHandlerImpl::OnConnectionError, GetWeakPtr()));
+}
+
+ElectronApiIPCHandlerImpl::~ElectronApiIPCHandlerImpl() = default;
+
+void ElectronApiIPCHandlerImpl::WebContentsDestroyed() {
+  delete this;
+}
+
+void ElectronApiIPCHandlerImpl::OnConnectionError() {
+  delete this;
+}
+
+void ElectronApiIPCHandlerImpl::Message(bool internal,
+                                        const std::string& channel,
+                                        blink::CloneableMessage arguments) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->Message(internal, channel, std::move(arguments),
+                              GetRenderFrameHost());
+  }
+}
+void ElectronApiIPCHandlerImpl::Invoke(bool internal,
+                                       const std::string& channel,
+                                       blink::CloneableMessage arguments,
+                                       InvokeCallback callback) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->Invoke(internal, channel, std::move(arguments),
+                             std::move(callback), GetRenderFrameHost());
+  }
+}
+
+void ElectronApiIPCHandlerImpl::ReceivePostMessage(
+    const std::string& channel,
+    blink::TransferableMessage message) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->ReceivePostMessage(channel, std::move(message),
+                                         GetRenderFrameHost());
+  }
+}
+
+void ElectronApiIPCHandlerImpl::MessageSync(bool internal,
+                                            const std::string& channel,
+                                            blink::CloneableMessage arguments,
+                                            MessageSyncCallback callback) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->MessageSync(internal, channel, std::move(arguments),
+                                  std::move(callback), GetRenderFrameHost());
+  }
+}
+
+void ElectronApiIPCHandlerImpl::MessageTo(int32_t web_contents_id,
+                                          const std::string& channel,
+                                          blink::CloneableMessage arguments) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->MessageTo(web_contents_id, channel, std::move(arguments));
+  }
+}
+
+void ElectronApiIPCHandlerImpl::MessageHost(const std::string& channel,
+                                            blink::CloneableMessage arguments) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->MessageHost(channel, std::move(arguments),
+                                  GetRenderFrameHost());
+  }
+}
+
+content::RenderFrameHost* ElectronApiIPCHandlerImpl::GetRenderFrameHost() {
+  return content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+}
+
+// static
+void ElectronApiIPCHandlerImpl::Create(
+    content::RenderFrameHost* frame_host,
+    mojo::PendingAssociatedReceiver<mojom::ElectronApiIPC> receiver) {
+  new ElectronApiIPCHandlerImpl(frame_host, std::move(receiver));
+}
+}  // namespace electron
diff --git a/shell/browser/electron_browser_handler_impl.h b/shell/browser/electron_api_ipc_handler_impl.h
similarity index 58%
rename from shell/browser/electron_browser_handler_impl.h
rename to shell/browser/electron_api_ipc_handler_impl.h
index fea3f11907d1d..7cddf88bedc4a 100644
--- a/shell/browser/electron_browser_handler_impl.h
+++ b/shell/browser/electron_api_ipc_handler_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2019 Slack Technologies, Inc.
+// Copyright (c) 2022 Slack Technologies, Inc.
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_HANDLER_IMPL_H_
-#define ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_HANDLER_IMPL_H_
+#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_API_IPC_HANDLER_IMPL_H_
+#define ELECTRON_SHELL_BROWSER_ELECTRON_API_IPC_HANDLER_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -18,23 +18,23 @@ class RenderFrameHost;
 }
 
 namespace electron {
-class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
-                                   public content::WebContentsObserver {
+class ElectronApiIPCHandlerImpl : public mojom::ElectronApiIPC,
+                                  public content::WebContentsObserver {
  public:
-  explicit ElectronBrowserHandlerImpl(
+  explicit ElectronApiIPCHandlerImpl(
       content::RenderFrameHost* render_frame_host,
-      mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver);
+      mojo::PendingAssociatedReceiver<mojom::ElectronApiIPC> receiver);
 
   static void Create(
       content::RenderFrameHost* frame_host,
-      mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver);
+      mojo::PendingAssociatedReceiver<mojom::ElectronApiIPC> receiver);
 
   // disable copy
-  ElectronBrowserHandlerImpl(const ElectronBrowserHandlerImpl&) = delete;
-  ElectronBrowserHandlerImpl& operator=(const ElectronBrowserHandlerImpl&) =
+  ElectronApiIPCHandlerImpl(const ElectronApiIPCHandlerImpl&) = delete;
+  ElectronApiIPCHandlerImpl& operator=(const ElectronApiIPCHandlerImpl&) =
       delete;
 
-  // mojom::ElectronBrowser:
+  // mojom::ElectronApiIPC:
   void Message(bool internal,
                const std::string& channel,
                blink::CloneableMessage arguments) override;
@@ -42,7 +42,6 @@ class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
               const std::string& channel,
               blink::CloneableMessage arguments,
               InvokeCallback callback) override;
-  void OnFirstNonEmptyLayout() override;
   void ReceivePostMessage(const std::string& channel,
                           blink::TransferableMessage message) override;
   void MessageSync(bool internal,
@@ -54,17 +53,13 @@ class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
                  blink::CloneableMessage arguments) override;
   void MessageHost(const std::string& channel,
                    blink::CloneableMessage arguments) override;
-  void UpdateDraggableRegions(
-      std::vector<mojom::DraggableRegionPtr> regions) override;
-  void SetTemporaryZoomLevel(double level) override;
-  void DoGetZoomLevel(DoGetZoomLevelCallback callback) override;
 
-  base::WeakPtr<ElectronBrowserHandlerImpl> GetWeakPtr() {
+  base::WeakPtr<ElectronApiIPCHandlerImpl> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
   }
 
  private:
-  ~ElectronBrowserHandlerImpl() override;
+  ~ElectronApiIPCHandlerImpl() override;
 
   // content::WebContentsObserver:
   void WebContentsDestroyed() override;
@@ -76,9 +71,9 @@ class ElectronBrowserHandlerImpl : public mojom::ElectronBrowser,
   const int render_process_id_;
   const int render_frame_id_;
 
-  mojo::AssociatedReceiver<mojom::ElectronBrowser> receiver_{this};
+  mojo::AssociatedReceiver<mojom::ElectronApiIPC> receiver_{this};
 
-  base::WeakPtrFactory<ElectronBrowserHandlerImpl> weak_factory_{this};
+  base::WeakPtrFactory<ElectronApiIPCHandlerImpl> weak_factory_{this};
 };
 }  // namespace electron
-#endif  // ELECTRON_SHELL_BROWSER_ELECTRON_BROWSER_HANDLER_IMPL_H_
+#endif  // ELECTRON_SHELL_BROWSER_ELECTRON_API_IPC_HANDLER_IMPL_H_
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 04e31a63b754d..50fff944a3af3 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -77,13 +77,14 @@
 #include "shell/browser/api/electron_api_web_request.h"
 #include "shell/browser/badging/badge_manager.h"
 #include "shell/browser/child_web_contents_tracker.h"
+#include "shell/browser/electron_api_ipc_handler_impl.h"
 #include "shell/browser/electron_autofill_driver_factory.h"
 #include "shell/browser/electron_browser_context.h"
-#include "shell/browser/electron_browser_handler_impl.h"
 #include "shell/browser/electron_browser_main_parts.h"
 #include "shell/browser/electron_navigation_throttle.h"
 #include "shell/browser/electron_quota_permission_context.h"
 #include "shell/browser/electron_speech_recognition_manager_delegate.h"
+#include "shell/browser/electron_web_contents_utility_handler_impl.h"
 #include "shell/browser/font_defaults.h"
 #include "shell/browser/javascript_environment.h"
 #include "shell/browser/media/media_capture_devices_dispatcher.h"
@@ -1515,14 +1516,33 @@ void ElectronBrowserClient::
             render_frame_host,  // NOLINT(runtime/references)
         blink::AssociatedInterfaceRegistry&
             associated_registry) {  // NOLINT(runtime/references)
+  auto* contents =
+      content::WebContents::FromRenderFrameHost(&render_frame_host);
+  if (contents) {
+    auto* prefs = WebContentsPreferences::From(contents);
+    if (render_frame_host.GetFrameTreeNodeId() ==
+            contents->GetMainFrame()->GetFrameTreeNodeId() ||
+        (prefs && prefs->AllowsNodeIntegrationInSubFrames())) {
+      associated_registry.AddInterface(base::BindRepeating(
+          [](content::RenderFrameHost* render_frame_host,
+             mojo::PendingAssociatedReceiver<electron::mojom::ElectronApiIPC>
+                 receiver) {
+            ElectronApiIPCHandlerImpl::Create(render_frame_host,
+                                              std::move(receiver));
+          },
+          &render_frame_host));
+    }
+  }
+
   associated_registry.AddInterface(base::BindRepeating(
       [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<electron::mojom::ElectronBrowser>
-             receiver) {
-        ElectronBrowserHandlerImpl::Create(render_frame_host,
-                                           std::move(receiver));
+         mojo::PendingAssociatedReceiver<
+             electron::mojom::ElectronWebContentsUtility> receiver) {
+        ElectronWebContentsUtilityHandlerImpl::Create(render_frame_host,
+                                                      std::move(receiver));
       },
       &render_frame_host));
+
   associated_registry.AddInterface(base::BindRepeating(
       [](content::RenderFrameHost* render_frame_host,
          mojo::PendingAssociatedReceiver<mojom::ElectronAutofillDriver>
diff --git a/shell/browser/electron_browser_handler_impl.cc b/shell/browser/electron_browser_handler_impl.cc
deleted file mode 100644
index e66968b0cb132..0000000000000
--- a/shell/browser/electron_browser_handler_impl.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2019 Slack Technologies, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "shell/browser/electron_browser_handler_impl.h"
-
-#include <utility>
-
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_process_host.h"
-#include "mojo/public/cpp/bindings/self_owned_receiver.h"
-
-namespace electron {
-ElectronBrowserHandlerImpl::ElectronBrowserHandlerImpl(
-    content::RenderFrameHost* frame_host,
-    mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver)
-    : render_process_id_(frame_host->GetProcess()->GetID()),
-      render_frame_id_(frame_host->GetRoutingID()) {
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(frame_host);
-  DCHECK(web_contents);
-  content::WebContentsObserver::Observe(web_contents);
-
-  receiver_.Bind(std::move(receiver));
-  receiver_.set_disconnect_handler(base::BindOnce(
-      &ElectronBrowserHandlerImpl::OnConnectionError, GetWeakPtr()));
-}
-
-ElectronBrowserHandlerImpl::~ElectronBrowserHandlerImpl() = default;
-
-void ElectronBrowserHandlerImpl::WebContentsDestroyed() {
-  delete this;
-}
-
-void ElectronBrowserHandlerImpl::OnConnectionError() {
-  delete this;
-}
-
-void ElectronBrowserHandlerImpl::Message(bool internal,
-                                         const std::string& channel,
-                                         blink::CloneableMessage arguments) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->Message(internal, channel, std::move(arguments),
-                              GetRenderFrameHost());
-  }
-}
-void ElectronBrowserHandlerImpl::Invoke(bool internal,
-                                        const std::string& channel,
-                                        blink::CloneableMessage arguments,
-                                        InvokeCallback callback) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->Invoke(internal, channel, std::move(arguments),
-                             std::move(callback), GetRenderFrameHost());
-  }
-}
-
-void ElectronBrowserHandlerImpl::OnFirstNonEmptyLayout() {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->OnFirstNonEmptyLayout(GetRenderFrameHost());
-  }
-}
-
-void ElectronBrowserHandlerImpl::ReceivePostMessage(
-    const std::string& channel,
-    blink::TransferableMessage message) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->ReceivePostMessage(channel, std::move(message),
-                                         GetRenderFrameHost());
-  }
-}
-
-void ElectronBrowserHandlerImpl::MessageSync(bool internal,
-                                             const std::string& channel,
-                                             blink::CloneableMessage arguments,
-                                             MessageSyncCallback callback) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->MessageSync(internal, channel, std::move(arguments),
-                                  std::move(callback), GetRenderFrameHost());
-  }
-}
-
-void ElectronBrowserHandlerImpl::MessageTo(int32_t web_contents_id,
-                                           const std::string& channel,
-                                           blink::CloneableMessage arguments) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->MessageTo(web_contents_id, channel, std::move(arguments));
-  }
-}
-
-void ElectronBrowserHandlerImpl::MessageHost(
-    const std::string& channel,
-    blink::CloneableMessage arguments) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->MessageHost(channel, std::move(arguments),
-                                  GetRenderFrameHost());
-  }
-}
-
-void ElectronBrowserHandlerImpl::UpdateDraggableRegions(
-    std::vector<mojom::DraggableRegionPtr> regions) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->UpdateDraggableRegions(std::move(regions));
-  }
-}
-
-void ElectronBrowserHandlerImpl::SetTemporaryZoomLevel(double level) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->SetTemporaryZoomLevel(level);
-  }
-}
-
-void ElectronBrowserHandlerImpl::DoGetZoomLevel(
-    DoGetZoomLevelCallback callback) {
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
-  if (api_web_contents) {
-    api_web_contents->DoGetZoomLevel(std::move(callback));
-  }
-}
-
-content::RenderFrameHost* ElectronBrowserHandlerImpl::GetRenderFrameHost() {
-  return content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-}
-
-// static
-void ElectronBrowserHandlerImpl::Create(
-    content::RenderFrameHost* frame_host,
-    mojo::PendingAssociatedReceiver<mojom::ElectronBrowser> receiver) {
-  new ElectronBrowserHandlerImpl(frame_host, std::move(receiver));
-}
-}  // namespace electron
diff --git a/shell/browser/electron_web_contents_utility_handler_impl.cc b/shell/browser/electron_web_contents_utility_handler_impl.cc
new file mode 100644
index 0000000000000..807dcdbdf9cc1
--- /dev/null
+++ b/shell/browser/electron_web_contents_utility_handler_impl.cc
@@ -0,0 +1,83 @@
+// Copyright (c) 2022 Slack Technologies, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/electron_web_contents_utility_handler_impl.h"
+
+#include <utility>
+
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
+
+namespace electron {
+ElectronWebContentsUtilityHandlerImpl::ElectronWebContentsUtilityHandlerImpl(
+    content::RenderFrameHost* frame_host,
+    mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility> receiver)
+    : render_process_id_(frame_host->GetProcess()->GetID()),
+      render_frame_id_(frame_host->GetRoutingID()) {
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(frame_host);
+  DCHECK(web_contents);
+  content::WebContentsObserver::Observe(web_contents);
+
+  receiver_.Bind(std::move(receiver));
+  receiver_.set_disconnect_handler(base::BindOnce(
+      &ElectronWebContentsUtilityHandlerImpl::OnConnectionError, GetWeakPtr()));
+}
+
+ElectronWebContentsUtilityHandlerImpl::
+    ~ElectronWebContentsUtilityHandlerImpl() = default;
+
+void ElectronWebContentsUtilityHandlerImpl::WebContentsDestroyed() {
+  delete this;
+}
+
+void ElectronWebContentsUtilityHandlerImpl::OnConnectionError() {
+  delete this;
+}
+
+void ElectronWebContentsUtilityHandlerImpl::OnFirstNonEmptyLayout() {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->OnFirstNonEmptyLayout(GetRenderFrameHost());
+  }
+}
+
+void ElectronWebContentsUtilityHandlerImpl::UpdateDraggableRegions(
+    std::vector<mojom::DraggableRegionPtr> regions) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->UpdateDraggableRegions(std::move(regions));
+  }
+}
+
+void ElectronWebContentsUtilityHandlerImpl::SetTemporaryZoomLevel(
+    double level) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->SetTemporaryZoomLevel(level);
+  }
+}
+
+void ElectronWebContentsUtilityHandlerImpl::DoGetZoomLevel(
+    DoGetZoomLevelCallback callback) {
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents());
+  if (api_web_contents) {
+    api_web_contents->DoGetZoomLevel(std::move(callback));
+  }
+}
+
+content::RenderFrameHost*
+ElectronWebContentsUtilityHandlerImpl::GetRenderFrameHost() {
+  return content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+}
+
+// static
+void ElectronWebContentsUtilityHandlerImpl::Create(
+    content::RenderFrameHost* frame_host,
+    mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility>
+        receiver) {
+  new ElectronWebContentsUtilityHandlerImpl(frame_host, std::move(receiver));
+}
+}  // namespace electron
diff --git a/shell/browser/electron_web_contents_utility_handler_impl.h b/shell/browser/electron_web_contents_utility_handler_impl.h
new file mode 100644
index 0000000000000..30a9baa40f835
--- /dev/null
+++ b/shell/browser/electron_web_contents_utility_handler_impl.h
@@ -0,0 +1,71 @@
+// Copyright (c) 2022 Slack Technologies, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_SHELL_BROWSER_ELECTRON_WEB_CONTENTS_UTILITY_HANDLER_IMPL_H_
+#define ELECTRON_SHELL_BROWSER_ELECTRON_WEB_CONTENTS_UTILITY_HANDLER_IMPL_H_
+
+#include <string>
+#include <vector>
+
+#include "base/memory/weak_ptr.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "electron/shell/common/api/api.mojom.h"
+#include "shell/browser/api/electron_api_web_contents.h"
+
+namespace content {
+class RenderFrameHost;
+}
+
+namespace electron {
+class ElectronWebContentsUtilityHandlerImpl
+    : public mojom::ElectronWebContentsUtility,
+      public content::WebContentsObserver {
+ public:
+  explicit ElectronWebContentsUtilityHandlerImpl(
+      content::RenderFrameHost* render_frame_host,
+      mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility>
+          receiver);
+
+  static void Create(
+      content::RenderFrameHost* frame_host,
+      mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility>
+          receiver);
+
+  // disable copy
+  ElectronWebContentsUtilityHandlerImpl(
+      const ElectronWebContentsUtilityHandlerImpl&) = delete;
+  ElectronWebContentsUtilityHandlerImpl& operator=(
+      const ElectronWebContentsUtilityHandlerImpl&) = delete;
+
+  // mojom::ElectronWebContentsUtility:
+  void OnFirstNonEmptyLayout() override;
+  void UpdateDraggableRegions(
+      std::vector<mojom::DraggableRegionPtr> regions) override;
+  void SetTemporaryZoomLevel(double level) override;
+  void DoGetZoomLevel(DoGetZoomLevelCallback callback) override;
+
+  base::WeakPtr<ElectronWebContentsUtilityHandlerImpl> GetWeakPtr() {
+    return weak_factory_.GetWeakPtr();
+  }
+
+ private:
+  ~ElectronWebContentsUtilityHandlerImpl() override;
+
+  // content::WebContentsObserver:
+  void WebContentsDestroyed() override;
+
+  void OnConnectionError();
+
+  content::RenderFrameHost* GetRenderFrameHost();
+
+  const int render_process_id_;
+  const int render_frame_id_;
+
+  mojo::AssociatedReceiver<mojom::ElectronWebContentsUtility> receiver_{this};
+
+  base::WeakPtrFactory<ElectronWebContentsUtilityHandlerImpl> weak_factory_{
+      this};
+};
+}  // namespace electron
+#endif  // ELECTRON_SHELL_BROWSER_ELECTRON_WEB_CONTENTS_UTILITY_HANDLER_IMPL_H_
diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h
index 912540ac0aad0..544bc54a80e46 100644
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -71,6 +71,9 @@ class WebContentsPreferences
   bool ShouldDisableHtmlFullscreenWindowResize() const {
     return disable_html_fullscreen_window_resize_;
   }
+  bool AllowsNodeIntegrationInSubFrames() const {
+    return node_integration_in_sub_frames_;
+  }
   bool ShouldDisableDialogs() const { return disable_dialogs_; }
   bool ShouldUseSafeDialogs() const { return safe_dialogs_; }
   bool GetSafeDialogsMessage(std::string* message) const;
diff --git a/shell/common/api/api.mojom b/shell/common/api/api.mojom
index 1206b5858a183..4515b82ac48d0 100644
--- a/shell/common/api/api.mojom
+++ b/shell/common/api/api.mojom
@@ -31,7 +31,21 @@ struct DraggableRegion {
   gfx.mojom.Rect bounds;
 };
 
-interface ElectronBrowser {
+interface ElectronWebContentsUtility {
+  // Informs underlying WebContents that first non-empty layout was performed
+  // by compositor.
+  OnFirstNonEmptyLayout();
+
+  UpdateDraggableRegions(
+    array<DraggableRegion> regions);
+
+  SetTemporaryZoomLevel(double zoom_level);
+
+  [Sync]
+  DoGetZoomLevel() => (double result);
+};
+
+interface ElectronApiIPC {
   // Emits an event on |channel| from the ipcMain JavaScript object in the main
   // process.
   Message(
@@ -46,10 +60,6 @@ interface ElectronBrowser {
       string channel,
       blink.mojom.CloneableMessage arguments) => (blink.mojom.CloneableMessage result);
 
-  // Informs underlying WebContents that first non-empty layout was performed
-  // by compositor.
-  OnFirstNonEmptyLayout();
-
   ReceivePostMessage(string channel, blink.mojom.TransferableMessage message);
 
   // Emits an event on |channel| from the ipcMain JavaScript object in the main
@@ -70,12 +80,4 @@ interface ElectronBrowser {
   MessageHost(
     string channel,
     blink.mojom.CloneableMessage arguments);
-
-  UpdateDraggableRegions(
-    array<DraggableRegion> regions);
-
-  SetTemporaryZoomLevel(double zoom_level);
-
-  [Sync]
-  DoGetZoomLevel() => (double result);
 };
diff --git a/shell/common/gin_helper/event_emitter.cc b/shell/common/gin_helper/event_emitter.cc
index 8779c05507ba1..32a3e4b1b8183 100644
--- a/shell/common/gin_helper/event_emitter.cc
+++ b/shell/common/gin_helper/event_emitter.cc
@@ -54,7 +54,7 @@ v8::Local<v8::Object> CreateNativeEvent(
     v8::Isolate* isolate,
     v8::Local<v8::Object> sender,
     content::RenderFrameHost* frame,
-    electron::mojom::ElectronBrowser::MessageSyncCallback callback) {
+    electron::mojom::ElectronApiIPC::MessageSyncCallback callback) {
   v8::Local<v8::Object> event;
   if (frame && callback) {
     gin::Handle<Event> native_event = Event::Create(isolate);
diff --git a/shell/common/gin_helper/event_emitter.h b/shell/common/gin_helper/event_emitter.h
index a69b595551ffb..90af3f7478df4 100644
--- a/shell/common/gin_helper/event_emitter.h
+++ b/shell/common/gin_helper/event_emitter.h
@@ -29,7 +29,7 @@ v8::Local<v8::Object> CreateNativeEvent(
     v8::Isolate* isolate,
     v8::Local<v8::Object> sender,
     content::RenderFrameHost* frame,
-    electron::mojom::ElectronBrowser::MessageSyncCallback callback);
+    electron::mojom::ElectronApiIPC::MessageSyncCallback callback);
 
 }  // namespace internal
 
diff --git a/shell/renderer/api/electron_api_ipc_renderer.cc b/shell/renderer/api/electron_api_ipc_renderer.cc
index 6b4f2698a968a..6f24ed17c4a3d 100644
--- a/shell/renderer/api/electron_api_ipc_renderer.cc
+++ b/shell/renderer/api/electron_api_ipc_renderer.cc
@@ -60,16 +60,16 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     weak_context_.SetWeak();
 
     render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
-        &electron_browser_remote_);
+        &electron_ipc_remote_);
   }
 
-  void OnDestruct() override { electron_browser_remote_.reset(); }
+  void OnDestruct() override { electron_ipc_remote_.reset(); }
 
   void WillReleaseScriptContext(v8::Local<v8::Context> context,
                                 int32_t world_id) override {
     if (weak_context_.IsEmpty() ||
         weak_context_.Get(context->GetIsolate()) == context)
-      electron_browser_remote_.reset();
+      electron_ipc_remote_.reset();
   }
 
   // gin::Wrappable:
@@ -92,7 +92,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                    bool internal,
                    const std::string& channel,
                    v8::Local<v8::Value> arguments) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return;
     }
@@ -100,7 +100,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     if (!electron::SerializeV8Value(isolate, arguments, &message)) {
       return;
     }
-    electron_browser_remote_->Message(internal, channel, std::move(message));
+    electron_ipc_remote_->Message(internal, channel, std::move(message));
   }
 
   v8::Local<v8::Promise> Invoke(v8::Isolate* isolate,
@@ -108,7 +108,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                                 bool internal,
                                 const std::string& channel,
                                 v8::Local<v8::Value> arguments) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return v8::Local<v8::Promise>();
     }
@@ -119,7 +119,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     gin_helper::Promise<blink::CloneableMessage> p(isolate);
     auto handle = p.GetHandle();
 
-    electron_browser_remote_->Invoke(
+    electron_ipc_remote_->Invoke(
         internal, channel, std::move(message),
         base::BindOnce(
             [](gin_helper::Promise<blink::CloneableMessage> p,
@@ -134,7 +134,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                    const std::string& channel,
                    v8::Local<v8::Value> message_value,
                    absl::optional<v8::Local<v8::Value>> transfer) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return;
     }
@@ -166,8 +166,8 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     }
 
     transferable_message.ports = std::move(ports);
-    electron_browser_remote_->ReceivePostMessage(
-        channel, std::move(transferable_message));
+    electron_ipc_remote_->ReceivePostMessage(channel,
+                                             std::move(transferable_message));
   }
 
   void SendTo(v8::Isolate* isolate,
@@ -175,7 +175,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
               int32_t web_contents_id,
               const std::string& channel,
               v8::Local<v8::Value> arguments) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return;
     }
@@ -183,15 +183,15 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     if (!electron::SerializeV8Value(isolate, arguments, &message)) {
       return;
     }
-    electron_browser_remote_->MessageTo(web_contents_id, channel,
-                                        std::move(message));
+    electron_ipc_remote_->MessageTo(web_contents_id, channel,
+                                    std::move(message));
   }
 
   void SendToHost(v8::Isolate* isolate,
                   gin_helper::ErrorThrower thrower,
                   const std::string& channel,
                   v8::Local<v8::Value> arguments) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return;
     }
@@ -199,7 +199,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     if (!electron::SerializeV8Value(isolate, arguments, &message)) {
       return;
     }
-    electron_browser_remote_->MessageHost(channel, std::move(message));
+    electron_ipc_remote_->MessageHost(channel, std::move(message));
   }
 
   v8::Local<v8::Value> SendSync(v8::Isolate* isolate,
@@ -207,7 +207,7 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
                                 bool internal,
                                 const std::string& channel,
                                 v8::Local<v8::Value> arguments) {
-    if (!electron_browser_remote_) {
+    if (!electron_ipc_remote_) {
       thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
       return v8::Local<v8::Value>();
     }
@@ -217,14 +217,13 @@ class IPCRenderer : public gin::Wrappable<IPCRenderer>,
     }
 
     blink::CloneableMessage result;
-    electron_browser_remote_->MessageSync(internal, channel, std::move(message),
-                                          &result);
+    electron_ipc_remote_->MessageSync(internal, channel, std::move(message),
+                                      &result);
     return electron::DeserializeV8Value(isolate, result);
   }
 
   v8::Global<v8::Context> weak_context_;
-  mojo::AssociatedRemote<electron::mojom::ElectronBrowser>
-      electron_browser_remote_;
+  mojo::AssociatedRemote<electron::mojom::ElectronApiIPC> electron_ipc_remote_;
 };
 
 gin::WrapperInfo IPCRenderer::kWrapperInfo = {gin::kEmbedderNativeGin};
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 25d2b5433b680..6ec08e583da96 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -453,10 +453,11 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     if (!MaybeGetRenderFrame(isolate, "setZoomLevel", &render_frame))
       return;
 
-    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    mojo::AssociatedRemote<mojom::ElectronWebContentsUtility>
+        web_contents_utility_remote;
     render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
-        &browser_remote);
-    browser_remote->SetTemporaryZoomLevel(level);
+        &web_contents_utility_remote);
+    web_contents_utility_remote->SetTemporaryZoomLevel(level);
   }
 
   double GetZoomLevel(v8::Isolate* isolate) {
@@ -465,10 +466,11 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     if (!MaybeGetRenderFrame(isolate, "getZoomLevel", &render_frame))
       return result;
 
-    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    mojo::AssociatedRemote<mojom::ElectronWebContentsUtility>
+        web_contents_utility_remote;
     render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
-        &browser_remote);
-    browser_remote->DoGetZoomLevel(&result);
+        &web_contents_utility_remote);
+    web_contents_utility_remote->DoGetZoomLevel(&result);
     return result;
   }
 
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index 4c763315f3539..2c22d1fceb62b 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -149,9 +149,11 @@ void ElectronRenderFrameObserver::DraggableRegionsChanged() {
     regions.push_back(std::move(region));
   }
 
-  mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
-  render_frame_->GetRemoteAssociatedInterfaces()->GetInterface(&browser_remote);
-  browser_remote->UpdateDraggableRegions(std::move(regions));
+  mojo::AssociatedRemote<mojom::ElectronWebContentsUtility>
+      web_contents_utility_remote;
+  render_frame_->GetRemoteAssociatedInterfaces()->GetInterface(
+      &web_contents_utility_remote);
+  web_contents_utility_remote->UpdateDraggableRegions(std::move(regions));
 }
 
 void ElectronRenderFrameObserver::WillReleaseScriptContext(
@@ -168,10 +170,11 @@ void ElectronRenderFrameObserver::OnDestruct() {
 void ElectronRenderFrameObserver::DidMeaningfulLayout(
     blink::WebMeaningfulLayout layout_type) {
   if (layout_type == blink::WebMeaningfulLayout::kVisuallyNonEmpty) {
-    mojo::AssociatedRemote<mojom::ElectronBrowser> browser_remote;
+    mojo::AssociatedRemote<mojom::ElectronWebContentsUtility>
+        web_contents_utility_remote;
     render_frame_->GetRemoteAssociatedInterfaces()->GetInterface(
-        &browser_remote);
-    browser_remote->OnFirstNonEmptyLayout();
+        &web_contents_utility_remote);
+    web_contents_utility_remote->OnFirstNonEmptyLayout();
   }
 }
 

From 08d54d241693441ef672efa87009c0eb01ae86cb Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Fri, 18 Mar 2022 21:29:42 -0700
Subject: [PATCH 131/811] fix: intialize FPS file in network service (#33339)

---
 shell/browser/net/system_network_context_manager.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index d1f474d59ead7..de3989ad88678 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -288,6 +288,10 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
       base::FeatureList::IsEnabled(features::kAsyncDns),
       default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
 
+  // Initializes first party sets component
+  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
+  content::GetNetworkService()->SetFirstPartySets(base::File());
+
   std::string app_name = electron::Browser::Get()->GetName();
 #if BUILDFLAG(IS_MAC)
   KeychainPassword::GetServiceName() = app_name + " Safe Storage";

From fdb60240f31b70130cbbf2d40e679f09c5919737 Mon Sep 17 00:00:00 2001
From: BIKI DAS <bikid475@gmail.com>
Date: Mon, 21 Mar 2022 06:51:21 +0530
Subject: [PATCH 132/811] fix: removed unused imported Objects (#33304)

---
 script/lib/util.py                 | 5 -----
 script/release/uploaders/upload.py | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/script/lib/util.py b/script/lib/util.py
index 9c667fed9e906..816fa47a106b8 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -1,18 +1,13 @@
 #!/usr/bin/env python
 
 from __future__ import print_function
-import atexit
 import contextlib
 import errno
 import json
 import os
 import shutil
-import ssl
-import stat
 import subprocess
 import sys
-import tarfile
-import tempfile
 # Python 3 / 2 compat import
 try:
   from urllib.request import urlopen
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 8b86a1d4884ea..2fc6416fc93c1 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -16,7 +16,7 @@
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
 from zipfile import ZipFile
-from lib.config import PLATFORM, get_target_arch,  get_env_var, s3_config, \
+from lib.config import PLATFORM, get_target_arch,s3_config, \
                        get_zip_name, enable_verbose_mode, get_platform_key
 from lib.util import get_electron_branding, execute, get_electron_version, \
                      s3put, get_electron_exec, get_out_dir, \

From 45e2f86fe018f3df8aad56e1a674ff2b50cd1c9b Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Sun, 20 Mar 2022 19:11:21 -0700
Subject: [PATCH 133/811] chore: fix pylint-2.7 errors (#33233)

---
 script/add-debug-link.py                   |  3 +--
 script/check-relative-doc-links.py         |  2 +-
 script/copy-debug-symbols.py               |  4 +---
 script/generate-config-gypi.py             |  4 ++--
 script/generate-zip-manifest.py            |  2 +-
 script/lib/config.py                       |  4 ++--
 script/lib/git.py                          |  7 +++----
 script/lib/native_tests.py                 |  8 +++++---
 script/lib/util.py                         |  4 ++--
 script/native-tests.py                     |  8 ++++----
 script/release/uploaders/upload.py         |  4 +++-
 script/run-clang-format.py                 |  2 +-
 script/zip_manifests/check-zip-manifest.py | 10 ++++------
 13 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/script/add-debug-link.py b/script/add-debug-link.py
index bf21ab80f5920..201d726d8240e 100755
--- a/script/add-debug-link.py
+++ b/script/add-debug-link.py
@@ -14,8 +14,7 @@ def add_debug_link_into_binaries(directory, target_cpu, debug_dir):
       add_debug_link_into_binary(binary_path, target_cpu, debug_dir)
 
 def add_debug_link_into_binary(binary_path, target_cpu, debug_dir):
-  if PLATFORM == 'linux' and (target_cpu == 'x86' or target_cpu == 'arm' or
-    target_cpu == 'arm64'):
+  if PLATFORM == 'linux' and target_cpu in ('x86', 'arm', 'arm64'):
     # Skip because no objcopy binary on the given target.
     return
 
diff --git a/script/check-relative-doc-links.py b/script/check-relative-doc-links.py
index 01a3ebd0e078b..7839d73122d21 100755
--- a/script/check-relative-doc-links.py
+++ b/script/check-relative-doc-links.py
@@ -23,7 +23,7 @@ def main():
           filepaths.append(os.path.join(root, f))
   except KeyboardInterrupt:
     print('Keyboard interruption. Please try again.')
-    return
+    return 0
 
   totalBrokenLinks = 0
   for path in filepaths:
diff --git a/script/copy-debug-symbols.py b/script/copy-debug-symbols.py
index c0d77025c779e..159387fadb60e 100755
--- a/script/copy-debug-symbols.py
+++ b/script/copy-debug-symbols.py
@@ -15,8 +15,7 @@ def copy_debug_from_binaries(directory, out_dir, target_cpu, compress):
       copy_debug_from_binary(binary_path, out_dir, target_cpu, compress)
 
 def copy_debug_from_binary(binary_path, out_dir, target_cpu, compress):
-  if PLATFORM == 'linux' and (target_cpu == 'x86' or target_cpu == 'arm' or
-     target_cpu == 'arm64'):
+  if PLATFORM == 'linux' and target_cpu in ('x86', 'arm', 'arm64'):
     # Skip because no objcopy binary on the given target.
     return    
   debug_name = get_debug_name(binary_path)
@@ -25,7 +24,6 @@ def copy_debug_from_binary(binary_path, out_dir, target_cpu, compress):
     cmd.extend(['--compress-debug-sections'])
   cmd.extend([binary_path, os.path.join(out_dir, debug_name)])
   execute(cmd)
-  return debug_name
 
 def get_debug_name(binary_path):
   return os.path.basename(binary_path) + '.debug'
diff --git a/script/generate-config-gypi.py b/script/generate-config-gypi.py
index f20360f8133d5..fee183951d87f 100755
--- a/script/generate-config-gypi.py
+++ b/script/generate-config-gypi.py
@@ -15,7 +15,7 @@ def run_node_configure(target_cpu):
   configure = os.path.join(NODE_DIR, 'configure.py')
   args = ['--dest-cpu', target_cpu]
   # Enabled in Chromium's V8.
-  if target_cpu == 'arm64' or target_cpu == 'x64':
+  if target_cpu in ('arm64', 'x64'):
     args += ['--experimental-enable-pointer-compression']
 
   # Work around "No acceptable ASM compiler found" error on some System,
@@ -62,4 +62,4 @@ def main(target_file, target_cpu):
     f.write(pprint.pformat(config, indent=2))
 
 if __name__ == '__main__':
-  sys.exit(main(*sys.argv[1:]))
+  sys.exit(main(sys.argv[1], sys.argv[2]))
diff --git a/script/generate-zip-manifest.py b/script/generate-zip-manifest.py
index c6cb5792d0e57..c82e239d3d983 100755
--- a/script/generate-zip-manifest.py
+++ b/script/generate-zip-manifest.py
@@ -11,4 +11,4 @@ def main(zip_path, manifest_out):
   return 0
 
 if __name__ == '__main__':
-  sys.exit(main(*sys.argv[1:]))
+  sys.exit(main(sys.argv[1], sys.argv[2]))
diff --git a/script/lib/config.py b/script/lib/config.py
index 9ef44a43fe3d9..43f076f735bdf 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -31,8 +31,8 @@
 def get_platform_key():
   if 'MAS_BUILD' in os.environ:
     return 'mas'
-  else:
-    return PLATFORM
+
+  return PLATFORM
 
 
 def get_target_arch():
diff --git a/script/lib/git.py b/script/lib/git.py
index 429b2e4f866ce..3ea4808f8af37 100644
--- a/script/lib/git.py
+++ b/script/lib/git.py
@@ -233,8 +233,8 @@ def to_utf8(patch):
   """Python 2/3 compatibility: unicode has been renamed to str in Python3"""
   if sys.version_info[0] >= 3:
     return str(patch, "utf-8")
-  else:
-    return unicode(patch, "utf-8")
+
+  return unicode(patch, "utf-8")
 
 
 def export_patches(repo, out_dir, patch_range=None, dry_run=False):
@@ -268,7 +268,7 @@ def export_patches(repo, out_dir, patch_range=None, dry_run=False):
           out_dir, len(bad_patches), "\n-- ".join(bad_patches)
         )
       )
-      exit(1)
+      sys.exit(1)
   else:
     # Remove old patches so that deleted commits are correctly reflected in the
     # patch files (as a removed file)
@@ -291,4 +291,3 @@ def export_patches(repo, out_dir, patch_range=None, dry_run=False):
         ) as f:
           f.write(formatted_patch.encode('utf-8'))
         pl.write(filename + '\n')
-
diff --git a/script/lib/native_tests.py b/script/lib/native_tests.py
index e84f393848793..04858bf7ed132 100644
--- a/script/lib/native_tests.py
+++ b/script/lib/native_tests.py
@@ -69,7 +69,8 @@ def get_current():
     if platform in ('cygwin', 'win32'):
       return Platform.WINDOWS
 
-    assert False, "unexpected current platform '{}'".format(platform)
+    raise AssertionError(
+        "unexpected current platform '{}'".format(platform))
 
   @staticmethod
   def get_all():
@@ -155,7 +156,7 @@ def __expand_shorthand(value):
     if isinstance(value, basestring):
       return {value: None}
 
-    assert False, "unexpected shorthand type: {}".format(type(value))
+    raise AssertionError("unexpected shorthand type: {}".format(type(value)))
 
   @staticmethod
   def __make_a_list(value):
@@ -174,7 +175,8 @@ def __merge_nested_lists(value):
       # It looks ugly as hell, but it does the job.
       return [list_item for key in value for list_item in value[key]]
 
-    assert False, "unexpected type for list merging: {}".format(type(value))
+    raise AssertionError(
+        "unexpected type for list merging: {}".format(type(value)))
 
   def __platform_supports(self, binary_name):
     return Platform.get_current() in self.tests[binary_name]['platforms']
diff --git a/script/lib/util.py b/script/lib/util.py
index 816fa47a106b8..93b364c6a23e0 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -186,9 +186,9 @@ def get_electron_exec():
 
   if sys.platform == 'darwin':
     return '{0}/Electron.app/Contents/MacOS/Electron'.format(out_dir)
-  elif sys.platform == 'win32':
+  if sys.platform == 'win32':
     return '{0}/electron.exe'.format(out_dir)
-  elif sys.platform == 'linux':
+  if sys.platform == 'linux':
     return '{0}/electron'.format(out_dir)
 
   raise Exception(
diff --git a/script/native-tests.py b/script/native-tests.py
index 4657b9233867a..f6dea2a8d216b 100755
--- a/script/native-tests.py
+++ b/script/native-tests.py
@@ -97,11 +97,11 @@ def main():
     if args.binary is not None:
       return tests_list.run(args.binary, args.output_dir, args.verbosity,
                             args.disabled_tests_policy)
-    else:
-      return tests_list.run_all(args.output_dir, args.verbosity,
-                                args.disabled_tests_policy)
 
-  assert False, "unexpected command '{}'".format(args.command)
+    return tests_list.run_all(args.output_dir, args.verbosity,
+                              args.disabled_tests_policy)
+
+  raise AssertionError("unexpected command '{}'".format(args.command))
 
 
 if __name__ == '__main__':
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 2fc6416fc93c1..2cec0ff8dabed 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -160,6 +160,8 @@ def main():
         'toolchain_profile.json')
     upload_electron(release, toolchain_profile_zip, args)
 
+  return 0
+
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
   parser.add_argument('-v', '--version', help='Specify the version',
@@ -205,7 +207,7 @@ def zero_zip_date_time(fname):
   try:
     with open(fname, 'r+b') as f:
       _zero_zip_date_time(f)
-  except:
+  except Exception:
     raise NonZipFileError(fname)
 
 
diff --git a/script/run-clang-format.py b/script/run-clang-format.py
index f9d276dc14f4b..b7817bb32c612 100644
--- a/script/run-clang-format.py
+++ b/script/run-clang-format.py
@@ -287,7 +287,7 @@ def main():
         extensions=args.extensions.split(','))
 
     if not files:
-        return
+        return 0
 
     njobs = args.j
     if njobs == 0:
diff --git a/script/zip_manifests/check-zip-manifest.py b/script/zip_manifests/check-zip-manifest.py
index 6af55104e0d1a..39a6e94e16989 100755
--- a/script/zip_manifests/check-zip-manifest.py
+++ b/script/zip_manifests/check-zip-manifest.py
@@ -7,7 +7,7 @@ def main(zip_path, manifest_in):
   with open(manifest_in, 'r') as manifest, \
       zipfile.ZipFile(zip_path, 'r', allowZip64=True) as z:
     files_in_zip = set(z.namelist())
-    files_in_manifest = set([l.strip() for l in manifest.readlines()])
+    files_in_manifest = {l.strip() for l in manifest.readlines()}
   added_files = files_in_zip - files_in_manifest
   removed_files = files_in_manifest - files_in_zip
   if added_files:
@@ -18,10 +18,8 @@ def main(zip_path, manifest_in):
     print("Files removed from bundle:")
     for f in sorted(list(removed_files)):
       print('-' + f)
-  if added_files or removed_files:
-    return 1
-  else:
-    return 0
+
+  return 1 if added_files or removed_files else 0
 
 if __name__ == '__main__':
-  sys.exit(main(*sys.argv[1:]))
+  sys.exit(main(sys.argv[1], sys.argv[2]))

From e100402b1335315d707c72b69cd940ad5aee5c15 Mon Sep 17 00:00:00 2001
From: Lalit <lalitkumarsingh3716@gmail.com>
Date: Mon, 21 Mar 2022 07:43:55 +0530
Subject: [PATCH 134/811] docs: possible change in tutorial/ipc (#33218)

The `counter` channel should be `update-counter` channel
---
 docs/tutorial/ipc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/ipc.md b/docs/tutorial/ipc.md
index 5d3fc2ffec29b..c1af5d1f08528 100644
--- a/docs/tutorial/ipc.md
+++ b/docs/tutorial/ipc.md
@@ -413,7 +413,7 @@ function createWindow () {
 ```
 
 For the purposes of the tutorial, it's important to note that the `click` handler
-sends a message (either `1` or `-1`) to the renderer process through the `counter` channel.
+sends a message (either `1` or `-1`) to the renderer process through the `update-counter` channel.
 
 ```javascript
 click: () => mainWindow.webContents.send('update-counter', -1)

From 4cc2ed842e6ee6bab9c9b8743593023953da046b Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 21 Mar 2022 16:42:22 +0900
Subject: [PATCH 135/811] fix: iocp integration when process is reused (#33207)

---
 shell/common/node_bindings.cc              | 13 ++----------
 shell/common/node_bindings.h               | 10 +++++-----
 shell/common/node_bindings_linux.cc        | 18 +++++++++++++++++
 shell/common/node_bindings_linux.h         |  4 ++++
 shell/common/node_bindings_mac.cc          | 18 +++++++++++++++++
 shell/common/node_bindings_mac.h           |  4 ++++
 shell/common/node_bindings_win.cc          | 23 ++++++++++++++++++++++
 shell/common/node_bindings_win.h           |  6 ++++++
 shell/renderer/electron_renderer_client.cc |  4 +++-
 9 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 99b017dc425fe..4e5b1577b1cfa 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -462,7 +462,8 @@ node::Environment* NodeBindings::CreateEnvironment(
 
   args.insert(args.begin() + 1, init_script);
 
-  isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform);
+  if (!isolate_data_)
+    isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform);
 
   node::Environment* env;
   uint64_t flags = node::EnvironmentFlags::kDefaultFlags |
@@ -573,16 +574,6 @@ void NodeBindings::LoadEnvironment(node::Environment* env) {
 }
 
 void NodeBindings::PrepareMessageLoop() {
-#if !BUILDFLAG(IS_WIN)
-  int handle = uv_backend_fd(uv_loop_);
-
-  // If the backend fd hasn't changed, don't proceed.
-  if (handle == handle_)
-    return;
-
-  handle_ = handle;
-#endif
-
   // Add dummy handle for libuv, otherwise libuv would quit when there is
   // nothing to do.
   uv_async_init(uv_loop_, dummy_uv_handle_.get(), nullptr);
diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h
index 64519d340b5a1..204cf12d5cc6c 100644
--- a/shell/common/node_bindings.h
+++ b/shell/common/node_bindings.h
@@ -93,11 +93,15 @@ class NodeBindings {
   void LoadEnvironment(node::Environment* env);
 
   // Prepare for message loop integration.
-  void PrepareMessageLoop();
+  virtual void PrepareMessageLoop();
 
   // Do message loop integration.
   virtual void RunMessageLoop();
 
+  // Gets/sets the per isolate data.
+  void set_isolate_data(node::IsolateData* isolate_data) {
+    isolate_data_ = isolate_data;
+  }
   node::IsolateData* isolate_data() const { return isolate_data_; }
 
   // Gets/sets the environment to wrap uv loop.
@@ -161,10 +165,6 @@ class NodeBindings {
   // Isolate data used in creating the environment
   node::IsolateData* isolate_data_ = nullptr;
 
-#if !BUILDFLAG(IS_WIN)
-  int handle_ = -1;
-#endif
-
   base::WeakPtrFactory<NodeBindings> weak_factory_{this};
 };
 
diff --git a/shell/common/node_bindings_linux.cc b/shell/common/node_bindings_linux.cc
index 3a69fea9aafc1..d361daec953e0 100644
--- a/shell/common/node_bindings_linux.cc
+++ b/shell/common/node_bindings_linux.cc
@@ -19,7 +19,25 @@ NodeBindingsLinux::NodeBindingsLinux(BrowserEnvironment browser_env)
 
 NodeBindingsLinux::~NodeBindingsLinux() = default;
 
+void NodeBindingsLinux::PrepareMessageLoop() {
+  int handle = uv_backend_fd(uv_loop_);
+
+  // If the backend fd hasn't changed, don't proceed.
+  if (handle == handle_)
+    return;
+
+  NodeBindings::PrepareMessageLoop();
+}
+
 void NodeBindingsLinux::RunMessageLoop() {
+  int handle = uv_backend_fd(uv_loop_);
+
+  // If the backend fd hasn't changed, don't proceed.
+  if (handle == handle_)
+    return;
+
+  handle_ = handle;
+
   // Get notified when libuv's watcher queue changes.
   uv_loop_->data = this;
   uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h
index aca06dd0f5952..934ed68c597b8 100644
--- a/shell/common/node_bindings_linux.h
+++ b/shell/common/node_bindings_linux.h
@@ -15,6 +15,7 @@ class NodeBindingsLinux : public NodeBindings {
   explicit NodeBindingsLinux(BrowserEnvironment browser_env);
   ~NodeBindingsLinux() override;
 
+  void PrepareMessageLoop() override;
   void RunMessageLoop() override;
 
  private:
@@ -25,6 +26,9 @@ class NodeBindingsLinux : public NodeBindings {
 
   // Epoll to poll for uv's backend fd.
   int epoll_;
+
+  // uv's backend fd.
+  int handle_ = -1;
 };
 
 }  // namespace electron
diff --git a/shell/common/node_bindings_mac.cc b/shell/common/node_bindings_mac.cc
index e5163f700615b..7107d20c11b93 100644
--- a/shell/common/node_bindings_mac.cc
+++ b/shell/common/node_bindings_mac.cc
@@ -19,7 +19,25 @@ NodeBindingsMac::NodeBindingsMac(BrowserEnvironment browser_env)
 
 NodeBindingsMac::~NodeBindingsMac() = default;
 
+void NodeBindingsMac::PrepareMessageLoop() {
+  int handle = uv_backend_fd(uv_loop_);
+
+  // If the backend fd hasn't changed, don't proceed.
+  if (handle == handle_)
+    return;
+
+  NodeBindings::PrepareMessageLoop();
+}
+
 void NodeBindingsMac::RunMessageLoop() {
+  int handle = uv_backend_fd(uv_loop_);
+
+  // If the backend fd hasn't changed, don't proceed.
+  if (handle == handle_)
+    return;
+
+  handle_ = handle;
+
   // Get notified when libuv's watcher queue changes.
   uv_loop_->data = this;
   uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h
index 2e54f2fc9a214..7687f85a7b8d3 100644
--- a/shell/common/node_bindings_mac.h
+++ b/shell/common/node_bindings_mac.h
@@ -15,6 +15,7 @@ class NodeBindingsMac : public NodeBindings {
   explicit NodeBindingsMac(BrowserEnvironment browser_env);
   ~NodeBindingsMac() override;
 
+  void PrepareMessageLoop() override;
   void RunMessageLoop() override;
 
  private:
@@ -22,6 +23,9 @@ class NodeBindingsMac : public NodeBindings {
   static void OnWatcherQueueChanged(uv_loop_t* loop);
 
   void PollEvents() override;
+
+  // uv's backend fd.
+  int handle_ = -1;
 };
 
 }  // namespace electron
diff --git a/shell/common/node_bindings_win.cc b/shell/common/node_bindings_win.cc
index 2356c523e3612..1410925f195c5 100644
--- a/shell/common/node_bindings_win.cc
+++ b/shell/common/node_bindings_win.cc
@@ -29,6 +29,29 @@ NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
 
 NodeBindingsWin::~NodeBindingsWin() = default;
 
+void NodeBindingsWin::PrepareMessageLoop() {
+  // IOCP does not change for the process until the loop is recreated,
+  // we ensure that there is only a single polling thread satisfying
+  // the concurrency limit set from CreateIoCompletionPort call by
+  // uv_loop_init for the lifetime of this process.
+  if (initialized_)
+    return;
+
+  NodeBindings::PrepareMessageLoop();
+}
+
+void NodeBindingsWin::RunMessageLoop() {
+  // Avoid calling UvRunOnce if the loop is already active,
+  // otherwise it can lead to situations were the number of active
+  // threads processing on IOCP is greater than the concurrency limit.
+  if (initialized_)
+    return;
+
+  initialized_ = true;
+
+  NodeBindings::RunMessageLoop();
+}
+
 void NodeBindingsWin::PollEvents() {
   // If there are other kinds of events pending, uv_backend_timeout will
   // instruct us not to wait.
diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h
index 0a5eed2237ed2..59d7469b0ff75 100644
--- a/shell/common/node_bindings_win.h
+++ b/shell/common/node_bindings_win.h
@@ -15,8 +15,14 @@ class NodeBindingsWin : public NodeBindings {
   explicit NodeBindingsWin(BrowserEnvironment browser_env);
   ~NodeBindingsWin() override;
 
+  void PrepareMessageLoop() override;
+  void RunMessageLoop() override;
+
  private:
   void PollEvents() override;
+
+  // Indicates whether polling thread has been created.
+  bool initialized_ = false;
 };
 
 }  // namespace electron
diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index 2c80080172c1f..08276425938f3 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -162,8 +162,10 @@ void ElectronRendererClient::WillReleaseScriptContext(
   isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
 
   node::FreeEnvironment(env);
-  if (env == node_bindings_->uv_env())
+  if (node_bindings_->uv_env() == nullptr) {
     node::FreeIsolateData(node_bindings_->isolate_data());
+    node_bindings_->set_isolate_data(nullptr);
+  }
 
   isolate->SetMicrotasksPolicy(old_policy);
 

From 755feb4d81e10b79b2c43eaa698b50cf1f726a72 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 21 Mar 2022 10:30:02 +0100
Subject: [PATCH 136/811] feat: add nativeTheme.inForcedColorsMode (#32956)

---
 docs/api/native-theme.md                       | 5 +++++
 shell/browser/api/electron_api_native_theme.cc | 7 ++++++-
 shell/browser/api/electron_api_native_theme.h  | 1 +
 spec-main/api-native-theme-spec.ts             | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/api/native-theme.md b/docs/api/native-theme.md
index 8baa75e8d01fb..3235eba9a78da 100644
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -67,3 +67,8 @@ or is being instructed to show a high-contrast UI.
 
 A `boolean` for if the OS / Chromium currently has an inverted color scheme
 or is being instructed to use an inverted color scheme.
+
+### `nativeTheme.inForcedColorsMode` _Windows_ _Readonly_
+
+A `boolean` indicating whether Chromium is in forced colors mode, controlled by system accessibility settings.
+Currently, Windows high contrast is the only system setting that triggers forced colors mode.
diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc
index 3eedde9666e91..7c511685d1afa 100644
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -67,6 +67,10 @@ bool NativeTheme::ShouldUseHighContrastColors() {
   return ui_theme_->UserHasContrastPreference();
 }
 
+bool NativeTheme::InForcedColorsMode() {
+  return ui_theme_->InForcedColorsMode();
+}
+
 #if BUILDFLAG(IS_MAC)
 const CFStringRef WhiteOnBlack = CFSTR("whiteOnBlack");
 const CFStringRef UniversalAccessDomain = CFSTR("com.apple.universalaccess");
@@ -106,7 +110,8 @@ gin::ObjectTemplateBuilder NativeTheme::GetObjectTemplateBuilder(
       .SetProperty("shouldUseHighContrastColors",
                    &NativeTheme::ShouldUseHighContrastColors)
       .SetProperty("shouldUseInvertedColorScheme",
-                   &NativeTheme::ShouldUseInvertedColorScheme);
+                   &NativeTheme::ShouldUseInvertedColorScheme)
+      .SetProperty("inForcedColorsMode", &NativeTheme::InForcedColorsMode);
 }
 
 const char* NativeTheme::GetTypeName() {
diff --git a/shell/browser/api/electron_api_native_theme.h b/shell/browser/api/electron_api_native_theme.h
index cf092e0460961..5f26ab74d6ba9 100644
--- a/shell/browser/api/electron_api_native_theme.h
+++ b/shell/browser/api/electron_api_native_theme.h
@@ -46,6 +46,7 @@ class NativeTheme : public gin::Wrappable<NativeTheme>,
   bool ShouldUseDarkColors();
   bool ShouldUseHighContrastColors();
   bool ShouldUseInvertedColorScheme();
+  bool InForcedColorsMode();
 
   // ui::NativeThemeObserver:
   void OnNativeThemeUpdated(ui::NativeTheme* theme) override;
diff --git a/spec-main/api-native-theme-spec.ts b/spec-main/api-native-theme-spec.ts
index 3a03eb1ef81a2..12b9951ad5f03 100644
--- a/spec-main/api-native-theme-spec.ts
+++ b/spec-main/api-native-theme-spec.ts
@@ -109,4 +109,10 @@ describe('nativeTheme module', () => {
       expect(nativeTheme.shouldUseHighContrastColors).to.be.a('boolean');
     });
   });
+
+  describe('nativeTheme.inForcedColorsMode', () => {
+    it('returns a boolean', () => {
+      expect(nativeTheme.inForcedColorsMode).to.be.a('boolean');
+    });
+  });
 });

From 4b8b492b628d78e1637016730a926a71a01ff9e7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 21 Mar 2022 06:01:28 -0700
Subject: [PATCH 137/811] Bump v19.0.0-nightly.20220321

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index e1b801e28d07d..2a38aac402469 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220318
\ No newline at end of file
+19.0.0-nightly.20220321
\ No newline at end of file
diff --git a/package.json b/package.json
index 90e4b2ae0145c..0e3814d6cfdb4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220318",
+  "version": "19.0.0-nightly.20220321",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 14ba8ce3ae702..b5ef04aa1cb85 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220318
- PRODUCTVERSION 19,0,0,20220318
+ FILEVERSION 19,0,0,20220321
+ PRODUCTVERSION 19,0,0,20220321
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From db79734bfb12ed922140266451f60c649042f319 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 21 Mar 2022 18:35:54 +0100
Subject: [PATCH 138/811] feat: support more color formats for
 `backgroundColor` (#31868)

---
 docs/api/browser-view.md                      | 30 ++++++++-
 docs/api/browser-window.md                    | 56 ++++++++++++----
 shell/browser/api/electron_api_base_window.cc |  4 +-
 shell/browser/api/electron_api_base_window.h  |  2 +-
 .../browser/api/electron_api_browser_view.cc  |  4 +-
 .../api/electron_api_browser_window.cc        |  4 +-
 .../browser/api/electron_api_web_contents.cc  |  2 +-
 shell/browser/native_window.cc                |  2 +-
 shell/browser/ui/cocoa/electron_touch_bar.mm  |  2 +-
 shell/browser/web_contents_preferences.cc     |  2 +-
 shell/common/color_util.cc                    | 64 +++++++++++--------
 shell/common/color_util.h                     |  8 ++-
 spec-main/api-browser-window-spec.ts          | 19 ++++++
 13 files changed, 144 insertions(+), 55 deletions(-)

diff --git a/docs/api/browser-view.md b/docs/api/browser-view.md
index 783a54855c869..ed63f4a4881db 100644
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -70,5 +70,31 @@ The `bounds` of this BrowserView instance as `Object`.
 
 #### `view.setBackgroundColor(color)` _Experimental_
 
-* `color` string - Color in `#aarrggbb` or `#argb` form. The alpha channel is
-  optional.
+* `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
+  optional for the hex type.
+
+Examples of valid `color` values:
+
+* Hex
+  * #fff (RGB)
+  * #ffff (ARGB)
+  * #ffffff (RRGGBB)
+  * #ffffffff (AARRGGBB)
+* RGB
+  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
+    * e.g. rgb(255, 255, 255)
+* RGBA
+  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
+    * e.g. rgba(255, 255, 255, 1.0)
+* HSL
+  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
+    * e.g. hsl(200, 20%, 50%)
+* HSLA
+  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
+    * e.g. hsla(200, 20%, 50%, 0.5)
+* Color name
+  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
+  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
+    * e.g. `blueviolet` or `red`
+
+**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBA` or `RGA`.
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 768d27284104e..5588d78562dbe 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -66,6 +66,18 @@ win.loadURL('https://github.com')
 Note that even for apps that use `ready-to-show` event, it is still recommended
 to set `backgroundColor` to make the app feel more native.
 
+Some examples of valid `backgroundColor` values include:
+
+```js
+const win = new BrowserWindow()
+win.setBackgroundColor('hsl(230, 100%, 50%)')
+win.setBackgroundColor('rgb(255, 145, 145)')
+win.setBackgroundColor('#ff00a3')
+win.setBackgroundColor('blueviolet')
+```
+
+For more information about these color types see valid options in [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor).
+
 ## Parent and child windows
 
 By using `parent` option, you can create child windows:
@@ -199,9 +211,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `enableLargerThanScreen` boolean (optional) - Enable the window to be resized larger
     than screen. Only relevant for macOS, as other OSes allow
     larger-than-screen windows by default. Default is `false`.
-  * `backgroundColor` string (optional) - Window's background color as a hexadecimal value,
-    like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha in #AARRGGBB format is supported if
-    `transparent` is set to `true`). Default is `#FFF` (white).
+  * `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
   * `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
   * `opacity` number (optional) - Set the initial opacity of the window, between 0.0 (fully
     transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
@@ -992,12 +1002,33 @@ APIs like `win.setSize`.
 
 #### `win.setBackgroundColor(backgroundColor)`
 
-* `backgroundColor` string - Window's background color as a hexadecimal value,
-  like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha is supported if `transparent`
-  is `true`). Default is `#FFF` (white).
-
-Sets the background color of the window. See [Setting
-`backgroundColor`](#setting-the-backgroundcolor-property).
+* `backgroundColor` string - Color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. The alpha channel is optional for the hex type.
+
+Examples of valid `backgroundColor` values:
+
+* Hex
+  * #fff (shorthand RGB)
+  * #ffff (shorthand ARGB)
+  * #ffffff (RGB)
+  * #ffffffff (ARGB)
+* RGB
+  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
+    * e.g. rgb(255, 255, 255)
+* RGBA
+  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
+    * e.g. rgba(255, 255, 255, 1.0)
+* HSL
+  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
+    * e.g. hsl(200, 20%, 50%)
+* HSLA
+  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
+    * e.g. hsla(200, 20%, 50%, 0.5)
+* Color name
+  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
+  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
+    * e.g. `blueviolet` or `red`
+
+Sets the background color of the window. See [Setting `backgroundColor`](#setting-the-backgroundcolor-property).
 
 #### `win.previewFile(path[, displayName])` _macOS_
 
@@ -1041,8 +1072,11 @@ Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `
 
 #### `win.getBackgroundColor()`
 
-Returns `string` - Gets the background color of the window. See [Setting
-`backgroundColor`](#setting-the-backgroundcolor-property).
+Returns `string` - Gets the background color of the window in Hex (`#RRGGBB`) format.
+
+See [Setting `backgroundColor`](#setting-the-backgroundcolor-property).
+
+**Note:** The alpha value is _not_ returned alongside the red, green, and blue values.
 
 #### `win.setContentBounds(bounds[, animate])`
 
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
index 704fceeae40c3..3024eba2098ec 100644
--- a/shell/browser/api/electron_api_base_window.cc
+++ b/shell/browser/api/electron_api_base_window.cc
@@ -643,11 +643,11 @@ bool BaseWindow::IsTabletMode() const {
 }
 
 void BaseWindow::SetBackgroundColor(const std::string& color_name) {
-  SkColor color = ParseHexColor(color_name);
+  SkColor color = ParseCSSColor(color_name);
   window_->SetBackgroundColor(color);
 }
 
-std::string BaseWindow::GetBackgroundColor() {
+std::string BaseWindow::GetBackgroundColor(gin_helper::Arguments* args) {
   return ToRGBHex(window_->GetBackgroundColor());
 }
 
diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
index e70202e0e7c61..7651ddd0e653c 100644
--- a/shell/browser/api/electron_api_base_window.h
+++ b/shell/browser/api/electron_api_base_window.h
@@ -159,7 +159,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   bool IsKiosk();
   bool IsTabletMode() const;
   virtual void SetBackgroundColor(const std::string& color_name);
-  std::string GetBackgroundColor();
+  std::string GetBackgroundColor(gin_helper::Arguments* args);
   void SetHasShadow(bool has_shadow);
   bool HasShadow();
   void SetOpacity(const double opacity);
diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
index 6feadb81074a3..1a9735cef11e3 100644
--- a/shell/browser/api/electron_api_browser_view.cc
+++ b/shell/browser/api/electron_api_browser_view.cc
@@ -154,11 +154,11 @@ gfx::Rect BrowserView::GetBounds() {
 }
 
 void BrowserView::SetBackgroundColor(const std::string& color_name) {
-  view_->SetBackgroundColor(ParseHexColor(color_name));
+  view_->SetBackgroundColor(ParseCSSColor(color_name));
 
   if (web_contents()) {
     auto* wc = web_contents()->web_contents();
-    wc->SetPageBaseBackgroundColor(ParseHexColor(color_name));
+    wc->SetPageBaseBackgroundColor(ParseCSSColor(color_name));
   }
 }
 
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index 5df4b474b244a..b0629e27c74d7 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -370,7 +370,7 @@ void BrowserWindow::Blur() {
 
 void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
   BaseWindow::SetBackgroundColor(color_name);
-  SkColor color = ParseHexColor(color_name);
+  SkColor color = ParseCSSColor(color_name);
   web_contents()->SetPageBaseBackgroundColor(color);
   auto* rwhv = web_contents()->GetRenderWidgetHostView();
   if (rwhv) {
@@ -384,7 +384,7 @@ void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
     auto* web_preferences =
         WebContentsPreferences::From(api_web_contents_->web_contents());
     if (web_preferences) {
-      web_preferences->SetBackgroundColor(ParseHexColor(color_name));
+      web_preferences->SetBackgroundColor(ParseCSSColor(color_name));
     }
   }
 }
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index f6d275e8f4c3b..58d3f7f016685 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -773,7 +773,7 @@ WebContents::WebContents(v8::Isolate* isolate,
     // and we then need to pull it back out and check it here.
     std::string background_color;
     options.GetHidden(options::kBackgroundColor, &background_color);
-    bool transparent = ParseHexColor(background_color) == SK_ColorTRANSPARENT;
+    bool transparent = ParseCSSColor(background_color) == SK_ColorTRANSPARENT;
 
     content::WebContents::CreateParams params(session->browser_context());
     auto* view = new OffScreenWebContentsView(
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 6e42c30304943..b62ce2f617055 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -241,7 +241,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
 #endif
   std::string color;
   if (options.Get(options::kBackgroundColor, &color)) {
-    SetBackgroundColor(ParseHexColor(color));
+    SetBackgroundColor(ParseCSSColor(color));
   } else if (!transparent()) {
     // For normal window, use white as default background.
     SetBackgroundColor(SK_ColorWHITE);
diff --git a/shell/browser/ui/cocoa/electron_touch_bar.mm b/shell/browser/ui/cocoa/electron_touch_bar.mm
index 6b3a1383dd0ed..af690bd79d851 100644
--- a/shell/browser/ui/cocoa/electron_touch_bar.mm
+++ b/shell/browser/ui/cocoa/electron_touch_bar.mm
@@ -339,7 +339,7 @@ - (bool)hasItemWithID:(const std::string&)item_id {
 }
 
 - (NSColor*)colorFromHexColorString:(const std::string&)colorString {
-  SkColor color = electron::ParseHexColor(colorString);
+  SkColor color = electron::ParseCSSColor(colorString);
   return skia::SkColorToDeviceNSColor(color);
 }
 
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index c7bdcbf362241..44030d1e6bfd0 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -235,7 +235,7 @@ void WebContentsPreferences::Merge(
   }
   std::string background_color;
   if (web_preferences.GetHidden(options::kBackgroundColor, &background_color))
-    background_color_ = ParseHexColor(background_color);
+    background_color_ = ParseCSSColor(background_color);
   std::string safe_dialogs_message;
   if (web_preferences.Get("safeDialogsMessage", &safe_dialogs_message))
     safe_dialogs_message_ = safe_dialogs_message;
diff --git a/shell/common/color_util.cc b/shell/common/color_util.cc
index 9e15bc618f394..afa4c7f7a40bc 100644
--- a/shell/common/color_util.cc
+++ b/shell/common/color_util.cc
@@ -4,46 +4,54 @@
 
 #include "shell/common/color_util.h"
 
+#include <cmath>
+#include <utility>
 #include <vector>
 
-#include "base/strings/string_number_conversions.h"
+#include "base/cxx17_backports.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "content/public/common/color_parser.h"
+#include "ui/gfx/color_utils.h"
 
-namespace electron {
+namespace {
+
+bool IsHexFormat(const std::string& str) {
+  // Must be either #ARGB or #AARRGGBB.
+  bool is_hex_length = str.length() == 5 || str.length() == 9;
+  if (str[0] != '#' || !is_hex_length)
+    return false;
+
+  if (!std::all_of(str.begin() + 1, str.end(), ::isxdigit))
+    return false;
 
-SkColor ParseHexColor(const std::string& color_string) {
-  // Check the string for incorrect formatting.
-  if (color_string.empty() || color_string[0] != '#')
-    return SK_ColorWHITE;
+  return true;
+}
+
+}  // namespace
 
-  // Prepend FF if alpha channel is not specified.
-  std::string source = color_string.substr(1);
-  if (source.size() == 3)
-    source.insert(0, "F");
-  else if (source.size() == 6)
-    source.insert(0, "FF");
+namespace electron {
 
-  // Convert the string from #FFF format to #FFFFFF format.
-  std::string formatted_color;
-  if (source.size() == 4) {
-    for (size_t i = 0; i < 4; ++i) {
-      formatted_color += source[i];
-      formatted_color += source[i];
+SkColor ParseCSSColor(const std::string& color_string) {
+  // ParseCssColorString expects RGBA and we historically use ARGB
+  // so we need to convert before passing to ParseCssColorString.
+  std::string color_str = color_string;
+  if (IsHexFormat(color_str)) {
+    if (color_str.length() == 5) {
+      // #ARGB => #RGBA
+      std::swap(color_str[1], color_str[4]);
+    } else {
+      // #AARRGGBB => #RRGGBBAA
+      std::swap(color_str[1], color_str[7]);
+      std::swap(color_str[2], color_str[8]);
     }
-  } else if (source.size() == 8) {
-    formatted_color = source;
-  } else {
-    return SK_ColorWHITE;
   }
 
-  // Convert the string to an integer and make sure it is in the correct value
-  // range.
-  std::vector<uint8_t> bytes;
-  if (!base::HexStringToBytes(formatted_color, &bytes))
-    return SK_ColorWHITE;
+  SkColor color;
+  if (!content::ParseCssColorString(color_str, &color))
+    color = SK_ColorWHITE;
 
-  return SkColorSetARGB(bytes[0], bytes[1], bytes[2], bytes[3]);
+  return color;
 }
 
 std::string ToRGBHex(SkColor color) {
diff --git a/shell/common/color_util.h b/shell/common/color_util.h
index 88b68cc398f9f..9bcceef2fbd3a 100644
--- a/shell/common/color_util.h
+++ b/shell/common/color_util.h
@@ -11,12 +11,14 @@
 
 namespace electron {
 
-// Parse hex color like "#FFF" or "#EFEFEF"
-SkColor ParseHexColor(const std::string& color_string);
+// Parses a CSS-style color string from hex, rgb(), rgba(),
+// hsl(), hsla(), or color name formats.
+SkColor ParseCSSColor(const std::string& color_string);
 
-// Convert color to RGB hex value like "#ABCDEF"
+// Convert color to RGB hex value like "#RRGGBB".
 std::string ToRGBHex(SkColor color);
 
+// Convert color to RGBA hex value like "#RRGGBBAA".
 std::string ToRGBAHex(SkColor color, bool include_hash = true);
 
 }  // namespace electron
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 89ff468ec5202..1f6e88b5088dc 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1076,6 +1076,25 @@ describe('BrowserWindow module', () => {
         w.setBackgroundColor(backgroundColor);
         expect(w.getBackgroundColor()).to.equal(backgroundColor);
       });
+      it('returns correct color with multiple passed formats', () => {
+        w.destroy();
+        w = new BrowserWindow({});
+
+        w.setBackgroundColor('#AABBFF');
+        expect(w.getBackgroundColor()).to.equal('#AABBFF');
+
+        w.setBackgroundColor('blueviolet');
+        expect(w.getBackgroundColor()).to.equal('#8A2BE2');
+
+        w.setBackgroundColor('rgb(255, 0, 185)');
+        expect(w.getBackgroundColor()).to.equal('#FF00B9');
+
+        w.setBackgroundColor('rgba(245, 40, 145, 0.8)');
+        expect(w.getBackgroundColor()).to.equal('#F52891');
+
+        w.setBackgroundColor('hsl(155, 100%, 50%)');
+        expect(w.getBackgroundColor()).to.equal('#00FF95');
+      });
     });
 
     describe('BrowserWindow.getNormalBounds()', () => {

From 1ccf206e77a5e70d80a80afbfccb6654d2e5ea3d Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 21 Mar 2022 10:51:59 -0700
Subject: [PATCH 139/811] docs: add note about supported versions to issue
 template (#33348)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 706d63103ed76..7ea654e33ecea 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,8 +17,11 @@ body:
 - type: input
   attributes:
     label: Electron Version
-    description: What version of Electron are you using?
-    placeholder: 12.0.0
+    description: |
+      What version of Electron are you using?
+      
+      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions).
+    placeholder: 17.0.0
   validations:
     required: true
 - type: dropdown
@@ -53,7 +56,7 @@ body:
   attributes:
     label: Last Known Working Electron version
     description: What is the last version of Electron this worked in, if applicable?
-    placeholder: 11.0.0
+    placeholder: 16.0.0
 - type: textarea
   attributes:
     label: Expected Behavior

From 2205d725f2b01e5cc78e7e38fb597d53285c15ac Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 21 Mar 2022 11:17:25 -0700
Subject: [PATCH 140/811] chore: bump @electron/docs-parser version (#33346)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0e3814d6cfdb4..32b8e545c0fe5 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
-    "@electron/docs-parser": "^0.12.3",
+    "@electron/docs-parser": "^0.12.4",
     "@electron/typescript-definitions": "^8.9.5",
     "@octokit/auth-app": "^2.10.0",
     "@octokit/rest": "^18.0.3",
diff --git a/yarn.lock b/yarn.lock
index b03a8b7cbf371..484a7a5c18a4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,10 +18,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@electron/docs-parser@^0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@electron/docs-parser/-/docs-parser-0.12.3.tgz#a984c5ebc60348683b2acdbb0ebb73414b6763fd"
-  integrity sha512-e7OKn/NNAHMZ4Pw1702MHd2VE3Z5NKdXIIDxg9nWsDBUuSCuOKRCb4i0Ev8Eev0V0nKLaH+NMz6yzovpx0PrHg==
+"@electron/docs-parser@^0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@electron/docs-parser/-/docs-parser-0.12.4.tgz#cca403c8c2200181339c3115cdd25f3fbfc7dea3"
+  integrity sha512-vdkjcvkI7zTd2v1A8qsl5+HY+9AQCrW5Eh60I9rhPtUPoxo2V1pQwogTW6kzc3XZ54crTa7R3KxwkZpSbcGCug==
   dependencies:
     "@types/markdown-it" "^10.0.0"
     chai "^4.2.0"

From 59246a4c7c27253848fd6c56bc7c9a137b85f123 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 22 Mar 2022 00:30:05 +0100
Subject: [PATCH 141/811] fix: NOTREACHED when resizing windows frameless
 bounds (#33029)

* fix: NOTREACHED when resizing windows frameless bounds

* fix: scope to window_->IsResizable()
---
 shell/browser/ui/views/win_frame_view.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index 9ddea873c704c..7ca295ec5c12d 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -34,6 +34,14 @@ void WinFrameView::Init(NativeWindowViews* window, views::Widget* frame) {
   window_ = window;
   frame_ = frame;
 
+  // Prevent events from trickling down the views hierarchy here, since
+  // when a given resizable window is frameless we only want to use
+  // FramelessView's ResizingBorderHitTest in
+  // ShouldDescendIntoChildForEventHandling. See
+  // https://chromium-review.googlesource.com/c/chromium/src/+/3251980.
+  if (!window_->has_frame() && window_->IsResizable())
+    frame_->client_view()->SetCanProcessEventsWithinSubtree(false);
+
   if (window->IsWindowControlsOverlayEnabled()) {
     caption_button_container_ =
         AddChildView(std::make_unique<WinCaptionButtonContainer>(this));

From 108ee7037f09fd623f473af5b3ecd943b5f6014a Mon Sep 17 00:00:00 2001
From: zeeker999 <13848632+zeeker999@users.noreply.github.com>
Date: Tue, 22 Mar 2022 07:38:03 +0800
Subject: [PATCH 142/811] fix: IncrementCapturerCount doesn't increase the
 capturer count (#32973)

---
 .../browser/api/electron_api_web_contents.cc  |  5 +-
 spec-main/api-browser-view-spec.ts            | 62 +++++++++++++++++++
 spec-main/api-browser-window-spec.ts          | 19 ++++++
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 58d3f7f016685..c5238cead782f 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -3127,8 +3127,9 @@ void WebContents::IncrementCapturerCount(gin::Arguments* args) {
   // get stayAwake arguments if they exist
   args->GetNext(&stay_awake);
 
-  std::ignore =
-      web_contents()->IncrementCapturerCount(size, stay_hidden, stay_awake);
+  std::ignore = web_contents()
+                    ->IncrementCapturerCount(size, stay_hidden, stay_awake)
+                    .Release();
 }
 
 void WebContents::DecrementCapturerCount(gin::Arguments* args) {
diff --git a/spec-main/api-browser-view-spec.ts b/spec-main/api-browser-view-spec.ts
index ac6a036db06b9..8d54b9efe1cae 100644
--- a/spec-main/api-browser-view-spec.ts
+++ b/spec-main/api-browser-view-spec.ts
@@ -302,4 +302,66 @@ describe('BrowserView module', () => {
       view.webContents.loadFile(path.join(fixtures, 'pages', 'window-open.html'));
     });
   });
+
+  describe('BrowserView.capturePage(rect)', () => {
+    it('returns a Promise with a Buffer', async () => {
+      view = new BrowserView({
+        webPreferences: {
+          backgroundThrottling: false
+        }
+      });
+      w.addBrowserView(view);
+      view.setBounds({
+        ...w.getBounds(),
+        x: 0,
+        y: 0
+      });
+      const image = await view.webContents.capturePage({
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100
+      });
+
+      expect(image.isEmpty()).to.equal(true);
+    });
+
+    xit('resolves after the window is hidden and capturer count is non-zero', async () => {
+      view = new BrowserView({
+        webPreferences: {
+          backgroundThrottling: false
+        }
+      });
+      w.setBrowserView(view);
+      view.setBounds({
+        ...w.getBounds(),
+        x: 0,
+        y: 0
+      });
+      await view.webContents.loadFile(path.join(fixtures, 'pages', 'a.html'));
+
+      view.webContents.incrementCapturerCount();
+      const image = await view.webContents.capturePage();
+      expect(image.isEmpty()).to.equal(false);
+    });
+
+    it('should increase the capturer count', () => {
+      view = new BrowserView({
+        webPreferences: {
+          backgroundThrottling: false
+        }
+      });
+      w.setBrowserView(view);
+      view.setBounds({
+        ...w.getBounds(),
+        x: 0,
+        y: 0
+      });
+
+      view.webContents.incrementCapturerCount();
+      expect(view.webContents.isBeingCaptured()).to.be.true();
+      view.webContents.decrementCapturerCount();
+      expect(view.webContents.isBeingCaptured()).to.be.false();
+    });
+  });
 });
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 1f6e88b5088dc..d4d4a70799a16 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1453,6 +1453,17 @@ describe('BrowserWindow module', () => {
       expect(hiddenImage.isEmpty()).to.equal(isEmpty);
     });
 
+    it('resolves after the window is hidden and capturer count is non-zero', async () => {
+      const w = new BrowserWindow({ show: false });
+      w.webContents.setBackgroundThrottling(false);
+      w.loadFile(path.join(fixtures, 'pages', 'a.html'));
+      await emittedOnce(w, 'ready-to-show');
+
+      w.webContents.incrementCapturerCount();
+      const image = await w.capturePage();
+      expect(image.isEmpty()).to.equal(false);
+    });
+
     it('preserves transparency', async () => {
       const w = new BrowserWindow({ show: false, transparent: true });
       w.loadFile(path.join(fixtures, 'pages', 'theme-color.html'));
@@ -1466,6 +1477,14 @@ describe('BrowserWindow module', () => {
       // Values can be 0,2,3,4, or 6. We want 6, which is RGB + Alpha
       expect(imgBuffer[25]).to.equal(6);
     });
+
+    it('should increase the capturer count', () => {
+      const w = new BrowserWindow({ show: false });
+      w.webContents.incrementCapturerCount();
+      expect(w.webContents.isBeingCaptured()).to.be.true();
+      w.webContents.decrementCapturerCount();
+      expect(w.webContents.isBeingCaptured()).to.be.false();
+    });
   });
 
   describe('BrowserWindow.setProgressBar(progress)', () => {

From d79d3fc7d735b8b67a3121800d9c158d6e777af7 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 21 Mar 2022 16:38:46 -0700
Subject: [PATCH 143/811] test: fix and re-enable Network.getResponseBody test
 (#33227)

---
 spec-main/api-debugger-spec.ts | 43 ++++++++++++----------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/spec-main/api-debugger-spec.ts b/spec-main/api-debugger-spec.ts
index d75d786b2b8aa..a37f45b67b06f 100644
--- a/spec-main/api-debugger-spec.ts
+++ b/spec-main/api-debugger-spec.ts
@@ -133,39 +133,26 @@ describe('debugger module', () => {
       w.webContents.debugger.detach();
     });
 
-    // TODO(deepak1556): Fix and enable with upgrade
-    it.skip('handles valid unicode characters in message', (done) => {
-      try {
-        w.webContents.debugger.attach();
-      } catch (err) {
-        done(`unexpected error : ${err}`);
-      }
-
-      let requestId : number;
-      w.webContents.debugger.on('message', (event, method, params) => {
-        if (method === 'Network.responseReceived' &&
-            params.response.url.startsWith('http://127.0.0.1')) {
-          requestId = params.requestId;
-        } else if (method === 'Network.loadingFinished' &&
-                   params.requestId === requestId) {
-          w.webContents.debugger.sendCommand('Network.getResponseBody', {
-            requestId: params.requestId
-          }).then(data => {
-            expect(data.body).to.equal('\u0024');
-            done();
-          }).catch(result => done(result));
-        }
-      });
-
+    it('handles valid unicode characters in message', async () => {
       server = http.createServer((req, res) => {
         res.setHeader('Content-Type', 'text/plain; charset=utf-8');
         res.end('\u0024');
       });
+      await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
 
-      server.listen(0, '127.0.0.1', () => {
-        w.webContents.debugger.sendCommand('Network.enable');
-        w.loadURL(`http://127.0.0.1:${(server.address() as AddressInfo).port}`);
-      });
+      w.loadURL(`http://127.0.0.1:${(server.address() as AddressInfo).port}`);
+      // If we do this synchronously, it's fast enough to attach and enable
+      // network capture before the load. If we do it before the loadURL, for
+      // some reason network capture doesn't get enabled soon enough and we get
+      // an error when calling `Network.getResponseBody`.
+      w.webContents.debugger.attach();
+      w.webContents.debugger.sendCommand('Network.enable');
+      const [,, { requestId }] = await emittedUntil(w.webContents.debugger, 'message', (_event: any, method: string, params: any) =>
+        method === 'Network.responseReceived' && params.response.url.startsWith('http://127.0.0.1'));
+      await emittedUntil(w.webContents.debugger, 'message', (_event: any, method: string, params: any) =>
+        method === 'Network.loadingFinished' && params.requestId === requestId);
+      const { body } = await w.webContents.debugger.sendCommand('Network.getResponseBody', { requestId });
+      expect(body).to.equal('\u0024');
     });
 
     it('does not crash for invalid unicode characters in message', (done) => {

From c262eac441a8fb69ee22b1ecb22979b8ce3b7948 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 21 Mar 2022 18:55:53 -0500
Subject: [PATCH 144/811] test: re-enable webview resize events test (#33220)

---
 spec/webview-spec.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 0b649d1bd77ad..ca2ce8f84ad94 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -1214,9 +1214,7 @@ describe('<webview> tag', function () {
 
     const generateSpecs = (description, sandbox) => {
       describe(description, () => {
-        // TODO(nornagon): disabled during chromium roll 2019-06-11 due to a
-        // 'ResizeObserver loop limit exceeded' error on Windows
-        xit('emits resize events', async () => {
+        it('emits resize events', async () => {
           const firstResizeSignal = waitForEvent(webview, 'resize');
           const domReadySignal = waitForEvent(webview, 'dom-ready');
 

From f5112632a395378a1e21757ebaa7ff4a1a13343a Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 22 Mar 2022 07:07:09 +0100
Subject: [PATCH 145/811] fix: pend bounds change when moving BrowserWindows
 (#33288)

* fix: ensure bounds changes apply when moving windows

* chore: remove unused queue include
---
 shell/browser/native_window_views.cc     | 7 +++++++
 shell/browser/native_window_views.h      | 2 ++
 shell/browser/native_window_views_win.cc | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index a5c58964016c3..4258bce662937 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -699,6 +699,13 @@ bool NativeWindowViews::IsFullscreen() const {
 }
 
 void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
+#if BUILDFLAG(IS_WIN)
+  if (is_moving_ || is_resizing_) {
+    pending_bounds_change_ = bounds;
+    return;
+  }
+#endif
+
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
   // On Linux and Windows the minimum and maximum size should be updated with
   // window size when window is not resizable.
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index db178209ad6a5..0d08ebf6dbd8d 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -303,6 +303,8 @@ class NativeWindowViews : public NativeWindow,
   // Whether the window is currently being moved.
   bool is_moving_ = false;
 
+  absl::optional<gfx::Rect> pending_bounds_change_;
+
   // The color to use as the theme and symbol colors respectively for Window
   // Controls Overlay if enabled on Windows.
   SkColor overlay_button_color_;
diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index 01d88048af794..12ae336acc2f3 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -314,6 +314,15 @@ bool NativeWindowViews::PreHandleMSG(UINT message,
         NotifyWindowMoved();
         is_moving_ = false;
       }
+
+      // If the user dragged or moved the window during one or more
+      // calls to window.setBounds(), we want to apply the most recent
+      // one once they are done with the move or resize operation.
+      if (pending_bounds_change_.has_value()) {
+        SetBounds(pending_bounds_change_.value(), false /* animate */);
+        pending_bounds_change_.reset();
+      }
+
       return false;
     }
     case WM_MOVING: {

From 0af2b8de73ab33f2ae8ecc285e2e9a247e09aaa7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Tue, 22 Mar 2022 01:12:20 -0500
Subject: [PATCH 146/811] docs: mark skipTaskbar as unsupported on Linux
 (#33226)

Fixes #33124.
---
 docs/api/browser-window.md           |  4 ++--
 docs/breaking-changes.md             | 13 ++++++++++++-
 shell/browser/native_window_views.cc |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 5588d78562dbe..9f5e2349004b5 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -186,8 +186,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     mode. On macOS, also whether the maximize/zoom button should toggle full
     screen mode or maximize window. Default is `true`.
   * `simpleFullscreen` boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
-  * `skipTaskbar` boolean (optional) - Whether to show the window in taskbar. Default is
-    `false`.
+  * `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
+    Default is `false`.
   * `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
   * `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
   * `icon` ([NativeImage](native-image.md) | string) (optional) - The window icon. On Windows it is
diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index 6d561f87bd75e..c44fcc257ef52 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -27,9 +27,20 @@ preload scripts _do_ depend on Node, either refactor them to remove Node usage
 from the renderer, or explicitly specify `sandbox: false` for the relevant
 renderers.
 
+### Removed: `skipTaskbar` on Linux
+
+See `skipTaskbar` discussion in 19.0 below. This feature is not available on
+Wayland. Since most modern Linux desktops are transitioning to Wayland, this
+feature will be removed for Linux.
+
 ## Planned Breaking API Changes (19.0)
 
-*None (yet)*
+### Unsupported: `skipTaskbar` on Linux
+
+On X11, `skipTaskbar` sends a `_NET_WM_STATE_SKIP_TASKBAR` message to the X11
+window manager. There is not a direct equivalent for Wayland, and the known
+workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
+requires unsafe mode), so Electron is unable to support this feature on Linux.
 
 ## Planned Breaking API Changes (18.0)
 
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 4258bce662937..87d9dd1616627 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -291,6 +291,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
 #endif
 
 #if defined(USE_X11)
+  // TODO(ckerr): remove in Electron v20.0.0
   // Before the window is mapped the SetWMSpecState can not work, so we have
   // to manually set the _NET_WM_STATE.
   std::vector<x11::Atom> state_atom_list;

From 956406a1934e9f71935103a67f13cbd7b571304d Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 22 Mar 2022 00:19:46 -0700
Subject: [PATCH 147/811] fix: use stricter options in
 SecStaticCodeCheckValidity (#33368)

* fix: use stricter options in SecStaticCodeCheckValidity

* Update patches/squirrel.mac/fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch

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

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 patches/squirrel.mac/.patches                 |   1 +
 ...code_kseccsstrictvalidate_in_the_sec.patch |  21 +++
 spec-main/api-autoupdater-darwin-spec.ts      | 137 +++++++++++++++++-
 3 files changed, 153 insertions(+), 6 deletions(-)
 create mode 100644 patches/squirrel.mac/fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch

diff --git a/patches/squirrel.mac/.patches b/patches/squirrel.mac/.patches
index f9ad92a0b41ad..0950bcb5a678d 100644
--- a/patches/squirrel.mac/.patches
+++ b/patches/squirrel.mac/.patches
@@ -1,2 +1,3 @@
 build_add_gn_config.patch
 fix_ensure_that_self_is_retained_until_the_racsignal_is_complete.patch
+fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
diff --git a/patches/squirrel.mac/fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch b/patches/squirrel.mac/fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
new file mode 100644
index 0000000000000..cf9af4dd40fa7
--- /dev/null
+++ b/patches/squirrel.mac/fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Mon, 21 Mar 2022 15:14:19 -0700
+Subject: fix: use kSecCSCheckNestedCode | kSecCSStrictValidate in the Sec
+ validate call
+
+This ensures that Squirrel.Mac validates the nested bundles (nested Frameworks) including the incoming Squirrel.Mac framework.
+
+diff --git a/Squirrel/SQRLCodeSignature.m b/Squirrel/SQRLCodeSignature.m
+index f8754dbd6a1490d2b50f1014e2daa5c1f71b2103..2f5e27c1ae5c5bd514abe33d4cd42c4724656c07 100644
+--- a/Squirrel/SQRLCodeSignature.m
++++ b/Squirrel/SQRLCodeSignature.m
+@@ -124,7 +124,7 @@ - (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL {
+ 		}
+ 		
+ 		CFErrorRef validityError = NULL;
+-		result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSCheckAllArchitectures, (__bridge SecRequirementRef)self.requirement, &validityError);
++		result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSCheckNestedCode | kSecCSStrictValidate | kSecCSCheckAllArchitectures, (__bridge SecRequirementRef)self.requirement, &validityError);
+ 		@onExit {
+ 			if (validityError != NULL) CFRelease(validityError);
+ 		};
diff --git a/spec-main/api-autoupdater-darwin-spec.ts b/spec-main/api-autoupdater-darwin-spec.ts
index 226a196c4ab5a..c4535337f9015 100644
--- a/spec-main/api-autoupdater-darwin-spec.ts
+++ b/spec-main/api-autoupdater-darwin-spec.ts
@@ -6,14 +6,14 @@ import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import { AddressInfo } from 'net';
-import { ifdescribe } from './spec-helpers';
+import { ifdescribe, ifit } from './spec-helpers';
 
 const features = process._linkedBinding('electron_common_features');
 
 const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 // We can only test the auto updater on darwin non-component builds
-ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process.mas && !features.isComponentBuild())('autoUpdater behavior', function () {
+ifdescribe(process.platform === 'darwin' && !(process.env.CI && process.arch === 'arm64') && !process.mas && !features.isComponentBuild())('autoUpdater behavior', function () {
   this.timeout(120000);
 
   let identity = '';
@@ -115,8 +115,11 @@ ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process
 
   const cachedZips: Record<string, string> = {};
 
-  const getOrCreateUpdateZipPath = async (version: string, fixture: string) => {
-    const key = `${version}-${fixture}`;
+  const getOrCreateUpdateZipPath = async (version: string, fixture: string, mutateAppPostSign?: {
+    mutate: (appPath: string) => Promise<void>,
+    mutationKey: string,
+  }) => {
+    const key = `${version}-${fixture}-${mutateAppPostSign?.mutationKey || 'no-mutation'}`;
     if (!cachedZips[key]) {
       let updateZipPath: string;
       await withTempDirectory(async (dir) => {
@@ -127,6 +130,7 @@ ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process
           (await fs.readFile(appPJPath, 'utf8')).replace('1.0.0', version)
         );
         await signApp(secondAppPath);
+        await mutateAppPostSign?.mutate(secondAppPath);
         updateZipPath = path.resolve(dir, 'update.zip');
         await spawn('zip', ['-r', '--symlinks', updateZipPath, './'], {
           cwd: dir
@@ -143,10 +147,12 @@ ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process
     }
   });
 
-  it('should fail to set the feed URL when the app is not signed', async () => {
+  // On arm64 builds the built app is self-signed by default so the setFeedURL call always works
+  ifit(process.arch !== 'arm64')('should fail to set the feed URL when the app is not signed', async () => {
     await withTempDirectory(async (dir) => {
       const appPath = await copyApp(dir);
       const launchResult = await launchApp(appPath, ['http://myupdate']);
+      console.log(launchResult);
       expect(launchResult.code).to.equal(1);
       expect(launchResult.out).to.include('Could not get code signature for running application');
     });
@@ -259,12 +265,16 @@ ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process
       nextVersion: string;
       startFixture: string;
       endFixture: string;
+      mutateAppPostSign?: {
+        mutate: (appPath: string) => Promise<void>,
+        mutationKey: string,
+      }
     }, fn: (appPath: string, zipPath: string) => Promise<void>) => {
       await withTempDirectory(async (dir) => {
         const appPath = await copyApp(dir, opts.startFixture);
         await signApp(appPath);
 
-        const updateZipPath = await getOrCreateUpdateZipPath(opts.nextVersion, opts.endFixture);
+        const updateZipPath = await getOrCreateUpdateZipPath(opts.nextVersion, opts.endFixture, opts.mutateAppPostSign);
 
         await fn(appPath, updateZipPath);
       });
@@ -311,6 +321,121 @@ ifdescribe(process.platform === 'darwin' && process.arch !== 'arm64' && !process
       });
     });
 
+    it('should hit the download endpoint when an update is available and fail when the zip signature is invalid', async () => {
+      await withUpdatableApp({
+        nextVersion: '2.0.0',
+        startFixture: 'update',
+        endFixture: 'update',
+        mutateAppPostSign: {
+          mutationKey: 'add-resource',
+          mutate: async (appPath) => {
+            const resourcesPath = path.resolve(appPath, 'Contents', 'Resources', 'app', 'injected.txt');
+            await fs.writeFile(resourcesPath, 'demo');
+          }
+        }
+      }, async (appPath, updateZipPath) => {
+        server.get('/update-file', (req, res) => {
+          res.download(updateZipPath);
+        });
+        server.get('/update-check', (req, res) => {
+          res.json({
+            url: `http://localhost:${port}/update-file`,
+            name: 'My Release Name',
+            notes: 'Theses are some release notes innit',
+            pub_date: (new Date()).toString()
+          });
+        });
+        const launchResult = await launchApp(appPath, [`http://localhost:${port}/update-check`]);
+        logOnError(launchResult, () => {
+          expect(launchResult).to.have.property('code', 1);
+          expect(launchResult.out).to.include('Code signature at URL');
+          expect(launchResult.out).to.include('a sealed resource is missing or invalid');
+          expect(requests).to.have.lengthOf(2);
+          expect(requests[0]).to.have.property('url', '/update-check');
+          expect(requests[1]).to.have.property('url', '/update-file');
+          expect(requests[0].header('user-agent')).to.include('Electron/');
+          expect(requests[1].header('user-agent')).to.include('Electron/');
+        });
+      });
+    });
+
+    it('should hit the download endpoint when an update is available and fail when the ShipIt binary is a symlink', async () => {
+      await withUpdatableApp({
+        nextVersion: '2.0.0',
+        startFixture: 'update',
+        endFixture: 'update',
+        mutateAppPostSign: {
+          mutationKey: 'modify-shipit',
+          mutate: async (appPath) => {
+            const shipItPath = path.resolve(appPath, 'Contents', 'Frameworks', 'Squirrel.framework', 'Resources', 'ShipIt');
+            await fs.remove(shipItPath);
+            await fs.symlink('/tmp/ShipIt', shipItPath, 'file');
+          }
+        }
+      }, async (appPath, updateZipPath) => {
+        server.get('/update-file', (req, res) => {
+          res.download(updateZipPath);
+        });
+        server.get('/update-check', (req, res) => {
+          res.json({
+            url: `http://localhost:${port}/update-file`,
+            name: 'My Release Name',
+            notes: 'Theses are some release notes innit',
+            pub_date: (new Date()).toString()
+          });
+        });
+        const launchResult = await launchApp(appPath, [`http://localhost:${port}/update-check`]);
+        logOnError(launchResult, () => {
+          expect(launchResult).to.have.property('code', 1);
+          expect(launchResult.out).to.include('Code signature at URL');
+          expect(launchResult.out).to.include('a sealed resource is missing or invalid');
+          expect(requests).to.have.lengthOf(2);
+          expect(requests[0]).to.have.property('url', '/update-check');
+          expect(requests[1]).to.have.property('url', '/update-file');
+          expect(requests[0].header('user-agent')).to.include('Electron/');
+          expect(requests[1].header('user-agent')).to.include('Electron/');
+        });
+      });
+    });
+
+    it('should hit the download endpoint when an update is available and fail when the Electron Framework is modified', async () => {
+      await withUpdatableApp({
+        nextVersion: '2.0.0',
+        startFixture: 'update',
+        endFixture: 'update',
+        mutateAppPostSign: {
+          mutationKey: 'modify-eframework',
+          mutate: async (appPath) => {
+            const shipItPath = path.resolve(appPath, 'Contents', 'Frameworks', 'Electron Framework.framework', 'Electron Framework');
+            await fs.appendFile(shipItPath, Buffer.from('123'));
+          }
+        }
+      }, async (appPath, updateZipPath) => {
+        server.get('/update-file', (req, res) => {
+          res.download(updateZipPath);
+        });
+        server.get('/update-check', (req, res) => {
+          res.json({
+            url: `http://localhost:${port}/update-file`,
+            name: 'My Release Name',
+            notes: 'Theses are some release notes innit',
+            pub_date: (new Date()).toString()
+          });
+        });
+        const launchResult = await launchApp(appPath, [`http://localhost:${port}/update-check`]);
+        logOnError(launchResult, () => {
+          expect(launchResult).to.have.property('code', 1);
+          expect(launchResult.out).to.include('Code signature at URL');
+          expect(launchResult.out).to.include(' main executable failed strict validation');
+          expect(requests).to.have.lengthOf(2);
+          expect(requests[0]).to.have.property('url', '/update-check');
+          expect(requests[1]).to.have.property('url', '/update-file');
+          expect(requests[0].header('user-agent')).to.include('Electron/');
+          expect(requests[1].header('user-agent')).to.include('Electron/');
+        });
+      });
+    });
+
     it('should hit the download endpoint when an update is available and update successfully when the zip is provided with JSON update mode', async () => {
       await withUpdatableApp({
         nextVersion: '2.0.0',

From 81318f0acc59f6acbc74f1baa9cbe1e4411f53f8 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 22 Mar 2022 00:51:04 -0700
Subject: [PATCH 148/811] fix: disable SIGUSR1 when --inspect is disabled
 (#33188)

---
 patches/node/.patches                         |  1 +
 ...nalhandler_to_environment_to_prevent.patch | 69 +++++++++++++++++++
 shell/common/node_bindings.cc                 |  6 ++
 3 files changed, 76 insertions(+)
 create mode 100644 patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 7a36ac8cbf7a6..7e1c403073d8c 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -33,3 +33,4 @@ darwin_translate_eprototype_to_econnreset_3413.patch
 darwin_bump_minimum_supported_version_to_10_15_3406.patch
 fix_failing_node_js_test_on_outdated.patch
 be_compatible_with_cppgc.patch
+feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
diff --git a/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
new file mode 100644
index 0000000000000..c08a9efde794b
--- /dev/null
+++ b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Mon, 7 Mar 2022 16:36:28 -0800
+Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
+ SIGUSR1 handling
+
+This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent.  Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
+
+diff --git a/src/env-inl.h b/src/env-inl.h
+index 845e00208af4b12960ed8b3f3926323af7685185..1ebc33324907654d16e9c0e19b2955efbac7cac7 100644
+--- a/src/env-inl.h
++++ b/src/env-inl.h
+@@ -896,6 +896,10 @@ inline bool Environment::should_initialize_inspector() const {
+   return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
+ }
+ 
++inline bool Environment::should_start_debug_signal_handler() const {
++  return (flags_ & EnvironmentFlags::kNoStartDebugSignalHandler) == 0;
++}
++
+ bool Environment::filehandle_close_warning() const {
+   return emit_filehandle_warning_;
+ }
+diff --git a/src/env.h b/src/env.h
+index ab8334bf0e3405fee4d21a4b541bd1164d92ca89..b2537ebd44bc5b37dd97752735f84e87de1f24bf 100644
+--- a/src/env.h
++++ b/src/env.h
+@@ -1207,6 +1207,7 @@ class Environment : public MemoryRetainer {
+   inline bool hide_console_windows() const;
+   inline bool no_global_search_paths() const;
+   inline bool should_initialize_inspector() const;
++  inline bool should_start_debug_signal_handler() const;
+   inline uint64_t thread_id() const;
+   inline worker::Worker* worker_context() const;
+   Environment* worker_parent_env() const;
+diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
+index c4a3322c6d972fc2052af75b79389c522924d9c5..39ff8df415be1908ba404fba34d9cedda04a88af 100644
+--- a/src/inspector_agent.cc
++++ b/src/inspector_agent.cc
+@@ -680,8 +680,10 @@ bool Agent::Start(const std::string& path,
+                               StartIoThreadAsyncCallback));
+     uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
+     start_io_thread_async.data = this;
+-    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
+-    StartDebugSignalHandler();
++    if (parent_env_->should_start_debug_signal_handler()) {
++      // Ignore failure, SIGUSR1 won't work, but that should not block node start.
++      StartDebugSignalHandler();
++    }
+ 
+     parent_env_->AddCleanupHook([](void* data) {
+       Environment* env = static_cast<Environment*>(data);
+diff --git a/src/node.h b/src/node.h
+index 4201c0d0460b032721ef42a26d79c38a9ee20c24..6873fc89406b046823db9e45234eb7f6b767099d 100644
+--- a/src/node.h
++++ b/src/node.h
+@@ -425,7 +425,11 @@ enum Flags : uint64_t {
+   // Controls whether or not the Environment should call InitializeInspector.
+   // This control is needed by embedders who may not want to initialize the V8
+   // inspector in situations where it already exists.
+-  kNoInitializeInspector = 1 << 8
++  kNoInitializeInspector = 1 << 8,
++  // Controls where or not the InspectorAgent for this Environment should
++  // call StartDebugSignalHandler.  This control is needed by embedders who may
++  // not want to allow other processes to start the V8 inspector.
++  kNoStartDebugSignalHandler = 1 << 9
+ };
+ }  // namespace EnvironmentFlags
+ 
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 4e5b1577b1cfa..aad85fb2c9c68 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -478,6 +478,12 @@ node::Environment* NodeBindings::CreateEnvironment(
              node::EnvironmentFlags::kNoInitializeInspector;
   }
 
+  if (!electron::fuses::IsNodeCliInspectEnabled()) {
+    // If --inspect and friends are disabled we also shouldn't listen for
+    // SIGUSR1
+    flags |= node::EnvironmentFlags::kNoStartDebugSignalHandler;
+  }
+
   v8::TryCatch try_catch(isolate);
   env = node::CreateEnvironment(
       isolate_data_, context, args, exec_args,

From 4d8ebcd19ce3e7618b5155cf0855ecbcc937e8ec Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 22 Mar 2022 01:52:10 -0700
Subject: [PATCH 149/811] chore: change usages of std::vector with const
 elements (#33373)

---
 ...ransfer_to_requestsingleinstancelock.patch | 28 +++++++++----------
 shell/browser/api/electron_api_app.cc         |  6 ++--
 shell/browser/api/electron_api_app.h          |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index a609f4e83a6de..1f6c211951b05 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -19,7 +19,7 @@ instance, but also so the second instance can send back additional
 data to the first instance if needed.
 
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 5a64220aaf1309832dc0ad543e353de67fe0a779..a568dd10d1ef8679d66f4cdc6a471c251cbcd4eb 100644
+index 5a64220aaf1309832dc0ad543e353de67fe0a779..5b701b1361707b610ed60c344e441e67ca701362 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -18,6 +18,7 @@
@@ -46,7 +46,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..a568dd10d1ef8679d66f4cdc6a471c25
        base::RepeatingCallback<bool(const base::CommandLine& command_line,
 -                                   const base::FilePath& current_directory)>;
 +                                   const base::FilePath& current_directory,
-+                                   const std::vector<const uint8_t> additional_data,
++                                   const std::vector<uint8_t> additional_data,
 +                                   const NotificationAckCallback& ack_callback)>;
  
  #if BUILDFLAG(IS_WIN)
@@ -96,7 +96,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..a568dd10d1ef8679d66f4cdc6a471c25
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65ddbfc332 100644
+index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a5a1f1424 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -148,7 +148,7 @@ const char kACKToken[] = "ACK";
@@ -112,7 +112,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
-+                     const std::vector<const uint8_t> additional_data,
++                     const std::vector<uint8_t> additional_data,
                       SocketReader* reader);
  
   private:
@@ -133,7 +133,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65
 -    const std::string& current_dir, const std::vector<std::string>& argv,
 +    const std::string& current_dir,
 +    const std::vector<std::string>& argv,
-+    const std::vector<const uint8_t> additional_data,
++    const std::vector<uint8_t> additional_data,
      SocketReader* reader) {
    DCHECK(ui_task_runner_->BelongsToCurrentThread());
    DCHECK(reader);
@@ -195,7 +195,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65
 +  base::StringToSizeT(tokens[0], &num_args);
 +  std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
 +
-+  std::vector<const uint8_t> additional_data;
++  std::vector<uint8_t> additional_data;
 +  if (tokens.size() >= 3 + num_args) {
 +    size_t additional_data_size;
 +    base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
@@ -204,7 +204,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65
 +        std::string(1, kTokenDelimiter));
 +    const uint8_t* additional_data_bits =
 +        reinterpret_cast<const uint8_t*>(remaining_args.c_str());
-+    additional_data = std::vector<const uint8_t>(additional_data_bits,
++    additional_data = std::vector<uint8_t>(additional_data_bits,
 +        additional_data_bits + additional_data_size);
 +  }
 +
@@ -282,7 +282,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..b23c16fde275fdba559abb1f30e42f65
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d0c912034 100644
+index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce82ad6abb2 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
 @@ -21,6 +21,7 @@
@@ -301,7 +301,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d
 +const DWORD kPipeTimeout = 10000;
 +const DWORD kMaxMessageLength = 32 * 1024;
 +
-+std::unique_ptr<std::vector<const uint8_t>> g_ack_data;
++std::unique_ptr<std::vector<uint8_t>> g_ack_data;
 +base::OneShotTimer g_ack_timer;
 +HANDLE g_write_ack_pipe;
 +bool g_write_ack_callback_called = false;
@@ -314,7 +314,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d
                        base::CommandLine* parsed_command_line,
 -                      base::FilePath* current_directory) {
 +                      base::FilePath* current_directory,
-+                      std::vector<const uint8_t>* parsed_additional_data) {
++                      std::vector<uint8_t>* parsed_additional_data) {
    // We should have enough room for the shortest command (min_message_size)
    // and also be a multiple of wchar_t bytes. The shortest command
 -  // possible is L"START\0\0" (empty current directory and command line).
@@ -355,7 +355,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d
 +        msg.substr(fourth_null + 1, fifth_null - fourth_null);
 +    const uint8_t* additional_data_bytes =
 +        reinterpret_cast<const uint8_t*>(additional_data.c_str());
-+    *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
++    *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
 +        additional_data_bytes + additional_data_length);
 +
      return true;
@@ -365,8 +365,8 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d
  
 +void StoreAck(const base::span<const uint8_t>* ack_data) {
 +  if (ack_data) {
-+    g_ack_data = std::make_unique<std::vector<const uint8_t>>(ack_data->begin(),
-+                                                              ack_data->end());
++    g_ack_data = std::make_unique<std::vector<uint8_t>>(ack_data->begin(),
++                                                        ack_data->end());
 +  } else {
 +    g_ack_data = nullptr;
 +  }
@@ -414,7 +414,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..268be8c0334a4bc051ff08792ea0dc3d
    base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
    base::FilePath current_directory;
 -  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
-+  std::vector<const uint8_t> additional_data;
++  std::vector<uint8_t> additional_data;
 +  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory,
 +                        &additional_data)) {
      *result = TRUE;
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index bcc96086557f8..353b8c3d67783 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -519,12 +519,12 @@ bool NotificationCallbackWrapper(
     const base::RepeatingCallback<
         void(const base::CommandLine& command_line,
              const base::FilePath& current_directory,
-             const std::vector<const uint8_t> additional_data,
+             const std::vector<uint8_t> additional_data,
              const ProcessSingleton::NotificationAckCallback& ack_callback)>&
         callback,
     const base::CommandLine& cmd,
     const base::FilePath& cwd,
-    const std::vector<const uint8_t> additional_data,
+    const std::vector<uint8_t> additional_data,
     const ProcessSingleton::NotificationAckCallback& ack_callback) {
   // Make sure the callback is called after app gets ready.
   if (Browser::Get()->is_ready()) {
@@ -1118,7 +1118,7 @@ static void AckCallbackWrapper(
 void App::OnSecondInstance(
     const base::CommandLine& cmd,
     const base::FilePath& cwd,
-    const std::vector<const uint8_t> additional_data,
+    const std::vector<uint8_t> additional_data,
     const ProcessSingleton::NotificationAckCallback& ack_callback) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
   v8::Locker locker(isolate);
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index d6bd52ada971f..840c0cb66da34 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -197,7 +197,7 @@ class App : public ElectronBrowserClient::Delegate,
   void OnSecondInstance(
       const base::CommandLine& cmd,
       const base::FilePath& cwd,
-      const std::vector<const uint8_t> additional_data,
+      const std::vector<uint8_t> additional_data,
       const ProcessSingleton::NotificationAckCallback& ack_callback);
   bool HasSingleInstanceLock() const;
   bool RequestSingleInstanceLock(gin::Arguments* args);

From b7188f07f4ac1193b9b73aedec8a7edb5e917982 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 22 Mar 2022 06:00:54 -0700
Subject: [PATCH 150/811] Bump v19.0.0-nightly.20220322

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 2a38aac402469..7ed2959db92aa 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220321
\ No newline at end of file
+19.0.0-nightly.20220322
\ No newline at end of file
diff --git a/package.json b/package.json
index 32b8e545c0fe5..e385ef6a7ab8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220321",
+  "version": "19.0.0-nightly.20220322",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b5ef04aa1cb85..b311dceaba875 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220321
- PRODUCTVERSION 19,0,0,20220321
+ FILEVERSION 19,0,0,20220322
+ PRODUCTVERSION 19,0,0,20220322
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From feff8b358494fa1d0ed755dae7095f820c354f93 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 22 Mar 2022 08:31:53 -0700
Subject: [PATCH 151/811] ci: enable thin LTO on Mac (#33194)

* build: remove thin lto mac patch

* build: remove step-get-more-space-on-mac

* build: remove USE_PREBUILT_V8_CONTEXT_SNAPSHOT

* ci: re-add mksnapshot logic

* ci: re-add USE_PREBUILT_V8_CONTEXT_SNAPSHOT

* ci: re-add get-more-space, delete thin LTO cache & .dSYM

* ci: don't delete v8_snapshot_generator.dSYM

* ci: add timeout to mksnapshot
---
 .circleci/build_config.yml                    |  2 ++
 patches/chromium/.patches                     |  1 -
 .../build_disable_thin_lto_on_mac.patch       | 22 -------------------
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 patches/chromium/build_disable_thin_lto_on_mac.patch

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 0175d1fd97e90..3d4f5c162644a 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -544,6 +544,7 @@ step-electron-build: &step-electron-build
         (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
         rm -rf out/Default/clang_x64_v8_arm64/gen
         rm -rf out/Default/clang_x64_v8_arm64/obj
+        rm -rf out/Default/clang_x64_v8_arm64/thinlto-cache
         rm -rf out/Default/clang_x64/obj
 
         # Regenerate because we just deleted some ninja files 
@@ -780,6 +781,7 @@ step-show-goma-stats: &step-show-goma-stats
 step-mksnapshot-build: &step-mksnapshot-build
   run:
     name: mksnapshot build
+    no_output_timeout: 30m
     command: |
       cd src
       if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index c470189487c06..7dcf136c34928 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -112,6 +112,5 @@ feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
-build_disable_thin_lto_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 remove_incorrect_width_height_adjustments.patch
diff --git a/patches/chromium/build_disable_thin_lto_on_mac.patch b/patches/chromium/build_disable_thin_lto_on_mac.patch
deleted file mode 100644
index f5ffa86766c1a..0000000000000
--- a/patches/chromium/build_disable_thin_lto_on_mac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <vertedinde@electronjs.org>
-Date: Tue, 1 Mar 2022 11:31:59 -0800
-Subject: build: disable thin lto on mac
-
-Ths build disables thin lto for mac, in order to preserve
-disk space on mac without breaking win-ia32.
-The patch can be removed when we have more disk space on CircleCI
-
-diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index 9d25c10587c7ab4e2053f8f69aef3f135ef8e9f9..8d8b8d13c62da1fdd051019c8b726de7d1783113 100644
---- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -74,7 +74,7 @@ declare_args() {
-   use_thin_lto =
-       is_cfi ||
-       (is_clang && is_official_build && chrome_pgo_phase != 1 &&
--       (is_linux || is_win || is_mac ||
-+       (is_linux || is_win ||
-         (is_android && target_os != "chromeos") ||
-         ((is_chromeos_ash || is_chromeos_lacros) && is_chromeos_device)))
- 

From 3aec1c3e3fddaca43412afa60af5bb62282b8e98 Mon Sep 17 00:00:00 2001
From: Black-Hole <158blackhole@gmail.com>
Date: Wed, 23 Mar 2022 00:41:21 +0800
Subject: [PATCH 152/811] chore: upgrade @electron/get version to ^1.14.1
 (#33259)

Co-authored-by: Mark Lee <malept@users.noreply.github.com>
---
 npm/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/package.json b/npm/package.json
index 753f3af8b1fd3..a66407d4e4d5c 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -8,7 +8,7 @@
     "postinstall": "node install.js"
   },
   "dependencies": {
-    "@electron/get": "^1.13.0",
+    "@electron/get": "^1.14.1",
     "@types/node": "^14.6.2",
     "extract-zip": "^1.0.3"
   },

From 8ad1470d08435de405b6738ef546d5ca95559fd0 Mon Sep 17 00:00:00 2001
From: Johns Gresham <johnsgresham@gmail.com>
Date: Tue, 22 Mar 2022 19:54:08 -0400
Subject: [PATCH 153/811] docs: remove extra $ from npm install command
 (#33366)

---
 docs/tutorial/quick-start.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index d7252ac16bfdc..64d82d61dfdb4 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -66,7 +66,7 @@ Your `package.json` file should look something like this:
 Then, install the `electron` package into your app's `devDependencies`.
 
 ```sh npm2yarn
-$ npm install --save-dev electron
+npm install --save-dev electron
 ```
 
 > Note: If you're encountering any issues with installing Electron, please

From 4633376b28293ed74d88cf292c2539824c3bd795 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 22 Mar 2022 17:14:49 -0700
Subject: [PATCH 154/811] test: fix crash on image.crop (#33148)

* test: fix crash on image.crop

* Trigger CI
---
 spec-main/screen-helpers.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec-main/screen-helpers.ts b/spec-main/screen-helpers.ts
index 26fbcb8ea2b08..ea9d69e0f17d9 100644
--- a/spec-main/screen-helpers.ts
+++ b/spec-main/screen-helpers.ts
@@ -41,7 +41,8 @@ const formatHexByte = (val: number): string => {
  * Get the hex color at the given pixel coordinate in an image.
  */
 export const getPixelColor = (image: Electron.NativeImage, point: Electron.Point): string => {
-  const pixel = image.crop({ ...point, width: 1, height: 1 });
+  // image.crop crashes if point is fractional, so round to prevent that crash
+  const pixel = image.crop({ x: Math.round(point.x), y: Math.round(point.y), width: 1, height: 1 });
   // TODO(samuelmaddock): NativeImage.toBitmap() should return the raw pixel
   // color, but it sometimes differs. Why is that?
   const [b, g, r] = pixel.toBitmap();

From 27ddf19f3ce34f0153d29e23f68b6c38b206f296 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 22 Mar 2022 17:17:35 -0700
Subject: [PATCH 155/811] chore: use pylint-2.7 (#33232)

* chore: use pylint-2.7

* chore: fix pylint errors
---
 script/lint.js                     | 2 +-
 script/release/uploaders/upload.py | 1 +
 script/run-clang-format.py         | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/script/lint.js b/script/lint.js
index 5e7489ee8ddd6..6cfb8143cd081 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -103,7 +103,7 @@ const LINTERS = [{
     const rcfile = path.join(DEPOT_TOOLS, 'pylintrc');
     const args = ['--rcfile=' + rcfile, ...filenames];
     const env = Object.assign({ PYTHONPATH: path.join(ELECTRON_ROOT, 'script') }, process.env);
-    spawnAndCheckExitCode('pylint', args, { env });
+    spawnAndCheckExitCode('pylint-2.7', args, { env });
   }
 }, {
   key: 'javascript',
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 2cec0ff8dabed..88fbcc2423770 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -208,6 +208,7 @@ def zero_zip_date_time(fname):
     with open(fname, 'r+b') as f:
       _zero_zip_date_time(f)
   except Exception:
+    # pylint: disable=W0707
     raise NonZipFileError(fname)
 
 
diff --git a/script/run-clang-format.py b/script/run-clang-format.py
index b7817bb32c612..a8d43e08ba83b 100644
--- a/script/run-clang-format.py
+++ b/script/run-clang-format.py
@@ -78,12 +78,14 @@ def make_diff(diff_file, original, reformatted):
 
 class DiffError(Exception):
     def __init__(self, message, errs=None):
+        # pylint: disable=R1725
         super(DiffError, self).__init__(message)
         self.errs = errs or []
 
 
 class UnexpectedError(Exception):
     def __init__(self, message, exc=None):
+        # pylint: disable=R1725
         super(UnexpectedError, self).__init__(message)
         self.formatted_traceback = traceback.format_exc()
         self.exc = exc
@@ -96,6 +98,7 @@ def run_clang_format_diff_wrapper(args, file_name):
     except DiffError:
         raise
     except Exception as e:
+        # pylint: disable=W0707
         raise UnexpectedError('{}: {}: {}'.format(
             file_name, e.__class__.__name__, e), e)
 
@@ -105,6 +108,7 @@ def run_clang_format_diff(args, file_name):
         with io.open(file_name, 'r', encoding='utf-8') as f:
             original = f.readlines()
     except IOError as exc:
+        # pylint: disable=W0707
         raise DiffError(str(exc))
     invocation = [args.clang_format_executable, file_name]
     if args.fix:
@@ -117,6 +121,7 @@ def run_clang_format_diff(args, file_name):
             universal_newlines=True,
             shell=True)
     except OSError as exc:
+        # pylint: disable=W0707
         raise DiffError(str(exc))
     proc_stdout = proc.stdout
     proc_stderr = proc.stderr

From 06a00b74e817a61f20e2734d50d8eb7bc9b099f6 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Tue, 22 Mar 2022 17:37:55 -0700
Subject: [PATCH 156/811] fix: initialize asar support in worker threads
 (#33216)

* fix: initialize asar support in worker threads

Use `ObjectWrap` instead of gin's Wrap in `electron_api_asar.cc` because
gin isn't fully initialized (and apparently not possible to initialize
without ruining the isolate configuration and array buffer allocator) in
worker threads. In the worker thread call `setupAsarSupport` just as we
do for the main process.

* Update lib/asar/fs-wrapper.ts

Co-authored-by: Darshan Sen <raisinten@gmail.com>

* Update patches/node/worker_thread_add_asar_support.patch

Co-authored-by: Darshan Sen <raisinten@gmail.com>

* Add a test

Co-authored-by: Darshan Sen <raisinten@gmail.com>
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 lib/asar/fs-wrapper.ts                        |  12 +-
 patches/node/.patches                         |   1 +
 .../node/worker_thread_add_asar_support.patch |  41 ++++
 shell/common/api/electron_api_asar.cc         | 208 ++++++++++++------
 shell/common/node_includes.h                  |   1 +
 spec-main/asar-spec.ts                        |  16 ++
 spec/fixtures/test.asar/worker_threads.asar   | Bin 0 -> 672 bytes
 typings/internal-ambient.d.ts                 |   2 +-
 8 files changed, 210 insertions(+), 71 deletions(-)
 create mode 100644 patches/node/worker_thread_add_asar_support.patch
 create mode 100644 spec/fixtures/test.asar/worker_threads.asar

diff --git a/lib/asar/fs-wrapper.ts b/lib/asar/fs-wrapper.ts
index 87e03b73664f6..1feabb16fc901 100644
--- a/lib/asar/fs-wrapper.ts
+++ b/lib/asar/fs-wrapper.ts
@@ -30,11 +30,13 @@ const getOrCreateArchive = (archivePath: string) => {
     return cachedArchives.get(archivePath);
   }
 
-  const newArchive = asar.createArchive(archivePath);
-  if (!newArchive) return null;
-
-  cachedArchives.set(archivePath, newArchive);
-  return newArchive;
+  try {
+    const newArchive = new asar.Archive(archivePath);
+    cachedArchives.set(archivePath, newArchive);
+    return newArchive;
+  } catch {
+    return null;
+  }
 };
 
 const asarRe = /\.asar/i;
diff --git a/patches/node/.patches b/patches/node/.patches
index 7e1c403073d8c..85ca6d4b58d7c 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -34,3 +34,4 @@ darwin_bump_minimum_supported_version_to_10_15_3406.patch
 fix_failing_node_js_test_on_outdated.patch
 be_compatible_with_cppgc.patch
 feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
+worker_thread_add_asar_support.patch
diff --git a/patches/node/worker_thread_add_asar_support.patch b/patches/node/worker_thread_add_asar_support.patch
new file mode 100644
index 0000000000000..7300f87fd4fc3
--- /dev/null
+++ b/patches/node/worker_thread_add_asar_support.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fedor Indutny <indutny@signal.org>
+Date: Wed, 9 Mar 2022 17:52:32 -0800
+Subject: worker_thread: add asar support
+
+This patch initializes asar support in workers threads in
+Node.js.
+
+diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
+index 419ffd9d5deb84eb94381259d3084411f6c3341b..17a1860d158976f11035553601560d171c7fc25a 100644
+--- a/lib/internal/bootstrap/pre_execution.js
++++ b/lib/internal/bootstrap/pre_execution.js
+@@ -505,6 +505,7 @@ module.exports = {
+   loadPreloadModules,
+   setupTraceCategoryState,
+   setupInspectorHooks,
++  setupAsarSupport,
+   initializeReport,
+   initializeCJSLoader,
+   initializeWASI
+diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
+index e3ce67987ee3185a93750ebad72beab304c71e3a..ef5082d73b6153b49875c61d9b365b873b16145d 100644
+--- a/lib/internal/main/worker_thread.js
++++ b/lib/internal/main/worker_thread.js
+@@ -27,6 +27,7 @@ const {
+   initializeReport,
+   initializeSourceMapsHandlers,
+   loadPreloadModules,
++  setupAsarSupport,
+   setupTraceCategoryState
+ } = require('internal/bootstrap/pre_execution');
+ 
+@@ -154,6 +155,8 @@ port.on('message', (message) => {
+     };
+     workerIo.sharedCwdCounter = cwdCounter;
+ 
++    setupAsarSupport();
++
+     const CJSLoader = require('internal/modules/cjs/loader');
+     assert(!CJSLoader.hasLoadedAnyUserCJSModule);
+     loadPreloadModules();
diff --git a/shell/common/api/electron_api_asar.cc b/shell/common/api/electron_api_asar.cc
index 7ded3c169c576..0b2397ff2c331 100644
--- a/shell/common/api/electron_api_asar.cc
+++ b/shell/common/api/electron_api_asar.cc
@@ -5,11 +5,8 @@
 #include <vector>
 
 #include "gin/handle.h"
-#include "gin/object_template_builder.h"
-#include "gin/wrappable.h"
 #include "shell/common/asar/archive.h"
 #include "shell/common/asar/asar_util.h"
-#include "shell/common/gin_converters/callback_converter.h"
 #include "shell/common/gin_converters/file_path_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
 #include "shell/common/node_includes.h"
@@ -17,45 +14,73 @@
 
 namespace {
 
-class Archive : public gin::Wrappable<Archive> {
+class Archive : public node::ObjectWrap {
  public:
-  static gin::Handle<Archive> Create(v8::Isolate* isolate,
-                                     const base::FilePath& path) {
-    auto archive = std::make_unique<asar::Archive>(path);
-    if (!archive->Init())
-      return gin::Handle<Archive>();
-    return gin::CreateHandle(isolate, new Archive(isolate, std::move(archive)));
-  }
-
-  // gin::Wrappable
-  static gin::WrapperInfo kWrapperInfo;
-  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
-      v8::Isolate* isolate) override {
-    return gin::ObjectTemplateBuilder(isolate)
-        .SetMethod("getFileInfo", &Archive::GetFileInfo)
-        .SetMethod("stat", &Archive::Stat)
-        .SetMethod("readdir", &Archive::Readdir)
-        .SetMethod("realpath", &Archive::Realpath)
-        .SetMethod("copyFileOut", &Archive::CopyFileOut)
-        .SetMethod("getFdAndValidateIntegrityLater", &Archive::GetFD);
+  static v8::Local<v8::FunctionTemplate> CreateFunctionTemplate(
+      v8::Isolate* isolate) {
+    auto tpl = v8::FunctionTemplate::New(isolate, Archive::New);
+    tpl->SetClassName(
+        v8::String::NewFromUtf8(isolate, "Archive").ToLocalChecked());
+    tpl->InstanceTemplate()->SetInternalFieldCount(1);
+
+    NODE_SET_PROTOTYPE_METHOD(tpl, "getFileInfo", &Archive::GetFileInfo);
+    NODE_SET_PROTOTYPE_METHOD(tpl, "stat", &Archive::Stat);
+    NODE_SET_PROTOTYPE_METHOD(tpl, "readdir", &Archive::Readdir);
+    NODE_SET_PROTOTYPE_METHOD(tpl, "realpath", &Archive::Realpath);
+    NODE_SET_PROTOTYPE_METHOD(tpl, "copyFileOut", &Archive::CopyFileOut);
+    NODE_SET_PROTOTYPE_METHOD(tpl, "getFdAndValidateIntegrityLater",
+                              &Archive::GetFD);
+
+    return tpl;
   }
 
-  const char* GetTypeName() override { return "Archive"; }
-
   // disable copy
   Archive(const Archive&) = delete;
   Archive& operator=(const Archive&) = delete;
 
  protected:
-  Archive(v8::Isolate* isolate, std::unique_ptr<asar::Archive> archive)
+  explicit Archive(std::unique_ptr<asar::Archive> archive)
       : archive_(std::move(archive)) {}
 
+  static void New(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      isolate->ThrowException(v8::Exception::Error(node::FIXED_ONE_BYTE_STRING(
+          isolate, "failed to convert path to V8")));
+      return;
+    }
+
+    auto archive = std::make_unique<asar::Archive>(path);
+    if (!archive->Init()) {
+      isolate->ThrowException(v8::Exception::Error(node::FIXED_ONE_BYTE_STRING(
+          isolate, "failed to initialize archive")));
+      return;
+    }
+
+    auto* archive_wrap = new Archive(std::move(archive));
+    archive_wrap->Wrap(args.This());
+    args.GetReturnValue().Set(args.This());
+  }
+
   // Reads the offset and size of file.
-  v8::Local<v8::Value> GetFileInfo(v8::Isolate* isolate,
-                                   const base::FilePath& path) {
+  static void GetFileInfo(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     asar::Archive::FileInfo info;
-    if (!archive_ || !archive_->GetFileInfo(path, &info))
-      return v8::False(isolate);
+    if (!wrap->archive_ || !wrap->archive_->GetFileInfo(path, &info)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     gin_helper::Dictionary dict(isolate, v8::Object::New(isolate));
     dict.Set("size", info.size);
     dict.Set("unpacked", info.unpacked);
@@ -74,65 +99,104 @@ class Archive : public gin::Wrappable<Archive> {
       integrity.Set("hash", info.integrity.value().hash);
       dict.Set("integrity", integrity);
     }
-    return dict.GetHandle();
+    args.GetReturnValue().Set(dict.GetHandle());
   }
 
   // Returns a fake result of fs.stat(path).
-  v8::Local<v8::Value> Stat(v8::Isolate* isolate, const base::FilePath& path) {
+  static void Stat(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     asar::Archive::Stats stats;
-    if (!archive_ || !archive_->Stat(path, &stats))
-      return v8::False(isolate);
+    if (!wrap->archive_ || !wrap->archive_->Stat(path, &stats)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     gin_helper::Dictionary dict(isolate, v8::Object::New(isolate));
     dict.Set("size", stats.size);
     dict.Set("offset", stats.offset);
     dict.Set("isFile", stats.is_file);
     dict.Set("isDirectory", stats.is_directory);
     dict.Set("isLink", stats.is_link);
-    return dict.GetHandle();
+    args.GetReturnValue().Set(dict.GetHandle());
   }
 
   // Returns all files under a directory.
-  v8::Local<v8::Value> Readdir(v8::Isolate* isolate,
-                               const base::FilePath& path) {
+  static void Readdir(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     std::vector<base::FilePath> files;
-    if (!archive_ || !archive_->Readdir(path, &files))
-      return v8::False(isolate);
-    return gin::ConvertToV8(isolate, files);
+    if (!wrap->archive_ || !wrap->archive_->Readdir(path, &files)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+    args.GetReturnValue().Set(gin::ConvertToV8(isolate, files));
   }
 
   // Returns the path of file with symbol link resolved.
-  v8::Local<v8::Value> Realpath(v8::Isolate* isolate,
-                                const base::FilePath& path) {
+  static void Realpath(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     base::FilePath realpath;
-    if (!archive_ || !archive_->Realpath(path, &realpath))
-      return v8::False(isolate);
-    return gin::ConvertToV8(isolate, realpath);
+    if (!wrap->archive_ || !wrap->archive_->Realpath(path, &realpath)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+    args.GetReturnValue().Set(gin::ConvertToV8(isolate, realpath));
   }
 
   // Copy the file out into a temporary file and returns the new path.
-  v8::Local<v8::Value> CopyFileOut(v8::Isolate* isolate,
-                                   const base::FilePath& path) {
+  static void CopyFileOut(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+    base::FilePath path;
+    if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+
     base::FilePath new_path;
-    if (!archive_ || !archive_->CopyFileOut(path, &new_path))
-      return v8::False(isolate);
-    return gin::ConvertToV8(isolate, new_path);
+    if (!wrap->archive_ || !wrap->archive_->CopyFileOut(path, &new_path)) {
+      args.GetReturnValue().Set(v8::False(isolate));
+      return;
+    }
+    args.GetReturnValue().Set(gin::ConvertToV8(isolate, new_path));
   }
 
   // Return the file descriptor.
-  int GetFD() const {
-    if (!archive_)
-      return -1;
-    return archive_->GetUnsafeFD();
+  static void GetFD(const v8::FunctionCallbackInfo<v8::Value>& args) {
+    auto* isolate = args.GetIsolate();
+    auto* wrap = node::ObjectWrap::Unwrap<Archive>(args.Holder());
+
+    args.GetReturnValue().Set(gin::ConvertToV8(
+        isolate, wrap->archive_ ? wrap->archive_->GetUnsafeFD() : -1));
   }
 
- private:
   std::unique_ptr<asar::Archive> archive_;
 };
 
-// static
-gin::WrapperInfo Archive::kWrapperInfo = {gin::kEmbedderNativeGin};
+static void InitAsarSupport(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  auto* isolate = args.GetIsolate();
+  auto require = args[0];
 
-void InitAsarSupport(v8::Isolate* isolate, v8::Local<v8::Value> require) {
   // Evaluate asar_bundle.js.
   std::vector<v8::Local<v8::String>> asar_bundle_params = {
       node::FIXED_ONE_BYTE_STRING(isolate, "require")};
@@ -142,8 +206,15 @@ void InitAsarSupport(v8::Isolate* isolate, v8::Local<v8::Value> require) {
       &asar_bundle_params, &asar_bundle_args, nullptr);
 }
 
-v8::Local<v8::Value> SplitPath(v8::Isolate* isolate,
-                               const base::FilePath& path) {
+static void SplitPath(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  auto* isolate = args.GetIsolate();
+
+  base::FilePath path;
+  if (!gin::ConvertFromV8(isolate, args[0], &path)) {
+    args.GetReturnValue().Set(v8::False(isolate));
+    return;
+  }
+
   gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
   base::FilePath asar_path, file_path;
   if (asar::GetAsarArchivePath(path, &asar_path, &file_path, true)) {
@@ -153,17 +224,24 @@ v8::Local<v8::Value> SplitPath(v8::Isolate* isolate,
   } else {
     dict.Set("isAsar", false);
   }
-  return dict.GetHandle();
+  args.GetReturnValue().Set(dict.GetHandle());
 }
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
-  gin_helper::Dictionary dict(context->GetIsolate(), exports);
-  dict.SetMethod("createArchive", &Archive::Create);
-  dict.SetMethod("splitPath", &SplitPath);
-  dict.SetMethod("initAsarSupport", &InitAsarSupport);
+  auto* isolate = exports->GetIsolate();
+
+  auto cons = Archive::CreateFunctionTemplate(isolate)
+                  ->GetFunction(context)
+                  .ToLocalChecked();
+  cons->SetName(node::FIXED_ONE_BYTE_STRING(isolate, "Archive"));
+
+  exports->Set(context, node::FIXED_ONE_BYTE_STRING(isolate, "Archive"), cons)
+      .Check();
+  NODE_SET_METHOD(exports, "splitPath", &SplitPath);
+  NODE_SET_METHOD(exports, "initAsarSupport", &InitAsarSupport);
 }
 
 }  // namespace
diff --git a/shell/common/node_includes.h b/shell/common/node_includes.h
index f4f026df663de..c678769324349 100644
--- a/shell/common/node_includes.h
+++ b/shell/common/node_includes.h
@@ -23,6 +23,7 @@
 #include "node_errors.h"
 #include "node_internals.h"
 #include "node_native_module_env.h"
+#include "node_object_wrap.h"
 #include "node_options-inl.h"
 #include "node_options.h"
 #include "node_platform.h"
diff --git a/spec-main/asar-spec.ts b/spec-main/asar-spec.ts
index 865a022a9a38a..babfcdb8c1a21 100644
--- a/spec-main/asar-spec.ts
+++ b/spec-main/asar-spec.ts
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import * as path from 'path';
 import * as url from 'url';
+import { Worker } from 'worker_threads';
 import { BrowserWindow, ipcMain } from 'electron/main';
 import { closeAllWindows } from './window-helpers';
 import { emittedOnce } from './events-helpers';
@@ -108,4 +109,19 @@ describe('asar package', () => {
       expect(result).to.equal('success');
     });
   });
+
+  describe('worker threads', function () {
+    it('should start worker thread from asar file', function (callback) {
+      const p = path.join(asarDir, 'worker_threads.asar', 'worker.js');
+      const w = new Worker(p);
+
+      w.on('error', (err) => callback(err));
+      w.on('message', (message) => {
+        expect(message).to.equal('ping');
+        w.terminate();
+
+        callback(null);
+      });
+    });
+  });
 });
diff --git a/spec/fixtures/test.asar/worker_threads.asar b/spec/fixtures/test.asar/worker_threads.asar
new file mode 100644
index 0000000000000000000000000000000000000000..5c7db2852589586997cc68ce8713640754a0f22a
GIT binary patch
literal 672
zcmbtSO-sZu5Ut>;zoO*gE-bZ8(>C2@1#eyiVUHq`q?5L8ZEKUokEQ?Gg9i^zSCQS5
z$P$K3k~i<o8*=J6&gY5ad|<p|Y>BRFFl4?Z8(Y=>!!9+|8<2SzhBMM?ZNQQ_3CN68
zjfJAG?CXdZb<tv8KH}r*>XOC@B1&OOJS(0_kebF!1R_poz;Ve)s6^x}WvSqj=b20r
znsO>N&^QInHDgq#LhB5fWZkOuYS#!0GZqEx=MFo(Jzn5$7-r<T?bpyBm}c>wXPm%)
zT!WUB0tE@UMM_E?WlTmY=1c(>Qfrx~XeJAJ2&sxG6_7+qXDZ2}NTh$dK3V`>4})qO
zW4*1{i5?nz)ArUIyrtK})28ZSa`ruydt3G(a&tCaxGubO2s3_HH3dQ^Q*U|UZC!7V
k!|z&SufZ5mAjb$CD~E;qD>v322>IvZpW6wH_zB{_05^ZisQ>@~

literal 0
HcmV?d00001

diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index c3b73935a2999..ae8a2e84cd878 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -83,7 +83,7 @@ declare namespace NodeJS {
   }
 
   interface AsarBinding {
-    createArchive(path: string): AsarArchive;
+    Archive: { new(path: string): AsarArchive };
     splitPath(path: string): {
       isAsar: false;
     } | {

From 800b96fe142446faa08aa0d380e71e3bea79b12f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 22 Mar 2022 17:45:23 -0700
Subject: [PATCH 157/811] docs: add new IPC validation section to the security
 tutorial (#33369)

* docs: add new IPC validation section to the security tutorial

* Update security.md

* Update docs/tutorial/security.md

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

* Update docs/tutorial/security.md

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

Co-authored-by: Erick Zhao <erick@hotmail.ca>
---
 docs/tutorial/security.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index d267a61a47d00..db5b1b60a337c 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -723,6 +723,41 @@ Migrate your app one major version at a time, while referring to Electron's
 [Breaking Changes][breaking-changes] document to see if any code needs to
 be updated.
 
+### 17. Validate the `sender` of all IPC messages
+
+You should always validate incoming IPC messages `sender` property to ensure you
+aren't performing actions or sending information to untrusted renderers.
+
+#### Why?
+
+All Web Frames can in theory send IPC messages to the main process, including
+iframes and child windows in some scenarios.  If you have an IPC message that returns
+user data to the sender via `event.reply` or performs privileged actions that the renderer
+can't natively, you should ensure you aren't listening to third party web frames.
+
+You should be validating the `sender` of **all** IPC messages by default.
+
+#### How?
+
+```js title='main.js (Main Process)'
+// Bad
+ipcMain.handle('get-secrets', () => {
+  return getSecrets();
+});
+
+// Good
+ipcMain.handle('get-secrets', (e) => {
+  if (!validateSender(e.senderFrame)) return null;
+  return getSecrets();
+});
+
+function validateSender(frame) {
+  // Value the host of the URL using an actual URL parser and an allowlist
+  if ((new URL(frame.url)).host === 'electronjs.org') return true;
+  return false;
+}
+```
+
 [breaking-changes]: ../breaking-changes.md
 [browser-window]: ../api/browser-window.md
 [browser-view]: ../api/browser-view.md

From 3744ac0a520562e08ecc4ec5f88f059818a0ad1e Mon Sep 17 00:00:00 2001
From: andreasdj <johansson.d.andreas@gmail.com>
Date: Wed, 23 Mar 2022 02:16:15 +0100
Subject: [PATCH 158/811] fix: persist BrowserView content bounds when
 calculating layout (#32747)

Reverting change introduced in PR: https://github.com/electron/electron/pull/30510

Co-authored-by: Andreas Johansson <aj3621@tobii.com>
---
 shell/browser/ui/views/inspectable_web_contents_view_views.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/ui/views/inspectable_web_contents_view_views.cc b/shell/browser/ui/views/inspectable_web_contents_view_views.cc
index 35a32fd505158..7ab8ac51a2116 100644
--- a/shell/browser/ui/views/inspectable_web_contents_view_views.cc
+++ b/shell/browser/ui/views/inspectable_web_contents_view_views.cc
@@ -214,7 +214,7 @@ void InspectableWebContentsViewViews::SetTitle(const std::u16string& title) {
 
 void InspectableWebContentsViewViews::Layout() {
   if (!devtools_web_view_->GetVisible()) {
-    contents_web_view_->SetBoundsRect(GetVisibleBounds());
+    contents_web_view_->SetBoundsRect(GetContentsBounds());
     return;
   }
 

From 6bb492ac231777437e6d7a1cd5ecf703093fba91 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 23 Mar 2022 02:46:45 -0700
Subject: [PATCH 159/811] docs: update Ubuntu version used for Linux prebuilt
 binaries (#33372)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 00bb29edb3c9f..a239e00ada6b4 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Each Electron release provides binaries for macOS, Windows, and Linux.
 
 * macOS (El Capitan and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
 * Windows (Windows 7 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8.
-* Linux: The prebuilt binaries of Electron are built on Ubuntu 18.04. They have also been verified to work on:
+* Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
   * Ubuntu 14.04 and newer
   * Fedora 24 and newer
   * Debian 8 and newer

From a5ab10f3d2370aa8c3d9abb409776dc4875966af Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 23 Mar 2022 06:00:58 -0700
Subject: [PATCH 160/811] Bump v19.0.0-nightly.20220323

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7ed2959db92aa..def1880de7559 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220322
\ No newline at end of file
+19.0.0-nightly.20220323
\ No newline at end of file
diff --git a/package.json b/package.json
index e385ef6a7ab8b..f4eab271f4e6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220322",
+  "version": "19.0.0-nightly.20220323",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b311dceaba875..38eebf5219792 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220322
- PRODUCTVERSION 19,0,0,20220322
+ FILEVERSION 19,0,0,20220323
+ PRODUCTVERSION 19,0,0,20220323
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f912130be6731e2636ed31f6da6e7a1d1d9e8b9d Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 23 Mar 2022 06:30:54 -0700
Subject: [PATCH 161/811] fix: libuv patches to address child_process.spawn
 slowness (#33337)

* fix: libuv patches to address child_process.spawn slowness

* chore: backport additional patches

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 patches/node/.patches                         |  11 +
 ..._don_t_use_thread-unsafe_strtok_3524.patch |  54 ++
 ...handle_kevent_note_exit_failure_3451.patch |  70 ++
 ...rocess_fix_hang_after_note_exit_3521.patch | 158 ++++
 ...or_for_exit_with_kqueue_on_bsds_3441.patch | 170 ++++
 ..._dupfd_cloexec_if_it_is_defined_3512.patch |  54 ++
 ...e_signal_mask_if_the_fork_fails_3537.patch |  36 +
 ...ess_simplify_uv_write_int_calls_3519.patch |  63 ++
 ...use_posix_spawn_instead_of_fork_3257.patch | 889 ++++++++++++++++++
 ...rotect_fork_in_uv_spawn_from_signals.patch | 173 ++++
 .../unix_remove_uv_cloexec_ioctl_3515.patch   |  91 ++
 .../unix_simplify_uv_cloexec_fcntl_3492.patch |  36 +
 12 files changed, 1805 insertions(+)
 create mode 100644 patches/node/macos_don_t_use_thread-unsafe_strtok_3524.patch
 create mode 100644 patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
 create mode 100644 patches/node/process_fix_hang_after_note_exit_3521.patch
 create mode 100644 patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
 create mode 100644 patches/node/process_only_use_f_dupfd_cloexec_if_it_is_defined_3512.patch
 create mode 100644 patches/node/process_reset_the_signal_mask_if_the_fork_fails_3537.patch
 create mode 100644 patches/node/process_simplify_uv_write_int_calls_3519.patch
 create mode 100644 patches/node/reland_macos_use_posix_spawn_instead_of_fork_3257.patch
 create mode 100644 patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
 create mode 100644 patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
 create mode 100644 patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 85ca6d4b58d7c..2c7f73453169f 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -35,3 +35,14 @@ fix_failing_node_js_test_on_outdated.patch
 be_compatible_with_cppgc.patch
 feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
 worker_thread_add_asar_support.patch
+process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
+unix_protect_fork_in_uv_spawn_from_signals.patch
+process_bsd_handle_kevent_note_exit_failure_3451.patch
+reland_macos_use_posix_spawn_instead_of_fork_3257.patch
+process_reset_the_signal_mask_if_the_fork_fails_3537.patch
+process_only_use_f_dupfd_cloexec_if_it_is_defined_3512.patch
+unix_simplify_uv_cloexec_fcntl_3492.patch
+unix_remove_uv_cloexec_ioctl_3515.patch
+process_simplify_uv_write_int_calls_3519.patch
+macos_don_t_use_thread-unsafe_strtok_3524.patch
+process_fix_hang_after_note_exit_3521.patch
diff --git a/patches/node/macos_don_t_use_thread-unsafe_strtok_3524.patch b/patches/node/macos_don_t_use_thread-unsafe_strtok_3524.patch
new file mode 100644
index 0000000000000..69e57568216d0
--- /dev/null
+++ b/patches/node/macos_don_t_use_thread-unsafe_strtok_3524.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Wed, 9 Mar 2022 11:06:39 +0100
+Subject: macos: don't use thread-unsafe strtok() (#3524)
+
+Refs https://github.com/libuv/libuv/pull/3524
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index 8cde389b826b6b167437845eccd5fed440dcadc4..147164e7ea25abbf655452930d78ee0a714cce36 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -387,30 +387,22 @@ static void uv__spawn_init_posix_spawn_fncs(void) {
+ 
+ 
+ static void uv__spawn_init_can_use_setsid(void) {
+-  static const int MACOS_CATALINA_VERSION_MAJOR = 19;
+-  char version_str[256];
+-  char* version_major_str;
+-  size_t version_str_size = 256;
+-  int r;
+-  int version_major;
+-
+-  /* Get a version string */
+-  r = sysctlbyname("kern.osrelease", version_str, &version_str_size, NULL, 0);
+-  if (r != 0)
++  int which[] = {CTL_KERN, KERN_OSRELEASE};
++  unsigned major;
++  unsigned minor;
++  unsigned patch;
++  char buf[256];
++  size_t len;
++
++  len = sizeof(buf);
++  if (sysctl(which, ARRAY_SIZE(which), buf, &len, NULL, 0))
+     return;
+ 
+-  /* Try to get the major version number. If not found
+-   * fall back to the fork/exec flow */
+-  version_major_str = strtok(version_str, ".");
+-  if (version_major_str == NULL)
++  /* NULL specifies to use LC_C_LOCALE */
++  if (3 != sscanf_l(buf, NULL, "%u.%u.%u", &major, &minor, &patch))
+     return;
+ 
+-  /* Parse the version major as a number. If it is greater than
+-   * the major version for macOS Catalina (aka macOS 10.15), then
+-   * the POSIX_SPAWN_SETSID flag is available */
+-  version_major = atoi_l(version_major_str, NULL); /* Use LC_C_LOCALE */
+-  if (version_major >= MACOS_CATALINA_VERSION_MAJOR)
+-    posix_spawn_can_use_setsid = 1;
++  posix_spawn_can_use_setsid = (major >= 19);  /* macOS Catalina */
+ }
+ 
+ 
diff --git a/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch b/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
new file mode 100644
index 0000000000000..c0ab59bbeab92
--- /dev/null
+++ b/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Tue, 1 Feb 2022 15:27:12 -0500
+Subject: process,bsd: handle kevent NOTE_EXIT failure (#3451)
+
+The kernel may return ESRCH if the child has already exited here.
+This is rather annoying, and means we must indirectly handle
+notification to our event loop of the process exit.
+
+Refs: https://github.com/libuv/libuv/pull/3441
+Refs: https://github.com/libuv/libuv/pull/3257
+
+diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
+index 16be13b99f5db77741aa276e90a437ef4eb5ba32..2dcc8b32f5165dd75061a1b55cc1abd2ab93ccc9 100644
+--- a/deps/uv/src/unix/internal.h
++++ b/deps/uv/src/unix/internal.h
+@@ -145,7 +145,8 @@ typedef struct uv__stream_queued_fds_s uv__stream_queued_fds_t;
+ 
+ /* loop flags */
+ enum {
+-  UV_LOOP_BLOCK_SIGPROF = 1
++  UV_LOOP_BLOCK_SIGPROF = 0x1,
++  UV_LOOP_REAP_CHILDREN = 0x2
+ };
+ 
+ /* flags of excluding ifaddr */
+diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
+index 35200f17495d80ed2d19ef9f6f76bbc92ee042f6..071fe0ce0938657d0fb840af62a432352e938a8a 100644
+--- a/deps/uv/src/unix/kqueue.c
++++ b/deps/uv/src/unix/kqueue.c
+@@ -285,7 +285,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+     for (i = 0; i < nfds; i++) {
+       ev = events + i;
+       if (ev->filter == EVFILT_PROC) {
+-        uv__wait_children(loop);
++        loop->flags |= UV_LOOP_REAP_CHILDREN;
+         nevents++;
+         continue;
+       }
+@@ -383,6 +383,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+       nevents++;
+     }
+ 
++    if (loop->flags & UV_LOOP_REAP_CHILDREN) {
++      loop->flags &= ~UV_LOOP_REAP_CHILDREN;
++      uv__wait_children(loop);
++    }
++
+     if (reset_timeout != 0) {
+       timeout = user_timeout;
+       reset_timeout = 0;
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index c1f6bd4b0076f0835caf83c45a6a896e7ae5def9..2920b942962357827bae9bcad23af8333e8b007f 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -507,8 +507,12 @@ int uv_spawn(uv_loop_t* loop,
+ #if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+     struct kevent event;
+     EV_SET(&event, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, 0);
+-    if (kevent(loop->backend_fd, &event, 1, NULL, 0, NULL))
+-      abort();
++    if (kevent(loop->backend_fd, &event, 1, NULL, 0, NULL)) {
++      if (errno != ESRCH)
++        abort();
++      /* Process already exited. Call waitpid on the next loop iteration. */
++      loop->flags |= UV_LOOP_REAP_CHILDREN;
++    }
+ #endif
+ 
+     QUEUE_INSERT_TAIL(&loop->process_handles, &process->queue);
diff --git a/patches/node/process_fix_hang_after_note_exit_3521.patch b/patches/node/process_fix_hang_after_note_exit_3521.patch
new file mode 100644
index 0000000000000..68702cf332b81
--- /dev/null
+++ b/patches/node/process_fix_hang_after_note_exit_3521.patch
@@ -0,0 +1,158 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Wed, 23 Mar 2022 15:39:38 +0900
+Subject: process: fix hang after NOTE_EXIT (#3521)
+
+Bug #3504 seems to affect more platforms than just OpenBSD. As this
+seems to be a race condition in these kernels, we do not want to fail
+because of it. Instead, we remove the WNOHANG flag from waitpid, and
+track exactly which processes have exited. Should also be a slight speed
+improvement for excessively large numbers of live children.
+
+diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
+index 071fe0ce0938657d0fb840af62a432352e938a8a..4c4d990ff5fa6c8ab937be2e4f79ccdaf90670c2 100644
+--- a/deps/uv/src/unix/kqueue.c
++++ b/deps/uv/src/unix/kqueue.c
+@@ -117,6 +117,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+   unsigned int revents;
+   QUEUE* q;
+   uv__io_t* w;
++  uv_process_t* process;
+   sigset_t* pset;
+   sigset_t set;
+   uint64_t base;
+@@ -284,12 +285,22 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+     loop->watchers[loop->nwatchers + 1] = (void*) (uintptr_t) nfds;
+     for (i = 0; i < nfds; i++) {
+       ev = events + i;
++      fd = ev->ident;
++
++      /* Handle kevent NOTE_EXIT results */
+       if (ev->filter == EVFILT_PROC) {
+-        loop->flags |= UV_LOOP_REAP_CHILDREN;
++        QUEUE_FOREACH(q, &loop->process_handles) {
++          process = QUEUE_DATA(q, uv_process_t, queue);
++          if (process->pid == fd) {
++            process->flags |= UV_HANDLE_REAP;
++            loop->flags |= UV_LOOP_REAP_CHILDREN;
++            break;
++          }
++        }
+         nevents++;
+         continue;
+       }
+-      fd = ev->ident;
++
+       /* Skip invalidated events, see uv__platform_invalidate_fd */
+       if (fd == -1)
+         continue;
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index 147164e7ea25abbf655452930d78ee0a714cce36..c8816b85b7e531648064e739fb89257565ad64bb 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -63,12 +63,18 @@ extern char **environ;
+ # include "zos-base.h"
+ #endif
+ 
+-#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__APPLE__) || \
++    defined(__DragonFly__) || \
++    defined(__FreeBSD__) || \
++    defined(__NetBSD__) || \
++    defined(__OpenBSD__)
+ #include <sys/event.h>
++#else
++#define UV_USE_SIGCHLD
+ #endif
+ 
+ 
+-#if !(defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
++#ifdef UV_USE_SIGCHLD
+ static void uv__chld(uv_signal_t* handle, int signum) {
+   assert(signum == SIGCHLD);
+   uv__wait_children(handle->loop);
+@@ -80,6 +86,7 @@ void uv__wait_children(uv_loop_t* loop) {
+   int exit_status;
+   int term_signal;
+   int status;
++  int options;
+   pid_t pid;
+   QUEUE pending;
+   QUEUE* q;
+@@ -93,19 +100,33 @@ void uv__wait_children(uv_loop_t* loop) {
+     process = QUEUE_DATA(q, uv_process_t, queue);
+     q = QUEUE_NEXT(q);
+ 
++#ifndef UV_USE_SIGCHLD
++    if ((process->flags & UV_HANDLE_REAP) == 0)
++      continue;
++    options = 0;
++    process->flags &= ~UV_HANDLE_REAP;
++#else
++    options = WNOHANG;
++#endif
++
+     do
+-      pid = waitpid(process->pid, &status, WNOHANG);
++      pid = waitpid(process->pid, &status, options);
+     while (pid == -1 && errno == EINTR);
+ 
+-    if (pid == 0)
++#ifdef UV_USE_SIGCHLD
++    if (pid == 0) /* Not yet exited */
+       continue;
++#endif
+ 
+     if (pid == -1) {
+       if (errno != ECHILD)
+         abort();
++      /* The child died, and we missed it. This probably means someone else
++       * stole the waitpid from us. Handle this by not handling it at all. */
+       continue;
+     }
+ 
++    assert(pid == process->pid);
+     process->status = status;
+     QUEUE_REMOVE(&process->queue);
+     QUEUE_INSERT_TAIL(&pending, &process->queue);
+@@ -964,7 +985,7 @@ int uv_spawn(uv_loop_t* loop,
+       goto error;
+   }
+ 
+-#if !(defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
++#ifdef UV_USE_SIGCHLD
+   uv_signal_start(&loop->child_watcher, uv__chld, SIGCHLD);
+ #endif
+ 
+@@ -983,13 +1004,14 @@ int uv_spawn(uv_loop_t* loop,
+    * fail to open a stdio handle. This ensures we can eventually reap the child
+    * with waitpid. */
+   if (exec_errorno == 0) {
+-#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifndef UV_USE_SIGCHLD
+     struct kevent event;
+     EV_SET(&event, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, 0);
+     if (kevent(loop->backend_fd, &event, 1, NULL, 0, NULL)) {
+       if (errno != ESRCH)
+         abort();
+       /* Process already exited. Call waitpid on the next loop iteration. */
++      process->flags |= UV_HANDLE_REAP;
+       loop->flags |= UV_LOOP_REAP_CHILDREN;
+     }
+ #endif
+diff --git a/deps/uv/src/uv-common.h b/deps/uv/src/uv-common.h
+index 8a190bf8fa8c5a282feaf251aec2a30c95776888..6001b0cf68d0b0268b578218b664a737f43c9521 100644
+--- a/deps/uv/src/uv-common.h
++++ b/deps/uv/src/uv-common.h
+@@ -130,7 +130,10 @@ enum {
+   UV_SIGNAL_ONE_SHOT                    = 0x02000000,
+ 
+   /* Only used by uv_poll_t handles. */
+-  UV_HANDLE_POLL_SLOW                   = 0x01000000
++  UV_HANDLE_POLL_SLOW                   = 0x01000000,
++
++  /* Only used by uv_process_t handles. */
++  UV_HANDLE_REAP                        = 0x10000000
+ };
+ 
+ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap);
diff --git a/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch b/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
new file mode 100644
index 0000000000000..917b589dbd37b
--- /dev/null
+++ b/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
@@ -0,0 +1,170 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <nornagon@nornagon.net>
+Date: Mon, 31 Jan 2022 11:49:22 -0800
+Subject: process: monitor for exit with kqueue on BSDs (#3441)
+
+This adds a workaround for an xnu kernel bug that sometimes results in
+SIGCHLD not being delivered. The workaround is to use kevent to listen
+for EVFILT_PROC/NOTE_EXIT events instead of relying on SIGCHLD on *BSD.
+
+Apple rdar: FB9529664
+Refs: https://github.com/libuv/libuv/pull/3257
+
+diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
+index 12d4da93686e993830a7d09e74d08191fc808f4f..16be13b99f5db77741aa276e90a437ef4eb5ba32 100644
+--- a/deps/uv/src/unix/internal.h
++++ b/deps/uv/src/unix/internal.h
+@@ -282,6 +282,7 @@ uv_handle_type uv__handle_type(int fd);
+ FILE* uv__open_file(const char* path);
+ int uv__getpwuid_r(uv_passwd_t* pwd);
+ int uv__search_path(const char* prog, char* buf, size_t* buflen);
++void uv__wait_children(uv_loop_t* loop);
+ 
+ /* random */
+ int uv__random_devurandom(void* buf, size_t buflen);
+diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
+index bf183d5fdc0ba89913469a294322eef84bc4cee8..35200f17495d80ed2d19ef9f6f76bbc92ee042f6 100644
+--- a/deps/uv/src/unix/kqueue.c
++++ b/deps/uv/src/unix/kqueue.c
+@@ -284,6 +284,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+     loop->watchers[loop->nwatchers + 1] = (void*) (uintptr_t) nfds;
+     for (i = 0; i < nfds; i++) {
+       ev = events + i;
++      if (ev->filter == EVFILT_PROC) {
++        uv__wait_children(loop);
++        nevents++;
++        continue;
++      }
+       fd = ev->ident;
+       /* Skip invalidated events, see uv__platform_invalidate_fd */
+       if (fd == -1)
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a7b374a48 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -48,10 +48,20 @@ extern char **environ;
+ # include "zos-base.h"
+ #endif
+ 
++#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/event.h>
++#endif
++
+ 
++#if !(defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+ static void uv__chld(uv_signal_t* handle, int signum) {
++  assert(signum == SIGCHLD);
++  uv__wait_children(handle->loop);
++}
++#endif
++
++void uv__wait_children(uv_loop_t* loop) {
+   uv_process_t* process;
+-  uv_loop_t* loop;
+   int exit_status;
+   int term_signal;
+   int status;
+@@ -60,10 +70,7 @@ static void uv__chld(uv_signal_t* handle, int signum) {
+   QUEUE* q;
+   QUEUE* h;
+ 
+-  assert(signum == SIGCHLD);
+-
+   QUEUE_INIT(&pending);
+-  loop = handle->loop;
+ 
+   h = &loop->process_handles;
+   q = QUEUE_HEAD(h);
+@@ -419,7 +426,9 @@ int uv_spawn(uv_loop_t* loop,
+   if (err)
+     goto error;
+ 
++#if !(defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+   uv_signal_start(&loop->child_watcher, uv__chld, SIGCHLD);
++#endif
+ 
+   /* Acquire write lock to prevent opening new fds in worker threads */
+   uv_rwlock_wrlock(&loop->cloexec_lock);
+@@ -478,6 +487,13 @@ int uv_spawn(uv_loop_t* loop,
+ 
+   /* Only activate this handle if exec() happened successfully */
+   if (exec_errorno == 0) {
++#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++    struct kevent event;
++    EV_SET(&event, pid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, 0);
++    if (kevent(loop->backend_fd, &event, 1, NULL, 0, NULL))
++      abort();
++#endif
++
+     QUEUE_INSERT_TAIL(&loop->process_handles, &process->queue);
+     uv__handle_start(process);
+   }
+diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
+index 59b95da9ebe3464bd1f9ce1c534122b1f9e06636..58489c4be7b3a7b36d5b01a1f07d411ef3d99ae3 100644
+--- a/deps/uv/test/test-list.h
++++ b/deps/uv/test/test-list.h
+@@ -318,6 +318,7 @@ TEST_DECLARE   (spawn_reads_child_path)
+ TEST_DECLARE   (spawn_inherit_streams)
+ TEST_DECLARE   (spawn_quoted_path)
+ TEST_DECLARE   (spawn_tcp_server)
++TEST_DECLARE   (spawn_exercise_sigchld_issue)
+ TEST_DECLARE   (fs_poll)
+ TEST_DECLARE   (fs_poll_getpath)
+ TEST_DECLARE   (fs_poll_close_request)
+@@ -944,6 +945,7 @@ TASK_LIST_START
+   TEST_ENTRY  (spawn_inherit_streams)
+   TEST_ENTRY  (spawn_quoted_path)
+   TEST_ENTRY  (spawn_tcp_server)
++  TEST_ENTRY  (spawn_exercise_sigchld_issue)
+   TEST_ENTRY  (fs_poll)
+   TEST_ENTRY  (fs_poll_getpath)
+   TEST_ENTRY  (fs_poll_close_request)
+diff --git a/deps/uv/test/test-spawn.c b/deps/uv/test/test-spawn.c
+index 9f2eb24b2d6daf339bec12027134409cfc3b4a82..dfd5458ef37c664af9a55a8383bdb3121885db3b 100644
+--- a/deps/uv/test/test-spawn.c
++++ b/deps/uv/test/test-spawn.c
+@@ -1891,6 +1891,44 @@ TEST_IMPL(spawn_quoted_path) {
+ #endif
+ }
+ 
++TEST_IMPL(spawn_exercise_sigchld_issue) {
++  int r;
++  int i;
++  uv_process_options_t dummy_options = {0};
++  uv_process_t dummy_processes[100];
++  char* args[2];
++
++  init_process_options("spawn_helper1", exit_cb);
++
++  r = uv_spawn(uv_default_loop(), &process, &options);
++  ASSERT_EQ(r, 0);
++
++  // This test exercises a bug in the darwin kernel that causes SIGCHLD not to
++  // be delivered sometimes. Calling posix_spawn many times increases the
++  // likelihood of encountering this issue, so spin a few times to make this
++  // test more reliable.
++  dummy_options.file = args[0] = "program-that-had-better-not-exist";
++  args[1] = NULL;
++  dummy_options.args = args;
++  dummy_options.exit_cb = fail_cb;
++  dummy_options.flags = 0;
++  for (i = 0; i < 100; i++) {
++    r = uv_spawn(uv_default_loop(), &dummy_processes[i], &dummy_options);
++    if (r != UV_ENOENT)
++      ASSERT_EQ(r, UV_EACCES);
++    uv_close((uv_handle_t*) &dummy_processes[i], close_cb);
++  }
++
++  r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
++  ASSERT_EQ(r, 0);
++
++  ASSERT_EQ(exit_cb_called, 1);
++  ASSERT_EQ(close_cb_called, 101);
++
++  MAKE_VALGRIND_HAPPY();
++  return 0;
++}
++
+ /* Helper for child process of spawn_inherit_streams */
+ #ifndef _WIN32
+ void spawn_stdin_stdout(void) {
diff --git a/patches/node/process_only_use_f_dupfd_cloexec_if_it_is_defined_3512.patch b/patches/node/process_only_use_f_dupfd_cloexec_if_it_is_defined_3512.patch
new file mode 100644
index 0000000000000..5b525fb18a5f0
--- /dev/null
+++ b/patches/node/process_only_use_f_dupfd_cloexec_if_it_is_defined_3512.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Sat, 5 Mar 2022 12:52:04 -0500
+Subject: process: only use F_DUPFD_CLOEXEC if it is defined (#3512)
+
+We can save a syscall on most modern systems (required by POSIX 2008),
+but not on all systems.
+
+Also handle errors from CLOEXEC. Even though fcntl does not really
+define there to be any, it could theoretically be EBADF if the user
+happened to pass a bad file descriptor to the same number fd (such that
+no other code happened to already fail on that).
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index d208f99be40df9f36447552daf2772c1cab1ce79..7705068730cb0536998bad7d304cb87df99b72e8 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -275,9 +275,20 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     use_fd = pipes[fd][1];
+     if (use_fd < 0 || use_fd >= fd)
+       continue;
++#ifdef F_DUPFD_CLOEXEC /* POSIX 2008 */
+     pipes[fd][1] = fcntl(use_fd, F_DUPFD_CLOEXEC, stdio_count);
++#else
++    pipes[fd][1] = fcntl(use_fd, F_DUPFD, stdio_count);
++#endif
+     if (pipes[fd][1] == -1)
+       uv__write_errno(error_fd);
++#ifndef F_DUPFD_CLOEXEC /* POSIX 2008 */
++    n = uv__cloexec_fcntl(pipes[fd][1], 1);
++    if (n) {
++      uv__write_int(error_fd, n);
++      _exit(127);
++    }
++#endif
+   }
+ 
+   for (fd = 0; fd < stdio_count; fd++) {
+@@ -300,8 +311,13 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     }
+ 
+     if (fd == use_fd) {
+-      if (close_fd == -1)
+-        uv__cloexec_fcntl(use_fd, 0);
++      if (close_fd == -1) {
++        n = uv__cloexec_fcntl(use_fd, 0);
++        if (n) {
++          uv__write_int(error_fd, n);
++          _exit(127);
++        }
++      }
+     }
+     else {
+       fd = dup2(use_fd, fd);
diff --git a/patches/node/process_reset_the_signal_mask_if_the_fork_fails_3537.patch b/patches/node/process_reset_the_signal_mask_if_the_fork_fails_3537.patch
new file mode 100644
index 0000000000000..e0cd88c292b7e
--- /dev/null
+++ b/patches/node/process_reset_the_signal_mask_if_the_fork_fails_3537.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Fri, 11 Mar 2022 12:05:24 -0500
+Subject: process: reset the signal mask if the fork fails (#3537)
+
+Fix a regression that sneaked into posix spawn changes.
+
+Refs: https://github.com/libuv/libuv/pull/3257
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index b85aa3b94edd040952e0d350a47a38d9ba8a67d3..d208f99be40df9f36447552daf2772c1cab1ce79 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -790,11 +790,6 @@ static int uv__spawn_and_init_child_fork(const uv_process_options_t* options,
+ 
+   *pid = fork();
+ 
+-  if (*pid == -1) {
+-    /* Failed to fork */
+-    return UV__ERR(errno);
+-  }
+-
+   if (*pid == 0) {
+     /* Fork succeeded, in the child process */
+     uv__process_child_init(options, stdio_count, pipes, error_fd);
+@@ -804,6 +799,10 @@ static int uv__spawn_and_init_child_fork(const uv_process_options_t* options,
+   if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
+     abort();
+ 
++  if (*pid == -1)
++    /* Failed to fork */
++    return UV__ERR(errno);
++
+   /* Fork succeeded, in the parent process */
+   return 0;
+ }
diff --git a/patches/node/process_simplify_uv_write_int_calls_3519.patch b/patches/node/process_simplify_uv_write_int_calls_3519.patch
new file mode 100644
index 0000000000000..201c9c949d49a
--- /dev/null
+++ b/patches/node/process_simplify_uv_write_int_calls_3519.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Mon, 7 Mar 2022 17:07:49 -0500
+Subject: process: simplify uv__write_int calls (#3519)
+
+Refs https://github.com/libuv/libuv/pull/3519
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index b6f9756c6a6710f5f10762b9299cc35047b98097..8cde389b826b6b167437845eccd5fed440dcadc4 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -216,16 +216,14 @@ static void uv__write_int(int fd, int val) {
+     n = write(fd, &val, sizeof(val));
+   while (n == -1 && errno == EINTR);
+ 
+-  if (n == -1 && errno == EPIPE)
+-    return; /* parent process has quit */
+-
+-  assert(n == sizeof(val));
++  /* The write might have failed (e.g. if the parent process has died),
++   * but we have nothing left but to _exit ourself now too. */
++  _exit(127);
+ }
+ 
+ 
+ static void uv__write_errno(int error_fd) {
+   uv__write_int(error_fd, UV__ERR(errno));
+-  _exit(127);
+ }
+ 
+ 
+@@ -284,10 +282,8 @@ static void uv__process_child_init(const uv_process_options_t* options,
+       uv__write_errno(error_fd);
+ #ifndef F_DUPFD_CLOEXEC /* POSIX 2008 */
+     n = uv__cloexec(pipes[fd][1], 1);
+-    if (n) {
++    if (n)
+       uv__write_int(error_fd, n);
+-      _exit(127);
+-    }
+ #endif
+   }
+ 
+@@ -313,10 +309,8 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     if (fd == use_fd) {
+       if (close_fd == -1) {
+         n = uv__cloexec(use_fd, 0);
+-        if (n) {
++        if (n)
+           uv__write_int(error_fd, n);
+-          _exit(127);
+-        }
+       }
+     }
+     else {
+@@ -368,7 +362,6 @@ static void uv__process_child_init(const uv_process_options_t* options,
+ #endif
+ 
+   uv__write_errno(error_fd);
+-  abort();
+ }
+ #endif
+ 
diff --git a/patches/node/reland_macos_use_posix_spawn_instead_of_fork_3257.patch b/patches/node/reland_macos_use_posix_spawn_instead_of_fork_3257.patch
new file mode 100644
index 0000000000000..cccbbf11736e0
--- /dev/null
+++ b/patches/node/reland_macos_use_posix_spawn_instead_of_fork_3257.patch
@@ -0,0 +1,889 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Wed, 2 Mar 2022 15:15:39 -0500
+Subject: Reland "macos: use posix_spawn instead of fork" (#3257)
+
+Fixes: https://github.com/libuv/libuv/issues/3050
+Refs: https://github.com/libuv/libuv/issues/3086
+Refs: https://github.com/libuv/libuv/pull/3064
+Refs: https://github.com/libuv/libuv/pull/3107
+Refs: https://github.com/libuv/libuv/pull/3064
+
+This reverts commit 217fdf4265589889d00c7c0622fde2710971a020, then fixes
+several issues with it:
+
+* remove error fast-cleanup code that triggers a nodejs bug
+
+Refs: https://github.com/libuv/libuv/pull/3107#issuecomment-782482608
+
+* protect posix_spawn from EINTR
+
+This is not a documented valid error, but seems to have been observed.
+
+* ignore setuid/setgid syscall
+
+This kernel function is not permitted unless the process is setuid root,
+so disable this syscall. Falling back to fork/exec should be okay for
+the rare cases that the user decides they need to do setuid(getuid()) or
+setuid(geteuid()) for the child.
+
+Refs: https://github.com/libuv/libuv/pull/3107#issuecomment-782482608
+
+* improve posix_spawn path search
+
+Ports the improvements in musl back to this function
+
+* fix some additional problems and formatting issues
+
+We previously might fail to start a watcher, in rare failure cases,
+resulting in a zombie that we would fail to kill. Also avoid creating
+the signal-pipe unless required (addresses a review comment from Apple)
+
+* fix fd->fd mapping reuse
+
+There was a chance that when duplicating the fd's into stdio_count+fd we
+might be closing a currently opened fd with that value.
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index 2920b942962357827bae9bcad23af8333e8b007f..b85aa3b94edd040952e0d350a47a38d9ba8a67d3 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -27,6 +27,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -35,8 +36,21 @@
+ #include <poll.h>
+ 
+ #if defined(__APPLE__) && !TARGET_OS_IPHONE
++# include <spawn.h>
++# include <paths.h>
++# include <sys/kauth.h>
++# include <sys/types.h>
++# include <sys/sysctl.h>
++# include <dlfcn.h>
+ # include <crt_externs.h>
++# include <xlocale.h>
+ # define environ (*_NSGetEnviron())
++
++/* macOS 10.14 back does not define this constant */
++# ifndef POSIX_SPAWN_SETSID
++#  define POSIX_SPAWN_SETSID 1024
++# endif
++
+ #else
+ extern char **environ;
+ #endif
+@@ -261,22 +275,22 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     use_fd = pipes[fd][1];
+     if (use_fd < 0 || use_fd >= fd)
+       continue;
+-    pipes[fd][1] = fcntl(use_fd, F_DUPFD, stdio_count);
++    pipes[fd][1] = fcntl(use_fd, F_DUPFD_CLOEXEC, stdio_count);
+     if (pipes[fd][1] == -1)
+       uv__write_errno(error_fd);
+   }
+ 
+   for (fd = 0; fd < stdio_count; fd++) {
+-    close_fd = pipes[fd][0];
++    close_fd = -1;
+     use_fd = pipes[fd][1];
+ 
+     if (use_fd < 0) {
+       if (fd >= 3)
+         continue;
+       else {
+-        /* redirect stdin, stdout and stderr to /dev/null even if UV_IGNORE is
+-         * set
+-         */
++        /* Redirect stdin, stdout and stderr to /dev/null even if UV_IGNORE is
++         * set. */
++        uv__close_nocheckstdio(fd); /* Free up fd, if it happens to be open. */
+         use_fd = open("/dev/null", fd == 0 ? O_RDONLY : O_RDWR);
+         close_fd = use_fd;
+ 
+@@ -285,28 +299,24 @@ static void uv__process_child_init(const uv_process_options_t* options,
+       }
+     }
+ 
+-    if (fd == use_fd)
+-      uv__cloexec_fcntl(use_fd, 0);
+-    else
++    if (fd == use_fd) {
++      if (close_fd == -1)
++        uv__cloexec_fcntl(use_fd, 0);
++    }
++    else {
+       fd = dup2(use_fd, fd);
++    }
+ 
+     if (fd == -1)
+       uv__write_errno(error_fd);
+ 
+-    if (fd <= 2)
++    if (fd <= 2 && close_fd == -1)
+       uv__nonblock_fcntl(fd, 0);
+ 
+     if (close_fd >= stdio_count)
+       uv__close(close_fd);
+   }
+ 
+-  for (fd = 0; fd < stdio_count; fd++) {
+-    use_fd = pipes[fd][1];
+-
+-    if (use_fd >= stdio_count)
+-      uv__close(use_fd);
+-  }
+-
+   if (options->cwd != NULL && chdir(options->cwd))
+     uv__write_errno(error_fd);
+ 
+@@ -327,9 +337,8 @@ static void uv__process_child_init(const uv_process_options_t* options,
+   if ((options->flags & UV_PROCESS_SETUID) && setuid(options->uid))
+     uv__write_errno(error_fd);
+ 
+-  if (options->env != NULL) {
++  if (options->env != NULL)
+     environ = options->env;
+-  }
+ 
+   /* Reset signal mask just before exec. */
+   sigemptyset(&signewset);
+@@ -348,6 +357,562 @@ static void uv__process_child_init(const uv_process_options_t* options,
+ #endif
+ 
+ 
++#if defined(__APPLE__)
++typedef struct uv__posix_spawn_fncs_tag {
++  struct {
++    int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *);
++  } file_actions;
++} uv__posix_spawn_fncs_t;
++
++
++static uv_once_t posix_spawn_init_once = UV_ONCE_INIT;
++static uv__posix_spawn_fncs_t posix_spawn_fncs;
++static int posix_spawn_can_use_setsid;
++
++
++static void uv__spawn_init_posix_spawn_fncs(void) {
++  /* Try to locate all non-portable functions at runtime */
++  posix_spawn_fncs.file_actions.addchdir_np =
++    dlsym(RTLD_DEFAULT, "posix_spawn_file_actions_addchdir_np");
++}
++
++
++static void uv__spawn_init_can_use_setsid(void) {
++  static const int MACOS_CATALINA_VERSION_MAJOR = 19;
++  char version_str[256];
++  char* version_major_str;
++  size_t version_str_size = 256;
++  int r;
++  int version_major;
++
++  /* Get a version string */
++  r = sysctlbyname("kern.osrelease", version_str, &version_str_size, NULL, 0);
++  if (r != 0)
++    return;
++
++  /* Try to get the major version number. If not found
++   * fall back to the fork/exec flow */
++  version_major_str = strtok(version_str, ".");
++  if (version_major_str == NULL)
++    return;
++
++  /* Parse the version major as a number. If it is greater than
++   * the major version for macOS Catalina (aka macOS 10.15), then
++   * the POSIX_SPAWN_SETSID flag is available */
++  version_major = atoi_l(version_major_str, NULL); /* Use LC_C_LOCALE */
++  if (version_major >= MACOS_CATALINA_VERSION_MAJOR)
++    posix_spawn_can_use_setsid = 1;
++}
++
++
++static void uv__spawn_init_posix_spawn(void) {
++  /* Init handles to all potentially non-defined functions */
++  uv__spawn_init_posix_spawn_fncs();
++
++  /* Init feature detection for POSIX_SPAWN_SETSID flag */
++  uv__spawn_init_can_use_setsid();
++}
++
++
++static int uv__spawn_set_posix_spawn_attrs(
++    posix_spawnattr_t* attrs,
++    const uv__posix_spawn_fncs_t* posix_spawn_fncs,
++    const uv_process_options_t* options) {
++  int err;
++  unsigned int flags;
++  sigset_t signal_set;
++
++  err = posix_spawnattr_init(attrs);
++  if (err != 0) {
++    /* If initialization fails, no need to de-init, just return */
++    return err;
++  }
++
++  if (options->flags & (UV_PROCESS_SETUID | UV_PROCESS_SETGID)) {
++    /* kauth_cred_issuser currently requires exactly uid == 0 for these
++     * posixspawn_attrs (set_groups_np, setuid_np, setgid_np), which deviates
++     * from the normal specification of setuid (which also uses euid), and they
++     * are also undocumented syscalls, so we do not use them. */
++    err = ENOSYS;
++    goto error;
++  }
++
++  /* Set flags for spawn behavior
++   * 1) POSIX_SPAWN_CLOEXEC_DEFAULT: (Apple Extension) All descriptors in the
++   *    parent will be treated as if they had been created with O_CLOEXEC. The
++   *    only fds that will be passed on to the child are those manipulated by
++   *    the file actions
++   * 2) POSIX_SPAWN_SETSIGDEF: Signals mentioned in spawn-sigdefault in the
++   *    spawn attributes will be reset to behave as their default
++   * 3) POSIX_SPAWN_SETSIGMASK: Signal mask will be set to the value of
++   *    spawn-sigmask in attributes
++   * 4) POSIX_SPAWN_SETSID: Make the process a new session leader if a detached
++   *    session was requested. */
++  flags = POSIX_SPAWN_CLOEXEC_DEFAULT |
++          POSIX_SPAWN_SETSIGDEF |
++          POSIX_SPAWN_SETSIGMASK;
++  if (options->flags & UV_PROCESS_DETACHED) {
++    /* If running on a version of macOS where this flag is not supported,
++     * revert back to the fork/exec flow. Otherwise posix_spawn will
++     * silently ignore the flag. */
++    if (!posix_spawn_can_use_setsid) {
++      err = ENOSYS;
++      goto error;
++    }
++
++    flags |= POSIX_SPAWN_SETSID;
++  }
++  err = posix_spawnattr_setflags(attrs, flags);
++  if (err != 0)
++    goto error;
++
++  /* Reset all signal the child to their default behavior */
++  sigfillset(&signal_set);
++  err = posix_spawnattr_setsigdefault(attrs, &signal_set);
++  if (err != 0)
++    goto error;
++
++  /* Reset the signal mask for all signals */
++  sigemptyset(&signal_set);
++  err = posix_spawnattr_setsigmask(attrs, &signal_set);
++  if (err != 0)
++    goto error;
++
++  return err;
++
++error:
++  (void) posix_spawnattr_destroy(attrs);
++  return err;
++}
++
++
++static int uv__spawn_set_posix_spawn_file_actions(
++    posix_spawn_file_actions_t* actions,
++    const uv__posix_spawn_fncs_t* posix_spawn_fncs,
++    const uv_process_options_t* options,
++    int stdio_count,
++    int (*pipes)[2]) {
++  int fd;
++  int fd2;
++  int use_fd;
++  int err;
++
++  err = posix_spawn_file_actions_init(actions);
++  if (err != 0) {
++    /* If initialization fails, no need to de-init, just return */
++    return err;
++  }
++
++  /* Set the current working directory if requested */
++  if (options->cwd != NULL) {
++    if (posix_spawn_fncs->file_actions.addchdir_np == NULL) {
++      err = ENOSYS;
++      goto error;
++    }
++
++    err = posix_spawn_fncs->file_actions.addchdir_np(actions, options->cwd);
++    if (err != 0)
++      goto error;
++  }
++
++  /* Do not return ENOSYS after this point, as we may mutate pipes. */
++
++  /* First duplicate low numbered fds, since it's not safe to duplicate them,
++   * they could get replaced. Example: swapping stdout and stderr; without
++   * this fd 2 (stderr) would be duplicated into fd 1, thus making both
++   * stdout and stderr go to the same fd, which was not the intention. */
++  for (fd = 0; fd < stdio_count; fd++) {
++    use_fd = pipes[fd][1];
++    if (use_fd < 0 || use_fd >= fd)
++      continue;
++    use_fd = stdio_count;
++    for (fd2 = 0; fd2 < stdio_count; fd2++) {
++      /* If we were not setting POSIX_SPAWN_CLOEXEC_DEFAULT, we would need to
++       * also consider whether fcntl(fd, F_GETFD) returned without the
++       * FD_CLOEXEC flag set. */
++      if (pipes[fd2][1] == use_fd) {
++        use_fd++;
++        fd2 = 0;
++      }
++    }
++    err = posix_spawn_file_actions_adddup2(
++      actions,
++      pipes[fd][1],
++      use_fd);
++    assert(err != ENOSYS);
++    if (err != 0)
++      goto error;
++    pipes[fd][1] = use_fd;
++  }
++
++  /* Second, move the descriptors into their respective places */
++  for (fd = 0; fd < stdio_count; fd++) {
++    use_fd = pipes[fd][1];
++    if (use_fd < 0) {
++      if (fd >= 3)
++        continue;
++      else {
++        /* If ignored, redirect to (or from) /dev/null, */
++        err = posix_spawn_file_actions_addopen(
++          actions,
++          fd,
++          "/dev/null",
++          fd == 0 ? O_RDONLY : O_RDWR,
++          0);
++        assert(err != ENOSYS);
++        if (err != 0)
++          goto error;
++        continue;
++      }
++    }
++
++    if (fd == use_fd)
++        err = posix_spawn_file_actions_addinherit_np(actions, fd);
++    else
++        err = posix_spawn_file_actions_adddup2(actions, use_fd, fd);
++    assert(err != ENOSYS);
++    if (err != 0)
++      goto error;
++
++    /* Make sure the fd is marked as non-blocking (state shared between child
++     * and parent). */
++    uv__nonblock_fcntl(use_fd, 0);
++  }
++
++  /* Finally, close all the superfluous descriptors */
++  for (fd = 0; fd < stdio_count; fd++) {
++    use_fd = pipes[fd][1];
++    if (use_fd < stdio_count)
++      continue;
++
++    /* Check if we already closed this. */
++    for (fd2 = 0; fd2 < fd; fd2++) {
++      if (pipes[fd2][1] == use_fd)
++          break;
++    }
++    if (fd2 < fd)
++      continue;
++
++    err = posix_spawn_file_actions_addclose(actions, use_fd);
++    assert(err != ENOSYS);
++    if (err != 0)
++      goto error;
++  }
++
++  return 0;
++
++error:
++  (void) posix_spawn_file_actions_destroy(actions);
++  return err;
++}
++
++char* uv__spawn_find_path_in_env(char** env) {
++  char** env_iterator;
++  const char path_var[] = "PATH=";
++
++  /* Look for an environment variable called PATH in the
++   * provided env array, and return its value if found */
++  for (env_iterator = env; *env_iterator != NULL; env_iterator++) {
++    if (strncmp(*env_iterator, path_var, sizeof(path_var) - 1) == 0) {
++      /* Found "PATH=" at the beginning of the string */
++      return *env_iterator + sizeof(path_var) - 1;
++    }
++  }
++
++  return NULL;
++}
++
++
++static int uv__spawn_resolve_and_spawn(const uv_process_options_t* options,
++                                       posix_spawnattr_t* attrs,
++                                       posix_spawn_file_actions_t* actions,
++                                       pid_t* pid) {
++  const char *p;
++  const char *z;
++  const char *path;
++  size_t l;
++  size_t k;
++  int err;
++  int seen_eacces;
++
++  path = NULL;
++  err = -1;
++  seen_eacces = 0;
++
++  /* Short circuit for erroneous case */
++  if (options->file == NULL)
++    return ENOENT;
++
++  /* The environment for the child process is that of the parent unless overriden
++   * by options->env */
++  char** env = environ;
++  if (options->env != NULL)
++    env = options->env;
++
++  /* If options->file contains a slash, posix_spawn/posix_spawnp behave
++   * the same, and don't involve PATH resolution at all. Otherwise, if
++   * options->file does not include a slash, but no custom environment is
++   * to be used, the environment used for path resolution as well for the
++   * child process is that of the parent process, so posix_spawnp is the
++   * way to go. */
++  if (strchr(options->file, '/') != NULL || options->env == NULL) {
++    do
++      err = posix_spawnp(pid, options->file, actions, attrs, options->args, env);
++    while (err == EINTR);
++    return err;
++  }
++
++  /* Look for the definition of PATH in the provided env */
++  path = uv__spawn_find_path_in_env(options->env);
++
++  /* The following resolution logic (execvpe emulation) is copied from
++   * https://git.musl-libc.org/cgit/musl/tree/src/process/execvp.c
++   * and adapted to work for our specific usage */
++
++  /* If no path was provided in options->env, use the default value
++   * to look for the executable */
++  if (path == NULL)
++    path = _PATH_DEFPATH;
++
++  k = strnlen(options->file, NAME_MAX + 1);
++  if (k > NAME_MAX)
++    return ENAMETOOLONG;
++
++  l = strnlen(path, PATH_MAX - 1) + 1;
++
++  for (p = path;; p = z) {
++    /* Compose the new process file from the entry in the PATH
++     * environment variable and the actual file name */
++    char b[PATH_MAX + NAME_MAX];
++    z = strchr(p, ':');
++    if (!z)
++      z = p + strlen(p);
++    if ((size_t)(z - p) >= l) {
++      if (!*z++)
++        break;
++
++      continue;
++    }
++    memcpy(b, p, z - p);
++    b[z - p] = '/';
++    memcpy(b + (z - p) + (z > p), options->file, k + 1);
++
++    /* Try to spawn the new process file. If it fails with ENOENT, the
++     * new process file is not in this PATH entry, continue with the next
++     * PATH entry. */
++    do
++      err = posix_spawn(pid, b, actions, attrs, options->args, env);
++    while (err == EINTR);
++
++    switch (err) {
++    case EACCES:
++      seen_eacces = 1;
++      break; /* continue search */
++    case ENOENT:
++    case ENOTDIR:
++      break; /* continue search */
++    default:
++      return err;
++    }
++
++    if (!*z++)
++      break;
++  }
++
++  if (seen_eacces)
++    return EACCES;
++  return err;
++}
++
++
++static int uv__spawn_and_init_child_posix_spawn(
++    const uv_process_options_t* options,
++    int stdio_count,
++    int (*pipes)[2],
++    pid_t* pid,
++    const uv__posix_spawn_fncs_t* posix_spawn_fncs) {
++  int err;
++  posix_spawnattr_t attrs;
++  posix_spawn_file_actions_t actions;
++
++  err = uv__spawn_set_posix_spawn_attrs(&attrs, posix_spawn_fncs, options);
++  if (err != 0)
++    goto error;
++
++  /* This may mutate pipes. */
++  err = uv__spawn_set_posix_spawn_file_actions(&actions,
++                                               posix_spawn_fncs,
++                                               options,
++                                               stdio_count,
++                                               pipes);
++  if (err != 0) {
++    (void) posix_spawnattr_destroy(&attrs);
++    goto error;
++  }
++
++  /* Try to spawn options->file resolving in the provided environment
++   * if any */
++  err = uv__spawn_resolve_and_spawn(options, &attrs, &actions, pid);
++  assert(err != ENOSYS);
++
++  /* Destroy the actions/attributes */
++  (void) posix_spawn_file_actions_destroy(&actions);
++  (void) posix_spawnattr_destroy(&attrs);
++
++error:
++  /* In an error situation, the attributes and file actions are
++   * already destroyed, only the happy path requires cleanup */
++  return UV__ERR(err);
++}
++#endif
++
++static int uv__spawn_and_init_child_fork(const uv_process_options_t* options,
++                                         int stdio_count,
++                                         int (*pipes)[2],
++                                         int error_fd,
++                                         pid_t* pid) {
++  sigset_t signewset;
++  sigset_t sigoldset;
++
++  /* Start the child with most signals blocked, to avoid any issues before we
++   * can reset them, but allow program failures to exit (and not hang). */
++  sigfillset(&signewset);
++  sigdelset(&signewset, SIGKILL);
++  sigdelset(&signewset, SIGSTOP);
++  sigdelset(&signewset, SIGTRAP);
++  sigdelset(&signewset, SIGSEGV);
++  sigdelset(&signewset, SIGBUS);
++  sigdelset(&signewset, SIGILL);
++  sigdelset(&signewset, SIGSYS);
++  sigdelset(&signewset, SIGABRT);
++  if (pthread_sigmask(SIG_BLOCK, &signewset, &sigoldset) != 0)
++    abort();
++
++  *pid = fork();
++
++  if (*pid == -1) {
++    /* Failed to fork */
++    return UV__ERR(errno);
++  }
++
++  if (*pid == 0) {
++    /* Fork succeeded, in the child process */
++    uv__process_child_init(options, stdio_count, pipes, error_fd);
++    abort();
++  }
++
++  if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
++    abort();
++
++  /* Fork succeeded, in the parent process */
++  return 0;
++}
++
++static int uv__spawn_and_init_child(
++    uv_loop_t* loop,
++    const uv_process_options_t* options,
++    int stdio_count,
++    int (*pipes)[2],
++    pid_t* pid) {
++  int signal_pipe[2] = { -1, -1 };
++  int status;
++  int err;
++  int exec_errorno;
++  ssize_t r;
++
++#if defined(__APPLE__)
++  uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn);
++
++  /* Special child process spawn case for macOS Big Sur (11.0) onwards
++   *
++   * Big Sur introduced a significant performance degradation on a call to
++   * fork/exec when the process has many pages mmaped in with MAP_JIT, like, say
++   * a javascript interpreter. Electron-based applications, for example,
++   * are impacted; though the magnitude of the impact depends on how much the
++   * app relies on subprocesses.
++   *
++   * On macOS, though, posix_spawn is implemented in a way that does not
++   * exhibit the problem. This block implements the forking and preparation
++   * logic with posix_spawn and its related primitives. It also takes advantage of
++   * the macOS extension POSIX_SPAWN_CLOEXEC_DEFAULT that makes impossible to
++   * leak descriptors to the child process. */
++  err = uv__spawn_and_init_child_posix_spawn(options,
++                                             stdio_count,
++                                             pipes,
++                                             pid,
++                                             &posix_spawn_fncs);
++
++  /* The posix_spawn flow will return UV_ENOSYS if any of the posix_spawn_x_np
++   * non-standard functions is both _needed_ and _undefined_. In those cases,
++   * default back to the fork/execve strategy. For all other errors, just fail. */
++  if (err != UV_ENOSYS)
++    return err;
++
++#endif
++
++  /* This pipe is used by the parent to wait until
++   * the child has called `execve()`. We need this
++   * to avoid the following race condition:
++   *
++   *    if ((pid = fork()) > 0) {
++   *      kill(pid, SIGTERM);
++   *    }
++   *    else if (pid == 0) {
++   *      execve("/bin/cat", argp, envp);
++   *    }
++   *
++   * The parent sends a signal immediately after forking.
++   * Since the child may not have called `execve()` yet,
++   * there is no telling what process receives the signal,
++   * our fork or /bin/cat.
++   *
++   * To avoid ambiguity, we create a pipe with both ends
++   * marked close-on-exec. Then, after the call to `fork()`,
++   * the parent polls the read end until it EOFs or errors with EPIPE.
++   */
++  err = uv__make_pipe(signal_pipe, 0);
++  if (err)
++    return err;
++
++  /* Acquire write lock to prevent opening new fds in worker threads */
++  uv_rwlock_wrlock(&loop->cloexec_lock);
++
++  err = uv__spawn_and_init_child_fork(options, stdio_count, pipes, signal_pipe[1], pid);
++
++  /* Release lock in parent process */
++  uv_rwlock_wrunlock(&loop->cloexec_lock);
++
++  uv__close(signal_pipe[1]);
++
++  if (err == 0) {
++    do
++      r = read(signal_pipe[0], &exec_errorno, sizeof(exec_errorno));
++    while (r == -1 && errno == EINTR);
++
++    if (r == 0)
++      ; /* okay, EOF */
++    else if (r == sizeof(exec_errorno)) {
++      do
++        err = waitpid(*pid, &status, 0); /* okay, read errorno */
++      while (err == -1 && errno == EINTR);
++      assert(err == *pid);
++      err = exec_errorno;
++    } else if (r == -1 && errno == EPIPE) {
++      /* Something unknown happened to our child before spawn */
++      do
++        err = waitpid(*pid, &status, 0); /* okay, got EPIPE */
++      while (err == -1 && errno == EINTR);
++      assert(err == *pid);
++      err = UV_EPIPE;
++    } else
++      abort();
++  }
++
++  uv__close_nocheckstdio(signal_pipe[0]);
++
++  return err;
++}
++
+ int uv_spawn(uv_loop_t* loop,
+              uv_process_t* process,
+              const uv_process_options_t* options) {
+@@ -355,18 +920,13 @@ int uv_spawn(uv_loop_t* loop,
+   /* fork is marked __WATCHOS_PROHIBITED __TVOS_PROHIBITED. */
+   return UV_ENOSYS;
+ #else
+-  sigset_t signewset;
+-  sigset_t sigoldset;
+-  int signal_pipe[2] = { -1, -1 };
+   int pipes_storage[8][2];
+   int (*pipes)[2];
+   int stdio_count;
+-  ssize_t r;
+   pid_t pid;
+   int err;
+   int exec_errorno;
+   int i;
+-  int status;
+ 
+   assert(options->file != NULL);
+   assert(!(options->flags & ~(UV_PROCESS_DETACHED |
+@@ -379,6 +939,7 @@ int uv_spawn(uv_loop_t* loop,
+ 
+   uv__handle_init(loop, (uv_handle_t*)process, UV_PROCESS);
+   QUEUE_INIT(&process->queue);
++  process->status = 0;
+ 
+   stdio_count = options->stdio_count;
+   if (stdio_count < 3)
+@@ -403,106 +964,24 @@ int uv_spawn(uv_loop_t* loop,
+       goto error;
+   }
+ 
+-  /* This pipe is used by the parent to wait until
+-   * the child has called `execve()`. We need this
+-   * to avoid the following race condition:
+-   *
+-   *    if ((pid = fork()) > 0) {
+-   *      kill(pid, SIGTERM);
+-   *    }
+-   *    else if (pid == 0) {
+-   *      execve("/bin/cat", argp, envp);
+-   *    }
+-   *
+-   * The parent sends a signal immediately after forking.
+-   * Since the child may not have called `execve()` yet,
+-   * there is no telling what process receives the signal,
+-   * our fork or /bin/cat.
+-   *
+-   * To avoid ambiguity, we create a pipe with both ends
+-   * marked close-on-exec. Then, after the call to `fork()`,
+-   * the parent polls the read end until it EOFs or errors with EPIPE.
+-   */
+-  err = uv__make_pipe(signal_pipe, 0);
+-  if (err)
+-    goto error;
+-
+ #if !(defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+   uv_signal_start(&loop->child_watcher, uv__chld, SIGCHLD);
+ #endif
+ 
+-  /* Acquire write lock to prevent opening new fds in worker threads */
+-  uv_rwlock_wrlock(&loop->cloexec_lock);
+-
+-  /* Start the child with most signals blocked, to avoid any issues before we
+-   * can reset them, but allow program failures to exit (and not hang). */
+-  sigfillset(&signewset);
+-  sigdelset(&signewset, SIGKILL);
+-  sigdelset(&signewset, SIGSTOP);
+-  sigdelset(&signewset, SIGTRAP);
+-  sigdelset(&signewset, SIGSEGV);
+-  sigdelset(&signewset, SIGBUS);
+-  sigdelset(&signewset, SIGILL);
+-  sigdelset(&signewset, SIGSYS);
+-  sigdelset(&signewset, SIGABRT);
+-  if (pthread_sigmask(SIG_BLOCK, &signewset, &sigoldset) != 0)
+-    abort();
+-
+-  pid = fork();
+-  if (pid == -1)
+-    err = UV__ERR(errno);
+-
+-  if (pid == 0)
+-    uv__process_child_init(options, stdio_count, pipes, signal_pipe[1]);
++  /* Spawn the child */
++  exec_errorno = uv__spawn_and_init_child(loop, options, stdio_count, pipes, &pid);
+ 
+-  if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
+-    abort();
+-
+-  /* Release lock in parent process */
+-  uv_rwlock_wrunlock(&loop->cloexec_lock);
+-
+-  uv__close(signal_pipe[1]);
+-
+-  if (pid == -1) {
+-    uv__close(signal_pipe[0]);
+-    goto error;
+-  }
+-
+-  process->status = 0;
+-  exec_errorno = 0;
+-  do
+-    r = read(signal_pipe[0], &exec_errorno, sizeof(exec_errorno));
+-  while (r == -1 && errno == EINTR);
+-
+-  if (r == 0)
+-    ; /* okay, EOF */
+-  else if (r == sizeof(exec_errorno)) {
+-    do
+-      err = waitpid(pid, &status, 0); /* okay, read errorno */
+-    while (err == -1 && errno == EINTR);
+-    assert(err == pid);
+-  } else if (r == -1 && errno == EPIPE) {
+-    do
+-      err = waitpid(pid, &status, 0); /* okay, got EPIPE */
+-    while (err == -1 && errno == EINTR);
+-    assert(err == pid);
+-  } else
+-    abort();
+-
+-  uv__close_nocheckstdio(signal_pipe[0]);
+-
+-  for (i = 0; i < options->stdio_count; i++) {
+-    err = uv__process_open_stream(options->stdio + i, pipes[i]);
+-    if (err == 0)
+-      continue;
+-
+-    while (i--)
+-      uv__process_close_stream(options->stdio + i);
+-
+-    goto error;
+-  }
++#if 0
++  /* This runs into a nodejs issue (it expects initialized streams, even if the
++   * exec failed).
++   * See https://github.com/libuv/libuv/pull/3107#issuecomment-782482608 */
++  if (exec_errorno != 0)
++      goto error;
++#endif
+ 
+-  /* Only activate this handle if exec() happened successfully */
++  /* Activate this handle if exec() happened successfully, even if we later
++   * fail to open a stdio handle. This ensures we can eventually reap the child
++   * with waitpid. */
+   if (exec_errorno == 0) {
+ #if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+     struct kevent event;
+@@ -515,12 +994,22 @@ int uv_spawn(uv_loop_t* loop,
+     }
+ #endif
+ 
++    process->pid = pid;
++    process->exit_cb = options->exit_cb;
+     QUEUE_INSERT_TAIL(&loop->process_handles, &process->queue);
+     uv__handle_start(process);
+   }
+ 
+-  process->pid = pid;
+-  process->exit_cb = options->exit_cb;
++  for (i = 0; i < options->stdio_count; i++) {
++    err = uv__process_open_stream(options->stdio + i, pipes[i]);
++    if (err == 0)
++      continue;
++
++    while (i--)
++      uv__process_close_stream(options->stdio + i);
++
++    goto error;
++  }
+ 
+   if (pipes != pipes_storage)
+     uv__free(pipes);
diff --git a/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch b/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
new file mode 100644
index 0000000000000..e8f06d17973e6
--- /dev/null
+++ b/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
@@ -0,0 +1,173 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Thu, 29 Jul 2021 12:09:51 -0400
+Subject: unix: protect fork in uv_spawn from signals
+
+Years ago, we found that various kernels (linux, macOS) were known to
+fail if they try to deliver a signal during this syscall, so we prevent
+that from happening. They may have fixed those issues, but it is
+generally just a bad time for signals to arrive (glibc blocks them here,
+for example, including some more internal ones that it won't let us
+touch here).
+
+We try to be a bit conservative, and leave many signals unblocked which
+could happen during normal execution and should terminate the process if
+they do. There is a small race window after the child starts before we
+clear the old handlers, if the user was to send an fake signal from
+elsewhere, but that should be quite unlikely.
+
+PR-URL: https://github.com/libuv/libuv/pull/3251
+Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index cfcba341e0e380ecd595e4b59e39c08a7b374a48..c1f6bd4b0076f0835caf83c45a6a896e7ae5def9 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <signal.h>
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -223,13 +224,32 @@ static void uv__process_child_init(const uv_process_options_t* options,
+                                    int stdio_count,
+                                    int (*pipes)[2],
+                                    int error_fd) {
+-  sigset_t set;
++  sigset_t signewset;
+   int close_fd;
+   int use_fd;
+-  int err;
+   int fd;
+   int n;
+ 
++  /* Reset signal disposition first. Use a hard-coded limit because NSIG is not
++   * fixed on Linux: it's either 32, 34 or 64, depending on whether RT signals
++   * are enabled. We are not allowed to touch RT signal handlers, glibc uses
++   * them internally.
++   */
++  for (n = 1; n < 32; n += 1) {
++    if (n == SIGKILL || n == SIGSTOP)
++      continue;  /* Can't be changed. */
++
++#if defined(__HAIKU__)
++    if (n == SIGKILLTHR)
++      continue;  /* Can't be changed. */
++#endif
++
++    if (SIG_ERR != signal(n, SIG_DFL))
++      continue;
++
++    uv__write_errno(error_fd);
++  }
++
+   if (options->flags & UV_PROCESS_DETACHED)
+     setsid();
+ 
+@@ -311,32 +331,10 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     environ = options->env;
+   }
+ 
+-  /* Reset signal disposition.  Use a hard-coded limit because NSIG
+-   * is not fixed on Linux: it's either 32, 34 or 64, depending on
+-   * whether RT signals are enabled.  We are not allowed to touch
+-   * RT signal handlers, glibc uses them internally.
+-   */
+-  for (n = 1; n < 32; n += 1) {
+-    if (n == SIGKILL || n == SIGSTOP)
+-      continue;  /* Can't be changed. */
+-
+-#if defined(__HAIKU__)
+-    if (n == SIGKILLTHR)
+-      continue;  /* Can't be changed. */
+-#endif
+-
+-    if (SIG_ERR != signal(n, SIG_DFL))
+-      continue;
+-
+-    uv__write_errno(error_fd);
+-  }
+-
+-  /* Reset signal mask. */
+-  sigemptyset(&set);
+-  err = pthread_sigmask(SIG_SETMASK, &set, NULL);
+-
+-  if (err != 0)
+-    uv__write_errno(error_fd);
++  /* Reset signal mask just before exec. */
++  sigemptyset(&signewset);
++  if (sigprocmask(SIG_SETMASK, &signewset, NULL) != 0)
++    abort();
+ 
+ #ifdef __MVS__
+   execvpe(options->file, options->args, environ);
+@@ -345,6 +343,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
+ #endif
+ 
+   uv__write_errno(error_fd);
++  abort();
+ }
+ #endif
+ 
+@@ -356,6 +355,8 @@ int uv_spawn(uv_loop_t* loop,
+   /* fork is marked __WATCHOS_PROHIBITED __TVOS_PROHIBITED. */
+   return UV_ENOSYS;
+ #else
++  sigset_t signewset;
++  sigset_t sigoldset;
+   int signal_pipe[2] = { -1, -1 };
+   int pipes_storage[8][2];
+   int (*pipes)[2];
+@@ -432,25 +433,41 @@ int uv_spawn(uv_loop_t* loop,
+ 
+   /* Acquire write lock to prevent opening new fds in worker threads */
+   uv_rwlock_wrlock(&loop->cloexec_lock);
+-  pid = fork();
+ 
+-  if (pid == -1) {
++  /* Start the child with most signals blocked, to avoid any issues before we
++   * can reset them, but allow program failures to exit (and not hang). */
++  sigfillset(&signewset);
++  sigdelset(&signewset, SIGKILL);
++  sigdelset(&signewset, SIGSTOP);
++  sigdelset(&signewset, SIGTRAP);
++  sigdelset(&signewset, SIGSEGV);
++  sigdelset(&signewset, SIGBUS);
++  sigdelset(&signewset, SIGILL);
++  sigdelset(&signewset, SIGSYS);
++  sigdelset(&signewset, SIGABRT);
++  if (pthread_sigmask(SIG_BLOCK, &signewset, &sigoldset) != 0)
++    abort();
++
++  pid = fork();
++  if (pid == -1)
+     err = UV__ERR(errno);
+-    uv_rwlock_wrunlock(&loop->cloexec_lock);
+-    uv__close(signal_pipe[0]);
+-    uv__close(signal_pipe[1]);
+-    goto error;
+-  }
+ 
+-  if (pid == 0) {
++  if (pid == 0)
+     uv__process_child_init(options, stdio_count, pipes, signal_pipe[1]);
++
++  if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
+     abort();
+-  }
+ 
+   /* Release lock in parent process */
+   uv_rwlock_wrunlock(&loop->cloexec_lock);
++
+   uv__close(signal_pipe[1]);
+ 
++  if (pid == -1) {
++    uv__close(signal_pipe[0]);
++    goto error;
++  }
++
+   process->status = 0;
+   exec_errorno = 0;
+   do
diff --git a/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch b/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
new file mode 100644
index 0000000000000..f49d25998bba2
--- /dev/null
+++ b/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Sun, 6 Mar 2022 15:01:33 -0500
+Subject: unix: remove uv__cloexec_ioctl() (#3515)
+
+Now that uv__cloexec_fcntl() is simplified
+(https://github.com/libuv/libuv/pull/3492), there is no benefit to
+maintaining duplicate code paths for the same thing.
+
+diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
+index 6cd519ad5b3e7af8f5c71b18a59b88458a233f15..8c30802ad15316a8ec20ecedfb5123174d74276b 100644
+--- a/deps/uv/src/unix/core.c
++++ b/deps/uv/src/unix/core.c
+@@ -597,20 +597,6 @@ int uv__nonblock_ioctl(int fd, int set) {
+ 
+   return 0;
+ }
+-
+-
+-int uv__cloexec_ioctl(int fd, int set) {
+-  int r;
+-
+-  do
+-    r = ioctl(fd, set ? FIOCLEX : FIONCLEX);
+-  while (r == -1 && errno == EINTR);
+-
+-  if (r)
+-    return UV__ERR(errno);
+-
+-  return 0;
+-}
+ #endif
+ 
+ 
+@@ -645,7 +631,7 @@ int uv__nonblock_fcntl(int fd, int set) {
+ }
+ 
+ 
+-int uv__cloexec_fcntl(int fd, int set) {
++int uv__cloexec(int fd, int set) {
+   int flags;
+   int r;
+ 
+diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
+index 2dcc8b32f5165dd75061a1b55cc1abd2ab93ccc9..543993989b8765247e140e9d950a25192e5e1ca5 100644
+--- a/deps/uv/src/unix/internal.h
++++ b/deps/uv/src/unix/internal.h
+@@ -175,11 +175,9 @@ struct uv__stream_queued_fds_s {
+     defined(__linux__) || \
+     defined(__OpenBSD__) || \
+     defined(__NetBSD__)
+-#define uv__cloexec uv__cloexec_ioctl
+ #define uv__nonblock uv__nonblock_ioctl
+ #define UV__NONBLOCK_IS_IOCTL 1
+ #else
+-#define uv__cloexec uv__cloexec_fcntl
+ #define uv__nonblock uv__nonblock_fcntl
+ #define UV__NONBLOCK_IS_IOCTL 0
+ #endif
+@@ -197,8 +195,7 @@ struct uv__stream_queued_fds_s {
+ #endif
+ 
+ /* core */
+-int uv__cloexec_ioctl(int fd, int set);
+-int uv__cloexec_fcntl(int fd, int set);
++int uv__cloexec(int fd, int set);
+ int uv__nonblock_ioctl(int fd, int set);
+ int uv__nonblock_fcntl(int fd, int set);
+ int uv__close(int fd); /* preserves errno */
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index 7705068730cb0536998bad7d304cb87df99b72e8..b6f9756c6a6710f5f10762b9299cc35047b98097 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -283,7 +283,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
+     if (pipes[fd][1] == -1)
+       uv__write_errno(error_fd);
+ #ifndef F_DUPFD_CLOEXEC /* POSIX 2008 */
+-    n = uv__cloexec_fcntl(pipes[fd][1], 1);
++    n = uv__cloexec(pipes[fd][1], 1);
+     if (n) {
+       uv__write_int(error_fd, n);
+       _exit(127);
+@@ -312,7 +312,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
+ 
+     if (fd == use_fd) {
+       if (close_fd == -1) {
+-        n = uv__cloexec_fcntl(use_fd, 0);
++        n = uv__cloexec(use_fd, 0);
+         if (n) {
+           uv__write_int(error_fd, n);
+           _exit(127);
diff --git a/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch b/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch
new file mode 100644
index 0000000000000..219ae54daa15b
--- /dev/null
+++ b/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Sat, 5 Mar 2022 18:55:49 +0100
+Subject: unix: simplify uv__cloexec_fcntl() (#3492)
+
+FD_CLOEXEC is the only defined flag for fcntl(F_SETFD) so don't bother
+getting the status of that flag first with fcntl(F_GETFD), just set it.
+
+diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
+index a6425294086ff2f1435fdd6866380d3aaaf68200..6cd519ad5b3e7af8f5c71b18a59b88458a233f15 100644
+--- a/deps/uv/src/unix/core.c
++++ b/deps/uv/src/unix/core.c
+@@ -649,21 +649,9 @@ int uv__cloexec_fcntl(int fd, int set) {
+   int flags;
+   int r;
+ 
+-  do
+-    r = fcntl(fd, F_GETFD);
+-  while (r == -1 && errno == EINTR);
+-
+-  if (r == -1)
+-    return UV__ERR(errno);
+-
+-  /* Bail out now if already set/clear. */
+-  if (!!(r & FD_CLOEXEC) == !!set)
+-    return 0;
+-
++  flags = 0;
+   if (set)
+-    flags = r | FD_CLOEXEC;
+-  else
+-    flags = r & ~FD_CLOEXEC;
++    flags = FD_CLOEXEC;
+ 
+   do
+     r = fcntl(fd, F_SETFD, flags);

From 41f94ef1549815f9e44ad29927d338d71a95d3ee Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 23 Mar 2022 12:40:29 -0400
Subject: [PATCH 162/811] Revert "test: re-enable webview resize events test
 (#33220)" (#33409)

This reverts commit c262eac441a8fb69ee22b1ecb22979b8ce3b7948.
---
 spec/webview-spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index ca2ce8f84ad94..0b649d1bd77ad 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -1214,7 +1214,9 @@ describe('<webview> tag', function () {
 
     const generateSpecs = (description, sandbox) => {
       describe(description, () => {
-        it('emits resize events', async () => {
+        // TODO(nornagon): disabled during chromium roll 2019-06-11 due to a
+        // 'ResizeObserver loop limit exceeded' error on Windows
+        xit('emits resize events', async () => {
           const firstResizeSignal = waitForEvent(webview, 'resize');
           const domReadySignal = waitForEvent(webview, 'dom-ready');
 

From cc253f5de96dc4f798673b0bbb5cb2c49ea2b7ce Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 23 Mar 2022 18:55:26 -0400
Subject: [PATCH 163/811] ci: abort CI if goma authentication is invalid
 (#33413)

---
 .circleci/build_config.yml |  4 ++++
 appveyor.yml               | 40 ++++++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 3d4f5c162644a..a6c0411fcab71 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -328,6 +328,10 @@ step-setup-goma-for-build: &step-setup-goma-for-build
       node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
       export GOMA_FALLBACK_ON_AUTH_FAILURE=true
       third_party/goma/goma_ctl.py ensure_start
+      if [ ! -z "$RAW_GOMA_AUTH" ] && [ "`third_party/goma/goma_auth.py info`" != "Login as Fermi Planck" ]; then
+        echo "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token."
+        exit 1
+      fi
       echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
       echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
       echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
diff --git a/appveyor.yml b/appveyor.yml
index fab35e3bc66d2..7b413faee5c78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -67,6 +67,31 @@ build_script:
   - mkdir src
   - update_depot_tools.bat
   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
+      }
+  - git clone https://github.com/electron/build-tools.git
+  - cd build-tools
+  - npm install
+  - mkdir third_party
+  - ps: >-
+      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+  - cd ..
+  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
+        if ($goma_login -eq 'Login as Fermi Planck') {
+          Write-warning "Goma authentication is correct";
+        } else {
+          Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
+          $host.SetShouldExit(1)
+        }
+      }
   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
   - ps: >-
       if ($env:GN_CONFIG -ne 'release') {
@@ -130,21 +155,6 @@ build_script:
           Write-warning "Failed to add third_party\angle\.git; continuing anyway"
         }
       }
-  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
-      }
-  - git clone https://github.com/electron/build-tools.git
-  - cd build-tools
-  - npm install
-  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-  - cd ..
-  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
   - cd src
   - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
   - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "

From db5a3c014ae17e464fcd1fa6bfcd05a40ea2ed71 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:59:54 -0400
Subject: [PATCH 164/811] chore: bump node to v16.14.2 (main) (#32833)

* chore: bump node in DEPS to v16.14.0

* src: add flags for controlling process behavior

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

* src: add x509.fingerprint512 to crypto module

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

* deps: upgrade to libuv 1.43.0

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

* chore: fixup patch indices

* chore: add missing filenames

https://github.com/nodejs/node/pull/39283
https://github.com/nodejs/node/pull/40665

* crypto: trim input for NETSCAPE_SPKI_b64_decode

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

* chore: update patches

* chore: bump node in DEPS to v16.14.1

* tools: enable no-empty ESLint rule

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

* chore: update patches

* chore: update patches

* chore: bump node in DEPS to v16.14.2

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                          |  2 +-
 patches/node/.patches                         |  3 -
 ...m_env_option_to_disable_node_options.patch | 68 ----------------
 patches/node/be_compatible_with_cppgc.patch   |  2 +-
 patches/node/build_add_gn_build_files.patch   | 20 +++--
 ...f_original-fs_and_custom_embedder_js.patch |  2 +-
 ...de_entrypoint_to_be_a_builtin_module.patch | 18 +++--
 ...owserglobals_from_global_not_process.patch |  4 +-
 ...imum_supported_version_to_10_15_3406.patch |  2 +-
 ...ove_eprototype_error_workaround_3405.patch |  2 +-
 ...nslate_eprototype_to_econnreset_3413.patch |  2 +-
 ...is_on_64bit_arch_and_ptr_compression.patch |  2 +-
 ...s_for_low-level_hooks_and_exceptions.patch | 81 -------------------
 .../feat_add_uv_loop_watcher_queue_code.patch |  4 +-
 .../node/feat_initialize_asar_support.patch   |  4 +-
 ...nt_for_debugger_agent_race_condition.patch |  4 +-
 ..._values_for_variables_in_common_gypi.patch |  2 +-
 ...everse_jsargs_defines_in_common_gypi.patch |  4 +-
 ...reventing_initializeinspector_in_env.patch | 12 +--
 ..._caused_by_gethostnamew_on_windows_7.patch | 68 +---------------
 .../fix_crypto_tests_to_run_with_bssl.patch   | 25 +++---
 ...se_tracing_tracingcontroller_instead.patch |  4 +-
 ...ingssl_and_openssl_incompatibilities.patch | 26 +++---
 ...g_-wdeprecated-declarations_in_libuv.patch |  4 +-
 .../pass_all_globals_through_require.patch    |  4 +-
 ...dder_overriding_of_internal_fs_calls.patch |  6 +-
 ...cess_fork_to_use_execute_script_with.patch |  4 +-
 ...rash_when_sharedarraybuffer_disabled.patch |  2 +-
 ...to_provide_a_custom_pageallocator_to.patch |  6 +-
 .../node/test_add_fixture_trim_option.patch   | 49 -----------
 shell/common/node_bindings.cc                 | 10 ++-
 31 files changed, 95 insertions(+), 351 deletions(-)
 delete mode 100644 patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch
 delete mode 100644 patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch
 delete mode 100644 patches/node/test_add_fixture_trim_option.patch

diff --git a/DEPS b/DEPS
index 790da2014c4de..c8b39d0e1ec0e 100644
--- a/DEPS
+++ b/DEPS
@@ -17,7 +17,7 @@ vars = {
   'chromium_version':
     '100.0.4894.0',
   'node_version':
-    'v16.13.2',
+    'v16.14.2',
   'nan_version':
     # The following commit hash of NAN is v2.14.2 with *only* changes to the
     # test suite. This should be updated to a specific tag when one becomes
diff --git a/patches/node/.patches b/patches/node/.patches
index 2c7f73453169f..7b2b6aae5d061 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -4,7 +4,6 @@ feat_initialize_asar_support.patch
 expose_get_builtin_module_function.patch
 build_add_gn_build_files.patch
 fix_add_default_values_for_variables_in_common_gypi.patch
-feat_add_flags_for_low-level_hooks_and_exceptions.patch
 fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
 pass_all_globals_through_require.patch
 build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
@@ -19,11 +18,9 @@ fix_allow_preventing_initializeinspector_in_env.patch
 src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
 fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
-add_should_read_node_options_from_env_option_to_disable_node_options.patch
 repl_fix_crash_when_sharedarraybuffer_disabled.patch
 fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
 chore_fix_-wimplicit-fallthrough.patch
-test_add_fixture_trim_option.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
 fix_don_t_create_console_window_when_creating_process.patch
diff --git a/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch b/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch
deleted file mode 100644
index 8f7b86fbef1fb..0000000000000
--- a/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Wed, 21 Jul 2021 13:40:59 -0700
-Subject: add should_read_node_options_from_env option to disable NODE_OPTIONS
- parsing at runtime
-
-We can remove the NODE_OPTIONS environment variable but it in theory could be injected / re-inserted at runtime and be used for workers.  In order to ensure the fuse is respected we need a hard runtime toggle for NODE_OPTION support.
-
-diff --git a/src/env.cc b/src/env.cc
-index 2cb2dccdf32ba4ad58972bb1d2b185996104b5ee..0abd61d6ddd1fb55afde40b38cf7c9400a8c3d41 100644
---- a/src/env.cc
-+++ b/src/env.cc
-@@ -329,6 +329,9 @@ std::string GetExecPath(const std::vector<std::string>& argv) {
-   return exec_path;
- }
- 
-+/* static */
-+bool Environment::should_read_node_options_from_env_ = true;
-+
- Environment::Environment(IsolateData* isolate_data,
-                          Isolate* isolate,
-                          const std::vector<std::string>& args,
-diff --git a/src/env.h b/src/env.h
-index e0deca497feb111622b257b952c9ed9161c7d001..ab8334bf0e3405fee4d21a4b541bd1164d92ca89 100644
---- a/src/env.h
-+++ b/src/env.h
-@@ -1145,6 +1145,8 @@ class Environment : public MemoryRetainer {
-   inline double trigger_async_id();
-   inline double get_default_trigger_async_id();
- 
-+  static bool should_read_node_options_from_env_;
-+
-   // List of id's that have been destroyed and need the destroy() cb called.
-   inline std::vector<double>* destroy_async_id_list();
- 
-diff --git a/src/node.cc b/src/node.cc
-index 207a95d202b4e422a39f837241f1655f7111b1e3..14b9002dbd918b59b05d8b12c5441080695ed9f0 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -875,7 +875,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
- #if !defined(NODE_WITHOUT_NODE_OPTIONS)
-   std::string node_options;
- 
--  if (credentials::SafeGetenv("NODE_OPTIONS", &node_options)) {
-+  if (Environment::should_read_node_options_from_env_ && credentials::SafeGetenv("NODE_OPTIONS", &node_options)) {
-     std::vector<std::string> env_argv =
-         ParseNodeOptionsEnvVar(node_options, errors);
- 
-diff --git a/src/node_worker.cc b/src/node_worker.cc
-index 16b7be36f284311f38583fa1df28a2945560b524..62a7dae080fad7e18863968dee22dbe4b461ab82 100644
---- a/src/node_worker.cc
-+++ b/src/node_worker.cc
-@@ -467,6 +467,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
-     });
- 
- #ifndef NODE_WITHOUT_NODE_OPTIONS
-+    if (Environment::should_read_node_options_from_env_) {
-     MaybeLocal<String> maybe_node_opts =
-         env_vars->Get(isolate, OneByteString(isolate, "NODE_OPTIONS"));
-     Local<String> node_opts;
-@@ -497,6 +498,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
-         return;
-       }
-     }
-+    }
- #endif
-   }
- 
diff --git a/patches/node/be_compatible_with_cppgc.patch b/patches/node/be_compatible_with_cppgc.patch
index 3bbc3ce0bde16..c907fff1e20a4 100644
--- a/patches/node/be_compatible_with_cppgc.patch
+++ b/patches/node/be_compatible_with_cppgc.patch
@@ -83,7 +83,7 @@ index bb1e8d4b46bce3bf08f730ac5d43f7113d17ae39..6da0669943fc6465ffc47a1c8c3dadfe
  }
  
 diff --git a/src/base_object.h b/src/base_object.h
-index d46a0f216009c63f45c440fc352b54d1ac4a08d8..81913c0d7762bf499ee19aaa3b63b986ca370bb4 100644
+index 1c63da92fd80c042d5ea729bdd70049cae51a141..3b8127e884187b21cebeabb39b60bd3010b62217 100644
 --- a/src/base_object.h
 +++ b/src/base_object.h
 @@ -40,7 +40,7 @@ class TransferData;
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index 3d78f40a42624..d18f8e519d5a4 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -964,10 +964,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
 +}
 diff --git a/filenames.json b/filenames.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc41054754
+index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424afb63ca5
 --- /dev/null
 +++ b/filenames.json
-@@ -0,0 +1,604 @@
+@@ -0,0 +1,612 @@
 +// This file is automatically generated by generate_gn_filenames_json.py
 +// DO NOT EDIT
 +{
@@ -1191,6 +1191,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "lib/internal/blob.js",
 +    "lib/internal/socket_list.js",
 +    "lib/internal/socketaddress.js",
++    "lib/internal/promise_hooks.js",
 +    "lib/internal/stream_base_commons.js",
 +    "lib/internal/url.js",
 +    "lib/internal/async_hooks.js",
@@ -1229,6 +1230,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "lib/internal/webstreams/queuingstrategies.js",
 +    "lib/internal/webstreams/encoding.js",
 +    "lib/internal/webstreams/transformstream.js",
++    "lib/internal/webstreams/adapters.js",
 +    "lib/internal/webstreams/transfer.js",
 +    "lib/internal/bootstrap/loaders.js",
 +    "lib/internal/bootstrap/pre_execution.js",
@@ -1252,6 +1254,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "lib/internal/streams/destroy.js",
 +    "lib/internal/streams/legacy.js",
 +    "lib/internal/streams/passthrough.js",
++    "lib/internal/streams/operators.js",
 +    "lib/internal/streams/readable.js",
 +    "lib/internal/streams/from.js",
 +    "lib/internal/streams/writable.js",
@@ -1263,6 +1266,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "lib/internal/streams/lazy_transform.js",
 +    "lib/internal/streams/duplex.js",
 +    "lib/internal/streams/pipeline.js",
++    "lib/internal/readline/interface.js",
 +    "lib/internal/readline/utils.js",
 +    "lib/internal/readline/emitKeypressEvents.js",
 +    "lib/internal/readline/callbacks.js",
@@ -1300,11 +1304,14 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "lib/internal/modules/run_main.js",
 +    "lib/internal/modules/package_json_reader.js",
 +    "lib/internal/modules/esm/module_job.js",
++    "lib/internal/modules/esm/assert.js",
 +    "lib/internal/modules/esm/get_source.js",
 +    "lib/internal/modules/esm/translators.js",
 +    "lib/internal/modules/esm/resolve.js",
 +    "lib/internal/modules/esm/create_dynamic_module.js",
 +    "lib/internal/modules/esm/load.js",
++    "lib/internal/modules/esm/handle_process_exit.js",
++    "lib/internal/modules/esm/initialize_import_meta.js",
 +    "lib/internal/modules/esm/module_map.js",
 +    "lib/internal/modules/esm/get_format.js",
 +    "lib/internal/modules/esm/loader.js",
@@ -1565,6 +1572,7 @@ index 0000000000000000000000000000000000000000..ac32bd83b683b048ffde3314f4caebbc
 +    "src/tracing/trace_event_common.h",
 +    "src/tracing/traced_value.h",
 +    "src/timer_wrap.h",
++    "src/timer_wrap-inl.h",
 +    "src/tty_wrap.h",
 +    "src/udp_wrap.h",
 +    "src/util.h",
@@ -1778,7 +1786,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
 +  args = rebase_path(inputs + outputs, root_build_dir)
 +}
 diff --git a/src/node_version.h b/src/node_version.h
-index 31e75367f8263f575f37243475acb58bb5c40d04..8f102792fe66847dad0ba7176299cf09686cd182 100644
+index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aacb48a6f60 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@
@@ -1905,10 +1913,10 @@ index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2e
 +
 +  out_file.writelines(new_contents)
 diff --git a/tools/install.py b/tools/install.py
-index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..dd13ad149f1b4cb807ca7aff62e1b15718116855 100755
+index 8a050dfa7c8b771ceb30fd2b74dc47f3de96834c..ad3bee1660de26d3502c6247f23b091171a6416c 100755
 --- a/tools/install.py
 +++ b/tools/install.py
-@@ -170,17 +170,72 @@ def files(action):
+@@ -172,17 +172,72 @@ def files(action):
  def headers(action):
    def wanted_v8_headers(files_arg, dest):
      v8_headers = [
@@ -1991,7 +1999,7 @@ index 41cc1cbc60a9480cc08df3aa0ebe582c2becc3a2..dd13ad149f1b4cb807ca7aff62e1b157
      files_arg = [name for name in files_arg if name in v8_headers]
      action(files_arg, dest)
  
-@@ -201,7 +256,7 @@ def headers(action):
+@@ -209,7 +264,7 @@ def headers(action):
    if sys.platform.startswith('aix'):
      action(['out/Release/node.exp'], 'include/node/')
  
diff --git a/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch b/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
index 711d8326bb029..519b9bf148983 100644
--- a/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
+++ b/patches/node/build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
@@ -35,7 +35,7 @@ index b45af42d12ff7df8a9e125e87f51af3456811c23..c84ff7feb07aebf656ada7e37d812d9d
  async function* watch(filename, options = {}) {
    const path = toNamespacedPath(getValidatedPath(filename));
 diff --git a/src/node_native_module.cc b/src/node_native_module.cc
-index 006a30903184d76d6c11849784e6c6b38fd39807..edde37f281c10a1cb69db642149cc300744499cb 100644
+index 5d20e1d6a86416c0de9f01a22b992aad889078d3..c836540c7d9328ae4646097ecc18023c1d8add8f 100644
 --- a/src/node_native_module.cc
 +++ b/src/node_native_module.cc
 @@ -20,6 +20,7 @@ NativeModuleLoader NativeModuleLoader::instance_;
diff --git a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
index a5087a9679b6c..b921424c37b37 100644
--- a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
+++ b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
@@ -8,31 +8,33 @@ they use themselves as the entry point. We should try to upstream some form
 of this.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 4d4996e9868c35ac3e0babbf08c38d90a6857abc..419ffd9d5deb84eb94381259d3084411f6c3341b 100644
+index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07b9db76a0 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -104,10 +104,12 @@ function patchProcessObject(expandArgv1) {
+@@ -95,11 +95,13 @@ function patchProcessObject(expandArgv1) {
    if (expandArgv1 && process.argv[1] &&
        !StringPrototypeStartsWith(process.argv[1], '-')) {
      // Expand process.argv[1] into a full path.
 -    const path = require('path');
 -    try {
 -      process.argv[1] = path.resolve(process.argv[1]);
--    } catch {}
+-    } catch {
+-      // Continue regardless of error.
 +    if (!process.argv[1] || !process.argv[1].startsWith('electron/js2c')) {
 +      const path = require('path');
 +      try {
 +        process.argv[1] = path.resolve(process.argv[1]);
-+      } catch {}
-+    }
++      } catch {
++        // Continue regardless of error.
++      }
+     }
    }
  
-   // TODO(joyeecheung): most of these should be deprecated and removed,
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 05a62bb3c3852536001912cb0b69fe5578ace125..37f395e9f2b7ab9ce99b0f8f4217253fcbd9175b 100644
+index caca939942cb721a3efde7005b0a987a19237a8b..2d30a56a87ff8657cddb3d9e6af5bd9f81deffdb 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1075,6 +1075,13 @@ Module.prototype._compile = function(content, filename) {
+@@ -1077,6 +1077,13 @@ Module.prototype._compile = function(content, filename) {
    if (getOptionValue('--inspect-brk') && process._eval == null) {
      if (!resolvedArgv) {
        // We enter the repl if we're not given a filename argument.
diff --git a/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch b/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
index 046a66f06ab2f..a666b1d9744f7 100644
--- a/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
+++ b/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
@@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
 config can only be set at compile time.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index ef06d0563fa7452348754418867a56c9b8c6f4e1..a313402f93937cf2f1f93eb74422d9609e291d76 100644
+index 085dd7e09d31fb1800b3596cc068637e1956ba52..9e0f811b2a37f45a9d8162dff7c9d5c935b856d6 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
-@@ -193,7 +193,7 @@ const {
+@@ -209,7 +209,7 @@ const {
    queueMicrotask
  } = require('internal/process/task_queues');
  
diff --git a/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch b/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
index 43023e3d02254..555ee607137d1 100644
--- a/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
+++ b/patches/node/darwin_bump_minimum_supported_version_to_10_15_3406.patch
@@ -11,7 +11,7 @@ Refs: https://github.com/libuv/libuv/pull/482
 Refs: https://github.com/libuv/libuv/pull/3405
 
 diff --git a/deps/uv/SUPPORTED_PLATFORMS.md b/deps/uv/SUPPORTED_PLATFORMS.md
-index 30e0ea617a6fcaa5b4b7c7c5b117652e61f367d3..dc57dfb12dc7ddf8d29308ac44f46084a933d5ca 100644
+index 87e23823ad6424526fdbc2457e535875124b31cb..79509db5b17bb9e7fe245d8a0fd7fa25f8665426 100644
 --- a/deps/uv/SUPPORTED_PLATFORMS.md
 +++ b/deps/uv/SUPPORTED_PLATFORMS.md
 @@ -3,7 +3,7 @@
diff --git a/patches/node/darwin_remove_eprototype_error_workaround_3405.patch b/patches/node/darwin_remove_eprototype_error_workaround_3405.patch
index 60dc8b799e4b7..45d8d4936d74e 100644
--- a/patches/node/darwin_remove_eprototype_error_workaround_3405.patch
+++ b/patches/node/darwin_remove_eprototype_error_workaround_3405.patch
@@ -18,7 +18,7 @@ I'm opting to simply remove the workaround and have the error bubble up.
 Refs: https://github.com/libuv/libuv/pull/482
 
 diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
-index bc64fe8f44b26d9f4c0d4d0d282b65cdf11a531b..1af448e7691392c3f7794eed1905d9132394e207 100644
+index 5858258d2868c3352e0e9e3313045aa29ff4a873..c5cd6ddc0b627eeb047e0cb08677f65b4601b89b 100644
 --- a/deps/uv/src/unix/stream.c
 +++ b/deps/uv/src/unix/stream.c
 @@ -58,20 +58,6 @@ struct uv__stream_select_s {
diff --git a/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch b/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch
index 903921bce934b..c6199bc4c1388 100644
--- a/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch
+++ b/patches/node/darwin_translate_eprototype_to_econnreset_3413.patch
@@ -18,7 +18,7 @@ Refs: https://github.com/libuv/libuv/pull/482
 Refs: https://github.com/libuv/libuv/pull/3405
 
 diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
-index 1af448e7691392c3f7794eed1905d9132394e207..9d22debf2bf5bd5912ade152e55a85ad652e3819 100644
+index c5cd6ddc0b627eeb047e0cb08677f65b4601b89b..b5b05a6a4a737f50b780b7c15717b4f465496fa8 100644
 --- a/deps/uv/src/unix/stream.c
 +++ b/deps/uv/src/unix/stream.c
 @@ -865,6 +865,20 @@ static int uv__try_write(uv_stream_t* stream,
diff --git a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
index 3beda4a974e9f..6b9b4d53271ba 100644
--- a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
+++ b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
@@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid
 out in memory on 64-bit machines, and will summarily fail to work.
 
 diff --git a/common.gypi b/common.gypi
-index 4b6a965f65b9ad711507e4dd7ade4d54d52277cc..9e4064b263819756f17fb712a54bd6f828c5be35 100644
+index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3f5e8eece 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -64,7 +64,7 @@
diff --git a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch b/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch
deleted file mode 100644
index bfe9ef5ec6ade..0000000000000
--- a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Thu, 13 Sep 2018 08:42:22 -0700
-Subject: feat: add flags for low-level hooks and exceptions
-
-This commit adds two new exposed methods to `node.cc`, `InitGeneric` and
-`LoadEnvironmentGeneric` that allow for control of which mode Node
-should run, which i have called `standalone_mode` and
-`upstream_node_mode`. Default behavior of `Init` and `LoadEnvironment`
-remain the same.
-
-We have 3 modes when running Node in Electron:
-1. In the main process, we want to have a full Node environment, but
-with signal handlers and other low level things disabled
-2. In renderer process, we want Node to reuse the web page's context
-3. In `ELECTRON_RUN_AS_NODE`, we want Node to run as it runs officially
-by default
-
-For modes 1 and 3, we have Node create a new V8 context with a Node
-Environment on it. However, for mode 2, since the V8 context is created
-by blink for web frames and web workers we make Node create the Node
-Environment on the V8 context of blink, so no new V8 context is created.
-
-As a result, a renderer process may have multiple Node Environments in it.
-
-diff --git a/src/node.cc b/src/node.cc
-index e942c108a15a3c50d92c08b344f6691050c7859d..207a95d202b4e422a39f837241f1655f7111b1e3 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -139,6 +139,8 @@ using v8::Undefined;
- using v8::V8;
- using v8::Value;
- 
-+bool g_upstream_node_mode = true;
-+
- namespace per_process {
- 
- // node_revert.h
-@@ -853,7 +855,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
-   binding::RegisterBuiltinModules();
- 
-   // Make inherited handles noninheritable.
--  uv_disable_stdio_inheritance();
-+  if (g_upstream_node_mode) {
-+    uv_disable_stdio_inheritance();
-+  }
- 
-   // Cache the original command line to be
-   // used in diagnostic reports.
-@@ -887,7 +891,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
-     if (exit_code != 0) return exit_code;
-   }
- #endif
--
-+  if (g_upstream_node_mode) {
-+  // NOTE(jeremy): indentation is intentionally wrong here, to ease rebasing.
-   const int exit_code = ProcessGlobalArgs(argv,
-                                           exec_argv,
-                                           errors,
-@@ -930,7 +935,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
-     return 9;
-   }
-   per_process::metadata.versions.InitializeIntlVersions();
--
-+  }  // g_upstream_node_mode
- # ifndef __POSIX__
-   std::string tz;
-   if (credentials::SafeGetenv("TZ", &tz) && !tz.empty()) {
-diff --git a/src/node.h b/src/node.h
-index 1f9afa558d0c8b7950a0f5862017e09a08118ec1..45de72bd94cf669ac2badf89d23164cb7022a5b3 100644
---- a/src/node.h
-+++ b/src/node.h
-@@ -213,6 +213,8 @@ namespace node {
- 
- class IsolateData;
- class Environment;
-+// Whether node should open some low level hooks.
-+NODE_EXTERN extern bool g_upstream_node_mode;
- 
- // TODO(addaleax): Officially deprecate this and replace it with something
- // better suited for a public embedder API.
diff --git a/patches/node/feat_add_uv_loop_watcher_queue_code.patch b/patches/node/feat_add_uv_loop_watcher_queue_code.patch
index 610da58034be2..49468ed2ae2fe 100644
--- a/patches/node/feat_add_uv_loop_watcher_queue_code.patch
+++ b/patches/node/feat_add_uv_loop_watcher_queue_code.patch
@@ -6,10 +6,10 @@ Subject: feat: add uv_loop watcher_queue code
 Electron's Node Integration works by listening to Node's backend file descriptor in a separate thread; when an event is ready the backend file descriptor will trigger a new event for it, and the main thread will then iterate the libuv loop. For certain operations (ex. adding a timeout task) the backend file descriptor isn't informed, & as a result the main thread doesn't know it needs to iterate the libuv loop so the timeout task will never execute until something else trigger a new event. This commit should be removed when https://github.com/libuv/libuv/pull/1921 is merged
 
 diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
-index 77503bde9f28e4769ae3832fb2117e632e9c9268..49930027bdad013d8fcbc375c534d67cc5201bc7 100644
+index 606083c87de5790d7e66fc34aeaae9a58acb8ef4..ca9568c58b1ccd554318f5deb27d2b4e80f08a28 100644
 --- a/deps/uv/include/uv.h
 +++ b/deps/uv/include/uv.h
-@@ -1802,6 +1802,8 @@ union uv_any_req {
+@@ -1805,6 +1805,8 @@ union uv_any_req {
  struct uv_loop_s {
    /* User data - use this for whatever. */
    void* data;
diff --git a/patches/node/feat_initialize_asar_support.patch b/patches/node/feat_initialize_asar_support.patch
index b32de0a339035..350139338d233 100644
--- a/patches/node/feat_initialize_asar_support.patch
+++ b/patches/node/feat_initialize_asar_support.patch
@@ -6,7 +6,7 @@ Subject: feat: initialize asar support
 This patch initializes asar support in Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index f2a10641906e317270e7f27f4ee3ee1956802113..4d4996e9868c35ac3e0babbf08c38d90a6857abc 100644
+index f21ba048b4863863e6c7b740f410775776a7649a..3c5e6fe40070f52d8b3f4e9757485845c1d6dbed 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
 @@ -76,6 +76,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
@@ -17,7 +17,7 @@ index f2a10641906e317270e7f27f4ee3ee1956802113..4d4996e9868c35ac3e0babbf08c38d90
  }
  
  function patchProcessObject(expandArgv1) {
-@@ -484,6 +485,10 @@ function loadPreloadModules() {
+@@ -477,6 +478,10 @@ function loadPreloadModules() {
    }
  }
  
diff --git a/patches/node/fix_account_for_debugger_agent_race_condition.patch b/patches/node/fix_account_for_debugger_agent_race_condition.patch
index e2c4b5401c958..f4f70161ba85a 100644
--- a/patches/node/fix_account_for_debugger_agent_race_condition.patch
+++ b/patches/node/fix_account_for_debugger_agent_race_condition.patch
@@ -10,7 +10,7 @@ errors. This is remedied by adding a small timeout to the test.
 We'll either upstream this or figure out a better solution.
 
 diff --git a/test/parallel/test-debugger-address.js b/test/parallel/test-debugger-address.js
-index 95dd1c6e3f82835d5ccaf65544d654b71efaa392..ed8dccf91247068455dd593bb3e8c02bddc89ae5 100644
+index bffc28ac916e8d241465f1e2649ab8aa4a15a0c7..079e668a3d1c505fa0a540fb1df87b32e603db48 100644
 --- a/test/parallel/test-debugger-address.js
 +++ b/test/parallel/test-debugger-address.js
 @@ -59,6 +59,7 @@ function launchTarget(...args) {
@@ -22,7 +22,7 @@ index 95dd1c6e3f82835d5ccaf65544d654b71efaa392..ed8dccf91247068455dd593bb3e8c02b
      .then(() => cli.waitFor(/break/))
      .then(() => cli.waitForPrompt())
 diff --git a/test/sequential/test-debugger-pid.js b/test/sequential/test-debugger-pid.js
-index 402c1f86dd4ed99b413eca5fce8a2db47797b11a..74ef0a1618ccf1f6671bbe2a03548eee6cd0b88c 100644
+index 0056113ecaecd3a176ee9539b7fda0132ef59963..3228d0ecc220b5c8c8034fea0dce20f8c38ac68c 100644
 --- a/test/sequential/test-debugger-pid.js
 +++ b/test/sequential/test-debugger-pid.js
 @@ -41,6 +41,7 @@ function launchTarget(...args) {
diff --git a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
index fc9a9c0e2182d..3278701357152 100644
--- a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
+++ b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
@@ -7,7 +7,7 @@ common.gypi is a file that's included in the node header bundle, despite
 the fact that we do not build node with gyp.
 
 diff --git a/common.gypi b/common.gypi
-index b8d61f0d32709f3476dd2fd870d3959ab8f16a60..4b6a965f65b9ad711507e4dd7ade4d54d52277cc 100644
+index be30169cf58d9759320f1763ede7e0ce89be3aa2..b86c3f3bbeddfa57c223ff066451fd3e1ce1315d 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -81,6 +81,23 @@
diff --git a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
index 7b1e9bff157a1..cc2b2f0f7cbb4 100644
--- a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+++ b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
@@ -6,7 +6,7 @@ Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi
 This can be removed once node upgrades V8 and inevitably has to do this exact same thing.  Also hi node people if you are looking at this.
 
 diff --git a/common.gypi b/common.gypi
-index 9e4064b263819756f17fb712a54bd6f828c5be35..2e59efb38d95231fcbcbb5a7859a6cfad3cf232c 100644
+index 59e6a857060a35ca52cff2b44bc412a3f5e8eece..7741f97758282d1c601eecf263cb4ce1510be284 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -65,6 +65,7 @@
@@ -25,7 +25,7 @@ index 9e4064b263819756f17fb712a54bd6f828c5be35..2e59efb38d95231fcbcbb5a7859a6cfa
      ##### end V8 defaults #####
  
      # When building native modules using 'npm install' with the system npm,
-@@ -390,6 +392,9 @@
+@@ -398,6 +400,9 @@
        ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
          'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
        }],
diff --git a/patches/node/fix_allow_preventing_initializeinspector_in_env.patch b/patches/node/fix_allow_preventing_initializeinspector_in_env.patch
index e018f2af59442..8cfa46d3819e0 100644
--- a/patches/node/fix_allow_preventing_initializeinspector_in_env.patch
+++ b/patches/node/fix_allow_preventing_initializeinspector_in_env.patch
@@ -36,10 +36,10 @@ index 523d252e08974a10f9a53fb46d3345669cec3380..5bf19a0dda42849159d954181058897c
  #endif
  
 diff --git a/src/env-inl.h b/src/env-inl.h
-index 1e85bc07a4cc29f3b380da3c0e217a85309eb3a5..845e00208af4b12960ed8b3f3926323af7685185 100644
+index e679780900abc9f6b6d1d6baa52576df278be8c7..2da8174fe9e4209f4705af0a1cf8bca5928f088c 100644
 --- a/src/env-inl.h
 +++ b/src/env-inl.h
-@@ -892,6 +892,10 @@ inline bool Environment::no_global_search_paths() const {
+@@ -882,6 +882,10 @@ inline bool Environment::no_global_search_paths() const {
           !options_->global_search_paths;
  }
  
@@ -51,10 +51,10 @@ index 1e85bc07a4cc29f3b380da3c0e217a85309eb3a5..845e00208af4b12960ed8b3f3926323a
    return emit_filehandle_warning_;
  }
 diff --git a/src/env.h b/src/env.h
-index 0c3715151488f425a723618252e1277b78fafe5f..e0deca497feb111622b257b952c9ed9161c7d001 100644
+index 7aa5822abf11f1858d1ef8551cfc7a8c3d931f1e..2554c530f2ca7078ed0cca03968b31f56027231b 100644
 --- a/src/env.h
 +++ b/src/env.h
-@@ -1204,6 +1204,7 @@ class Environment : public MemoryRetainer {
+@@ -1215,6 +1215,7 @@ class Environment : public MemoryRetainer {
    inline bool tracks_unmanaged_fds() const;
    inline bool hide_console_windows() const;
    inline bool no_global_search_paths() const;
@@ -63,10 +63,10 @@ index 0c3715151488f425a723618252e1277b78fafe5f..e0deca497feb111622b257b952c9ed91
    inline worker::Worker* worker_context() const;
    Environment* worker_parent_env() const;
 diff --git a/src/node.h b/src/node.h
-index 364f789fbcbec8e3234961294698d8e69b04a310..85b5ac6a5a5cb5e4388a92a1d07c9afe17140a8c 100644
+index 70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8..7ca7502e086190c87ae6a61dca2192253894e906 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -420,7 +420,11 @@ enum Flags : uint64_t {
+@@ -439,7 +439,11 @@ enum Flags : uint64_t {
    // $HOME/.node_modules and $NODE_PATH. This is used by standalone apps that
    // do not expect to have their behaviors changed because of globally
    // installed modules.
diff --git a/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch b/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
index eb24c26a805cb..5ebadbf25bec8 100644
--- a/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
+++ b/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
@@ -6,7 +6,7 @@ Subject: fix: crash caused by GetHostNameW on Windows 7
 Backported from https://github.com/libuv/libuv/pull/3285.
 
 diff --git a/deps/uv/src/win/util.c b/deps/uv/src/win/util.c
-index 88602c7ee8623f16f87398cf3ffd1f71555fc1a0..5ffde08e1aed041c4da679156ed10f7e54bfc386 100644
+index 33e874ac442f88b58d2b68c8ec9764f6f664552e..2d4cc0aaa02e61bf359e80eca27527efb49fd85e 100644
 --- a/deps/uv/src/win/util.c
 +++ b/deps/uv/src/win/util.c
 @@ -37,6 +37,7 @@
@@ -166,69 +166,3 @@ index 88602c7ee8623f16f87398cf3ffd1f71555fc1a0..5ffde08e1aed041c4da679156ed10f7e
  int uv_os_gethostname(char* buffer, size_t* size) {
    WCHAR buf[UV_MAXHOSTNAMESIZE];
    size_t len;
-@@ -1674,7 +1803,9 @@ int uv_os_gethostname(char* buffer, size_t* size) {
- 
-   uv__once_init(); /* Initialize winsock */
- 
--  if (GetHostNameW(buf, UV_MAXHOSTNAMESIZE) != 0)
-+  sGetHostNameW gethostnamew =
-+      pGetHostNameW == NULL ? uv__gethostnamew_nt60 : pGetHostNameW;
-+  if (gethostnamew(buf, UV_MAXHOSTNAMESIZE) != 0)
-     return uv_translate_sys_error(WSAGetLastError());
- 
-   convert_result = uv__convert_utf16_to_utf8(buf, -1, &utf8_str);
-diff --git a/deps/uv/src/win/winapi.c b/deps/uv/src/win/winapi.c
-index bb86ec8ceac8ba3fccd02b292aca7ddfab38e187..9d6effb10ddd1801f7411ee71a70575b7072ab7d 100644
---- a/deps/uv/src/win/winapi.c
-+++ b/deps/uv/src/win/winapi.c
-@@ -45,12 +45,15 @@ sPowerRegisterSuspendResumeNotification pPowerRegisterSuspendResumeNotification;
- /* User32.dll function pointer */
- sSetWinEventHook pSetWinEventHook;
- 
-+/* ws2_32.dll function pointer */
-+sGetHostNameW pGetHostNameW;
- 
- void uv_winapi_init(void) {
-   HMODULE ntdll_module;
-   HMODULE powrprof_module;
-   HMODULE user32_module;
-   HMODULE kernel32_module;
-+  HMODULE ws2_32_module;;
- 
-   ntdll_module = GetModuleHandleA("ntdll.dll");
-   if (ntdll_module == NULL) {
-@@ -134,4 +137,10 @@ void uv_winapi_init(void) {
-     pSetWinEventHook = (sSetWinEventHook)
-       GetProcAddress(user32_module, "SetWinEventHook");
-   }
-+
-+  ws2_32_module = LoadLibraryA("ws2_32.dll");
-+  if (ws2_32_module != NULL) {
-+    pGetHostNameW = (sGetHostNameW)
-+      GetProcAddress(ws2_32_module, "GetHostNameW");
-+  }
- }
-diff --git a/deps/uv/src/win/winapi.h b/deps/uv/src/win/winapi.h
-index 0b66b5634bca88cec65b1bf0c0193986f5ddd542..5951717ab9e21db274f956c44410cc03c1617eaf 100644
---- a/deps/uv/src/win/winapi.h
-+++ b/deps/uv/src/win/winapi.h
-@@ -4739,6 +4739,11 @@ typedef struct _TCP_INITIAL_RTO_PARAMETERS {
- # define  SIO_TCP_INITIAL_RTO _WSAIOW(IOC_VENDOR,17)
- #endif
- 
-+/* From winsock2.h */
-+typedef int (WSAAPI *sGetHostNameW)
-+            (PWSTR name,
-+             int   namelen);
-+
- /* Ntdll function pointers */
- extern sRtlGetVersion pRtlGetVersion;
- extern sRtlNtStatusToDosError pRtlNtStatusToDosError;
-@@ -4759,4 +4764,7 @@ extern sPowerRegisterSuspendResumeNotification pPowerRegisterSuspendResumeNotifi
- /* User32.dll function pointer */
- extern sSetWinEventHook pSetWinEventHook;
- 
-+/* ws2_32.dll function pointer */
-+extern sGetHostNameW pGetHostNameW;
-+
- #endif /* UV_WIN_WINAPI_H_ */
diff --git a/patches/node/fix_crypto_tests_to_run_with_bssl.patch b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
index 7774100703837..20e89d87ef6be 100644
--- a/patches/node/fix_crypto_tests_to_run_with_bssl.patch
+++ b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
@@ -590,7 +590,7 @@ index 9afcb38616dafd6da1ab7b5843d68f4f796ca9a6..00d3381056a5a40c549f06d74c130149
  }
 +*/
 diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js
-index 6893f0c0e6d49a8e171ec9f156f74656dab9fd06..4c8ccd10e0dcd64669cccca1e8c2e5279d683595 100644
+index b2c14b1efcd68bd20e9c946106f1ab5fb58627c5..eef0bfe638b641c68fdadd95226a74df044921cb 100644
 --- a/test/parallel/test-crypto-sign-verify.js
 +++ b/test/parallel/test-crypto-sign-verify.js
 @@ -29,6 +29,7 @@ const keySize = 2048;
@@ -673,20 +673,19 @@ index 008ab129f0e019c659eecf5a76b7eb412c947fe3..6688f5d916f50e1e4fcfff1619c8634a
  
  cipher.end('Papaya!');  // Should not cause an unhandled exception.
 diff --git a/test/parallel/test-crypto-x509.js b/test/parallel/test-crypto-x509.js
-index c85a79b4854369e35fbe89833e9df9a12065671e..8f13ac60362854d12264f26b74533bd55efd6605 100644
+index d1782359277dc52d7a60830a6dd958544d610e6b..4c781f062bc505b860b821773070551f4cd80067 100644
 --- a/test/parallel/test-crypto-x509.js
 +++ b/test/parallel/test-crypto-x509.js
-@@ -104,7 +104,8 @@ const der = Buffer.from(
-     '84:AC:5B:08:9A:20:89:B6:8F:D6'
+@@ -110,7 +110,7 @@ const der = Buffer.from(
+     'A3:06:C5:CE:43:C1:7F:2D:7E:5F:44:A5:EE:A3:CB:97:05:A3:E3:68'
    );
    assert.strictEqual(x509.keyUsage, undefined);
 -  assert.strictEqual(x509.serialNumber, 'ECC9B856270DA9A8');
-+
 +  assert.match(x509.serialNumber, /ECC9B856270DA9A8/i);
  
    assert.deepStrictEqual(x509.raw, der);
  
-@@ -190,6 +191,12 @@ const der = Buffer.from(
+@@ -196,6 +196,12 @@ const der = Buffer.from(
    });
    mc.port2.postMessage(x509);
  
@@ -699,7 +698,7 @@ index c85a79b4854369e35fbe89833e9df9a12065671e..8f13ac60362854d12264f26b74533bd5
    // Verify that legacy encoding works
    const legacyObjectCheck = {
      subject: 'C=US\n' +
-@@ -213,11 +220,7 @@ const der = Buffer.from(
+@@ -219,11 +225,7 @@ const der = Buffer.from(
          'CA Issuers - URI:http://ca.nodejs.org/ca.cert' :
          'OCSP - URI:http://ocsp.nodejs.org/\n' +
          'CA Issuers - URI:http://ca.nodejs.org/ca.cert\n',
@@ -712,16 +711,16 @@ index c85a79b4854369e35fbe89833e9df9a12065671e..8f13ac60362854d12264f26b74533bd5
      bits: 1024,
      exponent: '0x10001',
      valid_from: 'Nov 16 18:42:21 2018 GMT',
-@@ -226,7 +229,7 @@ const der = Buffer.from(
-     fingerprint256:
-       'B0:BE:46:49:B8:29:63:E0:6F:63:C8:8A:57:9C:3F:9B:72:' +
-       'C6:F5:89:E3:0D:84:AC:5B:08:9A:20:89:B6:8F:D6',
+@@ -237,7 +239,7 @@ const der = Buffer.from(
+       'D0:39:97:54:B6:D0:B4:46:5B:DE:13:5B:68:86:B6:F2:A8:' +
+       '95:22:D5:6E:8B:35:DA:89:29:CA:A3:06:C5:CE:43:C1:7F:' +
+       '2D:7E:5F:44:A5:EE:A3:CB:97:05:A3:E3:68',
 -    serialNumber: 'ECC9B856270DA9A8'
 +    serialNumberPattern: /ECC9B856270DA9A8/i
    };
  
    const legacyObject = x509.toLegacyObject();
-@@ -235,7 +238,7 @@ const der = Buffer.from(
+@@ -246,7 +248,7 @@ const der = Buffer.from(
    assert.strictEqual(legacyObject.subject, legacyObjectCheck.subject);
    assert.strictEqual(legacyObject.issuer, legacyObjectCheck.issuer);
    assert.strictEqual(legacyObject.infoAccess, legacyObjectCheck.infoAccess);
@@ -730,7 +729,7 @@ index c85a79b4854369e35fbe89833e9df9a12065671e..8f13ac60362854d12264f26b74533bd5
    assert.strictEqual(legacyObject.bits, legacyObjectCheck.bits);
    assert.strictEqual(legacyObject.exponent, legacyObjectCheck.exponent);
    assert.strictEqual(legacyObject.valid_from, legacyObjectCheck.valid_from);
-@@ -244,7 +247,5 @@ const der = Buffer.from(
+@@ -255,7 +257,5 @@ const der = Buffer.from(
    assert.strictEqual(
      legacyObject.fingerprint256,
      legacyObjectCheck.fingerprint256);
diff --git a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
index 8c641431ad5cc..97e7fb79cfe5a 100644
--- a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
+++ b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
@@ -22,7 +22,7 @@ index 0fb750c5abbe00740f2095ec397c823e26666199..523d252e08974a10f9a53fb46d334566
      int thread_pool_size,
      node::tracing::TracingController* tracing_controller) {
 diff --git a/src/node.h b/src/node.h
-index 45de72bd94cf669ac2badf89d23164cb7022a5b3..364f789fbcbec8e3234961294698d8e69b04a310 100644
+index 5b1404ff8e290a505a1143b582494e9a3319a183..70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -118,6 +118,7 @@ namespace node {
@@ -33,7 +33,7 @@ index 45de72bd94cf669ac2badf89d23164cb7022a5b3..364f789fbcbec8e3234961294698d8e6
  class TracingController;
  
  }
-@@ -499,6 +500,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
+@@ -518,6 +519,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(Environment* env);
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env);
  
diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
index a91c0a3cdd949..f7b4c08817e12 100644
--- a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
+++ b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -17,7 +17,7 @@ Upstreams:
 - https://github.com/nodejs/node/pull/39136
 
 diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
-index fe828bafa6422cc1f1717afddbd4b199055e9c43..74c56954e5e2d8efc3d8495860addc0138f39f3a 100644
+index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda45426038d199 100644
 --- a/src/crypto/crypto_common.cc
 +++ b/src/crypto/crypto_common.cc
 @@ -176,7 +176,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
@@ -66,7 +66,7 @@ index fe828bafa6422cc1f1717afddbd4b199055e9c43..74c56954e5e2d8efc3d8495860addc01
  }
  
  const char* X509ErrorCode(long err) {  // NOLINT(runtime/int)
-@@ -1117,14 +1124,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
+@@ -1126,14 +1133,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
      Environment* env,
      const SSLPointer& ssl) {
    EscapableHandleScope scope(env->isolate());
@@ -86,10 +86,10 @@ index fe828bafa6422cc1f1717afddbd4b199055e9c43..74c56954e5e2d8efc3d8495860addc01
      if (!Set(env->context(),
               obj,
 diff --git a/src/crypto/crypto_dh.cc b/src/crypto/crypto_dh.cc
-index 7e99759654e8b9272c48e0e6c0637f4327dc1615..612ed87ce396e285719a9efc8c346adb6d29b366 100644
+index b6ef5e5b1e004e663fbfd2578b82644cb53051e0..1d48ea6d022304b1e6a4f703fea790437edcc876 100644
 --- a/src/crypto/crypto_dh.cc
 +++ b/src/crypto/crypto_dh.cc
-@@ -144,13 +144,11 @@ void DiffieHellman::MemoryInfo(MemoryTracker* tracker) const {
+@@ -143,13 +143,11 @@ void DiffieHellman::MemoryInfo(MemoryTracker* tracker) const {
  bool DiffieHellman::Init(const char* p, int p_len, int g) {
    dh_.reset(DH_new());
    if (p_len <= 0) {
@@ -105,7 +105,7 @@ index 7e99759654e8b9272c48e0e6c0637f4327dc1615..612ed87ce396e285719a9efc8c346adb
      return false;
    }
    BIGNUM* bn_p =
-@@ -168,21 +166,18 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) {
+@@ -167,21 +165,18 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) {
  bool DiffieHellman::Init(const char* p, int p_len, const char* g, int g_len) {
    dh_.reset(DH_new());
    if (p_len <= 0) {
@@ -130,7 +130,7 @@ index 7e99759654e8b9272c48e0e6c0637f4327dc1615..612ed87ce396e285719a9efc8c346adb
      return false;
    }
    BIGNUM* bn_p =
-@@ -502,16 +497,20 @@ EVPKeyCtxPointer DhKeyGenTraits::Setup(DhKeyPairGenConfig* params) {
+@@ -501,16 +496,20 @@ EVPKeyCtxPointer DhKeyGenTraits::Setup(DhKeyPairGenConfig* params) {
      if (!BN_set_word(bn_g.get(), params->params.generator) ||
          !DH_set0_pqg(dh.get(), prime, nullptr, bn_g.get()))
        return EVPKeyCtxPointer();
@@ -152,7 +152,7 @@ index 7e99759654e8b9272c48e0e6c0637f4327dc1615..612ed87ce396e285719a9efc8c346adb
      if (!param_ctx ||
          EVP_PKEY_paramgen_init(param_ctx.get()) <= 0 ||
          EVP_PKEY_CTX_set_dh_paramgen_prime_len(
-@@ -523,8 +522,10 @@ EVPKeyCtxPointer DhKeyGenTraits::Setup(DhKeyPairGenConfig* params) {
+@@ -522,8 +521,10 @@ EVPKeyCtxPointer DhKeyGenTraits::Setup(DhKeyPairGenConfig* params) {
          EVP_PKEY_paramgen(param_ctx.get(), &raw_params) <= 0) {
        return EVPKeyCtxPointer();
      }
@@ -244,10 +244,10 @@ index ae4550e9fde8120c35409e495d5b763a95546509..188a7efe76df2a1aa2eb2746f4d74836
  
        if (target
 diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
-index fec0a493c985f1fb716dd6222e438b430947f2a1..1a7d26ad134b094d02023c99934b8ac7a4bb18d7 100644
+index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba1e76ce0a 100644
 --- a/src/crypto/crypto_util.cc
 +++ b/src/crypto/crypto_util.cc
-@@ -503,24 +503,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
+@@ -508,24 +508,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
      V(BIO)                                                                    \
      V(PKCS7)                                                                  \
      V(X509V3)                                                                 \
@@ -272,7 +272,7 @@ index fec0a493c985f1fb716dd6222e438b430947f2a1..1a7d26ad134b094d02023c99934b8ac7
      V(USER)                                                                   \
  
  #define V(name) case ERR_LIB_##name: lib = #name "_"; break;
-@@ -680,7 +670,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -684,7 +674,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
    CHECK(args[0]->IsUint32());
    Environment* env = Environment::GetCurrent(args);
    uint32_t len = args[0].As<Uint32>()->Value();
@@ -281,7 +281,7 @@ index fec0a493c985f1fb716dd6222e438b430947f2a1..1a7d26ad134b094d02023c99934b8ac7
    if (data == nullptr) {
      // There's no memory available for the allocation.
      // Return nothing.
-@@ -692,7 +682,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -696,7 +686,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
            data,
            len,
            [](void* data, size_t len, void* deleter_data) {
@@ -290,7 +290,7 @@ index fec0a493c985f1fb716dd6222e438b430947f2a1..1a7d26ad134b094d02023c99934b8ac7
            },
            data);
    Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store);
-@@ -700,10 +690,12 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -704,10 +694,12 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
  }
  
  void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
@@ -304,7 +304,7 @@ index fec0a493c985f1fb716dd6222e438b430947f2a1..1a7d26ad134b094d02023c99934b8ac7
  }  // namespace
  
 diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
-index 463a19f516d23fdb56eb83025f4a3f2b3f4a426b..86e66e29ee644f86cb8ac20f37061fc03dc3099b 100644
+index 5060fc3f2fbd67d8b33975f2512cbd7cf7fedf1a..4f86810f8366b490ca2293cd1a811e69a199f708 100644
 --- a/src/crypto/crypto_util.h
 +++ b/src/crypto/crypto_util.h
 @@ -16,7 +16,9 @@
diff --git a/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch b/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
index 1613f28863fd0..bb7df671a3957 100644
--- a/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
+++ b/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
@@ -6,10 +6,10 @@ Subject: fix: suppress clang -Wdeprecated-declarations in libuv
 Should be upstreamed.
 
 diff --git a/deps/uv/src/win/util.c b/deps/uv/src/win/util.c
-index 5ffde08e1aed041c4da679156ed10f7e54bfc386..69aff95f68519acc8fc399c4358702b146f802ca 100644
+index 2d4cc0aaa02e61bf359e80eca27527efb49fd85e..aaa16052e2a9c7d1dca82763c41c0890371f1471 100644
 --- a/deps/uv/src/win/util.c
 +++ b/deps/uv/src/win/util.c
-@@ -1949,10 +1949,17 @@ int uv_os_uname(uv_utsname_t* buffer) {
+@@ -1950,10 +1950,17 @@ int uv_os_uname(uv_utsname_t* buffer) {
      #ifdef _MSC_VER
      #pragma warning(suppress : 4996)
      #endif
diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch
index e0ef037d54b9e..ee776addc06a7 100644
--- a/patches/node/pass_all_globals_through_require.patch
+++ b/patches/node/pass_all_globals_through_require.patch
@@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
 (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
 
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index b8eff0440624a41d89a39c46303fa51d581bf4bf..67eb7717f13379312721fc4da2e760bc08d8ed3a 100644
+index cfe2982bf22c245d3249a743e341c9948d98c18b..2c188ae0b5cb86493a7fd701c343b36370369f20 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -127,6 +127,13 @@ const {
@@ -23,7 +23,7 @@ index b8eff0440624a41d89a39c46303fa51d581bf4bf..67eb7717f13379312721fc4da2e760bc
  const {
    isProxy
  } = require('internal/util/types');
-@@ -1096,10 +1103,12 @@ Module.prototype._compile = function(content, filename) {
+@@ -1098,10 +1105,12 @@ Module.prototype._compile = function(content, filename) {
    if (requireDepth === 0) statCache = new SafeMap();
    if (inspectorWrapper) {
      result = inspectorWrapper(compiledWrapper, thisValue, exports,
diff --git a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
index 1eccad9b31b62..ff492a0b6b9b0 100644
--- a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
+++ b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
@@ -7,10 +7,10 @@ We use this to allow node's 'fs' module to read from ASAR files as if they were
 a real filesystem.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 58f7396990dddb7dd4cf3d23fcdcc1d48f52623e..ef06d0563fa7452348754418867a56c9b8c6f4e1 100644
+index 1393cc20f45db69c9e133e25ac9428fcb6d81100..085dd7e09d31fb1800b3596cc068637e1956ba52 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
-@@ -62,6 +62,10 @@ setupBuffer();
+@@ -66,6 +66,10 @@ setupBuffer();
  process.domain = null;
  process._exiting = false;
  
@@ -22,7 +22,7 @@ index 58f7396990dddb7dd4cf3d23fcdcc1d48f52623e..ef06d0563fa7452348754418867a56c9
  const nativeModule = internalBinding('native_module');
  
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 67eb7717f13379312721fc4da2e760bc08d8ed3a..05a62bb3c3852536001912cb0b69fe5578ace125 100644
+index 2c188ae0b5cb86493a7fd701c343b36370369f20..caca939942cb721a3efde7005b0a987a19237a8b 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -86,7 +86,7 @@ const fs = require('fs');
diff --git a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
index 686eb257df509..67c1845b31c13 100644
--- a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
+++ b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
@@ -7,10 +7,10 @@ Subject: refactor: alter child_process.fork to use execute script with
 When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary.
 
 diff --git a/lib/child_process.js b/lib/child_process.js
-index 62c552d567eaad07ffe65ea5cb24be101b57ebdd..73c11500d7e4a540f26cc7ee3b692a2f4b158b19 100644
+index a7ef8ba1e4af1aaabf88ea424b0a101397f7eb16..9cd99a7440ee4d2273fe94a0d51b4bf4051f612d 100644
 --- a/lib/child_process.js
 +++ b/lib/child_process.js
-@@ -161,6 +161,15 @@ function fork(modulePath /* , args, options */) {
+@@ -160,6 +160,15 @@ function fork(modulePath, args = [], options) {
      throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
    }
  
diff --git a/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch b/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
index fe3a805081ff7..510461bd8a1be 100644
--- a/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
+++ b/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
@@ -25,7 +25,7 @@ index a771b1813731edf4f0dd60f3505799e389f1d876..b9461677e2d7d1df192e752496e62cca
    bench.start();
    for (let i = 0; i < n; i++)
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index 71a07a63a3636ab211746004ebab24a0058b08fc..e3ce67987ee3185a93750ebad72beab304c71e3a 100644
+index 65827ecd593ffb050484152fc6d31411fd3e4dcc..2e5d6b01d86e34549c1c7a3d3128350cad2b0c47 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
 @@ -9,7 +9,7 @@ const {
diff --git a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
index 455cc74afe3e6..08195a21f54d5 100644
--- a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
+++ b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
@@ -40,10 +40,10 @@ index 5bf19a0dda42849159d954181058897c45d280fd..03078ff3869fcd17101f1cdaf77f725d
  
  MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
 diff --git a/src/node.h b/src/node.h
-index 85b5ac6a5a5cb5e4388a92a1d07c9afe17140a8c..4201c0d0460b032721ef42a26d79c38a9ee20c24 100644
+index 7ca7502e086190c87ae6a61dca2192253894e906..b2b766f242e02593631be087fceaf63f71d74284 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -313,7 +313,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {
+@@ -332,7 +332,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {
  
    static std::unique_ptr<MultiIsolatePlatform> Create(
        int thread_pool_size,
@@ -53,7 +53,7 @@ index 85b5ac6a5a5cb5e4388a92a1d07c9afe17140a8c..4201c0d0460b032721ef42a26d79c38a
  };
  
  enum IsolateSettingsFlags {
-@@ -509,7 +510,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
+@@ -528,7 +529,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
  NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead",
      NODE_EXTERN MultiIsolatePlatform* CreatePlatform(
          int thread_pool_size,
diff --git a/patches/node/test_add_fixture_trim_option.patch b/patches/node/test_add_fixture_trim_option.patch
deleted file mode 100644
index 8a20a9354c089..0000000000000
--- a/patches/node/test_add_fixture_trim_option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 8 Nov 2021 15:52:17 +0100
-Subject: test: add fixture trim option
-
-Fixes a spec failure originating with a strict requirement in BoringSSL
-that base64 strings be evenly divisible by 4 in their implementation of
-`NETSCAPE_SPKI_b64_decode`.
-
-Fixes that issue by trimming the newlines out of the file.
-
-Upstreamed at https://github.com/nodejs/node/pull/40757.
-
-diff --git a/test/common/fixtures.js b/test/common/fixtures.js
-index e5e1d887df525e493989a4aa8df6952a0e5b6c47..2da8aeb6a694e4b45d76bc3908284783d83f6755 100644
---- a/test/common/fixtures.js
-+++ b/test/common/fixtures.js
-@@ -15,8 +15,13 @@ function readFixtureSync(args, enc) {
-   return fs.readFileSync(fixturesPath(args), enc);
- }
- 
--function readFixtureKey(name, enc) {
--  return fs.readFileSync(fixturesPath('keys', name), enc);
-+function readFixtureKey(name, enc, trim) {
-+  let result = fs.readFileSync(fixturesPath('keys', name), enc);
-+  if (trim) {
-+    result = Buffer.from(result.toString().trim(), 'utf8');
-+  }
-+
-+  return result;
- }
- 
- function readFixtureKeys(enc, ...names) {
-diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
-index 4a5f1f149fe6c739f7f1d2ee17df6e61a942d621..a21fbff81c840da29034cb07ae2bd711cfe78b0a 100644
---- a/test/parallel/test-crypto-certificate.js
-+++ b/test/parallel/test-crypto-certificate.js
-@@ -30,9 +30,9 @@ const { Certificate } = crypto;
- const fixtures = require('../common/fixtures');
- 
- // Test Certificates
--const spkacValid = fixtures.readKey('rsa_spkac.spkac');
-+const spkacValid = fixtures.readKey('rsa_spkac.spkac', null, true);
- const spkacChallenge = 'this-is-a-challenge';
--const spkacFail = fixtures.readKey('rsa_spkac_invalid.spkac');
-+const spkacFail = fixtures.readKey('rsa_spkac_invalid.spkac', null, true);
- const spkacPublicPem = fixtures.readKey('rsa_public.pem');
- 
- function copyArrayBuffer(buf) {
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index aad85fb2c9c68..1af890a2a0b3b 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -365,7 +365,6 @@ bool NodeBindings::IsInitialized() {
 void NodeBindings::Initialize() {
   TRACE_EVENT0("electron", "NodeBindings::Initialize");
   // Open node's error reporting system for browser process.
-  node::g_upstream_node_mode = false;
 
 #if BUILDFLAG(IS_LINUX)
   // Get real command line in renderer process forked by zygote.
@@ -381,14 +380,17 @@ void NodeBindings::Initialize() {
 
   auto env = base::Environment::Create();
   SetNodeOptions(env.get());
-  node::Environment::should_read_node_options_from_env_ =
-      fuses::IsNodeOptionsEnabled();
 
   std::vector<std::string> argv = {"electron"};
   std::vector<std::string> exec_argv;
   std::vector<std::string> errors;
+  uint64_t process_flags = node::ProcessFlags::kEnableStdioInheritance;
+  if (!fuses::IsNodeOptionsEnabled())
+    process_flags |= node::ProcessFlags::kDisableNodeOptionsEnv;
 
-  int exit_code = node::InitializeNodeWithArgs(&argv, &exec_argv, &errors);
+  int exit_code = node::InitializeNodeWithArgs(
+      &argv, &exec_argv, &errors,
+      static_cast<node::ProcessFlags::Flags>(process_flags));
 
   for (const std::string& error : errors)
     fprintf(stderr, "%s: %s\n", argv[0].c_str(), error.c_str());

From 9d698c76c56b0751f4951bc7f7c817c26e1d75b7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 24 Mar 2022 18:26:34 +0900
Subject: [PATCH 165/811] chore: update out-dated node patches (#33421)

---
 patches/node/.patches                         |   1 -
 ...nalhandler_to_environment_to_prevent.patch |  14 +-
 ...handle_kevent_note_exit_failure_3451.patch |   4 +-
 ...rocess_fix_hang_after_note_exit_3521.patch |   2 +-
 ...or_for_exit_with_kqueue_on_bsds_3441.patch |  18 +-
 ...rotect_fork_in_uv_spawn_from_signals.patch | 173 ------------------
 .../node/worker_thread_add_asar_support.patch |   6 +-
 7 files changed, 22 insertions(+), 196 deletions(-)
 delete mode 100644 patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 7b2b6aae5d061..c2b5fdf528bbf 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -33,7 +33,6 @@ be_compatible_with_cppgc.patch
 feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
 worker_thread_add_asar_support.patch
 process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
-unix_protect_fork_in_uv_spawn_from_signals.patch
 process_bsd_handle_kevent_note_exit_failure_3451.patch
 reland_macos_use_posix_spawn_instead_of_fork_3257.patch
 process_reset_the_signal_mask_if_the_fork_fails_3537.patch
diff --git a/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
index c08a9efde794b..3deaaeccdc157 100644
--- a/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
+++ b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
@@ -7,10 +7,10 @@ Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
 This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent.  Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
 
 diff --git a/src/env-inl.h b/src/env-inl.h
-index 845e00208af4b12960ed8b3f3926323af7685185..1ebc33324907654d16e9c0e19b2955efbac7cac7 100644
+index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1dfeacab3 100644
 --- a/src/env-inl.h
 +++ b/src/env-inl.h
-@@ -896,6 +896,10 @@ inline bool Environment::should_initialize_inspector() const {
+@@ -886,6 +886,10 @@ inline bool Environment::should_initialize_inspector() const {
    return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
  }
  
@@ -22,10 +22,10 @@ index 845e00208af4b12960ed8b3f3926323af7685185..1ebc33324907654d16e9c0e19b2955ef
    return emit_filehandle_warning_;
  }
 diff --git a/src/env.h b/src/env.h
-index ab8334bf0e3405fee4d21a4b541bd1164d92ca89..b2537ebd44bc5b37dd97752735f84e87de1f24bf 100644
+index 2554c530f2ca7078ed0cca03968b31f56027231b..1fbf965788f9c68d2999f38b40d39579f746d768 100644
 --- a/src/env.h
 +++ b/src/env.h
-@@ -1207,6 +1207,7 @@ class Environment : public MemoryRetainer {
+@@ -1216,6 +1216,7 @@ class Environment : public MemoryRetainer {
    inline bool hide_console_windows() const;
    inline bool no_global_search_paths() const;
    inline bool should_initialize_inspector() const;
@@ -34,7 +34,7 @@ index ab8334bf0e3405fee4d21a4b541bd1164d92ca89..b2537ebd44bc5b37dd97752735f84e87
    inline worker::Worker* worker_context() const;
    Environment* worker_parent_env() const;
 diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
-index c4a3322c6d972fc2052af75b79389c522924d9c5..39ff8df415be1908ba404fba34d9cedda04a88af 100644
+index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a4099ca1966c 100644
 --- a/src/inspector_agent.cc
 +++ b/src/inspector_agent.cc
 @@ -680,8 +680,10 @@ bool Agent::Start(const std::string& path,
@@ -51,10 +51,10 @@ index c4a3322c6d972fc2052af75b79389c522924d9c5..39ff8df415be1908ba404fba34d9cedd
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.h b/src/node.h
-index 4201c0d0460b032721ef42a26d79c38a9ee20c24..6873fc89406b046823db9e45234eb7f6b767099d 100644
+index b2b766f242e02593631be087fceaf63f71d74284..535df2d8dfb48ddc4d01e94565fdc527aed15ef7 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -425,7 +425,11 @@ enum Flags : uint64_t {
+@@ -444,7 +444,11 @@ enum Flags : uint64_t {
    // Controls whether or not the Environment should call InitializeInspector.
    // This control is needed by embedders who may not want to initialize the V8
    // inspector in situations where it already exists.
diff --git a/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch b/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
index c0ab59bbeab92..b8b4e9ef2541c 100644
--- a/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
+++ b/patches/node/process_bsd_handle_kevent_note_exit_failure_3451.patch
@@ -25,7 +25,7 @@ index 16be13b99f5db77741aa276e90a437ef4eb5ba32..2dcc8b32f5165dd75061a1b55cc1abd2
  
  /* flags of excluding ifaddr */
 diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
-index 35200f17495d80ed2d19ef9f6f76bbc92ee042f6..071fe0ce0938657d0fb840af62a432352e938a8a 100644
+index efbc561dee2574f06ebd9408d1e89e435c93cc5a..857eb1d54bfde99754ce2c6e92a287c288bd9f52 100644
 --- a/deps/uv/src/unix/kqueue.c
 +++ b/deps/uv/src/unix/kqueue.c
 @@ -285,7 +285,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -37,7 +37,7 @@ index 35200f17495d80ed2d19ef9f6f76bbc92ee042f6..071fe0ce0938657d0fb840af62a43235
          nevents++;
          continue;
        }
-@@ -383,6 +383,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
+@@ -382,6 +382,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
        nevents++;
      }
  
diff --git a/patches/node/process_fix_hang_after_note_exit_3521.patch b/patches/node/process_fix_hang_after_note_exit_3521.patch
index 68702cf332b81..768eda13452b3 100644
--- a/patches/node/process_fix_hang_after_note_exit_3521.patch
+++ b/patches/node/process_fix_hang_after_note_exit_3521.patch
@@ -10,7 +10,7 @@ track exactly which processes have exited. Should also be a slight speed
 improvement for excessively large numbers of live children.
 
 diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
-index 071fe0ce0938657d0fb840af62a432352e938a8a..4c4d990ff5fa6c8ab937be2e4f79ccdaf90670c2 100644
+index 857eb1d54bfde99754ce2c6e92a287c288bd9f52..036055149fcabcb9ff8f43522120c82b3474ab99 100644
 --- a/deps/uv/src/unix/kqueue.c
 +++ b/deps/uv/src/unix/kqueue.c
 @@ -117,6 +117,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
diff --git a/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch b/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
index 917b589dbd37b..38609025d0f79 100644
--- a/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
+++ b/patches/node/process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
@@ -23,7 +23,7 @@ index 12d4da93686e993830a7d09e74d08191fc808f4f..16be13b99f5db77741aa276e90a437ef
  /* random */
  int uv__random_devurandom(void* buf, size_t buflen);
 diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
-index bf183d5fdc0ba89913469a294322eef84bc4cee8..35200f17495d80ed2d19ef9f6f76bbc92ee042f6 100644
+index 75e9110709da8d30628449311cb916a26c775ecf..efbc561dee2574f06ebd9408d1e89e435c93cc5a 100644
 --- a/deps/uv/src/unix/kqueue.c
 +++ b/deps/uv/src/unix/kqueue.c
 @@ -284,6 +284,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
@@ -39,10 +39,10 @@ index bf183d5fdc0ba89913469a294322eef84bc4cee8..35200f17495d80ed2d19ef9f6f76bbc9
        /* Skip invalidated events, see uv__platform_invalidate_fd */
        if (fd == -1)
 diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
-index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a7b374a48 100644
+index 91bf3c507022b2eddc0d36f40d73a977bf731fbc..c1f6bd4b0076f0835caf83c45a6a896e7ae5def9 100644
 --- a/deps/uv/src/unix/process.c
 +++ b/deps/uv/src/unix/process.c
-@@ -48,10 +48,20 @@ extern char **environ;
+@@ -49,10 +49,20 @@ extern char **environ;
  # include "zos-base.h"
  #endif
  
@@ -64,7 +64,7 @@ index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a
    int exit_status;
    int term_signal;
    int status;
-@@ -60,10 +70,7 @@ static void uv__chld(uv_signal_t* handle, int signum) {
+@@ -61,10 +71,7 @@ static void uv__chld(uv_signal_t* handle, int signum) {
    QUEUE* q;
    QUEUE* h;
  
@@ -75,7 +75,7 @@ index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a
  
    h = &loop->process_handles;
    q = QUEUE_HEAD(h);
-@@ -419,7 +426,9 @@ int uv_spawn(uv_loop_t* loop,
+@@ -420,7 +427,9 @@ int uv_spawn(uv_loop_t* loop,
    if (err)
      goto error;
  
@@ -85,7 +85,7 @@ index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a
  
    /* Acquire write lock to prevent opening new fds in worker threads */
    uv_rwlock_wrlock(&loop->cloexec_lock);
-@@ -478,6 +487,13 @@ int uv_spawn(uv_loop_t* loop,
+@@ -495,6 +504,13 @@ int uv_spawn(uv_loop_t* loop,
  
    /* Only activate this handle if exec() happened successfully */
    if (exec_errorno == 0) {
@@ -100,10 +100,10 @@ index f4aebb0490e198cd9adcadfeb6b006de479cc993..cfcba341e0e380ecd595e4b59e39c08a
      uv__handle_start(process);
    }
 diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
-index 59b95da9ebe3464bd1f9ce1c534122b1f9e06636..58489c4be7b3a7b36d5b01a1f07d411ef3d99ae3 100644
+index 1f566861a0e2e9e29c925972155f49667bb7ce85..a43edf1a4a9b0932ec73b8edaca0f676ecf3ccfa 100644
 --- a/deps/uv/test/test-list.h
 +++ b/deps/uv/test/test-list.h
-@@ -318,6 +318,7 @@ TEST_DECLARE   (spawn_reads_child_path)
+@@ -320,6 +320,7 @@ TEST_DECLARE   (spawn_reads_child_path)
  TEST_DECLARE   (spawn_inherit_streams)
  TEST_DECLARE   (spawn_quoted_path)
  TEST_DECLARE   (spawn_tcp_server)
@@ -111,7 +111,7 @@ index 59b95da9ebe3464bd1f9ce1c534122b1f9e06636..58489c4be7b3a7b36d5b01a1f07d411e
  TEST_DECLARE   (fs_poll)
  TEST_DECLARE   (fs_poll_getpath)
  TEST_DECLARE   (fs_poll_close_request)
-@@ -944,6 +945,7 @@ TASK_LIST_START
+@@ -950,6 +951,7 @@ TASK_LIST_START
    TEST_ENTRY  (spawn_inherit_streams)
    TEST_ENTRY  (spawn_quoted_path)
    TEST_ENTRY  (spawn_tcp_server)
diff --git a/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch b/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
deleted file mode 100644
index e8f06d17973e6..0000000000000
--- a/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jameson Nash <vtjnash@gmail.com>
-Date: Thu, 29 Jul 2021 12:09:51 -0400
-Subject: unix: protect fork in uv_spawn from signals
-
-Years ago, we found that various kernels (linux, macOS) were known to
-fail if they try to deliver a signal during this syscall, so we prevent
-that from happening. They may have fixed those issues, but it is
-generally just a bad time for signals to arrive (glibc blocks them here,
-for example, including some more internal ones that it won't let us
-touch here).
-
-We try to be a bit conservative, and leave many signals unblocked which
-could happen during normal execution and should terminate the process if
-they do. There is a small race window after the child starts before we
-clear the old handlers, if the user was to send an fake signal from
-elsewhere, but that should be quite unlikely.
-
-PR-URL: https://github.com/libuv/libuv/pull/3251
-Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
-
-diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
-index cfcba341e0e380ecd595e4b59e39c08a7b374a48..c1f6bd4b0076f0835caf83c45a6a896e7ae5def9 100644
---- a/deps/uv/src/unix/process.c
-+++ b/deps/uv/src/unix/process.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -223,13 +224,32 @@ static void uv__process_child_init(const uv_process_options_t* options,
-                                    int stdio_count,
-                                    int (*pipes)[2],
-                                    int error_fd) {
--  sigset_t set;
-+  sigset_t signewset;
-   int close_fd;
-   int use_fd;
--  int err;
-   int fd;
-   int n;
- 
-+  /* Reset signal disposition first. Use a hard-coded limit because NSIG is not
-+   * fixed on Linux: it's either 32, 34 or 64, depending on whether RT signals
-+   * are enabled. We are not allowed to touch RT signal handlers, glibc uses
-+   * them internally.
-+   */
-+  for (n = 1; n < 32; n += 1) {
-+    if (n == SIGKILL || n == SIGSTOP)
-+      continue;  /* Can't be changed. */
-+
-+#if defined(__HAIKU__)
-+    if (n == SIGKILLTHR)
-+      continue;  /* Can't be changed. */
-+#endif
-+
-+    if (SIG_ERR != signal(n, SIG_DFL))
-+      continue;
-+
-+    uv__write_errno(error_fd);
-+  }
-+
-   if (options->flags & UV_PROCESS_DETACHED)
-     setsid();
- 
-@@ -311,32 +331,10 @@ static void uv__process_child_init(const uv_process_options_t* options,
-     environ = options->env;
-   }
- 
--  /* Reset signal disposition.  Use a hard-coded limit because NSIG
--   * is not fixed on Linux: it's either 32, 34 or 64, depending on
--   * whether RT signals are enabled.  We are not allowed to touch
--   * RT signal handlers, glibc uses them internally.
--   */
--  for (n = 1; n < 32; n += 1) {
--    if (n == SIGKILL || n == SIGSTOP)
--      continue;  /* Can't be changed. */
--
--#if defined(__HAIKU__)
--    if (n == SIGKILLTHR)
--      continue;  /* Can't be changed. */
--#endif
--
--    if (SIG_ERR != signal(n, SIG_DFL))
--      continue;
--
--    uv__write_errno(error_fd);
--  }
--
--  /* Reset signal mask. */
--  sigemptyset(&set);
--  err = pthread_sigmask(SIG_SETMASK, &set, NULL);
--
--  if (err != 0)
--    uv__write_errno(error_fd);
-+  /* Reset signal mask just before exec. */
-+  sigemptyset(&signewset);
-+  if (sigprocmask(SIG_SETMASK, &signewset, NULL) != 0)
-+    abort();
- 
- #ifdef __MVS__
-   execvpe(options->file, options->args, environ);
-@@ -345,6 +343,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
- #endif
- 
-   uv__write_errno(error_fd);
-+  abort();
- }
- #endif
- 
-@@ -356,6 +355,8 @@ int uv_spawn(uv_loop_t* loop,
-   /* fork is marked __WATCHOS_PROHIBITED __TVOS_PROHIBITED. */
-   return UV_ENOSYS;
- #else
-+  sigset_t signewset;
-+  sigset_t sigoldset;
-   int signal_pipe[2] = { -1, -1 };
-   int pipes_storage[8][2];
-   int (*pipes)[2];
-@@ -432,25 +433,41 @@ int uv_spawn(uv_loop_t* loop,
- 
-   /* Acquire write lock to prevent opening new fds in worker threads */
-   uv_rwlock_wrlock(&loop->cloexec_lock);
--  pid = fork();
- 
--  if (pid == -1) {
-+  /* Start the child with most signals blocked, to avoid any issues before we
-+   * can reset them, but allow program failures to exit (and not hang). */
-+  sigfillset(&signewset);
-+  sigdelset(&signewset, SIGKILL);
-+  sigdelset(&signewset, SIGSTOP);
-+  sigdelset(&signewset, SIGTRAP);
-+  sigdelset(&signewset, SIGSEGV);
-+  sigdelset(&signewset, SIGBUS);
-+  sigdelset(&signewset, SIGILL);
-+  sigdelset(&signewset, SIGSYS);
-+  sigdelset(&signewset, SIGABRT);
-+  if (pthread_sigmask(SIG_BLOCK, &signewset, &sigoldset) != 0)
-+    abort();
-+
-+  pid = fork();
-+  if (pid == -1)
-     err = UV__ERR(errno);
--    uv_rwlock_wrunlock(&loop->cloexec_lock);
--    uv__close(signal_pipe[0]);
--    uv__close(signal_pipe[1]);
--    goto error;
--  }
- 
--  if (pid == 0) {
-+  if (pid == 0)
-     uv__process_child_init(options, stdio_count, pipes, signal_pipe[1]);
-+
-+  if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
-     abort();
--  }
- 
-   /* Release lock in parent process */
-   uv_rwlock_wrunlock(&loop->cloexec_lock);
-+
-   uv__close(signal_pipe[1]);
- 
-+  if (pid == -1) {
-+    uv__close(signal_pipe[0]);
-+    goto error;
-+  }
-+
-   process->status = 0;
-   exec_errorno = 0;
-   do
diff --git a/patches/node/worker_thread_add_asar_support.patch b/patches/node/worker_thread_add_asar_support.patch
index 7300f87fd4fc3..070774bf05748 100644
--- a/patches/node/worker_thread_add_asar_support.patch
+++ b/patches/node/worker_thread_add_asar_support.patch
@@ -7,10 +7,10 @@ This patch initializes asar support in workers threads in
 Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 419ffd9d5deb84eb94381259d3084411f6c3341b..17a1860d158976f11035553601560d171c7fc25a 100644
+index 2af6b11c97ecdca3c40792ab35c69b07b9db76a0..e79ce2b79a5f88a315ac013b6e12534ba1531d6b 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -505,6 +505,7 @@ module.exports = {
+@@ -498,6 +498,7 @@ module.exports = {
    loadPreloadModules,
    setupTraceCategoryState,
    setupInspectorHooks,
@@ -19,7 +19,7 @@ index 419ffd9d5deb84eb94381259d3084411f6c3341b..17a1860d158976f11035553601560d17
    initializeCJSLoader,
    initializeWASI
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index e3ce67987ee3185a93750ebad72beab304c71e3a..ef5082d73b6153b49875c61d9b365b873b16145d 100644
+index 2e5d6b01d86e34549c1c7a3d3128350cad2b0c47..74ab84ca39a01269925ca0e326e4aa8894fce8a1 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
 @@ -27,6 +27,7 @@ const {

From d5ad18db03039f946726de14c6a615af85590e5e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Mar 2022 06:00:50 -0700
Subject: [PATCH 166/811] Bump v19.0.0-nightly.20220324

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index def1880de7559..2090a0b04f329 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220323
\ No newline at end of file
+19.0.0-nightly.20220324
\ No newline at end of file
diff --git a/package.json b/package.json
index f4eab271f4e6c..197c6c519779b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220323",
+  "version": "19.0.0-nightly.20220324",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 38eebf5219792..eea937658b6b5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220323
- PRODUCTVERSION 19,0,0,20220323
+ FILEVERSION 19,0,0,20220324
+ PRODUCTVERSION 19,0,0,20220324
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 962f4a6558af1bc132c0df324581636d22c695cf Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Thu, 24 Mar 2022 06:09:12 -0700
Subject: [PATCH 167/811] docs: remove pywin32 from Windows build instructions
 (#33402)

---
 docs/development/build-instructions-windows.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/development/build-instructions-windows.md b/docs/development/build-instructions-windows.md
index b827a713784b2..171679ddab5ba 100644
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -15,8 +15,6 @@ Follow the guidelines below for building **Electron itself** on Windows, for the
   set a few environment variables to point the toolchains to your installation path.
     * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
     * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
-  * [Python for Windows (pywin32) Extensions](https://pypi.org/project/pywin32/#files)
-  is also needed in order to run the build process.
 * [Node.js](https://nodejs.org/download/)
 * [Git](https://git-scm.com)
 * Debugging Tools for Windows of Windows SDK 10.0.15063.468 if you plan on

From 4fdf8584ed6820a1b464cabc80c41acedbbce814 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Thu, 24 Mar 2022 10:12:47 -0700
Subject: [PATCH 168/811] docs: fix SCA and postMessage links in
 web-frame-main.md (#33415)

---
 docs/api/web-frame-main.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/api/web-frame-main.md b/docs/api/web-frame-main.md
index a3fd055d80134..0190f4dbc0ac5 100644
--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -195,3 +195,6 @@ have the same `routingId`.
 A `string` representing the [visibility state](https://developer.mozilla.org/en-US/docs/Web/API/Document/visibilityState) of the frame.
 
 See also how the [Page Visibility API](browser-window.md#page-visibility) is affected by other Electron APIs.
+
+[SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
+[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage

From f69b59effc6d56f74445adbd2de7bc472892bdac Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:02:45 -0600
Subject: [PATCH 169/811] feat: add WCO title bar style setters (#33066)

* feat: add wco title bar style setters

* return after throwing
---
 docs/api/browser-window.md                    | 10 +++
 .../api/electron_api_browser_window.cc        | 71 +++++++++++++++++++
 .../browser/api/electron_api_browser_window.h |  4 ++
 shell/browser/native_window.h                 |  4 ++
 shell/browser/native_window_views.h           |  6 ++
 shell/browser/ui/views/win_caption_button.cc  |  2 +
 shell/browser/ui/views/win_frame_view.cc      |  8 +++
 shell/browser/ui/views/win_frame_view.h       |  3 +
 8 files changed, 108 insertions(+)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 9f5e2349004b5..0903009ef503a 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -1842,6 +1842,16 @@ with `addBrowserView` or `setBrowserView`.
 **Note:** The BrowserView API is currently experimental and may change or be
 removed in future Electron releases.
 
+#### `win.setTitleBarOverlay(options)` _Windows_
+
+* `options` Object
+  * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled.
+  * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled.
+  * `height` Integer (optional) _Windows_ - The height of the title bar and Window Controls Overlay in pixels.
+
+On a Window with Window Controls Overlay already enabled, this method updates
+the style of the title bar overlay.
+
 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
 [page-visibility-api]: https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
 [quick-look]: https://en.wikipedia.org/wiki/Quick_Look
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index b0629e27c74d7..e71b15fc0d575 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -10,6 +10,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"  // nogncheck
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/common/color_parser.h"
 #include "shell/browser/api/electron_api_web_contents_view.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_browser_view.h"
@@ -24,6 +25,14 @@
 #include "shell/common/options_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
+#if defined(TOOLKIT_VIEWS)
+#include "shell/browser/native_window_views.h"
+#endif
+
+#if BUILDFLAG(IS_WIN)
+#include "shell/browser/ui/views/win_frame_view.h"
+#endif
+
 namespace electron {
 
 namespace api {
@@ -466,6 +475,65 @@ v8::Local<v8::Value> BrowserWindow::GetWebContents(v8::Isolate* isolate) {
   return v8::Local<v8::Value>::New(isolate, web_contents_);
 }
 
+#if BUILDFLAG(IS_WIN)
+void BrowserWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options,
+                                       gin_helper::Arguments* args) {
+  // Ensure WCO is already enabled on this window
+  if (!window_->titlebar_overlay_enabled()) {
+    args->ThrowError("Titlebar overlay is not enabled");
+    return;
+  }
+
+  auto* window = static_cast<NativeWindowViews*>(window_.get());
+  bool updated = false;
+
+  // Check and update the button color
+  std::string btn_color;
+  if (options.Get(options::kOverlayButtonColor, &btn_color)) {
+    // Parse the string as a CSS color
+    SkColor color;
+    if (!content::ParseCssColorString(btn_color, &color)) {
+      args->ThrowError("Could not parse color as CSS color");
+      return;
+    }
+
+    // Update the view
+    window->set_overlay_button_color(color);
+    updated = true;
+  }
+
+  // Check and update the symbol color
+  std::string symbol_color;
+  if (options.Get(options::kOverlaySymbolColor, &symbol_color)) {
+    // Parse the string as a CSS color
+    SkColor color;
+    if (!content::ParseCssColorString(symbol_color, &color)) {
+      args->ThrowError("Could not parse symbol color as CSS color");
+      return;
+    }
+
+    // Update the view
+    window->set_overlay_symbol_color(color);
+    updated = true;
+  }
+
+  // Check and update the height
+  int height = 0;
+  if (options.Get(options::kOverlayHeight, &height)) {
+    window->set_titlebar_overlay_height(height);
+    updated = true;
+  }
+
+  // If anything was updated, invalidate the layout and schedule a paint of the
+  // window's frame view
+  if (updated) {
+    auto* frame_view = static_cast<WinFrameView*>(
+        window->widget()->non_client_view()->frame_view());
+    frame_view->InvalidateCaptionButtons();
+  }
+}
+#endif
+
 void BrowserWindow::ScheduleUnresponsiveEvent(int ms) {
   if (!window_unresponsive_closure_.IsCancelled())
     return;
@@ -524,6 +592,9 @@ void BrowserWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("focusOnWebView", &BrowserWindow::FocusOnWebView)
       .SetMethod("blurWebView", &BrowserWindow::BlurWebView)
       .SetMethod("isWebViewFocused", &BrowserWindow::IsWebViewFocused)
+#if BUILDFLAG(IS_WIN)
+      .SetMethod("setTitleBarOverlay", &BrowserWindow::SetTitleBarOverlay)
+#endif
       .SetProperty("webContents", &BrowserWindow::GetWebContents);
 }
 
diff --git a/shell/browser/api/electron_api_browser_window.h b/shell/browser/api/electron_api_browser_window.h
index d1793fd3edde1..00bdf694e8ff3 100644
--- a/shell/browser/api/electron_api_browser_window.h
+++ b/shell/browser/api/electron_api_browser_window.h
@@ -99,6 +99,10 @@ class BrowserWindow : public BaseWindow,
   void BlurWebView();
   bool IsWebViewFocused();
   v8::Local<v8::Value> GetWebContents(v8::Isolate* isolate);
+#if BUILDFLAG(IS_WIN)
+  void SetTitleBarOverlay(const gin_helper::Dictionary& options,
+                          gin_helper::Arguments* args);
+#endif
 
  private:
 #if BUILDFLAG(IS_MAC)
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index e7a4d193375cb..762552656a5df 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -328,6 +328,10 @@ class NativeWindow : public base::SupportsUserData,
   };
   TitleBarStyle title_bar_style() const { return title_bar_style_; }
   int titlebar_overlay_height() const { return titlebar_overlay_height_; }
+  void set_titlebar_overlay_height(int height) {
+    titlebar_overlay_height_ = height;
+  }
+  bool titlebar_overlay_enabled() const { return titlebar_overlay_; }
 
   bool has_frame() const { return has_frame_; }
   void set_has_frame(bool has_frame) { has_frame_ = has_frame; }
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index 0d08ebf6dbd8d..56823eb4b6297 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -181,7 +181,13 @@ class NativeWindowViews : public NativeWindow,
            titlebar_overlay_;
   }
   SkColor overlay_button_color() const { return overlay_button_color_; }
+  void set_overlay_button_color(SkColor color) {
+    overlay_button_color_ = color;
+  }
   SkColor overlay_symbol_color() const { return overlay_symbol_color_; }
+  void set_overlay_symbol_color(SkColor color) {
+    overlay_symbol_color_ = color;
+  }
 #endif
 
  private:
diff --git a/shell/browser/ui/views/win_caption_button.cc b/shell/browser/ui/views/win_caption_button.cc
index d12f761f9deb4..a3a52244ff206 100644
--- a/shell/browser/ui/views/win_caption_button.cc
+++ b/shell/browser/ui/views/win_caption_button.cc
@@ -100,6 +100,8 @@ void WinCaptionButton::SetSize(gfx::Size size) {
     base_width_ = width;
   if (height > 0)
     height_ = height;
+
+  InvalidateLayout();
 }
 
 int WinCaptionButton::GetBetweenButtonSpacing() const {
diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index 7ca295ec5c12d..bf67ab5d82033 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -62,6 +62,14 @@ SkColor WinFrameView::GetReadableFeatureColor(SkColor background_color) {
                                                   : SK_ColorBLACK;
 }
 
+void WinFrameView::InvalidateCaptionButtons() {
+  // Ensure that the caption buttons container exists
+  DCHECK(caption_button_container_);
+
+  caption_button_container_->InvalidateLayout();
+  caption_button_container_->SchedulePaint();
+}
+
 gfx::Rect WinFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return views::GetWindowBoundsForClientBounds(
diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h
index c3f3a0f27914d..76b8e64bd184e 100644
--- a/shell/browser/ui/views/win_frame_view.h
+++ b/shell/browser/ui/views/win_frame_view.h
@@ -30,6 +30,9 @@ class WinFrameView : public FramelessView {
 
   SkColor GetReadableFeatureColor(SkColor background_color);
 
+  // Tells the NonClientView to invalidate the WinFrameView's caption buttons.
+  void InvalidateCaptionButtons();
+
   // views::NonClientFrameView:
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;

From 92c5dedc76275fb84814aa05ab71c85d84a05663 Mon Sep 17 00:00:00 2001
From: Hanlin <onion7878@gmail.com>
Date: Fri, 25 Mar 2022 08:08:33 +0800
Subject: [PATCH 170/811] Update china npmmirror (#33401)

Source: https://zhuanlan.zhihu.com/p/465424728
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a239e00ada6b4..fcf0ab6216411 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ const child = proc.spawn(electron)
 
 ### Mirrors
 
-* [China](https://npm.taobao.org/mirrors/electron)
+* [China](https://npmmirror.com/mirrors/electron/)
 
 See the [Advanced Installation Instructions](https://www.electronjs.org/docs/latest/tutorial/installation#mirror) to learn how to use a custom mirror.
 

From 7e59d784a0b5c922564cbc8c55f95f0e7daf6997 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Thu, 24 Mar 2022 21:39:03 -0400
Subject: [PATCH 171/811] chore: bump chromium to 102.0.4961.0 (main) (#33091)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: bump chromium in DEPS to 101.0.4911.0

* chore: bump chromium in DEPS to 101.0.4913.0

* chore: bump chromium in DEPS to 101.0.4915.0

* chore: bump chromium in DEPS to 101.0.4917.0

* chore: bump chromium in DEPS to 101.0.4919.0

* chore: bump chromium in DEPS to 101.0.4921.0

* chore: bump chromium in DEPS to 101.0.4923.0

* chore: bump chromium in DEPS to 101.0.4925.0

* chore: bump chromium in DEPS to 101.0.4927.0

* chore: bump chromium in DEPS to 101.0.4929.0

* chore: update patches

* chore: bump chromium in DEPS to 101.0.4931.0

* chore: update patches

* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388

Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792

* 3503874: Remove base::size(), base::empty(), and base::data().

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874

* chore: reconcile patches with main rebase

* chore: bump chromium in DEPS to 101.0.4933.0

* chore: update patches

* 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593

* 3503874: Remove base::size(), base::empty(), and base::data().

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874

* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451

* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818

* chore: bump chromium in DEPS to 101.0.4935.0

* chore: update patches

* 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N)

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286

* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations"

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590

* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388

Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail

* chore: missing SkRegion include

* 3499600: Introduce blink::WebCssOrigin

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600

* fixup!: 3503874: Remove base::size(), base::empty(), and base::data().

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874

* chore: bump chromium in DEPS to 101.0.4937.0

* chore: update patches

* 3500826: [locales] Refactor locales for ios

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826

* 3509531: Make some public Blink media files private

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531

* 3497377: bluetooth: Add BluetoothDevice.forget()

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377

* chore: bump chromium in DEPS to 101.0.4939.0

* chore: bump chromium in DEPS to 101.0.4941.0

* 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804

* 3502592: Delete PPAPI init/shutdown code in //pdf.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592

* chore: update patches

* fixup! 3502592: Delete PPAPI init/shutdown code in //pdf.

* chore: bump chromium in DEPS to 101.0.4943.0

* chore: fix lint, remove unneeded headers

* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>

* update mojo calls in offscreen patch

* update hunspell filenames

* chore: bump chromium in DEPS to 101.0.4945.0

* chore: update patches

* fix offscreen patch again

* chore: bump chromium in DEPS to 101.0.4947.0

* chore: update patches

* chore: bump chromium in DEPS to 101.0.4949.0

* support unseasoned pdf

* update patches

* chore: update patches

* chore: [IWYU] include missing skia headers

* chore: bump chromium in DEPS to 101.0.4951.0

* chore: update patches

* 3457645: media: Remove IsKeySystemsUpdateNeeded()

https://chromium-review.googlesource.com/c/chromium/src/+/3457645

* chore: bump chromium in DEPS to 102.0.4952.2

* chore: update patches

* 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage().

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672

* 3508375: Fix an issue dangerous dialog is not shown for some apk download

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375

* chore: bump chromium in DEPS to 102.0.4953.0

* chore: update patches

* 3510189: Harden up drag and drop support across same-process boundaries.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189

* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815

* chore: bump chromium in DEPS to 102.0.4955.0

* build: add af and ur locale to manifests

3498914 [locales] Add af and ur to desktop

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914

* fixup! build: add af and ur locale to manifests

* chore: bump chromium in DEPS to 102.0.4957.0

* 3529090: gin: set JS flags before v8 initialization

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090

chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch

* chore: update patches

* 3536433: [network] Rename data_path and http_cache_path from _path to _directory.

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433

* 3111565: Relocated Page.printToPDF implementation to //components

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565

refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback

TODO: currently passes a placeholder for job_settings. We have other
code paths that inject settings from electron_api_web_contents.cc.
Should those be injected here as well? (CC @codebytere)

* fixup! 3111565: Relocated Page.printToPDF implementation to //components

* fixup! 3111565: Relocated Page.printToPDF implementation to //components

* 3520025: Make "libcxx_abi_unstable" not a gn arg

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025

build: since it is no longer a gn arg, patch it in

* chore: change usages of std::vector with const elements (#33373)

* chore: bump chromium in DEPS to 102.0.4959.0

* chore: update patches

* build: iwyu base/threading/platform_thread.h

* 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774

refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager

* use gclient_gn_args_from instead of hand-copying

* checkout mac on mac

* chore: update patches

* Revert "checkout mac on mac"

This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769.

* fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.

* fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded()

add nogncheck

* fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc

* Xref: https://github.com/llvm/llvm-project/commit/6dfdf79b8c482c892a76406799d285baf5d71198

Xref: https://reviews.llvm.org/D101458

Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and
so it must be enumerated in filenames.libcxxabi.gni

* 3511268: Remove unused headers from cxx17_backports.h

https://chromium-review.googlesource.com/c/chromium/src/+/3511268

use std::size instead of base::size

* iwyu: SkPaint

3488428: [includes] Fix transitive includes of SkImageEncoder

* chore: [IWYU] include missing skia headers

* fixup! 3511268: Remove unused headers from cxx17_backports.h

* chore: bump chromium in DEPS to 102.0.4961.0

* chore: update patches

* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>

chore: remove unused #include

* fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
---
 .eslintrc.json                                |   1 +
 BUILD.gn                                      |  12 +-
 DEPS                                          |  17 +-
 build/args/all.gn                             |   3 -
 chromium_src/BUILD.gn                         |   8 +-
 electron_paks.gni                             |   2 +-
 filenames.hunspell.gni                        |  16 +-
 filenames.libcxxabi.gni                       |   1 +
 patches/chromium/.patches                     |   2 +-
 .../add_didinstallconditionalfeatures.patch   |  32 ++--
 ..._scheduler_throttling_per_renderview.patch |  30 +--
 ..._windows_to_have_different_web_prefs.patch |  20 +-
 patches/chromium/blink_local_frame.patch      |   8 +-
 .../build_add_electron_tracing_category.patch |   4 +-
 ...build_disable_partition_alloc_on_mac.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  16 +-
 patches/chromium/build_gn.patch               |   4 +-
 .../build_libc_as_static_library.patch        |   4 +-
 ...bcxx_abi_unstable_false_for_electron.patch |  23 +++
 patches/chromium/can_create_window.patch      |  34 ++--
 ...dows_in_cryptotoken_webrequestsender.patch |   6 +-
 ..._v8_initialization_isolate_callbacks.patch |   2 +-
 ...screationoverridden_with_full_params.patch |  34 ++--
 ...esources_not_chrome_for_spellchecker.patch |   4 +-
 patches/chromium/chrome_key_systems.patch     |   4 +-
 patches/chromium/command-ismediakey.patch     |  18 +-
 .../crash_allow_setting_more_options.patch    |  12 +-
 patches/chromium/crashpad_pid_check.patch     |   2 +-
 patches/chromium/dcheck.patch                 |   4 +-
 patches/chromium/desktop_media_list.patch     |  16 +-
 patches/chromium/disable-redraw-lock.patch    |   2 +-
 .../disable_color_correct_rendering.patch     |  62 +++---
 .../disable_compositor_recycling.patch        |   4 +-
 patches/chromium/disable_hidden.patch         |  16 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |   8 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   2 +-
 ...locator_for_usage_outside_of_the_gin.patch |   4 +-
 ...xpose_setuseragent_on_networkcontext.patch |  12 +-
 .../extend_apply_webpreferences.patch         |   6 +-
 ...ransfer_to_requestsingleinstancelock.patch |  48 ++---
 .../feat_add_onclose_to_messageport.patch     |   4 +-
 ...dd_set_theme_source_to_allow_apps_to.patch |  14 +-
 ..._registry_to_multibuffer_data_source.patch |  30 +--
 ...g_the_base_spellchecker_download_url.patch |   8 +-
 ...screen_rendering_with_viz_compositor.patch |  34 ++--
 ..._raw_response_headers_from_urlloader.patch |  12 +-
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |  24 +--
 ...ntcapturercount_in_web_contents_impl.patch |   6 +-
 ...media_key_usage_with_globalshortcuts.patch |   6 +-
 ...king_and_message_bubbling_on_windows.patch |   4 +-
 ...rmissions_checks_in_exclusive_access.patch |   8 +-
 ...out_profile_refs_in_accessibility_ui.patch |  17 +-
 ..._properly_honor_printing_page_ranges.patch |   8 +-
 ...fix_use_electron_generated_resources.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |   7 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...reate_a_console_if_logging_to_stderr.patch |   4 +-
 patches/chromium/mas-cfisobjc.patch           |   8 +-
 .../mas-cgdisplayusesforcetogray.patch        |   4 +-
 .../mas_disable_remote_accessibility.patch    |  36 ++--
 patches/chromium/mas_no_private_api.patch     |   6 +-
 ...emote_certificate_verification_logic.patch |  22 +--
 .../chromium/notification_provenance.patch    |  10 +-
 patches/chromium/pepper_plugin_support.patch  |  53 ++----
 patches/chromium/picture-in-picture.patch     |  83 +++++----
 ...utofill_colors_to_the_color_pipeline.patch |  40 ++--
 patches/chromium/printing.patch               | 176 +++++++++++++-----
 patches/chromium/process_singleton.patch      |  34 ++--
 ...r_changes_to_the_webcontentsobserver.patch |  12 +-
 ...e_incorrect_width_height_adjustments.patch |  39 ----
 .../render_widget_host_view_base.patch        |   4 +-
 .../render_widget_host_view_mac.patch         |   8 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   4 +-
 patches/chromium/web_contents.patch           |   8 +-
 patches/chromium/webview_cross_drag.patch     |  18 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  18 +-
 ...feat_add_hook_to_notify_script_ready.patch |  14 +-
 ...bals_to_allow_patching_devtools_dock.patch |   2 +-
 patches/v8/build_gn.patch                     |   8 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   6 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...ed_attirbute_for_older_msvc_versions.patch |   6 +-
 ...workaround_an_undefined_symbol_error.patch |   2 +-
 .../zip_manifests/dist_zip.linux.arm.manifest |   2 +
 .../dist_zip.linux.arm64.manifest             |   2 +
 .../zip_manifests/dist_zip.linux.x64.manifest |   2 +
 .../zip_manifests/dist_zip.linux.x86.manifest |   2 +
 .../zip_manifests/dist_zip.mac.arm64.manifest |   6 +
 .../zip_manifests/dist_zip.mac.x64.manifest   |   6 +
 .../dist_zip.mac_mas.arm64.manifest           |   6 +
 .../dist_zip.mac_mas.x64.manifest             |   6 +
 .../zip_manifests/dist_zip.win.arm64.manifest |   2 +
 .../zip_manifests/dist_zip.win.ia32.manifest  |   2 +
 .../zip_manifests/dist_zip.win.x64.manifest   |   2 +
 shell/app/electron_content_client.cc          |  16 +-
 shell/app/electron_main_delegate.cc           |   2 +-
 .../bluetooth/electron_bluetooth_delegate.cc  |   6 +
 .../bluetooth/electron_bluetooth_delegate.h   |   3 +
 shell/browser/browser_win.cc                  |   4 +-
 shell/browser/electron_browser_client.cc      |  46 ++++-
 shell/browser/electron_browser_client.h       |  10 +-
 .../electron_browser_main_parts_posix.cc      |   1 +
 .../electron_download_manager_delegate.cc     |  17 +-
 shell/browser/electron_permission_manager.cc  |  10 +
 shell/browser/electron_permission_manager.h   |   3 +
 .../electron_extension_message_filter.cc      |   2 +-
 .../extensions/electron_messaging_delegate.cc |  39 +++-
 .../extensions/electron_messaging_delegate.h  |   3 +-
 shell/browser/font_defaults.cc                |   2 +-
 shell/browser/javascript_environment.cc       |   6 +-
 shell/browser/native_window_views.h           |   1 +
 shell/browser/net/asar/asar_url_loader.cc     |   4 +-
 shell/browser/net/asar/asar_url_loader.h      |   2 +-
 shell/browser/net/network_context_service.cc  |   4 +-
 .../net/proxying_url_loader_factory.cc        |   7 +-
 .../browser/net/proxying_url_loader_factory.h |   5 +-
 .../electron_desktop_window_tree_host_linux.h |   1 +
 shell/browser/ui/file_dialog_win.cc           |   2 +-
 shell/browser/ui/gtk/app_indicator_icon.h     |   1 +
 shell/browser/ui/inspectable_web_contents.cc  |   2 +-
 shell/browser/ui/win/jump_list.cc             |   8 +-
 shell/common/api/electron_api_native_image.h  |   1 +
 .../api/electron_api_native_image_mac.mm      |   2 +-
 shell/common/gin_helper/callback.cc           |   2 +-
 shell/common/platform_util_win.cc             |   2 +-
 shell/common/skia_util.cc                     |   1 +
 shell/common/v8_value_serializer.h            |   1 +
 shell/renderer/api/electron_api_web_frame.cc  |  11 +-
 shell/renderer/renderer_client_base.cc        |  90 ++++++---
 shell/renderer/renderer_client_base.h         |  17 +-
 142 files changed, 998 insertions(+), 754 deletions(-)
 create mode 100644 patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
 delete mode 100644 patches/chromium/remove_incorrect_width_height_adjustments.patch

diff --git a/.eslintrc.json b/.eslintrc.json
index 55d0f1712134a..7669da1863675 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,4 +1,5 @@
 {
+  "root": true,
   "extends": "standard",
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],
diff --git a/BUILD.gn b/BUILD.gn
index 60af73d56c7bb..013b61c740ea3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -363,6 +363,10 @@ source_set("electron_lib") {
     "//components/network_session_configurator/common",
     "//components/omnibox/browser:buildflags",
     "//components/os_crypt",
+    "//components/pdf/browser",
+    "//components/pdf/browser:interceptors",
+    "//components/pdf/common",
+    "//components/pdf/renderer",
     "//components/pref_registry",
     "//components/prefs",
     "//components/security_state/content",
@@ -698,7 +702,7 @@ source_set("electron_lib") {
       "//chrome/browser/resources/pdf:resources",
       "//components/pdf/browser",
       "//components/pdf/renderer",
-      "//pdf:pdf_ppapi",
+      "//pdf",
     ]
     sources += [
       "shell/browser/electron_pdf_web_contents_helper_client.cc",
@@ -1006,14 +1010,14 @@ if (is_mac) {
   action("electron_app_lproj_dirs") {
     outputs = []
 
-    foreach(locale, locales_as_mac_outputs) {
+    foreach(locale, locales_as_apple_outputs) {
       outputs += [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
     }
     script = "build/mac/make_locale_dirs.py"
     args = rebase_path(outputs)
   }
 
-  foreach(locale, locales_as_mac_outputs) {
+  foreach(locale, locales_as_apple_outputs) {
     bundle_data("electron_app_strings_${locale}_bundle_data") {
       sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
       outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
@@ -1022,7 +1026,7 @@ if (is_mac) {
   }
   group("electron_app_strings_bundle_data") {
     public_deps = []
-    foreach(locale, locales_as_mac_outputs) {
+    foreach(locale, locales_as_apple_outputs) {
       public_deps += [ ":electron_app_strings_${locale}_bundle_data" ]
     }
   }
diff --git a/DEPS b/DEPS
index c8b39d0e1ec0e..4aa74e7395add 100644
--- a/DEPS
+++ b/DEPS
@@ -1,21 +1,8 @@
-gclient_gn_args_file = 'src/build/config/gclient_args.gni'
-gclient_gn_args = [
-  'build_with_chromium',
-  'checkout_android',
-  'checkout_android_native_support',
-  'checkout_libaom',
-  'checkout_nacl',
-  'checkout_pgo_profiles',
-  'checkout_oculus_sdk',
-  'checkout_openxr',
-  'checkout_google_benchmark',
-  'mac_xcode_version',
-  'generate_location_tags',
-]
+gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '100.0.4894.0',
+    '102.0.4961.0',
   'node_version':
     'v16.14.2',
   'nan_version':
diff --git a/build/args/all.gn b/build/args/all.gn
index a346a9b3d4939..91c53266a80d9 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -25,9 +25,6 @@ enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 
-# This breaks native node modules
-libcxx_abi_unstable = false
-
 # These are disabled because they cause the zip manifest to differ between
 # testing and release builds.
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 4c048a63aef2e..7db91d633a5d0 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -298,12 +298,14 @@ static_library("chrome") {
 
     if (enable_pdf_viewer) {
       sources += [
+        "//chrome/browser/pdf/chrome_pdf_stream_delegate.cc",
+        "//chrome/browser/pdf/chrome_pdf_stream_delegate.h",
         "//chrome/browser/pdf/pdf_extension_util.cc",
         "//chrome/browser/pdf/pdf_extension_util.h",
         "//chrome/browser/pdf/pdf_frame_util.cc",
         "//chrome/browser/pdf/pdf_frame_util.h",
-        "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
-        "//chrome/renderer/pepper/chrome_pdf_print_client.h",
+        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
+        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
       ]
     }
   }
@@ -346,8 +348,6 @@ source_set("plugins") {
   sources += [
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
-    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
   ]
diff --git a/electron_paks.gni b/electron_paks.gni
index 84cec359e201b..0140e358710f6 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -197,7 +197,7 @@ template("electron_paks") {
     output_dir = "${invoker.output_dir}/locales"
 
     if (is_mac) {
-      output_locales = locales_as_mac_outputs
+      output_locales = locales_as_apple_outputs
     } else {
       output_locales = platform_pak_locales
     }
diff --git a/filenames.hunspell.gni b/filenames.hunspell.gni
index 0c91ae1db77c2..64574354e4244 100644
--- a/filenames.hunspell.gni
+++ b/filenames.hunspell.gni
@@ -7,11 +7,16 @@ hunspell_dictionaries = [
   "//third_party/hunspell_dictionaries/da-DK-3-0.bdic",
   "//third_party/hunspell_dictionaries/de-DE-3-0.bdic",
   "//third_party/hunspell_dictionaries/el-GR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/en-AU-9-0.bdic",
-  "//third_party/hunspell_dictionaries/en-CA-9-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-9-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-oxendict-9-0.bdic",
-  "//third_party/hunspell_dictionaries/en-US-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-AU-10-0.bdic",
+  "//third_party/hunspell_dictionaries/en-AU-10-1.bdic",
+  "//third_party/hunspell_dictionaries/en-CA-10-0.bdic",
+  "//third_party/hunspell_dictionaries/en-CA-10-1.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-10-0.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-10-1.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-oxendict-10-0.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-oxendict-10-1.bdic",
+  "//third_party/hunspell_dictionaries/en-US-10-0.bdic",
+  "//third_party/hunspell_dictionaries/en-US-10-1.bdic",
   "//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
   "//third_party/hunspell_dictionaries/et-EE-3-0.bdic",
   "//third_party/hunspell_dictionaries/fa-IR-9-0.bdic",
@@ -46,6 +51,7 @@ hunspell_dictionaries = [
   "//third_party/hunspell_dictionaries/tg-TG-5-0.bdic",
   "//third_party/hunspell_dictionaries/tr-TR-4-0.bdic",
   "//third_party/hunspell_dictionaries/uk-UA-4-0.bdic",
+  "//third_party/hunspell_dictionaries/uk-UA-5-0.bdic",
   "//third_party/hunspell_dictionaries/vi-VN-3-0.bdic",
   "//third_party/hunspell_dictionaries/xx-XX-3-0.bdic",
 ]
diff --git a/filenames.libcxxabi.gni b/filenames.libcxxabi.gni
index 813f95070a2fa..69bb490ccd89a 100644
--- a/filenames.libcxxabi.gni
+++ b/filenames.libcxxabi.gni
@@ -1,4 +1,5 @@
 libcxxabi_headers = [
+  "//buildtools/third_party/libc++abi/trunk/include/CMakeLists.txt",
   "//buildtools/third_party/libc++abi/trunk/include/__cxxabi_config.h",
   "//buildtools/third_party/libc++abi/trunk/include/cxxabi.h",
 ]
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 7dcf136c34928..2b208694ba35a 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -113,4 +113,4 @@ fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
-remove_incorrect_width_height_adjustments.patch
+build_make_libcxx_abi_unstable_false_for_electron.patch
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index b76baf2e4e6ba..18a816de672d4 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index a92e09dc651a5f1a9bbae2572fad32233afcd46c..f99b652dda817b62615d2b3f00b4ae4b438ec44d 100644
+index 19c936be477f944d62e85cec81359a71bbcfa45d..b02bb1cd67488f996b6142058c52c34dfe523fff 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -129,6 +129,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index a92e09dc651a5f1a9bbae2572fad32233afcd46c..f99b652dda817b62615d2b3f00b4ae4b
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 4473c5e812a4a598f3e2f2bb06f78def5791af24..44c0ec9815aafd61182fd18a9d125e185d7196bc 100644
+index c9296960c76e34646bf7cb3195b80c0cbc483b58..bc8bdba3facba81c572d43b85881ec02ad7d2f00 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4455,6 +4455,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4423,6 +4423,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,11 +40,11 @@ index 4473c5e812a4a598f3e2f2bb06f78def5791af24..44c0ec9815aafd61182fd18a9d125e18
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 21b90bbb8fe8ddc03eb20538be423a5396d18eb3..f9c735038f733d990783dd66ffe8c74f824c78f2 100644
+index 7be2fd1e02917537805a271f16f5f248f1c4fc45..ce0fc928448b597fb6401b77730700407ce406da 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -597,6 +597,8 @@ class CONTENT_EXPORT RenderFrameImpl
-       blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
+@@ -595,6 +595,8 @@ class CONTENT_EXPORT RenderFrameImpl
+                           uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
 +  void DidInstallConditionalFeatures(v8::Local<v8::Context> context,
@@ -53,10 +53,10 @@ index 21b90bbb8fe8ddc03eb20538be423a5396d18eb3..f9c735038f733d990783dd66ffe8c74f
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 3d6e0c0395ff7c92d8908c5151b467beec3a7516..2fadd6d9b2e3747eacea08973d8d3c7aa9c15f26 100644
+index 5adee94f81c0e98db976ac1c6c55fb5eab8c2e65..9d3e43f4394ad9a4377b47a001c4baf4027cbe7c 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -599,6 +599,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -584,6 +584,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -79,10 +79,10 @@ index aa4b510137d60e6fb924f4f1a6554fe06c19ad75..816b6260020a6cbb6880b0eed197743c
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 0dda1f7cd77c47f7e61ba48dd20429c13679b543..2f73aacda1bafe07775213e232eda56c4b33325b 100644
+index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4871ae81f 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -308,6 +308,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,10 +92,10 @@ index 0dda1f7cd77c47f7e61ba48dd20429c13679b543..2f73aacda1bafe07775213e232eda56c
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 5297ad63f1c76240d57a64cc5ea64cbf8c7e1b95..006da6072db12da1632f9d45ecb5710136573641 100644
+index e06c96c068139e829af7bd99ebb111507b2bddb0..a98bc22fc5c96ad1fd2071ea1c9e1aab2fb4d5ff 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-@@ -274,6 +274,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
+@@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
      web_frame_->Client()->DidCreateScriptContext(context, world_id);
  }
  
@@ -110,10 +110,10 @@ index 5297ad63f1c76240d57a64cc5ea64cbf8c7e1b95..006da6072db12da1632f9d45ecb57101
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 708414fca139eb8328e425d909a48ca97038e442..48b2a0e129ec166ebd4c9bbd32330b0cc43dbeb2 100644
+index 6658e44e65f8236927f283e3f65f007ae97ac81f..f384dcc4efd6c56c3e3e212c7e597f13bc9dae57 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-@@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
+@@ -79,6 +79,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override;
@@ -123,7 +123,7 @@ index 708414fca139eb8328e425d909a48ca97038e442..48b2a0e129ec166ebd4c9bbd32330b0c
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 4b639069d5d9173f0c35fe7656356031ba424a61..3da6699b40bf4f91e6d76a37e5fa8f680f7a7850 100644
+index 8087d1f62e9b1a8ac33a9e92c10a7cb8b8363e08..845c3329674d99dd385316dbfd1287fa3566a60e 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
 @@ -357,6 +357,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 9a54c4fbe9988..04504a209f10a 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 56c08919ab626a8a7b3bcb892ee94cdee2a106fc..b85bdf4ed574a149a6502e8d21e54f2ee80777a5 100644
+index 84044606fb0644b2b6053c72a9750bae3729f666..995c5dfc49a392669f73d85a92fbdb54cf0e11ca 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -647,6 +647,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -649,6 +649,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,24 +22,24 @@ index 56c08919ab626a8a7b3bcb892ee94cdee2a106fc..b85bdf4ed574a149a6502e8d21e54f2e
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 9e32df9f5fd765895c8470c3922a62f754e7d409..9bac2321d65d9e54ce88fffafd72a74803ed2c87 100644
+index a099eed10dd061994bff696519099c3ef7437a46..a1f1e9b55272e70b4acd5d1f1515fba7d91538fa 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl
-   bool IsRenderViewLive() override;
-   void WriteIntoTrace(perfetto::TracedValue context) override;
+@@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+   bool IsRenderViewLive() const override;
+   void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
  
 +  void SetSchedulerThrottling(bool allowed) override;
    void SendWebPreferencesToRenderer();
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 787077d71c04d571aa825bec0a549c5fad2b8574..4b05b80802ba97a46eed60e509b503fc8375016b 100644
+index a6fe708878eb9afba9a68e0be71ba2c0b2a84d7d..5cc81ceb44d0a8baee3ebcc63aa4137b1e9ef08e 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
-@@ -74,6 +74,9 @@ class CONTENT_EXPORT RenderViewHost {
-   // Write a representation of this object into a trace.
-   virtual void WriteIntoTrace(perfetto::TracedValue context) = 0;
+@@ -80,6 +80,9 @@ class CONTENT_EXPORT RenderViewHost {
+   virtual void WriteIntoTrace(
+       perfetto::TracedProto<TraceProto> context) const = 0;
  
 +  // Disable/Enable scheduler throttling.
 +  virtual void SetSchedulerThrottling(bool allowed) = 0;
@@ -73,10 +73,10 @@ index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 14d4a00293ab0b11e733676844ce483992d6cd8e..c6c2dbb9dddd1eaa21e8c7b276d871a3898463fa 100644
+index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033db89745c 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -368,6 +368,7 @@ class WebView {
+@@ -369,6 +369,7 @@ class WebView {
    // Scheduling -----------------------------------------------------------
  
    virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index 14d4a00293ab0b11e733676844ce483992d6cd8e..c6c2dbb9dddd1eaa21e8c7b276d871a3
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 8cdffac8ecb9ed2c6892f1e975a953846e7e3a5c..7e7927c7258963bd95a2c064ef85e410f4d2571d 100644
+index daab024ee0e2010e177eabeb7e0fb964c631dd17..06d8ca44fb1dc3748d81b5c5a407dfdf7183f845 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3659,6 +3659,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3666,6 +3666,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 8cdffac8ecb9ed2c6892f1e975a953846e7e3a5c..7e7927c7258963bd95a2c064ef85e410
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3670,7 +3677,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3677,7 +3684,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 763b2ecf84401..eac065943d3a7 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 30e237f886b41bdf528b2a0e81054d15fb323f1f..43f7920cf6ff12d8a48ddef5440814a42266e8c5 100644
+index effc18673a7f832352f427c9f4fb8b276fc28ad6..96b67b56002f88e0f4e2af9997aa6a78a1accd96 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -145,6 +145,20 @@ WebPreferences::WebPreferences()
+@@ -144,6 +144,20 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -33,7 +33,7 @@ index 30e237f886b41bdf528b2a0e81054d15fb323f1f..43f7920cf6ff12d8a48ddef5440814a4
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index d278453a261fe2dd3bacce433e35d50879b555a7..140f8d6273d944bfe36831d27aef757d89240b56 100644
+index a62792e0d484dc133f1df34a2c67dde838db203c..ef77424fc6778b047ac98700a5e18a3b6b161aba 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -47,7 +47,7 @@ index d278453a261fe2dd3bacce433e35d50879b555a7..140f8d6273d944bfe36831d27aef757d
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -151,6 +155,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -150,6 +154,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index d278453a261fe2dd3bacce433e35d50879b555a7..140f8d6273d944bfe36831d27aef757d
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 8509f720c5afb816c6cbb2313dd566a24236a790..b9f0f79d96c58a7769939610bb72f8b2bcd3be94 100644
+index 27d0bcc02a57b1a8f8f8e25df7af383d0e9a8c00..1cb920f4d0b01df012bc9b60eb3d9caa555d4e9e 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,7 +79,7 @@ index 8509f720c5afb816c6cbb2313dd566a24236a790..b9f0f79d96c58a7769939610bb72f8b2
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -160,6 +161,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -159,6 +160,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
@@ -103,7 +103,7 @@ index 8509f720c5afb816c6cbb2313dd566a24236a790..b9f0f79d96c58a7769939610bb72f8b2
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index a6291be3e953ceaee1d996e4b30a6ae78916bc7a..c3baf95c5d9b6a6ace56bcde9e1dc8179f18eaa0 100644
+index 0f5ed102b071001acc566b258946b359d33f5d45..aac80b973e4622d2207b92fcd2537342a60c6909 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,7 +114,7 @@ index a6291be3e953ceaee1d996e4b30a6ae78916bc7a..c3baf95c5d9b6a6ace56bcde9e1dc817
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -441,6 +442,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -436,6 +437,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -176,7 +176,7 @@ index a6291be3e953ceaee1d996e4b30a6ae78916bc7a..c3baf95c5d9b6a6ace56bcde9e1dc817
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 96dd9fd56e44e66c5ea24d9df7c6cbff25409d6c..e0d113b4dee6a72f350b8494448f516be01d0468 100644
+index 4feef4089d59cef252ba73f49d4e490875f657ff..db92219655b824ca630edb6afe85d85e017a4a06 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,7 +187,7 @@ index 96dd9fd56e44e66c5ea24d9df7c6cbff25409d6c..e0d113b4dee6a72f350b8494448f516b
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -212,6 +213,22 @@ struct WebPreferences {
+@@ -211,6 +212,22 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 1ad52265500fd..6ed95034fa73c 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 2b0c8720866b45c2a83d639533cb4c3e5dbb70e0..97c251cdc310eb22859efb1ba3ca6312a3236fa5 100644
+index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d26f32d11 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index 2b0c8720866b45c2a83d639533cb4c3e5dbb70e0..97c251cdc310eb22859efb1ba3ca6312
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index db69148e0756ed36bcf3a04f1ace69cc166261a6..bcf072a6d8bc46e5c71d9ef3f248b6af69693ac9 100644
+index 1efaff0e92061bc97dcbf3105f6b6c1dcefff17c..ec2e19c3ccf60f01b73259e1e6eff405ebf15f07 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -538,10 +538,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index db69148e0756ed36bcf3a04f1ace69cc166261a6..bcf072a6d8bc46e5c71d9ef3f248b6af
    if (!Client())
      return false;
  
-@@ -587,6 +583,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -594,6 +590,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index 22145207fe628..f096f681035eb 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,10 +8,10 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 107516329273ee4a6cc49433b69f307b1264362b..0c9555a04233d07a186e34ada8b7615095854950 100644
+index 083a46a96bf969a075ef05cfe4837c4cce784191..22f18293e65035cc3b9af322520b102eb6b24a76 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
-@@ -78,6 +78,7 @@
+@@ -80,6 +80,7 @@
    X("drmcursor")                                                         \
    X("dwrite")                                                            \
    X("DXVA_Decoding")                                                     \
diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch
index 944a1f80f3927..5fd0656a2cdea 100644
--- a/patches/chromium/build_disable_partition_alloc_on_mac.patch
+++ b/patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -9,7 +9,7 @@ and can be removed when the crash in fork is resolved.
 Related issue: https://github.com/electron/electron/issues/32718
 
 diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
-index 56acfed89ec4ad4ee568a1b517923efa4b4e9c1f..a1da35a84f896d158ac88368ff6d95025a23ff95 100644
+index 97a57dfb1626ae9a781736dd8b0b55bf201162c1..5c97441faad781b459255cb1f7d0652ec86e40c8 100644
 --- a/base/allocator/allocator.gni
 +++ b/base/allocator/allocator.gni
 @@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index c692f905ec181..e3a17bcbab19f 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 7caaf66cad9d5b9f787cea0d49c32c26801571c2..f45691888b74643189b956928fdc796bfc5bcee3 100644
+index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0fea2b6f0e 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index 7caaf66cad9d5b9f787cea0d49c32c26801571c2..f45691888b74643189b956928fdc796b
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 6a40a73520a951d7c6fd06cbd07329a40ff41544..9ca837d995160d57c7efb51c54cf27283b11b20e 100644
+index fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f62b184e0 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4502,7 +4502,7 @@ static_library("browser") {
+@@ -4508,7 +4508,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 6a40a73520a951d7c6fd06cbd07329a40ff41544..9ca837d995160d57c7efb51c54cf2728
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 7be0809cfd3a08a87b29256241bc11a33abd3d17..e3c85fd9f550da204e36091bad256b1c2400ade8 100644
+index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a197ae638 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5719,7 +5719,6 @@ test("unit_tests") {
+@@ -5904,7 +5904,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 7be0809cfd3a08a87b29256241bc11a33abd3d17..e3c85fd9f550da204e36091bad256b1c
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5742,6 +5741,10 @@ test("unit_tests") {
+@@ -5927,6 +5926,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 7be0809cfd3a08a87b29256241bc11a33abd3d17..e3c85fd9f550da204e36091bad256b1c
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6428,7 +6431,6 @@ test("unit_tests") {
+@@ -6616,7 +6619,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 7be0809cfd3a08a87b29256241bc11a33abd3d17..e3c85fd9f550da204e36091bad256b1c
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6473,6 +6475,11 @@ test("unit_tests") {
+@@ -6662,6 +6664,11 @@ test("unit_tests") {
        "//ui/native_theme:test_support",
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
diff --git a/patches/chromium/build_gn.patch b/patches/chromium/build_gn.patch
index 8155d69721913..bd23b789dcd3b 100644
--- a/patches/chromium/build_gn.patch
+++ b/patches/chromium/build_gn.patch
@@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will
 rebuild the entire tree.
 
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index fcc7e12834733fa0927c35708de9665db4c59eba..faac97db5a2c86f1fcc89c3c045ef74b7b2b878a 100644
+index d960648941d8b959b25f87b364a594ec44760348..74a14a2373305e2e62b974b34a28ea9a62c6a911 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -123,6 +123,9 @@ if (current_os == "") {
@@ -27,7 +27,7 @@ index fcc7e12834733fa0927c35708de9665db4c59eba..faac97db5a2c86f1fcc89c3c045ef74b
    # Set to enable the official build level of optimization. This has nothing
    # to do with branding, but enables an additional level of optimization above
    # release (!is_debug). This might be better expressed as a tri-state
-@@ -346,6 +349,7 @@ default_compiler_configs = [
+@@ -349,6 +352,7 @@ default_compiler_configs = [
    "//build/config/compiler/pgo:default_pgo_flags",
    "//build/config/coverage:default_coverage",
    "//build/config/sanitizers:default_sanitizer_flags",
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index e778543bd5674..67ef2bf3d247c 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index 7915346430db72d18474d7a011b8dc7637c3f281..cd736d988f9c5e37dc24c724268fe115e00914d9 100644
+index dec348e235b1306cec50e0602fb910f21eaed925..0545e0ce5490df51088ca7a4cacd968e69fa0d09 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
@@ -32,7 +32,7 @@ index 7915346430db72d18474d7a011b8dc7637c3f281..cd736d988f9c5e37dc24c724268fe115
    ]
    if (is_linux && !is_chromeos) {
 diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn
-index 1b0bea340d6e8aec153add6f184e382172916f8b..f5a8193e6b72f4cc039b95783be7d254b93911d8 100644
+index 40f1285f14c0843405e0ee51879b8742285a006d..5be895d3e36df53a5960006a1513f1322400fd23 100644
 --- a/buildtools/third_party/libc++abi/BUILD.gn
 +++ b/buildtools/third_party/libc++abi/BUILD.gn
 @@ -4,7 +4,7 @@
diff --git a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
new file mode 100644
index 0000000000000..89e171dc5eb23
--- /dev/null
+++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Tue, 22 Mar 2022 16:24:44 -0500
+Subject: build: make libcxx_abi_unstable false for electron
+
+https://nornagon.medium.com/a-libc-odyssey-973e51649063
+
+diff --git a/build/config/c++/BUILD.gn b/build/config/c++/BUILD.gn
+index 046792ac275853bf109537589b911cfada44ed24..e43daeaa8f8c8e23eea99b3f8f5f48f92012bbc1 100644
+--- a/build/config/c++/BUILD.gn
++++ b/build/config/c++/BUILD.gn
+@@ -8,6 +8,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
+ 
+ libcxx_abi_unstable = true
+ 
++if (is_electron_build) {
++  # This breaks native node modules
++  libcxx_abi_unstable = false
++}
++
+ # TODO(xiaohuic): https://crbug/917533 Crashes on internal ChromeOS build.
+ # Do unconditionally once the underlying problem is fixed.
+ if (is_chromeos_ash && is_chrome_branded) {
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index bb9b959820869..278d3581d311a 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index eba372243a31d08c251ad3367d24999277a8289b..713e2883139bca4bb56dcc7e3efcf6d6dfc4a02b 100644
+index 20b9d7cd590361b176298e24b5aac6f546acb518..a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6703,6 +6703,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6866,6 +6866,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index eba372243a31d08c251ad3367d24999277a8289b..713e2883139bca4bb56dcc7e3efcf6d6
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3fe9e1e4918ef65194621661c9c7c650089229fa..c8e49eeaca8b31479aa908be9c349ccd625e9e51 100644
+index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e83f4bd52 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3925,6 +3925,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3931,6 +3931,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 3fe9e1e4918ef65194621661c9c7c650089229fa..c8e49eeaca8b31479aa908be9c349ccd
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3967,12 +3975,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3975,12 +3983,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,7 +53,7 @@ index 3fe9e1e4918ef65194621661c9c7c650089229fa..c8e49eeaca8b31479aa908be9c349ccd
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index ace032dc2ffac27fbdddee5a4b13c3c3e36ba5ae..80f7dd56fdaa94a9880995b2b5393af0414eef29 100644
+index afc0dc34e4a1f6c06e96d7fa09922e8aaf4bab28..f3d13fc719324e064f70077deb5d95cb9e467820 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -550,6 +550,10 @@ struct CreateNewWindowParams {
@@ -68,10 +68,10 @@ index ace032dc2ffac27fbdddee5a4b13c3c3e36ba5ae..80f7dd56fdaa94a9880995b2b5393af0
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 85ed8b5e84813c10f97c5785d906a87455f8f67e..a11d5ba888c1489870875c859ec9eb79c67f94b7 100644
+index d832c0c37554dafad0c44c78f6dc9233015b152f..654abc174a237a90225ad7be7f1180e929b9829b 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -571,6 +571,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -576,6 +576,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 85ed8b5e84813c10f97c5785d906a87455f8f67e..a11d5ba888c1489870875c859ec9eb79
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 47527cb2e434f771f5aeb5099432ae86a0ad06ea..2fe1462a2cd92a731a5816b5fc22b059bad92fe8 100644
+index e142bc65c2a0fe06a1cf59621c424170dc2d641c..8573ea54135e363f83bd786db3483d1c539e4bb1 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -168,6 +168,7 @@ class NetworkService;
+@@ -169,6 +169,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index 47527cb2e434f771f5aeb5099432ae86a0ad06ea..2fe1462a2cd92a731a5816b5fc22b059
  }  // namespace network
  
  namespace sandbox {
-@@ -950,6 +951,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -958,6 +959,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -124,7 +124,7 @@ index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index f889d0bf33cf218a68bf5a9422aecaed23fa260a..3330876f623e5b2cb600b1ce1fd10b3375568613 100644
+index 9c70cc90402dd1541b2b58b3be2fa7ff215f8f57..a998c64237a7ffd6583a33cd54fe3229196300a6 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,7 +150,7 @@ index f889d0bf33cf218a68bf5a9422aecaed23fa260a..3330876f623e5b2cb600b1ce1fd10b33
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 83517883144a77a0c775ce2d146b4e85ef79ea97..aa65517a568aa0b324b2c8cca8f60bb532ba085a 100644
+index 9bdeb8745b3dd6d329f0403ca8c4a6f5de1d59c6..11815bca2741002dd8595af026ef402bc2af999e 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -32,6 +32,7 @@
@@ -173,10 +173,10 @@ index 83517883144a77a0c775ce2d146b4e85ef79ea97..aa65517a568aa0b324b2c8cca8f60bb5
        /*is_opener_navigation=*/false, request.HasUserGesture(),
        // `openee_can_access_opener_origin` only matters for opener navigations,
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 54b62065d148ab860a49dc03daaf7680ff00d778..3008d3efe89585a562ae55734938b10ef8b0074e 100644
+index 4379497806bf7c85ade2f4e4554d6a60c4ec966c..fa860bbcf0c12df33dae69d25b01587676a1b79e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -438,6 +438,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 12658b5c9ca6bc10cffd2c9e8ddf45bac697e75c..284f3ed1513009092ecdf2be6ff87641cc404cd9 100644
+index c18012a217bfc492ac2cdef5776bb23099df57ae..b96bd45cfee98c8177b3ac5979273d1f9ba47388 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2051,6 +2051,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2069,6 +2069,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
diff --git a/patches/chromium/chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch b/patches/chromium/chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
index a1ba014a796d3..380b7d15612c7 100644
--- a/patches/chromium/chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
+++ b/patches/chromium/chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
@@ -10,10 +10,10 @@ In Electron that can be simplified to webContents.isFocused() which maps to "is
 This can't be upstreamed but the patch is minimal.
 
 diff --git a/chrome/browser/resources/cryptotoken/webrequestsender.js b/chrome/browser/resources/cryptotoken/webrequestsender.js
-index 67385e25a9233ce7a5077e69e9be1f457252ea5d..3e6864e6ea3374874598a0175746451126ddb165 100644
+index 8ea2d1c6d7269d25cd34a61d971d35c81b561670..8609defbb5de5c11614858586a9100974aed067c 100644
 --- a/chrome/browser/resources/cryptotoken/webrequestsender.js
 +++ b/chrome/browser/resources/cryptotoken/webrequestsender.js
-@@ -141,10 +141,11 @@ function tabInForeground(tabId) {
+@@ -142,10 +142,11 @@ function tabInForeground(tabId) {
        reject();
        return;
      }
@@ -29,7 +29,7 @@ index 67385e25a9233ce7a5077e69e9be1f457252ea5d..3e6864e6ea3374874598a01757464511
      chrome.tabs.get(tabId, function(tab) {
        if (chrome.runtime.lastError) {
          resolve(false);
-@@ -154,9 +155,13 @@ function tabInForeground(tabId) {
+@@ -155,9 +156,13 @@ function tabInForeground(tabId) {
          resolve(false);
          return;
        }
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index a0affa82eec7a..00838845586bb 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,7 +9,7 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 10f34d87d74d81de91cbd006665465cee6c0d21e..93f09cd74b225a8b0c2d2f5280636513e852e8ff 100644
+index 5040ec838c64ffa8aa58ba43f51df649443b2f81..7a7a87d00fa392b7bd07267d9059664d5d472252 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 19409a0d9762f..04ad43d0a65ff 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -49,7 +49,7 @@ index 27452df45433e4aeb7b9008f8e5b91dd4b5f50db..5c6f9936e6d3d2647d7efbc70efda855
    // uses this to spawn new windows/tabs, which is also not allowed for
    // offscreen tabs.
 diff --git a/chrome/browser/media/offscreen_tab.h b/chrome/browser/media/offscreen_tab.h
-index 88b68339823142f9b2b2d4730d6ebc1033ac86a3..e2d53e1b233adced355be667d006d5d2ba3d5110 100644
+index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03a2c4e558 100644
 --- a/chrome/browser/media/offscreen_tab.h
 +++ b/chrome/browser/media/offscreen_tab.h
 @@ -107,8 +107,7 @@ class OffscreenTab final : public ProfileObserver,
@@ -63,10 +63,10 @@ index 88b68339823142f9b2b2d4730d6ebc1033ac86a3..e2d53e1b233adced355be667d006d5d2
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 4df94c57d6be19d6e76430391386e84d2816d94a..f1c0c6e8bec7ef17292c2a5a3b33800f402c889b 100644
+index 593cbe8038789e3b071ec9f5c243be6f0be629f0..18e5ade28bb966b35a6f69b2543768ac482d4730 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
-@@ -77,10 +77,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
+@@ -79,10 +79,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -80,7 +80,7 @@ index 4df94c57d6be19d6e76430391386e84d2816d94a..f1c0c6e8bec7ef17292c2a5a3b33800f
                                  /*from_user_gesture=*/true);
      return true;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.h b/chrome/browser/ui/ash/ash_web_view_impl.h
-index fd2bccf8f718683b55646ef200aaacc2df6ac485..b62b61fbcf4b8f1eff26546c5da020f88e4599fa 100644
+index e1adc822d8086b6c1b103a107923247cbb0aa7f2..2d2d65fa78d8fdccbe44aa1bf9b297e7038781c5 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.h
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.h
 @@ -46,8 +46,7 @@ class AshWebViewImpl : public ash::AshWebView,
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 04e327d970b872f0a9c505a0b99c6273900930f9..5993b3cb0cbe76cd266dee074effd736efa8fc50 100644
+index ace0c593debb46c9238e5708634fc6088a1bc715..31d5c0f00ae43706f16fc8615761e96eab31f1f3 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1767,12 +1767,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1770,12 +1770,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,7 +127,7 @@ index 04e327d970b872f0a9c505a0b99c6273900930f9..5993b3cb0cbe76cd266dee074effd736
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index a63ba24be314eb4372d7dda7206dee4b52730d1e..f9bcaa001bfed987edd0ebb001f5cda0e0aca4aa 100644
+index 5edda102ff59ccb30d2150a88e75e8fb65379fca..82aaa442bca9e7a5e57315ace0b1c62e40ec1d24 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
 @@ -808,8 +808,7 @@ class Browser : public TabStripModelObserver,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 5c63a024827359ccf697d0b7fc8fa2092eb107b7..3da88b5831717c979373c064b4c1520c28d4fd98 100644
+index d69e028b34ab4407abcdea3ece93db39926c587e..a82b571fdabe90771bc8f8ed4ae40df3085592c7 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3873,8 +3873,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3879,8 +3879,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -274,7 +274,7 @@ index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 3330876f623e5b2cb600b1ce1fd10b3375568613..a9f48c6577afef8876cd8304ff5a66405b7d8343 100644
+index a998c64237a7ffd6583a33cd54fe3229196300a6..4f57227a9033f905be13bc5166d0324d495a6531 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -318,8 +318,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -288,7 +288,7 @@ index 3330876f623e5b2cb600b1ce1fd10b3375568613..a9f48c6577afef8876cd8304ff5a6640
    // Allow delegate to creates a custom WebContents when
    // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index ce83daee0eb44d72caaf1e7e250ce0c3fadb827c..ed0b508a5d6cdd4433a8117ef2032ce8e1d99273 100644
+index bddbd37ca73369adb82dad5bb8b25f0ab2a7f878..9bf28cd7f926f41041f40d4bc0a497c8b8730b86 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 @@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@@ -316,10 +316,10 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 0b01120f6a6053ab03355c93216d703d0958aeab..a1c6c5a4b507bbf50668d7ed2febe97aca942c1d 100644
+index 56b6d5d28fe21a2bea723060ad48ee0134e814a2..a3da9c86c0018e7f4810feb73ca32896cd6ce93c 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-@@ -388,8 +388,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
+@@ -402,8 +402,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -372,10 +372,10 @@ index f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5
                            int opener_render_process_id,
                            int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 2214ba7726f105e62bdc92bd0e6142ea9fa6ed72..2b9b804106317bfc914efacc7adfd282563e4c8b 100644
+index 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23ebe4ce8317 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
-@@ -176,8 +176,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
+@@ -177,8 +177,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -386,10 +386,10 @@ index 2214ba7726f105e62bdc92bd0e6142ea9fa6ed72..2b9b804106317bfc914efacc7adfd282
          ->options()
          ->block_new_web_contents();
 diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
-index 1c3eebdc2cc3f5d8f110562eb3e18a1f45521c4f..11b7b0c6617c40c766d64cd0d4e60d22e569bfb1 100644
+index 749200efec166e0c29402a3d5e079f2e94460363..2cbc96e911291fb0b31c3f4a1444ded0be4521f5 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
-@@ -426,8 +426,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
+@@ -427,8 +427,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
index 262ac6344b129..10a9d5dbeb4c8 100644
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index ec55c3f97988a7de06a738e61e389ba07712ad4e..6a40a73520a951d7c6fd06cbd07329a40ff41544 100644
+index 863c9e088c2d967506a9fabd044d7b08cc8bee23..fca255a2cd49f1f5d2bcb4418b04355c5befba38 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7088,6 +7088,7 @@ static_library("browser") {
+@@ -7123,6 +7123,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index e1eba13e55ffa..2c9718a540923 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 0cdaa37db5a4c992c8051a6e4370f61b3e4559a3..58108239e1b5aad967eff63d8eed10a560726c6e 100644
+index ff769b9855810bfe3761079ddae286fc8aa5602f..1fea025e8fc1d4e2496f117780fa4d0eb2f2e983 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
@@ -20,7 +20,7 @@ index 0cdaa37db5a4c992c8051a6e4370f61b3e4559a3..58108239e1b5aad967eff63d8eed10a5
  #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
  #include "components/cdm/renderer/widevine_key_system_properties.h"
  #include "content/public/renderer/render_thread.h"
-@@ -230,12 +232,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -183,12 +185,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
  
  // Returns persistent-license session support.
  EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch
index 3a7e3c694cc04..ab63b9153c409 100644
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -87,10 +87,10 @@ index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add7
    // Create an observer that registers a hot key for |accelerator|.
    std::unique_ptr<gfx::SingletonHwndHotKeyObserver> observer =
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index 4e9e4f4d21fbe650d8f32254a3b450074a038751..ac923f436cbdd6ded0629da4e4c659d94258e55b 100644
+index 3f37f08ccc06137317164e96e8934a0202fa5550..b954f8dde00d4f5257223c464e9145a6bef48900 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
-@@ -296,6 +296,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
+@@ -297,6 +297,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
        case ui::VKEY_MEDIA_STOP:
          system_media_controls_->SetIsStopEnabled(should_enable);
          break;
@@ -146,10 +146,10 @@ index ada705fb42e88d4bfa05b212c84111be9057a50e..a866b975687dd08ad88031a63f161b31
    }
  
 diff --git a/ui/base/x/x11_global_shortcut_listener.cc b/ui/base/x/x11_global_shortcut_listener.cc
-index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688ada1a3ad3 100644
+index 898e15a25c99ad25221c41594803521565ff4432..664337941023e800c9605f987d0e1d65bb0a444d 100644
 --- a/ui/base/x/x11_global_shortcut_listener.cc
 +++ b/ui/base/x/x11_global_shortcut_listener.cc
-@@ -32,11 +32,13 @@ const x11::ModMask kModifiersMasks[] = {
+@@ -31,11 +31,13 @@ const x11::ModMask kModifiersMasks[] = {
  
  x11::ModMask GetNativeModifiers(bool is_alt_down,
                                  bool is_ctrl_down,
@@ -165,7 +165,7 @@ index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688a
  }
  
  }  // namespace
-@@ -82,8 +84,9 @@ uint32_t XGlobalShortcutListener::DispatchEvent(const PlatformEvent& event) {
+@@ -81,8 +83,9 @@ uint32_t XGlobalShortcutListener::DispatchEvent(const PlatformEvent& event) {
  bool XGlobalShortcutListener::RegisterAccelerator(KeyboardCode key_code,
                                                    bool is_alt_down,
                                                    bool is_ctrl_down,
@@ -177,7 +177,7 @@ index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688a
    auto keysym = XKeysymForWindowsKeyCode(key_code, false);
    auto keycode = connection_->KeysymToKeycode(keysym);
  
-@@ -108,7 +111,7 @@ bool XGlobalShortcutListener::RegisterAccelerator(KeyboardCode key_code,
+@@ -107,7 +110,7 @@ bool XGlobalShortcutListener::RegisterAccelerator(KeyboardCode key_code,
    }
  
    registered_combinations_.insert(
@@ -186,7 +186,7 @@ index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688a
  
    return true;
  }
-@@ -116,8 +119,9 @@ bool XGlobalShortcutListener::RegisterAccelerator(KeyboardCode key_code,
+@@ -115,8 +118,9 @@ bool XGlobalShortcutListener::RegisterAccelerator(KeyboardCode key_code,
  void XGlobalShortcutListener::UnregisterAccelerator(KeyboardCode key_code,
                                                      bool is_alt_down,
                                                      bool is_ctrl_down,
@@ -198,7 +198,7 @@ index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688a
    auto keysym = XKeysymForWindowsKeyCode(key_code, false);
    auto keycode = connection_->KeysymToKeycode(keysym);
  
-@@ -125,7 +129,7 @@ void XGlobalShortcutListener::UnregisterAccelerator(KeyboardCode key_code,
+@@ -124,7 +128,7 @@ void XGlobalShortcutListener::UnregisterAccelerator(KeyboardCode key_code,
      connection_->UngrabKey({keycode, x_root_window_, modifiers | mask});
  
    registered_combinations_.erase(
@@ -207,7 +207,7 @@ index a772666160a71e8e31242e25a8f3383ad9b914bf..7ed78ff875ccf9c38a480d0d59f4688a
  }
  
  void XGlobalShortcutListener::OnKeyPressEvent(const KeyEvent& event) {
-@@ -135,14 +139,15 @@ void XGlobalShortcutListener::OnKeyPressEvent(const KeyEvent& event) {
+@@ -134,14 +138,15 @@ void XGlobalShortcutListener::OnKeyPressEvent(const KeyEvent& event) {
    const bool is_alt_down = event.flags() & EF_ALT_DOWN;
    const bool is_ctrl_down = event.flags() & EF_CONTROL_DOWN;
    const bool is_shift_down = event.flags() & EF_SHIFT_DOWN;
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index c16edea8ac147..ff3fe7c4fcfae 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -75,10 +75,10 @@ index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index dc2b18b322350121768571b7997d632a10220ac9..3e3ee0f721a2316d324fb31e17ba97ff24d9e6d7 100644
+index 32e2038e15adae14aa218a353f074cd6654bdc16..72bec9c08d7ec50257a86b0ee7173864d879d7d9 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
-@@ -180,6 +180,7 @@ bool PlatformCrashpadInitialization(
+@@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
      // where crash_reporter provides it's own values for lsb-release.
      annotations["lsb-release"] = base::GetLinuxDistro();
  #endif
@@ -86,7 +86,7 @@ index dc2b18b322350121768571b7997d632a10220ac9..3e3ee0f721a2316d324fb31e17ba97ff
  
      std::vector<std::string> arguments;
      if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
-@@ -201,6 +202,13 @@ bool PlatformCrashpadInitialization(
+@@ -191,6 +192,13 @@ bool PlatformCrashpadInitialization(
      }
  #endif
  
@@ -128,10 +128,10 @@ index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a5
          arguments.push_back("--monitor-self");
        }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index 1a8f42cb4e2ea493642d8b264d0be5c3da358793..e972272de54107aaed6143e3f3569ba56bd3cf3e 100644
+index d2354b84f3a184ad53571518198055a0a91cbc25..c05529257dda2acf0fa588d49e2b902736d9b02f 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
-@@ -89,6 +89,7 @@ bool PlatformCrashpadInitialization(
+@@ -88,6 +88,7 @@ bool PlatformCrashpadInitialization(
  
      std::map<std::string, std::string> process_annotations;
      GetPlatformCrashpadAnnotations(&process_annotations);
@@ -139,7 +139,7 @@ index 1a8f42cb4e2ea493642d8b264d0be5c3da358793..e972272de54107aaed6143e3f3569ba5
  
      std::string url = crash_reporter_client->GetUploadUrl();
  
-@@ -127,6 +128,13 @@ bool PlatformCrashpadInitialization(
+@@ -126,6 +127,13 @@ bool PlatformCrashpadInitialization(
  
      std::vector<std::string> arguments(start_arguments);
  
diff --git a/patches/chromium/crashpad_pid_check.patch b/patches/chromium/crashpad_pid_check.patch
index 597472b3ec79d..5560d4b3ec9f8 100644
--- a/patches/chromium/crashpad_pid_check.patch
+++ b/patches/chromium/crashpad_pid_check.patch
@@ -16,7 +16,7 @@ https://github.com/electron/electron/pull/18483#discussion_r292703588
 https://github.com/electron/electron/pull/18483#issuecomment-501090683
 
 diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
-index 92d5c5d47cfa5bd70300bb8bbc16ab944cd93509..87c14718221a83d531d15abf1f1d2d1bbc020e77 100644
+index 6890a01cc4b333927be6c36ff3392706020f57a3..36da005deed5893989585427216fd1e16d5e9f0c 100644
 --- a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
 +++ b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
 @@ -446,9 +446,16 @@ bool ExceptionHandlerServer::ServiceClientConnection(
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 5374f0423050e..0af9aeccfd053 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index 183503c7d9891b7e651f0cac4b2dc97157b61928..1630a0a49a4b88ceda0ee14980236dc614b42c67 100644
+index 7a6503d4a4ad33290d97078336c18d81839a8675..0f162b8e681ebb67c5f3b23a40fe3b6ec97cec49 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -511,8 +511,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
+@@ -506,8 +506,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                 ->GetPageScaleConstraintsSet()
                                 .FinalConstraints()
                                 .initial_scale;
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index de4da5324bf23..4db38bb6a59dd 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -8,10 +8,10 @@ Subject: desktop_media_list.patch
 * Ensure "OnRefreshComplete()" even if there are no items in the list
 
 diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
-index 57cfc646f8ea545271c22d79ec158a04b148bc9c..c5339603930f68e7019ca33d8b9f148cf4ac86af 100644
+index 03af516b6c85523c51a70dac281dbd732c10ea7e..b6f91fbd15181dff4d8ddc4be2b66c2a5012f495 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list.h
-@@ -94,7 +94,8 @@ class DesktopMediaList {
+@@ -96,7 +96,8 @@ class DesktopMediaList {
    // once per DesktopMediaList instance.  It should not be called after
    // StartUpdating(), and StartUpdating() should not be called until |callback|
    // has been called.
@@ -22,10 +22,10 @@ index 57cfc646f8ea545271c22d79ec158a04b148bc9c..c5339603930f68e7019ca33d8b9f148c
    virtual int GetSourceCount() const = 0;
    virtual const Source& GetSource(int index) const = 0;
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-index 24bd95b79479c21182a0d1a61364e1794f900261..2b2a7494ee9bd88fd5c8ebf50a5e29738b2dffd0 100644
+index ac1e7854dc9ae629a499fac7626ec456e18c7867..087da9bbfb9081b94ca8ea8d245871dc3601b1a7 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-@@ -63,12 +63,12 @@ void DesktopMediaListBase::StartUpdating(DesktopMediaListObserver* observer) {
+@@ -65,12 +65,12 @@ void DesktopMediaListBase::StartUpdating(DesktopMediaListObserver* observer) {
    Refresh(true);
  }
  
@@ -41,10 +41,10 @@ index 24bd95b79479c21182a0d1a61364e1794f900261..2b2a7494ee9bd88fd5c8ebf50a5e2973
  
  int DesktopMediaListBase::GetSourceCount() const {
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
-index c56bc6dcc73cf0e0d5e0e64d45436ccac833cd66..69aaecca38ede55ee71310698710e3f17b04abff 100644
+index 9c77a2d5872cc340b7a237b896afea1dd3be2503..d06869ff78ec0d48e97c3aeb7ac86d4aa9d9b1ba 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
-@@ -36,7 +36,7 @@ class DesktopMediaListBase : public DesktopMediaList {
+@@ -38,7 +38,7 @@ class DesktopMediaListBase : public DesktopMediaList {
    void SetThumbnailSize(const gfx::Size& thumbnail_size) override;
    void SetViewDialogWindowId(content::DesktopMediaID dialog_id) override;
    void StartUpdating(DesktopMediaListObserver* observer) override;
@@ -54,10 +54,10 @@ index c56bc6dcc73cf0e0d5e0e64d45436ccac833cd66..69aaecca38ede55ee71310698710e3f1
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
-index b1db454db6b7982962541cef18c09425b8f5fa5a..1e37f85d7f786807af331ccc347d84d9b4d7177c 100644
+index 2bf801156b93305705914d3dcb7dcbbebd03c096..6ea87e4471ab64c838b705c64be6bc10d74b213e 100644
 --- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
-@@ -75,7 +75,8 @@ void FakeDesktopMediaList::StartUpdating(DesktopMediaListObserver* observer) {
+@@ -77,7 +77,8 @@ void FakeDesktopMediaList::StartUpdating(DesktopMediaListObserver* observer) {
    thumbnail_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
  }
  
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 678825807237a..90badb12ad13f 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index bf32a083d0f0873e112debe0e88ab1be8125a417..8ca72461bb7b42f1bc0da249a36f0fcf9ab6f13c 100644
+index bb79a55d46730a4a127ee6483a7a25ecdc2aea5b..b14fa0f41166a904991ec920cec2f45c3b71c953 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index dac0d9fbd0df3..24227afe87461 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 61ab59e0d97a392ae18c1d7ad7dd606b5cd1c567..2a899818ebb67ba4fc06ccbcff3ee03f6b83c0e6 100644
+index a7636e4535d0c4303c4022620b2fc7d18870f6da..5de5f020da02f30b28bf02701e9fd1662424c914 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1882,6 +1882,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1900,6 +1900,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -34,7 +34,7 @@ index 61ab59e0d97a392ae18c1d7ad7dd606b5cd1c567..2a899818ebb67ba4fc06ccbcff3ee03f
    // If we are likely to software composite the resource, we use sRGB because
    // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 64f1a3a3cb8d82235ff04f5c01a7cf571d8ba00c..ffa8d1a53870663647e423975f00e5650c6ab579 100644
+index f6094a5defe12c34564020b0779626b3e5bff99e..a068a9ba33d3f8c8cdc74ae63ab5e16caa0b90c3 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
 @@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -80,10 +80,10 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b949187690aca71c 100644
+index 553c3be2562e836e2ce6d6f44997cebf3cba7466..fbe38d97a8d1861ecfb5ccb583d050a28b9ab108 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
-@@ -87,6 +87,9 @@
+@@ -86,6 +86,9 @@
  
  using gpu::gles2::GLES2Interface;
  
@@ -93,7 +93,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  namespace viz {
  namespace {
  
-@@ -684,8 +687,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
+@@ -683,8 +686,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
  void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
    SetBlendEnabled(quad->ShouldDrawWithBlending());
  
@@ -105,7 +105,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    // Use the full quad_rect for debug quads to not move the edges based on
    // partial swaps.
-@@ -1675,7 +1679,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
+@@ -1674,7 +1678,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
            params->use_color_matrix, tint_gl_composited_content_,
            params->apply_shader_based_rounded_corner &&
                ShouldApplyRoundedCorner(params->quad)),
@@ -115,7 +115,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  }
  
  void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -2148,7 +2153,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -2147,7 +2152,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
    SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
                                         tint_gl_composited_content_,
                                         ShouldApplyRoundedCorner(quad)),
@@ -125,7 +125,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
    SkColor4f color_f = SkColor4f::FromColor(color);
-@@ -2156,7 +2162,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -2155,7 +2161,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
    // Apply color transform if the color space or source and target do not match.
    if (quad_color_space != CurrentRenderPassColorSpace()) {
      const gfx::ColorTransform* color_transform =
@@ -134,7 +134,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
      gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
      color_transform->Transform(&col, 1);
      color_f.fR = col.x();
-@@ -2378,7 +2384,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
+@@ -2377,7 +2383,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
                                                : NON_PREMULTIPLIED_ALPHA,
                         false, false, tint_gl_composited_content_,
                         ShouldApplyRoundedCorner(quad)),
@@ -144,7 +144,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2477,7 +2484,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
+@@ -2476,7 +2483,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
                         !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
                         tint_gl_composited_content_,
                         ShouldApplyRoundedCorner(quad)),
@@ -154,7 +154,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2587,7 +2595,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
+@@ -2586,7 +2594,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
    // The source color space should never be RGB.
    DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
  
@@ -164,7 +164,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
  #if BUILDFLAG(IS_WIN)
    // Force sRGB output on Windows for overlay candidate video quads to match
-@@ -2768,7 +2777,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
+@@ -2767,7 +2776,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
  
    SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
                                          ShouldApplyRoundedCorner(quad)),
@@ -174,7 +174,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
    gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2839,8 +2849,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
+@@ -2838,8 +2848,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
        draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
  
    // Bind the program to the GL state.
@@ -185,7 +185,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
                  /*adjust_src_white_level=*/draw_cache_.is_video_frame,
                  locked_quad.hdr_metadata());
  
-@@ -3697,7 +3707,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
+@@ -3696,7 +3706,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
                                 const gfx::ColorSpace& dst_color_space,
                                 bool adjust_src_white_level,
                                 absl::optional<gfx::HDRMetadata> hdr_metadata) {
@@ -196,7 +196,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
    gfx::ColorSpace adjusted_src_color_space = src_color_space;
    if (adjust_src_white_level && src_color_space.IsHDR()) {
      // TODO(b/183236148): consider using the destination's HDR static metadata
-@@ -4085,9 +4097,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+@@ -4084,9 +4096,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
          cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
    }
  
@@ -209,7 +209,7 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
    *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                             gfx::SizeF((*overlay_texture)->texture.size()));
  
-@@ -4307,8 +4319,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -4305,8 +4317,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
  
    PrepareGeometry(SHARED_BINDING);
  
@@ -221,14 +221,14 @@ index deb95d2f0728b27af6115674094cc1b7a8e25807..339fe73954f33fb7bbc17f88b9491876
  
    gfx::Transform render_matrix;
    render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -4514,3 +4527,5 @@ bool GLRenderer::ColorTransformKey::operator<(
+@@ -4512,3 +4525,5 @@ bool GLRenderer::ColorTransformKey::operator<(
  }
  
  }  // namespace viz
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index f5d73922086b5b27907fd393d4d4204a574c3b25..5b09f5ef5f04b519ed4148498c82d003c9fd6c91 100644
+index 90c7ace352fe909e3f521403c2a7fbf030ccc31e..f011183e21921f38ce5062079e8430a030159bc1 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -240,10 +240,10 @@ index f5d73922086b5b27907fd393d4d4204a574c3b25..5b09f5ef5f04b519ed4148498c82d003
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index ac9570fa3d9cb3b0026f70465e5b21ac7778c3df..acc0e121e7746da397cfab07b3707de7ae9a3143 100644
+index d8939c1936830b101d6bb4079cd99e6015b481c4..366f801cbe84a28ef462037a26da47c9f65057b4 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -194,6 +194,7 @@
+@@ -197,6 +197,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
  #include "ui/display/display_switches.h"
@@ -251,7 +251,7 @@ index ac9570fa3d9cb3b0026f70465e5b21ac7778c3df..acc0e121e7746da397cfab07b3707de7
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3283,6 +3284,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3212,6 +3213,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -260,7 +260,7 @@ index ac9570fa3d9cb3b0026f70465e5b21ac7778c3df..acc0e121e7746da397cfab07b3707de7
      sandbox::policy::switches::kDisableSeccompFilterSandbox,
      sandbox::policy::switches::kNoSandbox,
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 6260d73068636f4a8d4c73c161a4ffe165b267d0..2686ef0dfb7d8b667647d11fece5aa8e1be76fe5 100644
+index 648f25d99884b99f49e26cd9f280a8a6ae63e1c7..0f87961ecd8c24e3ba82c6bae187a12c9b112bd4 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 @@ -4,6 +4,7 @@
@@ -292,7 +292,7 @@ index 6260d73068636f4a8d4c73c161a4ffe165b267d0..2686ef0dfb7d8b667647d11fece5aa8e
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 49ef0d352cfb6163499fa42416187595c7011a68..d5bc620847872fcba96f6941be529428755d83a2 100644
+index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba26193952 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
@@ -303,7 +303,7 @@ index 49ef0d352cfb6163499fa42416187595c7011a68..d5bc620847872fcba96f6941be529428
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
  
-@@ -184,6 +185,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
+@@ -183,6 +184,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  
@@ -314,10 +314,10 @@ index 49ef0d352cfb6163499fa42416187595c7011a68..d5bc620847872fcba96f6941be529428
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index 298321f1aabcf4328fd39b856694a8a6459bfa24..4be245d082cd9d833db72b29e3d652120ecb913e 100644
+index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd0ad98d30 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
  #include "ui/gfx/buffer_format_util.h"
  #include "ui/gfx/color_space.h"
  #include "ui/gfx/icc_profile.h"
@@ -325,7 +325,7 @@ index 298321f1aabcf4328fd39b856694a8a6459bfa24..4be245d082cd9d833db72b29e3d65212
  
  namespace gfx {
  
-@@ -143,6 +144,14 @@ void IOSurfaceMachPortTraits::Release(mach_port_t port) {
+@@ -142,6 +143,14 @@ void IOSurfaceMachPortTraits::Release(mach_port_t port) {
  // Common method used by IOSurfaceSetColorSpace and IOSurfaceCanSetColorSpace.
  bool IOSurfaceSetColorSpace(IOSurfaceRef io_surface,
                              const ColorSpace& color_space) {
@@ -340,7 +340,7 @@ index 298321f1aabcf4328fd39b856694a8a6459bfa24..4be245d082cd9d833db72b29e3d65212
    // Allow but ignore invalid color spaces.
    if (!color_space.IsValid())
      return true;
-@@ -313,6 +322,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
+@@ -312,6 +321,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
      DCHECK_EQ(kIOReturnSuccess, r);
    }
  
@@ -357,7 +357,7 @@ index 298321f1aabcf4328fd39b856694a8a6459bfa24..4be245d082cd9d833db72b29e3d65212
    if (__builtin_available(macos 10.12, *)) {
      IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
 diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
-index be932ac3094a441cd5d9afa2ffd2c6d4a64ce559..a6aa9b4c6ba958eb81276911368cd053b9fb59f8 100644
+index 0e8044c6d87008c51fd165c6ef8bdc3687d6cc29..78015868927602b5225f252f0a9182f61b8431dc 100644
 --- a/ui/gfx/switches.cc
 +++ b/ui/gfx/switches.cc
 @@ -11,6 +11,8 @@ namespace switches {
@@ -370,7 +370,7 @@ index be932ac3094a441cd5d9afa2ffd2c6d4a64ce559..a6aa9b4c6ba958eb81276911368cd053
  // sharpness, kerning, hinting and layout.
  const char kDisableFontSubpixelPositioning[] =
 diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h
-index 442809de1631081efbe062922539318f5172a5ae..b8e5c7e53d58a06175105c9396a7d976bda7a4bd 100644
+index e8e5d44e246364dd45594efb442c129676c14270..252096ee18ca33f4b98f68beb1f534e1c2ab805e 100644
 --- a/ui/gfx/switches.h
 +++ b/ui/gfx/switches.h
 @@ -12,6 +12,7 @@
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 23daa8d150e30..cb16038fb732b 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 58002d37ba340f84f47e2522c0d7bf7c1a64c5d2..bc0a73f08e77bf13eb1cafa55f955e6083071104 100644
+index 54a1142f17e2a63b86e1fab52ea90276091c85a4..df9381bf8dc4b2b85548c529038f60cc3185fcdd 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -510,7 +510,11 @@
+@@ -511,7 +511,11 @@
      return;
  
    host()->WasHidden();
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 755b0eb4b9951..e9e9af547fe6f 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 03e318b14025f3c971d471351068986f8a1dd14d..59437e69e25fe85cffc9b558dec2284123ac48be 100644
+index 63f51521afa85f53073df2e3747eba95e80de09d..ed56e947fa137cbaddaa12503ae983d7acd4463f 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -803,6 +803,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  
@@ -20,12 +20,12 @@ index 03e318b14025f3c971d471351068986f8a1dd14d..59437e69e25fe85cffc9b558dec22841
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 5cc97c9c8305bf23b7cdf39ea68c304fac20b479..a6a65a251711394a33fb02bd66c2eeb7b559f711 100644
+index 5e2e1fe4482fdde0df1a02ae9ae6d68431dac4d8..3ae005ae898ee0dd8befa7699b469fc379b5a1d1 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -877,6 +877,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
-   void OnLocalSurfaceIdChanged(
-       const cc::RenderFrameMetadata& metadata) override;
+@@ -880,6 +880,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+ 
+   SiteInstanceGroup* GetSiteInstanceGroup();
  
 +  // Electron: Prevents the widget from getting hidden.
 +  bool disable_hidden_ = false;
@@ -34,10 +34,10 @@ index 5cc97c9c8305bf23b7cdf39ea68c304fac20b479..a6a65a251711394a33fb02bd66c2eeb7
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index a819dcf960a4c70c0c8cd57710971de2c41e13ca..bbc3671c3fa8e058b8f107d601233735c0822297 100644
+index b39dd8d70aa590677f7d3e95412c0709f0fbbc81..558fd14566a4b953b5140b59ad614b70e1855bc5 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -619,7 +619,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -618,7 +618,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index cc1a3911ab8ab..075e38265e551 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index a460f4643881a0bd70a863884aa50ae76e25c3b7..0635d66dad36e2d6042dd317962527793f5b96f7 100644
+index cd286b4925b3d2d9e74caecee759360488f2b8ba..0bc714a78e58719824ffeba8ced7854474fa6e92 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1159,6 +1159,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1177,6 +1177,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index a460f4643881a0bd70a863884aa50ae76e25c3b7..0635d66dad36e2d6042dd31796252779
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1205,6 +1206,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1223,6 +1224,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 6bd042bd527b8..692ebe4ddcdb1 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -6,10 +6,10 @@ Subject: Don't run PCScan functions if PCScan is disabled
 PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
 
 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
-index 63819bf2593894bd763547d58cfae31d821bd7eb..a4ee9520cfc11125837e42955f8f6f6c3f21bf9e 100644
+index 60a33e1501b58d486217d934de6f5c2c392e01bb..3b9ccdf82c6be5b12d32f053bedc5c6d1cd4bc0e 100644
 --- a/base/allocator/partition_allocator/memory_reclaimer.cc
 +++ b/base/allocator/partition_allocator/memory_reclaimer.cc
-@@ -67,7 +67,7 @@ void PartitionAllocMemoryReclaimer::Reclaim(int flags) {
+@@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {
    //
    // Lastly decommit empty slot spans and lastly try to discard unused pages at
    // the end of the remaining active slots.
@@ -17,9 +17,9 @@ index 63819bf2593894bd763547d58cfae31d821bd7eb..a4ee9520cfc11125837e42955f8f6f6c
 +#if PA_STARSCAN_ENABLE_STARSCAN_ON_RECLAIM && defined(PA_ALLOW_PCSCAN)
    {
      using PCScan = internal::PCScan;
-     const auto invocation_mode = flags & PartitionPurgeAggressiveReclaim
+     const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index 4bfe2501309e832dc9962d5f4642c6b7c782f83d..c45f1207be984fae9aee2cc5b9a7c405ed5ed96e 100644
+index d1b71673ca79ea0f2293cda46564ceb8a018f4e5..ca70bb8fdf7fec2e0d5e2b3bf0ece86def72e21b 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
 @@ -43,6 +43,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 017e3d5431128..d8cdef4d187c5 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 44c0ec9815aafd61182fd18a9d125e185d7196bc..a77c39adfc687d43004341d4ca9e6fa676c814f5 100644
+index bc8bdba3facba81c572d43b85881ec02ad7d2f00..3b12ab113f7c159beb74a09f95335977b4ee2b4f 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2394,7 +2394,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2367,7 +2367,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index a124b5b3d2ae1..b038130828869 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -19,7 +19,7 @@ index a1de50d6b0f699d0651c369cafafdd5bb542242d..65b9f5e5f81e8ef8b591ef2e027e095d
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 8ca72461bb7b42f1bc0da249a36f0fcf9ab6f13c..9ca11a19e66e34585b4b11e89cc3b789a4389b5e 100644
+index b14fa0f41166a904991ec920cec2f45c3b71c953..37bb1e9788a251b3f2c79b5272d4a44c22b707b3 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index c05e1e16aceef..cad261c043f60 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,10 +21,10 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index a7dad3d1053c3101183b9686adbccaa5cf3a87fc..24da1fde55c345cb58829539aec381af9af57bae 100644
+index 78b8a28eadf392422b55e441634e3161c8c1694c..af3ed7813d9ed5fb294b67a0da1237140b40abbf 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -368,6 +368,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
+@@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
    return g_page_allocator.Pointer();
  }
  
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index b30988fba7e9c..d04ad170f9062 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 20373c0e86852446569c401c4a993512cb388fc7..9b6dbdad1a17148303ddecaada17a57d4ea22bb2 100644
+index 4c8982a8ae3ae23fbeef244cd23b43c889d3fa94..13b48d5acadf5dcfb40a829751b089c1c29f9450 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1343,6 +1343,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1350,6 +1350,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index 20373c0e86852446569c401c4a993512cb388fc7..9b6dbdad1a17148303ddecaada17a57d
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index e412608e7720004462c48698c8ec39602b2b900e..46c00e0da6beb0c2e689475fc4b9927085414e1a 100644
+index eed05c05d1da28284af6ae0cef45dbbb47254058..f32671202010fa57901a09723feecacc72dbd5f9 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -282,6 +282,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -283,6 +283,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index e412608e7720004462c48698c8ec39602b2b900e..46c00e0da6beb0c2e689475fc4b99270
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index fa56cfed3703664232843ad26028096d95dca253..9852498e93939796e7ba6f80efcc7b2d827187ac 100644
+index c929eb10af5b8856debdc0d665eac767e9730714..c20bd2a2d6b989386ce7ef97e43f677e2c5291fa 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1067,6 +1067,9 @@ interface NetworkContext {
+@@ -1089,6 +1089,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index b0c806866f56a..1a14cd39962aa 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 7e7927c7258963bd95a2c064ef85e410f4d2571d..05353bda1169df38499e6f789bb632307d7bcfde 100644
+index 06d8ca44fb1dc3748d81b5c5a407dfdf7183f845..85e1772fbcbb190e32dd30996541cc2e9d19d057 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -158,6 +158,7 @@
+@@ -159,6 +159,7 @@
  #include "third_party/blink/renderer/core/timing/dom_window_performance.h"
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
@@ -23,7 +23,7 @@ index 7e7927c7258963bd95a2c064ef85e410f4d2571d..05353bda1169df38499e6f789bb63230
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1776,6 +1777,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1774,6 +1775,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index 1f6c211951b05..07752f798efa4 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -96,19 +96,19 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..5b701b1361707b610ed60c344e441e67
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a5a1f1424 100644
+index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190f7d1137d 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -148,7 +148,7 @@ const char kACKToken[] = "ACK";
+@@ -146,7 +146,7 @@ const char kACKToken[] = "ACK";
  const char kShutdownToken[] = "SHUTDOWN";
  const char kTokenDelimiter = '\0';
  const int kMaxMessageLength = 32 * 1024;
--const int kMaxACKMessageLength = base::size(kShutdownToken) - 1;
+-const int kMaxACKMessageLength = std::size(kShutdownToken) - 1;
 +const int kMaxACKMessageLength = kMaxMessageLength;
  
  bool g_disable_prompt = false;
  bool g_skip_is_chrome_process_check = false;
-@@ -614,6 +614,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -612,6 +612,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -116,7 +116,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
                       SocketReader* reader);
  
   private:
-@@ -638,6 +639,9 @@ class ProcessSingleton::LinuxWatcher
+@@ -636,6 +637,9 @@ class ProcessSingleton::LinuxWatcher
    // The ProcessSingleton that owns us.
    ProcessSingleton* const parent_;
  
@@ -126,7 +126,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
    std::set<std::unique_ptr<SocketReader>, base::UniquePtrComparator> readers_;
  };
  
-@@ -668,16 +672,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -666,16 +670,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -141,7 +141,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
 -  if (parent_->notification_callback_.Run(base::CommandLine(argv),
 -                                          base::FilePath(current_dir))) {
 -    // Send back "ACK" message to prevent the client process from starting up.
--    reader->FinishWithACK(kACKToken, base::size(kACKToken) - 1);
+-    reader->FinishWithACK(kACKToken, std::size(kACKToken) - 1);
 -  } else {
 +  auto wrapped_ack_callback =
 +      base::BindRepeating(&ProcessSingleton::LinuxWatcher::AckCallback,
@@ -154,7 +154,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
      LOG(WARNING) << "Not handling interprocess notification as browser"
                      " is shutting down";
      // Send back "SHUTDOWN" message, so that the client process can start up
-@@ -687,6 +696,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
+@@ -685,6 +694,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
    }
  }
  
@@ -165,7 +165,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
 +  if (!ack_callback_called_) {
 +    ack_callback_called_ = true;
 +    std::string ack_message;
-+    ack_message.append(kACKToken, base::size(kACKToken) - 1);
++    ack_message.append(kACKToken, std::size(kACKToken) - 1);
 +    if (response && response->size_bytes()) {
 +      ack_message.append(reinterpret_cast<const char*>(response->data()),
 +                         response->size_bytes());
@@ -177,17 +177,17 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
  void ProcessSingleton::LinuxWatcher::RemoveSocketReader(SocketReader* reader) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
    DCHECK(reader);
-@@ -722,7 +747,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -720,7 +745,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
 -  // Validate the message.  The shortest message is kStartToken\0x\0x
 +  // Validate the message.  The shortest message kStartToken\0\00
 +  // The shortest message with additional data is kStartToken\0\00\00\0.
-   const size_t kMinMessageLength = base::size(kStartToken) + 4;
+   const size_t kMinMessageLength = std::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -752,10 +778,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -750,10 +776,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -217,7 +217,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -784,8 +828,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -782,8 +826,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -231,7 +231,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -904,7 +952,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -902,7 +950,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -241,7 +241,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -914,11 +963,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -912,11 +961,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();
@@ -263,14 +263,14 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
    // Send the message
    if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
      // Try to kill the other process, because it might have been dead.
-@@ -960,6 +1019,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -958,6 +1017,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
        linux_ui->NotifyWindowManagerStartupComplete();
  #endif
  
-+    size_t ack_data_len = len - (base::size(kACKToken) - 1);
++    size_t ack_data_len = len - (std::size(kACKToken) - 1);
 +    if (ack_data_len) {
 +      const uint8_t* raw_ack_data =
-+          reinterpret_cast<const uint8_t*>(buf + base::size(kACKToken) - 1);
++          reinterpret_cast<const uint8_t*>(buf + std::size(kACKToken) - 1);
 +      base::span<const uint8_t> ack_data =
 +          base::make_span(raw_ack_data, raw_ack_data + ack_data_len);
 +      notification_ack_callback_.Run(&ack_data);
@@ -282,7 +282,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..44d563e35efb318c5684c30fc441996a
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce82ad6abb2 100644
+index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f941384b249a5d 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
 @@ -21,6 +21,7 @@
@@ -434,7 +434,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce8
    return true;
  }
  
-@@ -254,9 +343,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -261,9 +350,13 @@ bool ProcessSingleton::EscapeVirtualization(
  ProcessSingleton::ProcessSingleton(
      const std::string& program_name,
      const base::FilePath& user_data_dir,
@@ -449,7 +449,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce8
        program_name_(program_name),
        is_app_sandboxed_(is_app_sandboxed),
        is_virtualized_(false),
-@@ -271,6 +364,37 @@ ProcessSingleton::~ProcessSingleton() {
+@@ -278,6 +371,37 @@ ProcessSingleton::~ProcessSingleton() {
      ::CloseHandle(lock_file_);
  }
  
@@ -487,7 +487,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce8
  // Code roughly based on Mozilla.
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
-@@ -283,8 +407,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+@@ -290,8 +414,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
      return PROCESS_NONE;
    }
  
@@ -498,7 +498,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce8
        return PROCESS_NOTIFIED;
      case chrome::NOTIFY_FAILED:
        remote_window_ = NULL;
-@@ -422,6 +547,18 @@ bool ProcessSingleton::Create() {
+@@ -429,6 +554,18 @@ bool ProcessSingleton::Create() {
            << "Lock file can not be created! Error code: " << error;
  
        if (lock_file_ != INVALID_HANDLE_VALUE) {
@@ -517,7 +517,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..1d393e6e161b896a47d3490d902f2ce8
          // Set the window's title to the path of our user data directory so
          // other Chrome instances can decide if they should forward to us.
          TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
-@@ -449,6 +586,7 @@ bool ProcessSingleton::Create() {
+@@ -456,6 +593,7 @@ bool ProcessSingleton::Create() {
  }
  
  void ProcessSingleton::Cleanup() {
diff --git a/patches/chromium/feat_add_onclose_to_messageport.patch b/patches/chromium/feat_add_onclose_to_messageport.patch
index cf52cfa05ff50..01d4fd5beeb27 100644
--- a/patches/chromium/feat_add_onclose_to_messageport.patch
+++ b/patches/chromium/feat_add_onclose_to_messageport.patch
@@ -10,10 +10,10 @@ get this standardised, but in lieu of that, this makes MessagePort a
 whole bunch more useful!
 
 diff --git a/third_party/blink/renderer/core/messaging/message_port.cc b/third_party/blink/renderer/core/messaging/message_port.cc
-index c5714d115210488cb531c1e54de540f429636638..6f67b21803fcdc2498ef207878d1541e04822fca 100644
+index a284d187968914b4304eb49362b2a8ccafa5e5c2..d6f8bf39c47cfc622dec5736d82ccc308d406cfa 100644
 --- a/third_party/blink/renderer/core/messaging/message_port.cc
 +++ b/third_party/blink/renderer/core/messaging/message_port.cc
-@@ -161,6 +161,7 @@ void MessagePort::close() {
+@@ -162,6 +162,7 @@ void MessagePort::close() {
      Entangle(pipe.TakePort0());
    }
    closed_ = true;
diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
index fbd9cec05e06c..8b78ba638e7d5 100644
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.
 
 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index 5376b01ad03c346ecc1c5d47ff125103dbc05eb8..a60ce1d4fe6b7132d7adac1a7687c7185d1abee3 100644
+index 3f596e0d24ccf7586e2e20d219b73300ee3f56a0..0eb957667b591d1215b60f83141d8431079c1f45 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
-@@ -114,6 +114,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
+@@ -124,6 +124,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
  NativeTheme::~NativeTheme() = default;
  
  bool NativeTheme::ShouldUseDarkColors() const {
@@ -26,12 +26,12 @@ index 5376b01ad03c346ecc1c5d47ff125103dbc05eb8..a60ce1d4fe6b7132d7adac1a7687c718
  }
  
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index e46bc2cf64ca554c0e21a4e0851ad092f504e080..0ffe583d56ddc3abec8c848c1cd5dbc3623acb5b 100644
+index 3b9c8841ac65471141307025394464a90b02daa9..dba57a6af6a3ce8dc258a747d721fbc9d50b0ebf 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -389,6 +389,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
-       scoped_refptr<ColorProviderManager::InitializerSupplier> custom_theme)
-       const;
+@@ -392,6 +392,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
+           custom_theme,
+       bool use_custom_frame = true) const;
  
 +
 +  enum ThemeSource {
@@ -53,7 +53,7 @@ index e46bc2cf64ca554c0e21a4e0851ad092f504e080..0ffe583d56ddc3abec8c848c1cd5dbc3
    // Returns a shared instance of the native theme that should be used for web
    // rendering. Do not use it in a normal application context (i.e. browser).
    // The returned object should not be deleted by the caller. This function is
-@@ -558,6 +575,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -557,6 +574,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
    bool forced_colors_ = false;
    PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
    PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
diff --git a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
index 8aec002466d42..72cb9fc018ca2 100644
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -12,21 +12,8 @@ This patch adds a list of "streaming protocols" to the MultibufferDataSource in
 other protocols to register their streaming behavior. MultibufferDataSource::AssumeFullyBuffered()
 then refers to the list so that it can correctly determine the data source's settings.
 
-diff --git a/third_party/blink/public/platform/media/multi_buffer_data_source.h b/third_party/blink/public/platform/media/multi_buffer_data_source.h
-index fd2441add0c816c5031ed0e9321d2be7e0937161..c324d855b26f6dcb63d127d7ddafa509cb1074e4 100644
---- a/third_party/blink/public/platform/media/multi_buffer_data_source.h
-+++ b/third_party/blink/public/platform/media/multi_buffer_data_source.h
-@@ -33,6 +33,8 @@ namespace blink {
- class BufferedDataSourceHost;
- class MultiBufferReader;
- 
-+void BLINK_PLATFORM_EXPORT AddStreamingScheme(const char* new_scheme);
-+
- // A data source capable of loading URLs and buffering the data using an
- // in-memory sliding window.
- //
 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-index ba3e8d75ce49614e26dd77692166a11b614a5d9c..4c3170ecb94716ec2869c363381759cbf08f3ae6 100644
+index 58256037e0a2485a9f8de9f4086550f39e865b2d..3456f1d55b16239698ba83d1d27beec1c3806192 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 @@ -10,8 +10,10 @@
@@ -39,7 +26,7 @@ index ba3e8d75ce49614e26dd77692166a11b614a5d9c..4c3170ecb94716ec2869c363381759cb
 +#include "base/strings/string_util.h"
  #include "media/base/media_log.h"
  #include "net/base/net_errors.h"
- #include "third_party/blink/public/platform/media/buffered_data_source_host_impl.h"
+ #include "third_party/blink/renderer/platform/media/buffered_data_source_host_impl.h"
 @@ -60,8 +62,20 @@ const int kUpdateBufferSizeFrequency = 32;
  // How long to we delay a seek after a read?
  constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
@@ -77,3 +64,16 @@ index ba3e8d75ce49614e26dd77692166a11b614a5d9c..4c3170ecb94716ec2869c363381759cb
  }
  
  void MultiBufferDataSource::SetReader(MultiBufferReader* reader) {
+diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
+index cb5d1951af2ff71cc6c7905235d85d6cbc541ae7..292bcf55be733a5cc1e32e11bd00e9acebdbfcbf 100644
+--- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
++++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
+@@ -33,6 +33,8 @@ namespace blink {
+ class BufferedDataSourceHost;
+ class MultiBufferReader;
+ 
++void BLINK_PLATFORM_EXPORT AddStreamingScheme(const char* new_scheme);
++
+ // A data source capable of loading URLs and buffering the data using an
+ // in-memory sliding window.
+ //
diff --git a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
index 9fc5bef9c5021..ae711b32caf32 100644
--- a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
+++ b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -9,10 +9,10 @@ production use cases.  This is unlikely to be upstreamed as the change
 is entirely in //chrome.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-index 22fade6370fe654e48373f35bbac079131b873ff..57d694eab66c1431789405656f600390e023b533 100644
+index c1821235df8abd9c0991efeb1d82f8b6075e48e7..a35fc3aa63e6d57ef78ee4690f761060b074ec85 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -51,6 +51,9 @@ namespace {
+@@ -52,6 +52,9 @@ namespace {
  base::LazyInstance<GURL>::Leaky g_download_url_for_testing =
      LAZY_INSTANCE_INITIALIZER;
  
@@ -22,7 +22,7 @@ index 22fade6370fe654e48373f35bbac079131b873ff..57d694eab66c1431789405656f600390
  // Close the file.
  void CloseDictionary(base::File file) {
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -271,6 +274,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
+@@ -272,6 +275,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
    g_download_url_for_testing.Get() = url;
  }
  
@@ -33,7 +33,7 @@ index 22fade6370fe654e48373f35bbac079131b873ff..57d694eab66c1431789405656f600390
  GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
    if (g_download_url_for_testing.Get() != GURL())
      return g_download_url_for_testing.Get();
-@@ -278,6 +285,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
+@@ -279,6 +286,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
    std::string bdict_file = dictionary_file_.path.BaseName().MaybeAsASCII();
    DCHECK(!bdict_file.empty());
  
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 231ad6fe4f48e..f8f64ec23fbe9 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index eff91b68cf4b72de41b7b2ad09c029b8b5dcf3c6..c736f772e3714c6a80703c41c8a2f0dab36b166d 100644
+index 002b3ddfb0f77b787b74ee088578e3eb813d0192..a9003a98546bbfe78e2d30457a032218cc263441 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -139,6 +139,8 @@ viz_component("service") {
@@ -108,7 +108,7 @@ index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e3658036
  
  }  // namespace viz
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 8a277c6337d446890bb32814a68db2a9d3d3cd72..4c4e631d5a1476eaad6f54281e6d6899070d1a65 100644
+index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefbdd2c0f71 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
 @@ -26,6 +26,7 @@
@@ -159,9 +159,9 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..4c4e631d5a1476eaad6f54281e6d6899
 +#if !BUILDFLAG(IS_APPLE)
 +  if (offscreen) {
 +    DCHECK(display_client);
-+    mojom::LayeredWindowUpdaterPtr layered_window_updater;
++    mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater;
 +    display_client->CreateLayeredWindowUpdater(
-+        mojo::MakeRequest(&layered_window_updater));
++        layered_window_updater.InitWithNewPipeAndPassReceiver());
 +    return std::make_unique<SoftwareOutputDeviceProxy>(
 +        std::move(layered_window_updater));
 +  }
@@ -226,7 +226,7 @@ index a480befb5d8db36e7e281d5033aeef0bea83d220..4e54acc897d08c87bccc3b44f68634e2
  
 diff --git a/components/viz/service/display_embedder/software_output_device_proxy.cc b/components/viz/service/display_embedder/software_output_device_proxy.cc
 new file mode 100644
-index 0000000000000000000000000000000000000000..88aba74877a6490e08e357266b1ce8461b5b6dff
+index 0000000000000000000000000000000000000000..d5e90022d129ce6a7a8effd6c85d3a5295ac79bf
 --- /dev/null
 +++ b/components/viz/service/display_embedder/software_output_device_proxy.cc
 @@ -0,0 +1,158 @@
@@ -302,7 +302,7 @@ index 0000000000000000000000000000000000000000..88aba74877a6490e08e357266b1ce846
 +SoftwareOutputDeviceProxy::~SoftwareOutputDeviceProxy() = default;
 +
 +SoftwareOutputDeviceProxy::SoftwareOutputDeviceProxy(
-+    mojom::LayeredWindowUpdaterPtr layered_window_updater)
++    mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater)
 +    : layered_window_updater_(std::move(layered_window_updater)) {
 +  DCHECK(layered_window_updater_.is_bound());
 +}
@@ -390,10 +390,10 @@ index 0000000000000000000000000000000000000000..88aba74877a6490e08e357266b1ce846
 +}  // namespace viz
 diff --git a/components/viz/service/display_embedder/software_output_device_proxy.h b/components/viz/service/display_embedder/software_output_device_proxy.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..a80258d6165e45a3c3d2b551158ff7d2a5778a7c
+index 0000000000000000000000000000000000000000..daeabe1906b177adfe56b8057a72afb33269f976
 --- /dev/null
 +++ b/components/viz/service/display_embedder/software_output_device_proxy.h
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,95 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -409,6 +409,8 @@ index 0000000000000000000000000000000000000000..a80258d6165e45a3c3d2b551158ff7d2
 +#include "components/viz/host/host_display_client.h"
 +#include "components/viz/service/display/software_output_device.h"
 +#include "components/viz/service/viz_service_export.h"
++#include "mojo/public/cpp/bindings/pending_remote.h"
++#include "mojo/public/cpp/bindings/remote.h"
 +#include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
 +#include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
 +
@@ -455,7 +457,7 @@ index 0000000000000000000000000000000000000000..a80258d6165e45a3c3d2b551158ff7d2
 +class SoftwareOutputDeviceProxy : public SoftwareOutputDeviceBase {
 + public:
 +  explicit SoftwareOutputDeviceProxy(
-+      mojom::LayeredWindowUpdaterPtr layered_window_updater);
++      mojo::PendingRemote<mojom::LayeredWindowUpdater> layered_window_updater);
 +  ~SoftwareOutputDeviceProxy() override;
 +
 +  SoftwareOutputDeviceProxy(const SoftwareOutputDeviceProxy&) = delete;
@@ -473,7 +475,7 @@ index 0000000000000000000000000000000000000000..a80258d6165e45a3c3d2b551158ff7d2
 +  // Runs |swap_ack_callback_| after draw has happened.
 +  void DrawAck();
 +
-+  mojom::LayeredWindowUpdaterPtr layered_window_updater_;
++  mojo::Remote<mojom::LayeredWindowUpdater> layered_window_updater_;
 +
 +  std::unique_ptr<SkCanvas> canvas_;
 +  bool waiting_on_draw_ack_ = false;
@@ -501,7 +503,7 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index 4b6712b2a4f3c56a6d243ff9d93539505a5c7b86..7f62362ab27abd3497d23e8db8c8bb5a2e3392f9 100644
+index df92bab44402330869b44aa76bb40fc20e33b16a..2b3fbaee17c0a8bb7b04cd4c4edb13626dd1bb27 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 @@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(
@@ -571,7 +573,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 8b74e1d2a463156f62e983f535ff68a53215f648..6ef04da46c8b097b01d5ee40dcadf222d7a7870c 100644
+index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81dfc5bb646e 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -81,6 +81,7 @@ class DisplayPrivate;
@@ -599,7 +601,7 @@ index 8b74e1d2a463156f62e983f535ff68a53215f648..6ef04da46c8b097b01d5ee40dcadf222
  // Compositor object to take care of GPU painting.
  // A Browser compositor object is responsible for generating the final
  // displayable form of pixels comprising a single widget's contents. It draws an
-@@ -177,6 +188,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -178,6 +189,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
    // Schedules a redraw of the layer tree associated with this compositor.
    void ScheduleDraw();
  
@@ -609,7 +611,7 @@ index 8b74e1d2a463156f62e983f535ff68a53215f648..6ef04da46c8b097b01d5ee40dcadf222
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -467,6 +481,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -466,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
@@ -619,7 +621,7 @@ index 8b74e1d2a463156f62e983f535ff68a53215f648..6ef04da46c8b097b01d5ee40dcadf222
    raw_ptr<Layer> root_layer_ = nullptr;
  
 diff --git a/ui/gfx/ca_layer_params.h b/ui/gfx/ca_layer_params.h
-index 12e115cd6a128d8d150abc786d4d38b1d5119d91..b6320de28750333bee7ee83393849f4eb0a956ac 100644
+index c5fb29b30b9c5b7483998c567ed9a479d8743939..dc10d78315f76a3914ccd6e2e99af97fa909918b 100644
 --- a/ui/gfx/ca_layer_params.h
 +++ b/ui/gfx/ca_layer_params.h
 @@ -6,6 +6,7 @@
@@ -630,7 +632,7 @@ index 12e115cd6a128d8d150abc786d4d38b1d5119d91..b6320de28750333bee7ee83393849f4e
  #include "ui/gfx/geometry/size.h"
  #include "ui/gfx/gfx_export.h"
  
-@@ -51,6 +52,8 @@ struct GFX_EXPORT CALayerParams {
+@@ -41,6 +42,8 @@ struct GFX_EXPORT CALayerParams {
    gfx::ScopedRefCountedIOSurfaceMachPort io_surface_mach_port;
  #endif
  
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 9dc1207d32dff..f07fe207b2f52 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -103,10 +103,10 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 5c5aeeda64b244ab1f58556f28d2ca3c133d03a8..2f9aa4d49693a22507f668b2738c54be59802b8f 100644
+index 1530c51f9090ce51de1f3bc495ca83590d6430ab..d053aa813ab53092dcefb81116ff850318f439c2 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -469,6 +469,7 @@ URLLoader::URLLoader(
+@@ -470,6 +470,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index 5c5aeeda64b244ab1f58556f28d2ca3c133d03a8..2f9aa4d49693a22507f668b2738c54be
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -636,7 +637,7 @@ URLLoader::URLLoader(
+@@ -637,7 +638,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 5c5aeeda64b244ab1f58556f28d2ca3c133d03a8..2f9aa4d49693a22507f668b2738c54be
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1395,6 +1396,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1408,6 +1409,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
@@ -144,10 +144,10 @@ index 5c5aeeda64b244ab1f58556f28d2ca3c133d03a8..2f9aa4d49693a22507f668b2738c54be
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 98fe2512671e43a4e0da6e9b9ff714d7204fc3a8..bf8751c1b37a678f73ec8e11c86e1eb1287443e4 100644
+index 53822d17b20f4e6d163d0dc84eea6c455254a5f7..c494a63b0c1dcb39120e8aabc84a60ebbf2ff224 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -506,6 +506,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -502,6 +502,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 195ea7ae74d67..498c91f8f91a2 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 9ca11a19e66e34585b4b11e89cc3b789a4389b5e..264a9109e42c23e9be6bf7269b3cfee2634b61e4 100644
+index 37bb1e9788a251b3f2c79b5272d4a44c22b707b3..29c3104308e9e64d0ab99bdfae00479f8e1bfaa1 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3581,6 +3581,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3597,6 +3597,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index 7db4c0911e37d..a17c7119f3e7b 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -12,11 +12,11 @@ therefore causes unmapped page access crashes.
 This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
-diff --git a/chrome/browser/resources/pdf/pdf_viewer.js b/chrome/browser/resources/pdf/pdf_viewer.js
-index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b66399eb9 100644
---- a/chrome/browser/resources/pdf/pdf_viewer.js
-+++ b/chrome/browser/resources/pdf/pdf_viewer.js
-@@ -966,25 +966,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
+index 2e370bf7fd61d75677cfc84798ba543a48f3bc19..fc8f471745c8daf30679df1ffb994febe62cfbea 100644
+--- a/chrome/browser/resources/pdf/pdf_viewer.ts
++++ b/chrome/browser/resources/pdf/pdf_viewer.ts
+@@ -855,26 +855,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -25,7 +25,8 @@ index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b
      const blob = new Blob(dataArray);
 -    const fileName = this.attachments_[index].name;
 -    chrome.fileSystem.chooseEntry(
--        {type: 'saveFile', suggestedName: fileName}, entry => {
+-        {type: 'saveFile', suggestedName: fileName},
+-        (entry?: FileSystemFileEntry) => {
 -          if (chrome.runtime.lastError) {
 -            if (chrome.runtime.lastError.message !== 'User cancelled') {
 -              console.error(
@@ -34,7 +35,7 @@ index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b
 -            }
 -            return;
 -          }
--          entry.createWriter(writer => {
+-          entry!.createWriter((writer: FileWriter) => {
 -            writer.write(blob);
 -            // Unblock closing the window now that the user has saved
 -            // successfully.
@@ -47,12 +48,11 @@ index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b
    }
  
    /**
-@@ -1111,30 +1098,13 @@ export class PDFViewerElement extends PDFViewerBaseElement {
-     if (!fileName.toLowerCase().endsWith('.pdf')) {
+@@ -982,30 +968,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        fileName = fileName + '.pdf';
      }
+ 
 -    // Create blob before callback to avoid race condition.
-+
 +    const a = document.createElement('a');
 +    a.download = fileName;
      const blob = new Blob([result.dataToSave], {type: 'application/pdf'});
@@ -62,7 +62,7 @@ index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b
 -          accepts: [{description: '*.pdf', extensions: ['pdf']}],
 -          suggestedName: fileName
 -        },
--        entry => {
+-        (entry?: FileSystemFileEntry) => {
 -          if (chrome.runtime.lastError) {
 -            if (chrome.runtime.lastError.message !== 'User cancelled') {
 -              console.error(
@@ -71,7 +71,7 @@ index f3d71309080248024983891acb17d4df69648056..3cd563ed13ab9bd8fa084f54eb8f112b
 -            }
 -            return;
 -          }
--          entry.createWriter(writer => {
+-          entry!.createWriter((writer: FileWriter) => {
 -            writer.write(blob);
 -            // Unblock closing the window now that the user has saved
 -            // successfully.
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 458f2e257efd7..1bc8ed89784d0 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 7440f2025701ccde0ade36cda22467dd0614109b..3c6ee78454dc9154a37ec9046e382878ffda0c82 100644
+index 55224f960151b0cae23b2a49d755eace630e9e3a..86ab5a5e5e3e881fdaf3528640f097493123da74 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1830,7 +1830,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1827,7 +1827,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,7 +21,7 @@ index 7440f2025701ccde0ade36cda22467dd0614109b..3c6ee78454dc9154a37ec9046e382878
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index cd1b44d4ff5ce8924749ba9e41b3f599108bb8fd..72bc509b0506fafd026aa858864623886142b5f0 100644
+index d159f44dc855fee799f7b97b59a2a4e64631e7b4..b583fb7ff191d5dfce4b8fee5f06e074b3a6ea4f 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
index 7460a09ea3beb..f9edde8861faa 100644
--- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
+++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
@@ -59,10 +59,10 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
    // true if register successfully, or false if 1) the specificied |accelerator|
    // has been registered by another caller or other native applications, or
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index ac923f436cbdd6ded0629da4e4c659d94258e55b..43f9531075bcef87de8e60f24071f49fe4cd0891 100644
+index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f15d80a7e 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
-@@ -55,7 +55,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
+@@ -56,7 +56,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
                                 CanActiveMediaSessionControllerReceiveEvents();
  
    // Tell the underlying MediaKeysListener to listen for the key.
@@ -76,7 +76,7 @@ index ac923f436cbdd6ded0629da4e4c659d94258e55b..43f9531075bcef87de8e60f24071f49f
        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
      return false;
    }
-@@ -238,18 +243,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+@@ -239,18 +244,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
  #endif
  
    if (system_media_controls_) {
diff --git a/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
index 86a3c0fbc97be..5f83968390667 100644
--- a/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
+++ b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
@@ -48,10 +48,10 @@ index 4a894ef70eeb1d8489049aef552c9bae4f24ae62..f5049d730a850f2947023f976b25fb77
      }
    }
 diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.h b/content/browser/renderer_host/legacy_render_widget_host_win.h
-index 79dffd981f4d461f30bd3796cfba1457eda3a89d..ae378ce95f90989fd0e74c38b57f5f7dc0a1ee29 100644
+index 81e5cde38627914e6a19ed2c1ab62547fdd7fc19..111c59c91073578d8d176598b5e4d10b84918d4c 100644
 --- a/content/browser/renderer_host/legacy_render_widget_host_win.h
 +++ b/content/browser/renderer_host/legacy_render_widget_host_win.h
-@@ -105,6 +105,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
+@@ -106,6 +106,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
      MESSAGE_HANDLER_EX(WM_NCHITTEST, OnNCHitTest)
      MESSAGE_RANGE_HANDLER(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK,
                            OnMouseRange)
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
index f957509ddd87c..dfbc1343d6826 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
@@ -14,10 +14,10 @@ but it's not strictly necessary for this API to work to spec.
 Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index 9b2c91d39324b61afa49ccea6be2eda8308473ff..1652b52c5c752809348b3ab44d3703ac343c829d 100644
+index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f99dea3f1 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-@@ -382,13 +382,9 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -384,13 +384,9 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -33,7 +33,7 @@ index 9b2c91d39324b61afa49ccea6be2eda8308473ff..1652b52c5c752809348b3ab44d3703ac
  #endif
  
    toggled_into_fullscreen_ = true;
-@@ -401,6 +397,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -403,6 +399,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        url = extension_caused_fullscreen_;
    }
  
@@ -41,7 +41,7 @@ index 9b2c91d39324b61afa49ccea6be2eda8308473ff..1652b52c5c752809348b3ab44d3703ac
    if (display_id != display::kInvalidDisplayId) {
      // Check, but do not prompt, for permission to request a specific screen.
      // Sites generally need permission to get the display id in the first place.
-@@ -413,6 +410,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -415,6 +412,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        display_id = display::kInvalidDisplayId;
      }
    }
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 0559a3d4c4528..929bc1574435b 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,7 +7,7 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a65560d9e 100644
+index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b90008d9b 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
 @@ -20,7 +20,10 @@
@@ -61,21 +61,22 @@ index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a
    data.SetStringKey(kInternal, show_internal ? kOn : kOff);
  
    std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
-@@ -271,11 +278,11 @@ void HandleAccessibilityRequestCallback(
+@@ -271,12 +278,12 @@ void HandleAccessibilityRequestCallback(
    data.Set(kPagesField, std::move(rvh_list));
  
    std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
 -#if !BUILDFLAG(IS_ANDROID)
 +#if 0
    for (Browser* browser : *BrowserList::GetInstance()) {
-     browser_list->Append(BuildTargetDescriptor(browser));
+     browser_list->Append(
+         base::Value::FromUniquePtrValue(BuildTargetDescriptor(browser)));
    }
 -#endif  // !BUILDFLAG(IS_ANDROID)
 +#endif // !BUILDFLAG(IS_ANDROID)
    data.Set(kBrowsersField, std::move(browser_list));
  
    std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
-@@ -491,8 +498,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
+@@ -493,8 +500,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
  
    AllowJavascript();
    if (flag_name_str == kInternal) {
@@ -86,7 +87,7 @@ index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a
      return;
    }
  
-@@ -599,10 +608,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -601,10 +610,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -100,7 +101,7 @@ index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a
    result->SetStringKey(kTreeField, accessibility_contents);
    FireWebUIListener(request_type, *(result.get()));
  }
-@@ -627,6 +638,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -629,6 +640,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -108,7 +109,7 @@ index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a
    for (Browser* browser : *BrowserList::GetInstance()) {
      if (browser->session_id().id() == session_id) {
        std::unique_ptr<base::DictionaryValue> result(
-@@ -641,6 +653,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -643,6 +655,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
        return;
      }
    }
@@ -116,7 +117,7 @@ index 555dba06e99bd7294f88a21ddaf3b86a12fdd5ac..8064592eb285d1407ff8334149c27e3a
  #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
    std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-@@ -757,5 +770,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+@@ -759,5 +772,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  // static
  void AccessibilityUIMessageHandler::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index 7addac9d25797..fb162f70ab70e 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -62,10 +62,10 @@ index 9e351c7e80a135adf0ebe011763f5164e51981bb..b9fcb4d2a8c7a22ebc7cd8434636454e
    PMPrintSettings print_settings =
        static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
 diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
-index a964910a3b7e3bd225a3b8dc35ef9dc57c77248d..9f791d9ba5f0b540f5e3a67f5e1abb318ddb7680 100644
+index ba604d33cc0601276320f3f81f20e98cb2811f74..1da667c66b75ab44727c5029c02d44379f924007 100644
 --- a/printing/printing_context_system_dialog_win.cc
 +++ b/printing/printing_context_system_dialog_win.cc
-@@ -54,14 +54,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
+@@ -53,14 +53,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
    PRINTPAGERANGE ranges[32];
    dialog_options.nStartPage = START_PAGE_GENERAL;
    if (max_pages) {
@@ -74,7 +74,7 @@ index a964910a3b7e3bd225a3b8dc35ef9dc57c77248d..9f791d9ba5f0b540f5e3a67f5e1abb31
 -    ranges[0].nFromPage = 1;
 -    ranges[0].nToPage = max_pages;
 -    dialog_options.nPageRanges = 1;
--    dialog_options.nMaxPageRanges = base::size(ranges);
+-    dialog_options.nMaxPageRanges = std::size(ranges);
 +
 +    auto page_ranges = settings_->ranges();
 +    if (!page_ranges.empty()) {
@@ -95,7 +95,7 @@ index a964910a3b7e3bd225a3b8dc35ef9dc57c77248d..9f791d9ba5f0b540f5e3a67f5e1abb31
 +
      dialog_options.nMinPage = 1;
      dialog_options.nMaxPage = max_pages;
-+    dialog_options.nMaxPageRanges = base::size(ranges);
++    dialog_options.nMaxPageRanges = std::size(ranges);
      dialog_options.lpPageRanges = ranges;
    } else {
      // No need to bother, we don't know how many pages are available.
diff --git a/patches/chromium/fix_use_electron_generated_resources.patch b/patches/chromium/fix_use_electron_generated_resources.patch
index 60b0f49524594..686e94326c210 100644
--- a/patches/chromium/fix_use_electron_generated_resources.patch
+++ b/patches/chromium/fix_use_electron_generated_resources.patch
@@ -12,7 +12,7 @@ as they will loaded as empty strings.
 * IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
 
 diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
-index f72431f5bc7ba82316cf318f7845e7523c366d92..5133f3cd28c0d630a039118eb91c6c37ee202f3e 100644
+index ccb9d3fb018b4153cfebad8b87579dd5005398e9..5ee9583dddcceed80c7a6e0fa6a0365dbd6c9a6a 100644
 --- a/chrome/browser/pdf/pdf_extension_util.cc
 +++ b/chrome/browser/pdf/pdf_extension_util.cc
 @@ -11,8 +11,7 @@
@@ -24,7 +24,7 @@ index f72431f5bc7ba82316cf318f7845e7523c366d92..5133f3cd28c0d630a039118eb91c6c37
 +#include "electron/grit/electron_resources.h"
  #include "components/strings/grit/components_strings.h"
  #include "components/zoom/page_zoom_constants.h"
- #include "pdf/pdf_features.h"
+ #include "ui/base/l10n/l10n_util.h"
 diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
 index 6d18517898c11c6a628cec2eade57fe845827b3d..a21f52e8a3c6f80d69b27faae4b77700fdd09e35 100644
 --- a/chrome/browser/printing/printing_service.cc
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 481bd633fe47e..80c56304eadfc 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 1ca418461788e5b7d58c14b03c456d2c21f1305b..7a65b6713e3d0547f1990f8c59d0d11459532477 100644
+index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00aaf5f972d 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3089,6 +3089,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3167,6 +3167,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 1ca418461788e5b7d58c14b03c456d2c21f1305b..7a65b6713e3d0547f1990f8c59d0d114
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 2fe1462a2cd92a731a5816b5fc22b059bad92fe8..a4dfa54a7844983262cc0fa635433131382e4d14 100644
+index 8573ea54135e363f83bd786db3483d1c539e4bb1..11036e52affafe46bab3146184b8d89696d4163c 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -275,6 +275,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -276,6 +276,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index 5043b8a49a854..e67cc4c13a9ed 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,10 +38,10 @@ index 1e36669dfb275b8a7c4913c8465bd299c548ed3a..178023d52c9e8ef716ee215e7a243b18
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index f411bbde031d18bd3e0322ce154ccfd8eace930d..5db96b7402de70d1b4eba8b12a51fbc89fcb7fb6 100644
+index b123e69bf6a57b1a4041c79c1cddd0117ed3851c..a8a23ccd0837866c1cb0657e0b8713d484042f38 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -342,12 +342,14 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -348,7 +348,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -51,6 +51,9 @@ index f411bbde031d18bd3e0322ce154ccfd8eace930d..5db96b7402de70d1b4eba8b12a51fbc8
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
+@@ -358,7 +359,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+   // See https://crbug.com/v8/11043
+   SetFlags(mode, js_command_line_flags);
  
 -  v8::V8::InitializePlatform(V8Platform::Get());
 +  if (create_v8_platform)
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index e595534ffa59e..ea0050fc48222 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 77f77f2deb13fc1c02903fc436028cce2d051cf0..25223130a82b22ad46eddf7e133c6085c5c843d3 100644
+index 22896db086972ff3865df9cbb4d904f1e00b7321..8e23293f8cd7f0a4203b3d5fdae24aa5e26fc2ec 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -952,6 +952,11 @@
+@@ -955,6 +955,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index 52f3cc0d8a50e..db6a2993b6c77 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index dd65850ec1352b764a9661b37e7c7b5e7d256016..89094825f858dcd91298dbaf26b370ca57eb4836 100644
+index 27d6cc30cad2dffed0a2587fdd49199248e006e1..f6c0974ca21e6b83faf81e5d11add0eb534645d1 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 6682f1b87ea4a..c558d7e41b89e 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index ee41efe814da161cafb49229e1f02c8b82749e7c..494bbdeea2725e4b1218ba534fd126203012c100 100755
+index ceeeedc42d9fe86383f9fda2b1a26d39119e655c..ff3b3cb47cbce01bcdcb28f1ef8a360143b2488f 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index b960942083b87..d8a9cd23bbe73 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 9d22238878e3204dd1d866d2bb085d5311dca36a..e3610815fd942e631a61089ca5eeba07edd7213c 100644
+index 7074141f95253587ae3ca156118ac6b10dd60e26..0476d00de005060c991cd6fa9ccd323ef5d56ea3 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -249,11 +249,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -248,11 +248,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
index 6cf5df78a02c3..def44cb73a8ec 100644
--- a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
+++ b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -9,10 +9,10 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index 332b7d026e0365a66d5f4f275a90b48d0f2db5aa..3813fe1a3b2e95af5e213201ab3ea08a656e01c3 100644
+index bb2d3e991195877264fca46abd224d3a6ffd17e8..fc4f271f54235d2d8d823fdb0d95e3c76243390f 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -381,8 +381,12 @@ RunContentProcess(ContentMainParams params,
+@@ -387,8 +387,12 @@ RunContentProcess(ContentMainParams params,
  
  #if BUILDFLAG(IS_WIN)
      // Route stdio to parent console (if any) or create one.
diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch
index 88035201b5109..7efd6508d3fcc 100644
--- a/patches/chromium/mas-cfisobjc.patch
+++ b/patches/chromium/mas-cfisobjc.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of _CFIsObjC
 Removes usage of the _CFIsObjC private API.
 
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index bd26c088c2340f0c88227837fc797b1ed8157768..6e133c11acb7ea2570e6295b0788edc1606afbc2 100644
+index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
-@@ -31,12 +31,6 @@
+@@ -30,12 +30,6 @@
  #if !BUILDFLAG(IS_IOS)
  CFTypeID SecACLGetTypeID();
  CFTypeID SecTrustedApplicationGetTypeID();
@@ -22,7 +22,7 @@ index bd26c088c2340f0c88227837fc797b1ed8157768..6e133c11acb7ea2570e6295b0788edc1
  #endif
  }  // extern "C"
  
-@@ -317,8 +311,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -32,7 +32,7 @@ index bd26c088c2340f0c88227837fc797b1ed8157768..6e133c11acb7ea2570e6295b0788edc1
    return ns_val;
  }
  
-@@ -389,9 +382,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  
diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch
index c55b2981c5830..50554c76583ba 100644
--- a/patches/chromium/mas-cgdisplayusesforcetogray.patch
+++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of CGDisplayUsesForceToGray
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 1fb42e658d219e46bbc157d929d3b2158c063204..cb6dec724dbe511cb0c66d507d0b68db7296b648 100644
+index 21778ef0c7657937987fdc70bf9ceb9439aebf15..2f6e1390a3b824d80832e47f6c368e757e2d9806 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -155,7 +155,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
+@@ -162,7 +162,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
      display.set_color_depth(Display::kDefaultBitsPerPixel);
      display.set_depth_per_component(Display::kDefaultBitsPerComponent);
    }
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 21bddfec34c2b..8ac081f88cbfc 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -11,7 +11,7 @@ needs to think it's coming from the PWA process). I think it can just be chopped
 out -- if there are any side-effects, we should be able to work around them.
 
 diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm
-index 9734fb620a9a4010083af41a9e5cea038556eef5..05c95fb9b15f5ccbfecaee29d360dd27bf42f086 100644
+index 04691696ee653b95cf046edfd464b1a800a38abe..b567b1e1fa9e5103a6219292a649f8807f0aa7ae 100644
 --- a/components/remote_cocoa/app_shim/application_bridge.mm
 +++ b/components/remote_cocoa/app_shim/application_bridge.mm
 @@ -51,6 +51,7 @@
@@ -44,10 +44,10 @@ index 9734fb620a9a4010083af41a9e5cea038556eef5..05c95fb9b15f5ccbfecaee29d360dd27
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index fedefafc9837f681ad1c3fc48d06a333fea893e2..f07a090c24382c9330e8bd8baa3de47ec76da956 100644
+index 6394980da8ab8b38e29693ccedfc3827ac111a4c..7fff28ee83475963f80987f7736ac866daa7dad2 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -561,10 +561,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -567,10 +567,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -87,7 +87,7 @@ index 2cd40c288f42937688e4f846a002779158ada68f..f4c7bb0ab75835bfdbd100ce852646bf
  }
  
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 80d639b4a9eb7fa9265da4977782d125b72db719..5f82a49f6336cf89c8d404f8aef7b103709c95e9 100644
+index 2b99d6a9f13f12a2a470fb6a5aa98c05f26a54c7..46d735add749d76c32f80512d00373b442248c6a 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
 @@ -49,7 +49,9 @@ class ScopedPasswordInputEnabler;
@@ -100,7 +100,7 @@ index 80d639b4a9eb7fa9265da4977782d125b72db719..5f82a49f6336cf89c8d404f8aef7b103
  @class RenderWidgetHostViewCocoa;
  
  namespace content {
-@@ -665,10 +667,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -661,10 +663,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
    // EnsureSurfaceSynchronizedForWebTest().
    uint32_t latest_capture_sequence_number_ = 0u;
  
@@ -114,10 +114,10 @@ index 80d639b4a9eb7fa9265da4977782d125b72db719..5f82a49f6336cf89c8d404f8aef7b103
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c1a64c5d2 100644
+index 14fec4b1b39d995553b029ca7ec780ce29b27162..54a1142f17e2a63b86e1fab52ea90276091c85a4 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -253,8 +253,10 @@
+@@ -252,8 +252,10 @@
  void RenderWidgetHostViewMac::MigrateNSViewBridge(
      remote_cocoa::mojom::Application* remote_cocoa_application,
      uint64_t parent_ns_view_id) {
@@ -128,7 +128,7 @@ index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1498,8 +1500,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1519,8 +1521,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c
    return [GetInProcessNSView() window];
  }
  
-@@ -1543,9 +1547,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1564,9 +1568,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2038,12 +2044,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2061,12 +2067,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,10 +167,10 @@ index 09ada3b859e1862cbf365960422871a56af54983..58002d37ba340f84f47e2522c0d7bf7c
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 37f37c3a8e8a00cf9d4b8959ac2d97fe31629ad8..fa06bafbbaa69a20ce5a3260ca92947cb2bb9228 100644
+index be753e5ea42cc8757b0e7f9a21aa12b40f1928f2..83f3ef36e17b484d838c9338ae6ad0073b42283c 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -317,6 +317,13 @@ component("base") {
+@@ -319,6 +319,13 @@ component("base") {
      ]
    }
  
@@ -205,7 +205,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index 1964f624abc96c54645d1697b598799cfd9a2a00..30580103974b99dcaed2adb0b460b1af17658927 100644
+index d4051a7a8755c7b10d4df3746cb2857471f07c45..de04616893d1c97e3607eb5a4b942733ae597b05 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
 @@ -31,7 +31,9 @@
@@ -218,7 +218,7 @@ index 1964f624abc96c54645d1697b598799cfd9a2a00..30580103974b99dcaed2adb0b460b1af
  @class NSView;
  
  namespace remote_cocoa {
-@@ -445,11 +447,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -449,11 +451,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -233,10 +233,10 @@ index 1964f624abc96c54645d1697b598799cfd9a2a00..30580103974b99dcaed2adb0b460b1af
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index b77478d96caba7e94c198e9cc8cdd7a6b78e6b25..79af41886c66b51219b69282db17497c5af702d5 100644
+index 7ed5041b0625a98be269b4f4daeef33c3bc1f8b6..803d8bc43fa57c8e49d33d4be618d51a408ffe47 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -294,14 +294,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -296,14 +296,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +259,7 @@ index b77478d96caba7e94c198e9cc8cdd7a6b78e6b25..79af41886c66b51219b69282db17497c
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1275,6 +1283,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1287,6 +1295,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index b77478d96caba7e94c198e9cc8cdd7a6b78e6b25..79af41886c66b51219b69282db17497c
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1282,14 +1291,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1294,14 +1303,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index 02127ca0ad5c1..dd209431cba87 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -139,10 +139,10 @@ index 3f7dce0281f7b5a540d7b9377ef14a8a6aa9a2fa..11d8419791f3e45d5242081422d452d4
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 6ffc09426b92b0623957f4a5f547865f49e29546..45cf4e11a77c175d61c2ffe69009802596c97e25 100644
+index ebe37172d254e8441fe2b8c290bd5a59af38d754..6a131f5c41f3e43a1467efeec2ce63f6903691b7 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
-@@ -175,6 +175,12 @@ source_set("audio") {
+@@ -173,6 +173,12 @@ source_set("audio") {
        "mac/scoped_audio_unit.cc",
        "mac/scoped_audio_unit.h",
      ]
@@ -169,7 +169,7 @@ index ebdc6364312ee710d416318836c03aeec9bfb65c..aa9b50de7efaf0e1b64effea93204984
  }
  
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index e59fec60e9d593d311b21c12daf2d611a36a2d6e..b812dee59b55edee6efe73ce4b1da0a89b45240e 100644
+index 3cce5f20af78f4456466df64fe0d040b5dba5fa8..1814ebbca91007b242a4e4ef359896594c23616a 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
 @@ -129,8 +129,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index d524259dd9428..e3324296a3770 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512cb388fc7 100644
+index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c889d3fa94 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -126,6 +126,11 @@
+@@ -127,6 +127,11 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "url/gurl.h"
  
@@ -22,7 +22,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -433,6 +438,91 @@ bool GetFullDataFilePath(
+@@ -434,6 +439,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -114,7 +114,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -671,6 +761,13 @@ void NetworkContext::SetClient(
+@@ -678,6 +768,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,7 +128,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2226,6 +2323,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2242,6 +2339,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,7 +139,7 @@ index 8ff62f92ed6efdbfc18db53db3c5bb59c1acfe34..20373c0e86852446569c401c4a993512
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 6de81678e62d6921d0df5944ab01705402caa568..e412608e7720004462c48698c8ec39602b2b900e 100644
+index 3fd4c43562aa5de00d8698096f154522420c8f24..eed05c05d1da28284af6ae0cef45dbbb47254058 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -105,6 +105,7 @@ class URLMatcher;
@@ -150,7 +150,7 @@ index 6de81678e62d6921d0df5944ab01705402caa568..e412608e7720004462c48698c8ec3960
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -220,6 +221,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -221,6 +222,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,7 +159,7 @@ index 6de81678e62d6921d0df5944ab01705402caa568..e412608e7720004462c48698c8ec3960
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -793,6 +796,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -796,6 +799,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    CertVerifierWithTrustAnchors* cert_verifier_with_trust_anchors_ = nullptr;
  #endif
  
@@ -169,10 +169,10 @@ index 6de81678e62d6921d0df5944ab01705402caa568..e412608e7720004462c48698c8ec3960
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 9cd06ee552f8e592dd9efd1e73b10e5998559c04..fa56cfed3703664232843ad26028096d95dca253 100644
+index 64199b44316ab4671941c734444d207591512d0a..c929eb10af5b8856debdc0d665eac767e9730714 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -277,6 +277,17 @@ struct NetworkContextFilePaths {
+@@ -280,6 +280,17 @@ struct NetworkContextFilePaths {
    bool trigger_migration = false;
  };
  
@@ -190,7 +190,7 @@ index 9cd06ee552f8e592dd9efd1e73b10e5998559c04..fa56cfed3703664232843ad26028096d
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -807,6 +818,9 @@ interface NetworkContext {
+@@ -829,6 +840,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index fbb057eaf0f80..ff03cd3658ee0 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -7,7 +7,7 @@ Pass RenderFrameHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.
 
 diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
-index 06a1db7fd9324de7d1fcf49c5b8a40b922a945be..c63b92a5a100785bf00b5e6da4c7f71bb9e769b7 100644
+index 225609e52130d4113c8ae667f3ffa565bbde5b73..b33d27ce4fc6222146255cf4c0e7342751c75c9b 100644
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
 @@ -196,6 +196,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
@@ -31,7 +31,7 @@ index b0e64049d411305d58802fd290bb0480e9b36fee..4afcf3b7a5b841409b0e1c4c2f32fd48
        const GURL& origin,
        const GURL& document_url,
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index 442b856f8bcfbcea7742188897f0ce0a25cd60f4..6165eb772901faa25514c9bbefd13ff6b45d6b33 100644
+index fd2c2d72ebc3cab0cc824bb091da32d4be635dd9..8bcd6a87c38413a5281d164e3c0fcfd23c3fa04b 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
 @@ -81,10 +81,12 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
@@ -90,7 +90,7 @@ index f0d5ea365cf09d2dc06de88fc03e4bf5ddfdf4a6..b68666813ab231a3d4233d3ed2f9655b
          /*document_url=*/GURL(),
          notification_service_remote_.BindNewPipeAndPassReceiver());
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index 8e23ab272000a1244959bf9164d6880660d4a843..ff89f2bdf07e91029841bab7ce7c7a92526c0132 100644
+index 5580c415a1e8a45327147861d7c71cebd1ecbd5a..d37711f83be7566ec5ad2078942aaca1948a77c5 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
 @@ -281,13 +281,14 @@ void PlatformNotificationContextImpl::Shutdown() {
@@ -131,10 +131,10 @@ index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df6
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index a1a3683b8da459a5859a2953536f3400a7fda213..602525302cfdd89bf2ddc2924076e7349de7562a 100644
+index cc5f7c8d616ec9a433da428f180483da60736a9d..fb25a7c19f20ca690963c5a15bd09224687b5f57 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2125,7 +2125,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2083,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/pepper_plugin_support.patch b/patches/chromium/pepper_plugin_support.patch
index b9d73ff072c6d..bae8f486133f3 100644
--- a/patches/chromium/pepper_plugin_support.patch
+++ b/patches/chromium/pepper_plugin_support.patch
@@ -7,13 +7,13 @@ This tweaks Chrome's pepper flash and PDF plugin support to make it
 usable from Electron.
 
 diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc244092d2 100644
+index 2425ccd480f4b0f3ac3b9dddb5dbf90639fe515b..6f20e2edd880e34149668ece6e80e79b3da8dc66 100644
 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
 +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
-@@ -7,17 +7,21 @@
+@@ -6,17 +6,21 @@
+ 
  #include <stddef.h>
  
- #include "base/cxx17_backports.h"
 +#if 0
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/profiles/profile.h"
@@ -32,7 +32,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  #include "ppapi/c/pp_errors.h"
  #include "ppapi/host/dispatch_host_message.h"
  #include "ppapi/host/host_message_context.h"
-@@ -26,12 +30,11 @@
+@@ -25,12 +29,11 @@
  #include "ppapi/shared_impl/file_system_util.h"
  #include "storage/browser/file_system/isolated_context.h"
  
@@ -46,7 +46,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  
  namespace {
  
-@@ -41,6 +44,7 @@ const char* kPredefinedAllowedCrxFsOrigins[] = {
+@@ -40,6 +43,7 @@ const char* kPredefinedAllowedCrxFsOrigins[] = {
  };
  
  }  // namespace
@@ -54,7 +54,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  
  // static
  PepperIsolatedFileSystemMessageFilter*
-@@ -64,11 +68,16 @@ PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
+@@ -63,11 +67,16 @@ PepperIsolatedFileSystemMessageFilter::PepperIsolatedFileSystemMessageFilter(
      const base::FilePath& profile_directory,
      const GURL& document_url,
      ppapi::host::PpapiHost* ppapi_host)
@@ -62,7 +62,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
      : render_process_id_(render_process_id),
        profile_directory_(profile_directory),
        document_url_(document_url) {
-   for (size_t i = 0; i < base::size(kPredefinedAllowedCrxFsOrigins); ++i)
+   for (size_t i = 0; i < std::size(kPredefinedAllowedCrxFsOrigins); ++i)
      allowed_crxfs_origins_.insert(kPredefinedAllowedCrxFsOrigins[i]);
 +#else
 +    : profile_directory_(profile_directory),
@@ -71,7 +71,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  }
  
  PepperIsolatedFileSystemMessageFilter::
-@@ -93,6 +102,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
+@@ -92,6 +101,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(
    return PP_ERROR_FAILED;
  }
  
@@ -79,7 +79,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    ProfileManager* profile_manager = g_browser_process->profile_manager();
-@@ -117,6 +127,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
+@@ -116,6 +126,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) {
    return storage::IsolatedContext::ScopedFSHandle();
  #endif
  }
@@ -87,7 +87,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  
  int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
      ppapi::host::HostMessageContext* context,
-@@ -125,7 +136,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
+@@ -124,7 +135,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
      case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
        break;
      case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
@@ -96,7 +96,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
    }
    NOTREACHED();
    context->reply_msg =
-@@ -133,6 +144,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
+@@ -132,6 +143,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
    return PP_ERROR_FAILED;
  }
  
@@ -104,7 +104,7 @@ index 308e7bff4ea829f5e68a93e77e0205f3f6a509c4..88a1e057ed8873f05e0d11160e7994bc
  int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
      ppapi::host::HostMessageContext* context) {
  #if BUILDFLAG(ENABLE_EXTENSIONS)
-@@ -173,3 +185,4 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
+@@ -172,3 +184,4 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
    return PP_ERROR_NOTSUPPORTED;
  #endif
  }
@@ -156,41 +156,28 @@ index 40fafdbed313800a3f420d9d5a3daf8bbbdb7d95..1367725e04455ba5f299b8341a28f222
  
  #endif  // CHROME_BROWSER_RENDERER_HOST_PEPPER_PEPPER_ISOLATED_FILE_SYSTEM_MESSAGE_FILTER_H_
 diff --git a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-index 4b84f4ef068a76fa2be244a7f7ca2c6a8734bd46..13ae0a57535dfb516eb70b272fdaa5a4720d0591 100644
+index e3ee403ec5d4d75f22f1853ec8637a0559ce3c43..76232286e02a20bcd578c5ba28af638dfc8f562c 100644
 --- a/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
 +++ b/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc
-@@ -6,8 +6,13 @@
+@@ -5,7 +5,9 @@
+ #include "chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h"
  
  #include "base/check_op.h"
- #include "chrome/renderer/pepper/pepper_flash_font_file_host.h"
 +#if 0
  #include "chrome/renderer/pepper/pepper_uma_host.h"
-+#endif
-+#include "electron/buildflags/buildflags.h"
-+#if BUILDFLAG(ENABLE_PDF_VIEWER)
- #include "components/pdf/renderer/pepper_pdf_host.h"
 +#endif
  #include "content/public/renderer/renderer_ppapi_host.h"
- #include "pdf/buildflags.h"
  #include "ppapi/host/ppapi_host.h"
-@@ -55,7 +60,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-     }
-   }
- 
--#if BUILDFLAG(ENABLE_PDF)
-+#if BUILDFLAG(ENABLE_PDF_VIEWER)
-   if (host_->GetPpapiHost()->permissions().HasPermission(
-           ppapi::PERMISSION_PDF)) {
-     switch (message.type()) {
-@@ -66,6 +71,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
-   }
- #endif
+ #include "ppapi/host/resource_host.h"
+@@ -33,6 +35,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
+   if (!host_->IsValidInstance(instance))
+     return nullptr;
  
 +#if 0
    // Permissions for the following interfaces will be checked at the
    // time of the corresponding instance's method calls.  Currently these
    // interfaces are available only for whitelisted apps which may not have
-@@ -75,6 +81,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
+@@ -42,6 +45,7 @@ ChromeRendererPepperHostFactory::CreateResourceHost(
        return std::make_unique<PepperUMAHost>(host_, instance, resource);
      }
    }
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index 22bc937a11a4c..ff258785cd530 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -9,49 +9,49 @@ don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-index 063cbf00a7ae871d426cef5cec00aa379c3ace11..444d3cc2e1b00a62f382232d3d2eccdd481abf11 100644
+index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc5599600c 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
 @@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/gfx/color_palette.h"
+ #include "ui/base/models/image_model.h"
 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-index 648e199cb015155ba84cf1c846cf6d2a16858007..294bfb625d1155e640eeeb37bea597dc2d980e58 100644
+index 7d0e39968bf34cdc99549cb48f6bf0a11c182565..f21c1672abf34dc9d19cd39c5d09083a60ef6978 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 @@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
  
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "third_party/skia/include/core/SkColor.h"
  #include "ui/base/cursor/cursor.h"
  #include "ui/base/l10n/l10n_util.h"
 diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index 0c1fa8676d00240e60ddd037664a409d1c9619dd..64d21f1878c3433324fc61353a10ee21d59c0b47 100644
+index d3400d7b02edc9cffba4cb53ec601b6e4cfea3b2..8e620ad6172a650ea96f80c0b44035932471d88b 100644
 --- a/chrome/browser/ui/views/overlay/close_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/close_image_button.cc
 @@ -6,7 +6,7 @@
  
  #include "build/chromeos_buildflags.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/gfx/color_palette.h"
+ #include "ui/base/models/image_model.h"
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d42815d9f4 100644
+index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca8751134eaf3c33 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-@@ -20,6 +20,7 @@
+@@ -15,24 +15,28 @@
  #include "base/timer/timer.h"
  #include "build/build_config.h"
  #include "chrome/app/vector_icons/vector_icons.h"
@@ -59,8 +59,12 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  #include "chrome/browser/command_updater_delegate.h"
  #include "chrome/browser/command_updater_impl.h"
  #include "chrome/browser/profiles/profile.h"
-@@ -28,14 +29,15 @@
+ #include "chrome/browser/themes/theme_service.h"
+ #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
++#endif
+ #include "chrome/browser/ui/color/chrome_color_id.h"
++#if 0
  #include "chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h"
  #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 +#endif
@@ -71,12 +75,13 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  #include "components/omnibox/browser/location_bar_model_impl.h"
  #include "components/vector_icons/vector_icons.h"
  #include "content/public/browser/document_picture_in_picture_window_controller.h"
+ #include "content/public/browser/picture_in_picture_window_controller.h"
  #include "content/public/browser/web_contents.h"
 +#include "electron/grit/electron_resources.h"
  #include "content/public/common/content_constants.h"
  #include "media/base/media_switches.h"
  #include "media/base/video_util.h"
-@@ -57,7 +59,7 @@
+@@ -57,7 +61,7 @@
  #include "ui/aura/window.h"
  #endif
  
@@ -85,7 +90,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-@@ -91,7 +93,7 @@ T* AddChildView(std::vector<std::unique_ptr<views::View>>* views,
+@@ -109,7 +113,7 @@ END_METADATA
  }  // namespace
  
  OverlayLocationBarViewProxy::~OverlayLocationBarViewProxy() = default;
@@ -94,7 +99,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  class OverlayLocationBarViewImpl : public OverlayLocationBarViewProxy,
                                     public ChromeLocationBarModelDelegate,
                                     public LocationBarView::Delegate,
-@@ -149,7 +151,7 @@ class OverlayLocationBarViewImpl : public OverlayLocationBarViewProxy,
+@@ -167,7 +171,7 @@ class OverlayLocationBarViewImpl : public OverlayLocationBarViewProxy,
    const std::unique_ptr<LocationBarModelImpl> location_bar_model_;
    CommandUpdaterImpl command_updater_;
  };
@@ -103,7 +108,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  // static
  std::unique_ptr<DocumentOverlayWindowViews> DocumentOverlayWindowViews::Create(
      content::DocumentPictureInPictureWindowController* controller,
-@@ -185,7 +187,7 @@ std::unique_ptr<DocumentOverlayWindowViews> DocumentOverlayWindowViews::Create(
+@@ -203,7 +207,7 @@ std::unique_ptr<DocumentOverlayWindowViews> DocumentOverlayWindowViews::Create(
    overlay_window->Init(std::move(params));
    overlay_window->OnRootViewReady();
  
@@ -112,7 +117,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
    std::wstring app_user_model_id;
    Browser* browser =
        chrome::FindBrowserWithWebContents(controller->GetWebContents());
-@@ -260,12 +262,6 @@ views::View* DocumentOverlayWindowViews::GetControlsContainerView() const {
+@@ -278,12 +282,6 @@ views::View* DocumentOverlayWindowViews::GetControlsContainerView() const {
    return controls_container_view_;
  }
  
@@ -125,7 +130,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
  void DocumentOverlayWindowViews::SetUpViews() {
    // The window content consists of the fixed-height controls_container_view at
    // the top which is a box layout, and the remainder of the view is filled with
-@@ -281,6 +277,7 @@ void DocumentOverlayWindowViews::SetUpViews() {
+@@ -299,6 +297,7 @@ void DocumentOverlayWindowViews::SetUpViews() {
    //   +-------------------------------------+
  
    content::WebContents* pip_contents = controller_->GetChildWebContents();
@@ -133,7 +138,7 @@ index d12f196f2e7b1a4b3936af2cb16d872e91785fe4..4a015d21cf27b975c87d91d2149555d4
    auto* profile =
        Profile::FromBrowserContext(pip_contents->GetBrowserContext());
    profile_for_theme_ = profile;
-@@ -291,8 +288,8 @@ void DocumentOverlayWindowViews::SetUpViews() {
+@@ -309,8 +308,8 @@ void DocumentOverlayWindowViews::SetUpViews() {
      location_bar_view_proxy_ = std::make_unique<OverlayLocationBarViewImpl>(
          profile, controller_->GetWebContents());
    }
@@ -157,20 +162,20 @@ index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd61
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
 diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
-index 8e54570ea4c83483eedee4c781f0498ba07bc3dd..b1eb0b2f1a3dfb71e1f5d3917c67e66ac2b27d22 100644
+index 26f8f5ffa444d874b229b5e8debf087e4469dfd1..10149e812a43e3d5c92701e9b2ae8d68ed8395c7 100644
 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc
 +++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
-@@ -4,7 +4,7 @@
- 
+@@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/hang_up_button.h"
  
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index d96a4937e6ff6bbf4311673b4c91e9f0e957832a..a06cae5f50eb671fc05bd3d41ae4d218a649e991 100644
+index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c36ad14705 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
 @@ -14,13 +14,15 @@
@@ -200,85 +205,85 @@ index d96a4937e6ff6bbf4311673b4c91e9f0e957832a..a06cae5f50eb671fc05bd3d41ae4d218
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index ad413df822af98f4f80a460c6e464cf5237d5ac4..821b75400a7a4921e59a414516739c6de5a66df7 100644
+index bcd3b2e1038786b660a4b91fbc20d9d8b4afffb4..a953c9d0ee0b49d6cc096e3eb236296b57cbc6c0 100644
 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
 @@ -6,7 +6,7 @@
  
  #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-index 90c9dbbfa741da8cf72594738c1686b14e277663..34063436a7e8e36f624c1b86765fe886434df54a 100644
+index 8bf217b9b0c2bd22d6940c24c58eccb9865c5286..91f061a1243135db475371dda00c2fe054f4e8e3 100644
 --- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
 +++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
 @@ -6,7 +6,7 @@
  
  #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "ui/base/hit_test.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-index ae3b37b13498d63b0bc8d7d66e228f974e1c4b4a..9a4e7de29921209a5a7807efeecb02e05f38692d 100644
+index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c9606e228db 100644
 --- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
 +++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
 @@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
  
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-index c5254509559fd89a8831d69498e2f120416b08df..711490193ac7a9a122fe2b85661dd1a63d3a06ac 100644
+index 46ec4441ddb227325b319359f9d33a80aa856d85..57957d72310c0a232c78489fba5a07cdf475dc53 100644
 --- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
 @@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
  
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-index 98d653475bf2aaa57bd11961df3697882a9a40d7..3870cad08c531a2a8b3f6ba84088065a0d31f033 100644
+index 59b9a5442185bfb9efd8ed571ec63d56e3bc3326..34d58bf54019e0b8001c29cb301861d045c60214 100644
 --- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
 @@ -5,7 +5,7 @@
  #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
  
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
-index d5690233eb85d9f2992ae90461c0d1fd83730d84..d32ee40d1dc7a0004d534540189179b240964888 100644
+index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aad66f20a9 100644
 --- a/chrome/browser/ui/views/overlay/track_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/track_image_button.cc
 @@ -6,7 +6,7 @@
  
  #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
+ #include "chrome/browser/ui/color/chrome_color_id.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index d25bffe434d866760d1efc4dd972b6ba4946acd0..2819bcefb83b6b4cb10114b7ad1df881ccade58d 100644
+index b2e281840f48592eb773c16042fb6b56a0fa132b..d5156bab0c81ca508733a8d3ba95f052ff6d83e6 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
@@ -290,10 +295,10 @@ index d25bffe434d866760d1efc4dd972b6ba4946acd0..2819bcefb83b6b4cb10114b7ad1df881
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
 +#endif
+ #include "chrome/browser/ui/color/chrome_color_id.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
- #include "chrome/browser/ui/views/overlay/close_image_button.h"
-@@ -28,10 +30,10 @@
+@@ -29,10 +31,10 @@
  #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
  #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
  #include "chrome/browser/ui/views/overlay/track_image_button.h"
@@ -305,7 +310,7 @@ index d25bffe434d866760d1efc4dd972b6ba4946acd0..2819bcefb83b6b4cb10114b7ad1df881
  #include "media/base/media_switches.h"
  #include "media/base/video_util.h"
  #include "third_party/skia/include/core/SkColor.h"
-@@ -53,7 +55,7 @@
+@@ -56,7 +58,7 @@
  #include "ui/aura/window.h"
  #endif
  
@@ -314,7 +319,7 @@ index d25bffe434d866760d1efc4dd972b6ba4946acd0..2819bcefb83b6b4cb10114b7ad1df881
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-@@ -127,7 +129,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
+@@ -148,7 +150,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
    overlay_window->Init(std::move(params));
    overlay_window->OnRootViewReady();
  
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index 686010806fc75..e81c37f12f38f 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,13 +8,19 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index 1b9518366ba6c44421a86565ea3eba80e14b6c43..203ac8902eda26262f4178985ee565874bf879b8 100644
+index d9db2d705c88e828383e81efd8f8c6d28e1520bb..7f0e1672af0fef134fc637324e366e9e8d985054 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
-@@ -121,6 +121,10 @@
-   E_CPONLY(kColorPwaSecurityChipForegroundSecure) \
-   E_CPONLY(kColorPwaToolbarBackground) \
-   E_CPONLY(kColorPwaToolbarForeground) \
+@@ -122,6 +122,16 @@
+   E_CPONLY(kColorOverlayScrollbarStrokeHoveredDark) \
+   E_CPONLY(kColorOverlayScrollbarStrokeHoveredLight) \
+   E_CPONLY(kColorProgressBar) \
++  E_CPONLY(kColorPwaSecurityChipForeground) \
++  E_CPONLY(kColorPwaSecurityChipForegroundDangerous) \
++  E_CPONLY(kColorPwaSecurityChipForegroundPolicyCert) \
++  E_CPONLY(kColorPwaSecurityChipForegroundSecure) \
++  E_CPONLY(kColorPwaToolbarBackground) \
++  E_CPONLY(kColorPwaToolbarForeground) \
 +  E_CPONLY(kColorResultsTableNormalBackground) \
 +  E_CPONLY(kColorResultsTableHoveredBackground) \
 +  E_CPONLY(kColorResultsTableNormalText) \
@@ -22,7 +28,7 @@ index 1b9518366ba6c44421a86565ea3eba80e14b6c43..203ac8902eda26262f4178985ee56587
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -173,6 +177,7 @@
+@@ -174,6 +184,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@@ -31,13 +37,13 @@ index 1b9518366ba6c44421a86565ea3eba80e14b6c43..203ac8902eda26262f4178985ee56587
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
-index 1d8415814c6245e3f2dfd01de7a2de11f09cdc7a..6db48efe454820e242b862edbfaf4d40cf16eb9d 100644
+index a89f393da6c06ba21d5303a925dd9e907bde5e03..e0106610831ca36544161672f3663e54b2585228 100644
 --- a/ui/color/ui_color_mixer.cc
 +++ b/ui/color/ui_color_mixer.cc
-@@ -141,6 +141,17 @@ void AddUiColorMixer(ColorProvider* provider,
-       kColorPwaSecurityChipForeground};
-   mixer[kColorPwaToolbarBackground] = {kColorEndpointBackground};
-   mixer[kColorPwaToolbarForeground] = {kColorEndpointForeground};
+@@ -138,6 +138,17 @@ void AddUiColorMixer(ColorProvider* provider,
+       SetAlpha(GetColorWithMaxContrast(kColorOverlayScrollbarFillHoveredLight),
+                gfx::kGoogleGreyAlpha500);
+   mixer[kColorProgressBar] = {kColorAccent};
 +  mixer[kColorResultsTableNormalBackground] = {SK_ColorWHITE};
 +  mixer[kColorResultsTableHoveredBackground] =
 +      SetAlpha(kColorResultsTableNormalText, 0x0D);
@@ -52,7 +58,7 @@ index 1d8415814c6245e3f2dfd01de7a2de11f09cdc7a..6db48efe454820e242b862edbfaf4d40
    mixer[kColorSeparator] = {kColorMidground};
    mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
    mixer[kColorShadowValueAmbientShadowElevationThree] =
-@@ -216,6 +227,7 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -213,6 +224,7 @@ void AddUiColorMixer(ColorProvider* provider,
    mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
    mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
        kColorTreeNodeForegroundSelectedFocused};
@@ -61,10 +67,10 @@ index 1d8415814c6245e3f2dfd01de7a2de11f09cdc7a..6db48efe454820e242b862edbfaf4d40
  }
  
 diff --git a/ui/color/win/native_color_mixers_win.cc b/ui/color/win/native_color_mixers_win.cc
-index 5faab22f665829e04cc07125f2486b9cb35f1f56..9776dbcc576c62ee44cbdd0d59542856363fb8f4 100644
+index 0620a389750649218865de06ed5d66f9ffe71871..575dcd925807263a9a5657d5156a3772421a0ed5 100644
 --- a/ui/color/win/native_color_mixers_win.cc
 +++ b/ui/color/win/native_color_mixers_win.cc
-@@ -136,16 +136,22 @@ void AddNativeUiColorMixer(ColorProvider* provider,
+@@ -136,6 +136,10 @@ void AddNativeUiColorMixer(ColorProvider* provider,
        SetAlpha(kColorNotificationInputForeground, gfx::kGoogleGreyAlpha700);
    mixer[kColorSliderTrack] = AlphaBlend(
        kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
@@ -75,8 +81,10 @@ index 5faab22f665829e04cc07125f2486b9cb35f1f56..9776dbcc576c62ee44cbdd0d59542856
  
    // Window Background
    mixer[kColorBubbleFooterBackground] = {kColorNativeWindow};
+@@ -143,11 +147,13 @@ void AddNativeUiColorMixer(ColorProvider* provider,
+   mixer[kColorFrameActive] = {ui::kColorNativeWindow};
+   mixer[kColorFrameInactive] = {ui::kColorNativeWindow};
    mixer[kColorTooltipBackground] = {kColorNativeWindow};
-   mixer[kColorButtonBackgroundProminentDisabled] = {kColorNativeWindow};
 +  mixer[kColorResultsTableNormalBackground] = {kColorNativeWindow};
  
    // Window Text
@@ -87,7 +95,7 @@ index 5faab22f665829e04cc07125f2486b9cb35f1f56..9776dbcc576c62ee44cbdd0d59542856
  
    // Hyperlinks
    mixer[kColorLinkForeground] = {kColorNativeHotlight};
-@@ -179,6 +185,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
+@@ -181,6 +187,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
    mixer[kColorTextfieldForeground] = {kColorNativeBtnText};
    mixer[kColorTextfieldForegroundPlaceholder] = {kColorNativeBtnText};
    mixer[kColorTextfieldForegroundDisabled] = {kColorNativeBtnText};
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 86e14be4b6659..6aae32dba1e9f 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,10 +69,10 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 7dbb9aea759e4a80a4ef3133eeffcd952bbe6d50..62fbaa0e24dff2037f47ef4ccf09993aa79b3ef8 100644
+index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b2d05ae45 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
-@@ -20,13 +20,13 @@
+@@ -20,7 +20,6 @@
  #include "build/build_config.h"
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/printing/print_job.h"
@@ -80,14 +80,15 @@ index 7dbb9aea759e4a80a4ef3133eeffcd952bbe6d50..62fbaa0e24dff2037f47ef4ccf09993a
  #include "components/crash/core/common/crash_keys.h"
  #include "components/device_event_log/device_event_log.h"
  #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
+@@ -28,6 +27,7 @@
+ #include "content/public/browser/global_routing_id.h"
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/web_contents.h"
 +#include "electron/grit/electron_resources.h"
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -239,16 +239,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+@@ -234,16 +234,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -113,10 +114,10 @@ index 7dbb9aea759e4a80a4ef3133eeffcd952bbe6d50..62fbaa0e24dff2037f47ef4ccf09993a
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index 457749cf31578666304c30a5df1b8428629caafe..21c4a76411ee06775fb5bbb2d5a2ac17911d1c2a 100644
+index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782bbc06564 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -225,7 +225,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -226,7 +226,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -126,10 +127,10 @@ index 457749cf31578666304c30a5df1b8428629caafe..21c4a76411ee06775fb5bbb2d5a2ac17
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd0828b8a1 100644
+index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521e01702ac 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
-@@ -29,10 +29,10 @@
+@@ -30,10 +30,10 @@
  #include "chrome/browser/printing/print_view_manager_common.h"
  #include "chrome/browser/printing/printer_query.h"
  #include "chrome/browser/profiles/profile.h"
@@ -142,7 +143,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  #include "components/prefs/pref_service.h"
  #include "components/printing/browser/print_composite_client.h"
  #include "components/printing/browser/print_manager_utils.h"
-@@ -47,6 +47,7 @@
+@@ -49,6 +49,7 @@
  #include "content/public/browser/render_process_host.h"
  #include "content/public/browser/render_view_host.h"
  #include "content/public/browser/web_contents.h"
@@ -150,7 +151,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"
-@@ -81,6 +82,8 @@ using PrintSettingsCallback =
+@@ -86,6 +87,8 @@ using PrintSettingsCallback =
      base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
@@ -159,7 +160,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -89,6 +92,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -94,6 +97,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -167,7 +168,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -188,7 +192,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -178,7 +179,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -241,6 +247,7 @@ void ScriptedPrintReplyOnIO(
+@@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -186,7 +187,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -250,8 +257,9 @@ void ScriptedPrintReplyOnIO(
+@@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -197,7 +198,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -290,12 +298,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -212,7 +213,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -303,7 +313,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -224,7 +225,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -326,7 +339,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -328,7 +341,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
    // go in `ReleasePrintJob()`.
  
    SetPrintingRFH(rfh);
@@ -235,7 +236,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -470,7 +485,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -471,7 +486,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -245,7 +246,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
    if (!content::RenderProcessHost::FromID(process_id)) {
-@@ -478,16 +494,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -479,16 +495,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -259,17 +260,17 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  
  void PrintViewManagerBase::UpdatePrintingEnabled() {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-   // The Unretained() is safe because ForEachFrame() is synchronous.
--  web_contents()->ForEachFrame(base::BindRepeating(
+   // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
+-  web_contents()->GetMainFrame()->ForEachRenderFrameHost(base::BindRepeating(
 -      &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
 -      printing_enabled_.GetValue()));
-+  web_contents()->ForEachFrame(
++  web_contents()->GetMainFrame()->ForEachRenderFrameHost(
 +      base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
 +                          base::Unretained(this), true));
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -601,12 +620,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -602,12 +621,13 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -322,16 +323,16 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
 +    std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
      return;
    }
-   int process_id = render_process_host->GetID();
-@@ -693,7 +716,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+   auto callback_wrapper = base::BindOnce(
+@@ -691,7 +714,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+ #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
 -  ShowPrintErrorDialog();
  #endif
  
    ReleasePrinterQuery();
-@@ -708,6 +730,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -706,6 +728,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -343,13 +344,15 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -718,8 +745,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -716,10 +743,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
-+#if 0 // Printing is always enabled.
-   if (new_state == content::RenderFrameHost::LifecycleState::kActive)
++#if 0
+   if (new_state == content::RenderFrameHost::LifecycleState::kActive &&
+       render_frame_host->GetProcess()->IsPdf()) {
      SendPrintingEnabled(printing_enabled_.GetValue(), render_frame_host);
+   }
 +#endif
  }
  
@@ -402,7 +405,7 @@ index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd
  
    if (!cookie) {
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 2661776307f773ac8f2c62529ec86349b045ee8f..4fa8f358ee59baed32ef4fd0684d010256206a54 100644
+index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d0320000437dfb 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
 @@ -37,6 +37,8 @@ namespace printing {
@@ -420,9 +423,9 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..4fa8f358ee59baed32ef4fd0684d0102
    // this function. Returns false if printing is impossible at the moment.
 -  virtual bool PrintNow(content::RenderFrameHost* rfh);
 +  virtual bool PrintNow(content::RenderFrameHost* rfh,
-+                        bool silent,
-+                        base::Value settings,
-+                        CompletionCallback callback);
++                        bool silent = true,
++                        base::Value settings = {},
++                        CompletionCallback callback = {});
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Prints the document in `print_data` with settings specified in
@@ -460,8 +463,83 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..4fa8f358ee59baed32ef4fd0684d0102
    // Set while running an inner message loop inside RenderAllMissingPagesNow().
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
+diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
+index 879004c790d57b28e7a816ebf560971876c17168..334509d3ab45af4bb7877f656ca5aca7ee1bce00 100644
+--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
++++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
+@@ -20,7 +20,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
+ 
+ FakePrintRenderFrame::~FakePrintRenderFrame() = default;
+ 
+-void FakePrintRenderFrame::PrintRequestedPages() {}
++void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value /*settings*/) {}
+ 
+ void FakePrintRenderFrame::PrintForSystemDialog() {}
+ 
+diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
+index 10f46664d8337d6be2fac24d9a6933429f3b2c2b..6de833f2da3ae85cf0752284146974f2026ab174 100644
+--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
++++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
+@@ -24,7 +24,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
+ 
+  private:
+   // printing::mojom::PrintRenderFrame:
+-  void PrintRequestedPages() override;
++  void PrintRequestedPages(bool silent, ::base::Value settings) override;
+   void PrintForSystemDialog() override;
+   void SetPrintPreviewUI(
+       mojo::PendingAssociatedRemote<mojom::PrintPreviewUI> preview) override;
+diff --git a/components/printing/browser/print_to_pdf/pdf_print_manager.cc b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
+index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e534428dc49 100644
+--- a/components/printing/browser/print_to_pdf/pdf_print_manager.cc
++++ b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
+@@ -116,7 +116,8 @@ void PdfPrintManager::PrintToPdf(
+   set_cookie(print_pages_params_->params->document_cookie);
+   callback_ = std::move(callback);
+ 
+-  GetPrintRenderFrame(rfh)->PrintRequestedPages();
++  // TODO(electron-maintainers): do something with job_settings here?
++  GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
+ }
+ 
+ void PdfPrintManager::GetDefaultPrintSettings(
+@@ -138,14 +139,14 @@ void PdfPrintManager::ScriptedPrint(
+   if (!printing_rfh_) {
+     DLOG(ERROR) << "Unexpected message received before PrintToPdf is "
+                    "called: ScriptedPrint";
+-    std::move(callback).Run(std::move(default_param));
++    std::move(callback).Run(std::move(default_param), true/*canceled*/);
+     return;
+   }
+   if (params->is_scripted &&
+       GetCurrentTargetFrame()->IsNestedWithinFencedFrame()) {
+     DLOG(ERROR) << "Unexpected message received. Script Print is not allowed"
+                    " in a fenced frame.";
+-    std::move(callback).Run(std::move(default_param));
++    std::move(callback).Run(std::move(default_param), true/*canceled*/);
+     return;
+   }
+   absl::variant<printing::PageRanges, PageRangeError> page_ranges =
+@@ -162,7 +163,7 @@ void PdfPrintManager::ScriptedPrint(
+         break;
+     }
+     ReleaseJob(print_result);
+-    std::move(callback).Run(std::move(default_param));
++    std::move(callback).Run(std::move(default_param), true/*canceled*/);
+     return;
+   }
+ 
+@@ -170,7 +171,7 @@ void PdfPrintManager::ScriptedPrint(
+   print_pages_params_->pages = printing::PageRange::GetPages(
+       absl::get<printing::PageRanges>(page_ranges));
+ 
+-  std::move(callback).Run(print_pages_params_->Clone());
++  std::move(callback).Run(print_pages_params_->Clone(), false/*canceled*/);
+ }
+ 
+ void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df2d989964 100644
+index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496afa99ed539 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
 @@ -274,7 +274,7 @@ interface PrintPreviewUI {
@@ -469,7 +547,7 @@ index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page, and then switch back the CSS to display media type.
 -  PrintRequestedPages();
-+  PrintRequestedPages(bool silent, mojo_base.mojom.DictionaryValue settings);
++  PrintRequestedPages(bool silent, mojo_base.mojom.DeprecatedDictionaryValue settings);
  
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page using the print preview document's frame/node, and then
@@ -483,7 +561,7 @@ index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9c832bf5a 100644
+index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d0801b43a8ea 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -40,6 +40,7 @@
@@ -494,7 +572,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1254,7 +1255,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1263,7 +1264,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -504,7 +582,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
      if (!weak_this)
        return;
  
-@@ -1285,7 +1287,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1294,7 +1296,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -513,7 +591,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1300,7 +1302,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1309,7 +1311,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -522,7 +600,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1331,7 +1333,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1340,7 +1342,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -532,7 +610,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1378,6 +1381,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1387,6 +1390,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -541,7 +619,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
    print_preview_context_.OnPrintPreview();
  
    if (print_preview_context_.IsForArc()) {
-@@ -1915,7 +1920,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1924,7 +1929,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -551,7 +629,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1930,7 +1936,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1939,7 +1945,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -562,7 +640,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1938,7 +1946,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1947,7 +1955,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -571,7 +649,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1957,8 +1965,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1966,8 +1974,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -588,7 +666,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2206,36 +2221,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2215,36 +2230,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -652,7 +730,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2380,7 +2410,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2389,7 +2419,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -661,7 +739,7 @@ index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2625,18 +2655,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
+@@ -2634,18 +2664,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index 565c00742ba81..e5d125cd0dbb9 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -75,18 +75,18 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75 100644
+index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd0493c942 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
  #include <memory>
  #include <set>
  #include <string>
 +#include <tuple>
  #include <type_traits>
  
- #include <stddef.h>
-@@ -82,6 +83,7 @@
+ #include "base/base_paths.h"
+@@ -80,6 +81,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "base/task/sequenced_task_runner_helpers.h"
  #include "base/task/single_thread_task_runner.h"
@@ -94,7 +94,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  #include "base/threading/platform_thread.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "base/time/time.h"
-@@ -98,9 +100,11 @@
+@@ -96,9 +98,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -106,7 +106,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  
  #if defined(TOOLKIT_VIEWS) && \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -349,6 +353,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+@@ -347,6 +351,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -116,7 +116,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -368,6 +375,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -366,6 +373,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -124,7 +124,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -408,6 +416,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -406,6 +414,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -146,7 +146,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -775,6 +798,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -773,6 +796,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -157,7 +157,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -947,6 +974,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -945,6 +972,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -178,7 +178,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1046,14 +1087,32 @@ bool ProcessSingleton::Create() {
+@@ -1044,14 +1085,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -216,7 +216,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1096,10 +1155,13 @@ bool ProcessSingleton::Create() {
+@@ -1094,10 +1153,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
@@ -235,7 +235,7 @@ index c9f26ea2d2ea16484d416fdce095ec1b8b885991..7d3a441bdb64268ed5fbfa7bf589fb35
    return true;
  }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac53287f2d7 100644
+index e2312c65623a3f54ecbc18058720ccae53822e76..ec725b44296266bea1a51aea889463a0bba8449c 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
 @@ -28,7 +28,9 @@
@@ -265,7 +265,7 @@ index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac5
  }
  
  // Function was copied from Process::Terminate.
-@@ -245,9 +252,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -252,9 +259,13 @@ bool ProcessSingleton::EscapeVirtualization(
  }
  
  ProcessSingleton::ProcessSingleton(
@@ -279,7 +279,7 @@ index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac5
        is_virtualized_(false),
        lock_file_(INVALID_HANDLE_VALUE),
        user_data_dir_(user_data_dir),
-@@ -361,13 +372,16 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -368,13 +379,16 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
    return PROFILE_IN_USE;
  }
  
@@ -297,7 +297,7 @@ index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac5
  
    remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
    if (!remote_window_ && !EscapeVirtualization(user_data_dir_)) {
-@@ -376,7 +390,7 @@ bool ProcessSingleton::Create() {
+@@ -383,7 +397,7 @@ bool ProcessSingleton::Create() {
      // access. As documented, it's clearer to NOT request ownership on creation
      // since it isn't guaranteed we will get it. It is better to create it
      // without ownership and explicitly get the ownership afterward.
@@ -306,7 +306,7 @@ index 8eb7de0cd4007a5fd5431bcc7fb7be4962bd608e..0ea5eb3e3cf055d981ab73486115bac5
      if (!only_me.IsValid()) {
        DPLOG(FATAL) << "CreateMutex failed";
        return false;
-@@ -415,6 +429,17 @@ bool ProcessSingleton::Create() {
+@@ -422,6 +436,17 @@ bool ProcessSingleton::Create() {
              window_.CreateNamed(base::BindRepeating(&ProcessLaunchNotification,
                                                      notification_callback_),
                                  user_data_dir_.value());
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index ec5cabb02673a..a4aa00e1ae186 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 59437e69e25fe85cffc9b558dec2284123ac48be..d3af2aed32f6047cbb86bd2b4ce1df9fee80437c 100644
+index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d20db6210 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2082,6 +2082,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2073,6 +2073,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 59437e69e25fe85cffc9b558dec2284123ac48be..d3af2aed32f6047cbb86bd2b4ce1df9f
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c8e49eeaca8b31479aa908be9c349ccd625e9e51..5c63a024827359ccf697d0b7fc8fa2092eb107b7 100644
+index 92dcf2308842ce8922426b0cafdd5a3e83f4bd52..d69e028b34ab4407abcdea3ece93db39926c587e 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4486,6 +4486,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4494,6 +4494,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index c8e49eeaca8b31479aa908be9c349ccd625e9e51..5c63a024827359ccf697d0b7fc8fa209
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 85b426a7552cf925157a76fcd1ed7de47cd27a54..7440f2025701ccde0ade36cda22467dd0614109b 100644
+index fdb4a26de507f260466a7bc22c5cadc64190c342..55224f960151b0cae23b2a49d755eace630e9e3a 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -965,6 +965,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -961,6 +961,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
        blink::mojom::FrameVisibility visibility) override;
    void SendScreenRects() override;
    TextInputManager* GetTextInputManager() override;
diff --git a/patches/chromium/remove_incorrect_width_height_adjustments.patch b/patches/chromium/remove_incorrect_width_height_adjustments.patch
deleted file mode 100644
index 4fce52ba6e282..0000000000000
--- a/patches/chromium/remove_incorrect_width_height_adjustments.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bruce Dawson <brucedawson@chromium.org>
-Date: Mon, 28 Feb 2022 19:07:41 +0000
-Subject: Remove incorrect width/height adjustments
-
-In late 2016 a change which fixed some problems around window sizing
-when attaching or detaching additional displays was landed, which fixed
-some genuine bugs. Unfortunately it included a subtraction of 1 from the
-width and height of the Chrome window. I couldn't find any discussion of
-this size adjustment and I think that it was just a misunderstanding of
-how window rectangles work (inclusive versus exclusive extents).
-
-This size adjustment causes non-maximized Chrome windows to shrink every
-time a monitor is added or removed. The problematic commit was found
-by the bug-filer through a bisect of more than four years of Chrome
-history - I'm just landing the fix that they suggested.
-
-Bug: 1300415
-Change-Id: Ief124f584a91aa9cc3f10704b0cc1e83356dea5b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3492658
-Reviewed-by: Allen Bauer <kylixrd@chromium.org>
-Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#975872}
-
-diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 264a9109e42c23e9be6bf7269b3cfee2634b61e4..86f06d2a2c9588a2210a9f78f47e73f1b7c5e329 100644
---- a/ui/views/win/hwnd_message_handler.cc
-+++ b/ui/views/win/hwnd_message_handler.cc
-@@ -2834,8 +2834,8 @@ void HWNDMessageHandler::OnWindowPosChanging(WINDOWPOS* window_pos) {
-       // (Win+Shift+Arrows). See crbug.com/656001.
-       window_rect.left = window_pos->x;
-       window_rect.top = window_pos->y;
--      window_rect.right = window_pos->x + window_pos->cx - 1;
--      window_rect.bottom = window_pos->y + window_pos->cy - 1;
-+      window_rect.right = window_pos->x + window_pos->cx;
-+      window_rect.bottom = window_pos->y + window_pos->cy;
-     }
- 
-     HMONITOR monitor;
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index 24054daa57a97..229cc895360e4 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 5fd8cb63f589dd204c2477f2375ec1d3716b55f0..85e52f7a99fe350da05270cf6fde0fe82a1bec40 100644
+index 6944f34edbfb7656c19883243ab2eb15f5ce51d9..0a2ddf31689b0d2ba2600a40067f9892b06033a7 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -660,6 +660,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -662,6 +662,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index 9500c595ccfb4..88293ba5df857 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 57b797c2e730a76d4910f8bcd5b35cc515a61012..61575390665f00b96d593a2e1066be3b28d8de6f 100644
+index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66dc8d9d5da 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -154,6 +154,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -50,7 +50,7 @@ index 57b797c2e730a76d4910f8bcd5b35cc515a61012..61575390665f00b96d593a2e1066be3b
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -1006,6 +1022,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -1005,6 +1021,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSKeyDown &&
                                !(modifierFlags & NSCommandKeyMask);
  
@@ -61,7 +61,7 @@ index 57b797c2e730a76d4910f8bcd5b35cc515a61012..61575390665f00b96d593a2e1066be3b
    // We only handle key down events and just simply forward other events.
    if (eventType != NSKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1752,9 +1772,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1751,9 +1771,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index 57b797c2e730a76d4910f8bcd5b35cc515a61012..61575390665f00b96d593a2e1066be3b
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1763,7 +1785,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1762,7 +1784,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 6ed6e2f5790a2..536be6ee276a4 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 04546cad2b3e6355d667fe725b85836f128f0df7..7caaf66cad9d5b9f787cea0d49c32c26801571c2 100644
+index 6a696e816a185f8492674fcaf1cbbf7e2faabf99..a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1591,7 +1591,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1545,7 +1545,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 04546cad2b3e6355d667fe725b85836f128f0df7..7caaf66cad9d5b9f787cea0d49c32c26
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1619,6 +1619,12 @@ if (!is_android) {
+@@ -1574,6 +1574,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 0a1e41b6d04e2..c90a98511a533 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 0b42cba8667225c25df2405d99efe119a26c3585..ee8b42500499dc6a1700bc38e5b75976bb408490 100644
+index 347526056c09a34c62512869b7c21b9e2b6ea0d7..dda90e2043eaba4dd951628f4876cad60a553b9b 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1344,7 +1344,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1339,7 +1339,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index dd479d4ad0215..b40543e80b56a 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 602525302cfdd89bf2ddc2924076e7349de7562a..ac9570fa3d9cb3b0026f70465e5b21ac7778c3df 100644
+index fb25a7c19f20ca690963c5a15bd09224687b5f57..d8939c1936830b101d6bb4079cd99e6015b481c4 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1836,9 +1836,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1786,9 +1786,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 849e94be20ccd..0eea1a2d4de6d 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3da88b5831717c979373c064b4c1520c28d4fd98..cf3ea07bb7d708f9078c46af2c4583215f9cd189 100644
+index a82b571fdabe90771bc8f8ed4ae40df3085592c7..1942d3446225411bdce80628e219641b3089d4a3 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3040,6 +3040,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3045,6 +3045,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 3da88b5831717c979373c064b4c1520c28d4fd98..cf3ea07bb7d708f9078c46af2c458321
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3050,6 +3057,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3055,6 +3062,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
@@ -35,7 +35,7 @@ index 3da88b5831717c979373c064b4c1520c28d4fd98..cf3ea07bb7d708f9078c46af2c458321
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index ad5c13965f1ccc078de5f25b08d51ed43e37f259..cd1b44d4ff5ce8924749ba9e41b3f599108bb8fd 100644
+index cb672eb5276e8d3bb686f98405854f67970e72cb..d159f44dc855fee799f7b97b59a2a4e64631e7b4 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 67d32c0a23bbd..45933f1ae2cd9 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,17 +8,17 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index eff6616ef019ea8b661b878cc5fccd1e4b9217aa..9aff1848395dc41311df575dd7cbf0771271ed03 100644
+index 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d0988f380b7b 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -890,10 +890,7 @@ bool WebContentsViewAura::IsValidDragTarget(
-   // TODO(https://crbug.com/1266953): There are some known gaps caused by
-   // comparing `RenderViewHost` IDs, as `RenderViewHost` ID is not really a
-   // strong signal for page identity.
--  return !drag_start_ ||
--         target_rwh->GetProcess()->GetID() == drag_start_->process_id ||
--         GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
--             drag_start_->view_id;
+@@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+   // for the outermost view. Inner `WebContents` will have a
+   // `WebContentsViewChildFrame` so when dragging between an inner
+   // `WebContents` and its embedder the view IDs will be the same.
+-  bool cross_tab_drag =
+-      GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
+-      drag_start_->view_id;
+-  return cross_tab_drag;
 +  return true;
  }
  
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index af32042b3d84e..87438368253cc 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 713e2883139bca4bb56dcc7e3efcf6d6dfc4a02b..be2721cc6dc0582a05c74ac3d50c123666d7d5a3 100644
+index a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7..dd8c421545d75cd8c9864b88701e0f9071259444 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6102,6 +6102,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6253,6 +6253,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 099e2f15e3205..0ba771e680e52 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 63ead7f8ab838693bade7163ddebd1787cc82344..8512a66eda07202b6c6faea049736fd8f16c93db 100644
+index eb8968c2a86102d0d3a21f07c394f1c360083c6c..025ef3f70a5ae34faf8c6013fbfba171c7f501ac 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -361,6 +361,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -26,10 +26,10 @@ index 63ead7f8ab838693bade7163ddebd1787cc82344..8512a66eda07202b6c6faea049736fd8
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index a64d78c9d8112610af6a17c8f8b8b9124b9d40a3..0bd64497495cfd8eee5e7cae3eca69937f2e79e0 100644
+index 030fd7ed2ea675e42e7894b1d89e636f5f5b85a6..998fe8b45959b8cfd91a1ed4f75f5946adf61537 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -932,6 +932,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -950,6 +950,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,7 +43,7 @@ index a64d78c9d8112610af6a17c8f8b8b9124b9d40a3..0bd64497495cfd8eee5e7cae3eca6993
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 10c96d3915e64ebebd283c70292b33e22612b8eb..9fa6853a2945e2a34ed319f874f356a4afd72dd3 100644
+index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746ffc5d310 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -208,6 +208,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -55,10 +55,10 @@ index 10c96d3915e64ebebd283c70292b33e22612b8eb..9fa6853a2945e2a34ed319f874f356a4
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index d188491afffbd259d4287b0668a9d1cec291934a..2fe5234832f8a3510326171e1ccf5dbfeca49fc9 100644
+index ced2c8e433d5b807bd4f1aa44c6af53e93261c23..53b1ebb708e2332e38090d1adba88dbe850bf02d 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -720,6 +720,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -716,6 +716,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -67,10 +67,10 @@ index d188491afffbd259d4287b0668a9d1cec291934a..2fe5234832f8a3510326171e1ccf5dbf
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index 3d29142e7e9d641d17ad16a8b24bf263f0bd4c73..9f5f07b2865df5ed8dd4a8c01082f4378b5f9ccf 100644
+index 2406a8b438de5f01f5354e08bcfc8810238b1bea..e7a60f6cae0fabeac6a5adec633ad5f45d43ef33 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -730,6 +730,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -731,6 +731,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
      nested_runner_->QuitNow();
    }
  
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 8c14560076af0..6608ad6735fa2 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 8512a66eda07202b6c6faea049736fd8f16c93db..afe767350c8878da38ab2b566fa89bcb831f8716 100644
+index 025ef3f70a5ae34faf8c6013fbfba171c7f501ac..cea3f3dc05f91927f4ee8be5eec85ec26c8e1e07 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -361,6 +361,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -35,10 +35,10 @@ index 8512a66eda07202b6c6faea049736fd8f16c93db..afe767350c8878da38ab2b566fa89bcb
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 0bd64497495cfd8eee5e7cae3eca69937f2e79e0..9ab68aabff203127dba5a0ccdf16fa62f3ef4c40 100644
+index 998fe8b45959b8cfd91a1ed4f75f5946adf61537..30d22188daed7f0b451ae75655e12bac3c4f10ac 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -944,6 +944,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -962,6 +962,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,7 +52,7 @@ index 0bd64497495cfd8eee5e7cae3eca69937f2e79e0..9ab68aabff203127dba5a0ccdf16fa62
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 9fa6853a2945e2a34ed319f874f356a4afd72dd3..87f9190d227e501a648dbbaa350bbb105601fbfb 100644
+index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa5fc3db6e 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -208,6 +208,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,10 +65,10 @@ index 9fa6853a2945e2a34ed319f874f356a4afd72dd3..87f9190d227e501a648dbbaa350bbb10
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 2fe5234832f8a3510326171e1ccf5dbfeca49fc9..b36a118861b2efae6ae28ef0e7f14db5d284b929 100644
+index 53b1ebb708e2332e38090d1adba88dbe850bf02d..8e86b79cf98c5e2429d0ec54b27eb950c6ce6303 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -720,6 +720,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -716,6 +716,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
index 98510d24c4e2c..e94b4197ec86b 100644
--- a/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
+++ b/patches/devtools_frontend/fix_expose_globals_to_allow_patching_devtools_dock.patch
@@ -12,7 +12,7 @@ upstream a more durable approach to allowing us to do this, at which
 point this patch can be removed.
 
 diff --git a/front_end/entrypoints/shell/BUILD.gn b/front_end/entrypoints/shell/BUILD.gn
-index bf96adcaa42a2406cf1dd7cd2468802886aa4fd7..cd84442cab4a0da772dd37cd4e921041b3b6173a 100644
+index 848d6edb722a88aa2d1b42290e65d677f5107acf..86e1c70d7693db0f1a6df32f0413c45f4854e586 100644
 --- a/front_end/entrypoints/shell/BUILD.gn
 +++ b/front_end/entrypoints/shell/BUILD.gn
 @@ -31,6 +31,7 @@ devtools_entrypoint("shell") {
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 13649f1c4acc8..dbd23d4d3ed74 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index fb68d0ec4d121aaac31fd6e4c317a59976ef034c..dbbe9ae10bebdd71f441fda00c7dbfa187603a84 100644
+index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d274f922b 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -598,7 +598,7 @@ config("internal_config") {
+@@ -605,7 +605,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index fb68d0ec4d121aaac31fd6e4c317a59976ef034c..dbbe9ae10bebdd71f441fda00c7dbfa1
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5733,7 +5733,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5819,7 +5819,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index fb68d0ec4d121aaac31fd6e4c317a59976ef034c..dbbe9ae10bebdd71f441fda00c7dbfa1
  
      deps = [
        ":v8_libbase",
-@@ -5771,6 +5771,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5857,6 +5857,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index b4231609ce27d..1db85681252e3 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index e6797c92a52ab7805261ace2156a39fe368bd747..1aed7cad8b7dfff9fc7b1f93040c3eda33693af3 100644
+index f0f1355f590b37d4b0ff1b68124165ab61099cc1..15d94af6d969f93cefb21d82ddb7d508320bea30 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9097,7 +9097,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9088,7 +9088,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index e6797c92a52ab7805261ace2156a39fe368bd747..1aed7cad8b7dfff9fc7b1f93040c3eda
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 8e4ad43c1957f4ed555327588c41d049824c1dc5..54cf3b263ac5654b370897b951aa0be8f8d566e5 100644
+index ccef6add27d782845a404741e4a42d07c86d0222..659f5187f80f74b3902facebe8f34d8898244093 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6235,9 +6235,9 @@ void Heap::TearDown() {
+@@ -6152,9 +6152,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 59cf1289c5fab..bb775eb8c65e1 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c784f859ba874b9a79be3dd9c69d306b8a590660..93158da71e2e7dd1aecc421664d4d21687cb38a6 100644
+index 5338cdfd2067f1621ecb63ce8b8d1111e3677377..1f876cec9c66c2d92662c235ab5c9c608c242a37 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -598,6 +598,10 @@ config("internal_config") {
+@@ -605,6 +605,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -27,7 +27,7 @@ index c784f859ba874b9a79be3dd9c69d306b8a590660..93158da71e2e7dd1aecc421664d4d216
      defines += [ "BUILDING_V8_SHARED" ]
    }
 diff --git a/src/base/macros.h b/src/base/macros.h
-index 3a73afc1ce7712a0683992608ff399734eea1f9d..f90f4ebffd6295bfa3e047cfb9c5ff0f2c30f26a 100644
+index fcb9f8756fd3ce9b83fe4ef60ad02fb225ec32dd..57dcd3deab5f37420a427954699dd85175328f3d 100644
 --- a/src/base/macros.h
 +++ b/src/base/macros.h
 @@ -393,13 +393,17 @@ bool is_inbounds(float_t v) {
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index 4068e9b55533e..c2e6211db28bb 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 48f595a24ec7ead3076e1d44afb4f18b7bb810c3..df7cb44387a42fa173ce68ee8464d6abc050986f 100644
+index d57ad0a847ed1903228db4fb0650e1ca2922b608..de8947cb558455537e251f66cc3fe4f2f08c640b 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -886,7 +886,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -910,7 +910,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index ae318986f9b8a..452d901cd2707 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index dbbe9ae10bebdd71f441fda00c7dbfa187603a84..c784f859ba874b9a79be3dd9c69d306b8a590660 100644
+index 7eaa7582fc1efc2381c267fec96fe94d274f922b..5338cdfd2067f1621ecb63ce8b8d1111e3677377 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5745,7 +5745,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5831,7 +5831,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
index ad3c1b6198b4c..def8b4cf37dd3 100644
--- a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
@@ -9,10 +9,10 @@ higher versions, but native module compiling with this version
 will have an issue.
 
 diff --git a/include/v8config.h b/include/v8config.h
-index b16ab3ff88d1054d12af4de3ad0018c97c0b7fcc..c9963b43c121964c0c37c858adb228cd090d5c2a 100644
+index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503ef79e2f5 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
-@@ -452,10 +452,13 @@ path. Add it with -I<path> to the command line
+@@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
  # define V8_NOINLINE /* NOT SUPPORTED */
  #endif
  
@@ -28,7 +28,7 @@ index b16ab3ff88d1054d12af4de3ad0018c97c0b7fcc..c9963b43c121964c0c37c858adb228cd
  #else
  # define V8_DEPRECATED(message)
  #endif
-@@ -463,7 +466,11 @@ path. Add it with -I<path> to the command line
+@@ -465,7 +468,11 @@ path. Add it with -I<path> to the command line
  
  // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
  #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index 4226bc8f1acae..5ced839d89dbf 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index ac7a46a895dd914f48038f36738c40ccfbd5c63f..e9f7bc7d022d05b6b62caf171d4e457119256831 100644
+index 1edc2bd6cb05ec1000c0cc651ad10ee40a71e1ec..87b7ed6862c8bfa25b63ac0dbd9e97028bbeb17d 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
 @@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
diff --git a/script/zip_manifests/dist_zip.linux.arm.manifest b/script/zip_manifests/dist_zip.linux.arm.manifest
index 7e08e3f695f0c..82bcb68f4d167 100644
--- a/script/zip_manifests/dist_zip.linux.arm.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm.manifest
@@ -11,6 +11,7 @@ libGLESv2.so
 libffmpeg.so
 libvk_swiftshader.so
 libvulkan.so.1
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -61,6 +62,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.linux.arm64.manifest b/script/zip_manifests/dist_zip.linux.arm64.manifest
index 7e08e3f695f0c..82bcb68f4d167 100644
--- a/script/zip_manifests/dist_zip.linux.arm64.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm64.manifest
@@ -11,6 +11,7 @@ libGLESv2.so
 libffmpeg.so
 libvk_swiftshader.so
 libvulkan.so.1
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -61,6 +62,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.linux.x64.manifest b/script/zip_manifests/dist_zip.linux.x64.manifest
index 7e08e3f695f0c..82bcb68f4d167 100644
--- a/script/zip_manifests/dist_zip.linux.x64.manifest
+++ b/script/zip_manifests/dist_zip.linux.x64.manifest
@@ -11,6 +11,7 @@ libGLESv2.so
 libffmpeg.so
 libvk_swiftshader.so
 libvulkan.so.1
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -61,6 +62,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.linux.x86.manifest b/script/zip_manifests/dist_zip.linux.x86.manifest
index 7e08e3f695f0c..82bcb68f4d167 100644
--- a/script/zip_manifests/dist_zip.linux.x86.manifest
+++ b/script/zip_manifests/dist_zip.linux.x86.manifest
@@ -11,6 +11,7 @@ libGLESv2.so
 libffmpeg.so
 libvk_swiftshader.so
 libvulkan.so.1
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -61,6 +62,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.mac.arm64.manifest b/script/zip_manifests/dist_zip.mac.arm64.manifest
index 91ed477f54512..997413de941ee 100644
--- a/script/zip_manifests/dist_zip.mac.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac.arm64.manifest
@@ -24,6 +24,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
@@ -128,6 +130,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/tr.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/locale.pak
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/v8_context_snapshot.arm64.bin
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/locale.pak
@@ -193,6 +197,7 @@ Electron.app/Contents/MacOS/
 Electron.app/Contents/MacOS/Electron
 Electron.app/Contents/PkgInfo
 Electron.app/Contents/Resources/
+Electron.app/Contents/Resources/af.lproj/
 Electron.app/Contents/Resources/am.lproj/
 Electron.app/Contents/Resources/ar.lproj/
 Electron.app/Contents/Resources/bg.lproj/
@@ -245,6 +250,7 @@ Electron.app/Contents/Resources/te.lproj/
 Electron.app/Contents/Resources/th.lproj/
 Electron.app/Contents/Resources/tr.lproj/
 Electron.app/Contents/Resources/uk.lproj/
+Electron.app/Contents/Resources/ur.lproj/
 Electron.app/Contents/Resources/vi.lproj/
 Electron.app/Contents/Resources/zh_CN.lproj/
 Electron.app/Contents/Resources/zh_TW.lproj/
diff --git a/script/zip_manifests/dist_zip.mac.x64.manifest b/script/zip_manifests/dist_zip.mac.x64.manifest
index e411bc46d62d3..d20306318cf65 100644
--- a/script/zip_manifests/dist_zip.mac.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac.x64.manifest
@@ -24,6 +24,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
@@ -128,6 +130,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/tr.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/locale.pak
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/v8_context_snapshot.x86_64.bin
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/locale.pak
@@ -193,6 +197,7 @@ Electron.app/Contents/MacOS/
 Electron.app/Contents/MacOS/Electron
 Electron.app/Contents/PkgInfo
 Electron.app/Contents/Resources/
+Electron.app/Contents/Resources/af.lproj/
 Electron.app/Contents/Resources/am.lproj/
 Electron.app/Contents/Resources/ar.lproj/
 Electron.app/Contents/Resources/bg.lproj/
@@ -245,6 +250,7 @@ Electron.app/Contents/Resources/te.lproj/
 Electron.app/Contents/Resources/th.lproj/
 Electron.app/Contents/Resources/tr.lproj/
 Electron.app/Contents/Resources/uk.lproj/
+Electron.app/Contents/Resources/ur.lproj/
 Electron.app/Contents/Resources/vi.lproj/
 Electron.app/Contents/Resources/zh_CN.lproj/
 Electron.app/Contents/Resources/zh_TW.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
index 20ca9e4428da2..5f319b17895a3 100644
--- a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
@@ -21,6 +21,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
@@ -125,6 +127,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/tr.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/locale.pak
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/v8_context_snapshot.arm64.bin
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/locale.pak
@@ -170,6 +174,7 @@ Electron.app/Contents/MacOS/
 Electron.app/Contents/MacOS/Electron
 Electron.app/Contents/PkgInfo
 Electron.app/Contents/Resources/
+Electron.app/Contents/Resources/af.lproj/
 Electron.app/Contents/Resources/am.lproj/
 Electron.app/Contents/Resources/ar.lproj/
 Electron.app/Contents/Resources/bg.lproj/
@@ -222,6 +227,7 @@ Electron.app/Contents/Resources/te.lproj/
 Electron.app/Contents/Resources/th.lproj/
 Electron.app/Contents/Resources/tr.lproj/
 Electron.app/Contents/Resources/uk.lproj/
+Electron.app/Contents/Resources/ur.lproj/
 Electron.app/Contents/Resources/vi.lproj/
 Electron.app/Contents/Resources/zh_CN.lproj/
 Electron.app/Contents/Resources/zh_TW.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.x64.manifest b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
index c3a864ce25578..7736d9750d8e9 100644
--- a/script/zip_manifests/dist_zip.mac_mas.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
@@ -21,6 +21,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ar.lproj/
@@ -125,6 +127,8 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resourc
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/tr.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/uk.lproj/locale.pak
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/ur.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/v8_context_snapshot.x86_64.bin
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/vi.lproj/locale.pak
@@ -170,6 +174,7 @@ Electron.app/Contents/MacOS/
 Electron.app/Contents/MacOS/Electron
 Electron.app/Contents/PkgInfo
 Electron.app/Contents/Resources/
+Electron.app/Contents/Resources/af.lproj/
 Electron.app/Contents/Resources/am.lproj/
 Electron.app/Contents/Resources/ar.lproj/
 Electron.app/Contents/Resources/bg.lproj/
@@ -222,6 +227,7 @@ Electron.app/Contents/Resources/te.lproj/
 Electron.app/Contents/Resources/th.lproj/
 Electron.app/Contents/Resources/tr.lproj/
 Electron.app/Contents/Resources/uk.lproj/
+Electron.app/Contents/Resources/ur.lproj/
 Electron.app/Contents/Resources/vi.lproj/
 Electron.app/Contents/Resources/zh_CN.lproj/
 Electron.app/Contents/Resources/zh_TW.lproj/
diff --git a/script/zip_manifests/dist_zip.win.arm64.manifest b/script/zip_manifests/dist_zip.win.arm64.manifest
index 6f4e96ded7738..9ae29943b772f 100755
--- a/script/zip_manifests/dist_zip.win.arm64.manifest
+++ b/script/zip_manifests/dist_zip.win.arm64.manifest
@@ -7,6 +7,7 @@ ffmpeg.dll
 icudtl.dat
 libEGL.dll
 libGLESv2.dll
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -57,6 +58,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.win.ia32.manifest b/script/zip_manifests/dist_zip.win.ia32.manifest
index 61abecd09b4d0..cb7d05e9a4ec7 100644
--- a/script/zip_manifests/dist_zip.win.ia32.manifest
+++ b/script/zip_manifests/dist_zip.win.ia32.manifest
@@ -8,6 +8,7 @@ ffmpeg.dll
 icudtl.dat
 libEGL.dll
 libGLESv2.dll
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -58,6 +59,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/script/zip_manifests/dist_zip.win.x64.manifest b/script/zip_manifests/dist_zip.win.x64.manifest
index 61abecd09b4d0..cb7d05e9a4ec7 100644
--- a/script/zip_manifests/dist_zip.win.x64.manifest
+++ b/script/zip_manifests/dist_zip.win.x64.manifest
@@ -8,6 +8,7 @@ ffmpeg.dll
 icudtl.dat
 libEGL.dll
 libGLESv2.dll
+locales/af.pak
 locales/am.pak
 locales/ar.pak
 locales/bg.pak
@@ -58,6 +59,7 @@ locales/te.pak
 locales/th.pak
 locales/tr.pak
 locales/uk.pak
+locales/ur.pak
 locales/vi.pak
 locales/zh-CN.pak
 locales/zh-TW.pak
diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc
index 14e0c0c372833..598e7bf9d739f 100644
--- a/shell/app/electron_content_client.cc
+++ b/shell/app/electron_content_client.cc
@@ -18,6 +18,7 @@
 #include "content/public/common/content_switches.h"
 #include "electron/buildflags/buildflags.h"
 #include "extensions/common/constants.h"
+#include "pdf/buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "shell/common/electron_paths.h"
 #include "shell/common/options_switches.h"
@@ -34,8 +35,8 @@
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-#include "pdf/pdf.h"        // nogncheck
-#include "pdf/pdf_ppapi.h"  // nogncheck
+#include "components/pdf/renderer/internal_plugin_renderer_helpers.h"
+#include "pdf/pdf.h"  // nogncheck
 #include "shell/common/electron_constants.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
@@ -43,7 +44,8 @@
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
-#endif  // BUILDFLAG(ENABLE_PLUGINS)
+#include "ppapi/shared_impl/ppapi_switches.h"  // nogncheck crbug.com/1125897
+#endif                                         // BUILDFLAG(ENABLE_PLUGINS)
 
 namespace electron {
 
@@ -104,6 +106,8 @@ bool IsWidevineAvailable(
 #if BUILDFLAG(ENABLE_PLUGINS)
 void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
+  // TODO(upstream/thestig): Figure out how to make the PDF Viewer work without
+  // this PPAPI plugin registration.
   content::PepperPluginInfo pdf_info;
   pdf_info.is_internal = true;
   pdf_info.is_out_of_process = true;
@@ -114,12 +118,6 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   content::WebPluginMimeType pdf_mime_type(kPdfPluginMimeType, "pdf",
                                            "Portable Document Format");
   pdf_info.mime_types.push_back(pdf_mime_type);
-  pdf_info.internal_entry_points.get_interface = chrome_pdf::PPP_GetInterface;
-  pdf_info.internal_entry_points.initialize_module =
-      chrome_pdf::PPP_InitializeModule;
-  pdf_info.internal_entry_points.shutdown_module =
-      chrome_pdf::PPP_ShutdownModule;
-  pdf_info.permissions = ppapi::PERMISSION_PDF | ppapi::PERMISSION_DEV;
   plugins->push_back(pdf_info);
 
   // NB. in Chrome, this plugin isn't registered until the PDF extension is
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index caa13d764c7ba..e1769670fb8ba 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -234,7 +234,7 @@ ElectronMainDelegate::~ElectronMainDelegate() = default;
 const char* const ElectronMainDelegate::kNonWildcardDomainNonPortSchemes[] = {
     extensions::kExtensionScheme};
 const size_t ElectronMainDelegate::kNonWildcardDomainNonPortSchemesSize =
-    base::size(kNonWildcardDomainNonPortSchemes);
+    std::size(kNonWildcardDomainNonPortSchemes);
 
 bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
   auto* command_line = base::CommandLine::ForCurrentProcess();
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
index d25b4bd535d67..fcc90988bffb5 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
@@ -91,6 +91,12 @@ bool ElectronBluetoothDelegate::HasDevicePermission(
   return true;
 }
 
+void ElectronBluetoothDelegate::RevokeDevicePermissionWebInitiated(
+    RenderFrameHost* frame,
+    const WebBluetoothDeviceId& device_id) {
+  NOTIMPLEMENTED();
+}
+
 bool ElectronBluetoothDelegate::IsAllowedToAccessService(
     RenderFrameHost* frame,
     const WebBluetoothDeviceId& device_id,
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h
index 897ce2f2d31fa..9e9888ab42210 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.h
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h
@@ -71,6 +71,9 @@ class ElectronBluetoothDelegate : public content::BluetoothDelegate {
   bool HasDevicePermission(
       content::RenderFrameHost* frame,
       const blink::WebBluetoothDeviceId& device_id) override;
+  void RevokeDevicePermissionWebInitiated(
+      content::RenderFrameHost* frame,
+      const blink::WebBluetoothDeviceId& device_id) override;
   bool IsAllowedToAccessService(content::RenderFrameHost* frame,
                                 const blink::WebBluetoothDeviceId& device_id,
                                 const device::BluetoothUUID& service) override;
diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc
index 56a62ac32548f..ced835e59c1fc 100644
--- a/shell/browser/browser_win.cc
+++ b/shell/browser/browser_win.cc
@@ -40,7 +40,9 @@
 #include "shell/common/gin_helper/dictionary.h"
 #include "shell/common/skia_util.h"
 #include "skia/ext/legacy_display_globals.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/strings/grit/ui_strings.h"
@@ -97,7 +99,7 @@ std::wstring GetAppInfoHelperForProtocol(ASSOCSTR assoc_str, const GURL& url) {
     return std::wstring();
 
   wchar_t out_buffer[1024];
-  DWORD buffer_size = base::size(out_buffer);
+  DWORD buffer_size = std::size(out_buffer);
   HRESULT hr =
       AssocQueryString(ASSOCF_IS_PROTOCOL, assoc_str, url_scheme.c_str(), NULL,
                        out_buffer, &buffer_size);
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 50fff944a3af3..a11af4a0182e3 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -27,11 +27,16 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/pdf/chrome_pdf_stream_delegate.h"
+#include "chrome/browser/plugins/pdf_iframe_navigation_throttle.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/network_hints/common/network_hints.mojom.h"
+#include "components/pdf/browser/pdf_navigation_throttle.h"
+#include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
+#include "components/pdf/common/internal_plugin_helpers.h"
 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h"  // nogncheck
 #include "content/browser/site_instance_impl.h"  // nogncheck
 #include "content/public/browser/browser_main_runner.h"
@@ -620,7 +625,7 @@ void ElectronBrowserClient::AppendExtraCommandLineSwitches(
         switches::kServiceWorkerSchemes, switches::kStreamingSchemes};
     command_line->CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                    kCommonSwitchNames,
-                                   base::size(kCommonSwitchNames));
+                                   std::size(kCommonSwitchNames));
     if (process_type == ::switches::kUtilityProcess ||
         content::RenderProcessHost::FromID(process_id)) {
       MaybeAppendSecureOriginsAllowlistSwitch(command_line);
@@ -1042,10 +1047,10 @@ void HandleExternalProtocolInUI(
 bool ElectronBrowserClient::HandleExternalProtocol(
     const GURL& url,
     content::WebContents::Getter web_contents_getter,
-    int child_id,
     int frame_tree_node_id,
     content::NavigationUIData* navigation_data,
-    bool is_main_frame,
+    bool is_primary_main_frame,
+    bool is_in_fenced_frame_tree,
     network::mojom::WebSandboxFlags sandbox_flags,
     ui::PageTransition page_transition,
     bool has_user_gesture,
@@ -1070,6 +1075,18 @@ ElectronBrowserClient::CreateThrottlesForNavigation(
       std::make_unique<extensions::ExtensionNavigationThrottle>(handle));
 #endif
 
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+  std::unique_ptr<content::NavigationThrottle> pdf_iframe_throttle =
+      PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle);
+  if (pdf_iframe_throttle)
+    throttles.push_back(std::move(pdf_iframe_throttle));
+  std::unique_ptr<content::NavigationThrottle> pdf_throttle =
+      pdf::PdfNavigationThrottle::MaybeCreateThrottleFor(
+          handle, std::make_unique<ChromePdfStreamDelegate>());
+  if (pdf_throttle)
+    throttles.push_back(std::move(pdf_throttle));
+#endif
+
   return throttles;
 }
 
@@ -1474,6 +1491,26 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
   return true;
 }
 
+std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
+ElectronBrowserClient::WillCreateURLLoaderRequestInterceptors(
+    content::NavigationUIData* navigation_ui_data,
+    int frame_tree_node_id,
+    const scoped_refptr<network::SharedURLLoaderFactory>&
+        network_loader_factory) {
+  std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
+      interceptors;
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+  {
+    std::unique_ptr<content::URLLoaderRequestInterceptor> pdf_interceptor =
+        pdf::PdfURLLoaderRequestInterceptor::MaybeCreateInterceptor(
+            frame_tree_node_id, std::make_unique<ChromePdfStreamDelegate>());
+    if (pdf_interceptor)
+      interceptors.push_back(std::move(pdf_interceptor));
+  }
+#endif
+  return interceptors;
+}
+
 void ElectronBrowserClient::OverrideURLLoaderFactoryParams(
     content::BrowserContext* browser_context,
     const url::Origin& origin,
@@ -1747,6 +1784,9 @@ ElectronBrowserClient::GetPluginMimeTypesWithExternalHandlers(
   auto map = PluginUtils::GetMimeTypeToExtensionIdMap(browser_context);
   for (const auto& pair : map)
     mime_types.insert(pair.first);
+#endif
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+  mime_types.insert(pdf::kInternalPluginMimeType);
 #endif
   return mime_types;
 }
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index 730fc07e687e8..a19b04c4a6851 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -227,6 +227,12 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
       bool* bypass_redirect_checks,
       bool* disable_secure_dns,
       network::mojom::URLLoaderFactoryOverridePtr* factory_override) override;
+  std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
+  WillCreateURLLoaderRequestInterceptors(
+      content::NavigationUIData* navigation_ui_data,
+      int frame_tree_node_id,
+      const scoped_refptr<network::SharedURLLoaderFactory>&
+          network_loader_factory) override;
   bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
       base::StringPiece scheme,
       bool is_embedded_origin_secure) override;
@@ -247,10 +253,10 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   bool HandleExternalProtocol(
       const GURL& url,
       content::WebContents::Getter web_contents_getter,
-      int child_id,
       int frame_tree_node_id,
       content::NavigationUIData* navigation_data,
-      bool is_main_frame,
+      bool is_primary_main_frame,
+      bool is_in_fenced_frame_tree,
       network::mojom::WebSandboxFlags sandbox_flags,
       ui::PageTransition page_transition,
       bool has_user_gesture,
diff --git a/shell/browser/electron_browser_main_parts_posix.cc b/shell/browser/electron_browser_main_parts_posix.cc
index 766dbd5785a7e..6640dd2e3c4b3 100644
--- a/shell/browser/electron_browser_main_parts_posix.cc
+++ b/shell/browser/electron_browser_main_parts_posix.cc
@@ -16,6 +16,7 @@
 #include "base/debug/leak_annotations.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/task/post_task.h"
+#include "base/threading/platform_thread.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/browser.h"
diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index f1a54d9a6f15c..7558535ca29c7 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -141,11 +141,11 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
     std::ignore = dialog_promise.Then(std::move(dialog_callback));
     file_dialog::ShowSaveDialog(settings, std::move(dialog_promise));
   } else {
-    std::move(callback).Run(path,
-                            download::DownloadItem::TARGET_DISPOSITION_PROMPT,
-                            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-                            item->GetMixedContentStatus(), path, absl::nullopt,
-                            download::DOWNLOAD_INTERRUPT_REASON_NONE);
+    std::move(callback).Run(
+        path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
+        download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
+        item->GetMixedContentStatus(), path, base::FilePath(), absl::nullopt,
+        download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
 }
 
@@ -184,7 +184,7 @@ void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone(
   std::move(download_callback)
       .Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-           item->GetMixedContentStatus(), path, absl::nullopt,
+           item->GetMixedContentStatus(), path, base::FilePath(), absl::nullopt,
            interrupt_reason);
 }
 
@@ -204,7 +204,7 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN,
-        download->GetForcedFilePath(), absl::nullopt,
+        download->GetForcedFilePath(), base::FilePath(), absl::nullopt,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
@@ -217,7 +217,8 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         save_path, download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN, save_path,
-        absl::nullopt, download::DOWNLOAD_INTERRUPT_REASON_NONE);
+        base::FilePath(), absl::nullopt,
+        download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
 
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index a6902499aaf9f..cab9b82abe3a9 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/values.h"
+#include "content/browser/permissions/permission_util.h"  // nogncheck
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/permission_controller.h"
@@ -398,4 +399,13 @@ ElectronPermissionManager::GetPermissionStatusForFrame(
                  : blink::mojom::PermissionStatus::DENIED;
 }
 
+blink::mojom::PermissionStatus
+ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
+    content::PermissionType permission,
+    content::RenderFrameHost* render_frame_host) {
+  return GetPermissionStatus(
+      permission, render_frame_host->GetLastCommittedOrigin().GetURL(),
+      content::PermissionUtil::GetLastCommittedOriginAsURL(render_frame_host));
+}
+
 }  // namespace electron
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index 38cedf2ebfda6..e823b3c18833b 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -85,6 +85,9 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin) override;
+  blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
+      content::PermissionType permission,
+      content::RenderFrameHost* render_frame_host) override;
 
   bool CheckPermissionWithDetails(content::PermissionType permission,
                                   content::RenderFrameHost* render_frame_host,
diff --git a/shell/browser/extensions/electron_extension_message_filter.cc b/shell/browser/extensions/electron_extension_message_filter.cc
index 688c76c024f04..2da25a7627d25 100644
--- a/shell/browser/extensions/electron_extension_message_filter.cc
+++ b/shell/browser/extensions/electron_extension_message_filter.cc
@@ -40,7 +40,7 @@ ElectronExtensionMessageFilter::ElectronExtensionMessageFilter(
     int render_process_id,
     content::BrowserContext* browser_context)
     : BrowserMessageFilter(kExtensionFilteredMessageClasses,
-                           base::size(kExtensionFilteredMessageClasses)),
+                           std::size(kExtensionFilteredMessageClasses)),
       render_process_id_(render_process_id),
       browser_context_(browser_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git a/shell/browser/extensions/electron_messaging_delegate.cc b/shell/browser/extensions/electron_messaging_delegate.cc
index 3d05445222416..416254206dfa4 100644
--- a/shell/browser/extensions/electron_messaging_delegate.cc
+++ b/shell/browser/extensions/electron_messaging_delegate.cc
@@ -75,13 +75,40 @@ std::unique_ptr<MessagePort> ElectronMessagingDelegate::CreateReceiverForTab(
     const std::string& extension_id,
     const PortId& receiver_port_id,
     content::WebContents* receiver_contents,
-    int receiver_frame_id) {
+    int receiver_frame_id,
+    const std::string& receiver_document_id) {
   // Frame ID -1 is every frame in the tab.
-  bool include_child_frames = receiver_frame_id == -1;
-  content::RenderFrameHost* receiver_rfh =
-      include_child_frames ? receiver_contents->GetMainFrame()
-                           : ExtensionApiFrameIdMap::GetRenderFrameHostById(
-                                 receiver_contents, receiver_frame_id);
+  bool include_child_frames =
+      receiver_frame_id == -1 && receiver_document_id.empty();
+
+  content::RenderFrameHost* receiver_rfh = nullptr;
+  if (include_child_frames) {
+    // The target is the active outermost main frame of the WebContents.
+    receiver_rfh = receiver_contents->GetMainFrame();
+  } else if (!receiver_document_id.empty()) {
+    ExtensionApiFrameIdMap::DocumentId document_id =
+        ExtensionApiFrameIdMap::DocumentIdFromString(receiver_document_id);
+
+    // Return early for invalid documentIds.
+    if (!document_id)
+      return nullptr;
+
+    receiver_rfh =
+        ExtensionApiFrameIdMap::Get()->GetRenderFrameHostByDocumentId(
+            document_id);
+
+    // If both |document_id| and |receiver_frame_id| are provided they
+    // should find the same RenderFrameHost, if not return early.
+    if (receiver_frame_id != -1 &&
+        ExtensionApiFrameIdMap::GetRenderFrameHostById(
+            receiver_contents, receiver_frame_id) != receiver_rfh) {
+      return nullptr;
+    }
+  } else {
+    DCHECK_GT(receiver_frame_id, -1);
+    receiver_rfh = ExtensionApiFrameIdMap::GetRenderFrameHostById(
+        receiver_contents, receiver_frame_id);
+  }
   if (!receiver_rfh)
     return nullptr;
 
diff --git a/shell/browser/extensions/electron_messaging_delegate.h b/shell/browser/extensions/electron_messaging_delegate.h
index ac82d85ca2029..3c0942e654245 100644
--- a/shell/browser/extensions/electron_messaging_delegate.h
+++ b/shell/browser/extensions/electron_messaging_delegate.h
@@ -37,7 +37,8 @@ class ElectronMessagingDelegate : public MessagingDelegate {
       const std::string& extension_id,
       const PortId& receiver_port_id,
       content::WebContents* receiver_contents,
-      int receiver_frame_id) override;
+      int receiver_frame_id,
+      const std::string& receiver_document_id) override;
   std::unique_ptr<MessagePort> CreateReceiverForNativeApp(
       content::BrowserContext* browser_context,
       base::WeakPtr<MessagePort::ChannelDelegate> channel_delegate,
diff --git a/shell/browser/font_defaults.cc b/shell/browser/font_defaults.cc
index 89fd78281b369..a4ac516fa24e4 100644
--- a/shell/browser/font_defaults.cc
+++ b/shell/browser/font_defaults.cc
@@ -103,7 +103,7 @@ const FontDefault kFontDefaults[] = {
      IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN},
 #endif
 };
-const size_t kFontDefaultsLength = base::size(kFontDefaults);
+const size_t kFontDefaultsLength = std::size(kFontDefaults);
 
 // ^^^^^ DO NOT EDIT ^^^^^
 
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 0a40c5ca356fd..e4c79c77f907b 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -107,7 +107,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
  private:
   static void* AllocateMemoryOrNull(size_t size, InitializationPolicy policy) {
     return AllocateMemoryWithFlags(size, policy,
-                                   base::PartitionAllocReturnNull);
+                                   partition_alloc::AllocFlags::kReturnNull);
   }
 
   static void* AllocateMemoryWithFlags(size_t size,
@@ -131,9 +131,9 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
     }
 
     if (policy == kZeroInitialize) {
-      flags |= base::PartitionAllocZeroFill;
+      flags |= partition_alloc::AllocFlags::kZeroFill;
     }
-    void* data = allocator_->root()->AllocFlags(flags, size, "Electron");
+    void* data = allocator_->root()->AllocWithFlags(flags, size, "Electron");
     if (base::kAlignment < 16) {
       char* ptr = reinterpret_cast<char*>(data);
       DCHECK_EQ(base::bits::AlignUp(ptr, 16), ptr)
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index 56823eb4b6297..ad839239f25af 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "shell/common/api/api.mojom.h"
+#include "third_party/skia/include/core/SkRegion.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if BUILDFLAG(IS_WIN)
diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc
index bfa2a7d0e4832..7c39b2ed0b8b7 100644
--- a/shell/browser/net/asar/asar_url_loader.cc
+++ b/shell/browser/net/asar/asar_url_loader.cc
@@ -63,7 +63,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
  public:
   static void CreateAndStart(
       const network::ResourceRequest& request,
-      network::mojom::URLLoaderRequest loader,
+      mojo::PendingReceiver<network::mojom::URLLoader> loader,
       mojo::PendingRemote<network::mojom::URLLoaderClient> client,
       scoped_refptr<net::HttpResponseHeaders> extra_response_headers) {
     // Owns itself. Will live as long as its URLLoader and URLLoaderClientPtr
@@ -390,7 +390,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
 
 void CreateAsarURLLoader(
     const network::ResourceRequest& request,
-    network::mojom::URLLoaderRequest loader,
+    mojo::PendingReceiver<network::mojom::URLLoader> loader,
     mojo::PendingRemote<network::mojom::URLLoaderClient> client,
     scoped_refptr<net::HttpResponseHeaders> extra_response_headers) {
   auto task_runner = base::ThreadPool::CreateSequencedTaskRunner(
diff --git a/shell/browser/net/asar/asar_url_loader.h b/shell/browser/net/asar/asar_url_loader.h
index 09d255fd5d2d5..4cd61df37b69d 100644
--- a/shell/browser/net/asar/asar_url_loader.h
+++ b/shell/browser/net/asar/asar_url_loader.h
@@ -13,7 +13,7 @@ namespace asar {
 
 void CreateAsarURLLoader(
     const network::ResourceRequest& request,
-    network::mojom::URLLoaderRequest loader,
+    mojo::PendingReceiver<network::mojom::URLLoader> loader,
     mojo::PendingRemote<network::mojom::URLLoaderClient> client,
     scoped_refptr<net::HttpResponseHeaders> extra_response_headers);
 
diff --git a/shell/browser/net/network_context_service.cc b/shell/browser/net/network_context_service.cc
index be8f3403dc81a..176f28aa688da 100644
--- a/shell/browser/net/network_context_service.cc
+++ b/shell/browser/net/network_context_service.cc
@@ -80,14 +80,14 @@ void NetworkContextService::ConfigureNetworkContextParams(
   // Configure on-disk storage for persistent sessions.
   if (!in_memory) {
     // Configure the HTTP cache path and size.
-    network_context_params->http_cache_path =
+    network_context_params->http_cache_directory =
         path.Append(chrome::kCacheDirname);
     network_context_params->http_cache_max_size =
         browser_context_->GetMaxCacheSize();
 
     network_context_params->file_paths =
         network::mojom::NetworkContextFilePaths::New();
-    network_context_params->file_paths->data_path =
+    network_context_params->file_paths->data_directory =
         path.Append(chrome::kNetworkDataDirname);
     network_context_params->file_paths->unsandboxed_data_path = path;
     network_context_params->file_paths->trigger_migration =
diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc
index 6eb27c8395083..d079c7b286ff9 100644
--- a/shell/browser/net/proxying_url_loader_factory.cc
+++ b/shell/browser/net/proxying_url_loader_factory.cc
@@ -523,8 +523,9 @@ void ProxyingURLLoaderFactory::InProgressRequest::ContinueToStartRequest(
     if (has_any_extra_headers_listeners_)
       options |= network::mojom::kURLLoadOptionUseHeaderClient;
     factory_->target_factory_->CreateLoaderAndStart(
-        mojo::MakeRequest(&target_loader_), network_service_request_id_,
-        options, request_, proxied_client_receiver_.BindNewPipeAndPassRemote(),
+        target_loader_.BindNewPipeAndPassReceiver(),
+        network_service_request_id_, options, request_,
+        proxied_client_receiver_.BindNewPipeAndPassRemote(),
         traffic_annotation_);
   }
 
@@ -760,7 +761,7 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
     uint64_t* request_id_generator,
     std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
     absl::optional<int64_t> navigation_id,
-    network::mojom::URLLoaderFactoryRequest loader_request,
+    mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader_request,
     mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote,
     mojo::PendingReceiver<network::mojom::TrustedURLLoaderHeaderClient>
         header_client_receiver,
diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h
index 35d8e89be9332..10b6d561cd695 100644
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -28,6 +28,7 @@
 #include "services/network/public/mojom/url_loader.mojom.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
+#include "services/network/url_loader_factory.h"
 #include "shell/browser/net/electron_url_loader_factory.h"
 #include "shell/browser/net/web_request_api_interface.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -146,7 +147,7 @@ class ProxyingURLLoaderFactory
 
     mojo::Receiver<network::mojom::URLLoaderClient> proxied_client_receiver_{
         this};
-    network::mojom::URLLoaderPtr target_loader_;
+    mojo::Remote<network::mojom::URLLoader> target_loader_;
 
     network::mojom::URLResponseHeadPtr current_response_;
     mojo::ScopedDataPipeConsumerHandle current_body_;
@@ -198,7 +199,7 @@ class ProxyingURLLoaderFactory
       uint64_t* request_id_generator,
       std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
       absl::optional<int64_t> navigation_id,
-      network::mojom::URLLoaderFactoryRequest loader_request,
+      mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader_request,
       mojo::PendingRemote<network::mojom::URLLoaderFactory>
           target_factory_remote,
       mojo::PendingReceiver<network::mojom::TrustedURLLoaderHeaderClient>
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.h b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
index bbf5782dcb38a..58824f4dd63ea 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.h
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
@@ -12,6 +12,7 @@
 #include "base/scoped_observation.h"
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/views/client_frame_view_linux.h"
+#include "third_party/skia/include/core/SkRRect.h"
 #include "ui/native_theme/native_theme_observer.h"
 #include "ui/views/linux_ui/device_scale_factor_observer.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
diff --git a/shell/browser/ui/file_dialog_win.cc b/shell/browser/ui/file_dialog_win.cc
index 5aeaa238c2108..18fc06b0b7063 100644
--- a/shell/browser/ui/file_dialog_win.cc
+++ b/shell/browser/ui/file_dialog_win.cc
@@ -206,7 +206,7 @@ bool ShowOpenDialogSync(const DialogSettings& settings,
 
     wchar_t file_name[MAX_PATH];
     hr = GetFileNameFromShellItem(item, SIGDN_FILESYSPATH, file_name,
-                                  base::size(file_name));
+                                  std::size(file_name));
 
     if (FAILED(hr))
       return false;
diff --git a/shell/browser/ui/gtk/app_indicator_icon.h b/shell/browser/ui/gtk/app_indicator_icon.h
index 3219beb5ee154..0e50b89148a3f 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.h
+++ b/shell/browser/ui/gtk/app_indicator_icon.h
@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/nix/xdg_util.h"
+#include "third_party/skia/include/core/SkImage.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/views/linux_ui/status_icon_linux.h"
 
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index 4779ee6c77f1e..f249de999c7fd 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -142,7 +142,7 @@ void SetZoomLevelForWebContents(content::WebContents* web_contents,
 
 double GetNextZoomLevel(double level, bool out) {
   double factor = blink::PageZoomLevelToZoomFactor(level);
-  size_t size = base::size(kPresetZoomFactors);
+  size_t size = std::size(kPresetZoomFactors);
   for (size_t i = 0; i < size; ++i) {
     if (!blink::PageZoomValuesEqual(kPresetZoomFactors[i], factor))
       continue;
diff --git a/shell/browser/ui/win/jump_list.cc b/shell/browser/ui/win/jump_list.cc
index eb985984a7b36..12311f6377d1e 100644
--- a/shell/browser/ui/win/jump_list.cc
+++ b/shell/browser/ui/win/jump_list.cc
@@ -93,7 +93,7 @@ bool ConvertShellLinkToJumpListItem(IShellLink* shell_link,
 
   item->type = JumpListItem::Type::kTask;
   wchar_t path[MAX_PATH];
-  if (FAILED(shell_link->GetPath(path, base::size(path), nullptr, 0)))
+  if (FAILED(shell_link->GetPath(path, std::size(path), nullptr, 0)))
     return false;
 
   item->path = base::FilePath(path);
@@ -111,18 +111,18 @@ bool ConvertShellLinkToJumpListItem(IShellLink* shell_link,
     item->title = prop.get().pwszVal;
   }
 
-  if (SUCCEEDED(shell_link->GetWorkingDirectory(path, base::size(path))))
+  if (SUCCEEDED(shell_link->GetWorkingDirectory(path, std::size(path))))
     item->working_dir = base::FilePath(path);
 
   int icon_index;
   if (SUCCEEDED(
-          shell_link->GetIconLocation(path, base::size(path), &icon_index))) {
+          shell_link->GetIconLocation(path, std::size(path), &icon_index))) {
     item->icon_path = base::FilePath(path);
     item->icon_index = icon_index;
   }
 
   wchar_t item_desc[INFOTIPSIZE];
-  if (SUCCEEDED(shell_link->GetDescription(item_desc, base::size(item_desc))))
+  if (SUCCEEDED(shell_link->GetDescription(item_desc, std::size(item_desc))))
     item->description = item_desc;
 
   return true;
diff --git a/shell/common/api/electron_api_native_image.h b/shell/common/api/electron_api_native_image.h
index 7be02ad27b7af..9c417fa6d200c 100644
--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -14,6 +14,7 @@
 #include "gin/wrappable.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
 
 #if BUILDFLAG(IS_WIN)
 #include "base/files/file_path.h"
diff --git a/shell/common/api/electron_api_native_image_mac.mm b/shell/common/api/electron_api_native_image_mac.mm
index 60f3765a3def3..12cbad9f3e3b3 100644
--- a/shell/common/api/electron_api_native_image_mac.mm
+++ b/shell/common/api/electron_api_native_image_mac.mm
@@ -19,7 +19,7 @@
 #include "shell/common/gin_converters/image_converter.h"
 #include "shell/common/gin_helper/promise.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gfx/image/image.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
diff --git a/shell/common/gin_helper/callback.cc b/shell/common/gin_helper/callback.cc
index a5abed2c7020b..569fc5d570bf7 100644
--- a/shell/common/gin_helper/callback.cc
+++ b/shell/common/gin_helper/callback.cc
@@ -147,7 +147,7 @@ v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
   CHECK(!bind.IsEmpty());
   v8::Local<v8::Function> bind_func = bind.ToLocalChecked().As<v8::Function>();
   v8::Local<v8::Value> converted[] = {func, arg1, arg2};
-  return bind_func->Call(context, func, base::size(converted), converted)
+  return bind_func->Call(context, func, std::size(converted), converted)
       .ToLocalChecked();
 }
 
diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc
index c45093a559a62..eb1da7228470e 100644
--- a/shell/common/platform_util_win.cc
+++ b/shell/common/platform_util_win.cc
@@ -288,7 +288,7 @@ void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
     return;
 
   const ITEMIDLIST* highlight[] = {file_item};
-  hr = SHOpenFolderAndSelectItems(dir_item, base::size(highlight), highlight,
+  hr = SHOpenFolderAndSelectItems(dir_item, std::size(highlight), highlight,
                                   NULL);
   if (FAILED(hr)) {
     // On some systems, the above call mysteriously fails with "file not
diff --git a/shell/common/skia_util.cc b/shell/common/skia_util.cc
index 63f42a13ab41c..21b47fc8c27f3 100644
--- a/shell/common/skia_util.cc
+++ b/shell/common/skia_util.cc
@@ -21,6 +21,7 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/image/image_util.h"
 
 #if BUILDFLAG(IS_WIN)
diff --git a/shell/common/v8_value_serializer.h b/shell/common/v8_value_serializer.h
index b75ed82a3228b..958677581bd47 100644
--- a/shell/common/v8_value_serializer.h
+++ b/shell/common/v8_value_serializer.h
@@ -6,6 +6,7 @@
 #define ELECTRON_SHELL_COMMON_V8_VALUE_SERIALIZER_H_
 
 #include "base/containers/span.h"
+#include "ui/gfx/image/image_skia_rep.h"
 
 namespace v8 {
 class Isolate;
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 6ec08e583da96..5f2ea089056a8 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -79,17 +79,17 @@ struct Converter<blink::WebLocalFrame::ScriptExecutionType> {
 };
 
 template <>
-struct Converter<blink::WebDocument::CSSOrigin> {
+struct Converter<blink::WebCssOrigin> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     blink::WebDocument::CSSOrigin* out) {
+                     blink::WebCssOrigin* out) {
     std::string css_origin;
     if (!ConvertFromV8(isolate, val, &css_origin))
       return false;
     if (css_origin == "user") {
-      *out = blink::WebDocument::CSSOrigin::kUserOrigin;
+      *out = blink::WebCssOrigin::kUser;
     } else if (css_origin == "author") {
-      *out = blink::WebDocument::CSSOrigin::kAuthorOrigin;
+      *out = blink::WebCssOrigin::kAuthor;
     } else {
       return false;
     }
@@ -613,8 +613,7 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
   std::u16string InsertCSS(v8::Isolate* isolate,
                            const std::string& css,
                            gin::Arguments* args) {
-    blink::WebDocument::CSSOrigin css_origin =
-        blink::WebDocument::CSSOrigin::kAuthorOrigin;
+    blink::WebCssOrigin css_origin = blink::WebCssOrigin::kAuthor;
 
     gin_helper::Dictionary options;
     if (args->GetNext(&options))
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index 98f79468c5445..7b932f7f7576c 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -12,7 +12,9 @@
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
+#include "chrome/common/pdf_util.h"
 #include "components/network_hints/renderer/web_prescient_networking_impl.h"
+#include "components/pdf/renderer/pdf_internal_plugin_delegate.h"
 #include "content/common/buildflags.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
@@ -37,7 +39,6 @@
 #include "shell/renderer/electron_autofill_agent.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
-#include "third_party/blink/public/platform/media/multi_buffer_data_source.h"
 #include "third_party/blink/public/web/blink.h"
 #include "third_party/blink/public/web/web_custom_element.h"  // NOLINT(build/include_alpha)
 #include "third_party/blink/public/web/web_frame_widget.h"
@@ -46,6 +47,7 @@
 #include "third_party/blink/public/web/web_script_source.h"
 #include "third_party/blink/public/web/web_security_policy.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "third_party/blink/renderer/platform/media/multi_buffer_data_source.h"  // nogncheck
 #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"  // nogncheck
 
 #if BUILDFLAG(IS_MAC)
@@ -56,6 +58,10 @@
 #include <shlobj.h>
 #endif
 
+#if defined(WIDEVINE_CDM_AVAILABLE)
+#include "chrome/renderer/media/chrome_key_systems.h"  // nogncheck
+#endif
+
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
 #include "components/spellcheck/renderer/spellcheck.h"
 #include "components/spellcheck/renderer/spellcheck_provider.h"
@@ -186,12 +192,6 @@ void RendererClientBase::RenderThreadStarted() {
   thread->AddObserver(extensions_renderer_client_->GetDispatcher());
 #endif
 
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-  // Enables printing from Chrome PDF viewer.
-  pdf_print_client_ = std::make_unique<ChromePDFPrintClient>();
-  pdf::PepperPDFHost::SetPrintClient(pdf_print_client_.get());
-#endif
-
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
   spellcheck_ = std::make_unique<SpellCheck>(this);
 #endif
@@ -311,14 +311,38 @@ void RendererClientBase::DidClearWindowObject(
   render_frame->GetWebFrame()->ExecuteScript(blink::WebScriptSource("void 0"));
 }
 
+class ChromePdfInternalPluginDelegate final
+    : public pdf::PdfInternalPluginDelegate {
+ public:
+  ChromePdfInternalPluginDelegate() = default;
+  ChromePdfInternalPluginDelegate(const ChromePdfInternalPluginDelegate&) =
+      delete;
+  ChromePdfInternalPluginDelegate& operator=(
+      const ChromePdfInternalPluginDelegate&) = delete;
+  ~ChromePdfInternalPluginDelegate() override = default;
+
+  // `pdf::PdfInternalPluginDelegate`:
+  bool IsAllowedOrigin(const url::Origin& origin) const override {
+    return origin.scheme() == extensions::kExtensionScheme &&
+           origin.host() == extension_misc::kPdfExtensionId;
+  }
+};
+
 bool RendererClientBase::OverrideCreatePlugin(
     content::RenderFrame* render_frame,
     const blink::WebPluginParams& params,
     blink::WebPlugin** plugin) {
-  if (params.mime_type.Utf8() == content::kBrowserPluginMimeType ||
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-      params.mime_type.Utf8() == kPdfPluginMimeType ||
+  if (params.mime_type.Utf8() == kPdfPluginMimeType) {
+    *plugin = pdf::CreateInternalPlugin(
+        std::move(params), render_frame,
+        std::make_unique<ChromePdfInternalPluginDelegate>());
+    return true;
+  }
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
+
+  if (params.mime_type.Utf8() == content::kBrowserPluginMimeType ||
+      params.mime_type.Utf8() == kPdfPluginMimeType ||
       render_frame->GetBlinkPreferences().enable_plugins)
     return false;
 
@@ -329,15 +353,7 @@ bool RendererClientBase::OverrideCreatePlugin(
 void RendererClientBase::GetSupportedKeySystems(
     media::GetSupportedKeySystemsCB cb) {
 #if defined(WIDEVINE_CDM_AVAILABLE)
-  key_systems_provider_.GetSupportedKeySystems(std::move(cb));
-#endif
-}
-
-bool RendererClientBase::IsKeySystemsUpdateNeeded() {
-#if defined(WIDEVINE_CDM_AVAILABLE)
-  return key_systems_provider_.IsKeySystemsUpdateNeeded();
-#else
-  return false;
+  GetChromeKeySystems(std::move(cb));
 #endif
 }
 
@@ -355,6 +371,27 @@ bool RendererClientBase::IsPluginHandledExternally(
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
   DCHECK(plugin_element.HasHTMLTagName("object") ||
          plugin_element.HasHTMLTagName("embed"));
+  if (mime_type == "application/x-google-chrome-pdf") {
+    if (IsPdfInternalPluginAllowedOrigin(
+            render_frame->GetWebFrame()->GetSecurityOrigin())) {
+      return true;
+    }
+
+    content::WebPluginInfo info;
+    info.type = content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
+    const char16_t kPDFExtensionPluginName[] = u"Chromium PDF Viewer";
+    info.name = kPDFExtensionPluginName;
+    info.path = base::FilePath::FromUTF8Unsafe("internal-pdf-viewer");
+    info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
+    info.mime_types.emplace_back("application/x-google-chrome-pdf", "pdf",
+                                 "Portable Document Format");
+    return extensions::MimeHandlerViewContainerManager::Get(
+               content::RenderFrame::FromWebFrame(
+                   plugin_element.GetDocument().GetFrame()),
+               true /* create_if_does_not_exist */)
+        ->CreateFrameContainer(plugin_element, original_url, mime_type, info);
+  }
+
   // TODO(nornagon): this info should be shared with the data in
   // electron_content_client.cc / ComputeBuiltInPlugins.
   content::WebPluginInfo info;
@@ -375,10 +412,19 @@ bool RendererClientBase::IsPluginHandledExternally(
 #endif
 }
 
-bool RendererClientBase::IsOriginIsolatedPepperPlugin(
-    const base::FilePath& plugin_path) {
-  // Isolate all Pepper plugins, including the PDF plugin.
-  return true;
+v8::Local<v8::Object> RendererClientBase::GetScriptableObject(
+    const blink::WebElement& plugin_element,
+    v8::Isolate* isolate) {
+  // If there is a MimeHandlerView that can provide the scriptable object then
+  // MaybeCreateMimeHandlerView must have been called before and a container
+  // manager should exist.
+  auto* container_manager = extensions::MimeHandlerViewContainerManager::Get(
+      content::RenderFrame::FromWebFrame(
+          plugin_element.GetDocument().GetFrame()),
+      false /* create_if_does_not_exist */);
+  if (container_manager)
+    return container_manager->GetScriptableObject(plugin_element, isolate);
+  return v8::Local<v8::Object>();
 }
 
 std::unique_ptr<blink::WebPrescientNetworking>
diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h
index d830c6db5f88f..821e7e2d6d2d3 100644
--- a/shell/renderer/renderer_client_base.h
+++ b/shell/renderer/renderer_client_base.h
@@ -16,12 +16,8 @@
 // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // NOLINT(build/include_directory)
 
-#if defined(WIDEVINE_CDM_AVAILABLE)
-#include "chrome/renderer/media/chrome_key_systems_provider.h"  // nogncheck
-#endif
-
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-#include "chrome/renderer/pepper/chrome_pdf_print_client.h"  // nogncheck
+#include "components/pdf/renderer/internal_plugin_renderer_helpers.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
@@ -105,13 +101,14 @@ class RendererClientBase : public content::ContentRendererClient
                             const blink::WebPluginParams& params,
                             blink::WebPlugin** plugin) override;
   void GetSupportedKeySystems(media::GetSupportedKeySystemsCB cb) override;
-  bool IsKeySystemsUpdateNeeded() override;
   void DidSetUserAgent(const std::string& user_agent) override;
   bool IsPluginHandledExternally(content::RenderFrame* render_frame,
                                  const blink::WebElement& plugin_element,
                                  const GURL& original_url,
                                  const std::string& mime_type) override;
-  bool IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path) override;
+  v8::Local<v8::Object> GetScriptableObject(
+      const blink::WebElement& plugin_element,
+      v8::Isolate* isolate) override;
 
   void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
   void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
@@ -152,9 +149,6 @@ class RendererClientBase : public content::ContentRendererClient
   std::unique_ptr<ElectronExtensionsRendererClient> extensions_renderer_client_;
 #endif
 
-#if defined(WIDEVINE_CDM_AVAILABLE)
-  ChromeKeySystemsProvider key_systems_provider_;
-#endif
   std::string renderer_client_id_;
   // An increasing ID used for identifying an V8 context in this process.
   int64_t next_context_id_ = 0;
@@ -162,9 +156,6 @@ class RendererClientBase : public content::ContentRendererClient
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
   std::unique_ptr<SpellCheck> spellcheck_;
 #endif
-#if BUILDFLAG(ENABLE_PDF_VIEWER)
-  std::unique_ptr<ChromePDFPrintClient> pdf_print_client_;
-#endif
 };
 
 }  // namespace electron

From f60ff18b1488b5ba28d930d22924816452a638e4 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 25 Mar 2022 12:48:23 +0900
Subject: [PATCH 172/811] fix: gn check when //printing component is disabled
 (#33429)

---
 shell/browser/api/electron_api_web_contents.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index c5238cead782f..e4030acac92d4 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -167,7 +167,7 @@
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "components/printing/browser/print_manager_utils.h"
 #include "printing/backend/print_backend.h"  // nogncheck
-#include "printing/mojom/print.mojom.h"
+#include "printing/mojom/print.mojom.h"      // nogncheck
 #include "shell/browser/printing/print_preview_message_handler.h"
 #include "shell/browser/printing/print_view_manager_electron.h"
 

From b03d6dfba91733f8fed50da38f7a37b7c6be2f18 Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Fri, 25 Mar 2022 04:12:09 -0600
Subject: [PATCH 173/811] fix: non-client windows messages on legacy widget
 host (again) (#33438)

---
 ...cking_and_message_bubbling_on_windows.patch | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
index 5f83968390667..4f26f498c4d3a 100644
--- a/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
+++ b/patches/chromium/fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
@@ -13,7 +13,7 @@ messages in the legacy window handle layer.
 These conditions are regularly hit with WCO-enabled windows on Windows.
 
 diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.cc b/content/browser/renderer_host/legacy_render_widget_host_win.cc
-index 4a894ef70eeb1d8489049aef552c9bae4f24ae62..f5049d730a850f2947023f976b25fb772e42107a 100644
+index 4a894ef70eeb1d8489049aef552c9bae4f24ae62..df101c53861a83f107d459270c37b3b497a00cb0 100644
 --- a/content/browser/renderer_host/legacy_render_widget_host_win.cc
 +++ b/content/browser/renderer_host/legacy_render_widget_host_win.cc
 @@ -288,12 +288,12 @@ LRESULT LegacyRenderWidgetHostHWND::OnMouseRange(UINT message,
@@ -31,19 +31,15 @@ index 4a894ef70eeb1d8489049aef552c9bae4f24ae62..f5049d730a850f2947023f976b25fb77
        tme.hwndTrack = hwnd();
        tme.dwHoverTime = 0;
        TrackMouseEvent(&tme);
-@@ -319,12 +319,11 @@ LRESULT LegacyRenderWidgetHostHWND::OnMouseRange(UINT message,
-         message, w_param, l_param, &msg_handled);
-     handled = msg_handled;
-     // If the parent did not handle non client mouse messages, we call
--    // DefWindowProc on the message with the parent window handle. This
--    // ensures that WM_SYSCOMMAND is generated for the parent and we are
--    // out of the picture.
-+    // DefWindowProc on the message. This ensures that WM_SYSCOMMAND is
-+    // generated.
+@@ -324,7 +324,10 @@ LRESULT LegacyRenderWidgetHostHWND::OnMouseRange(UINT message,
+     // out of the picture.
      if (!handled &&
           (message >= WM_NCMOUSEMOVE && message <= WM_NCXBUTTONDBLCLK)) {
 -      ret = ::DefWindowProc(GetParent(), message, w_param, l_param);
-+      ret = ::DefWindowProc(hwnd(), message, w_param, l_param);
++      // Send WM_NCMOUSEMOVE messages using the LegacyRenderWidgetHostHWND's
++      // handle so mouse tracking on non-client areas doesn't break.
++      HWND target = message == WM_NCMOUSEMOVE ? hwnd() : GetParent();
++      ret = ::DefWindowProc(target, message, w_param, l_param);
        handled = TRUE;
      }
    }

From 3c5c880a337eb8f2a8f801e07b28f5232c1c17ad Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 06:01:13 -0700
Subject: [PATCH 174/811] Bump v19.0.0-nightly.20220325

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 2090a0b04f329..1e24e0ad0902e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220324
\ No newline at end of file
+19.0.0-nightly.20220325
\ No newline at end of file
diff --git a/package.json b/package.json
index 197c6c519779b..5fdbc7772f896 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220324",
+  "version": "19.0.0-nightly.20220325",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index eea937658b6b5..9eda6b7763560 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220324
- PRODUCTVERSION 19,0,0,20220324
+ FILEVERSION 19,0,0,20220325
+ PRODUCTVERSION 19,0,0,20220325
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c11cd3c14c2f2517b2de482e553545702ce6ab57 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 12:35:32 -0500
Subject: [PATCH 175/811] chore: bump chromium to 102.0.4962.3 (main) (#33447)

* chore: bump chromium in DEPS to 102.0.4962.3

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                                 |  2 +-
 ..._do_not_depend_on_packed_resource_integrity.patch | 12 ++++++------
 patches/chromium/can_create_window.patch             |  4 ++--
 ...ctron_resources_not_chrome_for_spellchecker.patch |  4 ++--
 ...n_notifythreadcreated_if_pcscan_is_disabled.patch |  2 +-
 ...client_sync_with_host_os_mac_on_linux_in_ci.patch |  2 +-
 patches/chromium/webview_fullscreen.patch            |  4 ++--
 patches/v8/build_gn.patch                            |  6 +++---
 patches/v8/dcheck.patch                              |  8 ++++----
 ...do_not_export_private_v8_symbols_on_windows.patch |  2 +-
 .../v8/export_symbols_needed_for_windows_build.patch |  4 ++--
 patches/v8/expose_mksnapshot.patch                   |  4 ++--
 ...mplies_dcheck_for_node_stream_array_buffers.patch |  2 +-
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/DEPS b/DEPS
index 4aa74e7395add..00113fcca6410 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.4961.0',
+    '102.0.4962.3',
   'node_version':
     'v16.14.2',
   'nan_version':
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index e3a17bcbab19f..d6d7b7c762219 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -33,7 +33,7 @@ index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0f
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f62b184e0 100644
+index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba4645b0a3606 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -4508,7 +4508,7 @@ static_library("browser") {
@@ -46,10 +46,10 @@ index fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a197ae638 100644
+index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df916a1af3 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5904,7 +5904,6 @@ test("unit_tests") {
+@@ -5907,7 +5907,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5927,6 +5926,10 @@ test("unit_tests") {
+@@ -5930,6 +5929,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6616,7 +6619,6 @@ test("unit_tests") {
+@@ -6619,7 +6622,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6662,6 +6664,11 @@ test("unit_tests") {
+@@ -6664,6 +6666,11 @@ test("unit_tests") {
        "//ui/native_theme:test_support",
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 278d3581d311a..21f6a27357742 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 20b9d7cd590361b176298e24b5aac6f546acb518..a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7 100644
+index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f3bc1fd3e 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6866,6 +6866,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6880,6 +6880,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
index 10a9d5dbeb4c8..5c092bf9ad23d 100644
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 863c9e088c2d967506a9fabd044d7b08cc8bee23..fca255a2cd49f1f5d2bcb4418b04355c5befba38 100644
+index 5f43b35aab6c2f277f0d021b378bee55f97572aa..5bbb64d83e2024feeb7a2eae45f6b8e937fc927c 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7123,6 +7123,7 @@ static_library("browser") {
+@@ -7126,6 +7126,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 692ebe4ddcdb1..8665613a56588 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -6,7 +6,7 @@ Subject: Don't run PCScan functions if PCScan is disabled
 PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
 
 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
-index 60a33e1501b58d486217d934de6f5c2c392e01bb..3b9ccdf82c6be5b12d32f053bedc5c6d1cd4bc0e 100644
+index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a932b214235 100644
 --- a/base/allocator/partition_allocator/memory_reclaimer.cc
 +++ b/base/allocator/partition_allocator/memory_reclaimer.cc
 @@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index c558d7e41b89e..13e3eec7f04d0 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index ceeeedc42d9fe86383f9fda2b1a26d39119e655c..ff3b3cb47cbce01bcdcb28f1ef8a360143b2488f 100755
+index 8cf820d7d1f5d9e85156a18e9ec573dbeb63d41a..a7d6ea676aaba90220761fa7ecc4569012806581 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 87438368253cc..4eb68495cc7ec 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7..dd8c421545d75cd8c9864b88701e0f9071259444 100644
+index a969bbaaecb4b589808413d40299b68f3bc1fd3e..6e5d3ae228b98295bd95bad3cc58215a13c20106 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6253,6 +6253,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6267,6 +6267,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index dbd23d4d3ed74..6cc87c66110b0 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d274f922b 100644
+index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,7 +605,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5819,7 +5819,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5818,7 +5818,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d
  
      deps = [
        ":v8_libbase",
-@@ -5857,6 +5857,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5856,6 +5856,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 1db85681252e3..df2d1239081be 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index f0f1355f590b37d4b0ff1b68124165ab61099cc1..15d94af6d969f93cefb21d82ddb7d508320bea30 100644
+index e5a0e9fc7655bcc2359578e299b64952d6daa8a8..f15ccd03bc500b9a0095cb8581c6ffc143b29710 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9088,7 +9088,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9080,7 +9080,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index f0f1355f590b37d4b0ff1b68124165ab61099cc1..15d94af6d969f93cefb21d82ddb7d508
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index ccef6add27d782845a404741e4a42d07c86d0222..659f5187f80f74b3902facebe8f34d8898244093 100644
+index f0ba31671416f1d77d3b1a5ecb76a0dd3954c8c2..0436b896522b31904512694d20f883470a646a0f 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6152,9 +6152,9 @@ void Heap::TearDown() {
+@@ -6151,9 +6151,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index bb775eb8c65e1..6fff7c78b7faf 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 5338cdfd2067f1621ecb63ce8b8d1111e3677377..1f876cec9c66c2d92662c235ab5c9c608c242a37 100644
+index 2262d19f0f9ced2c9e69862252d94ecb885c839f..2e5dcdd037f29cf51b2ff5d325a43036c8713f33 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,6 +605,10 @@ config("internal_config") {
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index c2e6211db28bb..1cbc270ca4e70 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index d57ad0a847ed1903228db4fb0650e1ca2922b608..de8947cb558455537e251f66cc3fe4f2f08c640b 100644
+index 1e3950ab2292ce6a3e6a4e469d8327da28f2d899..5e9b17acc59590147d8b3e2d74f62050e6b5a7ec 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -910,7 +910,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -911,7 +911,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 452d901cd2707..d1c6b34213e4c 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 7eaa7582fc1efc2381c267fec96fe94d274f922b..5338cdfd2067f1621ecb63ce8b8d1111e3677377 100644
+index 0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f..2262d19f0f9ced2c9e69862252d94ecb885c839f 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5831,7 +5831,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5830,7 +5830,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
index ce960703ace71..563444f217760 100644
--- a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
+++ b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
@@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
 when support is synchronized across both v8 and node.
 
 diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
-index cd760b9e67820c6ab69164992bccf19411cf1db6..f28258bf1b797c2a2d904e25802a17b14ad0c19a 100644
+index f2563ef61d3f5bc2d866f8c3366ca6c9ef8357a6..ed6180e28467df90ed8d91093ae9269a24e919db 100644
 --- a/src/objects/js-array-buffer.cc
 +++ b/src/objects/js-array-buffer.cc
 @@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {

From d4a34fb175858b91f50b9dd7a125be3c7c26aca1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 06:02:03 -0700
Subject: [PATCH 176/811] Bump v19.0.0-nightly.20220328

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1e24e0ad0902e..d10e2a276be81 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220325
\ No newline at end of file
+19.0.0-nightly.20220328
\ No newline at end of file
diff --git a/package.json b/package.json
index 5fdbc7772f896..7cc43408a42fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220325",
+  "version": "19.0.0-nightly.20220328",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9eda6b7763560..8826798177c3c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220325
- PRODUCTVERSION 19,0,0,20220325
+ FILEVERSION 19,0,0,20220328
+ PRODUCTVERSION 19,0,0,20220328
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9e45a1cd51397c9c3eecb3988877dee75ff0e283 Mon Sep 17 00:00:00 2001
From: Sofia Nguy <sofianguy@gmail.com>
Date: Mon, 28 Mar 2022 09:30:05 -0700
Subject: [PATCH 177/811] docs: Update release dates for E19 and fix typos
 (#33464)

---
 docs/tutorial/electron-timelines.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/tutorial/electron-timelines.md b/docs/tutorial/electron-timelines.md
index 80ac4ca66eeb4..91ea556110ee1 100644
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -22,23 +22,23 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 | 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 | 🚫 |
 | 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 | 🚫 |
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
-| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | ✅ |
 | 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | ✅ |
 | 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
-| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | TBD | ✅ |
-| 19.0.0 | 2022-Mar-31 | 2022-Apr-30 | 2022-May-24 | M102 | TBD | ✅ |
+| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
+| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | TBD | ✅ |
 
 **Notes:**
 
-* The `-beta.1` and `stable` dates are our solid release dates.
-* We strive for weekly beta releases, but we often release more betas than scheduled.
+* The `-alpha.1`, `-beta.1`, and `stable` dates are our solid release dates.
+* We strive for weekly alpha/beta releases, but we often release more than scheduled.
 * All dates are our goals but there may be reasons for adjusting the stable deadline, such as security bugs.
 
 **Historical changes:**
 
 * Since Electron 5, Electron has been publicizing its release dates ([see blog post](https://electronjs.org/blog/electron-5-0-timeline)).
-* Since Electron 6, Electron major versions have been targeting every other Chromium major version. Each Electron stable should happen on the same day as Chrome stable ([see blog post](https://www.electronjs.org/blog/12-week-cadence)). When this was announced
-* Since Electron 16, Electron has been releasing major versions on an 8-week cadence in accordance to Chrome's change to a 4-week release cadence ([see blog post](https://www.electronjs.org/blog/8-week-cadence).
+* Since Electron 6, Electron major versions have been targeting every other Chromium major version. Each Electron stable should happen on the same day as Chrome stable ([see blog post](https://www.electronjs.org/blog/12-week-cadence)).
+* Since Electron 16, Electron has been releasing major versions on an 8-week cadence in accordance to Chrome's change to a 4-week release cadence ([see blog post](https://www.electronjs.org/blog/8-week-cadence)).
 
 :::info Chrome release dates
 

From 1153a5ce5a34b553466b0da563831ff59cc6d328 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 28 Mar 2022 18:47:08 +0200
Subject: [PATCH 178/811] fix: BrowserView background color in webContents
 (#33435)

* chore: fix BrowserView background color in webContents

* disable screen capture test on linux

* spec: fix platform failure condition
---
 .../browser/api/electron_api_browser_view.cc  | 19 ++++++-
 .../browser/api/electron_api_web_contents.cc  | 10 ++--
 spec-main/api-browser-view-spec.ts            | 55 ++++++++++++++++++-
 3 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
index 1a9735cef11e3..18bbdea9c23ed 100644
--- a/shell/browser/api/electron_api_browser_view.cc
+++ b/shell/browser/api/electron_api_browser_view.cc
@@ -6,10 +6,13 @@
 
 #include <vector>
 
+#include "content/browser/renderer_host/render_widget_host_view_base.h"  // nogncheck
+#include "content/public/browser/render_widget_host_view.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_browser_view.h"
 #include "shell/browser/ui/drag_util.h"
+#include "shell/browser/web_contents_preferences.h"
 #include "shell/common/color_util.h"
 #include "shell/common/gin_converters/gfx_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
@@ -154,11 +157,25 @@ gfx::Rect BrowserView::GetBounds() {
 }
 
 void BrowserView::SetBackgroundColor(const std::string& color_name) {
-  view_->SetBackgroundColor(ParseCSSColor(color_name));
+  SkColor color = ParseCSSColor(color_name);
+  view_->SetBackgroundColor(color);
 
   if (web_contents()) {
     auto* wc = web_contents()->web_contents();
     wc->SetPageBaseBackgroundColor(ParseCSSColor(color_name));
+
+    auto* const rwhv = wc->GetRenderWidgetHostView();
+    if (rwhv) {
+      rwhv->SetBackgroundColor(color);
+      static_cast<content::RenderWidgetHostViewBase*>(rwhv)
+          ->SetContentBackgroundColor(color);
+    }
+
+    // Ensure new color is stored in webPreferences, otherwise
+    // the color will be reset on the next load via HandleNewRenderFrame.
+    auto* web_preferences = WebContentsPreferences::From(wc);
+    if (web_preferences)
+      web_preferences->SetBackgroundColor(color);
   }
 }
 
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index e4030acac92d4..714d0d60c6076 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1489,11 +1489,13 @@ void WebContents::HandleNewRenderFrame(
   // Set the background color of RenderWidgetHostView.
   auto* web_preferences = WebContentsPreferences::From(web_contents());
   if (web_preferences) {
+    absl::optional<SkColor> maybe_color = web_preferences->GetBackgroundColor();
+    web_contents()->SetPageBaseBackgroundColor(maybe_color);
+
     bool guest = IsGuest() || type_ == Type::kBrowserView;
-    absl::optional<SkColor> color =
-        guest ? SK_ColorTRANSPARENT : web_preferences->GetBackgroundColor();
-    web_contents()->SetPageBaseBackgroundColor(color);
-    SetBackgroundColor(rwhv, color.value_or(SK_ColorWHITE));
+    SkColor color =
+        maybe_color.value_or(guest ? SK_ColorTRANSPARENT : SK_ColorWHITE);
+    SetBackgroundColor(rwhv, color);
   }
 
   if (!background_throttling_)
diff --git a/spec-main/api-browser-view-spec.ts b/spec-main/api-browser-view-spec.ts
index 8d54b9efe1cae..3352c06e991a4 100644
--- a/spec-main/api-browser-view-spec.ts
+++ b/spec-main/api-browser-view-spec.ts
@@ -1,9 +1,10 @@
 import { expect } from 'chai';
 import * as path from 'path';
 import { emittedOnce } from './events-helpers';
-import { BrowserView, BrowserWindow, webContents } from 'electron/main';
+import { BrowserView, BrowserWindow, screen, webContents } from 'electron/main';
 import { closeWindow } from './window-helpers';
-import { defer, startRemoteControlApp } from './spec-helpers';
+import { defer, ifit, startRemoteControlApp } from './spec-helpers';
+import { areColorsSimilar, captureScreen, getPixelColor } from './screen-helpers';
 
 describe('BrowserView module', () => {
   const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
@@ -60,6 +61,56 @@ describe('BrowserView module', () => {
         view.setBackgroundColor(null as any);
       }).to.throw(/conversion failure/);
     });
+
+    // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
+    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('sets the background color to transparent if none is set', async () => {
+      const display = screen.getPrimaryDisplay();
+      const WINDOW_BACKGROUND_COLOR = '#55ccbb';
+
+      w.show();
+      w.setBounds(display.bounds);
+      w.setBackgroundColor(WINDOW_BACKGROUND_COLOR);
+      await w.loadURL('about:blank');
+
+      view = new BrowserView();
+      view.setBounds(display.bounds);
+      w.setBrowserView(view);
+      await view.webContents.loadURL('data:text/html,hello there');
+
+      const screenCapture = await captureScreen();
+      const centerColor = getPixelColor(screenCapture, {
+        x: display.size.width / 2,
+        y: display.size.height / 2
+      });
+
+      expect(areColorsSimilar(centerColor, WINDOW_BACKGROUND_COLOR)).to.be.true();
+    });
+
+    // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
+    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('successfully applies the background color', async () => {
+      const WINDOW_BACKGROUND_COLOR = '#55ccbb';
+      const VIEW_BACKGROUND_COLOR = '#ff00ff';
+      const display = screen.getPrimaryDisplay();
+
+      w.show();
+      w.setBounds(display.bounds);
+      w.setBackgroundColor(WINDOW_BACKGROUND_COLOR);
+      await w.loadURL('about:blank');
+
+      view = new BrowserView();
+      view.setBounds(display.bounds);
+      w.setBrowserView(view);
+      w.setBackgroundColor(VIEW_BACKGROUND_COLOR);
+      await view.webContents.loadURL('data:text/html,hello there');
+
+      const screenCapture = await captureScreen();
+      const centerColor = getPixelColor(screenCapture, {
+        x: display.size.width / 2,
+        y: display.size.height / 2
+      });
+
+      expect(areColorsSimilar(centerColor, VIEW_BACKGROUND_COLOR)).to.be.true();
+    });
   });
 
   describe('BrowserView.setAutoResize()', () => {

From cdf2b3f4e48799c3a6ab91d0d70b5aaaf3a44c0a Mon Sep 17 00:00:00 2001
From: Marek Rusinowski <marekrusinowski@gmail.com>
Date: Mon, 28 Mar 2022 18:48:50 +0200
Subject: [PATCH 179/811] fix: calling of X11 functions when running under
 Wayland (#33355)

* fix: don't call X11 functions in file dialog and message box

* refactor: remove unused GtkUiPlatform declaration

* fix: set gtk darktheme only when running under X11

* fix: replace X11 window state watcher with implementation using ozone

* fix: make sure global menu barr is used only when supported

* fix: don't call X11 function in native window views under wayland

* style: fix lint issues

* fix: use GtkUiPlatform::ShowGtkWindow instead of gtk_window_present directly

* refactor: extract CreateGlobalMenuBar into separate function

* refactor: move checking for WaylandWindowDecorations inside class

* fix: check if we run under X11 only in ozone build

* refactor: drop including unused ui/base/ui_base_features.h header

* fix: modify ui_gtk_public_header.patch to also export gtk_ui.h

* fix: refactor guarding of X11 calls

- Introduce patch exposing new electron_can_call_x11 property
- Replace defined(USE_OZONE) with BUILDFLAG(OZONE_PLATFORM_X11) flags

* fix: remove the last remaining usage of USE_X11

* fix: usage of BUILDFLAG(OZONE_PLATFORM_X11) not building on non ozone

* fix: call UpdateWindowState from OnBoundsChanged only under X11
---
 BUILD.gn                                      |   1 -
 filenames.gni                                 |   2 -
 patches/chromium/.patches                     |   1 +
 ...tform_electron_can_call_x11_property.patch |  37 +++
 patches/chromium/ui_gtk_public_header.patch   |  20 +-
 shell/browser/electron_browser_main_parts.h   |   6 -
 shell/browser/native_window.cc                |   2 +-
 shell/browser/native_window_views.cc          | 255 ++++++++++--------
 shell/browser/native_window_views.h           |  15 +-
 ...electron_desktop_window_tree_host_linux.cc |  73 ++++-
 .../electron_desktop_window_tree_host_linux.h |   3 +
 shell/browser/ui/file_dialog_gtk.cc           |  18 +-
 shell/browser/ui/gtk/menu_util.cc             |  30 ++-
 shell/browser/ui/message_box_gtk.cc           |  16 +-
 shell/browser/ui/x/window_state_watcher.cc    |  82 ------
 shell/browser/ui/x/window_state_watcher.h     |  45 ----
 16 files changed, 301 insertions(+), 305 deletions(-)
 create mode 100644 patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
 delete mode 100644 shell/browser/ui/x/window_state_watcher.cc
 delete mode 100644 shell/browser/ui/x/window_state_watcher.h

diff --git a/BUILD.gn b/BUILD.gn
index 013b61c740ea3..b8a6396c4f4e8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -563,7 +563,6 @@ source_set("electron_lib") {
     defines += [
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
-      "USE_X11=1",
     ]
 
     sources += [
diff --git a/filenames.gni b/filenames.gni
index eae36f790483d..f7c6ce5dff438 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -53,8 +53,6 @@ filenames = {
     "shell/browser/ui/views/global_menu_bar_x11.h",
     "shell/browser/ui/x/event_disabler.cc",
     "shell/browser/ui/x/event_disabler.h",
-    "shell/browser/ui/x/window_state_watcher.cc",
-    "shell/browser/ui/x/window_state_watcher.h",
     "shell/browser/ui/x/x_window_utils.cc",
     "shell/browser/ui/x/x_window_utils.h",
   ]
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 2b208694ba35a..901b355c9245a 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -114,3 +114,4 @@ port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
+introduce_ozoneplatform_electron_can_call_x11_property.patch
diff --git a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
new file mode 100644
index 0000000000000..f879002345cc1
--- /dev/null
+++ b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marek Rusinowski <marekrusinowski@gmail.com>
+Date: Wed, 23 Mar 2022 21:09:37 +0100
+Subject: introduce OzonePlatform::electron_can_call_x11 property
+
+We expose this additonal property in the OzonePlatform to be able to easily
+determine whatever we can call X11 functions without crashing the application
+at rutime. It would be best if eventually all usages of this property were
+replaced with clean ozone native implementations.
+
+diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
+index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f9f704b5e 100644
+--- a/ui/ozone/platform/x11/ozone_platform_x11.cc
++++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
+@@ -200,6 +200,7 @@ class OzonePlatformX11 : public OzonePlatform,
+       properties->supports_vulkan_swap_chain = true;
+       properties->uses_external_vulkan_image_factory = true;
+       properties->skia_can_fall_back_to_x11 = true;
++      properties->electron_can_call_x11 = true;
+       properties->platform_shows_drag_image = false;
+       properties->supports_global_application_menus = true;
+       properties->app_modal_dialogs_use_event_blocker = true;
+diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
+index 22ba32317a74df24249d1528dcaaa28ff18bd0f4..fa57f97520a0327be2c7f5179591ca61b801c8b0 100644
+--- a/ui/ozone/public/ozone_platform.h
++++ b/ui/ozone/public/ozone_platform.h
+@@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+     // Linux only: determines if Skia can fall back to the X11 output device.
+     bool skia_can_fall_back_to_x11 = false;
+ 
++    // Linux only: determines is Electron can call selected X11 functions while
++    // it migrates to pure ozone abstractions.
++    bool electron_can_call_x11 = false;
++
+     // Wayland only: determines whether windows which are not top level ones
+     // should be given parents explicitly.
+     bool set_parent_for_non_top_level_windows = false;
diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch
index f54224072007c..12f9984100bd6 100644
--- a/patches/chromium/ui_gtk_public_header.patch
+++ b/patches/chromium/ui_gtk_public_header.patch
@@ -3,22 +3,32 @@ From: deepak1556 <hop2deep@gmail.com>
 Date: Fri, 10 Apr 2020 17:47:18 -0700
 Subject: ui_gtk_public_header.patch
 
-Allow electron to depend on //ui/gtk/gtk_util.h
+Allow electron to depend on gtk_util.h and gtk_ui.h from //ui/gtk/
 
 diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
-index 4093df78da0bbb1d8df743942f364cf728ad3414..2f31d99b207ffc3531b5334b5a01239cc1fefb35 100644
+index 4093df78da0bbb1d8df743942f364cf728ad3414..2f7c404307bfebb0e2890148cf9b0d6d9c68094f 100644
 --- a/ui/gtk/BUILD.gn
 +++ b/ui/gtk/BUILD.gn
-@@ -69,7 +69,7 @@ generate_stubs("gtk_stubs") {
+@@ -69,7 +69,11 @@ generate_stubs("gtk_stubs") {
  }
  
  component("gtk") {
 -  public = [ "gtk_ui_factory.h" ]
-+  public = [ "gtk_ui_factory.h", "gtk_util.h" ]
++  public = [
++    "gtk_ui.h",
++    "gtk_ui_factory.h",
++    "gtk_util.h",
++  ]
  
    sources = [
      "gtk_color_mixers.cc",
-@@ -85,7 +85,6 @@ component("gtk") {
+@@ -79,13 +83,11 @@ component("gtk") {
+     "gtk_key_bindings_handler.cc",
+     "gtk_key_bindings_handler.h",
+     "gtk_ui.cc",
+-    "gtk_ui.h",
+     "gtk_ui_factory.cc",
+     "gtk_ui_platform.h",
      "gtk_ui_platform_stub.cc",
      "gtk_ui_platform_stub.h",
      "gtk_util.cc",
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index d8e49529e5641..e41097ef35826 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -36,12 +36,6 @@ class Screen;
 }
 #endif
 
-#if defined(USE_X11)
-namespace ui {
-class GtkUiPlatform;
-}
-#endif
-
 namespace device {
 class GeolocationManager;
 }
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index b62ce2f617055..1ca962fa92746 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -26,7 +26,7 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
-#if defined(USE_OZONE) || defined(USE_X11)
+#if defined(USE_OZONE)
 #include "ui/base/ui_base_features.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 87d9dd1616627..f542365e290df 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -19,7 +19,6 @@
 #include "content/public/browser/desktop_media_id.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/native_browser_view_views.h"
-#include "shell/browser/native_window_features.h"
 #include "shell/browser/ui/drag_util.h"
 #include "shell/browser/ui/inspectable_web_contents.h"
 #include "shell/browser/ui/inspectable_web_contents_view.h"
@@ -55,20 +54,16 @@
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/window/native_frame_view.h"
 
-#if defined(USE_X11)
+#if defined(USE_OZONE)
 #include "shell/browser/ui/views/global_menu_bar_x11.h"
 #include "shell/browser/ui/x/event_disabler.h"
-#include "shell/browser/ui/x/window_state_watcher.h"
 #include "shell/browser/ui/x/x_window_utils.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/shape.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/xproto.h"
 #include "ui/gfx/x/xproto_util.h"
-#endif
-
-#if defined(USE_OZONE) || defined(USE_X11)
-#include "ui/base/ui_base_features.h"
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 #elif BUILDFLAG(IS_WIN)
@@ -130,6 +125,26 @@ gfx::Rect DIPToScreenRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
 
 #endif
 
+#if defined(USE_OZONE)
+
+bool CreateGlobalMenuBar() {
+  return ui::OzonePlatform::GetInstance()
+      ->GetPlatformProperties()
+      .supports_global_application_menus;
+}
+
+#endif
+
+#if defined(USE_OZONE_PLATFORM_X11)
+
+bool IsX11() {
+  return ui::OzonePlatform::GetInstance()
+      ->GetPlatformProperties()
+      .electron_can_call_x11;
+}
+
+#endif
+
 class NativeWindowClientView : public views::ClientView {
  public:
   NativeWindowClientView(views::Widget* widget,
@@ -257,12 +272,10 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   params.wm_class_name = base::ToLowerASCII(name);
   params.wm_class_class = name;
 
-  if (base::FeatureList::IsEnabled(features::kWaylandWindowDecorations)) {
-    auto* native_widget = new views::DesktopNativeWidgetAura(widget());
-    params.native_widget = native_widget;
-    params.desktop_window_tree_host =
-        new ElectronDesktopWindowTreeHostLinux(this, native_widget);
-  }
+  auto* native_widget = new views::DesktopNativeWidgetAura(widget());
+  params.native_widget = native_widget;
+  params.desktop_window_tree_host =
+      new ElectronDesktopWindowTreeHostLinux(this, native_widget);
 #endif
 
   widget()->Init(std::move(params));
@@ -274,55 +287,52 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   std::string window_type;
   options.Get(options::kType, &window_type);
 
-#if defined(USE_X11)
-  // Start monitoring window states.
-  window_state_watcher_ = std::make_unique<WindowStateWatcher>(this);
-
+#if BUILDFLAG(IS_LINUX)
   // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
   bool use_dark_theme = false;
   if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
     SetGTKDarkThemeEnabled(use_dark_theme);
   }
-#endif
 
-#if BUILDFLAG(IS_LINUX)
   if (parent)
     SetParentWindow(parent);
 #endif
 
-#if defined(USE_X11)
-  // TODO(ckerr): remove in Electron v20.0.0
-  // Before the window is mapped the SetWMSpecState can not work, so we have
-  // to manually set the _NET_WM_STATE.
-  std::vector<x11::Atom> state_atom_list;
-  bool skip_taskbar = false;
-  if (options.Get(options::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
-    state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
-  }
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    // TODO(ckerr): remove in Electron v20.0.0
+    // Before the window is mapped the SetWMSpecState can not work, so we have
+    // to manually set the _NET_WM_STATE.
+    std::vector<x11::Atom> state_atom_list;
+    bool skip_taskbar = false;
+    if (options.Get(options::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
+      state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
+    }
 
-  // Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
-  if (fullscreen) {
-    state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_FULLSCREEN"));
-  }
+    // Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
+    if (fullscreen) {
+      state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_FULLSCREEN"));
+    }
 
-  if (parent) {
-    // Force using dialog type for child window.
-    window_type = "dialog";
+    if (parent) {
+      // Force using dialog type for child window.
+      window_type = "dialog";
 
-    // Modal window needs the _NET_WM_STATE_MODAL hint.
-    if (is_modal())
-      state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_MODAL"));
-  }
+      // Modal window needs the _NET_WM_STATE_MODAL hint.
+      if (is_modal())
+        state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_MODAL"));
+    }
 
-  if (!state_atom_list.empty())
-    SetArrayProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
-                     x11::GetAtom("_NET_WM_STATE"), x11::Atom::ATOM,
-                     state_atom_list);
+    if (!state_atom_list.empty())
+      SetArrayProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
+                       x11::GetAtom("_NET_WM_STATE"), x11::Atom::ATOM,
+                       state_atom_list);
 
-  // Set the _NET_WM_WINDOW_TYPE.
-  if (!window_type.empty())
-    SetWindowType(static_cast<x11::Window>(GetAcceleratedWidget()),
-                  window_type);
+    // Set the _NET_WM_WINDOW_TYPE.
+    if (!window_type.empty())
+      SetWindowType(static_cast<x11::Window>(GetAcceleratedWidget()),
+                    window_type);
+  }
 #endif
 
 #if BUILDFLAG(IS_WIN)
@@ -419,11 +429,13 @@ NativeWindowViews::~NativeWindowViews() {
 }
 
 void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) {
-#if defined(USE_X11)
-  const std::string color = use_dark_theme ? "dark" : "light";
-  x11::SetStringProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
-                         x11::GetAtom("_GTK_THEME_VARIANT"),
-                         x11::GetAtom("UTF8_STRING"), color);
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    const std::string color = use_dark_theme ? "dark" : "light";
+    x11::SetStringProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
+                           x11::GetAtom("_GTK_THEME_VARIANT"),
+                           x11::GetAtom("UTF8_STRING"), color);
+  }
 #endif
 }
 
@@ -478,7 +490,7 @@ void NativeWindowViews::Show() {
 
   NotifyWindowShow();
 
-#if defined(USE_X11)
+#if defined(USE_OZONE)
   if (global_menu_bar_)
     global_menu_bar_->OnWindowMapped();
 #endif
@@ -489,7 +501,7 @@ void NativeWindowViews::ShowInactive() {
 
   NotifyWindowShow();
 
-#if defined(USE_X11)
+#if defined(USE_OZONE)
   if (global_menu_bar_)
     global_menu_bar_->OnWindowMapped();
 #endif
@@ -503,7 +515,7 @@ void NativeWindowViews::Hide() {
 
   NotifyWindowHide();
 
-#if defined(USE_X11)
+#if defined(USE_OZONE)
   if (global_menu_bar_)
     global_menu_bar_->OnWindowUnmapped();
 #endif
@@ -525,8 +537,9 @@ bool NativeWindowViews::IsEnabled() {
 #if BUILDFLAG(IS_WIN)
   return ::IsWindowEnabled(GetAcceleratedWidget());
 #elif BUILDFLAG(IS_LINUX)
-#if defined(USE_X11)
-  return !event_disabler_.get();
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11())
+    return !event_disabler_.get();
 #endif
   NOTIMPLEMENTED();
   return true;
@@ -565,16 +578,18 @@ void NativeWindowViews::SetEnabledInternal(bool enable) {
 
 #if BUILDFLAG(IS_WIN)
   ::EnableWindow(GetAcceleratedWidget(), enable);
-#elif defined(USE_X11)
-  views::DesktopWindowTreeHostPlatform* tree_host =
-      views::DesktopWindowTreeHostLinux::GetHostForWidget(
-          GetAcceleratedWidget());
-  if (enable) {
-    tree_host->RemoveEventRewriter(event_disabler_.get());
-    event_disabler_.reset();
-  } else {
-    event_disabler_ = std::make_unique<EventDisabler>();
-    tree_host->AddEventRewriter(event_disabler_.get());
+#elif defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    views::DesktopWindowTreeHostPlatform* tree_host =
+        views::DesktopWindowTreeHostLinux::GetHostForWidget(
+            GetAcceleratedWidget());
+    if (enable) {
+      tree_host->RemoveEventRewriter(event_disabler_.get());
+      event_disabler_.reset();
+    } else {
+      event_disabler_ = std::make_unique<EventDisabler>();
+      tree_host->AddEventRewriter(event_disabler_.get());
+    }
   }
 #endif
 }
@@ -798,12 +813,14 @@ bool NativeWindowViews::MoveAbove(const std::string& sourceId) {
   ::SetWindowPos(GetAcceleratedWidget(), GetWindow(otherWindow, GW_HWNDPREV), 0,
                  0, 0, 0,
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-#elif defined(USE_X11)
-  if (!IsWindowValid(static_cast<x11::Window>(id.id)))
-    return false;
+#elif defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    if (!IsWindowValid(static_cast<x11::Window>(id.id)))
+      return false;
 
-  electron::MoveWindowAbove(static_cast<x11::Window>(GetAcceleratedWidget()),
-                            static_cast<x11::Window>(id.id));
+    electron::MoveWindowAbove(static_cast<x11::Window>(GetAcceleratedWidget()),
+                              static_cast<x11::Window>(id.id));
+  }
 #endif
 
   return true;
@@ -818,9 +835,10 @@ void NativeWindowViews::MoveTop() {
   ::SetWindowPos(GetAcceleratedWidget(), HWND_TOP, pos.x(), pos.y(),
                  size.width(), size.height(),
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
-#elif defined(USE_X11)
-  electron::MoveWindowToForeground(
-      static_cast<x11::Window>(GetAcceleratedWidget()));
+#elif defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11())
+    electron::MoveWindowToForeground(
+        static_cast<x11::Window>(GetAcceleratedWidget()));
 #endif
 }
 
@@ -1002,9 +1020,10 @@ void NativeWindowViews::SetSkipTaskbar(bool skip) {
     taskbar->AddTab(GetAcceleratedWidget());
     taskbar_host_.RestoreThumbarButtons(GetAcceleratedWidget());
   }
-#elif defined(USE_X11)
-  SetWMSpecState(static_cast<x11::Window>(GetAcceleratedWidget()), skip,
-                 x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
+#elif defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11())
+    SetWMSpecState(static_cast<x11::Window>(GetAcceleratedWidget()), skip,
+                   x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
 #endif
 }
 
@@ -1104,24 +1123,28 @@ void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) {
   } else {
     SetForwardMouseMessages(forward);
   }
-#elif defined(USE_X11)
-  auto* connection = x11::Connection::Get();
-  if (ignore) {
-    x11::Rectangle r{0, 0, 1, 1};
-    connection->shape().Rectangles({
-        .operation = x11::Shape::So::Set,
-        .destination_kind = x11::Shape::Sk::Input,
-        .ordering = x11::ClipOrdering::YXBanded,
-        .destination_window = static_cast<x11::Window>(GetAcceleratedWidget()),
-        .rectangles = {r},
-    });
-  } else {
-    connection->shape().Mask({
-        .operation = x11::Shape::So::Set,
-        .destination_kind = x11::Shape::Sk::Input,
-        .destination_window = static_cast<x11::Window>(GetAcceleratedWidget()),
-        .source_bitmap = x11::Pixmap::None,
-    });
+#elif defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    auto* connection = x11::Connection::Get();
+    if (ignore) {
+      x11::Rectangle r{0, 0, 1, 1};
+      connection->shape().Rectangles({
+          .operation = x11::Shape::So::Set,
+          .destination_kind = x11::Shape::Sk::Input,
+          .ordering = x11::ClipOrdering::YXBanded,
+          .destination_window =
+              static_cast<x11::Window>(GetAcceleratedWidget()),
+          .rectangles = {r},
+      });
+    } else {
+      connection->shape().Mask({
+          .operation = x11::Shape::So::Set,
+          .destination_kind = x11::Shape::Sk::Input,
+          .destination_window =
+              static_cast<x11::Window>(GetAcceleratedWidget()),
+          .source_bitmap = x11::Pixmap::None,
+      });
+    }
   }
 #endif
 }
@@ -1168,7 +1191,7 @@ bool NativeWindowViews::IsFocusable() {
 }
 
 void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
-#if defined(USE_X11)
+#if defined(USE_OZONE)
   // Remove global menu bar.
   if (global_menu_bar_ && menu_model == nullptr) {
     global_menu_bar_.reset();
@@ -1177,7 +1200,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
   }
 
   // Use global application menu bar when possible.
-  if (ShouldUseGlobalMenuBar()) {
+  if (CreateGlobalMenuBar() && ShouldUseGlobalMenuBar()) {
     if (!global_menu_bar_)
       global_menu_bar_ = std::make_unique<GlobalMenuBarX11>(this);
     if (global_menu_bar_->IsServerStarted()) {
@@ -1264,12 +1287,13 @@ void NativeWindowViews::SetTopBrowserView(NativeBrowserView* view) {
 void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
   NativeWindow::SetParentWindow(parent);
 
-#if defined(USE_X11)
-  x11::SetProperty(
-      static_cast<x11::Window>(GetAcceleratedWidget()),
-      x11::Atom::WM_TRANSIENT_FOR, x11::Atom::WINDOW,
-      parent ? static_cast<x11::Window>(parent->GetAcceleratedWidget())
-             : ui::GetX11RootWindow());
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11())
+    x11::SetProperty(
+        static_cast<x11::Window>(GetAcceleratedWidget()),
+        x11::Atom::WM_TRANSIENT_FOR, x11::Atom::WINDOW,
+        parent ? static_cast<x11::Window>(parent->GetAcceleratedWidget())
+               : ui::GetX11RootWindow());
 #elif BUILDFLAG(IS_WIN)
   // To set parentship between windows into Windows is better to play with the
   //  owner instead of the parent, as Windows natively seems to do if a parent
@@ -1347,18 +1371,19 @@ void NativeWindowViews::SetVisibleOnAllWorkspaces(
 }
 
 bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
-#if defined(USE_X11)
-  // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
-  // determine whether the current window is visible on all workspaces.
-  x11::Atom sticky_atom = x11::GetAtom("_NET_WM_STATE_STICKY");
-  std::vector<x11::Atom> wm_states;
-  GetArrayProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
-                   x11::GetAtom("_NET_WM_STATE"), &wm_states);
-  return std::find(wm_states.begin(), wm_states.end(), sticky_atom) !=
-         wm_states.end();
-#else
-  return false;
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (IsX11()) {
+    // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
+    // determine whether the current window is visible on all workspaces.
+    x11::Atom sticky_atom = x11::GetAtom("_NET_WM_STATE_STICKY");
+    std::vector<x11::Atom> wm_states;
+    GetArrayProperty(static_cast<x11::Window>(GetAcceleratedWidget()),
+                     x11::GetAtom("_NET_WM_STATE"), &wm_states);
+    return std::find(wm_states.begin(), wm_states.end(), sticky_atom) !=
+           wm_states.end();
+  }
 #endif
+  return false;
 }
 
 content::DesktopMediaID NativeWindowViews::GetDesktopMediaID() const {
diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index ad839239f25af..5454aafaec053 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -16,6 +16,13 @@
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/views/widget/widget_observer.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/buildflags.h"
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+#define USE_OZONE_PLATFORM_X11
+#endif
+#endif
+
 #if BUILDFLAG(IS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "shell/browser/ui/win/taskbar_host.h"
@@ -32,7 +39,7 @@ class GlobalMenuBarX11;
 class RootView;
 class WindowStateWatcher;
 
-#if defined(USE_X11)
+#if defined(USE_OZONE_PLATFORM_X11)
 class EventDisabler;
 #endif
 
@@ -259,12 +266,12 @@ class NativeWindowViews : public NativeWindow,
   // events from resizing the window.
   extensions::SizeConstraints old_size_constraints_;
 
-#if defined(USE_X11)
+#if defined(USE_OZONE)
   std::unique_ptr<GlobalMenuBarX11> global_menu_bar_;
 
-  // Handles window state events.
-  std::unique_ptr<WindowStateWatcher> window_state_watcher_;
+#endif
 
+#if defined(USE_OZONE_PLATFORM_X11)
   // To disable the mouse events.
   std::unique_ptr<EventDisabler> event_disabler_;
 #endif
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
index f763c13dca689..045e7d9dcff9e 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
@@ -10,7 +10,9 @@
 
 #include <vector>
 
+#include "base/feature_list.h"
 #include "base/i18n/rtl.h"
+#include "shell/browser/native_window_features.h"
 #include "shell/browser/ui/views/client_frame_view_linux.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/skia_conversions.h"
@@ -20,6 +22,14 @@
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 #include "ui/views/window/non_client_view.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/buildflags.h"
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+#define USE_OZONE_PLATFORM_X11
+#endif
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
 namespace electron {
 
 ElectronDesktopWindowTreeHostLinux::ElectronDesktopWindowTreeHostLinux(
@@ -46,6 +56,18 @@ void ElectronDesktopWindowTreeHostLinux::OnBoundsChanged(
     const BoundsChange& change) {
   views::DesktopWindowTreeHostLinux::OnBoundsChanged(change);
   UpdateFrameHints();
+
+#if defined(USE_OZONE_PLATFORM_X11)
+  if (ui::OzonePlatform::GetInstance()
+          ->GetPlatformProperties()
+          .electron_can_call_x11) {
+    // The OnWindowStateChanged should receive all updates but currently under
+    // X11 it doesn't receive changes to the fullscreen status because chromium
+    // is handling the fullscreen state changes synchronously, see
+    // X11Window::ToggleFullscreen in ui/ozone/platform/x11/x11_window.cc.
+    UpdateWindowState(platform_window()->GetPlatformWindowState());
+  }
+#endif
 }
 
 void ElectronDesktopWindowTreeHostLinux::OnWindowStateChanged(
@@ -53,6 +75,43 @@ void ElectronDesktopWindowTreeHostLinux::OnWindowStateChanged(
     ui::PlatformWindowState new_state) {
   views::DesktopWindowTreeHostLinux::OnWindowStateChanged(old_state, new_state);
   UpdateFrameHints();
+  UpdateWindowState(new_state);
+}
+
+void ElectronDesktopWindowTreeHostLinux::UpdateWindowState(
+    ui::PlatformWindowState new_state) {
+  if (window_state_ == new_state)
+    return;
+
+  switch (window_state_) {
+    case ui::PlatformWindowState::kMinimized:
+      native_window_view_->NotifyWindowRestore();
+      break;
+    case ui::PlatformWindowState::kMaximized:
+      native_window_view_->NotifyWindowUnmaximize();
+      break;
+    case ui::PlatformWindowState::kFullScreen:
+      native_window_view_->NotifyWindowLeaveFullScreen();
+      break;
+    case ui::PlatformWindowState::kUnknown:
+    case ui::PlatformWindowState::kNormal:
+      break;
+  }
+  switch (new_state) {
+    case ui::PlatformWindowState::kMinimized:
+      native_window_view_->NotifyWindowMinimize();
+      break;
+    case ui::PlatformWindowState::kMaximized:
+      native_window_view_->NotifyWindowMaximize();
+      break;
+    case ui::PlatformWindowState::kFullScreen:
+      native_window_view_->NotifyWindowEnterFullScreen();
+      break;
+    case ui::PlatformWindowState::kUnknown:
+    case ui::PlatformWindowState::kNormal:
+      break;
+  }
+  window_state_ = new_state;
 }
 
 void ElectronDesktopWindowTreeHostLinux::OnNativeThemeUpdated(
@@ -65,13 +124,15 @@ void ElectronDesktopWindowTreeHostLinux::OnDeviceScaleFactorChanged() {
 }
 
 void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
-  if (SupportsClientFrameShadow() && native_window_view_->has_frame() &&
-      native_window_view_->has_client_frame()) {
-    UpdateClientDecorationHints(static_cast<ClientFrameViewLinux*>(
-        native_window_view_->widget()->non_client_view()->frame_view()));
-  }
+  if (base::FeatureList::IsEnabled(features::kWaylandWindowDecorations)) {
+    if (SupportsClientFrameShadow() && native_window_view_->has_frame() &&
+        native_window_view_->has_client_frame()) {
+      UpdateClientDecorationHints(static_cast<ClientFrameViewLinux*>(
+          native_window_view_->widget()->non_client_view()->frame_view()));
+    }
 
-  SizeConstraintsChanged();
+    SizeConstraintsChanged();
+  }
 }
 
 void ElectronDesktopWindowTreeHostLinux::UpdateClientDecorationHints(
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.h b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
index 58824f4dd63ea..e9bb28adb97dc 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.h
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
@@ -14,6 +14,7 @@
 #include "shell/browser/ui/views/client_frame_view_linux.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/native_theme/native_theme_observer.h"
+#include "ui/platform_window/platform_window.h"
 #include "ui/views/linux_ui/device_scale_factor_observer.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 
@@ -55,6 +56,7 @@ class ElectronDesktopWindowTreeHostLinux
  private:
   void UpdateFrameHints();
   void UpdateClientDecorationHints(ClientFrameViewLinux* view);
+  void UpdateWindowState(ui::PlatformWindowState new_state);
 
   NativeWindowViews* native_window_view_;  // weak ref
 
@@ -65,6 +67,7 @@ class ElectronDesktopWindowTreeHostLinux
                           &views::LinuxUI::AddDeviceScaleFactorObserver,
                           &views::LinuxUI::RemoveDeviceScaleFactorObserver>
       scale_observation_{this};
+  ui::PlatformWindowState window_state_ = ui::PlatformWindowState::kUnknown;
 };
 
 }  // namespace electron
diff --git a/shell/browser/ui/file_dialog_gtk.cc b/shell/browser/ui/file_dialog_gtk.cc
index 6f2141ada00fe..440c06823cea3 100644
--- a/shell/browser/ui/file_dialog_gtk.cc
+++ b/shell/browser/ui/file_dialog_gtk.cc
@@ -18,16 +18,9 @@
 #include "shell/browser/unresponsive_suppressor.h"
 #include "shell/common/gin_converters/file_path_converter.h"
 #include "ui/base/glib/glib_signal.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_util.h"
 
-#if defined(USE_X11)
-#include "ui/events/platform/x11/x11_event_source.h"
-#endif
-
-#if defined(USE_OZONE) || defined(USE_X11)
-#include "ui/base/ui_base_features.h"
-#endif
-
 namespace file_dialog {
 
 static GModule* gtk_module;
@@ -247,14 +240,7 @@ class FileChooserDialog {
       dl_gtk_native_dialog_show(static_cast<void*>(dialog_));
     } else {
       gtk_widget_show_all(GTK_WIDGET(dialog_));
-
-#if defined(USE_X11)
-      // We need to call gtk_window_present after making the widgets visible
-      // to make sure window gets correctly raised and gets focus.
-      x11::Time time = ui::X11EventSource::GetInstance()->GetTimestamp();
-      gtk_window_present_with_time(GTK_WINDOW(dialog_),
-                                   static_cast<uint32_t>(time));
-#endif
+      gtk::GtkUi::GetPlatform()->ShowGtkWindow(GTK_WINDOW(dialog_));
     }
   }
 
diff --git a/shell/browser/ui/gtk/menu_util.cc b/shell/browser/ui/gtk/menu_util.cc
index 08f2a5544b8e3..fb1c0e63e91ac 100644
--- a/shell/browser/ui/gtk/menu_util.cc
+++ b/shell/browser/ui/gtk/menu_util.cc
@@ -22,8 +22,12 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
-#if defined(USE_OZONE) || defined(USE_X11)
-#include "ui/base/ui_base_features.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/buildflags.h"
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+#define USE_OZONE_PLATFORM_X11
+#endif
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace electron {
@@ -45,6 +49,8 @@ int EventFlagsFromGdkState(guint state) {
   return flags;
 }
 
+#if defined(USE_OZONE_PLATFORM_X11)
+
 guint GetGdkKeyCodeForAccelerator(const ui::Accelerator& accelerator) {
   // The second parameter is false because accelerator keys are expressed in
   // terms of the non-shift-modified key.
@@ -64,6 +70,8 @@ GdkModifierType GetGdkModifierForAccelerator(
   return static_cast<GdkModifierType>(modifier);
 }
 
+#endif
+
 }  // namespace
 
 GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image) {
@@ -225,13 +233,17 @@ void BuildSubmenuFromModel(ui::MenuModel* model,
       connect_to_activate = false;
     }
 
-#if defined(USE_X11)
-    ui::Accelerator accelerator;
-    if (model->GetAcceleratorAt(i, &accelerator)) {
-      gtk_widget_add_accelerator(menu_item, "activate", nullptr,
-                                 GetGdkKeyCodeForAccelerator(accelerator),
-                                 GetGdkModifierForAccelerator(accelerator),
-                                 GTK_ACCEL_VISIBLE);
+#if defined(USE_OZONE_PLATFORM_X11)
+    if (ui::OzonePlatform::GetInstance()
+            ->GetPlatformProperties()
+            .electron_can_call_x11) {
+      ui::Accelerator accelerator;
+      if (model->GetAcceleratorAt(i, &accelerator)) {
+        gtk_widget_add_accelerator(menu_item, "activate", nullptr,
+                                   GetGdkKeyCodeForAccelerator(accelerator),
+                                   GetGdkModifierForAccelerator(accelerator),
+                                   GTK_ACCEL_VISIBLE);
+      }
     }
 #endif
 
diff --git a/shell/browser/ui/message_box_gtk.cc b/shell/browser/ui/message_box_gtk.cc
index 6945214920d12..28b332d6f8adf 100644
--- a/shell/browser/ui/message_box_gtk.cc
+++ b/shell/browser/ui/message_box_gtk.cc
@@ -18,13 +18,10 @@
 #include "shell/browser/unresponsive_suppressor.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gtk/gtk_ui.h"
 #include "ui/gtk/gtk_util.h"
 
-#if defined(USE_X11)
-#include "ui/events/platform/x11/x11_event_source.h"
-#endif
-
-#if defined(USE_OZONE) || defined(USE_X11)
+#if defined(USE_OZONE)
 #include "ui/base/ui_base_features.h"
 #endif
 
@@ -161,14 +158,7 @@ class GtkMessageBox : public NativeWindowObserver {
 
   void Show() {
     gtk_widget_show(dialog_);
-
-#if defined(USE_X11)
-    // We need to call gtk_window_present after making the widgets visible to
-    // make sure window gets correctly raised and gets focus.
-    x11::Time time = ui::X11EventSource::GetInstance()->GetTimestamp();
-    gtk_window_present_with_time(GTK_WINDOW(dialog_),
-                                 static_cast<uint32_t>(time));
-#endif
+    gtk::GtkUi::GetPlatform()->ShowGtkWindow(GTK_WINDOW(dialog_));
   }
 
   int RunSynchronous() {
diff --git a/shell/browser/ui/x/window_state_watcher.cc b/shell/browser/ui/x/window_state_watcher.cc
deleted file mode 100644
index 42e553b45e0cb..0000000000000
--- a/shell/browser/ui/x/window_state_watcher.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "shell/browser/ui/x/window_state_watcher.h"
-
-#include <vector>
-
-#include "ui/base/x/x11_util.h"
-#include "ui/gfx/x/x11_atom_cache.h"
-#include "ui/gfx/x/xproto_util.h"
-
-namespace electron {
-
-WindowStateWatcher::WindowStateWatcher(NativeWindowViews* window)
-    : window_(window),
-      widget_(window->GetAcceleratedWidget()),
-      net_wm_state_atom_(x11::GetAtom("_NET_WM_STATE")),
-      net_wm_state_hidden_atom_(x11::GetAtom("_NET_WM_STATE_HIDDEN")),
-      net_wm_state_maximized_vert_atom_(
-          x11::GetAtom("_NET_WM_STATE_MAXIMIZED_VERT")),
-      net_wm_state_maximized_horz_atom_(
-          x11::GetAtom("_NET_WM_STATE_MAXIMIZED_HORZ")),
-      net_wm_state_fullscreen_atom_(x11::GetAtom("_NET_WM_STATE_FULLSCREEN")),
-      was_minimized_(window_->IsMinimized()),
-      was_maximized_(window_->IsMaximized()) {
-  ui::X11EventSource::GetInstance()->connection()->AddEventObserver(this);
-}
-
-WindowStateWatcher::~WindowStateWatcher() {
-  ui::X11EventSource::GetInstance()->connection()->RemoveEventObserver(this);
-}
-
-void WindowStateWatcher::OnEvent(const x11::Event& x11_event) {
-  if (IsWindowStateEvent(x11_event)) {
-    std::vector<x11::Atom> wm_states;
-    if (GetArrayProperty(
-            static_cast<x11::Window>(window_->GetAcceleratedWidget()),
-            net_wm_state_atom_, &wm_states)) {
-      const auto props =
-          base::flat_set<x11::Atom>(std::begin(wm_states), std::end(wm_states));
-      const bool is_minimized = props.contains(net_wm_state_hidden_atom_);
-      const bool is_maximized =
-          props.contains(net_wm_state_maximized_vert_atom_) &&
-          props.contains(net_wm_state_maximized_horz_atom_);
-      const bool is_fullscreen = props.contains(net_wm_state_fullscreen_atom_);
-
-      if (is_minimized != was_minimized_) {
-        if (is_minimized)
-          window_->NotifyWindowMinimize();
-        else
-          window_->NotifyWindowRestore();
-      } else if (is_maximized != was_maximized_) {
-        if (is_maximized)
-          window_->NotifyWindowMaximize();
-        else
-          window_->NotifyWindowUnmaximize();
-      } else {
-        // If this is neither a "maximize" or "minimize" event, then we think it
-        // is a "fullscreen" event.
-        // The "IsFullscreen()" becomes true immediately before "OnEvent"
-        // is called, so we can not handle this like "maximize" and "minimize"
-        // by watching whether they have changed.
-        if (is_fullscreen)
-          window_->NotifyWindowEnterFullScreen();
-        else
-          window_->NotifyWindowLeaveFullScreen();
-      }
-
-      was_minimized_ = is_minimized;
-      was_maximized_ = is_maximized;
-    }
-  }
-}
-
-bool WindowStateWatcher::IsWindowStateEvent(const x11::Event& x11_event) const {
-  auto* property = x11_event.As<x11::PropertyNotifyEvent>();
-  return (property && property->atom == net_wm_state_atom_ &&
-          static_cast<uint32_t>(property->window) == widget_);
-}
-
-}  // namespace electron
diff --git a/shell/browser/ui/x/window_state_watcher.h b/shell/browser/ui/x/window_state_watcher.h
deleted file mode 100644
index 81b1117579c84..0000000000000
--- a/shell/browser/ui/x/window_state_watcher.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ELECTRON_SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-#define ELECTRON_SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_
-
-#include "ui/events/platform/x11/x11_event_source.h"
-#include "ui/gfx/x/event.h"
-
-#include "shell/browser/native_window_views.h"
-
-namespace electron {
-
-class WindowStateWatcher : public x11::EventObserver {
- public:
-  explicit WindowStateWatcher(NativeWindowViews* window);
-  ~WindowStateWatcher() override;
-
-  // disable copy
-  WindowStateWatcher(const WindowStateWatcher&) = delete;
-  WindowStateWatcher& operator=(const WindowStateWatcher&) = delete;
-
- protected:
-  // x11::EventObserver:
-  void OnEvent(const x11::Event& x11_event) override;
-
- private:
-  bool IsWindowStateEvent(const x11::Event& x11_event) const;
-
-  NativeWindowViews* window_;
-  gfx::AcceleratedWidget widget_;
-  const x11::Atom net_wm_state_atom_;
-  const x11::Atom net_wm_state_hidden_atom_;
-  const x11::Atom net_wm_state_maximized_vert_atom_;
-  const x11::Atom net_wm_state_maximized_horz_atom_;
-  const x11::Atom net_wm_state_fullscreen_atom_;
-
-  bool was_minimized_ = false;
-  bool was_maximized_ = false;
-};
-
-}  // namespace electron
-
-#endif  // ELECTRON_SHELL_BROWSER_UI_X_WINDOW_STATE_WATCHER_H_

From 3c30b59c3e64c39ae5b6dffc293d13efc537d6db Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 28 Mar 2022 10:34:10 -0700
Subject: [PATCH 180/811] build: store last ninja log in artifacts (#32936)

---
 .circleci/build_config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index a6c0411fcab71..dc18ceadedcb3 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -1270,6 +1270,7 @@ commands:
             mv_if_exist src/out/Default/hunspell_dictionaries.zip
             mv_if_exist src/cross-arch-snapshots
             mv_if_exist src/out/electron_ninja_log
+            mv_if_exist src/out/Default/.ninja_log
           when: always
       - store_artifacts:
           path: generated_artifacts

From c4e3a1aad3ae3fc2be4fc8efa64b17abddb7b621 Mon Sep 17 00:00:00 2001
From: Baitinq <30861839+Baitinq@users.noreply.github.com>
Date: Mon, 28 Mar 2022 18:25:44 +0000
Subject: [PATCH 181/811] docs: Use Node's URL parser in the 5th security
 recommendation (#33463)

Rule 13 recommends using Node's URL parser for handling url inputs. At
the moment, this is not being followed in the code example for rule 5,
which falls back on checking that the url ends with a '/'. If this was
forgotten when a user copies this code it could introduce security
vulnerabilities if an attacker uses an URL in the following way:

"https://example.com.attacker.com"

Using Node's URL parser fixes this potential missuse and enables the
'/' to be omited from the code example.

Co-authored-by: Baitinq <you@example.com>
---
 docs/tutorial/security.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index db5b1b60a337c..cda76d60b210a 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -279,11 +279,12 @@ security-conscious developers might want to assume the very opposite.
 
 ```js title='main.js (Main Process)'
 const { session } = require('electron')
+const URL = require('url').URL
 
 session
   .fromPartition('some-partition')
   .setPermissionRequestHandler((webContents, permission, callback) => {
-    const url = webContents.getURL()
+    const parsedUrl = new URL(webContents.getURL())
 
     if (permission === 'notifications') {
       // Approves the permissions request
@@ -291,7 +292,7 @@ session
     }
 
     // Verify URL
-    if (!url.startsWith('https://example.com/')) {
+    if (parsedUrl.protocol !== 'https:' || parsedUrl.host !== 'example.com') {
       // Denies the permissions request
       return callback(false)
     }

From 1c5bbba5cf2ef82839e46778b44d7737e50a6f06 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 28 Mar 2022 15:06:11 -0500
Subject: [PATCH 182/811] docs: simplify skipTaskbar breaking changes text
 (#33479)

---
 docs/breaking-changes.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index c44fcc257ef52..7dcbaaff47e3a 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -29,19 +29,15 @@ renderers.
 
 ### Removed: `skipTaskbar` on Linux
 
-See `skipTaskbar` discussion in 19.0 below. This feature is not available on
-Wayland. Since most modern Linux desktops are transitioning to Wayland, this
-feature will be removed for Linux.
-
-## Planned Breaking API Changes (19.0)
-
-### Unsupported: `skipTaskbar` on Linux
-
 On X11, `skipTaskbar` sends a `_NET_WM_STATE_SKIP_TASKBAR` message to the X11
 window manager. There is not a direct equivalent for Wayland, and the known
 workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
 requires unsafe mode), so Electron is unable to support this feature on Linux.
 
+## Planned Breaking API Changes (19.0)
+
+None
+
 ## Planned Breaking API Changes (18.0)
 
 ### Removed: `nativeWindowOpen`

From 594dc7e24a71bff68b2b6e69801e881a910a5604 Mon Sep 17 00:00:00 2001
From: Calvin <clavin@users.noreply.github.com>
Date: Mon, 28 Mar 2022 15:37:35 -0600
Subject: [PATCH 183/811] chore: update node types version (#33452)

* chore: update node types version

* update express types to solve type conflict

* one more yarn.lock type bump

* update another types package to fix incompatible global declarations

* remove incompatible type magicks

* update our ambient types to match the node types

* fix test type
---
 lib/common/webpack-provider.ts    |  2 +-
 npm/package.json                  |  2 +-
 package.json                      |  8 ++---
 spec-main/api-web-request-spec.ts |  6 ++--
 typings/internal-ambient.d.ts     |  2 +-
 yarn.lock                         | 51 +++++++++++++++++--------------
 6 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/lib/common/webpack-provider.ts b/lib/common/webpack-provider.ts
index a54551d321843..4d2a8c9ed3ce6 100644
--- a/lib/common/webpack-provider.ts
+++ b/lib/common/webpack-provider.ts
@@ -7,7 +7,7 @@
 
 // Rip global off of window (which is also global) so that webpack doesn't
 // auto replace it with a looped reference to this file
-const _global = typeof globalThis !== 'undefined' ? globalThis.global : (self as any || window as any).global as NodeJS.Global;
+const _global = typeof globalThis !== 'undefined' ? globalThis.global : (self || window).global;
 const process = _global.process;
 const Buffer = _global.Buffer;
 
diff --git a/npm/package.json b/npm/package.json
index a66407d4e4d5c..6a5df9ee0b824 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@electron/get": "^1.14.1",
-    "@types/node": "^14.6.2",
+    "@types/node": "^16.11.26",
     "extract-zip": "^1.0.3"
   },
   "engines": {
diff --git a/package.json b/package.json
index 7cc43408a42fa..2879902c047be 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
     "@types/chai": "^4.2.12",
     "@types/chai-as-promised": "^7.1.3",
     "@types/dirty-chai": "^2.0.2",
-    "@types/express": "^4.17.7",
+    "@types/express": "^4.17.13",
     "@types/fs-extra": "^9.0.1",
     "@types/klaw": "^3.0.1",
     "@types/minimist": "^1.2.0",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^14.6.2",
+    "@types/node": "^16.11.26",
     "@types/semver": "^7.3.3",
     "@types/send": "^0.14.5",
     "@types/split": "^1.0.0",
@@ -27,7 +27,7 @@
     "@types/temp": "^0.8.34",
     "@types/uuid": "^3.4.6",
     "@types/webpack": "^4.41.21",
-    "@types/webpack-env": "^1.15.2",
+    "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
     "asar": "^3.1.0",
@@ -141,4 +141,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/spec-main/api-web-request-spec.ts b/spec-main/api-web-request-spec.ts
index f939f4af5a668..22e58e5fe8be8 100644
--- a/spec-main/api-web-request-spec.ts
+++ b/spec-main/api-web-request-spec.ts
@@ -5,7 +5,7 @@ import * as path from 'path';
 import * as url from 'url';
 import * as WebSocket from 'ws';
 import { ipcMain, protocol, session, WebContents, webContents } from 'electron/main';
-import { AddressInfo } from 'net';
+import { AddressInfo, Socket } from 'net';
 import { emittedOnce } from './events-helpers';
 
 const fixturesPath = path.resolve(__dirname, 'fixtures');
@@ -481,8 +481,8 @@ describe('webRequest module', () => {
       server.on('upgrade', function upgrade (request, socket, head) {
         const pathname = require('url').parse(request.url).pathname;
         if (pathname === '/websocket') {
-          reqHeaders[request.url] = request.headers;
-          wss.handleUpgrade(request, socket, head, function done (ws) {
+          reqHeaders[request.url!] = request.headers;
+          wss.handleUpgrade(request, socket as Socket, head, function done (ws) {
             wss.emit('connection', ws, request);
           });
         }
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index ae8a2e84cd878..0eb2f3d493a61 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -254,7 +254,7 @@ declare namespace NodeJS {
     _firstFileName?: string;
 
     helperExecPath: string;
-    mainModule: NodeJS.Module;
+    mainModule?: NodeJS.Module | undefined;
   }
 }
 
diff --git a/yarn.lock b/yarn.lock
index 484a7a5c18a4d..4a4bb3f3c5b17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -290,22 +290,22 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
-"@types/express-serve-static-core@*":
-  version "4.17.8"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.8.tgz#b8f7b714138536742da222839892e203df569d1c"
-  integrity sha512-1SJZ+R3Q/7mLkOD9ewCBDYD2k0WyZQtWYqF/2VvoNN2/uhI49J9CDN4OAm+wGMA0DbArA4ef27xl4+JwMtGggw==
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.17.7":
-  version "4.17.7"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.7.tgz#42045be6475636d9801369cd4418ef65cdb0dd59"
-  integrity sha512-dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ==
+"@types/express@^4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "*"
+    "@types/express-serve-static-core" "^4.17.18"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
@@ -406,6 +406,11 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
   integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
 
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -441,16 +446,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.22.tgz#91ee88ebfa25072433497f6f3150f84fa8c3a91b"
   integrity sha512-rOsaPRUGTOXbRBOKToy4cgZXY4Y+QSVhxcLwdEveozbk7yuudhWMpxxcaXqYizLMP3VY7OcWCFtx9lGFh5j5kg==
 
-"@types/node@^14.6.2":
-  version "14.6.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.3.tgz#cc4f979548ca4d8e7b90bc0180052ab99ee64224"
-  integrity sha512-pC/hkcREG6YfDfui1FBmj8e20jFU5Exjw4NYDm8kEdrW+mOh0T1Zve8DWKnS7ZIZvgncrctcNCXF4Q2I+loyww==
-
 "@types/node@^16.0.0":
   version "16.4.13"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d"
   integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==
 
+"@types/node@^16.11.26":
+  version "16.11.26"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47"
+  integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -485,12 +490,12 @@
     "@types/node" "*"
 
 "@types/serve-static@*":
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.4.tgz#6662a93583e5a6cabca1b23592eb91e12fa80e7c"
-  integrity sha512-jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug==
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
   dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/mime" "*"
+    "@types/mime" "^1"
+    "@types/node" "*"
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -573,10 +578,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/webpack-env@^1.15.2":
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a"
-  integrity sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ==
+"@types/webpack-env@^1.16.3":
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a"
+  integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==
 
 "@types/webpack-sources@*":
   version "0.1.6"

From 4aeeb64d300555dacb6c3d17989266c3fd0bab57 Mon Sep 17 00:00:00 2001
From: Gellert Hegyi <gellert.hegyi@around.co>
Date: Tue, 29 Mar 2022 05:02:44 +0200
Subject: [PATCH 184/811] fix: crash when WindowButtonsProxy references cleared
 NSWindow (#33069)

* resets WindowButtonsProxy on window delete on macOS

* fixes reset
---
 shell/browser/native_window_mac.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 3220741ec356c..92cebd9bb65ba 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -328,6 +328,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
       [](NativeWindowMac* window) {
         if (window->window_)
           window->window_ = nil;
+        if (window->buttons_proxy_)
+          window->buttons_proxy_.reset();
       },
       this));
 

From 37a94d9857a611e38d799cb36790e872a5a722c6 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 28 Mar 2022 23:57:11 -0400
Subject: [PATCH 185/811] ci: fixup esbuild on macos (#33486)

* ci: fixup esbuild on macos

* ci: call update_depot_tools right after clone

* when all else fails, use sed
---
 .circleci/build_config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index dc18ceadedcb3..f25a498be8d2c 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -470,6 +470,8 @@ step-fix-sync: &step-fix-sync
 
         # Fix esbuild (wrong binary)
         echo 'infra/3pp/tools/esbuild/${platform}' `gclient getdep --deps-file=src/third_party/devtools-frontend/src/DEPS -r 'third_party/esbuild:infra/3pp/tools/esbuild/${platform}'` > esbuild_ensure_file
+        # Remove extra output from calling gclient getdep which always calls update_depot_tools
+        sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
         cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
       fi
 

From 6b66fea67dda1fe56ba0fb1e44d57bac5af1fdbe Mon Sep 17 00:00:00 2001
From: Joseph <kartingman25@gmail.com>
Date: Tue, 29 Mar 2022 03:02:30 -0400
Subject: [PATCH 186/811] docs: update heading level of webFrame.insertCSS
 (#33467)

---
 docs/api/web-frame.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md
index b59d98c54cb60..06bf313547d01 100644
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -110,7 +110,7 @@ webFrame.setSpellCheckProvider('en-US', {
 })
 ```
 
-#### `webFrame.insertCSS(css[, options])`
+### `webFrame.insertCSS(css[, options])`
 
 * `css` string
 * `options` Object (optional)

From 4e66b072da72c2a9c0445c2dcc132040d7a63b98 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 29 Mar 2022 19:03:07 +0900
Subject: [PATCH 187/811] chore: update libuv patch for event loop integration
 (#31647)

* chore: update libuv patch for loop integration

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/node/.patches                         |   2 +-
 ...o_change_option_to_uv_loop_configure.patch | 503 ++++++++++++++++++
 .../feat_add_uv_loop_watcher_queue_code.patch |  59 --
 .../unix_remove_uv_cloexec_ioctl_3515.patch   |   2 +-
 .../unix_simplify_uv_cloexec_fcntl_3492.patch |   2 +-
 shell/common/node_bindings.cc                 |   3 +
 shell/common/node_bindings_linux.cc           |  13 -
 shell/common/node_bindings_linux.h            |   3 -
 shell/common/node_bindings_mac.cc             |  13 -
 shell/common/node_bindings_mac.h              |   3 -
 10 files changed, 509 insertions(+), 94 deletions(-)
 create mode 100644 patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 delete mode 100644 patches/node/feat_add_uv_loop_watcher_queue_code.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index c2b5fdf528bbf..29ed54ec0eb16 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -1,5 +1,4 @@
 refactor_alter_child_process_fork_to_use_execute_script_with.patch
-feat_add_uv_loop_watcher_queue_code.patch
 feat_initialize_asar_support.patch
 expose_get_builtin_module_function.patch
 build_add_gn_build_files.patch
@@ -42,3 +41,4 @@ unix_remove_uv_cloexec_ioctl_3515.patch
 process_simplify_uv_write_int_calls_3519.patch
 macos_don_t_use_thread-unsafe_strtok_3524.patch
 process_fix_hang_after_note_exit_3521.patch
+feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
diff --git a/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch b/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
new file mode 100644
index 0000000000000..df4c22dbe6633
--- /dev/null
+++ b/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
@@ -0,0 +1,503 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Mon, 31 Jan 2022 20:56:58 +0900
+Subject: feat: add UV_LOOP_INTERRUPT_ON_IO_CHANGE option to uv_loop_configure
+
+https://github.com/libuv/libuv/pull/3308
+
+diff --git a/deps/uv/docs/src/loop.rst b/deps/uv/docs/src/loop.rst
+index 0f5ddfb3ca21b7e5b38d0a4ce4b9e77387597199..ba815202fb157aa82859ec0518523cf6f2ec6ba1 100644
+--- a/deps/uv/docs/src/loop.rst
++++ b/deps/uv/docs/src/loop.rst
+@@ -73,7 +73,15 @@ API
+ 
+       This option is necessary to use :c:func:`uv_metrics_idle_time`.
+ 
++    - UV_LOOP_INTERRUPT_ON_IO_CHANGE: Interrupt the loop whenever a new IO
++      event has been added or changed.
++
++      This option is usually when implementing event loop integration, to make
++      the polling of backend fd interrupt to recognize the changes of IO events.
++
+     .. versionchanged:: 1.39.0 added the UV_METRICS_IDLE_TIME option.
++    .. versionchanged:: 1.43.0 added the UV_LOOP_INTERRUPT_ON_IO_CHANGE option.
++
+ 
+ .. c:function:: int uv_loop_close(uv_loop_t* loop)
+ 
+diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
+index 606083c87de5790d7e66fc34aeaae9a58acb8ef4..824b0b77cf5f0a46dcb3855c44ac73faaba2055f 100644
+--- a/deps/uv/include/uv.h
++++ b/deps/uv/include/uv.h
+@@ -252,7 +252,8 @@ typedef struct uv_statfs_s uv_statfs_t;
+ 
+ typedef enum {
+   UV_LOOP_BLOCK_SIGNAL = 0,
+-  UV_METRICS_IDLE_TIME
++  UV_METRICS_IDLE_TIME,
++  UV_LOOP_INTERRUPT_ON_IO_CHANGE
+ } uv_loop_option;
+ 
+ typedef enum {
+diff --git a/deps/uv/src/unix/async.c b/deps/uv/src/unix/async.c
+index e1805c323795e5b0c465d80100eebeb7bf838caa..dd4358c0cdaa97ba8fadf4d9755993803beddd18 100644
+--- a/deps/uv/src/unix/async.c
++++ b/deps/uv/src/unix/async.c
+@@ -38,7 +38,6 @@
+ #include <sys/eventfd.h>
+ #endif
+ 
+-static void uv__async_send(uv_loop_t* loop);
+ static int uv__async_start(uv_loop_t* loop);
+ 
+ 
+@@ -70,7 +69,7 @@ int uv_async_send(uv_async_t* handle) {
+     return 0;
+ 
+   /* Wake up the other thread's event loop. */
+-  uv__async_send(handle->loop);
++  uv__loop_interrupt(handle->loop);
+ 
+   /* Tell the other thread we're done. */
+   if (cmpxchgi(&handle->pending, 1, 2) != 1)
+@@ -165,40 +164,6 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
+ }
+ 
+ 
+-static void uv__async_send(uv_loop_t* loop) {
+-  const void* buf;
+-  ssize_t len;
+-  int fd;
+-  int r;
+-
+-  buf = "";
+-  len = 1;
+-  fd = loop->async_wfd;
+-
+-#if defined(__linux__)
+-  if (fd == -1) {
+-    static const uint64_t val = 1;
+-    buf = &val;
+-    len = sizeof(val);
+-    fd = loop->async_io_watcher.fd;  /* eventfd */
+-  }
+-#endif
+-
+-  do
+-    r = write(fd, buf, len);
+-  while (r == -1 && errno == EINTR);
+-
+-  if (r == len)
+-    return;
+-
+-  if (r == -1)
+-    if (errno == EAGAIN || errno == EWOULDBLOCK)
+-      return;
+-
+-  abort();
+-}
+-
+-
+ static int uv__async_start(uv_loop_t* loop) {
+   int pipefd[2];
+   int err;
+diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
+index 7cd3a2a954ff7d70e6ba7a6f7538648841bc54b2..f89b7158218be60ac10e61484a2d5e5e28a3182f 100644
+--- a/deps/uv/src/unix/core.c
++++ b/deps/uv/src/unix/core.c
+@@ -887,6 +887,9 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
+     loop->watchers[w->fd] = w;
+     loop->nfds++;
+   }
++
++  if (uv__get_internal_fields(loop)->flags & UV_LOOP_INTERRUPT_ON_IO_CHANGE)
++    uv__loop_interrupt(loop);
+ }
+ 
+ 
+@@ -918,6 +921,9 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
+   }
+   else if (QUEUE_EMPTY(&w->watcher_queue))
+     QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue);
++
++  if (uv__get_internal_fields(loop)->flags & UV_LOOP_INTERRUPT_ON_IO_CHANGE)
++    uv__loop_interrupt(loop);
+ }
+ 
+ 
+@@ -934,6 +940,9 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) {
+ void uv__io_feed(uv_loop_t* loop, uv__io_t* w) {
+   if (QUEUE_EMPTY(&w->pending_queue))
+     QUEUE_INSERT_TAIL(&loop->pending_queue, &w->pending_queue);
++
++  if (uv__get_internal_fields(loop)->flags & UV_LOOP_INTERRUPT_ON_IO_CHANGE)
++    uv__loop_interrupt(loop);
+ }
+ 
+ 
+diff --git a/deps/uv/src/unix/loop.c b/deps/uv/src/unix/loop.c
+index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..353143e5ebecae598425dc036f4458bb7c43bb0b 100644
+--- a/deps/uv/src/unix/loop.c
++++ b/deps/uv/src/unix/loop.c
+@@ -217,6 +217,11 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
+     return 0;
+   }
+ 
++  if (option == UV_LOOP_INTERRUPT_ON_IO_CHANGE) {
++    lfields->flags |= UV_LOOP_INTERRUPT_ON_IO_CHANGE;
++    return 0;
++  }
++
+   if (option != UV_LOOP_BLOCK_SIGNAL)
+     return UV_ENOSYS;
+ 
+@@ -226,3 +231,37 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
+   loop->flags |= UV_LOOP_BLOCK_SIGPROF;
+   return 0;
+ }
++
++
++void uv__loop_interrupt(uv_loop_t* loop) {
++  const void* buf;
++  ssize_t len;
++  int fd;
++  int r;
++
++  buf = "";
++  len = 1;
++  fd = loop->async_wfd;
++
++#if defined(__linux__)
++  if (fd == -1) {
++    static const uint64_t val = 1;
++    buf = &val;
++    len = sizeof(val);
++    fd = loop->async_io_watcher.fd;  /* eventfd */
++  }
++#endif
++
++  do
++    r = write(fd, buf, len);
++  while (r == -1 && errno == EINTR);
++
++  if (r == len)
++    return;
++
++  if (r == -1)
++    if (errno == EAGAIN || errno == EWOULDBLOCK)
++      return;
++
++  abort();
++}
+diff --git a/deps/uv/src/uv-common.h b/deps/uv/src/uv-common.h
+index 6001b0cf68d0b0268b578218b664a737f43c9521..5d2212571f4bcb648ab332f0c5650d0fdb37c03a 100644
+--- a/deps/uv/src/uv-common.h
++++ b/deps/uv/src/uv-common.h
+@@ -140,6 +140,8 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap);
+ 
+ void uv__loop_close(uv_loop_t* loop);
+ 
++void uv__loop_interrupt(uv_loop_t* loop);
++
+ int uv__read_start(uv_stream_t* stream,
+                    uv_alloc_cb alloc_cb,
+                    uv_read_cb read_cb);
+@@ -268,6 +270,10 @@ void uv__threadpool_cleanup(void);
+     if (((h)->flags & UV_HANDLE_ACTIVE) != 0) break;                          \
+     (h)->flags |= UV_HANDLE_ACTIVE;                                           \
+     if (((h)->flags & UV_HANDLE_REF) != 0) uv__active_handle_add(h);          \
++    int loop_flags = uv__get_internal_fields((h)->loop)->flags;               \
++    if (loop_flags & UV_LOOP_INTERRUPT_ON_IO_CHANGE) {                        \
++      uv__loop_interrupt((h)->loop);                                          \
++    }                                                                         \
+   }                                                                           \
+   while (0)
+ 
+diff --git a/deps/uv/src/win/core.c b/deps/uv/src/win/core.c
+index e53a0f8e28637a58ceec7852d1a79874fc1a9548..dd4065c1cc68763bfe258492e3119669311394dc 100644
+--- a/deps/uv/src/win/core.c
++++ b/deps/uv/src/win/core.c
+@@ -381,10 +381,20 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
+     return 0;
+   }
+ 
++  if (option == UV_LOOP_INTERRUPT_ON_IO_CHANGE) {
++    lfields->flags |= UV_LOOP_INTERRUPT_ON_IO_CHANGE;
++    return 0;
++  }
++
+   return UV_ENOSYS;
+ }
+ 
+ 
++void uv__loop_interrupt(uv_loop_t* loop) {
++  PostQueuedCompletionStatus(loop->iocp, 0, 0, NULL);
++}
++
++
+ int uv_backend_fd(const uv_loop_t* loop) {
+   return -1;
+ }
+diff --git a/deps/uv/test/test-embed.c b/deps/uv/test/test-embed.c
+index c6ddceb149d9c1d68b0dd17b6dac0d4c3c3e9dbc..f6572c5dc2b6ef39bd11889ad1f7873007a6437d 100644
+--- a/deps/uv/test/test-embed.c
++++ b/deps/uv/test/test-embed.c
+@@ -25,115 +25,179 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
+-#ifndef HAVE_KQUEUE
+-# if defined(__APPLE__) ||                                                    \
+-     defined(__DragonFly__) ||                                                \
+-     defined(__FreeBSD__) ||                                                  \
+-     defined(__FreeBSD_kernel__) ||                                           \
+-     defined(__OpenBSD__) ||                                                  \
+-     defined(__NetBSD__)
+-#  define HAVE_KQUEUE 1
+-# endif
+-#endif
+-
+ #ifndef HAVE_EPOLL
+ # if defined(__linux__)
+ #  define HAVE_EPOLL 1
+ # endif
+ #endif
+ 
+-#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL)
++#if defined(HAVE_EPOLL)
++# include <sys/epoll.h>
++#endif
+ 
+-#if defined(HAVE_KQUEUE)
++#if !defined(_WIN32)
+ # include <sys/types.h>
+-# include <sys/event.h>
+ # include <sys/time.h>
+ #endif
+ 
+-#if defined(HAVE_EPOLL)
+-# include <sys/epoll.h>
+-#endif
+-
++static uv_loop_t main_loop;
++static uv_loop_t external_loop;
+ static uv_thread_t embed_thread;
+ static uv_sem_t embed_sem;
+-static uv_timer_t embed_timer;
+ static uv_async_t embed_async;
++static uv_async_t main_async;
+ static volatile int embed_closed;
+ 
+-static int embed_timer_called;
++static uv_timer_t main_timer;
++static int main_timer_called;
+ 
+ 
+-static void embed_thread_runner(void* arg) {
++#if defined(_WIN32)
++static void embed_thread_poll_win(HANDLE iocp, int timeout) {
++  DWORD bytes;
++  ULONG_PTR key;
++  OVERLAPPED* overlapped;
++
++  GetQueuedCompletionStatus(iocp,
++                            &bytes,
++                            &key,
++                            &overlapped,
++                            timeout >= 0 ? timeout : INFINITE);
++
++  /* Give the event back so the loop can deal with it. */
++  if (overlapped != NULL)
++    PostQueuedCompletionStatus(iocp,
++                               bytes,
++                               key,
++                               overlapped);
++}
++#else
++static void embed_thread_poll_unix(int fd, int timeout) {
+   int r;
+-  int fd;
++  do {
++#if defined(HAVE_EPOLL)
++    struct epoll_event ev;
++    r = epoll_wait(fd, &ev, 1, timeout);
++#else
++    struct timeval tv;
++    if (timeout >= 0) {
++      tv.tv_sec = timeout / 1000;
++      tv.tv_usec = (timeout % 1000) * 1000;
++    }
++    fd_set readset;
++    FD_ZERO(&readset);
++    FD_SET(fd, &readset);
++    r = select(fd + 1, &readset, NULL, NULL, timeout >= 0 ? &tv : NULL);
++#endif
++  } while (r == -1 && errno == EINTR);
++}
++#endif /* !_WIN32 */
++
++
++static void embed_thread_runner(void* arg) {
+   int timeout;
+ 
+-  while (!embed_closed) {
+-    fd = uv_backend_fd(uv_default_loop());
+-    timeout = uv_backend_timeout(uv_default_loop());
+-
+-    do {
+-#if defined(HAVE_KQUEUE)
+-      struct timespec ts;
+-      ts.tv_sec = timeout / 1000;
+-      ts.tv_nsec = (timeout % 1000) * 1000000;
+-      r = kevent(fd, NULL, 0, NULL, 0, &ts);
+-#elif defined(HAVE_EPOLL)
+-      {
+-        struct epoll_event ev;
+-        r = epoll_wait(fd, &ev, 1, timeout);
+-      }
++  do {
++    timeout = uv_backend_timeout(&main_loop);
++
++#if defined(_WIN32)
++    embed_thread_poll_win(main_loop.iocp, timeout);
++#else
++    embed_thread_poll_unix(uv_backend_fd(&main_loop), timeout);
+ #endif
+-    } while (r == -1 && errno == EINTR);
++
+     uv_async_send(&embed_async);
++
+     uv_sem_wait(&embed_sem);
+-  }
++  } while (!embed_closed);
+ }
+ 
+ 
+ static void embed_cb(uv_async_t* async) {
+-  uv_run(uv_default_loop(), UV_RUN_ONCE);
++  /* Run tasks in main loop */
++  uv_run(&main_loop, UV_RUN_NOWAIT);
+ 
++  /* Tell embed thread to continue polling */
+   uv_sem_post(&embed_sem);
+ }
+ 
+ 
+-static void embed_timer_cb(uv_timer_t* timer) {
+-  embed_timer_called++;
++static void main_timer_cb(uv_timer_t* timer) {
++  main_timer_called++;
+   embed_closed = 1;
+ 
+   uv_close((uv_handle_t*) &embed_async, NULL);
++  uv_close((uv_handle_t*) &main_async, NULL);
+ }
+-#endif
+ 
+ 
+-TEST_IMPL(embed) {
+-#if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL)
+-  uv_loop_t external;
+-
+-  ASSERT(0 == uv_loop_init(&external));
++static void init_loops(void) {
++  ASSERT_EQ(0, uv_loop_init(&main_loop));
++  ASSERT_EQ(0, uv_loop_init(&external_loop));
+ 
+-  embed_timer_called = 0;
++  main_timer_called = 0;
+   embed_closed = 0;
+ 
+-  uv_async_init(&external, &embed_async, embed_cb);
++  uv_async_init(&external_loop, &embed_async, embed_cb);
+ 
+-  /* Start timer in default loop */
+-  uv_timer_init(uv_default_loop(), &embed_timer);
+-  uv_timer_start(&embed_timer, embed_timer_cb, 250, 0);
++  /* Create a dummy async for main loop otherwise backend timeout will
++     always be 0 */
++  uv_async_init(&main_loop, &main_async, embed_cb);
+ 
+-  /* Start worker that will interrupt external loop */
++  /* Start worker that will poll main loop and interrupt external loop */
+   uv_sem_init(&embed_sem, 0);
+   uv_thread_create(&embed_thread, embed_thread_runner, NULL);
++}
+ 
+-  /* But run external loop */
+-  uv_run(&external, UV_RUN_DEFAULT);
++
++static void run_loop(void) {
++  /* Run external loop */
++  uv_run(&external_loop, UV_RUN_DEFAULT);
+ 
+   uv_thread_join(&embed_thread);
+-  uv_loop_close(&external);
++  uv_sem_destroy(&embed_sem);
++  uv_loop_close(&external_loop);
++  uv_loop_close(&main_loop);
++}
+ 
+-  ASSERT(embed_timer_called == 1);
+-#endif
++
++TEST_IMPL(embed) {
++  init_loops();
++
++  /* Start timer in main loop */
++  uv_timer_init(&main_loop, &main_timer);
++  uv_timer_start(&main_timer, main_timer_cb, 250, 0);
++
++  run_loop();
++  ASSERT_EQ(main_timer_called, 1);
++
++  return 0;
++}
++
++
++static uv_timer_t external_timer;
++
++
++static void external_timer_cb(uv_timer_t* timer) {
++  /* Start timer in main loop */
++  uv_timer_init(&main_loop, &main_timer);
++  uv_timer_start(&main_timer, main_timer_cb, 250, 0);
++}
++
++
++TEST_IMPL(embed_with_external_timer) {
++  init_loops();
++
++  /* Interrupt embed polling when a handle is started */
++  ASSERT_EQ(0, uv_loop_configure(&main_loop, UV_LOOP_INTERRUPT_ON_IO_CHANGE));
++
++  /* Start timer in external loop, whose callback will not interrupt the
++     polling in embed thread */
++  uv_timer_init(&external_loop, &external_timer);
++  uv_timer_start(&external_timer, external_timer_cb, 100, 0);
++
++  run_loop();
++  ASSERT_EQ(main_timer_called, 1);
+ 
+   return 0;
+ }
+diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
+index a43edf1a4a9b0932ec73b8edaca0f676ecf3ccfa..199402e31406cf8ba360d54769461bb5285011ee 100644
+--- a/deps/uv/test/test-list.h
++++ b/deps/uv/test/test-list.h
+@@ -263,6 +263,7 @@ TEST_DECLARE   (process_priority)
+ TEST_DECLARE   (has_ref)
+ TEST_DECLARE   (active)
+ TEST_DECLARE   (embed)
++TEST_DECLARE   (embed_with_external_timer)
+ TEST_DECLARE   (async)
+ TEST_DECLARE   (async_null_cb)
+ TEST_DECLARE   (eintr_handling)
+@@ -860,6 +861,7 @@ TASK_LIST_START
+   TEST_ENTRY  (active)
+ 
+   TEST_ENTRY  (embed)
++  TEST_ENTRY  (embed_with_external_timer)
+ 
+   TEST_ENTRY  (async)
+   TEST_ENTRY  (async_null_cb)
diff --git a/patches/node/feat_add_uv_loop_watcher_queue_code.patch b/patches/node/feat_add_uv_loop_watcher_queue_code.patch
deleted file mode 100644
index 49468ed2ae2fe..0000000000000
--- a/patches/node/feat_add_uv_loop_watcher_queue_code.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 30 Jul 2018 10:34:54 -0700
-Subject: feat: add uv_loop watcher_queue code
-
-Electron's Node Integration works by listening to Node's backend file descriptor in a separate thread; when an event is ready the backend file descriptor will trigger a new event for it, and the main thread will then iterate the libuv loop. For certain operations (ex. adding a timeout task) the backend file descriptor isn't informed, & as a result the main thread doesn't know it needs to iterate the libuv loop so the timeout task will never execute until something else trigger a new event. This commit should be removed when https://github.com/libuv/libuv/pull/1921 is merged
-
-diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
-index 606083c87de5790d7e66fc34aeaae9a58acb8ef4..ca9568c58b1ccd554318f5deb27d2b4e80f08a28 100644
---- a/deps/uv/include/uv.h
-+++ b/deps/uv/include/uv.h
-@@ -1805,6 +1805,8 @@ union uv_any_req {
- struct uv_loop_s {
-   /* User data - use this for whatever. */
-   void* data;
-+  /* Callback when loop's watcher queue updates. */
-+  void (*on_watcher_queue_updated)(uv_loop_t*);
-   /* Loop reference counting. */
-   unsigned int active_handles;
-   void* handle_queue[2];
-diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
-index 71e9c525c4a77b8b5322e8516c58329100a8d951..a6425294086ff2f1435fdd6866380d3aaaf68200 100644
---- a/deps/uv/src/unix/core.c
-+++ b/deps/uv/src/unix/core.c
-@@ -906,8 +906,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
-     return;
- #endif
- 
--  if (QUEUE_EMPTY(&w->watcher_queue))
-+  if (QUEUE_EMPTY(&w->watcher_queue)) {
-     QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue);
-+    if (loop->on_watcher_queue_updated)
-+      loop->on_watcher_queue_updated(loop);
-+  }
- 
-   if (loop->watchers[w->fd] == NULL) {
-     loop->watchers[w->fd] = w;
-@@ -942,8 +945,11 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
-       loop->nfds--;
-     }
-   }
--  else if (QUEUE_EMPTY(&w->watcher_queue))
-+  else if (QUEUE_EMPTY(&w->watcher_queue)) {
-     QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue);
-+    if (loop->on_watcher_queue_updated)
-+      loop->on_watcher_queue_updated(loop);
-+  }
- }
- 
- 
-@@ -960,6 +966,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) {
- void uv__io_feed(uv_loop_t* loop, uv__io_t* w) {
-   if (QUEUE_EMPTY(&w->pending_queue))
-     QUEUE_INSERT_TAIL(&loop->pending_queue, &w->pending_queue);
-+  if (loop->on_watcher_queue_updated)
-+    loop->on_watcher_queue_updated(loop);
- }
- 
- 
diff --git a/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch b/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
index f49d25998bba2..937abe6108d84 100644
--- a/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
+++ b/patches/node/unix_remove_uv_cloexec_ioctl_3515.patch
@@ -8,7 +8,7 @@ Now that uv__cloexec_fcntl() is simplified
 maintaining duplicate code paths for the same thing.
 
 diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
-index 6cd519ad5b3e7af8f5c71b18a59b88458a233f15..8c30802ad15316a8ec20ecedfb5123174d74276b 100644
+index a87b96cfc1dfdc88fa712a4fa991320ff28f2dcd..7cd3a2a954ff7d70e6ba7a6f7538648841bc54b2 100644
 --- a/deps/uv/src/unix/core.c
 +++ b/deps/uv/src/unix/core.c
 @@ -597,20 +597,6 @@ int uv__nonblock_ioctl(int fd, int set) {
diff --git a/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch b/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch
index 219ae54daa15b..13229f0466cd1 100644
--- a/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch
+++ b/patches/node/unix_simplify_uv_cloexec_fcntl_3492.patch
@@ -7,7 +7,7 @@ FD_CLOEXEC is the only defined flag for fcntl(F_SETFD) so don't bother
 getting the status of that flag first with fcntl(F_GETFD), just set it.
 
 diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
-index a6425294086ff2f1435fdd6866380d3aaaf68200..6cd519ad5b3e7af8f5c71b18a59b88458a233f15 100644
+index 71e9c525c4a77b8b5322e8516c58329100a8d951..a87b96cfc1dfdc88fa712a4fa991320ff28f2dcd 100644
 --- a/deps/uv/src/unix/core.c
 +++ b/deps/uv/src/unix/core.c
 @@ -649,21 +649,9 @@ int uv__cloexec_fcntl(int fd, int set) {
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 1af890a2a0b3b..c83253dc9210b 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -322,6 +322,9 @@ NodeBindings::NodeBindings(BrowserEnvironment browser_env)
   } else {
     uv_loop_ = uv_default_loop();
   }
+
+  // Interrupt embed polling when a handle is started.
+  uv_loop_configure(uv_loop_, UV_LOOP_INTERRUPT_ON_IO_CHANGE);
 }
 
 NodeBindings::~NodeBindings() {
diff --git a/shell/common/node_bindings_linux.cc b/shell/common/node_bindings_linux.cc
index d361daec953e0..395dcfc28b480 100644
--- a/shell/common/node_bindings_linux.cc
+++ b/shell/common/node_bindings_linux.cc
@@ -38,22 +38,9 @@ void NodeBindingsLinux::RunMessageLoop() {
 
   handle_ = handle;
 
-  // Get notified when libuv's watcher queue changes.
-  uv_loop_->data = this;
-  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
-
   NodeBindings::RunMessageLoop();
 }
 
-// static
-void NodeBindingsLinux::OnWatcherQueueChanged(uv_loop_t* loop) {
-  NodeBindingsLinux* self = static_cast<NodeBindingsLinux*>(loop->data);
-
-  // We need to break the io polling in the epoll thread when loop's watcher
-  // queue changes, otherwise new events cannot be notified.
-  self->WakeupEmbedThread();
-}
-
 void NodeBindingsLinux::PollEvents() {
   int timeout = uv_backend_timeout(uv_loop_);
 
diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h
index 934ed68c597b8..4499f1c754fe1 100644
--- a/shell/common/node_bindings_linux.h
+++ b/shell/common/node_bindings_linux.h
@@ -19,9 +19,6 @@ class NodeBindingsLinux : public NodeBindings {
   void RunMessageLoop() override;
 
  private:
-  // Called when uv's watcher queue changes.
-  static void OnWatcherQueueChanged(uv_loop_t* loop);
-
   void PollEvents() override;
 
   // Epoll to poll for uv's backend fd.
diff --git a/shell/common/node_bindings_mac.cc b/shell/common/node_bindings_mac.cc
index 7107d20c11b93..cfc37e5f50135 100644
--- a/shell/common/node_bindings_mac.cc
+++ b/shell/common/node_bindings_mac.cc
@@ -38,22 +38,9 @@ void NodeBindingsMac::RunMessageLoop() {
 
   handle_ = handle;
 
-  // Get notified when libuv's watcher queue changes.
-  uv_loop_->data = this;
-  uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
-
   NodeBindings::RunMessageLoop();
 }
 
-// static
-void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) {
-  NodeBindingsMac* self = static_cast<NodeBindingsMac*>(loop->data);
-
-  // We need to break the io polling in the kqueue thread when loop's watcher
-  // queue changes, otherwise new events cannot be notified.
-  self->WakeupEmbedThread();
-}
-
 void NodeBindingsMac::PollEvents() {
   struct timeval tv;
   int timeout = uv_backend_timeout(uv_loop_);
diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h
index 7687f85a7b8d3..911287a65fd37 100644
--- a/shell/common/node_bindings_mac.h
+++ b/shell/common/node_bindings_mac.h
@@ -19,9 +19,6 @@ class NodeBindingsMac : public NodeBindings {
   void RunMessageLoop() override;
 
  private:
-  // Called when uv's watcher queue changes.
-  static void OnWatcherQueueChanged(uv_loop_t* loop);
-
   void PollEvents() override;
 
   // uv's backend fd.

From 9a2b35163ea5d372cdec3ab8c0a8644a044487d6 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 06:01:08 -0700
Subject: [PATCH 188/811] Bump v19.0.0-nightly.20220329

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d10e2a276be81..e078e2e369954 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220328
\ No newline at end of file
+19.0.0-nightly.20220329
\ No newline at end of file
diff --git a/package.json b/package.json
index 2879902c047be..b5959d33c6396 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220328",
+  "version": "19.0.0-nightly.20220329",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -141,4 +141,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 8826798177c3c..194e1b56579c3 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220328
- PRODUCTVERSION 19,0,0,20220328
+ FILEVERSION 19,0,0,20220329
+ PRODUCTVERSION 19,0,0,20220329
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From bf3d0e225760a0026a1b58ac4f4d29a83b0aad20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 15:39:38 +0200
Subject: [PATCH 189/811] build(deps-dev): bump minimist from 1.2.5 to 1.2.6
 (#33432)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b5959d33c6396..34f8e5b0b6a40 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "lint-staged": "^10.2.11",
     "markdownlint": "^0.21.1",
     "markdownlint-cli": "^0.25.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "null-loader": "^4.0.0",
     "pre-flight": "^1.1.0",
     "remark-cli": "^10.0.0",
diff --git a/yarn.lock b/yarn.lock
index 4a4bb3f3c5b17..39af7f570db85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4812,15 +4812,10 @@ minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.0.0, minimist@^1.2.5, minimist@~1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.2.0, minimist@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+minimist@^1.0.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.0, minimist@~1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"

From f0c22a770d131acb6117f6d07d86fb9b8b66476c Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 29 Mar 2022 16:05:08 +0200
Subject: [PATCH 190/811] chore: fix moveAbove desktopCapturer spec (#33471)

---
 spec-main/api-desktop-capturer-spec.ts | 84 ++++++++++++++------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/spec-main/api-desktop-capturer-spec.ts b/spec-main/api-desktop-capturer-spec.ts
index 74e2bc73722aa..766b11b3325a9 100644
--- a/spec-main/api-desktop-capturer-spec.ts
+++ b/spec-main/api-desktop-capturer-spec.ts
@@ -1,7 +1,8 @@
 import { expect } from 'chai';
 import { screen, desktopCapturer, BrowserWindow } from 'electron/main';
+import { delay, ifdescribe, ifit } from './spec-helpers';
 import { emittedOnce } from './events-helpers';
-import { ifdescribe, ifit } from './spec-helpers';
+
 import { closeAllWindows } from './window-helpers';
 
 const features = process._linkedBinding('electron_common_features');
@@ -156,26 +157,37 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
     }
   });
 
-  // TODO(deepak1556): currently fails on all ci, enable it after upgrade.
-  it.skip('moveAbove should move the window at the requested place', async () => {
+  it('moveAbove should move the window at the requested place', async () => {
     // DesktopCapturer.getSources() is guaranteed to return in the correct
     // z-order from foreground to background.
     const MAX_WIN = 4;
-    const mainWindow = w;
-    const wList = [mainWindow];
+    const wList: BrowserWindow[] = [];
+
+    const destroyWindows = () => {
+      for (const w of wList) {
+        w.destroy();
+      }
+    };
+
     try {
-      for (let i = 0; i < MAX_WIN - 1; i++) {
-        const w = new BrowserWindow({ show: true, width: 100, height: 100 });
+      for (let i = 0; i < MAX_WIN; i++) {
+        const w = new BrowserWindow({ show: false, width: 100, height: 100 });
         wList.push(w);
       }
       expect(wList.length).to.equal(MAX_WIN);
 
       // Show and focus all the windows.
-      wList.forEach(async (w) => {
+      for (const w of wList) {
+        const wShown = emittedOnce(w, 'show');
         const wFocused = emittedOnce(w, 'focus');
+
+        w.show();
         w.focus();
+
+        await wShown;
         await wFocused;
-      });
+      }
+
       // At this point our windows should be showing from bottom to top.
 
       // DesktopCapturer.getSources() returns sources sorted from foreground to
@@ -189,11 +201,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
       // bots while it is not on my workstation, as expected, with and without
       // the --ci parameter.
       if (process.platform === 'linux' && sources.length === 0) {
-        wList.forEach((w) => {
-          if (w !== mainWindow) {
-            w.destroy();
-          }
-        });
+        destroyWindows();
         it.skip('desktopCapturer.getSources returned an empty source list');
         return;
       }
@@ -207,44 +215,40 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
       expect(sources.length).to.equal(wList.length);
 
       // Check that the sources and wList are sorted in the reverse order.
-      const wListReversed = wList.slice(0).reverse();
-      const canGoFurther = sources.every(
+      // If they're not, skip remaining checks because either focus or
+      // window placement are not reliable in the running test environment.
+      const wListReversed = wList.slice().reverse();
+      const proceed = sources.every(
         (source, index) => source.id === wListReversed[index].getMediaSourceId());
-      if (!canGoFurther) {
-        // Skip remaining checks because either focus or window placement are
-        // not reliable in the running test environment. So there is no point
-        // to go further to test moveAbove as requirements are not met.
-        return;
-      }
-
-      // Do the real work, i.e. move each window above the next one so that
-      // wList is sorted from foreground to background.
-      wList.forEach(async (w, index) => {
-        if (index < (wList.length - 1)) {
-          const wNext = wList[index + 1];
-          w.moveAbove(wNext.getMediaSourceId());
+      if (!proceed) return;
+
+      // Move windows so wList is sorted from foreground to background.
+      for (const [i, w] of wList.entries()) {
+        if (i < wList.length - 1) {
+          const next = wList[wList.length - 1];
+          w.focus();
+          w.moveAbove(next.getMediaSourceId());
+          // Ensure the window has time to move.
+          await delay(2000);
         }
-      });
+      }
 
       sources = await desktopCapturer.getSources({
         types: ['window'],
         thumbnailSize: { width: 0, height: 0 }
       });
-      // Only keep our windows again.
-      sources.splice(MAX_WIN, sources.length - MAX_WIN);
+
+      sources.splice(MAX_WIN, sources.length);
       expect(sources.length).to.equal(MAX_WIN);
       expect(sources.length).to.equal(wList.length);
 
       // Check that the sources and wList are sorted in the same order.
-      sources.forEach((source, index) => {
-        expect(source.id).to.equal(wList[index].getMediaSourceId());
-      });
+      for (const [index, source] of sources.entries()) {
+        const wID = wList[index].getMediaSourceId();
+        expect(source.id).to.equal(wID);
+      }
     } finally {
-      wList.forEach((w) => {
-        if (w !== mainWindow) {
-          w.destroy();
-        }
-      });
+      destroyWindows();
     }
   });
 });

From 8ea0631b823aea7f01b1eb9e410ea74dbb857556 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 29 Mar 2022 17:57:21 +0200
Subject: [PATCH 191/811] test: re-enable desktop specs (#33497)

---
 spec-main/api-desktop-capturer-spec.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec-main/api-desktop-capturer-spec.ts b/spec-main/api-desktop-capturer-spec.ts
index 766b11b3325a9..ad343b9305ce7 100644
--- a/spec-main/api-desktop-capturer-spec.ts
+++ b/spec-main/api-desktop-capturer-spec.ts
@@ -23,8 +23,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
 
   after(closeAllWindows);
 
-  // TODO(nornagon): figure out why this test is failing on Linux and re-enable it.
-  ifit(process.platform !== 'linux')('should return a non-empty array of sources', async () => {
+  it('should return a non-empty array of sources', async () => {
     const sources = await desktopCapturer.getSources({ types: ['window', 'screen'] });
     expect(sources).to.be.an('array').that.is.not.empty();
   });
@@ -34,8 +33,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
     await expect(promise).to.be.eventually.rejectedWith(Error, 'Invalid options');
   });
 
-  // TODO(nornagon): figure out why this test is failing on Linux and re-enable it.
-  ifit(process.platform !== 'linux')('does not throw an error when called more than once (regression)', async () => {
+  it('does not throw an error when called more than once (regression)', async () => {
     const sources1 = await desktopCapturer.getSources({ types: ['window', 'screen'] });
     expect(sources1).to.be.an('array').that.is.not.empty();
 
@@ -43,7 +41,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
     expect(sources2).to.be.an('array').that.is.not.empty();
   });
 
-  ifit(process.platform !== 'linux')('responds to subsequent calls of different options', async () => {
+  it('responds to subsequent calls of different options', async () => {
     const promise1 = desktopCapturer.getSources({ types: ['window'] });
     await expect(promise1).to.eventually.be.fulfilled();
 
@@ -52,7 +50,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
   });
 
   // Linux doesn't return any window sources.
-  ifit(process.platform !== 'linux')('returns an empty display_id for window sources on Windows and Mac', async () => {
+  ifit(process.platform !== 'linux')('returns an empty display_id for window sources', async () => {
     const w = new BrowserWindow({ width: 200, height: 200 });
     await w.loadURL('about:blank');
 
@@ -64,7 +62,7 @@ ifdescribe(!process.arch.includes('arm') && process.platform !== 'win32')('deskt
     }
   });
 
-  ifit(process.platform !== 'linux')('returns display_ids matching the Screen API on Windows and Mac', async () => {
+  ifit(process.platform !== 'linux')('returns display_ids matching the Screen API', async () => {
     const displays = screen.getAllDisplays();
     const sources = await desktopCapturer.getSources({ types: ['screen'] });
     expect(sources).to.be.an('array').of.length(displays.length);

From d1ea62c3e835abc20e30e64d76823edfa5cbe75c Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 29 Mar 2022 18:22:58 +0200
Subject: [PATCH 192/811] fix: getting focused window with destroyed
 webContents (#33404)

* fix: getting focused window with destroyed webContents

* fix: add extra safeguards
---
 lib/browser/api/browser-window.ts    |  5 ++++-
 spec-main/api-browser-window-spec.ts | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/browser/api/browser-window.ts b/lib/browser/api/browser-window.ts
index 62630bfffb2f5..d20ea0bda5571 100644
--- a/lib/browser/api/browser-window.ts
+++ b/lib/browser/api/browser-window.ts
@@ -72,7 +72,10 @@ BrowserWindow.getAllWindows = () => {
 
 BrowserWindow.getFocusedWindow = () => {
   for (const window of BrowserWindow.getAllWindows()) {
-    if (window.isFocused() || window.isDevToolsFocused()) return window;
+    const hasWC = window.webContents && !window.webContents.isDestroyed();
+    if (!window.isDestroyed() && hasWC) {
+      if (window.isFocused() || window.isDevToolsFocused()) return window;
+    }
   }
   return null;
 };
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index d4d4a70799a16..19c08c0700813 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3725,6 +3725,25 @@ describe('BrowserWindow module', () => {
         expect(w.getChildWindows().length).to.equal(0);
       });
 
+      it('closes a grandchild window when a middle child window is destroyed', (done) => {
+        const w = new BrowserWindow();
+
+        w.loadFile(path.join(fixtures, 'pages', 'base-page.html'));
+        w.webContents.executeJavaScript('window.open("")');
+
+        w.webContents.on('did-create-window', async (window) => {
+          const childWindow = new BrowserWindow({ parent: window });
+
+          await delay();
+          window.close();
+
+          childWindow.on('closed', () => {
+            expect(() => { BrowserWindow.getFocusedWindow(); }).to.not.throw();
+            done();
+          });
+        });
+      });
+
       it('should not affect the show option', () => {
         const w = new BrowserWindow({ show: false });
         const c = new BrowserWindow({ show: false, parent: w });

From 94498b923e407ab7e6ac094ae829c89744ebf65c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 12:25:40 -0400
Subject: [PATCH 193/811] build(deps): bump minimist from 1.2.5 to 1.2.6 in
 /spec-main (#33431)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec-main/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec-main/yarn.lock b/spec-main/yarn.lock
index f4034d4e9be31..6f6264a60426e 100644
--- a/spec-main/yarn.lock
+++ b/spec-main/yarn.lock
@@ -660,9 +660,9 @@ mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
     mime-db "1.51.0"
 
 minimist@^1.2.0:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 ndarray-pack@^1.1.1:
   version "1.2.1"

From 4c988a5a24a6e1dd81875c2ec3b2b7ed47d5c96a Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 29 Mar 2022 14:47:06 -0700
Subject: [PATCH 194/811] docs: fix type of 'value' param in setUserDefaults
 (#33481)

---
 docs/api/system-preferences.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api/system-preferences.md b/docs/api/system-preferences.md
index d0960f3b0a949..154e5750f093d 100644
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -177,11 +177,11 @@ Some popular `key` and `type`s are:
 * `NSPreferredWebServices`: `dictionary`
 * `NSUserDictionaryReplacementItems`: `array`
 
-### `systemPreferences.setUserDefault(key, type, value)` _macOS_
+### `systemPreferences.setUserDefault<Type extends keyof UserDefaultTypes>(key, type, value)` _macOS_
 
 * `key` string
-* `type` string - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
-* `value` string
+* `type` Type - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
+* `value` UserDefaultTypes[Type]
 
 Set the value of `key` in `NSUserDefaults`.
 

From 479f652f904f773fe3a73a207e97eb39be2748a1 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 29 Mar 2022 14:47:34 -0700
Subject: [PATCH 195/811] feat: add new Squirrel.Mac bundle installation method
 behind flag (#33470)

---
 patches/squirrel.mac/.patches                 |   1 +
 ...ndle_installation_method_behind_flag.patch | 128 ++++++++++++++++++
 spec-main/api-autoupdater-darwin-spec.ts      |  62 ++++++++-
 3 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 patches/squirrel.mac/feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch

diff --git a/patches/squirrel.mac/.patches b/patches/squirrel.mac/.patches
index 0950bcb5a678d..f16e10d95fdba 100644
--- a/patches/squirrel.mac/.patches
+++ b/patches/squirrel.mac/.patches
@@ -1,3 +1,4 @@
 build_add_gn_config.patch
 fix_ensure_that_self_is_retained_until_the_racsignal_is_complete.patch
 fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
+feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch
diff --git a/patches/squirrel.mac/feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch b/patches/squirrel.mac/feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch
new file mode 100644
index 0000000000000..ed8006fe96309
--- /dev/null
+++ b/patches/squirrel.mac/feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch
@@ -0,0 +1,128 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Mon, 28 Mar 2022 02:43:18 -0700
+Subject: feat: add new Squirrel.Mac bundle installation method behind flag
+
+The 'SquirrelMacEnableDirectContentsWrite' user default in your apps defaults suite
+can be used to control this new installation method.  It is designed to remove the
+requirement that the updating process have write access to its parent directory.
+
+With this feature enabled the updating process only needs write access to it's own
+.app bundle folder, not the owning /Applications folder.  This should allow more
+non-admin users to update applications when appropriately granted group based permissions.
+
+E.g. 775 and chown :staff
+
+diff --git a/Squirrel/SQRLInstaller.m b/Squirrel/SQRLInstaller.m
+index 7dd98ddee4ae0f4e01fd7aaa3486083bff7d0da1..c1f328fa8c3689218ef260347cb8f9d30b789efe 100644
+--- a/Squirrel/SQRLInstaller.m
++++ b/Squirrel/SQRLInstaller.m
+@@ -249,6 +249,7 @@ - (RACSignal *)acquireTargetBundleURLForRequest:(SQRLShipItRequest *)request {
+ 		] reduce:^(NSURL *directoryURL, SQRLCodeSignature *codeSignature) {
+ 			NSURL *targetBundleURL = request.targetBundleURL;
+ 			NSURL *newBundleURL = [directoryURL URLByAppendingPathComponent:targetBundleURL.lastPathComponent];
++			[NSFileManager.defaultManager createDirectoryAtURL:newBundleURL withIntermediateDirectories:FALSE attributes:nil error:nil];
+ 
+ 			return [[SQRLInstallerOwnedBundle alloc] initWithOriginalURL:request.targetBundleURL temporaryURL:newBundleURL codeSignature:codeSignature];
+ 		}]
+@@ -481,10 +482,50 @@ - (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
+ 	NSParameterAssert(targetURL != nil);
+ 	NSParameterAssert(sourceURL != nil);
+ 
++	NSLog(@"Moving bundle from %@ to %@", sourceURL, targetURL);
++
++	// If both the sourceURL and the targetURL exist we can try to skip a permissions check
++	// by moving Thing.app/Contents directly.  This allows us to update applications without
++	// permission to write files into the parent directory of Thing.app
++	//
++	// There is no known case where these directories don't exist but in order to handle
++	// edge cases / race conditions we'll handle it anyway.
++	//
++	// This exists check is non-atomic with the rename call below but that's OK
++	BOOL canRenameContentsDirectly = FALSE;
++	// For now while this is tested at scale this new option is behind a user default, this
++	// can be set by applications wishing to test this feature at runtime.  If it causes issues
++	// it can be opted out by individual users by setting this key to false explicitly.
++	// Once this has bene tested at scale it will become the default for all Squirrel.Mac
++	// users.
++	NSUserDefaults *defaults = [[NSUserDefaults alloc] init];
++	[defaults addSuiteNamed:_applicationIdentifier];
++	// In cases where this code is being executed under the ShipIt executable it's running
++	// under an application identifier equal to {parent_identifier}.ShipIt
++	// In this case we need to use the true parent identifier too as that is 99% of the time
++	// where the key will be set.
++	if ([_applicationIdentifier hasSuffix:@".ShipIt"]) {
++		[defaults addSuiteNamed:[_applicationIdentifier substringToIndex:[_applicationIdentifier length] - 7]];
++	}
++
++	if ([defaults boolForKey:@"SquirrelMacEnableDirectContentsWrite"]) {
++		canRenameContentsDirectly = [NSFileManager.defaultManager fileExistsAtPath:targetURL.path] && [NSFileManager.defaultManager fileExistsAtPath:sourceURL.path];
++
++		if (canRenameContentsDirectly) {
++			NSLog(@"Moving bundles via 'Contents' folder rename");
++		} else {
++			NSLog(@"Moving bundles directly as one of source / target does not exist.  This is unexpected.");
++		}
++	} else {
++		NSLog(@"Moving bundles directly as SquirrelMacEnableDirectContentsWrite is disabled for app: %@", _applicationIdentifier);
++	}
++	NSURL *targetContentsURL = canRenameContentsDirectly ? [targetURL URLByAppendingPathComponent:@"Contents"] : targetURL;
++	NSURL *sourceContentsURL = canRenameContentsDirectly ? [sourceURL URLByAppendingPathComponent:@"Contents"] : sourceURL;
++
+ 	return [[[[RACSignal
+ 		defer:^{
+ 			// rename() is atomic, NSFileManager sucks.
+-			if (rename(sourceURL.path.fileSystemRepresentation, targetURL.path.fileSystemRepresentation) == 0) {
++			if (rename(sourceContentsURL.path.fileSystemRepresentation, targetContentsURL.path.fileSystemRepresentation) == 0) {
+ 				return [RACSignal empty];
+ 			} else {
+ 				int code = errno;
+@@ -497,24 +538,24 @@ - (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
+ 			}
+ 		}]
+ 		doCompleted:^{
+-			NSLog(@"Moved bundle from %@ to %@", sourceURL, targetURL);
++			NSLog(@"Moved bundle contents from %@ to %@", sourceContentsURL, targetContentsURL);
+ 		}]
+ 		catch:^(NSError *error) {
+ 			if (![error.domain isEqual:NSPOSIXErrorDomain] || error.code != EXDEV) return [RACSignal error:error];
+ 
+ 			// If the locations lie on two different volumes, remove the
+ 			// destination by hand, then perform a move.
+-			[NSFileManager.defaultManager removeItemAtURL:targetURL error:NULL];
++			[NSFileManager.defaultManager removeItemAtURL:targetContentsURL error:NULL];
+ 
+-			if ([NSFileManager.defaultManager moveItemAtURL:sourceURL toURL:targetURL error:&error]) {
+-				NSLog(@"Moved bundle across volumes from %@ to %@", sourceURL, targetURL);
++			if ([NSFileManager.defaultManager moveItemAtURL:sourceContentsURL toURL:targetContentsURL error:&error]) {
++				NSLog(@"Moved bundle contents across volumes from %@ to %@", sourceContentsURL, targetContentsURL);
+ 				return [RACSignal empty];
+ 			} else {
+-				NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Couldn't move bundle %@ across volumes to %@", nil), sourceURL, targetURL];
++				NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Couldn't move bundle contents %@ across volumes to %@", nil), sourceContentsURL, targetContentsURL];
+ 				return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorMovingAcrossVolumes toError:error]];
+ 			}
+ 		}]
+-		setNameWithFormat:@"%@ -installItemAtURL: %@ fromURL: %@", self, targetURL, sourceURL];
++		setNameWithFormat:@"%@ -installItemAtURL: %@ fromURL: %@", self, targetContentsURL, sourceContentsURL];
+ }
+ 
+ #pragma mark Quarantine Bit Removal
+diff --git a/Squirrel/SQRLUpdater.m b/Squirrel/SQRLUpdater.m
+index c81c820d61da3c7d1cfd2c516147c954a5773a0c..4c703159a2bb0239b7d4e1793a985b5ec2edcfa9 100644
+--- a/Squirrel/SQRLUpdater.m
++++ b/Squirrel/SQRLUpdater.m
+@@ -329,7 +329,12 @@ - (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQ
+ 
+ 			BOOL targetWritable = [self canWriteToURL:targetURL];
+ 			BOOL parentWritable = [self canWriteToURL:targetURL.URLByDeletingLastPathComponent];
+-			return [SQRLShipItLauncher launchPrivileged:!targetWritable || !parentWritable];
++			BOOL launchPrivileged = !targetWritable || !parentWritable;
++			if ([[NSUserDefaults standardUserDefaults] boolForKey:@"SquirrelMacEnableDirectContentsWrite"]) {
++				// If SquirrelMacEnableDirectContentsWrite is enabled we don't care if the parent directory is writeable or not
++				BOOL launchPrivileged = !targetWritable;
++			}
++			return [SQRLShipItLauncher launchPrivileged:launchPrivileged];
+ 		}]
+ 		replayLazily]
+ 		setNameWithFormat:@"shipItLauncher"];
diff --git a/spec-main/api-autoupdater-darwin-spec.ts b/spec-main/api-autoupdater-darwin-spec.ts
index c4535337f9015..18c075f0c7695 100644
--- a/spec-main/api-autoupdater-darwin-spec.ts
+++ b/spec-main/api-autoupdater-darwin-spec.ts
@@ -7,6 +7,8 @@ import * as os from 'os';
 import * as path from 'path';
 import { AddressInfo } from 'net';
 import { ifdescribe, ifit } from './spec-helpers';
+import * as uuid from 'uuid';
+import { systemPreferences } from 'electron';
 
 const features = process._linkedBinding('electron_common_features');
 
@@ -132,7 +134,7 @@ ifdescribe(process.platform === 'darwin' && !(process.env.CI && process.arch ===
         await signApp(secondAppPath);
         await mutateAppPostSign?.mutate(secondAppPath);
         updateZipPath = path.resolve(dir, 'update.zip');
-        await spawn('zip', ['-r', '--symlinks', updateZipPath, './'], {
+        await spawn('zip', ['-0', '-r', '--symlinks', updateZipPath, './'], {
           cwd: dir
         });
       }, false);
@@ -321,6 +323,64 @@ ifdescribe(process.platform === 'darwin' && !(process.env.CI && process.arch ===
       });
     });
 
+    describe('with SquirrelMacEnableDirectContentsWrite enabled', () => {
+      let previousValue: any;
+
+      beforeEach(() => {
+        previousValue = systemPreferences.getUserDefault('SquirrelMacEnableDirectContentsWrite', 'boolean');
+        systemPreferences.setUserDefault('SquirrelMacEnableDirectContentsWrite', 'boolean', true as any);
+      });
+
+      afterEach(() => {
+        systemPreferences.setUserDefault('SquirrelMacEnableDirectContentsWrite', 'boolean', previousValue as any);
+      });
+
+      it('should hit the download endpoint when an update is available and update successfully when the zip is provided leaving the parent directory untouched', async () => {
+        await withUpdatableApp({
+          nextVersion: '2.0.0',
+          startFixture: 'update',
+          endFixture: 'update'
+        }, async (appPath, updateZipPath) => {
+          const randomID = uuid.v4();
+          cp.spawnSync('xattr', ['-w', 'spec-id', randomID, appPath]);
+          server.get('/update-file', (req, res) => {
+            res.download(updateZipPath);
+          });
+          server.get('/update-check', (req, res) => {
+            res.json({
+              url: `http://localhost:${port}/update-file`,
+              name: 'My Release Name',
+              notes: 'Theses are some release notes innit',
+              pub_date: (new Date()).toString()
+            });
+          });
+          const relaunchPromise = new Promise<void>((resolve) => {
+            server.get('/update-check/updated/:version', (req, res) => {
+              res.status(204).send();
+              resolve();
+            });
+          });
+          const launchResult = await launchApp(appPath, [`http://localhost:${port}/update-check`]);
+          logOnError(launchResult, () => {
+            expect(launchResult).to.have.property('code', 0);
+            expect(launchResult.out).to.include('Update Downloaded');
+            expect(requests).to.have.lengthOf(2);
+            expect(requests[0]).to.have.property('url', '/update-check');
+            expect(requests[1]).to.have.property('url', '/update-file');
+            expect(requests[0].header('user-agent')).to.include('Electron/');
+            expect(requests[1].header('user-agent')).to.include('Electron/');
+          });
+
+          await relaunchPromise;
+          expect(requests).to.have.lengthOf(3);
+          expect(requests[2].url).to.equal('/update-check/updated/2.0.0');
+          expect(requests[2].header('user-agent')).to.include('Electron/');
+          const result = cp.spawnSync('xattr', ['-l', appPath]);
+          expect(result.stdout.toString()).to.include(`spec-id: ${randomID}`);
+        });
+      });
+    });
+
     it('should hit the download endpoint when an update is available and fail when the zip signature is invalid', async () => {
       await withUpdatableApp({
         nextVersion: '2.0.0',

From 0615fadeadc9de97b51ff4931ab1ea4400b7f42d Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 30 Mar 2022 00:34:44 +0200
Subject: [PATCH 196/811] chore: set v8_typed_array_max_size_in_heap to default
 (#33496)

---
 build/args/all.gn               | 1 -
 script/node-disabled-tests.json | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/build/args/all.gn b/build/args/all.gn
index 91c53266a80d9..a9a472bc79c2c 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -5,7 +5,6 @@ root_extra_deps = [ "//electron" ]
 node_module_version = 106
 
 v8_promise_internal_field_count = 1
-v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"
 
 # TODO: this breaks mksnapshot
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index 28368dce775d1..52128823432f0 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -3,9 +3,6 @@
   "async-hooks/test-crypto-pbkdf2",
   "async-hooks/test-crypto-randomBytes",
   "parallel/test-bootstrap-modules",
-  "parallel/test-buffer-backing-arraybuffer",
-  "parallel/test-buffer-constructor-node-modules-paths",
-  "parallel/test-buffer-constructor-outside-node-modules",
   "parallel/test-child-process-fork-exec-path",
   "parallel/test-child-process-stdio-overlapped",
   "parallel/test-cli-node-print-help",

From 10f67e64f945fa71f82c39d846a068ad71c8da06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 18:47:46 -0400
Subject: [PATCH 197/811] build(deps): bump ansi-regex from 3.0.0 to 3.0.1 in
 /spec (#33484)

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/yarn.lock b/spec/yarn.lock
index fc6bccebb7505..db24b66cc2cb1 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -30,9 +30,9 @@ ajv@^6.5.5:
     uri-js "^4.2.2"
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^5.0.0:
   version "5.0.0"

From 89c1abd1b325c8ac815f37521754e377120a4171 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 29 Mar 2022 16:07:55 -0700
Subject: [PATCH 198/811] chore: bump NMV for Electron 20 (#33476)

---
 build/args/all.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/args/all.gn b/build/args/all.gn
index a9a472bc79c2c..1e31472914a6d 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 106
+node_module_version = 107
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"

From 9c3b159b956d30a60052a4c6c81b297ad5329567 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 29 Mar 2022 16:08:34 -0700
Subject: [PATCH 199/811] fix: on macOS show BrowserWindow on maximize if not
 currently shown (#32949)

---
 shell/browser/native_window_mac.mm   | 12 +++++++++++-
 spec-main/api-browser-window-spec.ts | 10 ++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 92cebd9bb65ba..04cca2461f5bc 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -602,13 +602,23 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::Maximize() {
-  if (IsMaximized())
+  const bool is_visible = [window_ isVisible];
+
+  if (IsMaximized()) {
+    if (!is_visible)
+      ShowInactive();
     return;
+  }
 
   // Take note of the current window size
   if (IsNormal())
     original_frame_ = [window_ frame];
   [window_ zoom:nil];
+
+  if (!is_visible) {
+    ShowInactive();
+    NotifyWindowMaximize();
+  }
 }
 
 void NativeWindowMac::Unmaximize() {
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 19c08c0700813..4c9f451a5952d 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3579,22 +3579,24 @@ describe('BrowserWindow module', () => {
   // TODO(dsanders11): Enable once maximize event works on Linux again on CI
   ifdescribe(process.platform !== 'linux')('BrowserWindow.maximize()', () => {
     afterEach(closeAllWindows);
-    // TODO(dsanders11): Disabled on macOS, see https://github.com/electron/electron/issues/32947
-    ifit(process.platform !== 'darwin')('should show the window if it is not currently shown', async () => {
+    it('should show the window if it is not currently shown', async () => {
       const w = new BrowserWindow({ show: false });
       const hidden = emittedOnce(w, 'hide');
-      const shown = emittedOnce(w, 'show');
+      let shown = emittedOnce(w, 'show');
       const maximize = emittedOnce(w, 'maximize');
       expect(w.isVisible()).to.be.false('visible');
       w.maximize();
       await maximize;
+      await shown;
+      expect(w.isMaximized()).to.be.true('maximized');
       expect(w.isVisible()).to.be.true('visible');
       // Even if the window is already maximized
       w.hide();
       await hidden;
       expect(w.isVisible()).to.be.false('visible');
+      shown = emittedOnce(w, 'show');
       w.maximize();
-      await shown; // Ensure a 'show' event happens when it becomes visible
+      await shown;
       expect(w.isVisible()).to.be.true('visible');
     });
   });

From a9296229c8038f667ae93a3acb245e2093983453 Mon Sep 17 00:00:00 2001
From: Mitchell Cohen <mitch.cohen@me.com>
Date: Tue, 29 Mar 2022 21:34:07 -0400
Subject: [PATCH 200/811] feat: add app.isHidden API for macOS (#32155)

* feat: add app.isHidden API

* Update docs/api/app.md

Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com>

* fixed isHidden tests

* Update docs/api/app.md

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

* Update spec-main/api-app-spec.ts

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
---
 docs/api/app.md                       |  4 ++++
 shell/browser/api/electron_api_app.cc |  1 +
 shell/browser/browser.h               |  1 +
 shell/browser/browser_mac.mm          |  4 ++++
 spec-main/api-app-spec.ts             | 19 ++++++++++++++++++-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index b8c4780b22853..b01b218b181cf 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -606,6 +606,10 @@ You should seek to use the `steal` option as sparingly as possible.
 
 Hides all application windows without minimizing them.
 
+### `app.isHidden()` _macOS_
+
+Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
+
 ### `app.show()` _macOS_
 
 Shows application windows after they were hidden. Does not automatically focus
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 353b8c3d67783..73db1e756f885 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -1769,6 +1769,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
                  base::BindRepeating(&Browser::IsEmojiPanelSupported, browser))
 #if BUILDFLAG(IS_MAC)
       .SetMethod("hide", base::BindRepeating(&Browser::Hide, browser))
+      .SetMethod("isHidden", base::BindRepeating(&Browser::IsHidden, browser))
       .SetMethod("show", base::BindRepeating(&Browser::Show, browser))
       .SetMethod("setUserActivity",
                  base::BindRepeating(&Browser::SetUserActivity, browser))
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
index 4a69bbd75dcb6..c56cc3ce84cd0 100755
--- a/shell/browser/browser.h
+++ b/shell/browser/browser.h
@@ -158,6 +158,7 @@ class Browser : public WindowListObserver {
 
   // Hide the application.
   void Hide();
+  bool IsHidden();
 
   // Show the application.
   void Show();
diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index cdd3ba7711b4b..1094747b41130 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -117,6 +117,10 @@
   [[AtomApplication sharedApplication] hide:nil];
 }
 
+bool Browser::IsHidden() {
+  return [[AtomApplication sharedApplication] isHidden];
+}
+
 void Browser::Show() {
   [[AtomApplication sharedApplication] unhide:nil];
 }
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index f4337d224bdb1..4de2ca2a0dd0a 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -9,7 +9,7 @@ import { promisify } from 'util';
 import { app, BrowserWindow, Menu, session, net as electronNet } from 'electron/main';
 import { emittedOnce } from './events-helpers';
 import { closeWindow, closeAllWindows } from './window-helpers';
-import { ifdescribe, ifit } from './spec-helpers';
+import { ifdescribe, ifit, waitUntil } from './spec-helpers';
 import split = require('split')
 
 const fixturesPath = path.resolve(__dirname, '../spec/fixtures');
@@ -1575,6 +1575,23 @@ describe('app module', () => {
     });
   });
 
+  ifdescribe(process.platform === 'darwin')('app hide and show API', () => {
+    describe('app.isHidden', () => {
+      it('returns true when the app is hidden', async () => {
+        app.hide();
+        await expect(
+          waitUntil(() => app.isHidden())
+        ).to.eventually.be.fulfilled();
+      });
+      it('returns false when the app is shown', async () => {
+        app.show();
+        await expect(
+          waitUntil(() => !app.isHidden())
+        ).to.eventually.be.fulfilled();
+      });
+    });
+  });
+
   const dockDescribe = process.platform === 'darwin' ? describe : describe.skip;
   dockDescribe('dock APIs', () => {
     after(async () => {

From df3cfb663c19bd580594d4d00d04bfe244054e7f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 29 Mar 2022 19:50:59 -0700
Subject: [PATCH 201/811] refactor: use posix_spawn instead of NSTask so we can
 disclaim the spawned ShipIt executable (#33468)

---
 patches/squirrel.mac/.patches                 |   1 +
 ...ead_of_nstask_so_we_can_disclaim_the.patch | 101 ++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch

diff --git a/patches/squirrel.mac/.patches b/patches/squirrel.mac/.patches
index f16e10d95fdba..53f27f11a9e25 100644
--- a/patches/squirrel.mac/.patches
+++ b/patches/squirrel.mac/.patches
@@ -2,3 +2,4 @@ build_add_gn_config.patch
 fix_ensure_that_self_is_retained_until_the_racsignal_is_complete.patch
 fix_use_kseccschecknestedcode_kseccsstrictvalidate_in_the_sec.patch
 feat_add_new_squirrel_mac_bundle_installation_method_behind_flag.patch
+refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch
diff --git a/patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch b/patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch
new file mode 100644
index 0000000000000..c69df44026fd2
--- /dev/null
+++ b/patches/squirrel.mac/refactor_use_posix_spawn_instead_of_nstask_so_we_can_disclaim_the.patch
@@ -0,0 +1,101 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Mon, 28 Mar 2022 02:36:39 -0700
+Subject: refactor: use posix_spawn instead of NSTask so we can disclaim the
+ spawned ShipIt executable
+
+This ensures that if the ShipIt executable is hotswapped it doesn't inherit TCC permissions
+
+diff --git a/Squirrel/ShipIt-main.m b/Squirrel/ShipIt-main.m
+index db246534e176f9c3ea2dd8b1c8659378fdc2435d..2c515ffdd67052a08ee8155c0e46b57e9721a0e5 100644
+--- a/Squirrel/ShipIt-main.m
++++ b/Squirrel/ShipIt-main.m
+@@ -13,6 +13,9 @@
+ #import <ReactiveObjC/RACSignal+Operations.h>
+ #import <ReactiveObjC/RACScheduler.h>
+ 
++#include <spawn.h>
++#include <sys/wait.h>
++
+ #import "NSError+SQRLVerbosityExtensions.h"
+ #import "RACSignal+SQRLTransactionExtensions.h"
+ #import "SQRLInstaller.h"
+@@ -20,6 +23,20 @@
+ #import "SQRLTerminationListener.h"
+ #import "SQRLShipItRequest.h"
+ 
++extern char **environ;
++
++int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
++__attribute__((availability(macos,introduced=10.14),weak_import));
++
++#define CHECK_ERR(expr) \
++	{ \
++		int err = (expr); \
++    if (err) { \
++        fprintf(stderr, "%s: %s", #expr, strerror(err)); \
++        exit(err); \
++    } \
++	}
++
+ // The maximum number of times ShipIt should run the same installation state, in
+ // an attempt to update.
+ //
+@@ -136,11 +153,37 @@ static void installRequest(RACSignal *readRequestSignal, NSString *applicationId
+ 							NSString *exe = NSProcessInfo.processInfo.arguments[0];
+ 							NSLog(@"Launching new ShipIt at %@ with instructions to launch %@", exe, bundleURL);
+ 
+-							NSTask *task = [[NSTask alloc] init];
+-							[task setLaunchPath: exe];
+-							[task setArguments: @[launchSignal, bundleURL.path]];
+-							[task launch];
+-							[task waitUntilExit];
++							posix_spawnattr_t attr;
++							CHECK_ERR(posix_spawnattr_init(&attr));
++
++							if (@available(macOS 10.14, *)) {
++									// Disclaim TCC responsibilities
++									if (responsibility_spawnattrs_setdisclaim)
++											CHECK_ERR(responsibility_spawnattrs_setdisclaim(&attr, 1));
++							}
++
++							pid_t pid = 0;
++
++							const char* launchPath = [exe fileSystemRepresentation];
++							const char* signal = [launchSignal fileSystemRepresentation];
++							const char* path = [bundleURL.path fileSystemRepresentation];
++							const char* args[] = { launchPath, signal, path, 0 };
++							int status = posix_spawn(&pid, [exe UTF8String], NULL, &attr, (char *const*)args, environ);
++							if (status == 0) {
++								NSLog(@"New ShipIt pid: %i", pid);
++								do {
++									if (waitpid(pid, &status, 0) != -1) {
++										NSLog(@"ShipIt status %d", WEXITSTATUS(status));
++									} else {
++										perror("waitpid");
++										exit(1);
++									}
++								} while (!WIFEXITED(status) && !WIFSIGNALED(status));
++							} else {
++								NSLog(@"posix_spawn: %s", strerror(status));
++							}
++
++							posix_spawnattr_destroy(&attr);
+ 
+ 							NSLog(@"New ShipIt exited");
+ 						} else {
+@@ -172,7 +215,13 @@ int main(int argc, const char * argv[]) {
+ 		});
+ 
+ 		if (argc < 3) {
+-			NSLog(@"Missing launchd job label or state path for ShipIt");
++			NSLog(@"Missing launchd job label or state path for ShipIt (%d)", argc);
++			if (argc >= 1) {
++				NSLog(@"Arg 1: {%s}", argv[0]);
++			}
++			if (argc >= 2) {
++				NSLog(@"Arg 2: {%s}", argv[1]);
++			}
+ 			return EXIT_FAILURE;
+ 		}
+ 

From c119b1ebef0afe3b8dbedc4f869a1c67684d6009 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 30 Mar 2022 12:09:42 +0900
Subject: [PATCH 202/811] chore: remove redundant code in node integration
 (#33500)

---
 shell/browser/electron_browser_main_parts.cc |  4 ++--
 shell/common/node_bindings.cc                | 21 ++++++++++++++--
 shell/common/node_bindings.h                 | 11 +++++----
 shell/common/node_bindings_linux.cc          | 24 -------------------
 shell/common/node_bindings_linux.h           |  7 ------
 shell/common/node_bindings_mac.cc            | 24 -------------------
 shell/common/node_bindings_mac.h             |  7 ------
 shell/common/node_bindings_win.cc            | 25 --------------------
 shell/common/node_bindings_win.h             |  7 ------
 shell/renderer/electron_renderer_client.cc   |  6 ++---
 shell/renderer/web_worker_observer.cc        |  4 ++--
 11 files changed, 32 insertions(+), 108 deletions(-)

diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 82713b7d15288..98344e65d95ac 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -402,8 +402,8 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
 int ElectronBrowserMainParts::PreMainMessageLoopRun() {
   // Run user's main script before most things get initialized, so we can have
   // a chance to setup everything.
-  node_bindings_->PrepareMessageLoop();
-  node_bindings_->RunMessageLoop();
+  node_bindings_->PrepareEmbedThread();
+  node_bindings_->StartPolling();
 
   // url::Add*Scheme are not threadsafe, this helps prevent data races.
   url::LockSchemeRegistries();
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index c83253dc9210b..15560da0cb71b 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -584,7 +584,16 @@ void NodeBindings::LoadEnvironment(node::Environment* env) {
   gin_helper::EmitEvent(env->isolate(), env->process_object(), "loaded");
 }
 
-void NodeBindings::PrepareMessageLoop() {
+void NodeBindings::PrepareEmbedThread() {
+  // IOCP does not change for the process until the loop is recreated,
+  // we ensure that there is only a single polling thread satisfying
+  // the concurrency limit set from CreateIoCompletionPort call by
+  // uv_loop_init for the lifetime of this process.
+  // More background can be found at:
+  // https://github.com/microsoft/vscode/issues/142786#issuecomment-1061673400
+  if (initialized_)
+    return;
+
   // Add dummy handle for libuv, otherwise libuv would quit when there is
   // nothing to do.
   uv_async_init(uv_loop_, dummy_uv_handle_.get(), nullptr);
@@ -594,7 +603,15 @@ void NodeBindings::PrepareMessageLoop() {
   uv_thread_create(&embed_thread_, EmbedThreadRunner, this);
 }
 
-void NodeBindings::RunMessageLoop() {
+void NodeBindings::StartPolling() {
+  // Avoid calling UvRunOnce if the loop is already active,
+  // otherwise it can lead to situations were the number of active
+  // threads processing on IOCP is greater than the concurrency limit.
+  if (initialized_)
+    return;
+
+  initialized_ = true;
+
   // The MessageLoop should have been created, remember the one in main thread.
   task_runner_ = base::ThreadTaskRunnerHandle::Get();
 
diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h
index 204cf12d5cc6c..54bed07a39aab 100644
--- a/shell/common/node_bindings.h
+++ b/shell/common/node_bindings.h
@@ -92,11 +92,11 @@ class NodeBindings {
   // Load node.js in the environment.
   void LoadEnvironment(node::Environment* env);
 
-  // Prepare for message loop integration.
-  virtual void PrepareMessageLoop();
+  // Prepare embed thread for message loop integration.
+  void PrepareEmbedThread();
 
-  // Do message loop integration.
-  virtual void RunMessageLoop();
+  // Notify embed thread to start polling after environment is loaded.
+  void StartPolling();
 
   // Gets/sets the per isolate data.
   void set_isolate_data(node::IsolateData* isolate_data) {
@@ -144,6 +144,9 @@ class NodeBindings {
   // Thread to poll uv events.
   static void EmbedThreadRunner(void* arg);
 
+  // Indicates whether polling thread has been created.
+  bool initialized_ = false;
+
   // Whether the libuv loop has ended.
   bool embed_closed_ = false;
 
diff --git a/shell/common/node_bindings_linux.cc b/shell/common/node_bindings_linux.cc
index 395dcfc28b480..5fc157da00e58 100644
--- a/shell/common/node_bindings_linux.cc
+++ b/shell/common/node_bindings_linux.cc
@@ -17,30 +17,6 @@ NodeBindingsLinux::NodeBindingsLinux(BrowserEnvironment browser_env)
   epoll_ctl(epoll_, EPOLL_CTL_ADD, backend_fd, &ev);
 }
 
-NodeBindingsLinux::~NodeBindingsLinux() = default;
-
-void NodeBindingsLinux::PrepareMessageLoop() {
-  int handle = uv_backend_fd(uv_loop_);
-
-  // If the backend fd hasn't changed, don't proceed.
-  if (handle == handle_)
-    return;
-
-  NodeBindings::PrepareMessageLoop();
-}
-
-void NodeBindingsLinux::RunMessageLoop() {
-  int handle = uv_backend_fd(uv_loop_);
-
-  // If the backend fd hasn't changed, don't proceed.
-  if (handle == handle_)
-    return;
-
-  handle_ = handle;
-
-  NodeBindings::RunMessageLoop();
-}
-
 void NodeBindingsLinux::PollEvents() {
   int timeout = uv_backend_timeout(uv_loop_);
 
diff --git a/shell/common/node_bindings_linux.h b/shell/common/node_bindings_linux.h
index 4499f1c754fe1..db8a8ed32ad58 100644
--- a/shell/common/node_bindings_linux.h
+++ b/shell/common/node_bindings_linux.h
@@ -13,19 +13,12 @@ namespace electron {
 class NodeBindingsLinux : public NodeBindings {
  public:
   explicit NodeBindingsLinux(BrowserEnvironment browser_env);
-  ~NodeBindingsLinux() override;
-
-  void PrepareMessageLoop() override;
-  void RunMessageLoop() override;
 
  private:
   void PollEvents() override;
 
   // Epoll to poll for uv's backend fd.
   int epoll_;
-
-  // uv's backend fd.
-  int handle_ = -1;
 };
 
 }  // namespace electron
diff --git a/shell/common/node_bindings_mac.cc b/shell/common/node_bindings_mac.cc
index cfc37e5f50135..fe9b0d6986196 100644
--- a/shell/common/node_bindings_mac.cc
+++ b/shell/common/node_bindings_mac.cc
@@ -17,30 +17,6 @@ namespace electron {
 NodeBindingsMac::NodeBindingsMac(BrowserEnvironment browser_env)
     : NodeBindings(browser_env) {}
 
-NodeBindingsMac::~NodeBindingsMac() = default;
-
-void NodeBindingsMac::PrepareMessageLoop() {
-  int handle = uv_backend_fd(uv_loop_);
-
-  // If the backend fd hasn't changed, don't proceed.
-  if (handle == handle_)
-    return;
-
-  NodeBindings::PrepareMessageLoop();
-}
-
-void NodeBindingsMac::RunMessageLoop() {
-  int handle = uv_backend_fd(uv_loop_);
-
-  // If the backend fd hasn't changed, don't proceed.
-  if (handle == handle_)
-    return;
-
-  handle_ = handle;
-
-  NodeBindings::RunMessageLoop();
-}
-
 void NodeBindingsMac::PollEvents() {
   struct timeval tv;
   int timeout = uv_backend_timeout(uv_loop_);
diff --git a/shell/common/node_bindings_mac.h b/shell/common/node_bindings_mac.h
index 911287a65fd37..cae9540edbe7c 100644
--- a/shell/common/node_bindings_mac.h
+++ b/shell/common/node_bindings_mac.h
@@ -13,16 +13,9 @@ namespace electron {
 class NodeBindingsMac : public NodeBindings {
  public:
   explicit NodeBindingsMac(BrowserEnvironment browser_env);
-  ~NodeBindingsMac() override;
-
-  void PrepareMessageLoop() override;
-  void RunMessageLoop() override;
 
  private:
   void PollEvents() override;
-
-  // uv's backend fd.
-  int handle_ = -1;
 };
 
 }  // namespace electron
diff --git a/shell/common/node_bindings_win.cc b/shell/common/node_bindings_win.cc
index 1410925f195c5..9b2319cfdc86b 100644
--- a/shell/common/node_bindings_win.cc
+++ b/shell/common/node_bindings_win.cc
@@ -27,31 +27,6 @@ NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
   }
 }
 
-NodeBindingsWin::~NodeBindingsWin() = default;
-
-void NodeBindingsWin::PrepareMessageLoop() {
-  // IOCP does not change for the process until the loop is recreated,
-  // we ensure that there is only a single polling thread satisfying
-  // the concurrency limit set from CreateIoCompletionPort call by
-  // uv_loop_init for the lifetime of this process.
-  if (initialized_)
-    return;
-
-  NodeBindings::PrepareMessageLoop();
-}
-
-void NodeBindingsWin::RunMessageLoop() {
-  // Avoid calling UvRunOnce if the loop is already active,
-  // otherwise it can lead to situations were the number of active
-  // threads processing on IOCP is greater than the concurrency limit.
-  if (initialized_)
-    return;
-
-  initialized_ = true;
-
-  NodeBindings::RunMessageLoop();
-}
-
 void NodeBindingsWin::PollEvents() {
   // If there are other kinds of events pending, uv_backend_timeout will
   // instruct us not to wait.
diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h
index 59d7469b0ff75..a0dcd3378f909 100644
--- a/shell/common/node_bindings_win.h
+++ b/shell/common/node_bindings_win.h
@@ -13,16 +13,9 @@ namespace electron {
 class NodeBindingsWin : public NodeBindings {
  public:
   explicit NodeBindingsWin(BrowserEnvironment browser_env);
-  ~NodeBindingsWin() override;
-
-  void PrepareMessageLoop() override;
-  void RunMessageLoop() override;
 
  private:
   void PollEvents() override;
-
-  // Indicates whether polling thread has been created.
-  bool initialized_ = false;
 };
 
 }  // namespace electron
diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index 08276425938f3..1c819d13c445b 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -93,9 +93,7 @@ void ElectronRendererClient::DidCreateScriptContext(
   if (!node_integration_initialized_) {
     node_integration_initialized_ = true;
     node_bindings_->Initialize();
-    node_bindings_->PrepareMessageLoop();
-  } else {
-    node_bindings_->PrepareMessageLoop();
+    node_bindings_->PrepareEmbedThread();
   }
 
   // Setup node tracing controller.
@@ -131,7 +129,7 @@ void ElectronRendererClient::DidCreateScriptContext(
     node_bindings_->set_uv_env(env);
 
     // Give the node loop a run to make sure everything is ready.
-    node_bindings_->RunMessageLoop();
+    node_bindings_->StartPolling();
   }
 }
 
diff --git a/shell/renderer/web_worker_observer.cc b/shell/renderer/web_worker_observer.cc
index ca929bf9e4bb9..ea5f60daba426 100644
--- a/shell/renderer/web_worker_observer.cc
+++ b/shell/renderer/web_worker_observer.cc
@@ -56,7 +56,7 @@ void WebWorkerObserver::WorkerScriptReadyForEvaluation(
       isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
 
   // Start the embed thread.
-  node_bindings_->PrepareMessageLoop();
+  node_bindings_->PrepareEmbedThread();
 
   // Setup node tracing controller.
   if (!node::tracing::TraceEventHelper::GetAgent())
@@ -78,7 +78,7 @@ void WebWorkerObserver::WorkerScriptReadyForEvaluation(
   node_bindings_->set_uv_env(env);
 
   // Give the node loop a run to make sure everything is ready.
-  node_bindings_->RunMessageLoop();
+  node_bindings_->StartPolling();
 }
 
 void WebWorkerObserver::ContextWillDestroy(v8::Local<v8::Context> context) {

From aac546368faab9f140d52b4c5fb329c75a9ddca7 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 30 Mar 2022 12:51:13 +0200
Subject: [PATCH 203/811] test: re-enable `test-child-process-stdio-overlapped`
 (#33502)

---
 .circleci/build_config.yml                  | 11 +++++++++++
 patches/node/build_add_gn_build_files.patch | 13 +++++++++++--
 script/node-disabled-tests.json             |  1 -
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index f25a498be8d2c..0424b3e2d8290 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -674,6 +674,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/chromedriver.zip
       - src/out/Default/shell_browser_ui_unittests
       - src/out/Default/gen/node_headers
+      - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
       - src/electron
       - src/third_party/electron_node
@@ -811,6 +812,13 @@ step-mksnapshot-build: &step-mksnapshot-build
         (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
       fi
 
+step-nodejs-build-test-executable: &step-nodejs-build-test-executable
+  run:
+    name: Build Node.js Test Executables
+    command: |
+      cd src
+      ninja -C out/Default third_party/electron_node:overlapped-checker
+
 step-hunspell-build: &step-hunspell-build
   run:
     name: hunspell build
@@ -1433,6 +1441,9 @@ commands:
             # Node.js headers
             - *step-nodejs-headers-build
 
+            # Node.js test executable
+            - *step-nodejs-build-test-executable
+
             - *step-show-goma-stats
 
             # mksnapshot
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index d18f8e519d5a4..fbf050490c493 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -7,10 +7,10 @@ This adds GN build files for Node, so we don't have to build with GYP.
 
 diff --git a/BUILD.gn b/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd5788caa61305fd9af8f9d7f8f1937a224fda83
+index 0000000000000000000000000000000000000000..4afca42d22ee702af50da92aa08c1de897891424
 --- /dev/null
 +++ b/BUILD.gn
-@@ -0,0 +1,394 @@
+@@ -0,0 +1,403 @@
 +import("//electron/build/asar.gni")
 +import("//v8/gni/v8.gni")
 +
@@ -192,6 +192,15 @@ index 0000000000000000000000000000000000000000..bd5788caa61305fd9af8f9d7f8f1937a
 +  }
 +}
 +
++executable("overlapped-checker") {
++  sources = []
++  if (is_win) {
++    sources += [ "test/overlapped-checker/main_win.c" ]
++  } else {
++    sources += [ "test/overlapped-checker/main_unix.c" ]
++  }
++}
++
 +component("node_lib") {
 +  deps = [
 +    ":node_js2c",
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index 52128823432f0..bfaf96bf9415d 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -4,7 +4,6 @@
   "async-hooks/test-crypto-randomBytes",
   "parallel/test-bootstrap-modules",
   "parallel/test-child-process-fork-exec-path",
-  "parallel/test-child-process-stdio-overlapped",
   "parallel/test-cli-node-print-help",
   "parallel/test-cluster-bind-privileged-port",
   "parallel/test-cluster-shared-handle-bind-privileged-port",

From f13f07023fca537cf8eeecc23c6f533e7665b7f0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 06:01:28 -0700
Subject: [PATCH 204/811] Bump v20.0.0-nightly.20220330

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index e078e2e369954..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-19.0.0-nightly.20220329
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 34f8e5b0b6a40..3ef503b0bc981 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "19.0.0-nightly.20220329",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 194e1b56579c3..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,0,0,20220329
- PRODUCTVERSION 19,0,0,20220329
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "19.0.0"
+            VALUE "FileVersion", "20.0.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "19.0.0"
+            VALUE "ProductVersion", "20.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From a508dce1bfe000ad25a6d6320f12cd41ee1a3fd7 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 30 Mar 2022 09:50:26 -0400
Subject: [PATCH 205/811] ci: save Windows artifacts at end of job in case they
 fail (#33510)

---
 appveyor.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7b413faee5c78..a449f76827eb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -177,16 +177,7 @@ build_script:
   - ninja -C out/Default third_party/electron_node:headers
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
-  - appveyor PushArtifact out/Default/dist.zip
-  - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
-  - appveyor PushArtifact out/Default/chromedriver.zip
-  - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
   - 7z a node_headers.zip out\Default\gen\node_headers
-  - appveyor PushArtifact node_headers.zip
-  - appveyor PushArtifact out/Default/mksnapshot.zip
-  - appveyor PushArtifact out/Default/hunspell_dictionaries.zip
-  - appveyor PushArtifact out/Default/electron.lib
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
         # Needed for msdia140.dll on 64-bit windows
@@ -201,7 +192,6 @@ build_script:
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
         7z a pdb.zip out\Default\*.pdb
-        appveyor-retry appveyor PushArtifact pdb.zip
       }
   - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
@@ -230,7 +220,6 @@ test_script:
   - echo "Done verifying mksnapshot"
   - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying chromedriver"
-  - if exist %cd%\electron.log ( appveyor-retry appveyor PushArtifact %cd%\electron.log )
 deploy_script:
   - cd electron
   - ps: >-
@@ -246,4 +235,19 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
-  - if exist src\electron\electron.log ( appveyor-retry appveyor PushArtifact src\electron\electron.log )
+  - cd ..
+  - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
+  - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
+  - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
+  - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
+  - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
+  - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
+  - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
+  - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
+  - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
+  - ps: >-
+      if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
+        appveyor-retry appveyor PushArtifact pdb.zip
+      }
+
+  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

From 929fc8bea5dd8f5fa64723cc0a805319e3340bb8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 31 Mar 2022 02:17:34 +0900
Subject: [PATCH 206/811] test: make test apps' name prefixed with
 electron-test- (#33511)

---
 spec-main/api-app-spec.ts                          |  8 ++++----
 spec-main/api-session-spec.ts                      |  2 +-
 .../context-bridge-mutability/package.json         |  4 ++--
 .../api/safe-storage/decrypt-app/package.json      |  2 +-
 .../api/safe-storage/encrypt-app/package.json      |  2 +-
 .../apps/background-color-transparent/package.json |  2 +-
 spec-main/fixtures/apps/xwindow-icon/package.json  |  4 ++--
 .../auto-update/check-with-headers/package.json    |  4 ++--
 spec-main/fixtures/auto-update/check/package.json  |  4 ++--
 .../fixtures/auto-update/update-json/package.json  |  4 ++--
 spec-main/fixtures/auto-update/update/package.json |  4 ++--
 spec/fixtures/api/cookie-app/package.json          |  2 +-
 spec/fixtures/api/electron-module-app/.gitignore   |  1 -
 spec/fixtures/api/electron-module-app/index.html   | 14 --------------
 .../node_modules/electron/index.js                 |  0
 .../node_modules/electron/package.json             |  4 ----
 .../electron-module-app/node_modules/foo/index.js  |  1 -
 .../node_modules/foo/package.json                  |  4 ----
 spec/fixtures/api/mixed-sandbox-app/package.json   |  2 +-
 spec/fixtures/api/quit-app/package.json            |  2 +-
 spec/fixtures/api/relaunch/package.json            |  2 +-
 spec/fixtures/api/singleton-data/package.json      |  2 +-
 spec/fixtures/api/singleton/package.json           |  2 +-
 23 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 100644 spec/fixtures/api/electron-module-app/.gitignore
 delete mode 100644 spec/fixtures/api/electron-module-app/index.html
 delete mode 100644 spec/fixtures/api/electron-module-app/node_modules/electron/index.js
 delete mode 100644 spec/fixtures/api/electron-module-app/node_modules/electron/package.json
 delete mode 100644 spec/fixtures/api/electron-module-app/node_modules/foo/index.js
 delete mode 100644 spec/fixtures/api/electron-module-app/node_modules/foo/package.json

diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 4de2ca2a0dd0a..718223229572b 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -90,9 +90,9 @@ describe('app module', () => {
 
       it('overrides the name', () => {
         expect(app.name).to.equal('Electron Test Main');
-        app.name = 'test-name';
+        app.name = 'electron-test-name';
 
-        expect(app.name).to.equal('test-name');
+        expect(app.name).to.equal('electron-test-name');
         app.name = 'Electron Test Main';
       });
     });
@@ -104,9 +104,9 @@ describe('app module', () => {
 
       it('overrides the name', () => {
         expect(app.getName()).to.equal('Electron Test Main');
-        app.setName('test-name');
+        app.setName('electron-test-name');
 
-        expect(app.getName()).to.equal('test-name');
+        expect(app.getName()).to.equal('electron-test-name');
         app.setName('Electron Test Main');
       });
     });
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index f504d0db6d464..53a637bf86f60 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -1130,7 +1130,7 @@ describe('session module', () => {
         session.defaultSession.setCodeCachePath('');
       }).to.throw('Absolute path must be provided to store code cache.');
       expect(() => {
-        session.defaultSession.setCodeCachePath(path.join(app.getPath('userData'), 'test-code-cache'));
+        session.defaultSession.setCodeCachePath(path.join(app.getPath('userData'), 'electron-test-code-cache'));
       }).to.not.throw();
     });
   });
diff --git a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json b/spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json
index d1fc13838e5fe..91b9749095be8 100644
--- a/spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json
+++ b/spec-main/fixtures/api/context-bridge/context-bridge-mutability/package.json
@@ -1,4 +1,4 @@
 {
-    "name": "context-bridge-mutability",
+    "name": "electron-test-context-bridge-mutability",
     "main": "main.js"
-}
\ No newline at end of file
+}
diff --git a/spec-main/fixtures/api/safe-storage/decrypt-app/package.json b/spec-main/fixtures/api/safe-storage/decrypt-app/package.json
index cb5d6ffc41906..f4e7a5ad938a1 100644
--- a/spec-main/fixtures/api/safe-storage/decrypt-app/package.json
+++ b/spec-main/fixtures/api/safe-storage/decrypt-app/package.json
@@ -1,4 +1,4 @@
 {
-    "name": "electron-safe-storage",
+    "name": "electron-test-safe-storage",
     "main": "main.js"
 }
diff --git a/spec-main/fixtures/api/safe-storage/encrypt-app/package.json b/spec-main/fixtures/api/safe-storage/encrypt-app/package.json
index 2fa2fabcd1e84..1b14cccc1d787 100644
--- a/spec-main/fixtures/api/safe-storage/encrypt-app/package.json
+++ b/spec-main/fixtures/api/safe-storage/encrypt-app/package.json
@@ -1,4 +1,4 @@
 {
-  "name": "electron-safe-storage",
+  "name": "electron-test-safe-storage",
   "main": "main.js"
 }
diff --git a/spec-main/fixtures/apps/background-color-transparent/package.json b/spec-main/fixtures/apps/background-color-transparent/package.json
index 0ea4852f44c3f..6b8e31a17749e 100644
--- a/spec-main/fixtures/apps/background-color-transparent/package.json
+++ b/spec-main/fixtures/apps/background-color-transparent/package.json
@@ -1,4 +1,4 @@
 {
-  "name": "background-color-transparent",
+  "name": "electron-test-background-color-transparent",
   "main": "main.js"
 }
diff --git a/spec-main/fixtures/apps/xwindow-icon/package.json b/spec-main/fixtures/apps/xwindow-icon/package.json
index 595e59b0f0f46..9e9503d422d03 100644
--- a/spec-main/fixtures/apps/xwindow-icon/package.json
+++ b/spec-main/fixtures/apps/xwindow-icon/package.json
@@ -1,4 +1,4 @@
 {
-    "name": "electron-xwindow-icon",
+    "name": "electron-test-xwindow-icon",
     "main": "main.js"
-  }
\ No newline at end of file
+  }
diff --git a/spec-main/fixtures/auto-update/check-with-headers/package.json b/spec-main/fixtures/auto-update/check-with-headers/package.json
index 05b06e42b92f0..b5362baed5a4c 100644
--- a/spec-main/fixtures/auto-update/check-with-headers/package.json
+++ b/spec-main/fixtures/auto-update/check-with-headers/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-test-initial-app",
+  "name": "electron-test-check-with-headers",
   "version": "1.0.0",
   "main": "./index.js"
-}
\ No newline at end of file
+}
diff --git a/spec-main/fixtures/auto-update/check/package.json b/spec-main/fixtures/auto-update/check/package.json
index 05b06e42b92f0..d127bfd349293 100644
--- a/spec-main/fixtures/auto-update/check/package.json
+++ b/spec-main/fixtures/auto-update/check/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-test-initial-app",
+  "name": "electron-test-check",
   "version": "1.0.0",
   "main": "./index.js"
-}
\ No newline at end of file
+}
diff --git a/spec-main/fixtures/auto-update/update-json/package.json b/spec-main/fixtures/auto-update/update-json/package.json
index 5edc5dc51ce71..ef434f0b40912 100644
--- a/spec-main/fixtures/auto-update/update-json/package.json
+++ b/spec-main/fixtures/auto-update/update-json/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "initial-app",
+  "name": "electron-test-update-json",
   "version": "1.0.0",
   "main": "./index.js"
-}
\ No newline at end of file
+}
diff --git a/spec-main/fixtures/auto-update/update/package.json b/spec-main/fixtures/auto-update/update/package.json
index 5edc5dc51ce71..c9bb15fe643a5 100644
--- a/spec-main/fixtures/auto-update/update/package.json
+++ b/spec-main/fixtures/auto-update/update/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "initial-app",
+  "name": "electron-test-update",
   "version": "1.0.0",
   "main": "./index.js"
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/api/cookie-app/package.json b/spec/fixtures/api/cookie-app/package.json
index bd21c272f5e2b..6b2951e75ac1b 100644
--- a/spec/fixtures/api/cookie-app/package.json
+++ b/spec/fixtures/api/cookie-app/package.json
@@ -1,4 +1,4 @@
 {
-  "name": "electron-cookie-app",
+  "name": "electron-test-cookie-app",
   "main": "main.js"
 }
diff --git a/spec/fixtures/api/electron-module-app/.gitignore b/spec/fixtures/api/electron-module-app/.gitignore
deleted file mode 100644
index 736e8ae58ad87..0000000000000
--- a/spec/fixtures/api/electron-module-app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!node_modules
\ No newline at end of file
diff --git a/spec/fixtures/api/electron-module-app/index.html b/spec/fixtures/api/electron-module-app/index.html
deleted file mode 100644
index 02bfee958747c..0000000000000
--- a/spec/fixtures/api/electron-module-app/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title></title>
-    <script>
-      require('foo').bar()
-      require('electron').ipcRenderer.send('answer')
-    </script>
-  </head>
-  <body>
-
-  </body>
-</html>
diff --git a/spec/fixtures/api/electron-module-app/node_modules/electron/index.js b/spec/fixtures/api/electron-module-app/node_modules/electron/index.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/spec/fixtures/api/electron-module-app/node_modules/electron/package.json b/spec/fixtures/api/electron-module-app/node_modules/electron/package.json
deleted file mode 100644
index 07e3804ebb16e..0000000000000
--- a/spec/fixtures/api/electron-module-app/node_modules/electron/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "electron",
-  "main": "index.js"
-}
diff --git a/spec/fixtures/api/electron-module-app/node_modules/foo/index.js b/spec/fixtures/api/electron-module-app/node_modules/foo/index.js
deleted file mode 100644
index 41f3ba446f69d..0000000000000
--- a/spec/fixtures/api/electron-module-app/node_modules/foo/index.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.bar = function () {};
diff --git a/spec/fixtures/api/electron-module-app/node_modules/foo/package.json b/spec/fixtures/api/electron-module-app/node_modules/foo/package.json
deleted file mode 100644
index 596ac286ecadc..0000000000000
--- a/spec/fixtures/api/electron-module-app/node_modules/foo/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "foo",
-  "main": "index.js"
-}
diff --git a/spec/fixtures/api/mixed-sandbox-app/package.json b/spec/fixtures/api/mixed-sandbox-app/package.json
index c5b70811e60c5..e7c1a4105eedc 100644
--- a/spec/fixtures/api/mixed-sandbox-app/package.json
+++ b/spec/fixtures/api/mixed-sandbox-app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-app-mixed-sandbox",
+  "name": "electron-test-mixed-sandbox",
   "main": "main.js"
 }
 
diff --git a/spec/fixtures/api/quit-app/package.json b/spec/fixtures/api/quit-app/package.json
index fbdee7f90f955..5ca705eee7141 100644
--- a/spec/fixtures/api/quit-app/package.json
+++ b/spec/fixtures/api/quit-app/package.json
@@ -1,4 +1,4 @@
 {
-  "name": "electron-quit-app",
+  "name": "electron-test-quit-app",
   "main": "main.js"
 }
diff --git a/spec/fixtures/api/relaunch/package.json b/spec/fixtures/api/relaunch/package.json
index dbaabc84896d2..93edb1ae8aeb5 100644
--- a/spec/fixtures/api/relaunch/package.json
+++ b/spec/fixtures/api/relaunch/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-app-relaunch",
+  "name": "electron-test-relaunch",
   "main": "main.js"
 }
 
diff --git a/spec/fixtures/api/singleton-data/package.json b/spec/fixtures/api/singleton-data/package.json
index 3c20945331c14..a1498100b0fea 100644
--- a/spec/fixtures/api/singleton-data/package.json
+++ b/spec/fixtures/api/singleton-data/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-app-singleton-data",
+  "name": "electron-test-singleton-data",
   "main": "main.js"
 }
 
diff --git a/spec/fixtures/api/singleton/package.json b/spec/fixtures/api/singleton/package.json
index ebf7c8f4892e2..42299dda77359 100644
--- a/spec/fixtures/api/singleton/package.json
+++ b/spec/fixtures/api/singleton/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "electron-app-singleton",
+  "name": "electron-test-singleton",
   "main": "main.js"
 }
 

From b711860d21da111270c3c59945a037d6d04eec83 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 14:08:58 -0400
Subject: [PATCH 207/811] chore: bump chromium to 102.0.4971.0 (main) (#33454)

* chore: bump chromium in DEPS to 102.0.4965.0

* chore: 3-way merge of chromium/printing.patch

* chore: update patch shear in chromium/picture-in-picture.patch

* chore: update patches

* 3101519: Window Placement: Prototype fullscreen companion window support

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3101519

build: add popup_preventer.cc, .h to our library. It's needed because
FullscreenController, we were already using, started aggregating a
PopupPreventer in 3101519.

* chore: bump chromium in DEPS to 102.0.4967.0

* Revert "3101519: Window Placement: Prototype fullscreen companion window support"

This reverts commit fc215cb99c464e939882ed3f5cf8e9874a8e3311.

Adding popup_preventer might not be the right solution; there are
cascading dependencies.

* 3551449: Add service-based usage for system print settings

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3551449

chore: fix code shear in patches/chromium/printing.patch

* chore: update patches

* chore: bump chromium in DEPS to 102.0.4969.0

* chore: update patches

* chore: bump chromium in DEPS to 102.0.4971.0

* chore: update fix_patch_out_permissions_checks_in_exclusive_access.patch

Refs https://chromium-review.googlesource.com/c/chromium/src/+/3101519

PopupunderPreventer is not useful in //electron since the window
attributes are controlled by the user via setWindowOpenHandler.

* chore: update patches

* Add FirstPartySetsHandler as a interface class in content API.

https://chromium-review.googlesource.com/c/chromium/src/+/3503410

* Create a new MediaStreamRequestType for GetOpenDevice

https://chromium-review.googlesource.com/c/chromium/src/+/3541939

* Support site isolation for <webview> tags in WebViewRendererState.

https://chromium-review.googlesource.com/c/chromium/src/+/3537735

* ci: update xcode version

Refs https://chromium-review.googlesource.com/c/chromium/src/+/3544199
https://developer.apple.com/documentation/screencapturekit/capturing_screen_content_in_macos

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 .circleci/build_config.yml                    |  22 ++--
 DEPS                                          |   2 +-
 .../add_didinstallconditionalfeatures.patch   |  10 +-
 ..._scheduler_throttling_per_renderview.patch |  10 +-
 ..._secondary_label_via_simplemenumodel.patch |   2 +-
 patches/chromium/blink_local_frame.patch      |   6 +-
 .../build_add_electron_tracing_category.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  22 ++--
 patches/chromium/can_create_window.patch      |  30 ++---
 ..._v8_initialization_isolate_callbacks.patch |   2 +-
 ...screationoverridden_with_full_params.patch |  12 +-
 ...esources_not_chrome_for_spellchecker.patch |   4 +-
 patches/chromium/dcheck.patch                 |   4 +-
 .../disable_color_correct_rendering.patch     |   6 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   2 +-
 .../extend_apply_webpreferences.patch         |   2 +-
 ...screen_rendering_with_viz_compositor.patch |  10 +-
 ...x_crash_when_saving_edited_pdf_files.patch |   6 +-
 ...rmissions_checks_in_exclusive_access.patch |  82 +++++++++++-
 ..._properly_honor_printing_page_ranges.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   2 +-
 .../chromium/notification_provenance.patch    |   2 +-
 patches/chromium/picture-in-picture.patch     |  36 +++---
 patches/chromium/printing.patch               | 120 ++++++++++--------
 ...r_changes_to_the_webcontentsobserver.patch |   4 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 .../support_mixed_sandbox_with_zygote.patch   |   2 +-
 patches/chromium/web_contents.patch           |   6 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |   8 +-
 ...feat_add_hook_to_notify_script_ready.patch |   4 +-
 patches/v8/build_gn.patch                     |   6 +-
 ...export_private_v8_symbols_on_windows.patch |   2 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 shell/browser/api/electron_api_web_request.cc |   4 +-
 shell/browser/electron_browser_client.cc      |   6 +-
 .../media/media_stream_devices_controller.cc  |   7 +
 .../net/proxying_url_loader_factory.cc        |  11 +-
 .../browser/net/proxying_url_loader_factory.h |   4 -
 shell/browser/net/proxying_websocket.cc       |   1 -
 .../net/system_network_context_manager.cc     |   4 -
 46 files changed, 289 insertions(+), 216 deletions(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 0424b3e2d8290..9d8c587022e1c 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -59,7 +59,7 @@ executors:
         description: "xcode version"
         default: "12.4.0"
         type: enum
-        enum: ["12.4.0", "13.2.1"]
+        enum: ["12.4.0", "13.3.0"]
 
     macos:
       xcode: << parameters.xcode >>
@@ -1923,7 +1923,7 @@ jobs:
   osx-testing-x64:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1940,7 +1940,7 @@ jobs:
   osx-testing-x64-gn-check:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
@@ -1949,7 +1949,7 @@ jobs:
   osx-publish-x64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1970,7 +1970,7 @@ jobs:
   osx-publish-arm64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1992,7 +1992,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2011,7 +2011,7 @@ jobs:
   mas-testing-x64:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -2029,7 +2029,7 @@ jobs:
   mas-testing-x64-gn-check:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-machine-mac
       <<: *env-mas
@@ -2039,7 +2039,7 @@ jobs:
   mas-publish-x64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2060,7 +2060,7 @@ jobs:
   mas-publish-arm64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2082,7 +2082,7 @@ jobs:
   mas-testing-arm64:
     executor:
       name: macos
-      xcode: "13.2.1"
+      xcode: "13.3.0"
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
diff --git a/DEPS b/DEPS
index 00113fcca6410..087a1ca200ee2 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.4962.3',
+    '102.0.4971.0',
   'node_version':
     'v16.14.2',
   'nan_version':
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 18a816de672d4..b5fd394b36e15 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index 19c936be477f944d62e85cec81359a71bbcfa45d..b02bb1cd67488f996b6142058c52c34dfe523fff 100644
+index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749ef7409d77 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -131,6 +131,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index 19c936be477f944d62e85cec81359a71bbcfa45d..b02bb1cd67488f996b6142058c52c34d
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index c9296960c76e34646bf7cb3195b80c0cbc483b58..bc8bdba3facba81c572d43b85881ec02ad7d2f00 100644
+index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4423,6 +4423,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4444,6 +4444,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -92,7 +92,7 @@ index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index e06c96c068139e829af7bd99ebb111507b2bddb0..a98bc22fc5c96ad1fd2071ea1c9e1aab2fb4d5ff 100644
+index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8774b9dc7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 04504a209f10a..e6dcf47aac97b 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 84044606fb0644b2b6053c72a9750bae3729f666..995c5dfc49a392669f73d85a92fbdb54cf0e11ca 100644
+index 8ee02135efb64c57d0779faa96640aa8e7775b58..66007d67da1230740eb00e31b220ddb02fbf37d9 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -649,6 +649,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -650,6 +650,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -85,10 +85,10 @@ index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index daab024ee0e2010e177eabeb7e0fb964c631dd17..06d8ca44fb1dc3748d81b5c5a407dfdf7183f845 100644
+index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504ccd6796979 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3666,6 +3666,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3669,6 +3669,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index daab024ee0e2010e177eabeb7e0fb964c631dd17..06d8ca44fb1dc3748d81b5c5a407dfdf
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3677,7 +3684,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3680,7 +3687,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
index 8ce5997c5cb9f..1b4e797564bb2 100644
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
 
 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index 746dffb1defec9d776f681d41325a65b02cbdd0f..05a7f20f10e3ff514aa3b3b5386980ddfcc586eb 100644
+index a787411f89e2d95e2fa636a7cc6723bdd227e563..f8c67d10957c26fbcd21fa1fe05507efd78f1c29 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
 @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 6ed95034fa73c..8acc606a3dbef 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -49,10 +49,10 @@ index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 1efaff0e92061bc97dcbf3105f6b6c1dcefff17c..ec2e19c3ccf60f01b73259e1e6eff405ebf15f07 100644
+index ae445a52314d8581909f05a06442954f39b6b6d0..857715ca74b0f3a50953095d15237292e2a05510 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index 1efaff0e92061bc97dcbf3105f6b6c1dcefff17c..ec2e19c3ccf60f01b73259e1e6eff405
    if (!Client())
      return false;
  
-@@ -594,6 +590,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index f096f681035eb..6c074efcaf841 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 083a46a96bf969a075ef05cfe4837c4cce784191..22f18293e65035cc3b9af322520b102eb6b24a76 100644
+index 0736e7021761e6019e1b52448d21ffdb73b964fc..571b553e9aaa98739851d0ff312eefe9f6a75596 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -80,6 +80,7 @@
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index d6d7b7c762219..435d66c466712 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0fea2b6f0e 100644
+index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc6e0c2f79 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0f
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba4645b0a3606 100644
+index a99ce094addf69f21f3c42690defc445eff8fa05..797c8add1af6df1142179388ef1b7a5bf977d527 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4508,7 +4508,7 @@ static_library("browser") {
+@@ -4518,7 +4518,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba464
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df916a1af3 100644
+index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426aab23bef0 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5907,7 +5907,6 @@ test("unit_tests") {
+@@ -5943,7 +5943,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5930,6 +5929,10 @@ test("unit_tests") {
+@@ -5966,6 +5965,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6619,7 +6622,6 @@ test("unit_tests") {
+@@ -6656,7 +6659,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,10 +76,10 @@ index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6664,6 +6666,11 @@ test("unit_tests") {
-       "//ui/native_theme:test_support",
-       "//ui/webui/resources/js/browser_command:mojo_bindings",
-     ]
+@@ -6704,6 +6706,11 @@ test("unit_tests") {
+     if (is_chromeos) {
+       deps += [ "//ui/chromeos" ]
+     }
 +
 +    if (!is_electron_build) {
 +      deps += [ "//chrome:packed_resources_integrity_hash" ]
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 21f6a27357742..5ccade1f90045 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f3bc1fd3e 100644
+index be7895586d64b0f8e7f122561d86f49479400a2b..5ad53ce87d8757b18e5ecedbd7ec9aec54bea165 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6880,6 +6880,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6908,6 +6908,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e83f4bd52 100644
+index 88266830511440e51e47166c66f80e9956bcef5a..3fa51ecee644055db44bd4dd54c27ec224ff46d6 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3931,6 +3931,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3937,6 +3937,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3975,12 +3983,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3981,12 +3989,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,7 +53,7 @@ index 2afbf96abef912bf483d08f6c011aa4a2e515e25..92dcf2308842ce8922426b0cafdd5a3e
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index afc0dc34e4a1f6c06e96d7fa09922e8aaf4bab28..f3d13fc719324e064f70077deb5d95cb9e467820 100644
+index ec594f27e94bf0b95967c4d816c9b1e159e4a08d..de908becd59392db284c60f61d97f8b2210aa888 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -550,6 +550,10 @@ struct CreateNewWindowParams {
@@ -68,10 +68,10 @@ index afc0dc34e4a1f6c06e96d7fa09922e8aaf4bab28..f3d13fc719324e064f70077deb5d95cb
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index d832c0c37554dafad0c44c78f6dc9233015b152f..654abc174a237a90225ad7be7f1180e929b9829b 100644
+index fbf6817479cace0ca06065eef3aa70aae2a0ebe1..cef6a18df7cfb8528ea07e808c3e539726ea815d 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -576,6 +576,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -577,6 +577,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index d832c0c37554dafad0c44c78f6dc9233015b152f..654abc174a237a90225ad7be7f1180e9
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index e142bc65c2a0fe06a1cf59621c424170dc2d641c..8573ea54135e363f83bd786db3483d1c539e4bb1 100644
+index a0f2f002b51c6061fe509d13b2286faaec721936..1b7e71e12d01929b8bfacf8c7c8950922bdd3d59 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -169,6 +169,7 @@ class NetworkService;
+@@ -170,6 +170,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index e142bc65c2a0fe06a1cf59621c424170dc2d641c..8573ea54135e363f83bd786db3483d1c
  }  // namespace network
  
  namespace sandbox {
-@@ -958,6 +959,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -959,6 +960,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -124,7 +124,7 @@ index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 9c70cc90402dd1541b2b58b3be2fa7ff215f8f57..a998c64237a7ffd6583a33cd54fe3229196300a6 100644
+index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd482d8eb3f3 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -135,7 +135,7 @@ index 9c70cc90402dd1541b2b58b3be2fa7ff215f8f57..a998c64237a7ffd6583a33cd54fe3229
  #include "content/public/browser/eye_dropper.h"
  #include "content/public/browser/invalidate_type.h"
  #include "content/public/browser/media_stream_request.h"
-@@ -339,6 +340,13 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -338,6 +339,13 @@ class CONTENT_EXPORT WebContentsDelegate {
        const StoragePartitionConfig& partition_config,
        SessionStorageNamespace* session_storage_namespace);
  
@@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index c18012a217bfc492ac2cdef5776bb23099df57ae..b96bd45cfee98c8177b3ac5979273d1f9ba47388 100644
+index dcacde03e5889d7347aadb2cfde10da767c9f9ca..3ccb2700c97d1297b8482e1b7b324cfa4002e21e 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2069,6 +2069,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2068,6 +2068,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index 00838845586bb..574913f05552a 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,7 +9,7 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 5040ec838c64ffa8aa58ba43f51df649443b2f81..7a7a87d00fa392b7bd07267d9059664d5d472252 100644
+index 66dddc124ca48024cb9539529b787f6e9aa1fd5c..fd6dc712df185724ae88a40e643a26126e54d712 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 04ad43d0a65ff..2b80fd29fa5ac 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index ace0c593debb46c9238e5708634fc6088a1bc715..31d5c0f00ae43706f16fc8615761e96eab31f1f3 100644
+index 70ee9049e3cb73f55bed81c3e08037df2f4c9e07..8d230826aaf867d9046a6b9ac93a60f4750e52be 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1770,12 +1770,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1786,12 +1786,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index d69e028b34ab4407abcdea3ece93db39926c587e..a82b571fdabe90771bc8f8ed4ae40df3085592c7 100644
+index cc6afdef869470136c2cec392911742a289f6339..2033877b86eddbc9baac6a603587e631021f6819 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3879,8 +3879,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3885,8 +3885,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -274,10 +274,10 @@ index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index a998c64237a7ffd6583a33cd54fe3229196300a6..4f57227a9033f905be13bc5166d0324d495a6531 100644
+index eeafde1fa6067804665954525eafdd482d8eb3f3..b17f371aa489a5b61c28fbcd316b19815f072df9 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
-@@ -318,8 +318,7 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
        SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
index 5c092bf9ad23d..99d292f285fb0 100644
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources.  We need to load these from
 Electrons grit header instead of Chromes
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5f43b35aab6c2f277f0d021b378bee55f97572aa..5bbb64d83e2024feeb7a2eae45f6b8e937fc927c 100644
+index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..a99ce094addf69f21f3c42690defc445eff8fa05 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7126,6 +7126,7 @@ static_library("browser") {
+@@ -7135,6 +7135,7 @@ static_library("browser") {
      deps += [
        "//components/spellcheck/browser",
        "//components/spellcheck/common",
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 0af9aeccfd053..4832704e4e759 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index 7a6503d4a4ad33290d97078336c18d81839a8675..0f162b8e681ebb67c5f3b23a40fe3b6ec97cec49 100644
+index a4d74f8e59673d4734ef338235c027bd1c77e92e..6969d1c69ee215055bd49a2bf830416c9e8b62c8 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -506,8 +506,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
+@@ -515,8 +515,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                 ->GetPageScaleConstraintsSet()
                                 .FinalConstraints()
                                 .initial_scale;
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 24227afe87461..4d0d3ef337593 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -80,7 +80,7 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 553c3be2562e836e2ce6d6f44997cebf3cba7466..fbe38d97a8d1861ecfb5ccb583d050a28b9ab108 100644
+index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc9c51c6d3 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -86,6 +86,9 @@
@@ -228,7 +228,7 @@ index 553c3be2562e836e2ce6d6f44997cebf3cba7466..fbe38d97a8d1861ecfb5ccb583d050a2
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 90c7ace352fe909e3f521403c2a7fbf030ccc31e..f011183e21921f38ce5062079e8430a030159bc1 100644
+index 8b32bf5455183ff7bb6295d7922e76a6593b8ee0..041ffe9d26ef3401179eb57917f5585497500689 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -240,7 +240,7 @@ index 90c7ace352fe909e3f521403c2a7fbf030ccc31e..f011183e21921f38ce5062079e8430a0
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index d8939c1936830b101d6bb4079cd99e6015b481c4..366f801cbe84a28ef462037a26da47c9f65057b4 100644
+index ca056c66af681548ba01bd07db7dadc5ce2a5280..f5025422ebdb9fe35ee5e4e1ed647bc05028d4a8 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -197,6 +197,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index d8cdef4d187c5..2b2569457cc46 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index bc8bdba3facba81c572d43b85881ec02ad7d2f00..3b12ab113f7c159beb74a09f95335977b4ee2b4f 100644
+index 1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e..e0d7367135abb08f9f303cc528a55d8ba026fa56 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
 @@ -2367,7 +2367,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 1a14cd39962aa..854e5de029ce8 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 06d8ca44fb1dc3748d81b5c5a407dfdf7183f845..85e1772fbcbb190e32dd30996541cc2e9d19d057 100644
+index 13a16ae577130d7520b47eb046b504ccd6796979..6987c81cd9f6b774ec15605c0ea64ca34ba84d22 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -159,6 +159,7 @@
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index f8f64ec23fbe9..4c6b697e3b604 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -573,10 +573,10 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81dfc5bb646e 100644
+index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec03b43a28a 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
-@@ -81,6 +81,7 @@ class DisplayPrivate;
+@@ -82,6 +82,7 @@ class DisplayPrivate;
  class ExternalBeginFrameController;
  }  // namespace mojom
  class ContextProvider;
@@ -584,7 +584,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df
  class HostFrameSinkManager;
  class LocalSurfaceId;
  class RasterContextProvider;
-@@ -137,6 +138,16 @@ class COMPOSITOR_EXPORT ContextFactory {
+@@ -138,6 +139,16 @@ class COMPOSITOR_EXPORT ContextFactory {
    virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0;
  };
  
@@ -601,7 +601,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df
  // Compositor object to take care of GPU painting.
  // A Browser compositor object is responsible for generating the final
  // displayable form of pixels comprising a single widget's contents. It draws an
-@@ -178,6 +189,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -179,6 +190,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
    // Schedules a redraw of the layer tree associated with this compositor.
    void ScheduleDraw();
  
@@ -611,7 +611,7 @@ index b30b9460889b9bb3862f4e28b5f1292a118f2a09..d8f1f921d3e6e74c99d6a22c902f81df
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -466,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -469,6 +483,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index a17c7119f3e7b..832bba5787c3e 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
-index 2e370bf7fd61d75677cfc84798ba543a48f3bc19..fc8f471745c8daf30679df1ffb994febe62cfbea 100644
+index 22f7a86817fe4a2dc39913db349e81d93eef4874..c9509d84e25fd88d6ef13933099d582561fe5660 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.ts
 +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
-@@ -855,26 +855,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -858,26 +858,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -48,7 +48,7 @@ index 2e370bf7fd61d75677cfc84798ba543a48f3bc19..fc8f471745c8daf30679df1ffb994feb
    }
  
    /**
-@@ -982,30 +968,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -985,30 +971,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        fileName = fileName + '.pdf';
      }
  
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
index dfbc1343d6826..4ac4782be9141 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
@@ -14,10 +14,67 @@ but it's not strictly necessary for this API to work to spec.
 Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f99dea3f1 100644
+index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d54a5b39da 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-@@ -384,13 +384,9 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -16,12 +16,16 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/app_mode/app_mode_utils.h"
+ #include "chrome/browser/profiles/profile.h"
++#if 0
+ #include "chrome/browser/ui/blocked_content/popunder_preventer.h"
++#endif
+ #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
+ #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
+ #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
++#if 0
+ #include "chrome/browser/ui/status_bubble.h"
+ #include "chrome/browser/ui/tabs/tab_strip_model.h"
++#endif
+ #include "chrome/common/chrome_switches.h"
+ #include "content/public/browser/navigation_details.h"
+ #include "content/public/browser/navigation_entry.h"
+@@ -161,6 +165,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+     return;
+   }
+ 
++#if 0
+   if (base::FeatureList::IsEnabled(
+           blink::features::kWindowPlacementFullscreenCompanionWindow)) {
+     if (!popunder_preventer_)
+@@ -168,6 +173,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+     else
+       popunder_preventer_->WillActivateWebContents(web_contents);
+   }
++#endif
+ 
+   SetTabWithExclusiveAccess(web_contents);
+   requesting_origin_ =
+@@ -203,7 +209,9 @@ void FullscreenController::EnterFullscreenModeForTab(
+ }
+ 
+ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
++#if 0
+   popunder_preventer_.reset();
++#endif
+ 
+   if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
+     // During tab capture of fullscreen-within-tab views, the browser window
+@@ -248,11 +256,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
+ void FullscreenController::FullscreenTabOpeningPopup(
+     content::WebContents* opener,
+     content::WebContents* popup) {
++#if 0
+   DCHECK(base::FeatureList::IsEnabled(
+       blink::features::kWindowPlacementFullscreenCompanionWindow));
+   DCHECK_EQ(exclusive_access_tab(), opener);
+   DCHECK(popunder_preventer_);
+   popunder_preventer_->AddPotentialPopunder(popup);
++#endif
+ }
+ 
+ void FullscreenController::OnTabDeactivated(
+@@ -402,13 +412,9 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -33,7 +90,7 @@ index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f
  #endif
  
    toggled_into_fullscreen_ = true;
-@@ -403,6 +399,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -421,6 +427,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        url = extension_caused_fullscreen_;
    }
  
@@ -41,7 +98,7 @@ index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f
    if (display_id != display::kInvalidDisplayId) {
      // Check, but do not prompt, for permission to request a specific screen.
      // Sites generally need permission to get the display id in the first place.
-@@ -415,6 +412,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -434,6 +441,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        display_id = display::kInvalidDisplayId;
      }
    }
@@ -49,3 +106,20 @@ index 8d6f8aedab475c1a553949bfcba3753ebed87778..e379e4995b0812be5970cf9741a00e4f
  
    if (option == BROWSER)
      base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
+diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+index 7bd40f52ef5f6b04a7ea114ec4d18c8a98ec6d42..fb04fed5cc1e2e255c9e67c180fababe1fbb3fe0 100644
+--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
++++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+@@ -222,10 +222,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
+   // Used in testing to set the state to tab fullscreen.
+   bool is_tab_fullscreen_for_testing_ = false;
+ 
++#if 0
+   // Tracks related popups that lost activation or were shown without activation
+   // during content fullscreen sessions. This also activates the popups when
+   // fullscreen exits, to prevent sites from creating persisent popunders.
+   std::unique_ptr<PopunderPreventer> popunder_preventer_;
++#endif
+ 
+   base::ObserverList<FullscreenObserver> observer_list_;
+ 
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index fb162f70ab70e..6afb86bfb4a19 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -62,10 +62,10 @@ index 9e351c7e80a135adf0ebe011763f5164e51981bb..b9fcb4d2a8c7a22ebc7cd8434636454e
    PMPrintSettings print_settings =
        static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
 diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
-index ba604d33cc0601276320f3f81f20e98cb2811f74..1da667c66b75ab44727c5029c02d44379f924007 100644
+index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5bc88b0c2d 100644
 --- a/printing/printing_context_system_dialog_win.cc
 +++ b/printing/printing_context_system_dialog_win.cc
-@@ -53,14 +53,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
+@@ -75,14 +75,28 @@ void PrintingContextSystemDialogWin::AskUserForSettings(
    PRINTPAGERANGE ranges[32];
    dialog_options.nStartPage = START_PAGE_GENERAL;
    if (max_pages) {
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 80c56304eadfc..9ed4dada269e3 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00aaf5f972d 100644
+index 9208dc75b4e3d969fbb0bb13de64d2b129de9509..b5779d43456c5e356497f2cb671fcb9b3492b47f 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3167,6 +3167,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3170,6 +3170,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 6ecce70efe2d63259f8de512de276a49da1ee9c0..3068a27d60c109156d91dee68715d00a
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 8573ea54135e363f83bd786db3483d1c539e4bb1..11036e52affafe46bab3146184b8d89696d4163c 100644
+index 1b7e71e12d01929b8bfacf8c7c8950922bdd3d59..ca5a03653611843a8eac90e1be86ca4aa40ecce2 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -276,6 +276,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -277,6 +277,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index ea0050fc48222..c8d8f95b97aec 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 22896db086972ff3865df9cbb4d904f1e00b7321..8e23293f8cd7f0a4203b3d5fdae24aa5e26fc2ec 100644
+index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..2da5d367dacd557bcca79412ed77fd74d37241f4 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -955,6 +955,11 @@
+@@ -950,6 +950,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 13e3eec7f04d0..84f03a08c570c 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 8cf820d7d1f5d9e85156a18e9ec573dbeb63d41a..a7d6ea676aaba90220761fa7ecc4569012806581 100755
+index 90f738057d3040b5421d51592097c7c30106a94f..3cb2f0880bb36f19fc9b55f2351f891088e8c304 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index d8a9cd23bbe73..bfb6ba3121608 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 7074141f95253587ae3ca156118ac6b10dd60e26..0476d00de005060c991cd6fa9ccd323ef5d56ea3 100644
+index ce5f2904c283643558375a84453073f7ea8aba3e..a17bf60c79fdd2511a46796b80879ed7926c706d 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -248,11 +248,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index ff03cd3658ee0..f9c04cc3c1735 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -131,7 +131,7 @@ index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df6
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index cc5f7c8d616ec9a433da428f180483da60736a9d..fb25a7c19f20ca690963c5a15bd09224687b5f57 100644
+index a188b1282e7ceca3fe24cb2d82c644bf0c21bc6f..f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -2083,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index ff258785cd530..f5b2e1333c446 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -22,7 +22,7 @@ index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/base/models/image_model.h"
 diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-index 7d0e39968bf34cdc99549cb48f6bf0a11c182565..f21c1672abf34dc9d19cd39c5d09083a60ef6978 100644
+index d566dbf99ea1164c6a8407026a9839218a6ba1fb..239cd53d70c547c79214988a82efdc8c472d553c 100644
 --- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 +++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
 @@ -5,7 +5,7 @@
@@ -35,7 +35,7 @@ index 7d0e39968bf34cdc99549cb48f6bf0a11c182565..f21c1672abf34dc9d19cd39c5d09083a
  #include "ui/base/cursor/cursor.h"
  #include "ui/base/l10n/l10n_util.h"
 diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index d3400d7b02edc9cffba4cb53ec601b6e4cfea3b2..8e620ad6172a650ea96f80c0b44035932471d88b 100644
+index a3d9c0f03c8ade2553bad5721d4e15e6fd658074..b3b043cbf9144013bf7903121575b31b348ea87e 100644
 --- a/chrome/browser/ui/views/overlay/close_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/close_image_button.cc
 @@ -6,7 +6,7 @@
@@ -150,10 +150,10 @@ index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca875113
    web_view->SetWebContents(pip_contents);
  
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.h b/chrome/browser/ui/views/overlay/document_overlay_window_views.h
-index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd616e5d6aca 100644
+index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866a42237e6 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.h
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.h
-@@ -55,7 +55,6 @@ class DocumentOverlayWindowViews : public OverlayWindowViews,
+@@ -56,7 +56,6 @@ class DocumentOverlayWindowViews : public OverlayWindowViews,
    bool IsVisible() const override;
    void OnNativeWidgetMove() override;
    void OnNativeWidgetDestroyed() override;
@@ -162,13 +162,13 @@ index 86d385842501d28b5eb42f841822294eb597e6ed..43c19dfa6ec6b48f8694636cc184dd61
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
 diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
-index 26f8f5ffa444d874b229b5e8debf087e4469dfd1..10149e812a43e3d5c92701e9b2ae8d68ed8395c7 100644
+index 75bfe0f7a4d759f677cad5c365fa7f98121d54de..cb251381f1c77ad01d4906132f3d68865aaace10 100644
 --- a/chrome/browser/ui/views/overlay/hang_up_button.cc
 +++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/hang_up_button.h"
+@@ -6,7 +6,7 @@
  
  #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
@@ -205,13 +205,13 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index bcd3b2e1038786b660a4b91fbc20d9d8b4afffb4..a953c9d0ee0b49d6cc096e3eb236296b57cbc6c0 100644
+index cb1621a9deefcec601d7537e2cc2fbd24e5f7f64..2d74ab12e1eaf77a6f9dde13e894172d6835e061 100644
 --- a/chrome/browser/ui/views/overlay/playback_image_button.cc
 +++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
-@@ -6,7 +6,7 @@
- 
+@@ -7,7 +7,7 @@
  #include "chrome/app/vector_icons/vector_icons.h"
  #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
@@ -244,26 +244,26 @@ index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c96
  #include "ui/base/metadata/metadata_impl_macros.h"
  #include "ui/gfx/color_palette.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-index 46ec4441ddb227325b319359f9d33a80aa856d85..57957d72310c0a232c78489fba5a07cdf475dc53 100644
+index 20b82ff4dcf7fef3315b2b47bb480446509c6541..244a50e57b6c12680405c92f0ecbdbdb8bcfcb4f 100644
 --- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
+@@ -6,7 +6,7 @@
  
  #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-index 59b9a5442185bfb9efd8ed571ec63d56e3bc3326..34d58bf54019e0b8001c29cb301861d045c60214 100644
+index 1a1edb6321490fdbf5cd347cb3d2cb9a6a5b1080..1e959cf1c8fe356ab4427e4bf4f8da1028f4575f 100644
 --- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
 +++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
+@@ -6,7 +6,7 @@
  
  #include "chrome/browser/ui/color/chrome_color_id.h"
+ #include "chrome/browser/ui/views/overlay/constants.h"
 -#include "chrome/grit/generated_resources.h"
 +#include "electron/grit/electron_resources.h"
  #include "components/vector_icons/vector_icons.h"
@@ -283,7 +283,7 @@ index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aa
  #include "ui/base/l10n/l10n_util.h"
  #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index b2e281840f48592eb773c16042fb6b56a0fa132b..d5156bab0c81ca508733a8d3ba95f052ff6d83e6 100644
+index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a96dc31c4 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
@@ -319,7 +319,7 @@ index b2e281840f48592eb773c16042fb6b56a0fa132b..d5156bab0c81ca508733a8d3ba95f052
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-@@ -148,7 +150,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
+@@ -167,7 +169,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
    overlay_window->Init(std::move(params));
    overlay_window->OnRootViewReady();
  
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 6aae32dba1e9f..5b18830b6f0ed 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b2d05ae45 100644
+index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c0163fe3e77 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -88,7 +88,7 @@ index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -234,16 +234,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+@@ -229,16 +229,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -114,10 +114,10 @@ index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782bbc06564 100644
+index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b899e5972 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -226,7 +226,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -305,7 +305,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -127,7 +127,7 @@ index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521e01702ac 100644
+index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d284a4247 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -151,7 +151,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"
-@@ -86,6 +87,8 @@ using PrintSettingsCallback =
+@@ -88,6 +89,8 @@ using PrintSettingsCallback =
      base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
@@ -160,7 +160,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -94,6 +97,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -96,6 +99,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -168,7 +168,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -193,7 +197,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -179,7 +179,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO(
+@@ -246,6 +252,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -187,7 +187,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO(
+@@ -255,8 +262,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -198,7 +198,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -295,12 +303,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -213,7 +213,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -308,7 +318,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -225,8 +225,8 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -328,7 +341,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
-   // go in `ReleasePrintJob()`.
+@@ -334,7 +347,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+ #endif
  
    SetPrintingRFH(rfh);
 -  GetPrintRenderFrame(rfh)->PrintRequestedPages();
@@ -236,7 +236,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -471,7 +486,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -487,7 +502,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -245,8 +245,8 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
 +    bool canceled) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
-   if (!content::RenderProcessHost::FromID(process_id)) {
-@@ -479,16 +495,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+ #if BUILDFLAG(ENABLE_OOP_PRINTING)
+@@ -500,16 +516,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -270,22 +270,22 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -602,12 +621,13 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -625,11 +644,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 +#if 0 // Printing is always enabled.
++
    if (!printing_enabled_.GetValue()) {
      GetDefaultPrintSettingsReply(std::move(callback),
                                   mojom::PrintParams::New());
      return;
    }
--
 +#endif
-   content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
-   auto callback_wrapper =
-       base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
-@@ -624,18 +644,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+ #if BUILDFLAG(ENABLE_OOP_PRINTING)
+   if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
+       !service_manager_client_id_.has_value()) {
+@@ -656,18 +678,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -307,7 +307,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -645,6 +667,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -677,6 +701,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -315,7 +315,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -670,7 +693,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -702,14 +727,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -323,8 +323,16 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
 +    std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
      return;
    }
-   auto callback_wrapper = base::BindOnce(
-@@ -691,7 +714,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+ #if BUILDFLAG(ENABLE_OOP_PRINTING)
+   if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
+       !service_manager_client_id_.has_value()) {
+     // Renderer process has requested settings outside of the expected setup.
+-    std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
++    std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
+     return;
+   }
+ #endif
+@@ -732,7 +757,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -332,7 +340,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  #endif
  
    ReleasePrinterQuery();
-@@ -706,6 +728,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -747,6 +771,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -344,7 +352,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -716,10 +743,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -757,10 +786,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -357,7 +365,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -779,6 +808,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -820,6 +851,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -369,7 +377,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -840,7 +874,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -881,7 +917,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -381,9 +389,9 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    if (!weak_this)
      return false;
  
-@@ -915,6 +952,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
-   content::RenderFrameHost* rfh = printing_rfh_;
-   printing_rfh_ = nullptr;
+@@ -963,6 +1002,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+   UnregisterSystemPrintClient();
+ #endif
  
 +  if (!callback_.is_null()) {
 +    std::string cb_str = "";
@@ -395,7 +403,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
    if (!print_job_)
      return;
  
-@@ -964,7 +1008,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1012,7 +1058,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -405,7 +413,7 @@ index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521
  
    if (!cookie) {
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d0320000437dfb 100644
+index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61ddde6cd552 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
 @@ -37,6 +37,8 @@ namespace printing {
@@ -437,7 +445,7 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d03200
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -193,7 +199,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -207,7 +213,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -447,7 +455,7 @@ index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d03200
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -248,9 +255,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -262,9 +269,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -539,10 +547,10 @@ index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e53
  
  void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496afa99ed539 100644
+index 6cd585d597315940be144506b9bb819137a7981e..8ea9c38a46460edd237f003ddd7362240a02887e 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
-@@ -274,7 +274,7 @@ interface PrintPreviewUI {
+@@ -275,7 +275,7 @@ interface PrintPreviewUI {
  interface PrintRenderFrame {
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page, and then switch back the CSS to display media type.
@@ -551,7 +559,7 @@ index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496af
  
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page using the print preview document's frame/node, and then
-@@ -341,7 +341,7 @@ interface PrintManagerHost {
+@@ -342,7 +342,7 @@ interface PrintManagerHost {
    // Request the print settings from the user. This step is about showing
    // UI to the user to select the final print settings.
    [Sync]
@@ -561,7 +569,7 @@ index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496af
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d0801b43a8ea 100644
+index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd056957255b74f0a2 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -40,6 +40,7 @@
@@ -610,7 +618,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1387,6 +1390,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1389,6 +1392,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -618,8 +626,8 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
 +  print_preview_context_.InitWithFrame(frame);
    print_preview_context_.OnPrintPreview();
  
-   if (print_preview_context_.IsForArc()) {
-@@ -1924,7 +1929,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -1941,7 +1946,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -629,7 +637,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1939,7 +1945,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1956,7 +1962,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -640,7 +648,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1947,7 +1955,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1964,7 +1972,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -649,7 +657,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1966,8 +1974,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1983,8 +1991,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -666,7 +674,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2215,36 +2230,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2232,36 +2247,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -724,13 +732,13 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
 +    uint32_t* number_of_pages,
 +    const base::DictionaryValue& settings) {
    DCHECK(frame);
-   bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node);
+   bool fit_to_paper_size = !IsPrintingPdfFrame(frame, node);
 -  if (!InitPrintSettings(fit_to_paper_size)) {
 +  if (!InitPrintSettings(fit_to_paper_size, settings)) {
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2389,7 +2419,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2405,7 +2435,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -739,7 +747,7 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2634,18 +2664,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
+@@ -2656,18 +2686,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
@@ -760,10 +768,10 @@ index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d080
  
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b43325da73 100644
+index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d6cd2cdbf 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
-@@ -254,7 +254,7 @@ class PrintRenderFrameHelper
+@@ -256,7 +256,7 @@ class PrintRenderFrameHelper
        mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
  
    // printing::mojom::PrintRenderFrame:
@@ -772,7 +780,7 @@ index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b4
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
-@@ -321,7 +321,9 @@ class PrintRenderFrameHelper
+@@ -323,7 +323,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -783,7 +791,7 @@ index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b4
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -330,12 +332,14 @@ class PrintRenderFrameHelper
+@@ -332,12 +334,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index a4aa00e1ae186..e0d3249452e81 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -43,10 +43,10 @@ index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 92dcf2308842ce8922426b0cafdd5a3e83f4bd52..d69e028b34ab4407abcdea3ece93db39926c587e 100644
+index 3fa51ecee644055db44bd4dd54c27ec224ff46d6..cc6afdef869470136c2cec392911742a289f6339 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4494,6 +4494,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4500,6 +4500,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 536be6ee276a4..f37fd4c085d93 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 6a696e816a185f8492674fcaf1cbbf7e2faabf99..a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015 100644
+index f1e0552dedf377238e9cd9d24a5ebea77ed83717..1f86073736f849e797e029678bc212ce96ba0bd9 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1545,7 +1545,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1547,7 +1547,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 6a696e816a185f8492674fcaf1cbbf7e2faabf99..a6e0a53d4ebbd585114bc0cda2e2d1ca
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1574,6 +1574,12 @@ if (!is_android) {
+@@ -1576,6 +1576,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index b40543e80b56a..ea511b50b2598 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index fb25a7c19f20ca690963c5a15bd09224687b5f57..d8939c1936830b101d6bb4079cd99e6015b481c4 100644
+index f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6..ca056c66af681548ba01bd07db7dadc5ce2a5280 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1786,9 +1786,15 @@ bool RenderProcessHostImpl::Init() {
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 0eea1a2d4de6d..44905e57c8ee5 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index a82b571fdabe90771bc8f8ed4ae40df3085592c7..1942d3446225411bdce80628e219641b3089d4a3 100644
+index 2033877b86eddbc9baac6a603587e631021f6819..7f4679943fa1d7b2585552a811098d97cada3070 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3045,6 +3045,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3051,6 +3051,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index a82b571fdabe90771bc8f8ed4ae40df3085592c7..1942d3446225411bdce80628e219641b
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3055,6 +3062,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3061,6 +3068,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 45933f1ae2cd9..365473fa3413c 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -24,10 +24,10 @@ index 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d098
  
  ////////////////////////////////////////////////////////////////////////////////
 diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
-index 6455404fdccab1fffceef4b8d291c137d3a448c4..483b0b5b689da03f0d7e43576fa73275197f5a95 100644
+index dab3703cc4469802bae9e4d45c3e7d0f0857f577..ecd8af37c681ae5c97060af00bbeb8ebddb72b26 100644
 --- a/content/browser/web_contents/web_drag_dest_mac.mm
 +++ b/content/browser/web_contents/web_drag_dest_mac.mm
-@@ -385,9 +385,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
+@@ -388,9 +388,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
  }
  
  - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 4eb68495cc7ec..8bb0068ff0b9f 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index a969bbaaecb4b589808413d40299b68f3bc1fd3e..6e5d3ae228b98295bd95bad3cc58215a13c20106 100644
+index 5ad53ce87d8757b18e5ecedbd7ec9aec54bea165..37f181f16cd2520de1cbec678e02061b165fed62 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6267,6 +6267,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6293,6 +6293,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 0ba771e680e52..420a464c14cc5 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -55,10 +55,10 @@ index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index ced2c8e433d5b807bd4f1aa44c6af53e93261c23..53b1ebb708e2332e38090d1adba88dbe850bf02d 100644
+index b68c90f1f1dd23b8b938936a092b01ffa41f0f28..60aa2e562901d9ff7b915c105acaf49851c959ba 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -716,6 +716,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -714,6 +714,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -67,10 +67,10 @@ index ced2c8e433d5b807bd4f1aa44c6af53e93261c23..53b1ebb708e2332e38090d1adba88dbe
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index 2406a8b438de5f01f5354e08bcfc8810238b1bea..e7a60f6cae0fabeac6a5adec633ad5f45d43ef33 100644
+index 68c38d2045c7c23650bd56717081bb001a4e690e..e0e08d4bdf9521ed5c1940d31665d1b675119f0d 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -731,6 +731,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -732,6 +732,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
      nested_runner_->QuitNow();
    }
  
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 6608ad6735fa2..be38035e76cb7 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -65,10 +65,10 @@ index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 53b1ebb708e2332e38090d1adba88dbe850bf02d..8e86b79cf98c5e2429d0ec54b27eb950c6ce6303 100644
+index 60aa2e562901d9ff7b915c105acaf49851c959ba..bec02889875ef8f6e422d99c8a161898b36610c5 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -716,6 +716,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -714,6 +714,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 6cc87c66110b0..3a023b20e5aff 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f 100644
+index e4ea82d914cf99a9368c94da2cc35bd3214d8c23..c4de87b38433bed1a14ce5c3a482023de909ec47 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,7 +605,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5818,7 +5818,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5821,7 +5821,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9
  
      deps = [
        ":v8_libbase",
-@@ -5856,6 +5856,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5859,6 +5859,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 6fff7c78b7faf..e54954fdfc3a9 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 2262d19f0f9ced2c9e69862252d94ecb885c839f..2e5dcdd037f29cf51b2ff5d325a43036c8713f33 100644
+index d465e67c094b01ee128b9cecfb5ee999f4a1d8d1..f30fec3bc5c1901f96ff168da422aad1fa7ecd08 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,6 +605,10 @@ config("internal_config") {
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index 1cbc270ca4e70..a38ff09275019 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 1e3950ab2292ce6a3e6a4e469d8327da28f2d899..5e9b17acc59590147d8b3e2d74f62050e6b5a7ec 100644
+index 316f870e31f33c990793fdfe7ecb69bb120bb024..5db324b2bf0169657fc6e9dc3b15fa3ccaeac9c4 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -911,7 +911,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -927,7 +927,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index d1c6b34213e4c..2a9d03c693efa 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f..2262d19f0f9ced2c9e69862252d94ecb885c839f 100644
+index c4de87b38433bed1a14ce5c3a482023de909ec47..d465e67c094b01ee128b9cecfb5ee999f4a1d8d1 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5830,7 +5830,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5833,7 +5833,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc
index b8b5e05a96a6c..fb1b8ebcdafa8 100644
--- a/shell/browser/api/electron_api_web_request.cc
+++ b/shell/browser/api/electron_api_web_request.cc
@@ -164,8 +164,8 @@ void ToDictionary(gin_helper::Dictionary* details,
                  HttpResponseHeadersToV8(info->response_headers.get()));
   }
 
-  auto* render_frame_host =
-      content::RenderFrameHost::FromID(info->render_process_id, info->frame_id);
+  auto* render_frame_host = content::RenderFrameHost::FromID(
+      info->render_process_id, info->frame_routing_id);
   if (render_frame_host) {
     details->SetGetter("frame", render_frame_host);
     auto* web_contents =
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index a11af4a0182e3..143b7e5ed0457 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1478,10 +1478,8 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
   new ProxyingURLLoaderFactory(
       web_request.get(), protocol_registry->intercept_handlers(),
       render_process_id,
-      frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE,
-      frame_host ? frame_host->GetRenderViewHost()->GetRoutingID()
-                 : MSG_ROUTING_NONE,
-      &next_id_, std::move(navigation_ui_data), std::move(navigation_id),
+      frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE, &next_id_,
+      std::move(navigation_ui_data), std::move(navigation_id),
       std::move(proxied_receiver), std::move(target_factory_remote),
       std::move(header_client_receiver), type);
 
diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc
index 771e4ba43ee7c..38a4e03153b80 100644
--- a/shell/browser/media/media_stream_devices_controller.cc
+++ b/shell/browser/media/media_stream_devices_controller.cc
@@ -152,6 +152,13 @@ void MediaStreamDevicesController::Accept() {
         NOTREACHED();
         break;
       }
+      case blink::MEDIA_GET_OPEN_DEVICE: {
+        // Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do
+        // not need to get permissions for MediaStreamDevice as those are
+        // controlled by the original context.
+        NOTREACHED();
+        break;
+      }
     }
   }
 
diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc
index d079c7b286ff9..3cb8a384fdad4 100644
--- a/shell/browser/net/proxying_url_loader_factory.cc
+++ b/shell/browser/net/proxying_url_loader_factory.cc
@@ -38,7 +38,6 @@ ProxyingURLLoaderFactory::InProgressRequest::FollowRedirectParams::
 ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest(
     ProxyingURLLoaderFactory* factory,
     uint64_t web_request_id,
-    int32_t view_routing_id,
     int32_t frame_routing_id,
     int32_t network_service_request_id,
     uint32_t options,
@@ -51,7 +50,6 @@ ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest(
       original_initiator_(request.request_initiator),
       request_id_(web_request_id),
       network_service_request_id_(network_service_request_id),
-      view_routing_id_(view_routing_id),
       frame_routing_id_(frame_routing_id),
       options_(options),
       traffic_annotation_(traffic_annotation),
@@ -120,7 +118,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::UpdateRequestInfo() {
       request_id_, factory_->render_process_id_, frame_routing_id_,
       factory_->navigation_ui_data_ ? factory_->navigation_ui_data_->DeepCopy()
                                     : nullptr,
-      view_routing_id_, request_for_info, false,
+      request_for_info, false,
       !(options_ & network::mojom::kURLLoadOptionSynchronous),
       factory_->IsForServiceWorkerScript(), factory_->navigation_id_,
       ukm::kInvalidSourceIdObj));
@@ -757,7 +755,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
     const HandlersMap& intercepted_handlers,
     int render_process_id,
     int frame_routing_id,
-    int view_routing_id,
     uint64_t* request_id_generator,
     std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
     absl::optional<int64_t> navigation_id,
@@ -770,7 +767,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
       intercepted_handlers_(intercepted_handlers),
       render_process_id_(render_process_id),
       frame_routing_id_(frame_routing_id),
-      view_routing_id_(view_routing_id),
       request_id_generator_(request_id_generator),
       navigation_ui_data_(std::move(navigation_ui_data)),
       navigation_id_(std::move(navigation_id)),
@@ -866,9 +862,8 @@ void ProxyingURLLoaderFactory::CreateLoaderAndStart(
   auto result = requests_.emplace(
       web_request_id,
       std::make_unique<InProgressRequest>(
-          this, web_request_id, view_routing_id_, frame_routing_id_, request_id,
-          options, request, traffic_annotation, std::move(loader),
-          std::move(client)));
+          this, web_request_id, frame_routing_id_, request_id, options, request,
+          traffic_annotation, std::move(loader), std::move(client)));
   result.first->second->Restart();
 }
 
diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h
index 10b6d561cd695..f4456a0ee0f67 100644
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -54,7 +54,6 @@ class ProxyingURLLoaderFactory
     InProgressRequest(
         ProxyingURLLoaderFactory* factory,
         uint64_t web_request_id,
-        int32_t view_routing_id,
         int32_t frame_routing_id,
         int32_t network_service_request_id,
         uint32_t options,
@@ -136,7 +135,6 @@ class ProxyingURLLoaderFactory
     const absl::optional<url::Origin> original_initiator_;
     const uint64_t request_id_ = 0;
     const int32_t network_service_request_id_ = 0;
-    const int32_t view_routing_id_ = MSG_ROUTING_NONE;
     const int32_t frame_routing_id_ = MSG_ROUTING_NONE;
     const uint32_t options_ = 0;
     const net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
@@ -195,7 +193,6 @@ class ProxyingURLLoaderFactory
       const HandlersMap& intercepted_handlers,
       int render_process_id,
       int frame_routing_id,
-      int view_routing_id,
       uint64_t* request_id_generator,
       std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
       absl::optional<int64_t> navigation_id,
@@ -260,7 +257,6 @@ class ProxyingURLLoaderFactory
 
   const int render_process_id_;
   const int frame_routing_id_;
-  const int view_routing_id_;
   uint64_t* request_id_generator_;  // managed by ElectronBrowserClient
   std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data_;
   absl::optional<int64_t> navigation_id_;
diff --git a/shell/browser/net/proxying_websocket.cc b/shell/browser/net/proxying_websocket.cc
index 3d051e4d9f2da..0ed8edb01aeba 100644
--- a/shell/browser/net/proxying_websocket.cc
+++ b/shell/browser/net/proxying_websocket.cc
@@ -40,7 +40,6 @@ ProxyingWebSocket::ProxyingWebSocket(
           process_id,
           render_frame_id,
           nullptr,
-          MSG_ROUTING_NONE,
           request,
           /*is_download=*/false,
           /*is_async=*/true,
diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index de3989ad88678..d1f474d59ead7 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -288,10 +288,6 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
       base::FeatureList::IsEnabled(features::kAsyncDns),
       default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
 
-  // Initializes first party sets component
-  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
-  content::GetNetworkService()->SetFirstPartySets(base::File());
-
   std::string app_name = electron::Browser::Get()->GetName();
 #if BUILDFLAG(IS_MAC)
   KeychainPassword::GetServiceName() = app_name + " Safe Storage";

From afe0116d59f5abfb20d44af9525fb048809f5d73 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Thu, 31 Mar 2022 03:55:38 +0900
Subject: [PATCH 208/811] fix: build when pdf component is disabled (#33513)

---
 BUILD.gn                                      |  6 +-
 chromium_src/BUILD.gn                         | 19 +++---
 shell/app/electron_content_client.cc          | 12 ++--
 shell/browser/electron_api_ipc_handler_impl.h |  1 +
 shell/browser/electron_browser_client.cc      | 11 ++--
 ...ectron_web_contents_utility_handler_impl.h |  1 +
 shell/common/electron_constants.cc            |  3 +-
 shell/common/electron_constants.h             |  4 +-
 shell/renderer/renderer_client_base.cc        | 61 ++++++++++---------
 9 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index b8a6396c4f4e8..ffd38ce3a8c29 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -363,10 +363,6 @@ source_set("electron_lib") {
     "//components/network_session_configurator/common",
     "//components/omnibox/browser:buildflags",
     "//components/os_crypt",
-    "//components/pdf/browser",
-    "//components/pdf/browser:interceptors",
-    "//components/pdf/common",
-    "//components/pdf/renderer",
     "//components/pref_registry",
     "//components/prefs",
     "//components/security_state/content",
@@ -700,6 +696,8 @@ source_set("electron_lib") {
     deps += [
       "//chrome/browser/resources/pdf:resources",
       "//components/pdf/browser",
+      "//components/pdf/browser:interceptors",
+      "//components/pdf/common",
       "//components/pdf/renderer",
       "//pdf",
     ]
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 7db91d633a5d0..6c3ff516dcb5f 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -307,6 +307,10 @@ static_library("chrome") {
         "//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
         "//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
       ]
+      deps += [
+        "//components/pdf/browser",
+        "//components/pdf/renderer",
+      ]
     }
   }
 
@@ -334,15 +338,6 @@ source_set("plugins") {
     "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
     "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
   ]
-  deps += [
-    "//media:media_buildflags",
-    "//ppapi/buildflags",
-    "//ppapi/proxy:ipc",
-    "//services/device/public/mojom",
-  ]
-  if (enable_pdf_viewer) {
-    deps += [ "//components/pdf/browser" ]
-  }
 
   # renderer side
   sources += [
@@ -351,16 +346,16 @@ source_set("plugins") {
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
   ]
-  if (enable_pdf_viewer) {
-    deps += [ "//components/pdf/renderer" ]
-  }
+
   deps += [
     "//components/strings",
     "//media:media_buildflags",
+    "//ppapi/buildflags",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
+    "//services/device/public/mojom",
     "//skia",
   ]
 }
diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc
index 598e7bf9d739f..b755232a2b53b 100644
--- a/shell/app/electron_content_client.cc
+++ b/shell/app/electron_content_client.cc
@@ -35,7 +35,8 @@
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-#include "components/pdf/renderer/internal_plugin_renderer_helpers.h"
+#include "chrome/common/pdf_util.h"
+#include "components/pdf/common/internal_plugin_helpers.h"
 #include "pdf/pdf.h"  // nogncheck
 #include "shell/common/electron_constants.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
@@ -111,11 +112,11 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   content::PepperPluginInfo pdf_info;
   pdf_info.is_internal = true;
   pdf_info.is_out_of_process = true;
-  pdf_info.name = "Chromium PDF Viewer";
+  pdf_info.name = kPDFInternalPluginName;
   pdf_info.description = "Portable Document Format";
   // This isn't a real file path; it's just used as a unique identifier.
   pdf_info.path = base::FilePath(kPdfPluginPath);
-  content::WebPluginMimeType pdf_mime_type(kPdfPluginMimeType, "pdf",
+  content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType, "pdf",
                                            "Portable Document Format");
   pdf_info.mime_types.push_back(pdf_mime_type);
   plugins->push_back(pdf_info);
@@ -126,12 +127,11 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   // here.
   content::WebPluginInfo info;
   info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
-  info.name = u"Chromium PDF Viewer";
+  info.name = base::ASCIIToUTF16(kPDFExtensionPluginName);
   // This isn't a real file path; it's just used as a unique identifier.
   info.path = base::FilePath::FromUTF8Unsafe(extension_misc::kPdfExtensionId);
   info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
-  info.mime_types.emplace_back("application/pdf", "pdf",
-                               "Portable Document Format");
+  info.mime_types.emplace_back(kPDFMimeType, "pdf", "Portable Document Format");
   content::PluginService::GetInstance()->RefreshPlugins();
   content::PluginService::GetInstance()->RegisterInternalPlugin(info, true);
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
diff --git a/shell/browser/electron_api_ipc_handler_impl.h b/shell/browser/electron_api_ipc_handler_impl.h
index 7cddf88bedc4a..222f42bed1be6 100644
--- a/shell/browser/electron_api_ipc_handler_impl.h
+++ b/shell/browser/electron_api_ipc_handler_impl.h
@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "electron/shell/common/api/api.mojom.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 
 namespace content {
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 143b7e5ed0457..e317682535ac0 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -27,16 +27,11 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/pdf/chrome_pdf_stream_delegate.h"
-#include "chrome/browser/plugins/pdf_iframe_navigation_throttle.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/network_hints/common/network_hints.mojom.h"
-#include "components/pdf/browser/pdf_navigation_throttle.h"
-#include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
-#include "components/pdf/common/internal_plugin_helpers.h"
 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h"  // nogncheck
 #include "content/browser/site_instance_impl.h"  // nogncheck
 #include "content/public/browser/browser_main_runner.h"
@@ -52,6 +47,7 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/tts_controller.h"
 #include "content/public/browser/tts_platform.h"
+#include "content/public/browser/url_loader_request_interceptor.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ -212,7 +208,12 @@
 #endif
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
+#include "chrome/browser/pdf/chrome_pdf_stream_delegate.h"
+#include "chrome/browser/plugins/pdf_iframe_navigation_throttle.h"  // nogncheck
+#include "components/pdf/browser/pdf_navigation_throttle.h"
+#include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
 #include "components/pdf/browser/pdf_web_contents_helper.h"  // nogncheck
+#include "components/pdf/common/internal_plugin_helpers.h"
 #endif
 
 using content::BrowserThread;
diff --git a/shell/browser/electron_web_contents_utility_handler_impl.h b/shell/browser/electron_web_contents_utility_handler_impl.h
index 30a9baa40f835..819c818fcae54 100644
--- a/shell/browser/electron_web_contents_utility_handler_impl.h
+++ b/shell/browser/electron_web_contents_utility_handler_impl.h
@@ -11,6 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "electron/shell/common/api/api.mojom.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 
 namespace content {
diff --git a/shell/common/electron_constants.cc b/shell/common/electron_constants.cc
index 5d53425a3fc52..3d6eda0e9eea8 100644
--- a/shell/common/electron_constants.cc
+++ b/shell/common/electron_constants.cc
@@ -30,7 +30,8 @@ const char kRunAsNode[] = "ELECTRON_RUN_AS_NODE";
 #endif
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-const char kPdfPluginMimeType[] = "application/x-google-chrome-pdf";
+const char kPDFExtensionPluginName[] = "Chromium PDF Viewer";
+const char kPDFInternalPluginName[] = "Chromium PDF Plugin";
 const base::FilePath::CharType kPdfPluginPath[] =
     FILE_PATH_LITERAL("internal-pdf-viewer");
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
diff --git a/shell/common/electron_constants.h b/shell/common/electron_constants.h
index b91b70e683632..4218b3e47ffc7 100644
--- a/shell/common/electron_constants.h
+++ b/shell/common/electron_constants.h
@@ -30,8 +30,8 @@ extern const char kRunAsNode[];
 #endif
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-// The MIME type used for the PDF plugin.
-extern const char kPdfPluginMimeType[];
+extern const char kPDFExtensionPluginName[];
+extern const char kPDFInternalPluginName[];
 extern const base::FilePath::CharType kPdfPluginPath[];
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index 7b932f7f7576c..0302f37f7ccf3 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -12,9 +12,7 @@
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/common/pdf_util.h"
 #include "components/network_hints/renderer/web_prescient_networking_impl.h"
-#include "components/pdf/renderer/pdf_internal_plugin_delegate.h"
 #include "content/common/buildflags.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
@@ -68,6 +66,9 @@
 #endif
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
+#include "chrome/common/pdf_util.h"
+#include "components/pdf/common/internal_plugin_helpers.h"
+#include "components/pdf/renderer/pdf_internal_plugin_delegate.h"
 #include "shell/common/electron_constants.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
@@ -111,6 +112,25 @@ std::vector<std::string> ParseSchemesCLISwitch(base::CommandLine* command_line,
                            base::SPLIT_WANT_NONEMPTY);
 }
 
+#if BUILDFLAG(ENABLE_PDF_VIEWER)
+class ChromePdfInternalPluginDelegate final
+    : public pdf::PdfInternalPluginDelegate {
+ public:
+  ChromePdfInternalPluginDelegate() = default;
+  ChromePdfInternalPluginDelegate(const ChromePdfInternalPluginDelegate&) =
+      delete;
+  ChromePdfInternalPluginDelegate& operator=(
+      const ChromePdfInternalPluginDelegate&) = delete;
+  ~ChromePdfInternalPluginDelegate() override = default;
+
+  // `pdf::PdfInternalPluginDelegate`:
+  bool IsAllowedOrigin(const url::Origin& origin) const override {
+    return origin.scheme() == extensions::kExtensionScheme &&
+           origin.host() == extension_misc::kPdfExtensionId;
+  }
+};
+#endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
+
 // static
 RendererClientBase* g_renderer_client_base = nullptr;
 
@@ -311,29 +331,12 @@ void RendererClientBase::DidClearWindowObject(
   render_frame->GetWebFrame()->ExecuteScript(blink::WebScriptSource("void 0"));
 }
 
-class ChromePdfInternalPluginDelegate final
-    : public pdf::PdfInternalPluginDelegate {
- public:
-  ChromePdfInternalPluginDelegate() = default;
-  ChromePdfInternalPluginDelegate(const ChromePdfInternalPluginDelegate&) =
-      delete;
-  ChromePdfInternalPluginDelegate& operator=(
-      const ChromePdfInternalPluginDelegate&) = delete;
-  ~ChromePdfInternalPluginDelegate() override = default;
-
-  // `pdf::PdfInternalPluginDelegate`:
-  bool IsAllowedOrigin(const url::Origin& origin) const override {
-    return origin.scheme() == extensions::kExtensionScheme &&
-           origin.host() == extension_misc::kPdfExtensionId;
-  }
-};
-
 bool RendererClientBase::OverrideCreatePlugin(
     content::RenderFrame* render_frame,
     const blink::WebPluginParams& params,
     blink::WebPlugin** plugin) {
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-  if (params.mime_type.Utf8() == kPdfPluginMimeType) {
+  if (params.mime_type.Utf8() == pdf::kInternalPluginMimeType) {
     *plugin = pdf::CreateInternalPlugin(
         std::move(params), render_frame,
         std::make_unique<ChromePdfInternalPluginDelegate>());
@@ -342,7 +345,6 @@ bool RendererClientBase::OverrideCreatePlugin(
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
   if (params.mime_type.Utf8() == content::kBrowserPluginMimeType ||
-      params.mime_type.Utf8() == kPdfPluginMimeType ||
       render_frame->GetBlinkPreferences().enable_plugins)
     return false;
 
@@ -371,7 +373,7 @@ bool RendererClientBase::IsPluginHandledExternally(
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
   DCHECK(plugin_element.HasHTMLTagName("object") ||
          plugin_element.HasHTMLTagName("embed"));
-  if (mime_type == "application/x-google-chrome-pdf") {
+  if (mime_type == pdf::kInternalPluginMimeType) {
     if (IsPdfInternalPluginAllowedOrigin(
             render_frame->GetWebFrame()->GetSecurityOrigin())) {
       return true;
@@ -379,11 +381,10 @@ bool RendererClientBase::IsPluginHandledExternally(
 
     content::WebPluginInfo info;
     info.type = content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
-    const char16_t kPDFExtensionPluginName[] = u"Chromium PDF Viewer";
-    info.name = kPDFExtensionPluginName;
-    info.path = base::FilePath::FromUTF8Unsafe("internal-pdf-viewer");
+    info.name = base::ASCIIToUTF16(kPDFInternalPluginName);
+    info.path = base::FilePath(kPdfPluginPath);
     info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
-    info.mime_types.emplace_back("application/x-google-chrome-pdf", "pdf",
+    info.mime_types.emplace_back(pdf::kInternalPluginMimeType, "pdf",
                                  "Portable Document Format");
     return extensions::MimeHandlerViewContainerManager::Get(
                content::RenderFrame::FromWebFrame(
@@ -396,12 +397,10 @@ bool RendererClientBase::IsPluginHandledExternally(
   // electron_content_client.cc / ComputeBuiltInPlugins.
   content::WebPluginInfo info;
   info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
-  const char16_t kPDFExtensionPluginName[] = u"Chromium PDF Viewer";
-  info.name = kPDFExtensionPluginName;
+  info.name = base::ASCIIToUTF16(kPDFExtensionPluginName);
   info.path = base::FilePath::FromUTF8Unsafe(extension_misc::kPdfExtensionId);
   info.background_color = content::WebPluginInfo::kDefaultBackgroundColor;
-  info.mime_types.emplace_back("application/pdf", "pdf",
-                               "Portable Document Format");
+  info.mime_types.emplace_back(kPDFMimeType, "pdf", "Portable Document Format");
   return extensions::MimeHandlerViewContainerManager::Get(
              content::RenderFrame::FromWebFrame(
                  plugin_element.GetDocument().GetFrame()),
@@ -415,6 +414,7 @@ bool RendererClientBase::IsPluginHandledExternally(
 v8::Local<v8::Object> RendererClientBase::GetScriptableObject(
     const blink::WebElement& plugin_element,
     v8::Isolate* isolate) {
+#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   // If there is a MimeHandlerView that can provide the scriptable object then
   // MaybeCreateMimeHandlerView must have been called before and a container
   // manager should exist.
@@ -424,6 +424,7 @@ v8::Local<v8::Object> RendererClientBase::GetScriptableObject(
       false /* create_if_does_not_exist */);
   if (container_manager)
     return container_manager->GetScriptableObject(plugin_element, isolate);
+#endif
   return v8::Local<v8::Object>();
 }
 

From 8c8642634dd8a1027ee9a4e2f41c97727ab66da1 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 31 Mar 2022 00:29:02 +0200
Subject: [PATCH 209/811] fix: don't unmaximize on macOS if user set max bounds
 (#33480)

---
 shell/browser/native_window_mac.h    |  2 ++
 shell/browser/native_window_mac.mm   | 14 +++++++++++++-
 spec-main/api-browser-window-spec.ts | 16 ++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index 2728414379237..ae1e845c8a182 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -267,6 +267,8 @@ class NativeWindowMac : public NativeWindow,
   // Maximizable window state; necessary for persistence through redraws.
   bool maximizable_ = true;
 
+  bool user_set_bounds_maximized_ = false;
+
   // Simple (pre-Lion) Fullscreen Settings
   bool always_simple_fullscreen_ = false;
   bool is_simple_fullscreen_ = false;
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 04cca2461f5bc..7ed794206322e 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -622,7 +622,18 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::Unmaximize() {
-  if (!IsMaximized())
+  // Bail if the last user set bounds were the same size as the window
+  // screen (e.g. the user set the window to maximized via setBounds)
+  //
+  // Per docs during zoom:
+  // > If there’s no saved user state because there has been no previous
+  // > zoom,the size and location of the window don’t change.
+  //
+  // However, in classic Apple fashion, this is not the case in practice,
+  // and the frame inexplicably becomes very tiny. We should prevent
+  // zoom from being called if the window is being unmaximized and its
+  // unmaximized window bounds are themselves functionally maximized.
+  if (!IsMaximized() || user_set_bounds_maximized_)
     return;
 
   [window_ zoom:nil];
@@ -724,6 +735,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   cocoa_bounds.origin.y = NSHeight([screen frame]) - size.height() - bounds.y();
 
   [window_ setFrame:cocoa_bounds display:YES animate:animate];
+  user_set_bounds_maximized_ = IsMaximized() ? true : false;
 }
 
 gfx::Rect NativeWindowMac::GetBounds() {
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 4c9f451a5952d..d783cde6b8883 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3634,6 +3634,22 @@ describe('BrowserWindow module', () => {
       expectBoundsEqual(w.getSize(), initialSize);
       expectBoundsEqual(w.getPosition(), initialPosition);
     });
+
+    ifit(process.platform === 'darwin')('should not change size or position of a window which is functionally maximized', async () => {
+      const { workArea } = screen.getPrimaryDisplay();
+
+      const bounds = {
+        x: workArea.x,
+        y: workArea.y,
+        width: workArea.width,
+        height: workArea.height
+      };
+
+      const w = new BrowserWindow(bounds);
+      w.unmaximize();
+      await delay(1000);
+      expectBoundsEqual(w.getBounds(), bounds);
+    });
   });
 
   describe('setFullScreen(false)', () => {

From cbd06cd25e767ad2e0ead3a0454e198999efd56a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 31 Mar 2022 09:33:38 +0900
Subject: [PATCH 210/811] docs: remove "cache" from app.getPath (#33509)

---
 docs/api/app.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index b01b218b181cf..5970bf58e57cf 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -637,7 +637,6 @@ Returns `string` - The current application directory.
     * `~/Library/Application Support` on macOS
   * `userData` The directory for storing your app's configuration files, which by
     default it is the `appData` directory appended with your app's name.
-  * `cache`
   * `temp` Temporary directory.
   * `exe` The current executable file.
   * `module` The `libchromiumcontent` library.

From 7612df768741e8dd7e5f949b6215448c43d49bc0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 06:01:00 -0700
Subject: [PATCH 211/811] Bump v20.0.0-nightly.20220331

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..5e2990d348610 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220331
\ No newline at end of file
diff --git a/package.json b/package.json
index 3ef503b0bc981..6f79cc2a082cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220331",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..840b481fe1c77 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220331
+ PRODUCTVERSION 20,0,0,20220331
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9722ca78b2e2ad4462250ca05f52ef287abeb578 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 12:14:36 -0700
Subject: [PATCH 212/811] Revert "Bump v20.0.0-nightly.20220331"

This reverts commit 7612df768741e8dd7e5f949b6215448c43d49bc0.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 5e2990d348610..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220331
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 6f79cc2a082cd..3ef503b0bc981 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220331",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 840b481fe1c77..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220331
- PRODUCTVERSION 20,0,0,20220331
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1864edd2874162fc2554ae70fd526955903fac84 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 06:02:12 -0700
Subject: [PATCH 213/811] Bump v20.0.0-nightly.20220401

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..76305da68e582 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220401
\ No newline at end of file
diff --git a/package.json b/package.json
index 3ef503b0bc981..1b5d395d2bc5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220401",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..e7183f4f4db7c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220401
+ PRODUCTVERSION 20,0,0,20220401
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9207c2aa685a8eec69a83673ed0d2dee2b095281 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 09:52:10 -0700
Subject: [PATCH 214/811] Revert "Bump v20.0.0-nightly.20220401"

This reverts commit 1864edd2874162fc2554ae70fd526955903fac84.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 76305da68e582..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220401
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 1b5d395d2bc5b..3ef503b0bc981 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220401",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e7183f4f4db7c..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220401
- PRODUCTVERSION 20,0,0,20220401
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 78a3752adef43fa78c6c6b0805d9d1e10d147949 Mon Sep 17 00:00:00 2001
From: Micha Hanselmann <micha.hanselmann@gmail.com>
Date: Mon, 4 Apr 2022 03:39:55 +0200
Subject: [PATCH 215/811] fix: create `userData` on requestSingleInstanceLock()
 if needed (#33559)

* test: use custom userData folder for requestSingleInstanceLock()

* update test

* prefix test folder path

* fix: create userDataDir on requestSingleInstanceLock() if needed

* Trigger Build
---
 shell/browser/api/electron_api_app.cc             |  2 ++
 spec-main/api-app-spec.ts                         |  7 +++++++
 spec/fixtures/api/singleton-userdata/main.js      | 12 ++++++++++++
 spec/fixtures/api/singleton-userdata/package.json |  4 ++++
 4 files changed, 25 insertions(+)
 create mode 100644 spec/fixtures/api/singleton-userdata/main.js
 create mode 100644 spec/fixtures/api/singleton-userdata/package.json

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 73db1e756f885..e3a88a28b0872 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -1148,6 +1148,8 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) {
 
   base::FilePath user_dir;
   base::PathService::Get(chrome::DIR_USER_DATA, &user_dir);
+  // The user_dir may not have been created yet.
+  base::CreateDirectoryAndGetError(user_dir, nullptr);
 
   auto cb = base::BindRepeating(&App::OnSecondInstance, base::Unretained(this));
   auto wrapped_cb = base::BindRepeating(NotificationCallbackWrapper, cb);
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 718223229572b..0389b70931a07 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -228,6 +228,13 @@ describe('app module', () => {
       expect(code1).to.equal(0);
     });
 
+    it('returns true when setting non-existent user data folder', async function () {
+      const appPath = path.join(fixturesPath, 'api', 'singleton-userdata');
+      const instance = cp.spawn(process.execPath, [appPath]);
+      const [code] = await emittedOnce(instance, 'exit');
+      expect(code).to.equal(0);
+    });
+
     async function testArgumentPassing (testArgs: SingleInstanceLockTestArgs) {
       const appPath = path.join(fixturesPath, 'api', 'singleton-data');
       const first = cp.spawn(process.execPath, [appPath, ...testArgs.args]);
diff --git a/spec/fixtures/api/singleton-userdata/main.js b/spec/fixtures/api/singleton-userdata/main.js
new file mode 100644
index 0000000000000..98f6841b4282a
--- /dev/null
+++ b/spec/fixtures/api/singleton-userdata/main.js
@@ -0,0 +1,12 @@
+const { app } = require('electron');
+const fs = require('fs');
+const path = require('path');
+
+// non-existent user data folder should not break requestSingleInstanceLock()
+// ref: https://github.com/electron/electron/issues/33547
+const userDataFolder = path.join(app.getPath('home'), 'electron-test-singleton-userdata');
+fs.rmSync(userDataFolder, { force: true, recursive: true });
+app.setPath('userData', userDataFolder);
+
+const gotTheLock = app.requestSingleInstanceLock();
+app.exit(gotTheLock ? 0 : 1);
diff --git a/spec/fixtures/api/singleton-userdata/package.json b/spec/fixtures/api/singleton-userdata/package.json
new file mode 100644
index 0000000000000..1269c0a67d5dd
--- /dev/null
+++ b/spec/fixtures/api/singleton-userdata/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron-test-singleton-userdata",
+  "main": "main.js"
+}

From 0ac6d745368492440fc39c6f12b465388851f73e Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 4 Apr 2022 02:00:45 -0700
Subject: [PATCH 216/811] docs: mark platform-specific functionality for
 BrowserWindow (#33512)

---
 docs/api/browser-window.md | 123 ++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 57 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 0903009ef503a..b5973c715c1af 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -164,14 +164,14 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
   * `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
   * `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
-  * `movable` boolean (optional) - Whether window is movable. This is not implemented
-    on Linux. Default is `true`.
-  * `minimizable` boolean (optional) - Whether window is minimizable. This is not
-    implemented on Linux. Default is `true`.
-  * `maximizable` boolean (optional) - Whether window is maximizable. This is not
-    implemented on Linux. Default is `true`.
-  * `closable` boolean (optional) - Whether window is closable. This is not implemented
-    on Linux. Default is `true`.
+  * `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
+    movable. This is not implemented on Linux. Default is `true`.
+  * `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+    minimizable. This is not implemented on Linux. Default is `true`.
+  * `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+    maximizable. This is not implemented on Linux. Default is `true`.
+  * `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
+    closable. This is not implemented on Linux. Default is `true`.
   * `focusable` boolean (optional) - Whether the window can be focused. Default is
     `true`. On Windows setting `focusable: false` also implies setting
     `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
@@ -185,7 +185,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
     mode. On macOS, also whether the maximize/zoom button should toggle full
     screen mode or maximize window. Default is `true`.
-  * `simpleFullscreen` boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
+  * `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
+    macOS. Default is `false`.
   * `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
     Default is `false`.
   * `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
@@ -201,27 +202,30 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
   * `modal` boolean (optional) - Whether this is a modal window. This only works when the
     window is a child window. Default is `false`.
-  * `acceptFirstMouse` boolean (optional) - Whether clicking an inactive window will also
-  click through to the web contents. Default is `false` on macOS. This option is not
-  configurable on other platforms.
+  * `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
+    inactive window will also click through to the web contents. Default is
+    `false` on macOS. This option is not configurable on other platforms.
   * `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
     Default is `false`.
   * `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
     key is pressed. Default is `false`.
-  * `enableLargerThanScreen` boolean (optional) - Enable the window to be resized larger
-    than screen. Only relevant for macOS, as other OSes allow
-    larger-than-screen windows by default. Default is `false`.
+  * `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
+    be resized larger than screen. Only relevant for macOS, as other OSes
+    allow larger-than-screen windows by default. Default is `false`.
   * `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
   * `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
-  * `opacity` number (optional) - Set the initial opacity of the window, between 0.0 (fully
-    transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
+  * `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
+    the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
+    is only implemented on Windows and macOS.
   * `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
     some GTK+3 desktop environments. Default is `false`.
   * `transparent` boolean (optional) - Makes the window [transparent](../tutorial/window-customization.md#create-transparent-windows).
     Default is `false`. On Windows, does not work unless the window is frameless.
   * `type` string (optional) - The type of window, default is normal window. See more about
     this below.
-  * `visualEffectState` string (optional) - Specify how the material appearance should reflect window activity state on macOS. Must be used with the `vibrancy` property. Possible values are:
+  * `visualEffectState` string (optional) _macOS_ - Specify how the material
+    appearance should reflect window activity state on macOS. Must be used
+    with the `vibrancy` property. Possible values are:
     * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
     * `active` - The backdrop should always appear active.
     * `inactive` - The backdrop should always appear inactive.
@@ -229,36 +233,41 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     Default is `default`. Possible values are:
     * `default` - Results in the standard title bar for macOS or Windows respectively.
     * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
-    * `hiddenInset` - Only on macOS, results in a hidden title bar with an alternative look
-      where the traffic light buttons are slightly more inset from the window edge.
-    * `customButtonsOnHover` - Only on macOS, results in a hidden title bar and a full size
-      content window, the traffic light buttons will display when being hovered
-      over in the top left of the window.  **Note:** This option is currently
-      experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a
-    custom position for the traffic light buttons in frameless windows.
-  * `roundedCorners` boolean (optional) - Whether frameless window should have
-    rounded corners on macOS. Default is `true`.
-  * `fullscreenWindowTitle` boolean (optional) _Deprecated_ - Shows the title in
-    the title bar in full screen mode on macOS for `hiddenInset` titleBarStyle.
-    Default is `false`.
+    * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
+      with an alternative look where the traffic light buttons are slightly
+      more inset from the window edge.
+    * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
+      title bar and a full size content window, the traffic light buttons will
+      display when being hovered over in the top left of the window.
+      **Note:** This option is currently experimental.
+  * `trafficLightPosition` [Point](structures/point.md) (optional) _macOS_ -
+    Set a custom position for the traffic light buttons in frameless windows.
+  * `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
+    should have rounded corners on macOS. Default is `true`.
+  * `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
+    the title in the title bar in full screen mode on macOS for `hiddenInset`
+    titleBarStyle. Default is `false`.
   * `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
     Windows, which adds standard window frame. Setting it to `false` will remove
     window shadow and window animations. Default is `true`.
-  * `vibrancy` string (optional) - Add a type of vibrancy effect to the window, only on
-    macOS. Can be `appearance-based`, `light`, `dark`, `titlebar`, `selection`,
-    `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. Please note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are deprecated and have been removed in macOS Catalina (10.15).
-  * `zoomToPageWidth` boolean (optional) - Controls the behavior on macOS when
-    option-clicking the green stoplight button on the toolbar or by clicking the
-    Window > Zoom menu item. If `true`, the window will grow to the preferred
-    width of the web page when zoomed, `false` will cause it to zoom to the
-    width of the screen. This will also affect the behavior when calling
-    `maximize()` directly. Default is `false`.
-  * `tabbingIdentifier` string (optional) - Tab group name, allows opening the
-    window as a native tab on macOS 10.12+. Windows with the same tabbing
-    identifier will be grouped together. This also adds a native new tab button
-    to your window's tab bar and allows your `app` and window to receive the
-    `new-window-for-tab` event.
+  * `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
+    the window, only on macOS. Can be `appearance-based`, `light`, `dark`,
+    `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `medium-light`,
+    `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
+    `tooltip`, `content`, `under-window`, or `under-page`. Please note that
+    `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are
+    deprecated and have been removed in macOS Catalina (10.15).
+  * `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
+    macOS when option-clicking the green stoplight button on the toolbar or by
+    clicking the Window > Zoom menu item. If `true`, the window will grow to
+    the preferred width of the web page when zoomed, `false` will cause it to
+    zoom to the width of the screen. This will also affect the behavior when
+    calling `maximize()` directly. Default is `false`.
+  * `tabbingIdentifier` string (optional) _macOS_ - Tab group name, allows
+    opening the window as a native tab on macOS 10.12+. Windows with the same
+    tabbing identifier will be grouped together. This also adds a native new
+    tab button to your window's tab bar and allows your `app` and window to
+    receive the `new-window-for-tab` event.
   * `webPreferences` Object (optional) - Settings of web page's features.
     * `devTools` boolean (optional) - Whether to enable DevTools. If it is set to `false`, can not use `BrowserWindow.webContents.openDevTools()` to open DevTools. Default is `true`.
     * `nodeIntegration` boolean (optional) - Whether node integration is enabled.
@@ -310,8 +319,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     * `plugins` boolean (optional) - Whether plugins should be enabled. Default is `false`.
     * `experimentalFeatures` boolean (optional) - Enables Chromium's experimental features.
       Default is `false`.
-    * `scrollBounce` boolean (optional) - Enables scroll bounce (rubber banding) effect on
-      macOS. Default is `false`.
+    * `scrollBounce` boolean (optional) _macOS_ - Enables scroll bounce
+      (rubber banding) effect on macOS. Default is `false`.
     * `enableBlinkFeatures` string (optional) - A list of feature strings separated by `,`, like
       `CSSVariables,KeyboardEventKey` to enable. The full list of supported feature
       strings can be found in the [RuntimeEnabledFeatures.json5][runtime-enabled-features]
@@ -774,7 +783,7 @@ A `boolean` property that determines whether the window is in fullscreen mode.
 
 A `boolean` property that determines whether the window is focusable.
 
-#### `win.visibleOnAllWorkspaces`
+#### `win.visibleOnAllWorkspaces` _macOS_ _Linux_
 
 A `boolean` property that determines whether the window is visible on all workspaces.
 
@@ -811,13 +820,13 @@ A `string` property that determines the title of the native window.
 
 **Note:** The title of the web page can be different from the title of the native window.
 
-#### `win.minimizable`
+#### `win.minimizable` _macOS_ _Windows_
 
 A `boolean` property that determines whether the window can be manually minimized by user.
 
 On Linux the setter is a no-op, although the getter returns `true`.
 
-#### `win.maximizable`
+#### `win.maximizable` _macOS_ _Windows_
 
 A `boolean` property that determines whether the window can be manually maximized by user.
 
@@ -832,13 +841,13 @@ maximizes the window.
 
 A `boolean` property that determines whether the window can be manually resized by user.
 
-#### `win.closable`
+#### `win.closable` _macOS_ _Windows_
 
 A `boolean` property that determines whether the window can be manually closed by user.
 
 On Linux the setter is a no-op, although the getter returns `true`.
 
-#### `win.movable`
+#### `win.movable` _macOS_ _Windows_
 
 A `boolean` property that determines Whether the window can be moved by user.
 
@@ -1635,7 +1644,7 @@ Changes window icon.
 
 Sets whether the window traffic light buttons should be visible.
 
-#### `win.setAutoHideMenuBar(hide)`
+#### `win.setAutoHideMenuBar(hide)` _Windows_ _Linux_
 
 * `hide` boolean
 
@@ -1644,7 +1653,7 @@ menu bar will only show when users press the single `Alt` key.
 
 If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't hide it immediately.
 
-#### `win.isMenuBarAutoHide()`
+#### `win.isMenuBarAutoHide()` _Windows_ _Linux_
 
 Returns `boolean` - Whether menu bar automatically hides itself.
 
@@ -1654,11 +1663,11 @@ Returns `boolean` - Whether menu bar automatically hides itself.
 
 Sets whether the menu bar should be visible. If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
 
-#### `win.isMenuBarVisible()`
+#### `win.isMenuBarVisible()` _Windows_ _Linux_
 
 Returns `boolean` - Whether the menu bar is visible.
 
-#### `win.setVisibleOnAllWorkspaces(visible[, options])`
+#### `win.setVisibleOnAllWorkspaces(visible[, options])` _macOS_ _Linux_
 
 * `visible` boolean
 * `options` Object (optional)
@@ -1676,7 +1685,7 @@ Sets whether the window should be visible on all workspaces.
 
 **Note:** This API does nothing on Windows.
 
-#### `win.isVisibleOnAllWorkspaces()`
+#### `win.isVisibleOnAllWorkspaces()` _macOS_ _Linux_
 
 Returns `boolean` - Whether the window is visible on all workspaces.
 

From 204b53e7b8cb13080b10eccf69afe17bd0893bee Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 4 Apr 2022 02:32:57 -0700
Subject: [PATCH 217/811] build: upload to AZ as well as S3 (#33573)

* build: upload to AZ aswell as S3

* fix: provide env to azput
---
 package.json                                  |   3 +-
 script/lib/azput.js                           |  48 +++++
 script/lib/util.py                            |  21 +-
 script/release/release.js                     |  92 ++++----
 script/release/uploaders/upload-index-json.py |   8 +-
 .../uploaders/upload-node-checksums.py        |   8 +-
 .../release/uploaders/upload-node-headers.py  |  30 ++-
 script/release/uploaders/upload-symbols.py    |  11 +-
 script/release/uploaders/upload.py            |  14 +-
 yarn.lock                                     | 203 +++++++++++++++++-
 10 files changed, 345 insertions(+), 93 deletions(-)
 create mode 100644 script/lib/azput.js

diff --git a/package.json b/package.json
index 3ef503b0bc981..e976065ea1d06 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
+    "@azure/storage-blob": "^12.9.0",
     "@electron/docs-parser": "^0.12.4",
     "@electron/typescript-definitions": "^8.9.5",
     "@octokit/auth-app": "^2.10.0",
@@ -141,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/script/lib/azput.js b/script/lib/azput.js
new file mode 100644
index 0000000000000..0e6a75cd2ad8f
--- /dev/null
+++ b/script/lib/azput.js
@@ -0,0 +1,48 @@
+/* eslint-disable camelcase */
+const { BlobServiceClient } = require('@azure/storage-blob');
+const fs = require('fs');
+const path = require('path');
+
+const blobServiceClient = BlobServiceClient.fromConnectionString(process.env.ELECTRON_ARTIFACTS_BLOB_STORAGE);
+
+const args = require('minimist')(process.argv.slice(2));
+
+let { prefix = '/', key_prefix = '', _: files } = args;
+if (prefix && !prefix.endsWith(path.sep)) prefix = path.resolve(prefix) + path.sep;
+
+function filenameToKey (file) {
+  file = path.resolve(file);
+  if (file.startsWith(prefix)) file = file.substr(prefix.length - 1);
+  return key_prefix + (path.sep === '\\' ? file.replace(/\\/g, '/') : file);
+}
+
+let anErrorOccurred = false;
+function next (done) {
+  const file = files.shift();
+  if (!file) return done();
+  let key = filenameToKey(file);
+  // TODO: When we drop s3put, migrate the key to not include atom-shell in the callsites
+  key = key.replace('atom-shell/dist/', 'headers/dist/');
+  key = key.replace('atom-shell/symbols/', 'symbols/');
+  key = key.replace('atom-shell/tmp/', 'checksums-scratchpad/');
+  key = key.replace('electron-artifacts/', 'release-builds/');
+
+  const [containerName, ...keyPath] = key.split('/');
+  const blobKey = keyPath.join('/');
+  console.log(`Uploading '${file}' to container '${containerName}' with key '${blobKey}'...`);
+
+  const containerClient = blobServiceClient.getContainerClient(containerName);
+  const blockBlobClient = containerClient.getBlockBlobClient(blobKey);
+  blockBlobClient.uploadFile(file)
+    .then((uploadBlobResponse) => {
+      console.log(`Upload block blob ${blobKey} successfully: https://artifacts.electronjs.org/${key}`, uploadBlobResponse.requestId);
+    })
+    .catch((err) => {
+      console.error(err);
+      anErrorOccurred = true;
+    })
+    .then(() => next(done));
+}
+next(() => {
+  process.exit(anErrorOccurred ? 1 : 0);
+});
diff --git a/script/lib/util.py b/script/lib/util.py
index 93b364c6a23e0..c7f448331a7cd 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -15,7 +15,7 @@
   from urllib2 import urlopen
 import zipfile
 
-from lib.config import is_verbose_mode
+from lib.config import is_verbose_mode, s3_config
 
 ELECTRON_DIR = os.path.abspath(
   os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
@@ -155,7 +155,14 @@ def get_electron_version():
   with open(version_file) as f:
     return 'v' + f.read().strip()
 
-def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
+def store_artifact(prefix, key_prefix, files):
+  # Legacy S3 Bucket
+  s3put(prefix, key_prefix, files)
+  # New AZ Storage
+  azput(prefix, key_prefix, files)
+
+def s3put(prefix, key_prefix, files):
+  bucket, access_key, secret_key = s3_config()
   env = os.environ.copy()
   env['AWS_ACCESS_KEY_ID'] = access_key
   env['AWS_SECRET_ACCESS_KEY'] = secret_key
@@ -169,6 +176,16 @@ def s3put(bucket, access_key, secret_key, prefix, key_prefix, files):
   ] + files, env)
   print(output)
 
+def azput(prefix, key_prefix, files):
+  env = os.environ.copy()
+  output = execute([
+    'node',
+    os.path.join(os.path.dirname(__file__), 'azput.js'),
+    '--prefix', prefix,
+    '--key_prefix', key_prefix,
+  ] + files, env)
+  print(output)
+
 def get_out_dir():
   out_dir = 'Debug'
   override = os.environ.get('ELECTRON_OUT_DIR')
diff --git a/script/release/release.js b/script/release/release.js
index 3527f39ce2bd3..21ebbc0836aec 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -17,8 +17,8 @@ const pkgVersion = `v${pkg.version}`;
 const path = require('path');
 const temp = require('temp').track();
 const { URL } = require('url');
+const { BlobServiceClient } = require('@azure/storage-blob');
 const { Octokit } = require('@octokit/rest');
-const AWS = require('aws-sdk');
 
 require('colors');
 const pass = '✓'.green;
@@ -80,6 +80,8 @@ async function validateReleaseAssets (release, validatingRelease) {
     }
     const s3RemoteFiles = s3RemoteFilesForVersion(release.tag_name);
     await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
+    const azRemoteFiles = azRemoteFilesForVersion(release.tag_name);
+    await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
   }
 }
 
@@ -181,26 +183,36 @@ function assetsForVersion (version, validatingRelease) {
   return patterns;
 }
 
+const cloudStoreFilePaths = (version) => [
+  `iojs-${version}-headers.tar.gz`,
+  `iojs-${version}.tar.gz`,
+  `node-${version}.tar.gz`,
+  'node.lib',
+  'x64/node.lib',
+  'win-x64/iojs.lib',
+  'win-x86/iojs.lib',
+  'win-arm64/iojs.lib',
+  'win-x64/node.lib',
+  'win-x86/node.lib',
+  'win-arm64/node.lib',
+  'arm64/node.lib',
+  'SHASUMS.txt',
+  'SHASUMS256.txt'
+];
+
 function s3RemoteFilesForVersion (version) {
   const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/';
   const versionPrefix = `${bucket}atom-shell/dist/${version}/`;
-  const filePaths = [
-    `iojs-${version}-headers.tar.gz`,
-    `iojs-${version}.tar.gz`,
-    `node-${version}.tar.gz`,
-    'node.lib',
-    'x64/node.lib',
-    'win-x64/iojs.lib',
-    'win-x86/iojs.lib',
-    'win-arm64/iojs.lib',
-    'win-x64/node.lib',
-    'win-x86/node.lib',
-    'win-arm64/node.lib',
-    'arm64/node.lib',
-    'SHASUMS.txt',
-    'SHASUMS256.txt'
-  ];
-  return filePaths.map((filePath) => ({
+  return cloudStoreFilePaths(version).map((filePath) => ({
+    file: filePath,
+    url: `${versionPrefix}${filePath}`
+  }));
+}
+
+function azRemoteFilesForVersion (version) {
+  const azCDN = 'https://artifacts.electronjs.org/headers/';
+  const versionPrefix = `${azCDN}dist/${version}/`;
+  return cloudStoreFilePaths(version).map((filePath) => ({
     file: filePath,
     url: `${versionPrefix}${filePath}`
   }));
@@ -221,49 +233,39 @@ function runScript (scriptName, scriptArgs, cwd) {
 }
 
 function uploadNodeShasums () {
-  console.log('Uploading Node SHASUMS file to S3.');
+  console.log('Uploading Node SHASUMS file to artifacts.electronjs.org.');
   const scriptPath = path.join(ELECTRON_DIR, 'script', 'release', 'uploaders', 'upload-node-checksums.py');
   runScript(scriptPath, ['-v', pkgVersion]);
-  console.log(`${pass} Done uploading Node SHASUMS file to S3.`);
+  console.log(`${pass} Done uploading Node SHASUMS file to artifacts.electronjs.org.`);
 }
 
 function uploadIndexJson () {
-  console.log('Uploading index.json to S3.');
+  console.log('Uploading index.json to artifacts.electronjs.org.');
   const scriptPath = path.join(ELECTRON_DIR, 'script', 'release', 'uploaders', 'upload-index-json.py');
   runScript(scriptPath, [pkgVersion]);
-  console.log(`${pass} Done uploading index.json to S3.`);
+  console.log(`${pass} Done uploading index.json to artifacts.electronjs.org.`);
 }
 
 async function mergeShasums (pkgVersion) {
-  // Download individual checksum files for Electron zip files from S3,
+  // Download individual checksum files for Electron zip files from artifact storage,
   // concatenate them, and upload to GitHub.
 
-  const bucket = process.env.ELECTRON_S3_BUCKET;
-  const accessKeyId = process.env.ELECTRON_S3_ACCESS_KEY;
-  const secretAccessKey = process.env.ELECTRON_S3_SECRET_KEY;
-  if (!bucket || !accessKeyId || !secretAccessKey) {
-    throw new Error('Please set the $ELECTRON_S3_BUCKET, $ELECTRON_S3_ACCESS_KEY, and $ELECTRON_S3_SECRET_KEY environment variables');
+  const connectionString = process.env.ELECTRON_ARTIFACTS_BLOB_STORAGE;
+  if (!connectionString) {
+    throw new Error('Please set the $ELECTRON_ARTIFACTS_BLOB_STORAGE environment variable');
   }
 
-  const s3 = new AWS.S3({
-    apiVersion: '2006-03-01',
-    accessKeyId,
-    secretAccessKey,
-    region: 'us-west-2'
+  const blobServiceClient = BlobServiceClient.fromConnectionString(connectionString);
+  const containerClient = blobServiceClient.getContainerClient('checksums-scratchpad');
+  const blobsIter = containerClient.listBlobsFlat({
+    prefix: `${pkgVersion}/`
   });
-  const objects = await s3.listObjectsV2({
-    Bucket: bucket,
-    Prefix: `atom-shell/tmp/${pkgVersion}/`,
-    Delimiter: '/'
-  }).promise();
   const shasums = [];
-  for (const obj of objects.Contents) {
-    if (obj.Key.endsWith('.sha256sum')) {
-      const data = await s3.getObject({
-        Bucket: bucket,
-        Key: obj.Key
-      }).promise();
-      shasums.push(data.Body.toString('ascii').trim());
+  for await (const blob of blobsIter) {
+    if (blob.name.endsWith('.sha256sum')) {
+      const blobClient = containerClient.getBlockBlobClient(blob.name);
+      const response = await blobClient.downloadToBuffer();
+      shasums.push(response.toString('ascii').trim());
     }
   }
   return shasums.join('\n');
diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index 4b2c4973aa39d..41880d5667dae 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -9,8 +9,8 @@
 sys.path.append(
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
-from lib.config import s3_config
-from lib.util import s3put, scoped_cwd, safe_mkdir, get_out_dir, ELECTRON_DIR
+from lib.util import store_artifact, scoped_cwd, safe_mkdir, get_out_dir, \
+  ELECTRON_DIR
 
 OUT_DIR     = get_out_dir()
 
@@ -59,9 +59,7 @@ def main():
     with open(index_json, "w") as f:
       f.write(new_content)
 
-    bucket, access_key, secret_key = s3_config()
-    s3put(bucket, access_key, secret_key, OUT_DIR, 'atom-shell/dist',
-          [index_json])
+    store_artifact(OUT_DIR, 'atom-shell/dist', [index_json])
 
 
 if __name__ == '__main__':
diff --git a/script/release/uploaders/upload-node-checksums.py b/script/release/uploaders/upload-node-checksums.py
index 41d509f2a6f72..dfa8ef3595ad7 100755
--- a/script/release/uploaders/upload-node-checksums.py
+++ b/script/release/uploaders/upload-node-checksums.py
@@ -10,8 +10,7 @@
 sys.path.append(
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
-from lib.config import s3_config
-from lib.util import download, rm_rf, s3put, safe_mkdir
+from lib.util import download, rm_rf, store_artifact, safe_mkdir
 
 DIST_URL = 'https://electronjs.org/headers/'
 
@@ -30,9 +29,8 @@ def main():
   ]
 
   if args.target_dir is None:
-    bucket, access_key, secret_key = s3_config()
-    s3put(bucket, access_key, secret_key, directory,
-          'atom-shell/dist/{0}'.format(args.version), checksums)
+    store_artifact(directory, 'atom-shell/dist/{0}'.format(args.version),
+                   checksums)
   else:
     copy_files(checksums, args.target_dir)
 
diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py
index 0f81504fe117c..862eea96e8b02 100755
--- a/script/release/uploaders/upload-node-headers.py
+++ b/script/release/uploaders/upload-node-headers.py
@@ -9,8 +9,9 @@
 sys.path.append(
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
-from lib.config import PLATFORM, get_target_arch, s3_config
-from lib.util import safe_mkdir, scoped_cwd, s3put, get_out_dir, get_dist_dir
+from lib.config import PLATFORM, get_target_arch
+from lib.util import safe_mkdir, scoped_cwd, store_artifact, get_out_dir, \
+  get_dist_dir
 
 DIST_DIR    = get_dist_dir()
 OUT_DIR     = get_out_dir()
@@ -26,9 +27,8 @@
 def main():
   args = parse_args()
 
-  # Upload node's headers to S3.
-  bucket, access_key, secret_key = s3_config()
-  upload_node(bucket, access_key, secret_key, args.version)
+  # Upload node's headers to artifact storage.
+  upload_node(args.version)
 
 
 def parse_args():
@@ -38,17 +38,17 @@ def parse_args():
   return parser.parse_args()
 
 
-def upload_node(bucket, access_key, secret_key, version):
+def upload_node(version):
   with scoped_cwd(GEN_DIR):
     generated_tar = os.path.join(GEN_DIR, 'node_headers.tar.gz')
     for header_tar in HEADER_TAR_NAMES:
       versioned_header_tar = header_tar.format(version)
       shutil.copy2(generated_tar, os.path.join(GEN_DIR, versioned_header_tar))
 
-    s3put(bucket, access_key, secret_key, GEN_DIR,
-          'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz'))
-    s3put(bucket, access_key, secret_key, GEN_DIR,
-          'atom-shell/dist/{0}'.format(version), glob.glob('iojs-*.tar.gz'))
+    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
+                   glob.glob('node-*.tar.gz'))
+    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
+                   glob.glob('iojs-*.tar.gz'))
 
   if PLATFORM == 'win32':
     if get_target_arch() == 'ia32':
@@ -73,16 +73,14 @@ def upload_node(bucket, access_key, secret_key, version):
     shutil.copy2(electron_lib, v4_node_lib)
 
     # Upload the node.lib.
-    s3put(bucket, access_key, secret_key, DIST_DIR,
-          'atom-shell/dist/{0}'.format(version), [node_lib])
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [node_lib])
 
     # Upload the iojs.lib.
-    s3put(bucket, access_key, secret_key, DIST_DIR,
-          'atom-shell/dist/{0}'.format(version), [iojs_lib])
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [iojs_lib])
 
     # Upload the v4 node.lib.
-    s3put(bucket, access_key, secret_key, DIST_DIR,
-          'atom-shell/dist/{0}'.format(version), [v4_node_lib])
+    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version),
+                   [v4_node_lib])
 
 
 if __name__ == '__main__':
diff --git a/script/release/uploaders/upload-symbols.py b/script/release/uploaders/upload-symbols.py
index 25952bc05d1c9..3e877e64772db 100755
--- a/script/release/uploaders/upload-symbols.py
+++ b/script/release/uploaders/upload-symbols.py
@@ -14,8 +14,8 @@ def is_fs_case_sensitive():
 sys.path.append(
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
-from lib.config import PLATFORM, s3_config
-from lib.util import get_electron_branding, execute, s3put, \
+from lib.config import PLATFORM
+from lib.util import get_electron_branding, execute, store_artifact, \
                      get_out_dir, ELECTRON_DIR
 
 RELEASE_DIR = get_out_dir()
@@ -76,16 +76,15 @@ def main():
   for f in files:
     assert os.path.exists(f)
 
-  bucket, access_key, secret_key = s3_config()
-  upload_symbols(bucket, access_key, secret_key, files)
+  upload_symbols(files)
 
 
 def run_symstore(pdb, dest, product):
   execute(['symstore', 'add', '/r', '/f', pdb, '/s', dest, '/t', product])
 
 
-def upload_symbols(bucket, access_key, secret_key, files):
-  s3put(bucket, access_key, secret_key, SYMBOLS_DIR, 'atom-shell/symbols',
+def upload_symbols(files):
+  store_artifact(SYMBOLS_DIR, 'atom-shell/symbols',
         files)
 
 
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 88fbcc2423770..51302d677e76a 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -16,10 +16,10 @@
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
 
 from zipfile import ZipFile
-from lib.config import PLATFORM, get_target_arch,s3_config, \
+from lib.config import PLATFORM, get_target_arch, \
                        get_zip_name, enable_verbose_mode, get_platform_key
 from lib.util import get_electron_branding, execute, get_electron_version, \
-                     s3put, get_electron_exec, get_out_dir, \
+                     store_artifact, get_electron_exec, get_out_dir, \
                      SRC_DIR, ELECTRON_DIR, TS_NODE
 
 
@@ -342,14 +342,10 @@ def upload_electron(release, file_path, args):
 
   # if upload_to_s3 is set, skip github upload.
   if args.upload_to_s3:
-    bucket, access_key, secret_key = s3_config()
     key_prefix = 'electron-artifacts/{0}_{1}'.format(args.version,
                                                      args.upload_timestamp)
-    s3put(bucket, access_key, secret_key, os.path.dirname(file_path),
-          key_prefix, [file_path])
+    store_artifact(os.path.dirname(file_path), key_prefix, [file_path])
     upload_sha256_checksum(args.version, file_path, key_prefix)
-    s3url = 'https://gh-contractor-zcbenz.s3.amazonaws.com'
-    print('{0} uploaded to {1}/{2}/{0}'.format(filename, s3url, key_prefix))
     return
 
   # Upload the file.
@@ -369,7 +365,6 @@ def upload_io_to_github(release, filename, filepath, version):
 
 
 def upload_sha256_checksum(version, file_path, key_prefix=None):
-  bucket, access_key, secret_key = s3_config()
   checksum_path = '{}.sha256sum'.format(file_path)
   if key_prefix is None:
     key_prefix = 'atom-shell/tmp/{0}'.format(version)
@@ -380,8 +375,7 @@ def upload_sha256_checksum(version, file_path, key_prefix=None):
   filename = os.path.basename(file_path)
   with open(checksum_path, 'w') as checksum:
     checksum.write('{} *{}'.format(sha256.hexdigest(), filename))
-  s3put(bucket, access_key, secret_key, os.path.dirname(checksum_path),
-        key_prefix, [checksum_path])
+  store_artifact(os.path.dirname(checksum_path), key_prefix, [checksum_path])
 
 
 def get_release(version):
diff --git a/yarn.lock b/yarn.lock
index 39af7f570db85..ca7df59b03cf9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,94 @@
 # yarn lockfile v1
 
 
+"@azure/abort-controller@^1.0.0":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd"
+  integrity sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==
+  dependencies:
+    tslib "^2.0.0"
+
+"@azure/core-asynciterator-polyfill@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz#0dd3849fb8d97f062a39db0e5cadc9ffaf861fec"
+  integrity sha512-3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw==
+
+"@azure/core-auth@^1.3.0":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
+  integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/core-http@^2.0.0":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.4.tgz#df5a5b4138dbbc4299879f2fc6f257d0a5f0401e"
+  integrity sha512-QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
+    "@azure/core-auth" "^1.3.0"
+    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/logger" "^1.0.0"
+    "@types/node-fetch" "^2.5.0"
+    "@types/tunnel" "^0.0.3"
+    form-data "^4.0.0"
+    node-fetch "^2.6.7"
+    process "^0.11.10"
+    tough-cookie "^4.0.0"
+    tslib "^2.2.0"
+    tunnel "^0.0.6"
+    uuid "^8.3.0"
+    xml2js "^0.4.19"
+
+"@azure/core-lro@^2.2.0":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.4.tgz#42fbf4ae98093c59005206a4437ddcd057c57ca1"
+  integrity sha512-e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/logger" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/core-paging@^1.1.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.2.1.tgz#1b884f563b6e49971e9a922da3c7a20931867b54"
+  integrity sha512-UtH5iMlYsvg+nQYIl4UHlvvSrsBjOlRF4fs0j7mxd3rWdAStrKYrh2durOpHs5C9yZbVhsVDaisoyaf/lL1EVA==
+  dependencies:
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
+    tslib "^2.2.0"
+
+"@azure/core-tracing@1.0.0-preview.13":
+  version "1.0.0-preview.13"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+  dependencies:
+    "@opentelemetry/api" "^1.0.1"
+    tslib "^2.2.0"
+
+"@azure/logger@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96"
+  integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==
+  dependencies:
+    tslib "^2.2.0"
+
+"@azure/storage-blob@^12.9.0":
+  version "12.9.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.9.0.tgz#4cbd8b4c7a47dd064867430db892f4ef2d8f17ab"
+  integrity sha512-ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg==
+  dependencies:
+    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-http" "^2.0.0"
+    "@azure/core-lro" "^2.2.0"
+    "@azure/core-paging" "^1.1.1"
+    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/logger" "^1.0.0"
+    events "^3.0.0"
+    tslib "^2.2.0"
+
 "@babel/code-frame@^7.0.0":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -181,6 +269,11 @@
   dependencies:
     "@types/node" ">= 8"
 
+"@opentelemetry/api@^1.0.1":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.4.tgz#a167e46c10d05a07ab299fc518793b0cff8f6924"
+  integrity sha512-BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog==
+
 "@primer/octicons@^10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@primer/octicons/-/octicons-10.0.0.tgz#81e94ed32545dfd3472c8625a5b345f3ea4c153d"
@@ -431,6 +524,14 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
+"@types/node-fetch@^2.5.0":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+  integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+  dependencies:
+    "@types/node" "*"
+    form-data "^3.0.0"
+
 "@types/node@*":
   version "12.6.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.1.tgz#d5544f6de0aae03eefbb63d5120f6c8be0691946"
@@ -554,6 +655,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/tunnel@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
+  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/uglify-js@*":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082"
@@ -1108,6 +1216,11 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1685,6 +1798,13 @@ colors@^1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
   integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 commander@^2.20.0, commander@^2.9.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
@@ -2027,6 +2147,11 @@ deglob@^4.0.1:
     run-parallel "^1.1.2"
     uniq "^1.0.1"
 
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -2980,6 +3105,24 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 format@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
@@ -4768,6 +4911,18 @@ mime-db@1.40.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 mime-types@~2.1.24:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
@@ -4946,7 +5101,7 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch@^2.3.0:
+node-fetch@^2.3.0, node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -5630,6 +5785,11 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
+psl@^1.1.33:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -5677,7 +5837,7 @@ punycode@^1.2.4:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -7354,6 +7514,15 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -7404,6 +7573,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tslib@^2.0.0, tslib@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
 tsutils@^3.17.1:
   version "3.17.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -7416,6 +7590,11 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7645,7 +7824,7 @@ universal-user-agent@^6.0.0:
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
   integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -7754,6 +7933,11 @@ uuid@3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
@@ -8024,6 +8208,19 @@ xml2js@0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
+xml2js@^0.4.19:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmlbuilder@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"

From f287b0b3826c2e895ae7662df5e7721d55c213ac Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 06:03:57 -0700
Subject: [PATCH 218/811] Bump v20.0.0-nightly.20220404

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..096948707b216 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220404
\ No newline at end of file
diff --git a/package.json b/package.json
index e976065ea1d06..7167ce0e065b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220404",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..9d5255ed33325 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220404
+ PRODUCTVERSION 20,0,0,20220404
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From e28bde99476e640142396a36c1c562d377214509 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 07:31:00 -0700
Subject: [PATCH 219/811] Revert "Bump v20.0.0-nightly.20220404"

This reverts commit f287b0b3826c2e895ae7662df5e7721d55c213ac.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 096948707b216..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220404
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 7167ce0e065b8..e976065ea1d06 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220404",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9d5255ed33325..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220404
- PRODUCTVERSION 20,0,0,20220404
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c2449c421cf5aae37134757baf4ce62d0a177a2d Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 15:43:36 -0700
Subject: [PATCH 220/811] build: enable RDP for release builds

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a449f76827eb3..2897c134cd3df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,8 +24,8 @@
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
 # Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+on_finish:
+ - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 version: 1.0.{build}
 build_cloud: electron-16-core

From 18db9c551dc20c13177aed33b20edeb567fe2cec Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 15:43:57 -0700
Subject: [PATCH 221/811] Revert "build: enable RDP for release builds"

This reverts commit c2449c421cf5aae37134757baf4ce62d0a177a2d.
---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2897c134cd3df..a449f76827eb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,8 +24,8 @@
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
 # Uncomment these lines to enable RDP
-on_finish:
- - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 version: 1.0.{build}
 build_cloud: electron-16-core

From 09251fe24c586d7d6620e6f1e48d7ddee3440b5d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:44:35 -0700
Subject: [PATCH 222/811] Bump v20.0.0-nightly.20220404

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..096948707b216 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220404
\ No newline at end of file
diff --git a/package.json b/package.json
index e976065ea1d06..7167ce0e065b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220404",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..9d5255ed33325 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220404
+ PRODUCTVERSION 20,0,0,20220404
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 58386fbf4384f7a9221312241364a39e11fc8b38 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:44:53 -0700
Subject: [PATCH 223/811] Revert "Bump v20.0.0-nightly.20220404"

This reverts commit 5985e6fd76a552b9647eb81c0fbaf9f609b11935.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 096948707b216..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220404
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 7167ce0e065b8..e976065ea1d06 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220404",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9d5255ed33325..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220404
- PRODUCTVERSION 20,0,0,20220404
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From fcd7dbfa5c1950ea4215b2b5ddd0a8942fb37ed9 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 15:45:05 -0700
Subject: [PATCH 224/811] build: enable RDP for release builds

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a449f76827eb3..2897c134cd3df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,8 +24,8 @@
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
 # Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+on_finish:
+ - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 version: 1.0.{build}
 build_cloud: electron-16-core

From bff1a37791888204e43a0c848087a6a9f7cc31d1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:46:28 -0700
Subject: [PATCH 225/811] Bump v20.0.0-nightly.20220404

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..096948707b216 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220404
\ No newline at end of file
diff --git a/package.json b/package.json
index e976065ea1d06..7167ce0e065b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220404",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..9d5255ed33325 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220404
+ PRODUCTVERSION 20,0,0,20220404
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 128560c4ac50789f13fa98bc2d7dbb5e20efb811 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:49:20 -0700
Subject: [PATCH 226/811] Revert "Bump v20.0.0-nightly.20220404"

This reverts commit bff1a37791888204e43a0c848087a6a9f7cc31d1.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 096948707b216..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220404
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 7167ce0e065b8..e976065ea1d06 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220404",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9d5255ed33325..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220404
- PRODUCTVERSION 20,0,0,20220404
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d309558f649736085f67bba7609498222ddc7182 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 15:49:15 -0700
Subject: [PATCH 227/811] build: enable RDP for release builds

---
 appveyor.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2897c134cd3df..bd6b0c3db4465 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,10 +23,6 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
-# Uncomment these lines to enable RDP
-on_finish:
- - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.6.2
@@ -235,6 +231,8 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
+  # Uncomment this lines to enable RDP
+  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - cd ..
   - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
   - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)

From df34d20a219ec7fc47b211990cf5239399e18de9 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:50:33 -0700
Subject: [PATCH 228/811] Bump v20.0.0-nightly.20220404

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..096948707b216 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220404
\ No newline at end of file
diff --git a/package.json b/package.json
index e976065ea1d06..7167ce0e065b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220404",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..9d5255ed33325 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220404
+ PRODUCTVERSION 20,0,0,20220404
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From dce6c23b335d1032e40e24a0f09cf230f76cd457 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 16:25:10 -0700
Subject: [PATCH 229/811] Revert "build: enable RDP for release builds"

This reverts commit d309558f649736085f67bba7609498222ddc7182.
---
 appveyor.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index bd6b0c3db4465..2897c134cd3df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,10 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
+# Uncomment these lines to enable RDP
+on_finish:
+ - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.6.2
@@ -231,8 +235,6 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
-  # Uncomment this lines to enable RDP
-  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - cd ..
   - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
   - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)

From 1ada5d7ddf794195e3ce9da1017e1ebd24cf5811 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 16:25:19 -0700
Subject: [PATCH 230/811] Revert "Revert "build: enable RDP for release
 builds""

This reverts commit dce6c23b335d1032e40e24a0f09cf230f76cd457.
---
 appveyor.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2897c134cd3df..bd6b0c3db4465 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,10 +23,6 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
-# Uncomment these lines to enable RDP
-on_finish:
- - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.6.2
@@ -235,6 +231,8 @@ deploy_script:
         node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
+  # Uncomment this lines to enable RDP
+  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - cd ..
   - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
   - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)

From 477aa389e650d3dd2c3658b349f9a550201e6abb Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 4 Apr 2022 16:25:32 -0700
Subject: [PATCH 231/811] build: disable RDP

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index bd6b0c3db4465..55bdb38d5d864 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -232,7 +232,7 @@ deploy_script:
       }
 on_finish:
   # Uncomment this lines to enable RDP
-  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - cd ..
   - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
   - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)

From a72acfc5355a9e5737be3543b65d2d03f1246e30 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 4 Apr 2022 17:01:12 -0700
Subject: [PATCH 232/811] fix: revert "fix: some frameless windows showing a
 frame on Windows (#32692)" (#33599)

This reverts commit 7c701367c0820691e2a0f8f1cfd1fb3470071704.
---
 shell/browser/native_window_views.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index f542365e290df..03501b7b73f52 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -340,14 +340,15 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
     // Set Window style so that we get a minimize and maximize animation when
     // frameless.
     DWORD frame_style = WS_CAPTION | WS_OVERLAPPED;
-    if (resizable_ && thick_frame_)
+    if (resizable_)
       frame_style |= WS_THICKFRAME;
     if (minimizable_)
       frame_style |= WS_MINIMIZEBOX;
     if (maximizable_)
       frame_style |= WS_MAXIMIZEBOX;
-    if (!thick_frame_ || !has_frame())
-      frame_style &= ~WS_CAPTION;
+    // We should not show a frame for transparent window.
+    if (!thick_frame_)
+      frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
     ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
   }
 

From fcbdaab5e3c395a844ef75f0aa766dd20b1d90e9 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 4 Apr 2022 20:22:36 -0700
Subject: [PATCH 233/811] fix: add missing translation string for ax tree
 (#33614)

---
 electron_strings.grdp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/electron_strings.grdp b/electron_strings.grdp
index bf5dcf652558d..5068141716d7a 100644
--- a/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -145,4 +145,16 @@
   </message>
   <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
         Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
+  <if expr="is_win">
+    <then>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled graphic
+      </message>
+    </then>
+    <else>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled image
+      </message>
+    </else>
+  </if>
 </grit-part>

From cc3743bd43197db26411fd84a6d67fdff487c81d Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 5 Apr 2022 18:09:12 +0200
Subject: [PATCH 234/811] fix: remove usage of private pid API on MAS (#33594)

---
 patches/chromium/mas_no_private_api.patch | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index dd209431cba87..8054716d63c78 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -6,6 +6,33 @@ Subject: mas: avoid some private APIs
 Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
 excluded for people who want to submit their apps to the Mac App store.
 
+diff --git a/base/process/process_info_mac.cc b/base/process/process_info_mac.cc
+index 368405f29313d51a6eee16517b634c6d0ea95281..2553a7fbf1e8b4dea796dec3b3e906d265d3ad76 100644
+--- a/base/process/process_info_mac.cc
++++ b/base/process/process_info_mac.cc
+@@ -5,18 +5,22 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#ifndef MAS_BUILD
+ extern "C" {
+ pid_t responsibility_get_pid_responsible_for_pid(pid_t)
+     API_AVAILABLE(macosx(10.12));
+ }
++#endif
+ 
+ namespace base {
+ 
+ bool IsProcessSelfResponsible() {
++#ifndef MAS_BUILD
+   if (__builtin_available(macOS 10.14, *)) {
+     const pid_t pid = getpid();
+     return responsibility_get_pid_responsible_for_pid(pid) == pid;
+   }
++#endif
+   return true;
+ }
+ 
 diff --git a/content/common/pseudonymization_salt.cc b/content/common/pseudonymization_salt.cc
 index 28e003bef910abff022def659fe18d4cd0549f8a..530bcbdb5d350f6486dc1e8536f7b279be69e241 100644
 --- a/content/common/pseudonymization_salt.cc

From 927ab3104d9bb2b6a773d5b7a78b0da81f870b91 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Apr 2022 09:17:12 -0700
Subject: [PATCH 235/811] Revert "Bump v20.0.0-nightly.20220404"

This reverts commit df34d20a219ec7fc47b211990cf5239399e18de9.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 096948707b216..b0d7db7463dd8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220404
\ No newline at end of file
+20.0.0-nightly.20220330
\ No newline at end of file
diff --git a/package.json b/package.json
index 7167ce0e065b8..e976065ea1d06 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220404",
+  "version": "20.0.0-nightly.20220330",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9d5255ed33325..5746c1f414b34 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220404
- PRODUCTVERSION 20,0,0,20220404
+ FILEVERSION 20,0,0,20220330
+ PRODUCTVERSION 20,0,0,20220330
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4615fc53ca3af6de585de1c25ff623169cbba5d8 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 5 Apr 2022 09:25:07 -0700
Subject: [PATCH 236/811] chore: fix typo in NotifyWindowRequestPreferredWidth
 method name (#33568)

---
 shell/browser/native_window.cc                        | 2 +-
 shell/browser/native_window.h                         | 2 +-
 shell/browser/ui/cocoa/electron_ns_window_delegate.mm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 1ca962fa92746..989d816c17c8a 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -479,7 +479,7 @@ void NativeWindow::SetWindowControlsOverlayRect(const gfx::Rect& overlay_rect) {
   overlay_rect_ = overlay_rect;
 }
 
-void NativeWindow::NotifyWindowRequestPreferredWith(int* width) {
+void NativeWindow::NotifyWindowRequestPreferredWidth(int* width) {
   for (NativeWindowObserver& observer : observers_)
     observer.RequestPreferredWidth(width);
 }
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index 762552656a5df..febc36213fd04 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -269,7 +269,7 @@ class NativeWindow : public base::SupportsUserData,
 
   // Public API used by platform-dependent delegates and observers to send UI
   // related notifications.
-  void NotifyWindowRequestPreferredWith(int* width);
+  void NotifyWindowRequestPreferredWidth(int* width);
   void NotifyWindowCloseButtonClicked();
   void NotifyWindowClosed();
   void NotifyWindowEndSession();
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 1723f5c6d55ea..f9b7a1170d1de 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -75,7 +75,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window
 
   // Get preferred width from observers. Usually the page width.
   int preferred_width = 0;
-  shell_->NotifyWindowRequestPreferredWith(&preferred_width);
+  shell_->NotifyWindowRequestPreferredWidth(&preferred_width);
 
   // Never shrink from the current size on zoom.
   NSRect window_frame = [window frame];

From f95e565884999ddc2609742b2ba60e368e5a46e7 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 6 Apr 2022 13:40:52 +0200
Subject: [PATCH 237/811] chore: combine some smaller MAS patches (#33595)

* chore: combine some smaller MAS patches

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/.patches                     |   7 +-
 patches/chromium/mas-audiodeviceduck.patch    |  35 ---
 patches/chromium/mas-cfisobjc.patch           |  44 ----
 .../mas_avoid_usage_of_abort_report_np.patch  |  35 ---
 ...as_avoid_usage_of_private_macos_apis.patch | 233 ++++++++++++++++++
 ...mas_avoid_usage_of_pthread_fchdir_np.patch |  66 -----
 ..._usage_of_setapplicationisdaemon_and.patch |  50 ----
 .../mas_gate_private_enterprise_APIs.patch    |  36 ---
 8 files changed, 234 insertions(+), 272 deletions(-)
 delete mode 100644 patches/chromium/mas-audiodeviceduck.patch
 delete mode 100644 patches/chromium/mas-cfisobjc.patch
 delete mode 100644 patches/chromium/mas_avoid_usage_of_abort_report_np.patch
 create mode 100644 patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
 delete mode 100644 patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch
 delete mode 100644 patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch
 delete mode 100644 patches/chromium/mas_gate_private_enterprise_APIs.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 901b355c9245a..1487c1a4cc111 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -21,15 +21,11 @@ resource_file_conflict.patch
 scroll_bounce_flag.patch
 mas_blink_no_private_api.patch
 mas_no_private_api.patch
-mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
-mas-audiodeviceduck.patch
 mas_disable_remote_layer.patch
 mas_disable_remote_accessibility.patch
 mas_disable_custom_window_frame.patch
-mas_avoid_usage_of_abort_report_np.patch
-mas_avoid_usage_of_pthread_fchdir_np.patch
-mas_avoid_usage_of_setapplicationisdaemon_and.patch
+mas_avoid_usage_of_private_macos_apis.patch
 mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
 chrome_key_systems.patch
 add_didinstallconditionalfeatures.patch
@@ -103,7 +99,6 @@ chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
 process_singleton.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
-mas_gate_private_enterprise_APIs.patch
 load_v8_snapshot_in_browser_process.patch
 fix_patch_out_permissions_checks_in_exclusive_access.patch
 fix_aspect_ratio_with_max_size.patch
diff --git a/patches/chromium/mas-audiodeviceduck.patch b/patches/chromium/mas-audiodeviceduck.patch
deleted file mode 100644
index 765e3e06f0711..0000000000000
--- a/patches/chromium/mas-audiodeviceduck.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Thu, 20 Sep 2018 17:49:31 -0700
-Subject: mas: avoid usage of AudioDeviceDuck
-
-Removes usage of the AudioDeviceDuck private API.
-
-diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-index e28d37435da00153e34132f49ce8f6b240e70a65..77ce459d969022b7c5a4d1e57bb1f7e6fa7a9898 100644
---- a/media/audio/mac/audio_low_latency_input_mac.cc
-+++ b/media/audio/mac/audio_low_latency_input_mac.cc
-@@ -34,19 +34,23 @@
- 
- namespace {
- extern "C" {
-+#ifndef MAS_BUILD
- // See:
- // https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
- OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
-                          Float32 inDuckedLevel,
-                          const AudioTimeStamp* __nullable inStartTime,
-                          Float32 inRampDuration) __attribute__((weak_import));
-+#endif
- }
- 
- void UndoDucking(AudioDeviceID output_device_id) {
-+#ifndef MAS_BUILD
-   if (AudioDeviceDuck != nullptr) {
-     // Ramp the volume back up over half a second.
-     AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
-   }
-+#endif
- }
- 
- }  // namespace
diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch
deleted file mode 100644
index 7efd6508d3fcc..0000000000000
--- a/patches/chromium/mas-cfisobjc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Thu, 20 Sep 2018 17:49:20 -0700
-Subject: mas: avoid usage of _CFIsObjC
-
-Removes usage of the _CFIsObjC private API.
-
-diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
---- a/base/mac/foundation_util.mm
-+++ b/base/mac/foundation_util.mm
-@@ -30,12 +30,6 @@
- #if !BUILDFLAG(IS_IOS)
- CFTypeID SecACLGetTypeID();
- CFTypeID SecTrustedApplicationGetTypeID();
--// The NSFont/CTFont toll-free bridging is broken before 10.15.
--// http://www.openradar.me/15341349 rdar://15341349
--//
--// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
--// minimum OS for Chromium, remove this SPI declaration.
--Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
- #endif
- }  // extern "C"
- 
-@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
-       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
-   DCHECK(!cf_val ||
-          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
--         (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
--          [ns_val isKindOfClass:[NSFont class]]));
-+         ([ns_val isKindOfClass:[NSFont class]]));
-   return ns_val;
- }
- 
-@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
-     return (CTFontRef)(cf_val);
-   }
- 
--  if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
--    return NULL;
--
-   id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
-   if ([ns_val isKindOfClass:[NSFont class]]) {
-     return (CTFontRef)(cf_val);
diff --git a/patches/chromium/mas_avoid_usage_of_abort_report_np.patch b/patches/chromium/mas_avoid_usage_of_abort_report_np.patch
deleted file mode 100644
index 5c3f9a8b72719..0000000000000
--- a/patches/chromium/mas_avoid_usage_of_abort_report_np.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Mon, 4 Mar 2019 14:43:36 -0800
-Subject: mas: avoid usage of abort_report_np
-
-Disable usage of the private API abort_report_np in MAS builds.
-
-diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
-index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644
---- a/sandbox/mac/sandbox_logging.cc
-+++ b/sandbox/mac/sandbox_logging.cc
-@@ -32,9 +32,11 @@
-   }
- #endif
- 
-+#if !defined(MAS_BUILD)
- extern "C" {
- void abort_report_np(const char*, ...);
- }
-+#endif
- 
- namespace sandbox {
- 
-@@ -104,9 +106,11 @@ void SendAslLog(Level level, const char* message) {
-   asl_set(asl_message.get(), ASL_KEY_MSG, message);
-   asl_send(asl_client.get(), asl_message.get());
- 
-+#if !defined(MAS_BUILD)
-   if (level == Level::FATAL) {
-     abort_report_np(message);
-   }
-+#endif
- }
- 
- // |error| is strerror(errno) when a P* logging function is called. Pass
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
new file mode 100644
index 0000000000000..03d4ca35e86d8
--- /dev/null
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -0,0 +1,233 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@slack-corp.com>
+Date: Mon, 4 Mar 2019 14:43:36 -0800
+Subject: mas: avoid usage of private macOS APIs
+
+Disable usage of the following private APIs in MAS builds:
+* abort_report_np
+* pthread_fchdir_np
+* pthread_chdir_np
+* SetApplicationIsDaemon
+* _LSSetApplicationLaunchServicesServerConnectionStatus
+* AreDeviceAndUserJoinedToDomain
+* _CFIsObjC
+* AudioDeviceDuck
+
+diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
+index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9a6d0bacc 100644
+--- a/base/enterprise_util_mac.mm
++++ b/base/enterprise_util_mac.mm
+@@ -168,6 +168,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
+ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
+   static DeviceUserDomainJoinState state = [] {
+     DeviceUserDomainJoinState state{false, false};
++#if defined(MAS_BUILD)
++    return state;
++  }();
++
++  return state;
++}
++#else
+ 
+     @autoreleasepool {
+       ODSession* session = [ODSession defaultSession];
+@@ -274,5 +281,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
+ 
+   return state;
+ }
++#endif
+ 
+ }  // namespace base
+diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
+index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
+--- a/base/mac/foundation_util.mm
++++ b/base/mac/foundation_util.mm
+@@ -30,12 +30,6 @@
+ #if !BUILDFLAG(IS_IOS)
+ CFTypeID SecACLGetTypeID();
+ CFTypeID SecTrustedApplicationGetTypeID();
+-// The NSFont/CTFont toll-free bridging is broken before 10.15.
+-// http://www.openradar.me/15341349 rdar://15341349
+-//
+-// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
+-// minimum OS for Chromium, remove this SPI declaration.
+-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
+ #endif
+ }  // extern "C"
+ 
+@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+       const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
+   DCHECK(!cf_val ||
+          CTFontGetTypeID() == CFGetTypeID(cf_val) ||
+-         (_CFIsObjC(CTFontGetTypeID(), cf_val) &&
+-          [ns_val isKindOfClass:[NSFont class]]));
++         ([ns_val isKindOfClass:[NSFont class]]));
+   return ns_val;
+ }
+ 
+@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+     return (CTFontRef)(cf_val);
+   }
+ 
+-  if (!_CFIsObjC(CTFontGetTypeID(), cf_val))
+-    return NULL;
+-
+   id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
+   if ([ns_val isKindOfClass:[NSFont class]]) {
+     return (CTFontRef)(cf_val);
+diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
+index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd51e99377c 100644
+--- a/base/process/launch_mac.cc
++++ b/base/process/launch_mac.cc
+@@ -26,8 +26,10 @@ extern "C" {
+ // descriptor. libpthread only exposes a syscall wrapper starting in
+ // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
+ // the syscall is issued directly.
++#if !defined(MAS_BUILD)
+ int pthread_chdir_np(const char* dir) API_AVAILABLE(macosx(10.12));
+ int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12));
++#endif
+ 
+ int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
+     API_AVAILABLE(macosx(10.14));
+@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
+ };
+ 
+ int ChangeCurrentThreadDirectory(const char* path) {
++  #if defined(MAS_BUILD)
++  return syscall(SYS___pthread_chdir, path);
++  #else
+   if (__builtin_available(macOS 10.12, *)) {
+     return pthread_chdir_np(path);
+   } else {
+     return syscall(SYS___pthread_chdir, path);
+   }
++  #endif
+ }
+ 
+ // The recommended way to unset a per-thread cwd is to set a new value to an
+ // invalid file descriptor, per libpthread-218.1.3/private/private.h.
+ int ResetCurrentThreadDirectory() {
++  #if defined(MAS_BUILD)
++  return syscall(SYS___pthread_fchdir, -1);
++  #else
+   if (__builtin_available(macOS 10.12, *)) {
+     return pthread_fchdir_np(-1);
+   } else {
+     return syscall(SYS___pthread_fchdir, -1);
+   }
++  #endif
+ }
+ 
+ struct GetAppOutputOptions {
+@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+     file_actions.Inherit(STDERR_FILENO);
+   }
+ 
++#if 0
+   if (options.disclaim_responsibility) {
+     if (__builtin_available(macOS 10.14, *)) {
+       DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
+     }
+   }
++#endif
+ 
+   std::vector<char*> argv_cstr;
+   argv_cstr.reserve(argv.size() + 1);
+diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
+index e28d37435da00153e34132f49ce8f6b240e70a65..77ce459d969022b7c5a4d1e57bb1f7e6fa7a9898 100644
+--- a/media/audio/mac/audio_low_latency_input_mac.cc
++++ b/media/audio/mac/audio_low_latency_input_mac.cc
+@@ -34,19 +34,23 @@
+ 
+ namespace {
+ extern "C" {
++#ifndef MAS_BUILD
+ // See:
+ // https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h?rev=228264
+ OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
+                          Float32 inDuckedLevel,
+                          const AudioTimeStamp* __nullable inStartTime,
+                          Float32 inRampDuration) __attribute__((weak_import));
++#endif
+ }
+ 
+ void UndoDucking(AudioDeviceID output_device_id) {
++#ifndef MAS_BUILD
+   if (AudioDeviceDuck != nullptr) {
+     // Ramp the volume back up over half a second.
+     AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
+   }
++#endif
+ }
+ 
+ }  // namespace
+diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
+index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644
+--- a/sandbox/mac/sandbox_logging.cc
++++ b/sandbox/mac/sandbox_logging.cc
+@@ -32,9 +32,11 @@
+   }
+ #endif
+ 
++#if !defined(MAS_BUILD)
+ extern "C" {
+ void abort_report_np(const char*, ...);
+ }
++#endif
+ 
+ namespace sandbox {
+ 
+@@ -104,9 +106,11 @@ void SendAslLog(Level level, const char* message) {
+   asl_set(asl_message.get(), ASL_KEY_MSG, message);
+   asl_send(asl_client.get(), asl_message.get());
+ 
++#if !defined(MAS_BUILD)
+   if (level == Level::FATAL) {
+     abort_report_np(message);
+   }
++#endif
+ }
+ 
+ // |error| is strerror(errno) when a P* logging function is called. Pass
+diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc
+index 9f5261425162791668c2d15b7ffba091f831d652..c37f3dc05cb8372c7a6c4caef7a280b6f2f48e98 100644
+--- a/sandbox/mac/system_services.cc
++++ b/sandbox/mac/system_services.cc
+@@ -9,6 +9,7 @@
+ 
+ #include "base/mac/mac_logging.h"
+ 
++#if !defined(MAS_BUILD)
+ extern "C" {
+ OSStatus SetApplicationIsDaemon(Boolean isDaemon);
+ void _LSSetApplicationLaunchServicesServerConnectionStatus(
+@@ -19,10 +20,12 @@ void _LSSetApplicationLaunchServicesServerConnectionStatus(
+ // https://github.com/WebKit/webkit/commit/8da694b0b3febcc262653d01a45e946ce91845ed.
+ void _CSCheckFixDisable() API_AVAILABLE(macosx(10.15));
+ }  // extern "C"
++#endif
+ 
+ namespace sandbox {
+ 
+ void DisableLaunchServices() {
++  #if !defined(MAS_BUILD)
+   // Allow the process to continue without a LaunchServices ASN. The
+   // INIT_Process function in HIServices will abort if it cannot connect to
+   // launchservicesd to get an ASN. By setting this flag, HIServices skips
+@@ -36,12 +39,15 @@ void DisableLaunchServices() {
+       0, ^bool(CFDictionaryRef options) {
+         return false;
+       });
++  #endif
+ }
+ 
+ void DisableCoreServicesCheckFix() {
++#if !defined(MAS_BUILD)
+   if (__builtin_available(macOS 10.15, *)) {
+     _CSCheckFixDisable();
+   }
++#endif
+ }
+ 
+ }  // namespace sandbox
diff --git a/patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch b/patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch
deleted file mode 100644
index 5ea6286df620b..0000000000000
--- a/patches/chromium/mas_avoid_usage_of_pthread_fchdir_np.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Mon, 4 Mar 2019 14:46:48 -0800
-Subject: mas: avoid usage of pthread_fchdir_np
-
-Disable usage of pthread_fchdir_np and pthread_chdir_np in MAS builds.
-
-diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd51e99377c 100644
---- a/base/process/launch_mac.cc
-+++ b/base/process/launch_mac.cc
-@@ -26,8 +26,10 @@ extern "C" {
- // descriptor. libpthread only exposes a syscall wrapper starting in
- // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
- // the syscall is issued directly.
-+#if !defined(MAS_BUILD)
- int pthread_chdir_np(const char* dir) API_AVAILABLE(macosx(10.12));
- int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12));
-+#endif
- 
- int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
-     API_AVAILABLE(macosx(10.14));
-@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
- };
- 
- int ChangeCurrentThreadDirectory(const char* path) {
-+  #if defined(MAS_BUILD)
-+  return syscall(SYS___pthread_chdir, path);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_chdir_np(path);
-   } else {
-     return syscall(SYS___pthread_chdir, path);
-   }
-+  #endif
- }
- 
- // The recommended way to unset a per-thread cwd is to set a new value to an
- // invalid file descriptor, per libpthread-218.1.3/private/private.h.
- int ResetCurrentThreadDirectory() {
-+  #if defined(MAS_BUILD)
-+  return syscall(SYS___pthread_fchdir, -1);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_fchdir_np(-1);
-   } else {
-     return syscall(SYS___pthread_fchdir, -1);
-   }
-+  #endif
- }
- 
- struct GetAppOutputOptions {
-@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
-     file_actions.Inherit(STDERR_FILENO);
-   }
- 
-+#if 0
-   if (options.disclaim_responsibility) {
-     if (__builtin_available(macOS 10.14, *)) {
-       DPSXCHECK(responsibility_spawnattrs_setdisclaim(attr.get(), 1));
-     }
-   }
-+#endif
- 
-   std::vector<char*> argv_cstr;
-   argv_cstr.reserve(argv.size() + 1);
diff --git a/patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch b/patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch
deleted file mode 100644
index a6d15502298b1..0000000000000
--- a/patches/chromium/mas_avoid_usage_of_setapplicationisdaemon_and.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Mon, 4 Mar 2019 14:51:45 -0800
-Subject: mas: avoid usage of SetApplicationIsDaemon and
- _LSSetApplicationLaunchServicesServerConnectionStatus
-
-Disable usage of SetApplicationIsDaemon and
-_LSSetApplicationLaunchServicesServerConnectionStatus in MAS builds
-
-diff --git a/sandbox/mac/system_services.cc b/sandbox/mac/system_services.cc
-index 9f5261425162791668c2d15b7ffba091f831d652..c37f3dc05cb8372c7a6c4caef7a280b6f2f48e98 100644
---- a/sandbox/mac/system_services.cc
-+++ b/sandbox/mac/system_services.cc
-@@ -9,6 +9,7 @@
- 
- #include "base/mac/mac_logging.h"
- 
-+#if !defined(MAS_BUILD)
- extern "C" {
- OSStatus SetApplicationIsDaemon(Boolean isDaemon);
- void _LSSetApplicationLaunchServicesServerConnectionStatus(
-@@ -19,10 +20,12 @@ void _LSSetApplicationLaunchServicesServerConnectionStatus(
- // https://github.com/WebKit/webkit/commit/8da694b0b3febcc262653d01a45e946ce91845ed.
- void _CSCheckFixDisable() API_AVAILABLE(macosx(10.15));
- }  // extern "C"
-+#endif
- 
- namespace sandbox {
- 
- void DisableLaunchServices() {
-+  #if !defined(MAS_BUILD)
-   // Allow the process to continue without a LaunchServices ASN. The
-   // INIT_Process function in HIServices will abort if it cannot connect to
-   // launchservicesd to get an ASN. By setting this flag, HIServices skips
-@@ -36,12 +39,15 @@ void DisableLaunchServices() {
-       0, ^bool(CFDictionaryRef options) {
-         return false;
-       });
-+  #endif
- }
- 
- void DisableCoreServicesCheckFix() {
-+#if !defined(MAS_BUILD)
-   if (__builtin_available(macOS 10.15, *)) {
-     _CSCheckFixDisable();
-   }
-+#endif
- }
- 
- }  // namespace sandbox
diff --git a/patches/chromium/mas_gate_private_enterprise_APIs.patch b/patches/chromium/mas_gate_private_enterprise_APIs.patch
deleted file mode 100644
index 306a8c3792401..0000000000000
--- a/patches/chromium/mas_gate_private_enterprise_APIs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <khammond@slack-corp.com>
-Date: Tue, 19 Oct 2021 16:56:25 -0700
-Subject: fix: mas gate private enterprise APIs
-
-Beginning in Electron 15.2.0, Chromium moved several formerly public
-APIs into the AreDeviceAndUserJoinedToDomain method. Using these APIs
-in a MAS build will result in rejection from the Apple Store. This
-patch gates those APIs to non-MAS builds to comply with Apple
-Store requirements, and returns the default state for MAS builds.
-
-diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
-index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9a6d0bacc 100644
---- a/base/enterprise_util_mac.mm
-+++ b/base/enterprise_util_mac.mm
-@@ -168,6 +168,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
- DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
-   static DeviceUserDomainJoinState state = [] {
-     DeviceUserDomainJoinState state{false, false};
-+#if defined(MAS_BUILD)
-+    return state;
-+  }();
-+
-+  return state;
-+}
-+#else
- 
-     @autoreleasepool {
-       ODSession* session = [ODSession defaultSession];
-@@ -274,5 +281,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
- 
-   return state;
- }
-+#endif
- 
- }  // namespace base

From a05d9be44fdb5be9e1570d0516df77578cf8b23e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 06:01:36 -0700
Subject: [PATCH 238/811] Bump v20.0.0-nightly.20220406

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b0d7db7463dd8..115929710e8f0 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220330
\ No newline at end of file
+20.0.0-nightly.20220406
\ No newline at end of file
diff --git a/package.json b/package.json
index e976065ea1d06..82c7988249e35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220330",
+  "version": "20.0.0-nightly.20220406",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -142,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5746c1f414b34..c51befca22115 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220330
- PRODUCTVERSION 20,0,0,20220330
+ FILEVERSION 20,0,0,20220406
+ PRODUCTVERSION 20,0,0,20220406
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0168aede8e597bd91b1a7cad732301c6df48f532 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 6 Apr 2022 09:34:35 -0700
Subject: [PATCH 239/811] chore: use //chrome resources directly (#33626)

---
 BUILD.gn                                      |   1 +
 electron_paks.gni                             |  12 +-
 electron_resources.grd                        |   7 -
 electron_strings.grdp                         | 160 -----------------
 patches/chromium/.patches                     |   2 -
 ..._depend_on_packed_resource_integrity.patch |   2 +-
 ...esources_not_chrome_for_spellchecker.patch |  58 ------
 patches/chromium/desktop_media_list.patch     |  11 +-
 ...fix_use_electron_generated_resources.patch |  53 ------
 patches/chromium/picture-in-picture.patch     | 169 +-----------------
 patches/chromium/printing.patch               |   8 +-
 shell/browser/electron_browser_client.cc      |   1 -
 .../extensions/electron_extension_system.cc   |   2 +-
 shell/browser/file_select_helper.cc           |   2 +-
 shell/browser/hid/hid_chooser_context.cc      |   2 +-
 15 files changed, 27 insertions(+), 463 deletions(-)
 delete mode 100644 electron_strings.grdp
 delete mode 100644 patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
 delete mode 100644 patches/chromium/fix_use_electron_generated_resources.patch

diff --git a/BUILD.gn b/BUILD.gn
index ffd38ce3a8c29..7b32da03ec35f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -351,6 +351,7 @@ source_set("electron_lib") {
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
+    "//chrome:strings",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
diff --git a/electron_paks.gni b/electron_paks.gni
index 0140e358710f6..2b089fa53b940 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -54,6 +54,8 @@ template("electron_extra_paks") {
                            ])
     output = "${invoker.output_dir}/resources.pak"
     sources = [
+      "$root_gen_dir/chrome/browser_resources.pak",
+      "$root_gen_dir/chrome/common_resources.pak",
       "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -70,6 +72,8 @@ template("electron_extra_paks") {
     ]
     deps = [
       "//chrome/browser:dev_ui_browser_resources",
+      "//chrome/browser:resources",
+      "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
       "//content:dev_ui_content_resources",
@@ -173,17 +177,23 @@ template("electron_paks") {
     }
 
     source_patterns = [
+      "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
+      "${root_gen_dir}/chrome/generated_resources_",
+      "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
-      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
       "${root_gen_dir}/services/strings/services_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
       "${root_gen_dir}/ui/strings/ax_strings_",
       "${root_gen_dir}/ui/strings/ui_strings_",
     ]
     deps = [
+      "//chrome/app:generated_resources",
+      "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
+      "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//device/bluetooth/strings",
       "//services/strings",
diff --git a/electron_resources.grd b/electron_resources.grd
index 08eb971b39249..8e492ad82347d 100644
--- a/electron_resources.grd
+++ b/electron_resources.grd
@@ -11,15 +11,8 @@
     <output filename="electron_resources.pak" type="data_package" />
   </outputs>
   <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true">
-      <!-- TODO(deepak1556): Add translations,
-           check https://www.chromium.org/developers/design-documents/ui-localization -->
-      <part file="electron_strings.grdp" />
-    </messages>
     <includes>
       <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}/shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_PDF_MANIFEST" file="../chrome/browser/resources/pdf/manifest.json" type="BINDATA" />
-      <include name="IDR_CRYPTOTOKEN_MANIFEST" file="../chrome/browser/resources/cryptotoken/manifest.json" type="BINDATA" />
     </includes>
   </release>
 </grit>
diff --git a/electron_strings.grdp b/electron_strings.grdp
deleted file mode 100644
index 5068141716d7a..0000000000000
--- a/electron_strings.grdp
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<grit-part>
-  <!-- Windows Caption Buttons -->
-  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
-    Close
-  </message>
-  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
-    Minimize
-  </message>
-  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
-    Maximize
-  </message>
-  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
-    Restore
-  </message>
-
-  <!-- Printing Service -->
-  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
-    Printing Service
-  </message>
-  <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
-    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
-  </message>
-  <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
-    Untitled Document
-  </message>
-
-  <!-- Desktop Capturer API -->
-  <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
-    Entire Screen
-  </message>
-  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
-    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
-  </message>
-
-  <!-- File Select Helper-->
-  <message name="IDS_IMAGE_FILES" desc="The description of the image file extensions in the select file dialog.">
-    Image Files
-  </message>
-  <message name="IDS_AUDIO_FILES" desc="The description of the audio file extensions in the select file dialog.">
-    Audio Files
-  </message>
-  <message name="IDS_VIDEO_FILES" desc="The description of the video file extensions in the select file dialog.">
-    Video Files
-  </message>
-  <message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
-    Custom Files
-  </message>
-  <message name="IDS_DEFAULT_DOWNLOAD_FILENAME" desc="Default name for downloaded files when we have no idea what they could be.">
-    download
-  </message>
-
-  <!-- Picture-in-Picture -->
-  <if expr="is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in Picture
-    </message>
-  </if>
-  <if expr="not is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in picture
-    </message>
-  </if>
-  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
-    Pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
-    Play
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
-    Play from the beginning
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Back to video player
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
-    Mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
-    Unmute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Skip Ad
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Mute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Unmute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn on camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn off camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Hang up
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Close
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
-    Resize
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
-    Toggle video to play or pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
-    Toggle mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
-    Next track
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
-    Previous track
-  </message>
-  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
-    en-US
-  </message>
-  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
-    en-US,en
-  </message>
-  <if expr="is_win">
-    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
-      Windows Utilities
-    </message>
-  </if>
-  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
-          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
-    More actions
-  </message>
-  <!-- Badging -->
-  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
-    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
-    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
-    Unread Notifications
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
-    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
-  </message>
-  <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
-        Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
-  <if expr="is_win">
-    <then>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled graphic
-      </message>
-    </then>
-    <else>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled image
-      </message>
-    </else>
-  </if>
-</grit-part>
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 1487c1a4cc111..cd928849ccf21 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -54,7 +54,6 @@ feat_add_set_theme_source_to_allow_apps_to.patch
 add_webmessageportconverter_entangleandinjectmessageportchannel.patch
 ignore_rc_check.patch
 remove_usage_of_incognito_apis_in_the_spellchecker.patch
-chore_use_electron_resources_not_chrome_for_spellchecker.patch
 allow_disabling_blink_scheduler_throttling_per_renderview.patch
 hack_plugin_response_interceptor_to_point_to_electron.patch
 feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -77,7 +76,6 @@ skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
-fix_use_electron_generated_resources.patch
 chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 435d66c466712..27b5422532cc3 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -33,7 +33,7 @@ index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index a99ce094addf69f21f3c42690defc445eff8fa05..797c8add1af6df1142179388ef1b7a5bf977d527 100644
+index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..16c923640286837e93f0e7dddefc1d91740238c8 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -4518,7 +4518,7 @@ static_library("browser") {
diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
deleted file mode 100644
index 99d292f285fb0..0000000000000
--- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@slack-corp.com>
-Date: Wed, 23 Oct 2019 14:17:18 -0700
-Subject: chore: use electron resources not chrome for spellchecker
-
-spellchecker uses a few IDS_ resources.  We need to load these from
-Electrons grit header instead of Chromes
-
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..a99ce094addf69f21f3c42690defc445eff8fa05 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -7135,6 +7135,7 @@ static_library("browser") {
-     deps += [
-       "//components/spellcheck/browser",
-       "//components/spellcheck/common",
-+      "//electron:resources",
-     ]
- 
-     if (!is_android) {
-diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc
-index 7c3b6a69acb16186add5d467dbc22360d90d46d4..703e2ce60f4f35f9c71e8b503ffd62f9ea8f365a 100644
---- a/chrome/browser/spellchecker/spellcheck_factory.cc
-+++ b/chrome/browser/spellchecker/spellcheck_factory.cc
-@@ -7,7 +7,7 @@
- #include "build/build_config.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/spellchecker/spellcheck_service.h"
--#include "chrome/grit/locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
-diff --git a/components/language/core/browser/BUILD.gn b/components/language/core/browser/BUILD.gn
-index fdba4ca90882656d6ba369dae48d5dfc13991cb8..fb3b759362275aafd4ed01a7865a4dd0dfaad727 100644
---- a/components/language/core/browser/BUILD.gn
-+++ b/components/language/core/browser/BUILD.gn
-@@ -30,6 +30,7 @@ static_library("browser") {
-     "//components/pref_registry",
-     "//components/prefs",
-     "//components/strings",
-+    "//electron:resources",
-     "//ui/base",
-   ]
- }
-diff --git a/components/language/core/browser/language_prefs.cc b/components/language/core/browser/language_prefs.cc
-index 26f86d67c32b2a022698ae5ea5509912d2ccfacb..d48844d49308d67ee7bfa823335c7443173badbe 100644
---- a/components/language/core/browser/language_prefs.cc
-+++ b/components/language/core/browser/language_prefs.cc
-@@ -22,7 +22,7 @@
- #include "components/pref_registry/pref_registry_syncable.h"
- #include "components/prefs/pref_service.h"
- #include "components/prefs/scoped_user_pref_update.h"
--#include "components/strings/grit/components_locale_settings.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- 
- namespace language {
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index 4db38bb6a59dd..dc25d3074782c 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,18 +82,9 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..2026b926eee56f6b235963b23ab86b2743eaed90 100644
+index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc6657b943bdd 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -18,7 +18,7 @@
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/media/webrtc/desktop_media_list.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/common/content_features.h"
 @@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/patches/chromium/fix_use_electron_generated_resources.patch b/patches/chromium/fix_use_electron_generated_resources.patch
deleted file mode 100644
index 686e94326c210..0000000000000
--- a/patches/chromium/fix_use_electron_generated_resources.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Thu, 24 Sep 2020 11:10:41 -0700
-Subject: fix: use electron generated resources
-
-This patch fixes a few instances where we need to use Electron generated
-resources for IDS strings, or the IDs will be wrong and cause DCHECKS
-as they will loaded as empty strings.
-
-* IDS_UTILITY_PROCESS_UTILITY_WIN_NAME on Windows
-* IDR_PDF_MANIFEST on Linux
-* IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
-
-diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
-index ccb9d3fb018b4153cfebad8b87579dd5005398e9..5ee9583dddcceed80c7a6e0fa6a0365dbd6c9a6a 100644
---- a/chrome/browser/pdf/pdf_extension_util.cc
-+++ b/chrome/browser/pdf/pdf_extension_util.cc
-@@ -11,8 +11,7 @@
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/common/chrome_content_client.h"
--#include "chrome/grit/browser_resources.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/strings/grit/components_strings.h"
- #include "components/zoom/page_zoom_constants.h"
- #include "ui/base/l10n/l10n_util.h"
-diff --git a/chrome/browser/printing/printing_service.cc b/chrome/browser/printing/printing_service.cc
-index 6d18517898c11c6a628cec2eade57fe845827b3d..a21f52e8a3c6f80d69b27faae4b77700fdd09e35 100644
---- a/chrome/browser/printing/printing_service.cc
-+++ b/chrome/browser/printing/printing_service.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/printing/printing_service.h"
- 
- #include "base/no_destructor.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "chrome/services/printing/public/mojom/printing_service.mojom.h"
- #include "content/public/browser/service_process_host.h"
- 
-diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc
-index d5497a7e26cdb66c7c074bc509e2bfec7d7875cd..62d2f555253eef903bd04ff1a0ad37d1470309e0 100644
---- a/chrome/browser/win/icon_reader_service.cc
-+++ b/chrome/browser/win/icon_reader_service.cc
-@@ -4,7 +4,7 @@
- 
- #include "chrome/browser/win/icon_reader_service.h"
- 
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h"
- #include "content/public/browser/service_process_host.h"
- 
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index f5b2e1333c446..b22235fd4e639 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -8,50 +8,11 @@ chrome's generated resources for our own. This updates the #include so that we
 don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
-diff --git a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-index 7bc8d118f87b91baf1c3bd1d34374996ab1d3638..2d2c1c86f311b07f0c2b09d5a4c082cc5599600c 100644
---- a/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/back_to_tab_image_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/base/models/image_model.h"
-diff --git a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-index d566dbf99ea1164c6a8407026a9839218a6ba1fb..239cd53d70c547c79214988a82efdc8c472d553c 100644
---- a/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-+++ b/chrome/browser/ui/views/overlay/back_to_tab_label_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "third_party/skia/include/core/SkColor.h"
- #include "ui/base/cursor/cursor.h"
- #include "ui/base/l10n/l10n_util.h"
-diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
-index a3d9c0f03c8ade2553bad5721d4e15e6fd658074..b3b043cbf9144013bf7903121575b31b348ea87e 100644
---- a/chrome/browser/ui/views/overlay/close_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "build/chromeos_buildflags.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/base/models/image_model.h"
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca8751134eaf3c33 100644
+index 3309906bcae27ba89d73ce4fba49843a10cd31f6..987917a440480130d35f34f85c27ff7c27632fd9 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-@@ -15,24 +15,28 @@
+@@ -15,15 +15,19 @@
  #include "base/timer/timer.h"
  #include "build/build_config.h"
  #include "chrome/app/vector_icons/vector_icons.h"
@@ -71,16 +32,6 @@ index 3309906bcae27ba89d73ce4fba49843a10cd31f6..9f828f70606238186b35b5e1ca875113
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  #include "chrome/browser/ui/views/overlay/close_image_button.h"
  #include "chrome/browser/ui/views/overlay/resize_handle_button.h"
--#include "chrome/grit/generated_resources.h"
- #include "components/omnibox/browser/location_bar_model_impl.h"
- #include "components/vector_icons/vector_icons.h"
- #include "content/public/browser/document_picture_in_picture_window_controller.h"
- #include "content/public/browser/picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "content/public/common/content_constants.h"
- #include "media/base/media_switches.h"
- #include "media/base/video_util.h"
 @@ -57,7 +61,7 @@
  #include "ui/aura/window.h"
  #endif
@@ -161,24 +112,11 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
  
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
-diff --git a/chrome/browser/ui/views/overlay/hang_up_button.cc b/chrome/browser/ui/views/overlay/hang_up_button.cc
-index 75bfe0f7a4d759f677cad5c365fa7f98121d54de..cb251381f1c77ad01d4906132f3d68865aaace10 100644
---- a/chrome/browser/ui/views/overlay/hang_up_button.cc
-+++ b/chrome/browser/ui/views/overlay/hang_up_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c36ad14705 100644
+index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157acd9edd56 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-@@ -14,13 +14,15 @@
+@@ -14,9 +14,11 @@
  #include "base/time/time.h"
  #include "base/timer/timer.h"
  #include "build/build_config.h"
@@ -186,15 +124,10 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
--#include "chrome/grit/generated_resources.h"
 +#endif
+ #include "chrome/grit/generated_resources.h"
  #include "components/vector_icons/vector_icons.h"
  #include "content/public/browser/picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/hit_test.h"
- #include "ui/display/display.h"
- #include "ui/display/screen.h"
 @@ -36,7 +38,7 @@
  #include "ui/aura/window.h"
  #endif
@@ -204,86 +137,8 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..105dbc3661eb2710b2f10ca6584e85c3
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-diff --git a/chrome/browser/ui/views/overlay/playback_image_button.cc b/chrome/browser/ui/views/overlay/playback_image_button.cc
-index cb1621a9deefcec601d7537e2cc2fbd24e5f7f64..2d74ab12e1eaf77a6f9dde13e894172d6835e061 100644
---- a/chrome/browser/ui/views/overlay/playback_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/playback_image_button.cc
-@@ -7,7 +7,7 @@
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/resize_handle_button.cc b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-index 8bf217b9b0c2bd22d6940c24c58eccb9865c5286..91f061a1243135db475371dda00c2fe054f4e8e3 100644
---- a/chrome/browser/ui/views/overlay/resize_handle_button.cc
-+++ b/chrome/browser/ui/views/overlay/resize_handle_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/hit_test.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-index 51c7db1bfbd3c03b9cb2786c8c7482b33e3aca0b..2890f7420d2fd258f84019963eab6c9606e228db 100644
---- a/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-+++ b/chrome/browser/ui/views/overlay/skip_ad_label_button.cc
-@@ -5,7 +5,7 @@
- #include "chrome/browser/ui/views/overlay/skip_ad_label_button.h"
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
- #include "ui/gfx/color_palette.h"
-diff --git a/chrome/browser/ui/views/overlay/toggle_camera_button.cc b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-index 20b82ff4dcf7fef3315b2b47bb480446509c6541..244a50e57b6c12680405c92f0ecbdbdb8bcfcb4f 100644
---- a/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-+++ b/chrome/browser/ui/views/overlay/toggle_camera_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-index 1a1edb6321490fdbf5cd347cb3d2cb9a6a5b1080..1e959cf1c8fe356ab4427e4bf4f8da1028f4575f 100644
---- a/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-+++ b/chrome/browser/ui/views/overlay/toggle_microphone_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/browser/ui/color/chrome_color_id.h"
- #include "chrome/browser/ui/views/overlay/constants.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
-diff --git a/chrome/browser/ui/views/overlay/track_image_button.cc b/chrome/browser/ui/views/overlay/track_image_button.cc
-index 5e136488b37887e9523ac04a9ff4ccdfaf96c104..24899f4c2b6fe66b96a6728bf747f1aad66f20a9 100644
---- a/chrome/browser/ui/views/overlay/track_image_button.cc
-+++ b/chrome/browser/ui/views/overlay/track_image_button.cc
-@@ -6,7 +6,7 @@
- 
- #include "chrome/app/vector_icons/vector_icons.h"
- #include "chrome/browser/ui/color/chrome_color_id.h"
--#include "chrome/grit/generated_resources.h"
-+#include "electron/grit/electron_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/metadata/metadata_impl_macros.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a96dc31c4 100644
+index 6d2744b673ecb31464d4aa9b0d11177892c030f4..1dd75ec581ecd67e04a8f1cf1e43bce70eaa9380 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
@@ -298,18 +153,6 @@ index 6d2744b673ecb31464d4aa9b0d11177892c030f4..f9ea66415b85ce385be429ead5e04c8a
  #include "chrome/browser/ui/color/chrome_color_id.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_image_button.h"
  #include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
-@@ -29,10 +31,10 @@
- #include "chrome/browser/ui/views/overlay/toggle_camera_button.h"
- #include "chrome/browser/ui/views/overlay/toggle_microphone_button.h"
- #include "chrome/browser/ui/views/overlay/track_image_button.h"
--#include "chrome/grit/generated_resources.h"
- #include "components/vector_icons/vector_icons.h"
- #include "content/public/browser/video_picture_in_picture_window_controller.h"
- #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
- #include "media/base/media_switches.h"
- #include "media/base/video_util.h"
- #include "third_party/skia/include/core/SkColor.h"
 @@ -56,7 +58,7 @@
  #include "ui/aura/window.h"
  #endif
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 5b18830b6f0ed..877c4e12eaa0d 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c0163fe3e77 100644
+index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..3a42aa2a6cde698a75349e573a34b1328fc9c11c 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -84,7 +84,7 @@ index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..a5950a9d4c823e3df145c365bb499c01
  #include "content/public/browser/global_routing_id.h"
  #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
++#include "chrome/grit/generated_resources.h"
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
@@ -127,7 +127,7 @@ index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d284a4247 100644
+index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a89f5489f 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -147,7 +147,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..abd7e5e5832919cbd06b3b337f54d79d
  #include "content/public/browser/render_process_host.h"
  #include "content/public/browser/render_view_host.h"
  #include "content/public/browser/web_contents.h"
-+#include "electron/grit/electron_resources.h"
++#include "chrome/grit/generated_resources.h"
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index e317682535ac0..6db8fbec2119b 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -54,7 +54,6 @@
 #include "content/public/common/url_constants.h"
 #include "crypto/crypto_buildflags.h"
 #include "electron/buildflags/buildflags.h"
-#include "electron/grit/electron_resources.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "extensions/browser/api/messaging/messaging_api_message_filter.h"
 #include "mojo/public/cpp/bindings/binder_map.h"
diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc
index 20c2cf546ea52..2d757a3e99401 100644
--- a/shell/browser/extensions/electron_extension_system.cc
+++ b/shell/browser/extensions/electron_extension_system.cc
@@ -15,6 +15,7 @@
 #include "base/path_service.h"
 #include "base/task/post_task.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/grit/browser_resources.h"
 #include "components/value_store/value_store_factory_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -23,7 +24,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "electron/buildflags/buildflags.h"
-#include "electron/grit/electron_resources.h"
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
diff --git a/shell/browser/file_select_helper.cc b/shell/browser/file_select_helper.cc
index 6980915f6358b..dbd8b341fb673 100644
--- a/shell/browser/file_select_helper.cc
+++ b/shell/browser/file_select_helper.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -31,7 +32,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "electron/grit/electron_resources.h"
 #include "net/base/filename_util.h"
 #include "net/base/mime_util.h"
 #include "shell/browser/api/electron_api_web_contents.h"
diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc
index a743048f336f8..ca793e6ff22dc 100644
--- a/shell/browser/hid/hid_chooser_context.cc
+++ b/shell/browser/hid/hid_chooser_context.cc
@@ -13,10 +13,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/device_service.h"
-#include "electron/grit/electron_resources.h"
 #include "services/device/public/cpp/hid/hid_blocklist.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
 #include "shell/browser/web_contents_permission_helper.h"

From 68d6d8d45164571a9b209945119dce586c3f749d Mon Sep 17 00:00:00 2001
From: Inclusive Coding Bot
 <102100353+inclusive-coding-bot@users.noreply.github.com>
Date: Wed, 6 Apr 2022 17:19:32 -0400
Subject: [PATCH 240/811] chore: switch to gender neutral terms (#33532)

* Switch to gender neutral terms

* Update docs/api/web-contents.md

Co-authored-by: Milan Burda <milan.burda@gmail.com>

* Update docs/api/webview-tag.md

Co-authored-by: Milan Burda <milan.burda@gmail.com>

* Update script/release/uploaders/upload.py

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>

* Update docs/tutorial/in-app-purchases.md

Co-authored-by: Milan Burda <milan.burda@gmail.com>

Co-authored-by: inclusive-coding-bot <inclusive-coding-bot@github.com>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
---
 docs/tutorial/in-app-purchases.md  | 2 +-
 script/release/uploaders/upload.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/in-app-purchases.md b/docs/tutorial/in-app-purchases.md
index ced192ba296cc..d913df54827a2 100644
--- a/docs/tutorial/in-app-purchases.md
+++ b/docs/tutorial/in-app-purchases.md
@@ -116,7 +116,7 @@ inAppPurchase.getProducts(PRODUCT_IDS).then(products => {
     console.log(`The price of ${product.localizedTitle} is ${product.formattedPrice}.`)
   })
 
-  // Ask the user which product he/she wants to purchase.
+  // Ask the user which product they want to purchase.
   const selectedProduct = products[0]
   const selectedQuantity = 1
 
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 51302d677e76a..014d7c53749b4 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -228,7 +228,7 @@ def purify_extra_data(mm, offset, length, compressed_size=0):
     ZIP64_EXTRA_HEADER = 0x0001
     zip64_extra_struct = Struct("<HHQQ")
     # ZIP64.
-    # When a ZIP64 extra field is present his 8byte length
+    # When a ZIP64 extra field is present this 8byte length
     # will override the 4byte length defined in canonical zips.
     # This is in the form:
     # - 0x0001 (header_id)

From 75ccec7996e9b60f8ded7ebf7a6ba271c0a7e90c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 7 Apr 2022 16:39:51 +0900
Subject: [PATCH 241/811] docs: recommend setting e.returnValue (#33628)

---
 docs/api/browser-window.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index b5973c715c1af..44de118440190 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -473,7 +473,7 @@ window.onbeforeunload = (e) => {
   // a non-void value will silently cancel the close.
   // It is recommended to use the dialog API to let the user confirm closing the
   // application.
-  e.returnValue = false // equivalent to `return false` but not recommended
+  e.returnValue = false
 }
 ```
 

From ba8e7b96387871d9b21f2dce4bab47ee3945d3b7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 06:02:15 -0700
Subject: [PATCH 242/811] Bump v20.0.0-nightly.20220407

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 115929710e8f0..ccee8db1431af 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220406
\ No newline at end of file
+20.0.0-nightly.20220407
\ No newline at end of file
diff --git a/package.json b/package.json
index 82c7988249e35..284f80be8acbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220406",
+  "version": "20.0.0-nightly.20220407",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c51befca22115..718b11216c2ff 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220406
- PRODUCTVERSION 20,0,0,20220406
+ FILEVERSION 20,0,0,20220407
+ PRODUCTVERSION 20,0,0,20220407
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7fb1c8faadd7a371316a6ca9986d021d333e70c3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 08:59:17 -0700
Subject: [PATCH 243/811] Revert "Bump v20.0.0-nightly.20220407"

This reverts commit ba8e7b96387871d9b21f2dce4bab47ee3945d3b7.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index ccee8db1431af..115929710e8f0 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220407
\ No newline at end of file
+20.0.0-nightly.20220406
\ No newline at end of file
diff --git a/package.json b/package.json
index 284f80be8acbd..82c7988249e35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220407",
+  "version": "20.0.0-nightly.20220406",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 718b11216c2ff..c51befca22115 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220407
- PRODUCTVERSION 20,0,0,20220407
+ FILEVERSION 20,0,0,20220406
+ PRODUCTVERSION 20,0,0,20220406
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4d4682c0e38cd49add16310278726e48de9db2f5 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Thu, 7 Apr 2022 20:07:39 +0200
Subject: [PATCH 244/811] fix: report more detailed errors in
 shell.openExternal() on Windows (#33620)

---
 shell/common/platform_util_win.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc
index eb1da7228470e..7df712d8f049e 100644
--- a/shell/common/platform_util_win.cc
+++ b/shell/common/platform_util_win.cc
@@ -251,7 +251,8 @@ std::string OpenExternalOnWorkerThread(
           ShellExecuteW(nullptr, L"open", escaped_url.c_str(), nullptr,
                         working_dir.empty() ? nullptr : working_dir.c_str(),
                         SW_SHOWNORMAL)) <= 32) {
-    return "Failed to open";
+    return "Failed to open: " +
+           logging::SystemErrorCodeToString(logging::GetLastSystemErrorCode());
   }
   return "";
 }

From 94c2a7671ca07e74d36d621d046c0f2f6d2f04f3 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Fri, 8 Apr 2022 07:17:51 -0400
Subject: [PATCH 245/811] build: temporarily disable 32-bit Windows symbol
 generation (#33653)

* build: temporarily disable 32-bit Windows symbol generation

* fix: modify upload.py

* chore: fix comment

Co-authored-by: VerteDinde <vertedinde@electronjs.org>
---
 appveyor.yml                       |  5 +++--
 script/release/release.js          |  3 ++-
 script/release/uploaders/upload.py | 14 ++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 55bdb38d5d864..8839a999a9659 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -174,14 +174,15 @@ build_script:
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
+  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
+      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
+      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
         python electron\script\zip-symbols.py
         appveyor-retry appveyor PushArtifact out/Default/symbols.zip
       } else {
diff --git a/script/release/release.js b/script/release/release.js
index 21ebbc0836aec..97873ec38c370 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -134,7 +134,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
     `electron-${version}-win32-ia32-pdb.zip`,
-    `electron-${version}-win32-ia32-symbols.zip`,
+    // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
+    // `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
     `electron-${version}-win32-x64-symbols.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 014d7c53749b4..c3f860603624a 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,9 +76,10 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
-    upload_electron(release, symbols_zip, args)
+    if get_target_arch() != 'ia32' and PLATFORM != 'win32':
+      symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
+      upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
       api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@@ -95,9 +96,10 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
     upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
-    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
-    upload_electron(release, pdb_zip, args)
+    if get_target_arch() != 'ia32':
+      pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+      upload_electron(release, pdb_zip, args)
   elif PLATFORM == 'linux':
     debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)

From f711fe6b5701196e5d803c04aab44bc62b392f8e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 06:04:36 -0700
Subject: [PATCH 246/811] Bump v20.0.0-nightly.20220408

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 115929710e8f0..679f6445b9f41 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220406
\ No newline at end of file
+20.0.0-nightly.20220408
\ No newline at end of file
diff --git a/package.json b/package.json
index 82c7988249e35..8fcf838246431 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220406",
+  "version": "20.0.0-nightly.20220408",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c51befca22115..1fed0bf28ad2d 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220406
- PRODUCTVERSION 20,0,0,20220406
+ FILEVERSION 20,0,0,20220408
+ PRODUCTVERSION 20,0,0,20220408
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9d6e6c45c1d66615f4f5ac879d499f752074ad91 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 06:01:10 -0700
Subject: [PATCH 247/811] Bump v20.0.0-nightly.20220411

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 679f6445b9f41..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220408
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 8fcf838246431..36f71a3f636eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220408",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1fed0bf28ad2d..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220408
- PRODUCTVERSION 20,0,0,20220408
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 41c1a7e3185819d31154735e553e2e2cfd3459c6 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 11 Apr 2022 11:02:01 -0700
Subject: [PATCH 248/811] chore: modify uploaded assets for win-ia32 (#33699)

* chore: filter correct symbol files

* chore: upload correct assets
---
 appveyor.yml                       | 8 +++++---
 script/release/release.js          | 2 +-
 script/release/uploaders/upload.py | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8839a999a9659..2d364a4057cbd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -182,9 +182,11 @@ build_script:
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
-        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+      if ($env:GN_CONFIG -eq 'release') {
+        if ($env:TARGET_ARCH -ne 'ia32') {
+          python electron\script\zip-symbols.py
+          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
diff --git a/script/release/release.js b/script/release/release.js
index 97873ec38c370..f43cbf9a03560 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -133,8 +133,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    `electron-${version}-win32-ia32-pdb.zip`,
     // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
+    // `electron-${version}-win32-ia32-pdb.zip`,
     // `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index c3f860603624a..f255ad50acb0d 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,7 +76,7 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    if get_target_arch() != 'ia32' and PLATFORM != 'win32':
+    if (get_target_arch() != 'ia32' or PLATFORM != 'win32'):
       symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
       shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
       upload_electron(release, symbols_zip, args)

From 68723061174433f16e0b64a2f04f31179ab5027d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:03:28 -0700
Subject: [PATCH 249/811] Revert "Bump v20.0.0-nightly.20220411"

This reverts commit 9d6e6c45c1d66615f4f5ac879d499f752074ad91.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..679f6445b9f41 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220408
\ No newline at end of file
diff --git a/package.json b/package.json
index 36f71a3f636eb..8fcf838246431 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220408",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..1fed0bf28ad2d 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220408
+ PRODUCTVERSION 20,0,0,20220408
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8e2310db31a9c0b1b3ef3b15f41ab8cbaaa1fa66 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:08:17 -0700
Subject: [PATCH 250/811] Bump v20.0.0-nightly.20220411

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 679f6445b9f41..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220408
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 8fcf838246431..36f71a3f636eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220408",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1fed0bf28ad2d..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220408
- PRODUCTVERSION 20,0,0,20220408
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 207d4e5823582c5c8a2e1cf155eb7d3d903b430c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:22:06 -0700
Subject: [PATCH 251/811] Revert "Bump v20.0.0-nightly.20220411"

This reverts commit 8e2310db31a9c0b1b3ef3b15f41ab8cbaaa1fa66.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..679f6445b9f41 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220408
\ No newline at end of file
diff --git a/package.json b/package.json
index 36f71a3f636eb..8fcf838246431 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220408",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..1fed0bf28ad2d 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220408
+ PRODUCTVERSION 20,0,0,20220408
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a7a5e7fcfd4c2ca920764635cd1025829bf58350 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:23:37 -0700
Subject: [PATCH 252/811] Bump v20.0.0-nightly.20220411

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 679f6445b9f41..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220408
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 8fcf838246431..36f71a3f636eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220408",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1fed0bf28ad2d..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220408
- PRODUCTVERSION 20,0,0,20220408
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From caddc83cfe1be3837d060467835e4a705d9d0cb4 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 11 Apr 2022 22:51:10 +0200
Subject: [PATCH 253/811] feat: implement chrome.tabs.reload (#33560)

---
 docs/api/extensions.md                        |  1 +
 shell/browser/extensions/api/tabs/tabs_api.cc | 30 +++++++++++++++++--
 shell/browser/extensions/api/tabs/tabs_api.h  | 10 +++++++
 shell/common/extensions/api/tabs.json         | 21 +++++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/docs/api/extensions.md b/docs/api/extensions.md
index afaff0ef63487..c8fbb015a1f74 100644
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -99,6 +99,7 @@ Only `chrome.storage.local` is supported; `chrome.storage.sync` and
 The following methods of `chrome.tabs` are supported:
 
 - `chrome.tabs.sendMessage`
+- `chrome.tabs.reload`
 - `chrome.tabs.executeScript`
 - `chrome.tabs.update` (partial support)
   - supported properties: `url`, `muted`.
diff --git a/shell/browser/extensions/api/tabs/tabs_api.cc b/shell/browser/extensions/api/tabs/tabs_api.cc
index 8fa5783e33701..7bc0a0b5e486b 100644
--- a/shell/browser/extensions/api/tabs/tabs_api.cc
+++ b/shell/browser/extensions/api/tabs/tabs_api.cc
@@ -182,6 +182,30 @@ bool TabsExecuteScriptFunction::ShouldRemoveCSS() const {
   return false;
 }
 
+ExtensionFunction::ResponseAction TabsReloadFunction::Run() {
+  std::unique_ptr<tabs::Reload::Params> params(
+      tabs::Reload::Params::Create(args()));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  bool bypass_cache = false;
+  if (params->reload_properties.get() &&
+      params->reload_properties->bypass_cache.get()) {
+    bypass_cache = *params->reload_properties->bypass_cache;
+  }
+
+  int tab_id = params->tab_id ? *params->tab_id : -1;
+  auto* contents = electron::api::WebContents::FromID(tab_id);
+  if (!contents)
+    return RespondNow(Error("No such tab"));
+
+  contents->web_contents()->GetController().Reload(
+      bypass_cache ? content::ReloadType::BYPASSING_CACHE
+                   : content::ReloadType::NORMAL,
+      true);
+
+  return RespondNow(NoArguments());
+}
+
 ExtensionFunction::ResponseAction TabsGetFunction::Run() {
   std::unique_ptr<tabs::Get::Params> params(tabs::Get::Params::Create(args()));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ -262,17 +286,17 @@ ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() {
   auto* zoom_controller = contents->GetZoomController();
   WebContentsZoomController::ZoomMode zoom_mode =
       contents->GetZoomController()->zoom_mode();
-  api::tabs::ZoomSettings zoom_settings;
+  tabs::ZoomSettings zoom_settings;
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
   zoom_settings.default_zoom_factor = std::make_unique<double>(
       blink::PageZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel()));
 
   return RespondNow(
-      ArgumentList(api::tabs::GetZoomSettings::Results::Create(zoom_settings)));
+      ArgumentList(tabs::GetZoomSettings::Results::Create(zoom_settings)));
 }
 
 ExtensionFunction::ResponseAction TabsSetZoomSettingsFunction::Run() {
-  using api::tabs::ZoomSettings;
+  using tabs::ZoomSettings;
 
   std::unique_ptr<tabs::SetZoomSettings::Params> params(
       tabs::SetZoomSettings::Params::Create(args()));
diff --git a/shell/browser/extensions/api/tabs/tabs_api.h b/shell/browser/extensions/api/tabs/tabs_api.h
index f6078610d130e..eb3a86612e7f3 100644
--- a/shell/browser/extensions/api/tabs/tabs_api.h
+++ b/shell/browser/extensions/api/tabs/tabs_api.h
@@ -46,9 +46,19 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
   DECLARE_EXTENSION_FUNCTION("tabs.executeScript", TABS_EXECUTESCRIPT)
 };
 
+class TabsReloadFunction : public ExtensionFunction {
+  ~TabsReloadFunction() override {}
+
+  ResponseAction Run() override;
+
+  DECLARE_EXTENSION_FUNCTION("tabs.reload", TABS_RELOAD)
+};
+
 class TabsGetFunction : public ExtensionFunction {
   ~TabsGetFunction() override {}
+
   ResponseAction Run() override;
+
   DECLARE_EXTENSION_FUNCTION("tabs.get", TABS_GET)
 };
 
diff --git a/shell/common/extensions/api/tabs.json b/shell/common/extensions/api/tabs.json
index 36276d2f40561..14d83b015a805 100644
--- a/shell/common/extensions/api/tabs.json
+++ b/shell/common/extensions/api/tabs.json
@@ -120,6 +120,27 @@
       }
     ],
     "functions": [
+      {
+        "name": "reload",
+        "type": "function",
+        "description": "Reload a tab.",
+        "parameters": [
+          {"type": "integer", "name": "tabId", "minimum": 0, "optional": true, "description": "The ID of the tab to reload; defaults to the selected tab of the current window."},
+          {
+            "type": "object",
+            "name": "reloadProperties",
+            "optional": true,
+            "properties": {
+              "bypassCache": {
+                "type": "boolean",
+                "optional": true,
+                "description": "Whether using any local cache. Default is false."
+              }
+            }
+          },
+          {"type": "function", "name": "callback", "optional": true, "parameters": []}
+        ]
+      },
       {
         "name": "get",
         "type": "function",

From c9fd255093fc9d9204db8d50b8795a696f76f611 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 11 Apr 2022 16:05:21 -0700
Subject: [PATCH 254/811] build: use python3 to lint (#33627)

---
 docs/development/build-instructions-linux.md | 16 +-------
 docs/development/build-instructions-macos.md | 43 +++-----------------
 docs/development/coding-style.md             |  2 +-
 package.json                                 |  8 ++--
 script/check-relative-doc-links.py           |  4 +-
 5 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md
index 6d70af4f47d27..3bdd96863ceba 100644
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -7,21 +7,7 @@ Follow the guidelines below for building **Electron itself** on Linux, for the p
 ## Prerequisites
 
 * At least 25GB disk space and 8GB RAM.
-* Python 2.7.x. Some distributions like CentOS 6.x still use Python 2.6.x
-  so you may need to check your Python version with `python -V`.
-
-  Please also ensure that your system and Python version support at least TLS 1.2.
-  For a quick test, run the following script:
-
-  ```sh
-  $ npx @electron/check-python-tls
-  ```
-
-  If the script returns that your configuration is using an outdated security
-  protocol, use your system's package manager to update Python to the latest
-  version in the 2.7.x branch. Alternatively, visit https://www.python.org/downloads/
-  for detailed instructions.
-
+* Python >= 3.7.
 * Node.js. There are various ways to install Node. You can download
   source code from [nodejs.org](https://nodejs.org) and compile it.
   Doing so permits installing Node on your own home directory as a standard user.
diff --git a/docs/development/build-instructions-macos.md b/docs/development/build-instructions-macos.md
index 0461e78095b56..fb4ef30497727 100644
--- a/docs/development/build-instructions-macos.md
+++ b/docs/development/build-instructions-macos.md
@@ -6,45 +6,12 @@ Follow the guidelines below for building **Electron itself** on macOS, for the p
 
 ## Prerequisites
 
-* macOS >= 10.11.6
-* [Xcode](https://developer.apple.com/technologies/tools/) >= 9.0.0
+* macOS >= 11.6.0
+* [Xcode](https://developer.apple.com/technologies/tools/). The exact version
+  needed depends on what branch you are building, but the latest version of
+  Xcode is generally a good bet for building `main`.
 * [node.js](https://nodejs.org) (external)
-* Python 2.7 with support for TLS 1.2
-
-## Python
-
-Please also ensure that your system and Python version support at least TLS 1.2.
-This depends on both your version of macOS and Python. For a quick test, run:
-
-```sh
-$ npx @electron/check-python-tls
-```
-
-If the script returns that your configuration is using an outdated security
-protocol, you can either update macOS to High Sierra or install a new version
-of Python 2.7.x. To upgrade Python, use [Homebrew](https://brew.sh/):
-
-```sh
-$ brew install python@2 && brew link python@2 --force
-```
-
-If you are using Python as provided by Homebrew, you also need to install
-the following Python modules:
-
-* [pyobjc](https://pypi.org/project/pyobjc/#description)
-
-You can use `pip` to install it:
-
-```sh
-$ pip install pyobjc
-```
-
-## macOS SDK
-
-If you're developing Electron and don't plan to redistribute your
-custom Electron build, you may skip this section.
-
-Official Electron builds are built with [Xcode 12.2](https://download.developer.apple.com/Developer_Tools/Xcode_12.2/Xcode_12.2.xip), and the macOS 11.0 SDK. Building with a newer SDK works too, but the releases currently use the 11.0 SDK.
+* Python >= 3.7
 
 ## Building Electron
 
diff --git a/docs/development/coding-style.md b/docs/development/coding-style.md
index ac12d0597947a..e7e66a357d9cf 100644
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -28,7 +28,7 @@ For C++ and Python, we follow Chromium's [Coding
 Style](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/styleguide/styleguide.md).
 There is also a script `script/cpplint.py` to check whether all files conform.
 
-The Python version we are using now is Python 2.7.
+The Python version we are using now is Python 3.9.
 
 The C++ code uses a lot of Chromium's abstractions and types, so it's
 recommended to get acquainted with them. A good place to start is
diff --git a/package.json b/package.json
index 36f71a3f636eb..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -79,14 +79,14 @@
     "generate-version-json": "node script/generate-version-json.js",
     "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
     "lint:js": "node ./script/lint.js --js",
-    "lint:clang-format": "python script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
+    "lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
     "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
     "lint:cpp": "node ./script/lint.js --cc",
     "lint:objc": "node ./script/lint.js --objc",
     "lint:py": "node ./script/lint.js --py",
     "lint:gn": "node ./script/lint.js --gn",
     "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links && npm run lint:markdownlint",
-    "lint:docs-relative-links": "python ./script/check-relative-doc-links.py",
+    "lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
     "lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
     "lint:js-in-markdown": "standard-markdown docs",
     "create-api-json": "electron-docs-parser --dir=./",
@@ -117,14 +117,14 @@
       "ts-node script/gen-filenames.ts"
     ],
     "*.{cc,mm,c,h}": [
-      "python script/run-clang-format.py -r -c --fix"
+      "python3 script/run-clang-format.py -r -c --fix"
     ],
     "*.md": [
       "npm run lint:docs"
     ],
     "*.{gn,gni}": [
       "npm run gn-check",
-      "python script/run-gn-format.py"
+      "python3 script/run-gn-format.py"
     ],
     "*.py": [
       "node script/lint.js --py --fix --only --"
diff --git a/script/check-relative-doc-links.py b/script/check-relative-doc-links.py
index 7839d73122d21..7779a1c24eeda 100755
--- a/script/check-relative-doc-links.py
+++ b/script/check-relative-doc-links.py
@@ -41,7 +41,7 @@ def getBrokenLinks(filepath):
   brokenLinks = []
 
   try:
-    f = open(filepath, 'r')
+    f = open(filepath, 'r', encoding="utf-8")
     lines = f.readlines()
   except KeyboardInterrupt:
     print('Keyboard interruption while parsing. Please try again.')
@@ -77,7 +77,7 @@ def getBrokenLinks(filepath):
       tempFile = os.path.join(currentDir, sections[0])
       if os.path.isfile(tempFile):
         try:
-          newFile = open(tempFile, 'r')
+          newFile = open(tempFile, 'r', encoding="utf-8")
           newLines = newFile.readlines()
         except KeyboardInterrupt:
           print('Keyboard interruption while parsing. Please try again.')

From e8ed9cb4b507e120de8b396b1d8d88e554b7d395 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 12 Apr 2022 12:00:42 +0200
Subject: [PATCH 255/811] test: re-enable disabled ScriptOrModule specs
 (#33702)

---
 spec-main/api-web-contents-spec.ts | 3 +--
 spec-main/chromium-spec.ts         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 3d04494a50d1a..c2f6151fd2d4f 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -1857,8 +1857,7 @@ describe('webContents module', () => {
       }
     });
 
-    // TODO(codebytere): Re-enable after Chromium fixes upstream v8_scriptormodule_legacy_lifetime crash.
-    xdescribe('using a large document', () => {
+    describe('using a large document', () => {
       beforeEach(async () => {
         w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } });
         await w.loadFile(path.join(__dirname, 'fixtures', 'api', 'print-to-pdf.html'));
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 80920d99b631c..31d7bb7599625 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -238,8 +238,7 @@ describe('web security', () => {
     await p;
   });
 
-  // TODO(codebytere): Re-enable after Chromium fixes upstream v8_scriptormodule_legacy_lifetime crash.
-  xit('bypasses CORB when web security is disabled', async () => {
+  it('bypasses CORB when web security is disabled', async () => {
     const w = new BrowserWindow({ show: false, webPreferences: { webSecurity: false, nodeIntegration: true, contextIsolation: false } });
     const p = emittedOnce(ipcMain, 'success');
     await w.loadURL(`data:text/html,

From 59dd17f2cf0c816a718336d03667e42ca81ca187 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 13:19:14 +0200
Subject: [PATCH 256/811] chore: bump chromium to 102.0.4989.0 (main) (#33557)

* chore: bump chromium in DEPS to 102.0.4975.0

* chore: bump chromium in DEPS to 102.0.4977.0

* chore: update patches

* Remove parameter of OnGpuProcessCrashed()

https://chromium-review.googlesource.com/c/chromium/src/+/3543396

* hid: Add exclusionFilters option to requestDevice

https://chromium-review.googlesource.com/c/chromium/src/+/3478175

* chore: bump chromium in DEPS to 102.0.4979.0

* chore: bump chromium in DEPS to 102.0.4981.0

* chore: update patches

* Deny notification/push permission for documents in non-standard StoragePartitions

https://chromium-review.googlesource.com/c/chromium/src/+/3257305

* Improve FrameTreeNode tracking in URLLoaderNetworkContext

https://chromium-review.googlesource.com/c/chromium/src/+/3341866

* fixup! Remove parameter of OnGpuProcessCrashed()

* chore: fix lint

* Reland "Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome"

https://chromium-review.googlesource.com/c/chromium/src/+/3554236

* chore: bump chromium in DEPS to 102.0.4983.0

* Ensure EyeDropperView does not access a destroyed window

https://chromium-review.googlesource.com/c/chromium/src/+/3561542

* ci: don't delete dawn .git directory

83901: Adds a generated file with the dawn git hash encoded at build time. | https://dawn-review.googlesource.com/c/dawn/+/83901

* ci: update Windows toolchain

3550827: New toolchain for Windows 10 20348 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/3550827

* chore: bump chromium in DEPS to 102.0.4985.0

* chore: update patches

* chore: bump chromium in DEPS to 102.0.4987.0

* chore: update patches

* 3563432: codehealth: remove uses of DictionaryValue in cbui/webui

https://chromium-review.googlesource.com/c/chromium/src/+/3563432

* chore: update patches after rebase

* Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome

https://chromium-review.googlesource.com/c/chromium/src/+/3554236

* 3565724: Preserve "proper method names" as-is in error.stack.

https://chromium-review.googlesource.com/c/v8/v8/+/3565724

* chore: bump chromium in DEPS to 102.0.4989.0

* chore: update patches

* fixup ci: don't delete dawn .git directory for Windows

* 3560843: Remove multi-parameter version of gfx::Rect[F]::Inset()

https://chromium-review.googlesource.com/c/chromium/src/+/3560843

* 3572711: Remove unused IDS_PDF_TOOLTIP_ROTATE_CW resource.

https://chromium-review.googlesource.com/c/chromium/src/+/3572711

* 3572926: Reland "[Sysroot] Switch to Debian Bullseye stable"

https://chromium-review.googlesource.com/c/chromium/src/+/3572926

* build: fixup sysroots with electron specific dependencies

* fixup Remove multi-parameter version of gfx::Rect[F]::Inset()

* fixup 3565724: Preserve "proper method names" as-is in error.stack.

* fixup Remove multi-parameter version of gfx::Rect[F]::Inset()

* test: add spec for navigator.hid.requestDevice({ exclusionFilters: [...] }

* fixup 3565724: Preserve "proper method names" as-is in error.stack.

* ci: use python3 to get the windows toolchain profile

3525960: Explicitly run everything with python3 | https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3525960

* chore: add diagnostic logging

* fix: try calling process.crash()

* chore: remove logging

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .circleci/build_config.yml                    |   6 +-
 DEPS                                          |   2 +-
 appveyor.yml                                  |  10 +-
 chromium_src/BUILD.gn                         |   3 +
 lib/browser/api/app.ts                        |   6 +-
 ...client_precreatemessageloop_callback.patch |   6 +-
 .../add_didinstallconditionalfeatures.patch   |  20 +-
 ..._scheduler_throttling_per_renderview.patch |  24 +-
 ..._windows_to_have_different_web_prefs.patch |  20 +-
 patches/chromium/blink_local_frame.patch      |   6 +-
 ..._depend_on_packed_resource_integrity.patch |  16 +-
 .../build_libc_as_static_library.patch        |   4 +-
 patches/chromium/can_create_window.patch      |  38 +-
 ...screationoverridden_with_full_params.patch |  12 +-
 patches/chromium/desktop_media_list.patch     |   4 +-
 patches/chromium/disable-redraw-lock.patch    |   2 +-
 .../disable_color_correct_rendering.patch     |  36 +-
 patches/chromium/disable_hidden.patch         |  12 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |  16 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   4 +-
 ...locator_for_usage_outside_of_the_gin.patch |   4 +-
 ...xpose_setuseragent_on_networkcontext.patch |  12 +-
 .../extend_apply_webpreferences.patch         |   8 +-
 ...g_the_base_spellchecker_download_url.patch |   8 +-
 ...to_add_observers_on_created_hunspell.patch |   6 +-
 ...screen_rendering_with_viz_compositor.patch |  10 +-
 ..._raw_response_headers_from_urlloader.patch |  10 +-
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...ete_SerialPortManager_on_main_thread.patch |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   4 +-
 ...rmissions_checks_in_exclusive_access.patch |  20 +-
 ...out_profile_refs_in_accessibility_ui.patch |  24 +-
 ..._properly_honor_printing_page_ranges.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |   6 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |  12 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...as_avoid_usage_of_private_macos_apis.patch |   2 +-
 .../mas_disable_remote_accessibility.patch    |  10 +-
 .../chromium/mas_disable_remote_layer.patch   |   8 +-
 patches/chromium/mas_no_private_api.patch     |   4 +-
 ...emote_certificate_verification_logic.patch |  26 +-
 .../chromium/notification_provenance.patch    |  66 +--
 patches/chromium/picture-in-picture.patch     |   2 +-
 ...utofill_colors_to_the_color_pipeline.patch |  12 +-
 patches/chromium/printing.patch               |  80 ++--
 ...r_changes_to_the_webcontentsobserver.patch |  12 +-
 ...store_base_adaptcallbackforrepeating.patch |   4 +-
 .../render_widget_host_view_base.patch        |   6 +-
 patches/chromium/resource_file_conflict.patch |   2 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   2 +-
 patches/chromium/sysroot.patch                |   4 +-
 ...andboxed_ppapi_processes_skip_zygote.patch |   4 +-
 patches/chromium/web_contents.patch           |  10 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |   8 +-
 ...feat_add_hook_to_notify_script_ready.patch |   8 +-
 patches/node/.patches                         |   1 +
 ...er_method_names_as-is_in_error_stack.patch | 432 ++++++++++++++++++
 patches/v8/build_gn.patch                     |   6 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   2 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...dcheck_for_node_stream_array_buffers.patch |   2 +-
 script/sysroots.json                          |  59 ++-
 shell/browser/api/electron_api_app.cc         |   5 +-
 shell/browser/api/electron_api_app.h          |   2 +-
 shell/browser/electron_browser_context.cc     |   2 -
 shell/browser/electron_permission_manager.cc  |   9 +
 shell/browser/electron_permission_manager.h   |   5 +
 .../resources_private_api.cc                  |   1 -
 ...on_component_extension_resource_manager.cc |   4 +-
 shell/browser/hid/electron_hid_delegate.cc    |   8 +-
 shell/browser/hid/electron_hid_delegate.h     |   2 +
 shell/browser/hid/hid_chooser_controller.cc   |  91 ++--
 shell/browser/hid/hid_chooser_controller.h    |  14 +-
 ...electron_desktop_window_tree_host_linux.cc |   2 +-
 shell/browser/ui/views/autofill_popup_view.cc |   2 +-
 .../ui/views/client_frame_view_linux.cc       |   3 +-
 shell/browser/ui/views/win_caption_button.cc  |   6 +-
 shell/browser/ui/views/win_frame_view.cc      |   6 +-
 .../electron_desktop_window_tree_host_win.cc  |   2 +-
 spec-main/chromium-spec.ts                    |  40 ++
 .../quit-on-crashed-event/index.js            |   3 +-
 spec/static/main.js                           |  10 +-
 90 files changed, 973 insertions(+), 443 deletions(-)
 create mode 100644 patches/node/fix_preserve_proper_method_names_as-is_in_error_stack.patch

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 9d8c587022e1c..6b075c4c68b38 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -431,9 +431,11 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     background: true
 
 # On macOS delete all .git directories under src/ expect for
-# third_party/angle/ because of build time generation of file
+# third_party/angle/ and third_party/dawn/ because of build time generation of files
 # gen/angle/commit.h depends on third_party/angle/.git/HEAD
 # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
+# and dawn/common/Version_autogen.h depends on  third_party/dawn/.git/HEAD
+# https://dawn-review.googlesource.com/c/dawn/+/83901
 # TODO: maybe better to always leave out */.git/HEAD file for all targets ?
 step-delete-git-directories: &step-delete-git-directories
   run:
@@ -441,7 +443,7 @@ step-delete-git-directories: &step-delete-git-directories
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src
-        ( find . -type d -name ".git" -not -path "./third_party/angle/*" ) | xargs rm -rf
+        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
diff --git a/DEPS b/DEPS
index 087a1ca200ee2..191d6b86c7db5 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.4971.0',
+    '102.0.4989.0',
   'node_version':
     'v16.14.2',
   'nan_version':
diff --git a/appveyor.yml b/appveyor.yml
index 2d364a4057cbd..d716dad15c70c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,7 @@
 
 version: 1.0.{build}
 build_cloud: electron-16-core
-image: vs2019bt-16.6.2
+image: vs2019bt-16.16.11
 environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -150,6 +150,12 @@ build_script:
         if ($LASTEXITCODE -ne 0) {
           Write-warning "Failed to add third_party\angle\.git; continuing anyway"
         }
+        # build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
+        # https://dawn-review.googlesource.com/c/dawn/+/83901        
+        $(7z a $zipfile src\third_party\dawn\.git)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
+        }
       }
   - cd src
   - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
@@ -172,7 +178,7 @@ build_script:
   - ninja -C out/Default electron:electron_chromedriver_zip
   - ninja -C out/Default third_party/electron_node:headers
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
-  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+  - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
   # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 6c3ff516dcb5f..006e7373f2a68 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -69,6 +69,7 @@ static_library("chrome") {
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
+    "//chrome/browser/ui/native_window_tracker.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -119,6 +120,8 @@ static_library("chrome") {
   if (use_aura) {
     sources += [
       "//chrome/browser/platform_util_aura.cc",
+      "//chrome/browser/ui/aura/native_window_tracker_aura.cc",
+      "//chrome/browser/ui/aura/native_window_tracker_aura.h",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
     ]
   }
diff --git a/lib/browser/api/app.ts b/lib/browser/api/app.ts
index f952dcd0194b3..346b48c9fc4ba 100644
--- a/lib/browser/api/app.ts
+++ b/lib/browser/api/app.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 
-import { Menu } from 'electron/main';
+import { Menu, deprecate } from 'electron/main';
 
 const bindings = process._linkedBinding('electron_browser_app');
 const commandLine = process._linkedBinding('electron_common_command_line');
@@ -111,3 +111,7 @@ for (const name of events) {
     webContents.emit(name, event, ...args);
   });
 }
+
+// Deprecation.
+deprecate.event(app, 'gpu-process-crashed', 'child-process-gone');
+deprecate.event(app, 'renderer-process-crashed', 'render-process-gone');
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 14d1535fe63f8..2440aa84adfbf 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 9f840287967b50ec1db3a9d27973429ab231a486..731a279e395a8762a25a115665bff99be428de3d 100644
+index 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c571b710e 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -240,6 +240,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index 9f840287967b50ec1db3a9d27973429ab231a486..731a279e395a8762a25a115665bff99b
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -345,7 +349,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -346,7 +350,6 @@ int GpuMain(MainFunctionParams parameters) {
    GpuProcess gpu_process(io_thread_priority);
  #endif
  
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index b5fd394b36e15..be61078f2626f 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749ef7409d77 100644
+index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93356b2862 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -131,6 +131,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749e
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e 100644
+index 448e5e6eab9e3bb98569a1d60619732173a396d2..88ba5eb82133a665cd5f9bdc52746c605c95509f 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4444,6 +4444,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4465,6 +4465,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763e
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 7be2fd1e02917537805a271f16f5f248f1c4fc45..ce0fc928448b597fb6401b77730700407ce406da 100644
+index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b7dd8a5d3 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -595,6 +595,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -599,6 +599,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -67,10 +67,10 @@ index 5adee94f81c0e98db976ac1c6c55fb5eab8c2e65..9d3e43f4394ad9a4377b47a001c4baf4
    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                          int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index aa4b510137d60e6fb924f4f1a6554fe06c19ad75..816b6260020a6cbb6880b0eed197743ccd9002f5 100644
+index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b094153778e18b 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -205,6 +205,7 @@ void LocalWindowProxy::Initialize() {
+@@ -207,6 +207,7 @@ void LocalWindowProxy::Initialize() {
    }
  
    InstallConditionalFeatures();
@@ -110,10 +110,10 @@ index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 6658e44e65f8236927f283e3f65f007ae97ac81f..f384dcc4efd6c56c3e3e212c7e597f13bc9dae57 100644
+index 420d82ed07017deba3298c5454666c09240dd23d..15407fb95dcf25875eb76a41fe1834c1f0a53528 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-@@ -79,6 +79,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
+@@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override;
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index e6dcf47aac97b..b0d67115605e2 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 8ee02135efb64c57d0779faa96640aa8e7775b58..66007d67da1230740eb00e31b220ddb02fbf37d9 100644
+index 32df5050f5a66c4b4f0981d3777a3b5a4fac9629..d8d9982bc6bd6e472677707b326a5dafa9b7fcf5 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -650,6 +650,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -660,6 +660,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -48,10 +48,10 @@ index a6fe708878eb9afba9a68e0be71ba2c0b2a84d7d..5cc81ceb44d0a8baee3ebcc63aa4137b
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index 4e8d36420d6edc1725a840e1b9f123041d21abe4..dd198cb7bf02e509833c6b4c7d8e5d65d20d46dc 100644
+index fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618f9bb6525 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
-@@ -152,6 +152,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
+@@ -151,6 +151,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
    static WindowOpenDisposition NavigationPolicyToDisposition(
        blink::WebNavigationPolicy policy);
  
@@ -73,10 +73,10 @@ index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033db89745c 100644
+index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919f8241393 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -369,6 +369,7 @@ class WebView {
+@@ -364,6 +364,7 @@ class WebView {
    // Scheduling -----------------------------------------------------------
  
    virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504ccd6796979 100644
+index 0dc6c707cdbe14aec69f72575941c16a50ac2ce4..177e463358c3e8e94044f2ccc8eb2cf4a8ce7525 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3669,6 +3669,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3693,6 +3693,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504cc
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3680,7 +3687,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3704,7 +3711,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504cc
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 5107ef421138e136b20b25b7bbcc1f0bb246bb66..043266205142e59f88c4c2f2ae6b58bb009f2d9c 100644
+index 08a54c62b7f4eeb6a8b0e0cb192723e1aecad915..1eeb122ac5db86c53d328a308dc2b7a4a5ca9fed 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 5107ef421138e136b20b25b7bbcc1f0bb246bb66..043266205142e59f88c4c2f2ae6b58bb
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -857,6 +858,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -854,6 +855,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index eac065943d3a7..4d55e26c12764 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index effc18673a7f832352f427c9f4fb8b276fc28ad6..96b67b56002f88e0f4e2af9997aa6a78a1accd96 100644
+index a422f50719e4c6a4fc96364d0370272695aab15f..eb310c01b11ccd2d8aeb8065dd4aa5e252b16f7c 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -144,6 +144,20 @@ WebPreferences::WebPreferences()
+@@ -141,6 +141,20 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -33,7 +33,7 @@ index effc18673a7f832352f427c9f4fb8b276fc28ad6..96b67b56002f88e0f4e2af9997aa6a78
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index a62792e0d484dc133f1df34a2c67dde838db203c..ef77424fc6778b047ac98700a5e18a3b6b161aba 100644
+index e37be0929c0fc05f0e8e8bbe702cb6e2b6a4ac18..36a8ca7796a3e021df869ebacd7d76ed4d63e59d 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -47,7 +47,7 @@ index a62792e0d484dc133f1df34a2c67dde838db203c..ef77424fc6778b047ac98700a5e18a3b
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -150,6 +154,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -147,6 +151,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index a62792e0d484dc133f1df34a2c67dde838db203c..ef77424fc6778b047ac98700a5e18a3b
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 27d0bcc02a57b1a8f8f8e25df7af383d0e9a8c00..1cb920f4d0b01df012bc9b60eb3d9caa555d4e9e 100644
+index d682f3bf81da362cc6721817189ae0222ebad087..e1cf124e87b507a841044096d8325a4043fe2d1e 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,7 +79,7 @@ index 27d0bcc02a57b1a8f8f8e25df7af383d0e9a8c00..1cb920f4d0b01df012bc9b60eb3d9caa
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -159,6 +160,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -156,6 +157,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
@@ -103,7 +103,7 @@ index 27d0bcc02a57b1a8f8f8e25df7af383d0e9a8c00..1cb920f4d0b01df012bc9b60eb3d9caa
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 0f5ed102b071001acc566b258946b359d33f5d45..aac80b973e4622d2207b92fcd2537342a60c6909 100644
+index d09fed37e7a57e4f7399277dd116e306233019e4..87008b486c25918f5737880b97ca37d003434fac 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,7 +114,7 @@ index 0f5ed102b071001acc566b258946b359d33f5d45..aac80b973e4622d2207b92fcd2537342
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -436,6 +437,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -423,6 +424,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -176,7 +176,7 @@ index 0f5ed102b071001acc566b258946b359d33f5d45..aac80b973e4622d2207b92fcd2537342
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 4feef4089d59cef252ba73f49d4e490875f657ff..db92219655b824ca630edb6afe85d85e017a4a06 100644
+index 90b34813bb0294cef5ef9d71daf1c09315eca590..6eac656fcea3dc76f978c23cf7f084b2d3f474a8 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,7 +187,7 @@ index 4feef4089d59cef252ba73f49d4e490875f657ff..db92219655b824ca630edb6afe85d85e
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -211,6 +212,22 @@ struct WebPreferences {
+@@ -208,6 +209,22 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 8acc606a3dbef..7e4067aac72b2 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -49,10 +49,10 @@ index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index ae445a52314d8581909f05a06442954f39b6b6d0..857715ca74b0f3a50953095d15237292e2a05510 100644
+index cf424b45c60ee6cd8fcb5bced73332ffd4b60c2d..17d59201aa0e4f077536ec29a3c59bd4e1d831a7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -542,10 +542,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index ae445a52314d8581909f05a06442954f39b6b6d0..857715ca74b0f3a50953095d15237292
    if (!Client())
      return false;
  
-@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -591,6 +587,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 27b5422532cc3..4c64f9bb9664d 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc6e0c2f79 100644
+index ff2e479125f1a6d7cbb52e4f674cb836d4f6596c..f334b0b4fd4a6550c3b2baba870c5997f24db1ab 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index 1f86073736f849e797e029678bc212ce96ba0bd9..b8abc10e48bdff0f4e6c3f8e1c4927bc
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..16c923640286837e93f0e7dddefc1d91740238c8 100644
+index 158bfba2bc80925c49821453df63664a571ad571..e0a7d98c75c9692ce13ff3f2fb97852e91ead91f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4518,7 +4518,7 @@ static_library("browser") {
+@@ -4539,7 +4539,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 72c3a67361eaecbe7349db00bbd3b7c1deaced69..16c923640286837e93f0e7dddefc1d91
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426aab23bef0 100644
+index f04d3f3303eace8a7ef6b996197c4ff58aca8c37..15b5311dcf2e43a8703b714e688da683392e9b36 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5943,7 +5943,6 @@ test("unit_tests") {
+@@ -5984,7 +5984,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426a
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5966,6 +5965,10 @@ test("unit_tests") {
+@@ -6007,6 +6006,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426a
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6656,7 +6659,6 @@ test("unit_tests") {
+@@ -6695,7 +6698,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 4f088ea7cfbb7aaa3ed15607608dd9cafc6a2981..8df44262c079c96a1a81167a769d426a
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6704,6 +6706,11 @@ test("unit_tests") {
+@@ -6743,6 +6745,11 @@ test("unit_tests") {
      if (is_chromeos) {
        deps += [ "//ui/chromeos" ]
      }
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index 67ef2bf3d247c..15419321d710c 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index dec348e235b1306cec50e0602fb910f21eaed925..0545e0ce5490df51088ca7a4cacd968e69fa0d09 100644
+index a53cc9066a3485ff6829e3c410eb523de7d074d6..9697e2dc2d0892fc7f1007d62488c2f2f24ec92f 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
@@ -30,7 +30,7 @@ index dec348e235b1306cec50e0602fb910f21eaed925..0545e0ce5490df51088ca7a4cacd968e
 +    "//electron:libcxx_objects_zip",
      "//third_party/catapult/devil:devil",
    ]
-   if (is_linux && !is_chromeos) {
+   if (is_linux) {
 diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn
 index 40f1285f14c0843405e0ee51879b8742285a006d..5be895d3e36df53a5960006a1513f1322400fd23 100644
 --- a/buildtools/third_party/libc++abi/BUILD.gn
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 5ccade1f90045..978b5c4c8e288 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index be7895586d64b0f8e7f122561d86f49479400a2b..5ad53ce87d8757b18e5ecedbd7ec9aec54bea165 100644
+index c9f0b4a30f8df2ba2a12914b447cede52ed1ff85..a5d6618aac35f01e09a90bdafa9f60c8140b088c 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6908,6 +6908,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6937,6 +6937,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index be7895586d64b0f8e7f122561d86f49479400a2b..5ad53ce87d8757b18e5ecedbd7ec9aec
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 88266830511440e51e47166c66f80e9956bcef5a..3fa51ecee644055db44bd4dd54c27ec224ff46d6 100644
+index 6261962f55f065d4edc0641ce8927143468add8a..cf37734d313470c27d2d40bd90cb199234a1e99e 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3937,6 +3937,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3943,6 +3943,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 88266830511440e51e47166c66f80e9956bcef5a..3fa51ecee644055db44bd4dd54c27ec2
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3981,12 +3989,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3987,12 +3995,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,10 +53,10 @@ index 88266830511440e51e47166c66f80e9956bcef5a..3fa51ecee644055db44bd4dd54c27ec2
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index ec594f27e94bf0b95967c4d816c9b1e159e4a08d..de908becd59392db284c60f61d97f8b2210aa888 100644
+index 28144893598e6b4caa18cd23fea1da3ca1f406b1..8b83eb8c342499ec7a677cd849f0e3c17d955a38 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -550,6 +550,10 @@ struct CreateNewWindowParams {
+@@ -569,6 +569,10 @@ struct CreateNewWindowParams {
  
    // Governs how downloads are handled if `target_url` results in a download.
    blink.mojom.NavigationDownloadPolicy download_policy;
@@ -68,10 +68,10 @@ index ec594f27e94bf0b95967c4d816c9b1e159e4a08d..de908becd59392db284c60f61d97f8b2
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index fbf6817479cace0ca06065eef3aa70aae2a0ebe1..cef6a18df7cfb8528ea07e808c3e539726ea815d 100644
+index 2a51c8c4d4cd21c0dc106dbb3b2e4e940a47319b..79479dd5fc7e0a9c27e75b85e1380c38f32f6fe7 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -577,6 +577,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -578,6 +578,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index fbf6817479cace0ca06065eef3aa70aae2a0ebe1..cef6a18df7cfb8528ea07e808c3e5397
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index a0f2f002b51c6061fe509d13b2286faaec721936..1b7e71e12d01929b8bfacf8c7c8950922bdd3d59 100644
+index d6ad990189520f7fc15e04c1c4bd03588d3ee81e..6aa01e2f4e8227f0c1cb78b88009728efccdd998 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -170,6 +170,7 @@ class NetworkService;
+@@ -164,6 +164,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index a0f2f002b51c6061fe509d13b2286faaec721936..1b7e71e12d01929b8bfacf8c7c895092
  }  // namespace network
  
  namespace sandbox {
-@@ -959,6 +960,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -953,6 +954,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -150,10 +150,10 @@ index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd48
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 9bdeb8745b3dd6d329f0403ca8c4a6f5de1d59c6..11815bca2741002dd8595af026ef402bc2af999e 100644
+index f7fbc40e8df8b996d6079f2e691771529ca42497..5580f245477b713d0f1f92ca9d15de847c4f8c92 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  #include "third_party/blink/public/platform/impression_conversions.h"
  #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
  #include "third_party/blink/public/platform/url_conversion.h"
@@ -161,7 +161,7 @@ index 9bdeb8745b3dd6d329f0403ca8c4a6f5de1d59c6..11815bca2741002dd8595af026ef402b
  #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
  #include "third_party/blink/public/web/web_frame_widget.h"
  #include "third_party/blink/public/web/web_local_frame.h"
-@@ -291,6 +292,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -295,6 +296,10 @@ WebView* RenderViewImpl::CreateView(
      params->impression = blink::ConvertWebImpressionToImpression(*impression);
    }
  
@@ -220,14 +220,14 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index dcacde03e5889d7347aadb2cfde10da767c9f9ca..3ccb2700c97d1297b8482e1b7b324cfa4002e21e 100644
+index 00af75f5295251fb19c874d2b7d877c4a53f7f12..c0042534907dfca1789b8dde2ffa11956d3e029e 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2068,6 +2068,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2076,6 +2076,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
 +  window_features.raw_features = features;
  
-   FrameLoadRequest frame_request(incumbent_window,
-                                  ResourceRequest(completed_url));
+   // In fenced frames, we should always use `noopener`.
+   if (GetFrame()->IsInFencedFrameTree()) {
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 2b80fd29fa5ac..2b88e17531304 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -63,10 +63,10 @@ index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 593cbe8038789e3b071ec9f5c243be6f0be629f0..18e5ade28bb966b35a6f69b2543768ac482d4730 100644
+index 46e5ec4d834e9478db523a5a078218104c161a57..e584921a6d575740fc0331a8bac05904558efc15 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
-@@ -79,10 +79,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
+@@ -83,10 +83,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -80,10 +80,10 @@ index 593cbe8038789e3b071ec9f5c243be6f0be629f0..18e5ade28bb966b35a6f69b2543768ac
                                  /*from_user_gesture=*/true);
      return true;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.h b/chrome/browser/ui/ash/ash_web_view_impl.h
-index e1adc822d8086b6c1b103a107923247cbb0aa7f2..2d2d65fa78d8fdccbe44aa1bf9b297e7038781c5 100644
+index f0333177f885000fb22818ffa30a0c4ad520a161..03e82957f9d7bf009dcbf5fcd43718c9d2ac9bb8 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.h
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.h
-@@ -46,8 +46,7 @@ class AshWebViewImpl : public ash::AshWebView,
+@@ -47,8 +47,7 @@ class AshWebViewImpl : public ash::AshWebView,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index cc6afdef869470136c2cec392911742a289f6339..2033877b86eddbc9baac6a603587e631021f6819 100644
+index 63b01c486f56499bbc2acff0b5abdbf24b0ce676..aeb111257740cd8c73e88c9b15d1f95fd49240c4 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3885,8 +3885,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3891,8 +3891,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index dc25d3074782c..1d1ec74f873d3 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -41,10 +41,10 @@ index ac1e7854dc9ae629a499fac7626ec456e18c7867..087da9bbfb9081b94ca8ea8d245871dc
  
  int DesktopMediaListBase::GetSourceCount() const {
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
-index 9c77a2d5872cc340b7a237b896afea1dd3be2503..d06869ff78ec0d48e97c3aeb7ac86d4aa9d9b1ba 100644
+index 1150cf5fd95cb19d926a9af6d65472b680f53859..0fc3455f4966dd2047329adc308526dadcc64f1b 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
-@@ -38,7 +38,7 @@ class DesktopMediaListBase : public DesktopMediaList {
+@@ -39,7 +39,7 @@ class DesktopMediaListBase : public DesktopMediaList {
    void SetThumbnailSize(const gfx::Size& thumbnail_size) override;
    void SetViewDialogWindowId(content::DesktopMediaID dialog_id) override;
    void StartUpdating(DesktopMediaListObserver* observer) override;
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 90badb12ad13f..a102ba88e4f8d 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index bb79a55d46730a4a127ee6483a7a25ecdc2aea5b..b14fa0f41166a904991ec920cec2f45c3b71c953 100644
+index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52a591e1e7 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 4d0d3ef337593..297cb3869dcbe 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index a7636e4535d0c4303c4022620b2fc7d18870f6da..5de5f020da02f30b28bf02701e9fd1662424c914 100644
+index 14e13169de8b5e808e3284792237bef9939b1e00..7628a96dc8b2c9e8128cd462138d3487304c6e10 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1900,6 +1900,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1894,6 +1894,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -47,7 +47,7 @@ index f6094a5defe12c34564020b0779626b3e5bff99e..a068a9ba33d3f8c8cdc74ae63ab5e16c
    // Image Decode Service and raster tiles without images until the decode is
    // ready.
 diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
-index d8e2bd1e55a52e86dda5c1b69c425b49e16538bd..80e2c77066f24e99a1894faadbf1d030a188ffa9 100644
+index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562e8f93da5 100644
 --- a/components/viz/common/display/renderer_settings.h
 +++ b/components/viz/common/display/renderer_settings.h
 @@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -80,10 +80,10 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc9c51c6d3 100644
+index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb06c19c4d6 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
-@@ -86,6 +86,9 @@
+@@ -87,6 +87,9 @@
  
  using gpu::gles2::GLES2Interface;
  
@@ -93,7 +93,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  namespace viz {
  namespace {
  
-@@ -683,8 +686,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
+@@ -685,8 +688,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
  void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
    SetBlendEnabled(quad->ShouldDrawWithBlending());
  
@@ -105,7 +105,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
    // Use the full quad_rect for debug quads to not move the edges based on
    // partial swaps.
-@@ -1674,7 +1678,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
+@@ -1676,7 +1680,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
            params->use_color_matrix, tint_gl_composited_content_,
            params->apply_shader_based_rounded_corner &&
                ShouldApplyRoundedCorner(params->quad)),
@@ -115,7 +115,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  }
  
  void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -2147,7 +2152,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -2149,7 +2154,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
    SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
                                         tint_gl_composited_content_,
                                         ShouldApplyRoundedCorner(quad)),
@@ -125,7 +125,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
    gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
    SkColor4f color_f = SkColor4f::FromColor(color);
-@@ -2155,7 +2161,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
+@@ -2157,7 +2163,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
    // Apply color transform if the color space or source and target do not match.
    if (quad_color_space != CurrentRenderPassColorSpace()) {
      const gfx::ColorTransform* color_transform =
@@ -134,7 +134,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
      gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
      color_transform->Transform(&col, 1);
      color_f.fR = col.x();
-@@ -2377,7 +2383,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
+@@ -2379,7 +2385,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
                                                : NON_PREMULTIPLIED_ALPHA,
                         false, false, tint_gl_composited_content_,
                         ShouldApplyRoundedCorner(quad)),
@@ -144,7 +144,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2476,7 +2483,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
+@@ -2478,7 +2485,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
                         !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
                         tint_gl_composited_content_,
                         ShouldApplyRoundedCorner(quad)),
@@ -154,7 +154,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
    if (current_program_->tint_color_matrix_location() != -1) {
      auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2586,7 +2594,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
+@@ -2588,7 +2596,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
    // The source color space should never be RGB.
    DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
  
@@ -164,7 +164,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
  #if BUILDFLAG(IS_WIN)
    // Force sRGB output on Windows for overlay candidate video quads to match
-@@ -2767,7 +2776,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
+@@ -2769,7 +2778,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
  
    SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
                                          ShouldApplyRoundedCorner(quad)),
@@ -174,7 +174,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
  
    DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
    gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2838,8 +2848,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
+@@ -2840,8 +2850,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
        draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
  
    // Bind the program to the GL state.
@@ -185,7 +185,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
                  /*adjust_src_white_level=*/draw_cache_.is_video_frame,
                  locked_quad.hdr_metadata());
  
-@@ -3696,7 +3706,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
+@@ -3698,7 +3708,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
                                 const gfx::ColorSpace& dst_color_space,
                                 bool adjust_src_white_level,
                                 absl::optional<gfx::HDRMetadata> hdr_metadata) {
@@ -228,7 +228,7 @@ index 23eed6772dd7edd77378f3bf4cff9d6bb5274894..69056d1121eb833393aba362d71c52cc
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 8b32bf5455183ff7bb6295d7922e76a6593b8ee0..041ffe9d26ef3401179eb57917f5585497500689 100644
+index 8cd9a960ca1de81857af60daa91596c1dbb17786..7455afe4d81eac31fe3792a4459834a7f968918c 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -240,7 +240,7 @@ index 8b32bf5455183ff7bb6295d7922e76a6593b8ee0..041ffe9d26ef3401179eb57917f55854
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index ca056c66af681548ba01bd07db7dadc5ce2a5280..f5025422ebdb9fe35ee5e4e1ed647bc05028d4a8 100644
+index 927e182bbba7a3700fd20c8c964da7cc162c4210..f099940c5b8fd92c04401cfbd231c04cb413d286 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -197,6 +197,7 @@
@@ -251,7 +251,7 @@ index ca056c66af681548ba01bd07db7dadc5ce2a5280..f5025422ebdb9fe35ee5e4e1ed647bc0
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3212,6 +3213,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3213,6 +3214,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index e9e9af547fe6f..8b054f701425d 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 63f51521afa85f53073df2e3747eba95e80de09d..ed56e947fa137cbaddaa12503ae983d7acd4463f 100644
+index 04bba6457636018af2f76f0e218076e993f47467..7e421c72e3cb9abd9c3dc6542afed08f3910df93 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -808,6 +808,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  
@@ -20,10 +20,10 @@ index 63f51521afa85f53073df2e3747eba95e80de09d..ed56e947fa137cbaddaa12503ae983d7
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 5e2e1fe4482fdde0df1a02ae9ae6d68431dac4d8..3ae005ae898ee0dd8befa7699b469fc379b5a1d1 100644
+index cb2dd8695096c4eda0b4c1782fa9ebd7a05e2b7b..22ba56a675f28abd9857e3c6d4b9908c568df016 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -880,6 +880,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -877,6 +877,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
  
    SiteInstanceGroup* GetSiteInstanceGroup();
  
@@ -34,10 +34,10 @@ index 5e2e1fe4482fdde0df1a02ae9ae6d68431dac4d8..3ae005ae898ee0dd8befa7699b469fc3
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index b39dd8d70aa590677f7d3e95412c0709f0fbbc81..558fd14566a4b953b5140b59ad614b70e1855bc5 100644
+index 907de04692ff86a3b287c5e66d4811ed1b31858e..035a168a8520ff28a832a79903dc3efdff596c05 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -618,7 +618,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 8665613a56588..4b690a546db81 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -19,10 +19,10 @@ index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a93
      using PCScan = internal::PCScan;
      const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index d1b71673ca79ea0f2293cda46564ceb8a018f4e5..ca70bb8fdf7fec2e0d5e2b3bf0ece86def72e21b 100644
+index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be233e6ebcb 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
-@@ -43,6 +43,7 @@
+@@ -44,6 +44,7 @@
  #endif
  
  #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
@@ -30,7 +30,7 @@ index d1b71673ca79ea0f2293cda46564ceb8a018f4e5..ca70bb8fdf7fec2e0d5e2b3bf0ece86d
  #include "base/allocator/partition_allocator/starscan/pcscan.h"
  #include "base/allocator/partition_allocator/starscan/stack/stack.h"
  #endif
-@@ -76,7 +77,7 @@ void* ThreadFunc(void* params) {
+@@ -77,7 +78,7 @@ void* ThreadFunc(void* params) {
        base::DisallowSingleton();
  
  #if !BUILDFLAG(IS_NACL)
@@ -39,7 +39,7 @@ index d1b71673ca79ea0f2293cda46564ceb8a018f4e5..ca70bb8fdf7fec2e0d5e2b3bf0ece86d
      internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
  #endif
  
-@@ -102,7 +103,7 @@ void* ThreadFunc(void* params) {
+@@ -103,7 +104,7 @@ void* ThreadFunc(void* params) {
        PlatformThread::CurrentHandle().platform_handle(),
        PlatformThread::CurrentId());
  
@@ -49,10 +49,10 @@ index d1b71673ca79ea0f2293cda46564ceb8a018f4e5..ca70bb8fdf7fec2e0d5e2b3bf0ece86d
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index c965c9764ad38a8b52b727ca98fe41f00ab6707d..7d44c4e63b2b4ccf595b5e2a0212fb6c4eb2b5bd 100644
+index 8542c0d0d49511298cca800a59796b1e4271a3d8..1d0eeff5800f2ccf3f1fb6b1356c8cd067cfd945 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  #include <windows.h>
  
  #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
@@ -60,7 +60,7 @@ index c965c9764ad38a8b52b727ca98fe41f00ab6707d..7d44c4e63b2b4ccf595b5e2a0212fb6c
  #include "base/allocator/partition_allocator/starscan/pcscan.h"
  #include "base/allocator/partition_allocator/starscan/stack/stack.h"
  #endif
-@@ -105,7 +106,7 @@ DWORD __stdcall ThreadFunc(void* params) {
+@@ -113,7 +114,7 @@ DWORD __stdcall ThreadFunc(void* params) {
                                  FALSE,
                                  DUPLICATE_SAME_ACCESS);
  
@@ -69,7 +69,7 @@ index c965c9764ad38a8b52b727ca98fe41f00ab6707d..7d44c4e63b2b4ccf595b5e2a0212fb6c
    internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
  #endif
  
-@@ -125,7 +126,7 @@ DWORD __stdcall ThreadFunc(void* params) {
+@@ -133,7 +134,7 @@ DWORD __stdcall ThreadFunc(void* params) {
                                                     PlatformThread::CurrentId());
    }
  
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 2b2569457cc46..197e3b15b0834 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e..e0d7367135abb08f9f303cc528a55d8ba026fa56 100644
+index 88ba5eb82133a665cd5f9bdc52746c605c95509f..ceefc966e0b8f79e00d108de78f56f868f08ee67 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2367,7 +2367,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2377,7 +2377,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index b038130828869..b69182027c9db 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index a1de50d6b0f699d0651c369cafafdd5bb542242d..65b9f5e5f81e8ef8b591ef2e027e095df11c0d7b 100644
+index ece3dfbee04cf941689e4f21f5176db010fda564..9fd052c00a484cd1acd2031fda79e6307fd01b60 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -19,7 +19,7 @@ index a1de50d6b0f699d0651c369cafafdd5bb542242d..65b9f5e5f81e8ef8b591ef2e027e095d
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index b14fa0f41166a904991ec920cec2f45c3b71c953..37bb1e9788a251b3f2c79b5272d4a44c22b707b3 100644
+index a2f053c3e2588451458682aa6e86da52a591e1e7..9e38d55d7156986e48ed6dcb3522d77358bfdb75 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index cad261c043f60..aa6aa6d8e388e 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,10 +21,10 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 78b8a28eadf392422b55e441634e3161c8c1694c..af3ed7813d9ed5fb294b67a0da1237140b40abbf 100644
+index 952023235d9f1905b64195f625dbb3b1af97f908..3d8b4cc17584e7ae8be0b77a073a0453bcd5b3ef 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
+@@ -366,6 +366,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
    return g_page_allocator.Pointer();
  }
  
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index d04ad170f9062..6e3c56031e7f0 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 4c8982a8ae3ae23fbeef244cd23b43c889d3fa94..13b48d5acadf5dcfb40a829751b089c1c29f9450 100644
+index 98268925da14d61256f8dee3aa899f17ce7acaf6..1abdc204e278383818dc073f96c90e91ec1f3fb9 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1350,6 +1350,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1404,6 +1404,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index 4c8982a8ae3ae23fbeef244cd23b43c889d3fa94..13b48d5acadf5dcfb40a829751b089c1
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index eed05c05d1da28284af6ae0cef45dbbb47254058..f32671202010fa57901a09723feecacc72dbd5f9 100644
+index 58671094857cdfe5d853c8a284d51bc1b8a09660..7af71839aa1bc970370a91cd35f3cbefe06e67e5 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -283,6 +283,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -302,6 +302,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index eed05c05d1da28284af6ae0cef45dbbb47254058..f32671202010fa57901a09723feecacc
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index c929eb10af5b8856debdc0d665eac767e9730714..c20bd2a2d6b989386ce7ef97e43f677e2c5291fa 100644
+index b52e5a2230e96d55d7886bde331a505c58dd093a..757dd77b06cba44e832e86e729e44b1e9a427c49 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1089,6 +1089,9 @@ interface NetworkContext {
+@@ -1087,6 +1087,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 854e5de029ce8..1ffad5f73b38c 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,18 +12,18 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 13a16ae577130d7520b47eb046b504ccd6796979..6987c81cd9f6b774ec15605c0ea64ca34ba84d22 100644
+index 177e463358c3e8e94044f2ccc8eb2cf4a8ce7525..7efdb7a0cf2db85fadd0db0b6665bdf492f8f5bc 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -159,6 +159,7 @@
- #include "third_party/blink/renderer/core/timing/dom_window_performance.h"
+@@ -160,6 +160,7 @@
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
+ #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
 +#include "third_party/blink/renderer/platform/graphics/color.h"
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1774,6 +1775,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1780,6 +1781,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
index ae711b32caf32..563ac340dc186 100644
--- a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
+++ b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -9,10 +9,10 @@ production use cases.  This is unlikely to be upstreamed as the change
 is entirely in //chrome.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-index c1821235df8abd9c0991efeb1d82f8b6075e48e7..a35fc3aa63e6d57ef78ee4690f761060b074ec85 100644
+index ff5ee1d7a0f4e333498bf25acbbf49d1ce53b7a1..e98084036c04e9910779670497b1a431d4fee48a 100644
 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
-@@ -52,6 +52,9 @@ namespace {
+@@ -51,6 +51,9 @@ namespace {
  base::LazyInstance<GURL>::Leaky g_download_url_for_testing =
      LAZY_INSTANCE_INITIALIZER;
  
@@ -22,7 +22,7 @@ index c1821235df8abd9c0991efeb1d82f8b6075e48e7..a35fc3aa63e6d57ef78ee4690f761060
  // Close the file.
  void CloseDictionary(base::File file) {
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -272,6 +275,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
+@@ -271,6 +274,10 @@ void SpellcheckHunspellDictionary::SetDownloadURLForTesting(const GURL url) {
    g_download_url_for_testing.Get() = url;
  }
  
@@ -33,7 +33,7 @@ index c1821235df8abd9c0991efeb1d82f8b6075e48e7..a35fc3aa63e6d57ef78ee4690f761060
  GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
    if (g_download_url_for_testing.Get() != GURL())
      return g_download_url_for_testing.Get();
-@@ -279,6 +286,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
+@@ -278,6 +285,9 @@ GURL SpellcheckHunspellDictionary::GetDictionaryURL() {
    std::string bdict_file = dictionary_file_.path.BaseName().MaybeAsASCII();
    DCHECK(!bdict_file.empty());
  
diff --git a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
index d3448ffcc3b40..a8d36d481d1db 100644
--- a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+++ b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
@@ -7,10 +7,10 @@ Subject: feat: allow embedders to add observers on created hunspell
 This patch is used by Electron to implement spellchecker events.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index 80e5807fecbca3d3d3105522418c5f4b4d103f57..002204dbe0b9598b61141cab33b7befdfac077f8 100644
+index fb1ce87c18a72deb815b78b2f989fe0a8ebaf0bc..417e89f3ba808d9e599d391d57df0e481afb5522 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.cc
 +++ b/chrome/browser/spellchecker/spellcheck_service.cc
-@@ -469,6 +469,9 @@ void SpellcheckService::LoadDictionaries() {
+@@ -468,6 +468,9 @@ void SpellcheckService::LoadDictionaries() {
          std::make_unique<SpellcheckHunspellDictionary>(
              dictionary, platform_spellcheck_language, context_, this));
      hunspell_dictionaries_.back()->AddObserver(this);
@@ -20,7 +20,7 @@ index 80e5807fecbca3d3d3105522418c5f4b4d103f57..002204dbe0b9598b61141cab33b7befd
      hunspell_dictionaries_.back()->Load();
    }
  
-@@ -521,6 +524,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
+@@ -520,6 +523,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
           (!hunspell_dictionaries_.empty() || enable_if_uninitialized);
  }
  
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 4c6b697e3b604..77ff74d4b5934 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -573,10 +573,10 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec03b43a28a 100644
+index 80bff73a5886e8e79d7d91de5e27bc747fcfce02..8bc43d1359fa2551713992d6ccb73949743dde2e 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
-@@ -82,6 +82,7 @@ class DisplayPrivate;
+@@ -83,6 +83,7 @@ class DisplayPrivate;
  class ExternalBeginFrameController;
  }  // namespace mojom
  class ContextProvider;
@@ -584,7 +584,7 @@ index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec0
  class HostFrameSinkManager;
  class LocalSurfaceId;
  class RasterContextProvider;
-@@ -138,6 +139,16 @@ class COMPOSITOR_EXPORT ContextFactory {
+@@ -139,6 +140,16 @@ class COMPOSITOR_EXPORT ContextFactory {
    virtual viz::HostFrameSinkManager* GetHostFrameSinkManager() = 0;
  };
  
@@ -601,7 +601,7 @@ index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec0
  // Compositor object to take care of GPU painting.
  // A Browser compositor object is responsible for generating the final
  // displayable form of pixels comprising a single widget's contents. It draws an
-@@ -179,6 +190,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -180,6 +191,9 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
    // Schedules a redraw of the layer tree associated with this compositor.
    void ScheduleDraw();
  
@@ -611,7 +611,7 @@ index 2696c864d5e32e4b87834ced1035a7b1742639b4..ff663b4e75399898daaa3e77339deec0
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -469,6 +483,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -476,6 +490,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index f07fe207b2f52..9a069045d5097 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -53,7 +53,7 @@ index 1fcf54cac11c38352e14774cd08bcaa162443e9c..5356da11391d52a8f9aaa57a27616cee
    out->upgrade_if_insecure = data.upgrade_if_insecure();
    out->is_revalidating = data.is_revalidating();
 diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
-index 1b8dbc0538d0af843e40edc41505d08f9034f97b..270822eb756090f8a74f34823009942ed21e8616 100644
+index 3a1c5bd943c110514e4da06491190476d6e6de38..6a80fb16242865d398bcbcd380893ccc9a3fe167 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.h
 +++ b/services/network/public/cpp/url_request_mojom_traits.h
 @@ -269,6 +269,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@@ -103,10 +103,10 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 1530c51f9090ce51de1f3bc495ca83590d6430ab..d053aa813ab53092dcefb81116ff850318f439c2 100644
+index 74365833e96d5a3c443e9160e1ada106026ada30..10bc715a2d0bd4cfe750ed222424dd4c7be37979 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -470,6 +470,7 @@ URLLoader::URLLoader(
+@@ -469,6 +469,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index 1530c51f9090ce51de1f3bc495ca83590d6430ab..d053aa813ab53092dcefb81116ff8503
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -637,7 +638,7 @@ URLLoader::URLLoader(
+@@ -636,7 +637,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 1530c51f9090ce51de1f3bc495ca83590d6430ab..d053aa813ab53092dcefb81116ff8503
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1408,6 +1409,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1407,6 +1408,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 498c91f8f91a2..a562bd5cd3b15 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 37bb1e9788a251b3f2c79b5272d4a44c22b707b3..29c3104308e9e64d0ab99bdfae00479f8e1bfaa1 100644
+index 9e38d55d7156986e48ed6dcb3522d77358bfdb75..01ff95be00b3911749f66a136b2b5a6c02156bd3 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3597,6 +3597,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3596,6 +3596,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
index cf2398b0c00ef..d1d1cd7380be1 100644
--- a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
+++ b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
@@ -50,10 +50,10 @@ upstream would also hit this DCHECK, so give it a try with content_shell or
 chrome and that would help reporting upstream crbug.
 
 diff --git a/services/device/device_service.cc b/services/device/device_service.cc
-index 11a7b2902490986ba2462f92c3b3e5ae1b1a127f..32d591621c7206affab50ef061aa565527d5952f 100644
+index 1f18714dd0c79359173f8e9204b9314a92e3b2a8..068570dba8673d2b0af674f556465abda2ed16f5 100644
 --- a/services/device/device_service.cc
 +++ b/services/device/device_service.cc
-@@ -159,7 +159,7 @@ DeviceService::~DeviceService() {
+@@ -158,7 +158,7 @@ DeviceService::~DeviceService() {
      // naturally sequenced after the last task on
      // |serial_port_manager_task_runner_| per ThreadPool shutdown semantics).
      // See crbug.com/1263149#c20 for details.
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 1bc8ed89784d0..e01dfbd4ead06 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,7 +8,7 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 55224f960151b0cae23b2a49d755eace630e9e3a..86ab5a5e5e3e881fdaf3528640f097493123da74 100644
+index 5766344e7ca539e4ac8526eaa651f0079a9f01b1..ca02c970d0e83b24503a5128c5cf088d9e348f3b 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -1827,7 +1827,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -21,7 +21,7 @@ index 55224f960151b0cae23b2a49d755eace630e9e3a..86ab5a5e5e3e881fdaf3528640f09749
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index d159f44dc855fee799f7b97b59a2a4e64631e7b4..b583fb7ff191d5dfce4b8fee5f06e074b3a6ea4f 100644
+index 2f14f906b51ce73a69cd780d70ad6264285138ac..b14695646fe75d213b4affa60a6d775ce2474238 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
index 4ac4782be9141..4fd3f5b2054b5 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
@@ -14,7 +14,7 @@ but it's not strictly necessary for this API to work to spec.
 Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d54a5b39da 100644
+index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbbdd7f157b 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 @@ -16,12 +16,16 @@
@@ -34,7 +34,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
  #include "chrome/common/chrome_switches.h"
  #include "content/public/browser/navigation_details.h"
  #include "content/public/browser/navigation_entry.h"
-@@ -161,6 +165,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -159,6 +163,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      return;
    }
  
@@ -42,15 +42,15 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
    if (base::FeatureList::IsEnabled(
            blink::features::kWindowPlacementFullscreenCompanionWindow)) {
      if (!popunder_preventer_)
-@@ -168,6 +173,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -166,6 +171,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      else
        popunder_preventer_->WillActivateWebContents(web_contents);
    }
 +#endif
  
-   SetTabWithExclusiveAccess(web_contents);
-   requesting_origin_ =
-@@ -203,7 +209,9 @@ void FullscreenController::EnterFullscreenModeForTab(
+   // Keep the current state. |SetTabWithExclusiveAccess| may change the return
+   // value of |IsWindowFullscreenForTabOrPending|.
+@@ -218,7 +224,9 @@ void FullscreenController::EnterFullscreenModeForTab(
  }
  
  void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -60,7 +60,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
  
    if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
      // During tab capture of fullscreen-within-tab views, the browser window
-@@ -248,11 +256,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
+@@ -263,11 +271,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
  void FullscreenController::FullscreenTabOpeningPopup(
      content::WebContents* opener,
      content::WebContents* popup) {
@@ -74,7 +74,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
  }
  
  void FullscreenController::OnTabDeactivated(
-@@ -402,13 +412,9 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -417,13 +427,9 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -90,7 +90,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
  #endif
  
    toggled_into_fullscreen_ = true;
-@@ -421,6 +427,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -436,6 +442,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        url = extension_caused_fullscreen_;
    }
  
@@ -98,7 +98,7 @@ index f1b9597ea5070ac1847355833a751c72abc0e917..caa82d39fbab39ce7c90dcec401aa8d5
    if (display_id != display::kInvalidDisplayId) {
      // Check, but do not prompt, for permission to request a specific screen.
      // Sites generally need permission to get the display id in the first place.
-@@ -434,6 +441,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -449,6 +456,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        display_id = display::kInvalidDisplayId;
      }
    }
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 929bc1574435b..6994d7d5bdc0c 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,10 +7,10 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b90008d9b 100644
+index ee30fddfeb034d14ae05cb5957026f65f32a4fd4..aa38a6e0cc4c0ac57469bb67c85dae3b8ce19bc2 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
-@@ -20,7 +20,10 @@
+@@ -21,7 +21,10 @@
  #include "base/values.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
@@ -21,7 +21,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
  #include "chrome/common/pref_names.h"
  #include "chrome/common/webui_url_constants.h"
  #include "chrome/grit/dev_ui_browser_resources.h"
-@@ -49,9 +52,11 @@
+@@ -50,9 +53,11 @@
  #include "ui/views/accessibility/view_accessibility.h"
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -33,7 +33,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
  #include "ui/views/accessibility/widget_ax_tree_id_map.h"
  #include "ui/views/widget/widget.h"
  #include "ui/views/widget/widget_delegate.h"
-@@ -163,7 +168,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
+@@ -164,7 +169,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
                                 accessibility_mode);
  }
  
@@ -42,7 +42,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
  std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
    std::unique_ptr<base::DictionaryValue> target_data(
        new base::DictionaryValue());
-@@ -202,7 +207,9 @@ void HandleAccessibilityRequestCallback(
+@@ -203,7 +208,9 @@ void HandleAccessibilityRequestCallback(
    DCHECK(ShouldHandleAccessibilityRequestCallback(path));
  
    base::DictionaryValue data;
@@ -52,7 +52,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
    ui::AXMode mode =
        content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
    bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
-@@ -236,7 +243,7 @@ void HandleAccessibilityRequestCallback(
+@@ -237,7 +244,7 @@ void HandleAccessibilityRequestCallback(
    data.SetBoolKey(kViewsAccessibility,
                    features::IsAccessibilityTreeForViewsEnabled());
  
@@ -61,7 +61,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
    data.SetStringKey(kInternal, show_internal ? kOn : kOff);
  
    std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
-@@ -271,12 +278,12 @@ void HandleAccessibilityRequestCallback(
+@@ -272,12 +279,12 @@ void HandleAccessibilityRequestCallback(
    data.Set(kPagesField, std::move(rvh_list));
  
    std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
@@ -76,7 +76,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
    data.Set(kBrowsersField, std::move(browser_list));
  
    std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
-@@ -493,8 +500,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
+@@ -494,8 +501,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
  
    AllowJavascript();
    if (flag_name_str == kInternal) {
@@ -87,7 +87,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
      return;
    }
  
-@@ -601,10 +610,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -602,10 +611,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -101,7 +101,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
    result->SetStringKey(kTreeField, accessibility_contents);
    FireWebUIListener(request_type, *(result.get()));
  }
-@@ -629,6 +640,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -630,6 +641,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -109,7 +109,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
    for (Browser* browser : *BrowserList::GetInstance()) {
      if (browser->session_id().id() == session_id) {
        std::unique_ptr<base::DictionaryValue> result(
-@@ -643,6 +655,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -644,6 +656,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
        return;
      }
    }
@@ -117,7 +117,7 @@ index b9fd875b26d64e84201605978f897b234b998f6f..20ac941733b0b1f9e14954fde1c17b7b
  #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
    std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-@@ -759,5 +772,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+@@ -760,5 +773,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  // static
  void AccessibilityUIMessageHandler::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index 6afb86bfb4a19..d67ab8eee59c7 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -100,10 +100,10 @@ index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5b
    } else {
      // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index aca31e17a90f95d6a4616fec5b33ce55cd136af0..e340cfae256797b7683fad8b32776a95889a8f46 100644
+index 804166d8844da5bd889f014e79d59d0cd75f5490..35ef412756a2c63394e5f2587b5bc73eadae4d60 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
-@@ -240,6 +240,24 @@ void PrintDialogGtk::UpdateSettings(
+@@ -239,6 +239,24 @@ void PrintDialogGtk::UpdateSettings(
  
    gtk_print_settings_set_n_copies(gtk_settings_, settings->copies());
    gtk_print_settings_set_collate(gtk_settings_, settings->collate());
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 9ed4dada269e3..9b3efd6eefcaa 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 9208dc75b4e3d969fbb0bb13de64d2b129de9509..b5779d43456c5e356497f2cb671fcb9b3492b47f 100644
+index d3228eb29e921f63d74b7291814c7121f99bf8f8..739def8df363d8f33b194c7191a0016eefffcd9a 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3170,6 +3170,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3171,6 +3171,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 9208dc75b4e3d969fbb0bb13de64d2b129de9509..b5779d43456c5e356497f2cb671fcb9b
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 1b7e71e12d01929b8bfacf8c7c8950922bdd3d59..ca5a03653611843a8eac90e1be86ca4aa40ecce2 100644
+index 6aa01e2f4e8227f0c1cb78b88009728efccdd998..98830a0b12036025b69c74342329f95d74e2c623 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -277,6 +277,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index e67cc4c13a9ed..c25fe7140292c 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,10 +38,10 @@ index 1e36669dfb275b8a7c4913c8465bd299c548ed3a..178023d52c9e8ef716ee215e7a243b18
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index b123e69bf6a57b1a4041c79c1cddd0117ed3851c..a8a23ccd0837866c1cb0657e0b8713d484042f38 100644
+index 6996e07dd19c0fa29fe658c6cb33adc60969e63e..ee480cc557db3bfd4ff9428324151d071ad1f444 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -348,7 +348,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -351,7 +351,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -51,7 +51,7 @@ index b123e69bf6a57b1a4041c79c1cddd0117ed3851c..a8a23ccd0837866c1cb0657e0b8713d4
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
-@@ -358,7 +359,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+@@ -361,7 +362,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    // See https://crbug.com/v8/11043
    SetFlags(mode, js_command_line_flags);
  
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index 385502d7e9df0..a5004a9488601 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index b26a3c72aa63b81f8f4558b28b404faf138a897b..335dc385eb03bc9634387af44dfd1aa3bfa71cb6 100644
+index e9c3f3dee36a44d40844a88dbb899f593d03c907..c8dc226ce7c87fa84da5c99760f12538e367bbc9 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
 @@ -230,6 +230,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -28,7 +28,7 @@ index b26a3c72aa63b81f8f4558b28b404faf138a897b..335dc385eb03bc9634387af44dfd1aa3
  
  void GpuDataManagerImpl::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index 4364da656ac02f2f717e713f37d29ce44c14242b..ba044aee23db495e1da69c5bc0a807e96783faa9 100644
+index 4ed951d5829e87431a1f9f84f0317978cb673e31..82f9a2f97e71848ece8d04effc083db94a45d495 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
 @@ -124,6 +124,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
@@ -40,10 +40,10 @@ index 4364da656ac02f2f717e713f37d29ce44c14242b..ba044aee23db495e1da69c5bc0a807e9
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 972bb4e8ba2d1470ed5f24c125551e3e627d79e4..d3b15d35eb458c00e470569904924c28c7a3957d 100644
+index 53402e4d706f58c26498015c1a5c33b4f7ceabc7..c14ce99ec72881133a5bf2bd90369ee0211f6ca1 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1211,6 +1211,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1215,6 +1215,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
@@ -57,10 +57,10 @@ index 972bb4e8ba2d1470ed5f24c125551e3e627d79e4..d3b15d35eb458c00e470569904924c28
  
  void GpuDataManagerImplPrivate::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index 81f6abb91a3fdefc1b0128f3224c7b82bfcbd0d2..99980e3528f4660bf1205e44326645d97e762cb9 100644
+index ac0afe687650da564187127dc7ea93a47acde719..237e3f00b1451be43949a797ef1b35885b958a5d 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -89,6 +89,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -90,6 +90,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool VulkanRequested() const;
    void PostCreateThreads();
    void TerminateInfoCollectionGpuProcess();
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index c8d8f95b97aec..c3969f67ffd76 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 862a5fa7d1f388c9e6cda18416fb5d9ae56cca4b..2da5d367dacd557bcca79412ed77fd74d37241f4 100644
+index b036986b35dac88ab58d572a9e77bf0b1210411a..56f58636177cba954bdd24f8c43fc339a5e9b436 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -950,6 +950,11 @@
+@@ -954,6 +954,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index db6a2993b6c77..f9b02be672a7b 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index 27d6cc30cad2dffed0a2587fdd49199248e006e1..f6c0974ca21e6b83faf81e5d11add0eb534645d1 100644
+index b1180a85530a7dd65022e174fe335ede0c7c55ca..c12133d82b111d37c8bac92980c22e406125c8df 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 84f03a08c570c..dff95cff6f340 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 90f738057d3040b5421d51592097c7c30106a94f..3cb2f0880bb36f19fc9b55f2351f891088e8c304 100755
+index a8f53aaae2f2dd7e5af3b50a3bf80671a6276581..ee128e30c394c755306a62412b06d15503ccd2f2 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index bfb6ba3121608..b44a477877ab9 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index ce5f2904c283643558375a84453073f7ea8aba3e..a17bf60c79fdd2511a46796b80879ed7926c706d 100644
+index 85a55e9bbb7403b031c512fa5e010cbb0487d9c6..31c83eab4781725540f57e1e66c6f7e7c0b85d8b 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -248,11 +248,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -247,11 +247,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 03d4ca35e86d8..81d1ad3dbb10e 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -135,7 +135,7 @@ index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd5
    std::vector<char*> argv_cstr;
    argv_cstr.reserve(argv.size() + 1);
 diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-index e28d37435da00153e34132f49ce8f6b240e70a65..77ce459d969022b7c5a4d1e57bb1f7e6fa7a9898 100644
+index 0e842caf7b6487d94978c7b68fb5b222e330581f..5eafcd163ee1a05203a5eb76592a449f5a84e71f 100644
 --- a/media/audio/mac/audio_low_latency_input_mac.cc
 +++ b/media/audio/mac/audio_low_latency_input_mac.cc
 @@ -34,19 +34,23 @@
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 8ac081f88cbfc..5dedbca657033 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -167,7 +167,7 @@ index 14fec4b1b39d995553b029ca7ec780ce29b27162..54a1142f17e2a63b86e1fab52ea90276
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index be753e5ea42cc8757b0e7f9a21aa12b40f1928f2..83f3ef36e17b484d838c9338ae6ad0073b42283c 100644
+index 244b208e6a7872ea4d25fcf74a78abc9248a9ac3..45bafcaaa10641ca3a8306a6685ee9ed730d1e02 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -319,6 +319,13 @@ component("base") {
@@ -233,10 +233,10 @@ index d4051a7a8755c7b10d4df3746cb2857471f07c45..de04616893d1c97e3607eb5a4b942733
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index 7ed5041b0625a98be269b4f4daeef33c3bc1f8b6..803d8bc43fa57c8e49d33d4be618d51a408ffe47 100644
+index c9294c5358401da716b6d8d2846e20e9a04f4e2d..c9a3cdee33e3aa8bfbfa9c6678c2828a94b90061 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -296,14 +296,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -297,14 +297,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +259,7 @@ index 7ed5041b0625a98be269b4f4daeef33c3bc1f8b6..803d8bc43fa57c8e49d33d4be618d51a
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1287,6 +1295,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1288,6 +1296,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index 7ed5041b0625a98be269b4f4daeef33c3bc1f8b6..803d8bc43fa57c8e49d33d4be618d51a
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1294,14 +1303,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1295,14 +1304,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index 541ac9b7e977d..940e9864b669b 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -40,10 +40,10 @@ index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 224542e2a70e980684d5d882af7fe3988c5ee96b..7a726eea86f21fe31077aaa447cccc05007d5eaa 100644
+index 767d3f6454ef3150354911ed683f5485bb83fbbb..f273b56276c1b277b307f6c4c061e08d12daea42 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-@@ -59,7 +59,7 @@
+@@ -60,7 +60,7 @@
  
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
@@ -52,7 +52,7 @@ index 224542e2a70e980684d5d882af7fe3988c5ee96b..7a726eea86f21fe31077aaa447cccc05
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -68,6 +68,7 @@
+@@ -69,6 +69,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
@@ -60,7 +60,7 @@ index 224542e2a70e980684d5d882af7fe3988c5ee96b..7a726eea86f21fe31077aaa447cccc05
  }
  
  template <typename BaseClass>
-@@ -148,7 +149,9 @@
+@@ -149,7 +150,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index 8054716d63c78..8a03d6be4a747 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -183,10 +183,10 @@ index ebe37172d254e8441fe2b8c290bd5a59af38d754..6a131f5c41f3e43a1467efeec2ce63f6
        "AudioToolbox.framework",
        "AudioUnit.framework",
 diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
-index ebdc6364312ee710d416318836c03aeec9bfb65c..aa9b50de7efaf0e1b64effea93204984c91790b5 100644
+index b8805f9174818ac086a5d6542c9962050f00aee8..5491b62a2e180b2f6e48e243e2ac78c3b1a16892 100644
 --- a/media/audio/mac/audio_manager_mac.cc
 +++ b/media/audio/mac/audio_manager_mac.cc
-@@ -886,7 +886,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
+@@ -887,7 +887,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
  
  void AudioManagerMac::InitializeOnAudioThread() {
    DCHECK(GetTaskRunner()->BelongsToCurrentThread());
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index e3324296a3770..43c8aae94a345 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c889d3fa94 100644
+index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17ce7acaf6 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -127,6 +127,11 @@
@@ -22,7 +22,7 @@ index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c8
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -434,6 +439,91 @@ bool GetFullDataFilePath(
+@@ -435,6 +440,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -114,7 +114,7 @@ index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c8
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -678,6 +768,13 @@ void NetworkContext::SetClient(
+@@ -732,6 +822,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,7 +128,7 @@ index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c8
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2242,6 +2339,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2298,6 +2395,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,10 +139,10 @@ index 54b5a281161187f887032d9445f21c541b9691e5..4c8982a8ae3ae23fbeef244cd23b43c8
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 3fd4c43562aa5de00d8698096f154522420c8f24..eed05c05d1da28284af6ae0cef45dbbb47254058 100644
+index 53e3f293150e725cd1261f09a8f9bfcb5371a76c..58671094857cdfe5d853c8a284d51bc1b8a09660 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -105,6 +105,7 @@ class URLMatcher;
+@@ -108,6 +108,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -150,7 +150,7 @@ index 3fd4c43562aa5de00d8698096f154522420c8f24..eed05c05d1da28284af6ae0cef45dbbb
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -221,6 +222,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -240,6 +241,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,9 +159,9 @@ index 3fd4c43562aa5de00d8698096f154522420c8f24..eed05c05d1da28284af6ae0cef45dbbb
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -796,6 +799,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
-   CertVerifierWithTrustAnchors* cert_verifier_with_trust_anchors_ = nullptr;
- #endif
+@@ -827,6 +830,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+   std::vector<base::OnceClosure> dismount_closures_;
+ #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
 +  RemoteCertVerifier* remote_cert_verifier_ = nullptr;
 +
@@ -169,10 +169,10 @@ index 3fd4c43562aa5de00d8698096f154522420c8f24..eed05c05d1da28284af6ae0cef45dbbb
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 64199b44316ab4671941c734444d207591512d0a..c929eb10af5b8856debdc0d665eac767e9730714 100644
+index b2beaa762bfe88b56ac24d35646b6e6cbc630816..b52e5a2230e96d55d7886bde331a505c58dd093a 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -280,6 +280,17 @@ struct NetworkContextFilePaths {
+@@ -281,6 +281,17 @@ struct NetworkContextFilePaths {
    bool trigger_migration = false;
  };
  
@@ -190,7 +190,7 @@ index 64199b44316ab4671941c734444d207591512d0a..c929eb10af5b8856debdc0d665eac767
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -829,6 +840,9 @@ interface NetworkContext {
+@@ -830,6 +841,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index f9c04cc3c1735..b4277e3d63f55 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -7,10 +7,10 @@ Pass RenderFrameHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.
 
 diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
-index 225609e52130d4113c8ae667f3ffa565bbde5b73..b33d27ce4fc6222146255cf4c0e7342751c75c9b 100644
+index 83b33e3f521aa79942ba3446a8b161a4e4e23da1..24f409f673797b6e8bb1da680343ea1ddc083e4f 100644
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
-@@ -196,6 +196,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
+@@ -195,6 +195,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
  
  // TODO(awdf): Rename to DisplayNonPersistentNotification (Similar for Close)
  void PlatformNotificationServiceImpl::DisplayNotification(
@@ -31,13 +31,13 @@ index b0e64049d411305d58802fd290bb0480e9b36fee..4afcf3b7a5b841409b0e1c4c2f32fd48
        const GURL& origin,
        const GURL& document_url,
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index fd2c2d72ebc3cab0cc824bb091da32d4be635dd9..8bcd6a87c38413a5281d164e3c0fcfd23c3fa04b 100644
+index 32a61e73658d33dcd0fe1640094c8b79dde0be37..3c3650e0f8364a5c86bd11a6f11ca559a97f5900 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
-@@ -81,10 +81,12 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
-     PlatformNotificationContextImpl* notification_context,
+@@ -82,10 +82,12 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
      BrowserContext* browser_context,
      scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
+     RenderProcessHost* render_process_host,
 +    RenderFrameHost* render_frame_host,
      const url::Origin& origin,
      const GURL& document_url,
@@ -46,8 +46,8 @@ index fd2c2d72ebc3cab0cc824bb091da32d4be635dd9..8bcd6a87c38413a5281d164e3c0fcfd2
 +      render_frame_host_(render_frame_host),
        browser_context_(browser_context),
        service_worker_context_(std::move(service_worker_context)),
-       origin_(origin),
-@@ -147,7 +149,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
+       render_process_host_id_(render_process_host->GetID()),
+@@ -149,7 +151,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
        notification_id, std::move(event_listener_remote));
  
    browser_context_->GetPlatformNotificationService()->DisplayNotification(
@@ -57,18 +57,18 @@ index fd2c2d72ebc3cab0cc824bb091da32d4be635dd9..8bcd6a87c38413a5281d164e3c0fcfd2
  }
  
 diff --git a/content/browser/notifications/blink_notification_service_impl.h b/content/browser/notifications/blink_notification_service_impl.h
-index cb2b09912dbe426611e944316841ee2a9c2e373f..4d2603c29b2d89fa296b1aad40c2132a9c7498aa 100644
+index dc8de24c86f1769680ce7830844d35dfef7eb7e7..fcd99361fa8c895d6bd89bacb9fb94e76969e7b2 100644
 --- a/content/browser/notifications/blink_notification_service_impl.h
 +++ b/content/browser/notifications/blink_notification_service_impl.h
-@@ -41,6 +41,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
-       PlatformNotificationContextImpl* notification_context,
+@@ -42,6 +42,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
        BrowserContext* browser_context,
        scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
+       RenderProcessHost* render_process_host,
 +      RenderFrameHost* render_frame_host,
        const url::Origin& origin,
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
-@@ -101,6 +102,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
+@@ -102,6 +103,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
    // The notification context that owns this service instance.
    raw_ptr<PlatformNotificationContextImpl> notification_context_;
  
@@ -77,69 +77,69 @@ index cb2b09912dbe426611e944316841ee2a9c2e373f..4d2603c29b2d89fa296b1aad40c2132a
  
    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-index f0d5ea365cf09d2dc06de88fc03e4bf5ddfdf4a6..b68666813ab231a3d4233d3ed2f9655b18d8a280 100644
+index 7461d5079f9cb0f257fbb93248c98be9409d38e7..4ddb9e40f0441b378d73ac75d99ae64c90d32b58 100644
 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
 +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-@@ -126,7 +126,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
- 
+@@ -129,7 +129,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
      notification_service_ = std::make_unique<BlinkNotificationServiceImpl>(
          notification_context_.get(), &browser_context_,
--        embedded_worker_helper_->context_wrapper(),
-+        embedded_worker_helper_->context_wrapper(), nullptr,
-         url::Origin::Create(GURL(kTestOrigin)),
+         embedded_worker_helper_->context_wrapper(), &render_process_host_,
+-        url::Origin::Create(GURL(kTestOrigin)),
++        nullptr, url::Origin::Create(GURL(kTestOrigin)),
          /*document_url=*/GURL(),
          notification_service_remote_.BindNewPipeAndPassReceiver());
+ 
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index 5580c415a1e8a45327147861d7c71cebd1ecbd5a..d37711f83be7566ec5ad2078942aaca1948a77c5 100644
+index 1195296c6f925e6c4f52f61866cf4b7f824af4e9..d3142bef0856c5cd7f4822ee9dcaedaef74a12d3 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
-@@ -281,13 +281,14 @@ void PlatformNotificationContextImpl::Shutdown() {
- }
+@@ -282,13 +282,14 @@ void PlatformNotificationContextImpl::Shutdown() {
  
  void PlatformNotificationContextImpl::CreateService(
+     RenderProcessHost* render_process_host,
 +    RenderFrameHost* render_frame_host,
      const url::Origin& origin,
      const GURL& document_url,
      mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    services_.push_back(std::make_unique<BlinkNotificationServiceImpl>(
--      this, browser_context_, service_worker_context_, origin, document_url,
--      std::move(receiver)));
-+      this, browser_context_, service_worker_context_, render_frame_host,
-+      origin, document_url, std::move(receiver)));
+       this, browser_context_, service_worker_context_, render_process_host,
+-      origin, document_url, std::move(receiver)));
++      render_frame_host, origin, document_url, std::move(receiver)));
  }
  
  void PlatformNotificationContextImpl::RemoveService(
 diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
-index 951075749b24814606f494c5a89ee2adf527f512..7036323ff8ee38ae92790dfd2e216df61181bc55 100644
+index 69f000e5cd25c6d89c88238873f638923bafdf0e..4f0068a92a0e99e2b34f105954689c7b5c19f436 100644
 --- a/content/browser/notifications/platform_notification_context_impl.h
 +++ b/content/browser/notifications/platform_notification_context_impl.h
-@@ -47,6 +47,7 @@ class BrowserContext;
- struct NotificationDatabaseData;
+@@ -48,6 +48,7 @@ struct NotificationDatabaseData;
  class PlatformNotificationServiceProxy;
+ class RenderProcessHost;
  class ServiceWorkerContextWrapper;
 +class RenderFrameHost;
  
  // Implementation of the Web Notification storage context. The public methods
  // defined in this interface must only be called on the UI thread.
-@@ -76,6 +77,7 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
-   // Creates a BlinkNotificationServiceImpl that is owned by this context.
+@@ -78,6 +79,7 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
    // |document_url| is empty when originating from a worker.
    void CreateService(
+       RenderProcessHost* render_process_host,
 +      RenderFrameHost* render_frame_host,
        const url::Origin& origin,
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index a188b1282e7ceca3fe24cb2d82c644bf0c21bc6f..f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6 100644
+index b769a06dc9443317a1073738c6fd38816ebeb186..20a697be32f7e27a9fa33d0225c94520aa5ebf2e 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2083,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2083,7 +2083,8 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
--      origin, document_url, std::move(receiver));
-+      RenderFrameHost::FromID(GetID(), render_frame_id), origin, document_url, std::move(receiver));
+-      this, origin, document_url, std::move(receiver));
++      this, RenderFrameHost::FromID(GetID(), render_frame_id),
++      origin, document_url, std::move(receiver));
  }
  
  void RenderProcessHostImpl::CreateWebSocketConnector(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index b22235fd4e639..4e2dbb1fe2106 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -138,7 +138,7 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157a
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index 6d2744b673ecb31464d4aa9b0d11177892c030f4..1dd75ec581ecd67e04a8f1cf1e43bce70eaa9380 100644
+index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..b9b2b4aa7d168cd7a83c36edbe4f7dc30565c921 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index e81c37f12f38f..8dc0b14a55140 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index d9db2d705c88e828383e81efd8f8c6d28e1520bb..7f0e1672af0fef134fc637324e366e9e8d985054 100644
+index d1a9c517a69bcc79a4b42f8eb8b6fcc3cea2f4da..04569140589c25d37bad2cd5ff979cfc6b1f3f43 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
-@@ -122,6 +122,16 @@
+@@ -125,6 +125,16 @@
    E_CPONLY(kColorOverlayScrollbarStrokeHoveredDark) \
    E_CPONLY(kColorOverlayScrollbarStrokeHoveredLight) \
    E_CPONLY(kColorProgressBar) \
@@ -28,7 +28,7 @@ index d9db2d705c88e828383e81efd8f8c6d28e1520bb..7f0e1672af0fef134fc637324e366e9e
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -174,6 +184,7 @@
+@@ -177,6 +187,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@@ -37,10 +37,10 @@ index d9db2d705c88e828383e81efd8f8c6d28e1520bb..7f0e1672af0fef134fc637324e366e9e
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
-index a89f393da6c06ba21d5303a925dd9e907bde5e03..e0106610831ca36544161672f3663e54b2585228 100644
+index b404ef6063c3a6c542565de46458b7401f129963..ce6fca0516d91b8acfe5fe6bc89bc09ae03a17d6 100644
 --- a/ui/color/ui_color_mixer.cc
 +++ b/ui/color/ui_color_mixer.cc
-@@ -138,6 +138,17 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -143,6 +143,17 @@ void AddUiColorMixer(ColorProvider* provider,
        SetAlpha(GetColorWithMaxContrast(kColorOverlayScrollbarFillHoveredLight),
                 gfx::kGoogleGreyAlpha500);
    mixer[kColorProgressBar] = {kColorAccent};
@@ -58,7 +58,7 @@ index a89f393da6c06ba21d5303a925dd9e907bde5e03..e0106610831ca36544161672f3663e54
    mixer[kColorSeparator] = {kColorMidground};
    mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
    mixer[kColorShadowValueAmbientShadowElevationThree] =
-@@ -213,6 +224,7 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -218,6 +229,7 @@ void AddUiColorMixer(ColorProvider* provider,
    mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
    mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
        kColorTreeNodeForegroundSelectedFocused};
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 877c4e12eaa0d..09a9b9dd6df08 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..3a42aa2a6cde698a75349e573a34b1328fc9c11c 100644
+index 5248f98e3d8e1469afe2ec87f696581cb0ff4687..4fe1faed3bb95407e2d25ea9c868bc0d615ba03c 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -88,7 +88,7 @@ index b11b8f34cf7e252a8d22e167d6555f3aa432e5c4..3a42aa2a6cde698a75349e573a34b132
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -229,16 +229,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+@@ -232,16 +232,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -127,7 +127,7 @@ index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a89f5489f 100644
+index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774bf8b4b9b9 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -168,7 +168,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -193,7 +197,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -179,7 +179,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -246,6 +252,7 @@ void ScriptedPrintReplyOnIO(
+@@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -187,7 +187,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -255,8 +262,9 @@ void ScriptedPrintReplyOnIO(
+@@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -198,7 +198,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -295,12 +303,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -213,7 +213,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -308,7 +318,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -225,7 +225,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -334,7 +347,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -331,7 +344,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -236,7 +236,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -487,7 +502,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -484,7 +499,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -246,7 +246,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -500,16 +516,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -497,16 +513,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -270,7 +270,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -625,11 +644,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -622,11 +641,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -285,7 +285,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -656,18 +678,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -653,18 +675,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -307,7 +307,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -677,6 +701,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -674,6 +698,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -315,7 +315,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -702,14 +727,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -699,14 +724,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -332,7 +332,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
      return;
    }
  #endif
-@@ -732,7 +757,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -729,7 +754,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -340,7 +340,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  #endif
  
    ReleasePrinterQuery();
-@@ -747,6 +771,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -744,6 +768,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -352,7 +352,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -757,10 +786,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -754,10 +783,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -365,7 +365,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -820,6 +851,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -817,6 +848,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -377,7 +377,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -881,7 +917,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -878,7 +914,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -389,7 +389,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    if (!weak_this)
      return false;
  
-@@ -963,6 +1002,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -960,6 +999,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    UnregisterSystemPrintClient();
  #endif
  
@@ -403,7 +403,7 @@ index 2eb81c133b94fd237e4eaa60472c08515fd6d01e..e641ba582e01bc02b6f3d6f28cfcd91a
    if (!print_job_)
      return;
  
-@@ -1012,7 +1058,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1009,7 +1055,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -569,7 +569,7 @@ index 6cd585d597315940be144506b9bb819137a7981e..8ea9c38a46460edd237f003ddd736224
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd056957255b74f0a2 100644
+index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8bdd9963fa 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -40,6 +40,7 @@
@@ -580,7 +580,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1263,7 +1264,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1264,7 +1265,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -590,7 +590,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
      if (!weak_this)
        return;
  
-@@ -1294,7 +1296,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1295,7 +1297,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -599,7 +599,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1309,7 +1311,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1310,7 +1312,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -608,7 +608,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1340,7 +1342,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1341,7 +1343,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -618,7 +618,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1389,6 +1392,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1390,6 +1393,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -627,7 +627,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1941,7 +1946,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1942,7 +1947,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -637,7 +637,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1956,7 +1962,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -1957,7 +1963,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -648,7 +648,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1964,7 +1972,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1965,7 +1973,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -657,7 +657,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1983,8 +1991,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -1984,8 +1992,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -674,7 +674,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2232,36 +2247,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2233,36 +2248,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -738,7 +738,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2405,7 +2435,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2406,7 +2436,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -747,7 +747,7 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2656,18 +2686,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
+@@ -2657,18 +2687,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
@@ -768,10 +768,10 @@ index 419a2daf45c123df7cd4e38614598278cb775cba..9b3fcc2e7cfbd70587845bbd05695725
  
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d6cd2cdbf 100644
+index cd26f9ecf888c2a321890edd378ee0f8843a7f6c..958794f95fe8830b7e494340fbd53b0e92a498e3 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
-@@ -256,7 +256,7 @@ class PrintRenderFrameHelper
+@@ -257,7 +257,7 @@ class PrintRenderFrameHelper
        mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
  
    // printing::mojom::PrintRenderFrame:
@@ -780,7 +780,7 @@ index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
-@@ -323,7 +323,9 @@ class PrintRenderFrameHelper
+@@ -324,7 +324,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -791,7 +791,7 @@ index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -332,12 +334,14 @@ class PrintRenderFrameHelper
+@@ -333,12 +335,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.
@@ -809,7 +809,7 @@ index 023594185e3aa9c79e8c5179c40ce867a5bb80e9..312cf5d4dbdb130dee3a07f970c9d92d
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 3d8281c8af9a4339bdd492c67edafc4ec6efb09d..6f8b9d42e051579cf1d0774afa771a7e45d31ff2 100644
+index c4cdb402bc0aaa25b9118bad33a84b7f04cc94c4..8022f3599ec38d614272cde3109a7be2d9b2840e 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
 @@ -120,7 +120,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index e0d3249452e81..ab990b94d8742 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d20db6210 100644
+index 7e421c72e3cb9abd9c3dc6542afed08f3910df93..218fe3eb6d6e2e4bce19776f25560aa7b81dfefa 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2073,6 +2073,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2067,6 +2067,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index ed56e947fa137cbaddaa12503ae983d7acd4463f..e1d77416991bac0178935b1bd255947d
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3fa51ecee644055db44bd4dd54c27ec224ff46d6..cc6afdef869470136c2cec392911742a289f6339 100644
+index cf37734d313470c27d2d40bd90cb199234a1e99e..63b01c486f56499bbc2acff0b5abdbf24b0ce676 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4500,6 +4500,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4506,6 +4506,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,7 +59,7 @@ index 3fa51ecee644055db44bd4dd54c27ec224ff46d6..cc6afdef869470136c2cec392911742a
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index fdb4a26de507f260466a7bc22c5cadc64190c342..55224f960151b0cae23b2a49d755eace630e9e3a 100644
+index 207633738a6bb358c796c8bb42aa5805b753f61b..5766344e7ca539e4ac8526eaa651f0079a9f01b1 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -961,6 +961,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -71,7 +71,7 @@ index fdb4a26de507f260466a7bc22c5cadc64190c342..55224f960151b0cae23b2a49d755eace
        RenderWidgetHostImpl* render_widget_host) override;
    bool IsShowingContextMenuOnPage() const override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index b68d706fe204c3e8d65b2bf523950840c0398db2..8852a8da29bc9b7f9b832ad392741751f46e3fd7 100644
+index 9ee3b74460c009c92fb811787250270ea13233b3..802d02e825d98f103f48e3134d6b9dd7e99aa2c5 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
 @@ -13,6 +13,7 @@
diff --git a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
index ddd75f00d4f9a..ae36800e4a5dc 100644
--- a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
+++ b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
@@ -12,10 +12,10 @@ should be removed as soon as those have been updated. Patching because
 every instance is a FTBFS that prevents testing any one instance's fix.
 
 diff --git a/base/callback_helpers.h b/base/callback_helpers.h
-index 046130ff8cbc4945e94a4ee71ac6320b4f7c5369..c71c3e1720b3f4c7b7362d99957cd2479bf88a37 100644
+index 460442d9c0f894f78b29b33c027320511511dbcc..30068c219aa497892e10290be0fe5734ded8b23c 100644
 --- a/base/callback_helpers.h
 +++ b/base/callback_helpers.h
-@@ -94,6 +94,22 @@ class OnceCallbackHolder final {
+@@ -95,6 +95,22 @@ class OnceCallbackHolder final {
  
  }  // namespace internal
  
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index 229cc895360e4..79d8bc6b449cb 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 6944f34edbfb7656c19883243ab2eb15f5ce51d9..0a2ddf31689b0d2ba2600a40067f9892b06033a7 100644
+index 7d6f0a7f7f65440b7827a2fe01d75998716b1bef..6aaa797b602f7fca7f78026311938c6c88efcfbd 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -662,6 +662,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -658,6 +658,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index 6944f34edbfb7656c19883243ab2eb15f5ce51d9..0a2ddf31689b0d2ba2600a40067f9892
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index abdd3cf7d93ab9a1f80351d38ddcee52664414da..98da92a6d31103dfa0a48e278c3a15ee0533791e 100644
+index a5c773c9a78565230013b6219ec83621980defef..34b6650c766673274f0da3e539bf9a8e71c3d36e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index f37fd4c085d93..6e7b9f068b951 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,7 +52,7 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index f1e0552dedf377238e9cd9d24a5ebea77ed83717..1f86073736f849e797e029678bc212ce96ba0bd9 100644
+index 6b8f8778d17008582ab9edeae6d63dd1111182f3..ff2e479125f1a6d7cbb52e4f674cb836d4f6596c 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -1547,7 +1547,7 @@ if (is_chrome_branded && !is_android) {
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index c90a98511a533..ae352c1290d32 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 347526056c09a34c62512869b7c21b9e2b6ea0d7..dda90e2043eaba4dd951628f4876cad60a553b9b 100644
+index 6ee18591ecf3f73388384d82a6530a950ff580e7..c43e94bc7c53ec9573c2e0b869d93bfd73f7051a 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1339,7 +1339,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1313,7 +1313,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index ea511b50b2598..e10c15ba036d4 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index f0b6fa61bb24d5b5fc4cf9cb8fc2f635f515f3f6..ca056c66af681548ba01bd07db7dadc5ce2a5280 100644
+index 20a697be32f7e27a9fa33d0225c94520aa5ebf2e..927e182bbba7a3700fd20c8c964da7cc162c4210 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1786,9 +1786,15 @@ bool RenderProcessHostImpl::Init() {
diff --git a/patches/chromium/sysroot.patch b/patches/chromium/sysroot.patch
index 13f063ddec35f..4dd9ad00ae567 100644
--- a/patches/chromium/sysroot.patch
+++ b/patches/chromium/sysroot.patch
@@ -7,7 +7,7 @@ Make chrome's install-sysroot scripts point to our custom sysroot builds,
 which include extra deps that Electron needs (e.g. libnotify)
 
 diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
-index ada6208644cb22c9f51c571f9509e335c0836163..86b55223fc21adf0e01cb276ebc613f6ea24f8b2 100755
+index eaa1c2edfd6fba471312fdb4eb3917b50e38e018..1824d513f6296985b5a3758f7e052ed77dcf0e0f 100755
 --- a/build/linux/sysroot_scripts/install-sysroot.py
 +++ b/build/linux/sysroot_scripts/install-sysroot.py
 @@ -41,9 +41,11 @@ except ImportError:
@@ -24,7 +24,7 @@ index ada6208644cb22c9f51c571f9509e335c0836163..86b55223fc21adf0e01cb276ebc613f6
  
  VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
  
-@@ -105,7 +107,7 @@ def GetSysrootDict(target_platform, target_arch):
+@@ -106,7 +108,7 @@ def GetSysrootDict(target_platform, target_arch):
    if target_arch not in VALID_ARCHS:
      raise Error('Unknown architecture: %s' % target_arch)
  
diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
index b3d8608dc3a5c..5ce4605f1e1ea 100644
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.
 
 diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-index a0d6f0353bb387e6eca9f2b13ab1d40996234110..8548abdfae14d630794abc1033f9b9eda59f771b 100644
+index 28e6c85b65b782c5b788b3e2283db070d4490c7a..87dc089b7c36d72d623c73cd5aba196f00a0d1f1 100644
 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 @@ -7,6 +7,7 @@
@@ -17,7 +17,7 @@ index a0d6f0353bb387e6eca9f2b13ab1d40996234110..8548abdfae14d630794abc1033f9b9ed
  
  #if BUILDFLAG(IS_WIN)
  #include "base/win/windows_version.h"
-@@ -63,6 +64,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
+@@ -53,6 +54,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
  ZygoteHandle PpapiPluginSandboxedProcessLauncherDelegate::GetZygote() {
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 44905e57c8ee5..f71e73be0d009 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,12 +9,12 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2033877b86eddbc9baac6a603587e631021f6819..7f4679943fa1d7b2585552a811098d97cada3070 100644
+index aeb111257740cd8c73e88c9b15d1f95fd49240c4..d00640770b8648116cb83d3a565f4b2f3ca37f8c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3051,6 +3051,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3057,6 +3057,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
-       params.main_frame_name, GetOriginalOpener(), primary_main_frame_policy);
+       params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
 +  if (params.view && params.delegate_view) {
 +    view_.reset(params.view);
@@ -26,7 +26,7 @@ index 2033877b86eddbc9baac6a603587e631021f6819..7f4679943fa1d7b2585552a811098d97
    WebContentsViewDelegate* delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3061,6 +3068,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3067,6 +3074,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_.reset(CreateWebContentsView(this, delegate,
                                        &render_view_host_delegate_view_));
    }
@@ -35,7 +35,7 @@ index 2033877b86eddbc9baac6a603587e631021f6819..7f4679943fa1d7b2585552a811098d97
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index cb672eb5276e8d3bb686f98405854f67970e72cb..d159f44dc855fee799f7b97b59a2a4e64631e7b4 100644
+index c062c66f596f513e46da04fc9ea5f5969e7ee632..2f14f906b51ce73a69cd780d70ad6264285138ac 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 8bb0068ff0b9f..55e05e7be1181 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 5ad53ce87d8757b18e5ecedbd7ec9aec54bea165..37f181f16cd2520de1cbec678e02061b165fed62 100644
+index a5d6618aac35f01e09a90bdafa9f60c8140b088c..9385e097701ef51ed375fcaa097cdbf14d7ef0c7 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6293,6 +6293,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6322,6 +6322,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 420a464c14cc5..4bd7a399681ec 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -26,10 +26,10 @@ index eb8968c2a86102d0d3a21f07c394f1c360083c6c..025ef3f70a5ae34faf8c6013fbfba171
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 030fd7ed2ea675e42e7894b1d89e636f5f5b85a6..998fe8b45959b8cfd91a1ed4f75f5946adf61537 100644
+index dbde0706007b8f202fcca5fc05562979617b0183..2adea2c2edabf3c401e9dcd228f1d57c08066059 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -950,6 +950,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -949,6 +949,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,7 +43,7 @@ index 030fd7ed2ea675e42e7894b1d89e636f5f5b85a6..998fe8b45959b8cfd91a1ed4f75f5946
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746ffc5d310 100644
+index e7d0d3e7c08c2f6e83726e7fa2557847d148a0ed..c6e0a728150db2b5af41e12304c88d57e51faa43 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -208,6 +208,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -55,7 +55,7 @@ index 8cbfe0a939e97de8dd8d4b5e4d741fb46e94fd45..2bc2ef61890a4c189613ae8a3f61c746
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index b68c90f1f1dd23b8b938936a092b01ffa41f0f28..60aa2e562901d9ff7b915c105acaf49851c959ba 100644
+index 0825226fae036b1e5503b66dabe4bd92ad6ee9bb..3cbb1ed9ef65cb9044a76b0a1686f6ab019c87b5 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
 @@ -714,6 +714,7 @@ class BLINK_PLATFORM_EXPORT Platform {
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index be38035e76cb7..11730d37c9627 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -35,10 +35,10 @@ index 025ef3f70a5ae34faf8c6013fbfba171c7f501ac..cea3f3dc05f91927f4ee8be5eec85ec2
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 998fe8b45959b8cfd91a1ed4f75f5946adf61537..30d22188daed7f0b451ae75655e12bac3c4f10ac 100644
+index 2adea2c2edabf3c401e9dcd228f1d57c08066059..7c76b39ea82dd600b72288cccc571660b653b150 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -962,6 +962,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -961,6 +961,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,7 +52,7 @@ index 998fe8b45959b8cfd91a1ed4f75f5946adf61537..30d22188daed7f0b451ae75655e12bac
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa5fc3db6e 100644
+index c6e0a728150db2b5af41e12304c88d57e51faa43..7fa7dab64506ddc60e27096412ea7e93608a3394 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -208,6 +208,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,7 +65,7 @@ index 2bc2ef61890a4c189613ae8a3f61c746ffc5d310..36661d62ec1e6f7966b0789326fcbefa
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 60aa2e562901d9ff7b915c105acaf49851c959ba..bec02889875ef8f6e422d99c8a161898b36610c5 100644
+index 3cbb1ed9ef65cb9044a76b0a1686f6ab019c87b5..c7694b4a89c16d02f946598bcf66aa3d241af83e 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
 @@ -714,6 +714,8 @@ class BLINK_PLATFORM_EXPORT Platform {
diff --git a/patches/node/.patches b/patches/node/.patches
index 29ed54ec0eb16..b04c145d37cf8 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -42,3 +42,4 @@ process_simplify_uv_write_int_calls_3519.patch
 macos_don_t_use_thread-unsafe_strtok_3524.patch
 process_fix_hang_after_note_exit_3521.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
+fix_preserve_proper_method_names_as-is_in_error_stack.patch
diff --git a/patches/node/fix_preserve_proper_method_names_as-is_in_error_stack.patch b/patches/node/fix_preserve_proper_method_names_as-is_in_error_stack.patch
new file mode 100644
index 0000000000000..e14acc34fa100
--- /dev/null
+++ b/patches/node/fix_preserve_proper_method_names_as-is_in_error_stack.patch
@@ -0,0 +1,432 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Thu, 7 Apr 2022 11:07:10 +0200
+Subject: fix: preserve "proper method names" as-is in error.stack
+
+Refs https://chromium-review.googlesource.com/c/v8/v8/+/3565724.
+
+This patch can be removed when Node.js updates to V8 10.2.60 or higher,
+which includes the above CL.
+
+The above CL removes prepended Function. and Object. from
+stack traces, and so we need to remove them from the comparison output.
+
+diff --git a/test/message/async_error_nexttick_main.out b/test/message/async_error_nexttick_main.out
+index 8d11dea63d4191d4e492d42cad499e9e6f277bd4..9669e9b5102ff9ce8dfffbc45dadc60dab578458 100644
+--- a/test/message/async_error_nexttick_main.out
++++ b/test/message/async_error_nexttick_main.out
+@@ -1,7 +1,7 @@
+ Error: test
+     at one (*fixtures*async-error.js:4:9)
+     at two (*fixtures*async-error.js:17:9)
+-    at processTicksAndRejections (node:internal/process/task_queues:*:*)
++    at process.processTicksAndRejections (node:internal/process/task_queues:*:*)
+     at async three (*fixtures*async-error.js:20:3)
+     at async four (*fixtures*async-error.js:24:3)
+     at async main (*message*async_error_nexttick_main.js:7:5)
+diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
+index 97b017f66e2395ca90fc7562b9043579911ddc62..1d21462c8cf63ddbbf9e3b785b553a3104710132 100644
+--- a/test/message/core_line_numbers.out
++++ b/test/message/core_line_numbers.out
+@@ -7,8 +7,8 @@ RangeError: Invalid input
+     at Object.decode (node:punycode:*:*)
+     at Object.<anonymous> (*test*message*core_line_numbers.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:*
+diff --git a/test/message/error_aggregateTwoErrors.out b/test/message/error_aggregateTwoErrors.out
+index d1dc13eacc303cc52003bd5820e7eeec8d48822b..eb85c92e63c850bbf8fbbe2c1600e783e0cd6066 100644
+--- a/test/message/error_aggregateTwoErrors.out
++++ b/test/message/error_aggregateTwoErrors.out
+@@ -4,9 +4,9 @@ throw aggregateTwoErrors(err, originalError);
+ AggregateError: original
+     at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:* {
+   code: 'ERR0'
+diff --git a/test/message/error_exit.out b/test/message/error_exit.out
+index 2ef95b535dafe7b0a918b8d6a844e4c4a617818d..dc5e6e7d28cef3a23ca7ba2cfb1435cad55e2aeb 100644
+--- a/test/message/error_exit.out
++++ b/test/message/error_exit.out
+@@ -9,9 +9,9 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
+ 
+     at Object.<anonymous> (*test*message*error_exit.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:* {
+   generatedMessage: true,
+diff --git a/test/message/error_with_nul.out b/test/message/error_with_nul.out
+index 7fbb33f08e8dc342b9efc899e66f5e3350e9489b..a359999420fa76bd09b401a732acb7dcdfaa2198 100644
+GIT binary patch
+delta 13
+VcmdnUvXEuMi;3^+Czmts0st)*2A2Q;
+
+delta 31
+ncmZ3;vXN!N3wHmctkmQZy@@aCIo(S0l1no4^YkXCGwuQa$o~w9
+
+diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
+index 19e89869ba74fae3f447e299904939da5a683280..2bdbe3df1b4c7e13ba33f099ae89f88365e6b690 100644
+--- a/test/message/events_unhandled_error_common_trace.out
++++ b/test/message/events_unhandled_error_common_trace.out
+@@ -7,9 +7,9 @@ Error: foo:bar
+     at foo (*events_unhandled_error_common_trace.js:*:*)
+     at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:*
+ Emitted 'error' event at:
+diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
+index 3e0d4697504e49eaae5ce1807a3794cccbcd6eec..87bb2fbb91a66e6dde9dfc61427682cba90f529c 100644
+--- a/test/message/events_unhandled_error_nexttick.out
++++ b/test/message/events_unhandled_error_nexttick.out
+@@ -5,11 +5,11 @@ node:events:*
+ Error
+     at Object.<anonymous> (*events_unhandled_error_nexttick.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:*
+ Emitted 'error' event at:
+     at *events_unhandled_error_nexttick.js:*:*
+-    at processTicksAndRejections (node:internal/process/task_queues:*:*)
++    at process.processTicksAndRejections (node:internal/process/task_queues:*:*)
+diff --git a/test/message/events_unhandled_error_sameline.out b/test/message/events_unhandled_error_sameline.out
+index c027275033941df96d6ab24c1647f110a0436d9a..872556a3b393e737adb4ed3b613f2c0cf20b1d2c 100644
+--- a/test/message/events_unhandled_error_sameline.out
++++ b/test/message/events_unhandled_error_sameline.out
+@@ -5,9 +5,9 @@ node:events:*
+ Error
+     at Object.<anonymous> (*events_unhandled_error_sameline.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:*
+ Emitted 'error' event at:
+diff --git a/test/message/events_unhandled_error_subclass.out b/test/message/events_unhandled_error_subclass.out
+index 5b8131970d50d50971184ccad0e2159c52fb0afd..073ab348a96f2e24efc2a661009287e4b7acda77 100644
+--- a/test/message/events_unhandled_error_subclass.out
++++ b/test/message/events_unhandled_error_subclass.out
+@@ -5,9 +5,9 @@ node:events:*
+ Error
+     at Object.<anonymous> (*events_unhandled_error_subclass.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:*
+ Emitted 'error' event on Foo instance at:
+diff --git a/test/message/if-error-has-good-stack.out b/test/message/if-error-has-good-stack.out
+index d87581cd7675346d51261efa4e0e28c57f9652eb..c5188137124d38f48989d6774a177795617b4974 100644
+--- a/test/message/if-error-has-good-stack.out
++++ b/test/message/if-error-has-good-stack.out
+@@ -12,9 +12,9 @@ AssertionError [ERR_ASSERTION]: ifError got unwanted exception: test error
+     at a (*if-error-has-good-stack.js:*:*)
+     at Object.<anonymous> (*if-error-has-good-stack.js:*:*)
+     at Module._compile (node:internal/modules/cjs/loader:*:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+     at Module.load (node:internal/modules/cjs/loader:*:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+     at node:internal/main/run_main_module:*:* {
+   generatedMessage: false,
+@@ -25,9 +25,9 @@ AssertionError [ERR_ASSERTION]: ifError got unwanted exception: test error
+       at a (*if-error-has-good-stack.js:*:*)
+       at Object.<anonymous> (*if-error-has-good-stack.js:*:*)
+       at Module._compile (node:internal/modules/cjs/loader:*:*)
+-      at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
++      at Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+       at Module.load (node:internal/modules/cjs/loader:*:*)
+-      at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++      at Module._load (node:internal/modules/cjs/loader:*:*)
+       at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+       at node:internal/main/run_main_module:*:*
+   expected: null,
+diff --git a/test/message/nexttick_throw.out b/test/message/nexttick_throw.out
+index 955bcda6a26da019c9954c80ef9db24ea3094bef..3180f9a7de5df66f30c9dcee697ddfbb97df3725 100644
+--- a/test/message/nexttick_throw.out
++++ b/test/message/nexttick_throw.out
+@@ -4,4 +4,4 @@
+         ^
+ ReferenceError: undefined_reference_error_maker is not defined
+     at *test*message*nexttick_throw.js:*:*
+-    at processTicksAndRejections (node:internal/process/task_queues:*:*)
++    at process.processTicksAndRejections (node:internal/process/task_queues:*:*)
+diff --git a/test/message/source_map_disabled_by_api.out b/test/message/source_map_disabled_by_api.out
+index d2cca7da5297e3772ae1acf7b8901eada6c21112..bbe017b05a20edd736ea13e2b501f8d9fdc7d0e6 100644
+--- a/test/message/source_map_disabled_by_api.out
++++ b/test/message/source_map_disabled_by_api.out
+@@ -5,9 +5,9 @@ Error: an error!
+     at functionA (*enclosing-call-site-min.js:1:26)
+     at Object.<anonymous> (*enclosing-call-site-min.js:1:199)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+ *enclosing-call-site.js:16
+       throw new Error('an error!')
+@@ -20,7 +20,7 @@ Error: an error!
+     at functionA (*enclosing-call-site.js:2:3)
+     at Object.<anonymous> (*enclosing-call-site.js:24:3)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+diff --git a/test/message/source_map_enabled_by_api.out b/test/message/source_map_enabled_by_api.out
+index 525ceccec12e4bdb8a08964ade461692ee99beca..e85ecee7f14a8ba1a599aeaf1d9f5f4855c42c5d 100644
+--- a/test/message/source_map_enabled_by_api.out
++++ b/test/message/source_map_enabled_by_api.out
+@@ -9,9 +9,9 @@ Error: an error!
+     at functionA (*enclosing-call-site.js:2:3)
+     at Object.<anonymous> (*enclosing-call-site.js:24:3)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+ *enclosing-call-site-min.js:1
+ var functionA=function(){functionB()};function functionB(){functionC()}var functionC=function(){functionD()},functionD=function(){if(0<Math.random())throw Error("an error!");},thrower=functionA;try{functionA()}catch(a){throw a;};
+@@ -24,7 +24,7 @@ Error: an error!
+     at functionA (*enclosing-call-site-min.js:1:26)
+     at Object.<anonymous> (*enclosing-call-site-min.js:1:199)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+diff --git a/test/message/source_map_enclosing_function.out b/test/message/source_map_enclosing_function.out
+index 3eb76ecbbef31cd224e27001b825bce210f4e170..1babe95e398c61cdd3a4e1fd82fe418e4fbcd238 100644
+--- a/test/message/source_map_enclosing_function.out
++++ b/test/message/source_map_enclosing_function.out
+@@ -9,7 +9,7 @@ Error: an error!
+     at functionA (*enclosing-call-site.js:2:3)
+     at Object.<anonymous> (*enclosing-call-site.js:24:3)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+diff --git a/test/message/source_map_reference_error_tabs.out b/test/message/source_map_reference_error_tabs.out
+index bce1b5f8911d4b34d3165d7a4bc5195cbe29211d..d56ef13b20bf9ca333e8806e3905059583c1f991 100644
+--- a/test/message/source_map_reference_error_tabs.out
++++ b/test/message/source_map_reference_error_tabs.out
+@@ -6,9 +6,9 @@ ReferenceError: alert is not defined
+     at *tabs.coffee:26:2*
+     at *tabs.coffee:1:14*
+     at Module._compile (node:internal/modules/cjs/loader:*
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
++    at Module._extensions..js (node:internal/modules/cjs/loader:*
+     at Module.load (node:internal/modules/cjs/loader:*
+-    at Function.Module._load (node:internal/modules/cjs/loader:*
++    at Module._load (node:internal/modules/cjs/loader:*
+     at Module.require (node:internal/modules/cjs/loader:*
+     at require (node:internal/modules/cjs/helpers:*
+     at Object.<anonymous> (*source_map_reference_error_tabs.js:*
+diff --git a/test/message/source_map_throw_catch.out b/test/message/source_map_throw_catch.out
+index 95bba5eee3e9dc6415ab44b7c842fc05b5d5dec2..9a98aa59e767592c04153c2a6d349710d7f28a2e 100644
+--- a/test/message/source_map_throw_catch.out
++++ b/test/message/source_map_throw_catch.out
+@@ -6,9 +6,9 @@ Error: an exception
+     at *typescript-throw.ts:18:11*
+     at *typescript-throw.ts:24:1*
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+     at require (node:internal/modules/cjs/helpers:*)
+     at Object.<anonymous> (*source_map_throw_catch.js:6:3)
+diff --git a/test/message/source_map_throw_first_tick.out b/test/message/source_map_throw_first_tick.out
+index efa97a1d9f56ddbaf87422fa14d1f14f07a33061..1d76129d0c3506824d22be17711b1351285af937 100644
+--- a/test/message/source_map_throw_first_tick.out
++++ b/test/message/source_map_throw_first_tick.out
+@@ -6,9 +6,9 @@ Error: an exception
+     at *typescript-throw.ts:18:11*
+     at *typescript-throw.ts:24:1*
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Module.require (node:internal/modules/cjs/loader:*)
+     at require (node:internal/modules/cjs/helpers:*)
+     at Object.<anonymous> (*source_map_throw_first_tick.js:5:1)
+diff --git a/test/message/source_map_throw_icu.out b/test/message/source_map_throw_icu.out
+index 78482d73ddf0376de2443321c426fc6c84a1c29a..c5f699f80a9be862772ae5af8884d85bec72ebe3 100644
+--- a/test/message/source_map_throw_icu.out
++++ b/test/message/source_map_throw_icu.out
+@@ -6,9 +6,9 @@ Error: an error
+     at *icu.jsx:3:23*
+     at *icu.jsx:9:5*
+     at Module._compile (node:internal/modules/cjs/loader:*
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
++    at Module._extensions..js (node:internal/modules/cjs/loader:*
+     at Module.load (node:internal/modules/cjs/loader:*
+-    at Function.Module._load (node:internal/modules/cjs/loader:*
++    at Module._load (node:internal/modules/cjs/loader:*
+     at Module.require (node:internal/modules/cjs/loader:*
+     at require (node:internal/modules/cjs/helpers:*
+     at Object.<anonymous> (*source_map_throw_icu.js:*
+diff --git a/test/message/source_map_throw_set_immediate.out b/test/message/source_map_throw_set_immediate.out
+index c735e23cb955c5cb733ae766bd019848764b7ff1..21349d4c4598c0abac50b2b90e3bbf9b439257f5 100644
+--- a/test/message/source_map_throw_set_immediate.out
++++ b/test/message/source_map_throw_set_immediate.out
+@@ -5,4 +5,4 @@
+ Error: goodbye
+     at Hello *uglify-throw-original.js:5:9*
+     at *uglify-throw-original.js:9:3*
+-    at processImmediate (node:internal/timers:*)
++    at process.processImmediate (node:internal/timers:*)
+diff --git a/test/message/timeout_throw.out b/test/message/timeout_throw.out
+index 66e495eb84d0bda0c3f6b5f085aa2061f0e1b59a..968a5e4e4117713e4bf347e56ff84001ec86bb31 100644
+--- a/test/message/timeout_throw.out
++++ b/test/message/timeout_throw.out
+@@ -4,4 +4,4 @@
+ ReferenceError: undefined_reference_error_maker is not defined
+     at Timeout._onTimeout (*test*message*timeout_throw.js:*:*)
+     at listOnTimeout (node:internal/timers:*:*)
+-    at processTimers (node:internal/timers:*:*)
++    at process.processTimers (node:internal/timers:*:*)
+diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out
+index 61dee9f6d4fba3696b91333c5fbdc20cf8e819fe..b06dc02a4861bd0eae89c682db0dce426b7409f3 100644
+--- a/test/message/undefined_reference_in_new_context.out
++++ b/test/message/undefined_reference_in_new_context.out
+@@ -12,5 +12,5 @@ ReferenceError: foo is not defined
+     at Module._compile (node:internal/modules/cjs/loader:*)
+     at *..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
++    at Module._load (node:internal/modules/cjs/loader:*:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+diff --git a/test/message/vm_display_runtime_error.out b/test/message/vm_display_runtime_error.out
+index 8f1e9c37967f253071ad20c5a4f2b81f7b65b8cc..d7a39915f999101d4f2bfcc5f7bc9ba77eab8f0d 100644
+--- a/test/message/vm_display_runtime_error.out
++++ b/test/message/vm_display_runtime_error.out
+@@ -9,9 +9,9 @@ Error: boo!
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_display_runtime_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
+ test.vm:1
+@@ -24,8 +24,8 @@ Error: spooky!
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_display_runtime_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
+diff --git a/test/message/vm_display_syntax_error.out b/test/message/vm_display_syntax_error.out
+index b0b70fcd75966825e0ff1893ff984a3e20edc926..ce82fb366e0375eeea8ced2320a3662584411160 100644
+--- a/test/message/vm_display_syntax_error.out
++++ b/test/message/vm_display_syntax_error.out
+@@ -8,9 +8,9 @@ SyntaxError: Unexpected number
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_display_syntax_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
+ test.vm:1
+@@ -22,8 +22,8 @@ SyntaxError: Unexpected number
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_display_syntax_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
+diff --git a/test/message/vm_dont_display_runtime_error.out b/test/message/vm_dont_display_runtime_error.out
+index 2ff2e8355ab90c8d9d00aaa6bf743c4f3b7d0de0..72ef73d628e10f600e5e3e90691587f2f63b1a69 100644
+--- a/test/message/vm_dont_display_runtime_error.out
++++ b/test/message/vm_dont_display_runtime_error.out
+@@ -10,8 +10,8 @@ Error: boo!
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_dont_display_runtime_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
+diff --git a/test/message/vm_dont_display_syntax_error.out b/test/message/vm_dont_display_syntax_error.out
+index d46dce2993f863622d2764d816adda548e568121..2ce14fe4013df2aa37c0339880294ba804c4f0c3 100644
+--- a/test/message/vm_dont_display_syntax_error.out
++++ b/test/message/vm_dont_display_syntax_error.out
+@@ -10,8 +10,8 @@ SyntaxError: Unexpected number
+     at Object.runInThisContext (node:vm:*)
+     at Object.<anonymous> (*test*message*vm_dont_display_syntax_error.js:*)
+     at Module._compile (node:internal/modules/cjs/loader:*)
+-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
++    at Module._extensions..js (node:internal/modules/cjs/loader:*)
+     at Module.load (node:internal/modules/cjs/loader:*)
+-    at Function.Module._load (node:internal/modules/cjs/loader:*)
++    at Module._load (node:internal/modules/cjs/loader:*)
+     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
+     at node:internal/main/run_main_module:*:*
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 3a023b20e5aff..e0f0f0f0ab2ef 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index e4ea82d914cf99a9368c94da2cc35bd3214d8c23..c4de87b38433bed1a14ce5c3a482023de909ec47 100644
+index c5f46f1b0c565fa9f55f8ead1e9ef6dab9571e95..25df04a1e1fc0a2b4ba61d33384c33d076d471fa 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,7 +605,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index e4ea82d914cf99a9368c94da2cc35bd3214d8c23..c4de87b38433bed1a14ce5c3a482023d
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5821,7 +5821,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5823,7 +5823,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index e4ea82d914cf99a9368c94da2cc35bd3214d8c23..c4de87b38433bed1a14ce5c3a482023d
  
      deps = [
        ":v8_libbase",
-@@ -5859,6 +5859,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5861,6 +5861,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index df2d1239081be..f47cb07374a30 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index e5a0e9fc7655bcc2359578e299b64952d6daa8a8..f15ccd03bc500b9a0095cb8581c6ffc143b29710 100644
+index ac85fb294df295d65236a5e9143337989d2bf6e6..f7004b9aed1ea8c33695be5eda01150ed626c37b 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9080,7 +9080,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9110,7 +9110,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index e5a0e9fc7655bcc2359578e299b64952d6daa8a8..f15ccd03bc500b9a0095cb8581c6ffc1
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index f0ba31671416f1d77d3b1a5ecb76a0dd3954c8c2..0436b896522b31904512694d20f883470a646a0f 100644
+index 73263505e22956f10eaac4482d8a9ddf191edc13..083b488e0391224da0d13d7d2b80b3696619d59d 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6151,9 +6151,9 @@ void Heap::TearDown() {
+@@ -6161,9 +6161,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index e54954fdfc3a9..32f89f3419eab 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index d465e67c094b01ee128b9cecfb5ee999f4a1d8d1..f30fec3bc5c1901f96ff168da422aad1fa7ecd08 100644
+index 29f753f4944541dd8dc11b4daff900cb45be42a8..21b85f6188b7b9cea577128d0957fc463dfe74ee 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -605,6 +605,10 @@ config("internal_config") {
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 2a9d03c693efa..d149375c1a9b0 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c4de87b38433bed1a14ce5c3a482023de909ec47..d465e67c094b01ee128b9cecfb5ee999f4a1d8d1 100644
+index 25df04a1e1fc0a2b4ba61d33384c33d076d471fa..29f753f4944541dd8dc11b4daff900cb45be42a8 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5833,7 +5833,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5835,7 +5835,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
index 563444f217760..267c4b8797500 100644
--- a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
+++ b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
@@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
 when support is synchronized across both v8 and node.
 
 diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
-index f2563ef61d3f5bc2d866f8c3366ca6c9ef8357a6..ed6180e28467df90ed8d91093ae9269a24e919db 100644
+index 7c6dec2b52514085a731f78a551370d54912b5e9..2e8332b9fa6a6a3f55e78f29f710afa02c268b99 100644
 --- a/src/objects/js-array-buffer.cc
 +++ b/src/objects/js-array-buffer.cc
 @@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {
diff --git a/script/sysroots.json b/script/sysroots.json
index aef0ad6713c80..2f2437ade3e0a 100644
--- a/script/sysroots.json
+++ b/script/sysroots.json
@@ -1,38 +1,37 @@
-
 {
-    "sid_amd64": {
-        "Sha1Sum": "7e008cea9eae822d80d55c67fbb5ef4204678e74",
-        "SysrootDir": "debian_sid_amd64-sysroot",
-        "Tarball": "debian_sid_amd64_sysroot.tar.xz"
+    "bullseye_amd64": {
+        "Sha1Sum": "202e5738f4fad834a43ad9978efc53ff710ee979",
+        "SysrootDir": "debian_bullseye_amd64-sysroot",
+        "Tarball": "debian_bullseye_amd64_sysroot.tar.xz"
     },
-    "sid_arm": {
-        "Sha1Sum": "b6f4bb07817bea91b06514a9c1e3832df5a90dbf",
-        "SysrootDir": "debian_sid_arm-sysroot",
-        "Tarball": "debian_sid_arm_sysroot.tar.xz"
+    "bullseye_arm": {
+        "Sha1Sum": "683d994e5643dff423643eac59c1f62606d14f43",
+        "SysrootDir": "debian_bullseye_arm-sysroot",
+        "Tarball": "debian_bullseye_arm_sysroot.tar.xz"
     },
-    "sid_arm64": {
-        "Sha1Sum": "5a56c1ef714154ea5003bcafb16f21b0f8dde023",
-        "SysrootDir": "debian_sid_arm64-sysroot",
-        "Tarball": "debian_sid_arm64_sysroot.tar.xz"
+    "bullseye_arm64": {
+        "Sha1Sum": "de38cc85d51a820c3307e1937f3c2d3cedcce988",
+        "SysrootDir": "debian_bullseye_arm64-sysroot",
+        "Tarball": "debian_bullseye_arm64_sysroot.tar.xz"
     },
-    "sid_armel": {
-        "Sha1Sum": "84dfbda5b70e4056b5ec37d8dc95b9b890b2a2b5",
-        "SysrootDir": "debian_sid_armel-sysroot",
-        "Tarball": "debian_sid_armel_sysroot.tar.xz"
+    "bullseye_armel": {
+        "Sha1Sum": "db15aab39af3cfbc55a8ff0386943db1b78a1eab",
+        "SysrootDir": "debian_bullseye_armel-sysroot",
+        "Tarball": "debian_bullseye_armel_sysroot.tar.xz"
     },
-    "sid_i386": {
-        "Sha1Sum": "b0f1f65ab3bd0232e7080bd3d89a9399f5ba07bc",
-        "SysrootDir": "debian_sid_i386-sysroot",
-        "Tarball": "debian_sid_i386_sysroot.tar.xz"
+    "bullseye_i386": {
+        "Sha1Sum": "41a75c881636adb765d4e40b06058f64df501ffe",
+        "SysrootDir": "debian_bullseye_i386-sysroot",
+        "Tarball": "debian_bullseye_i386_sysroot.tar.xz"
     },
-    "sid_mips": {
-        "Sha1Sum": "72d808dad16f6bc605f0380649608b04435b0727",
-        "SysrootDir": "debian_sid_mips-sysroot",
-        "Tarball": "debian_sid_mips_sysroot.tar.xz"
+    "bullseye_mips": {
+        "Sha1Sum": "6d85967e8d6771e50180c289dae57ad06fd873cd",
+        "SysrootDir": "debian_bullseye_mips-sysroot",
+        "Tarball": "debian_bullseye_mips_sysroot.tar.xz"
     },
-    "sid_mips64el": {
-        "Sha1Sum": "0ae3b93990a22fed1fa6974c0cf1fa0f9ad976b9",
-        "SysrootDir": "debian_sid_mips64el-sysroot",
-        "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
+    "bullseye_mips64el": {
+        "Sha1Sum": "0774922d1269947f462bda38c82c4e5e819326ab",
+        "SysrootDir": "debian_bullseye_mips64el-sysroot",
+        "Tarball": "debian_bullseye_mips64el_sysroot.tar.xz"
     }
-}
\ No newline at end of file
+}
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index e3a88a28b0872..3b04c8ee2ea2a 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -881,9 +881,8 @@ void App::OnGpuInfoUpdate() {
   Emit("gpu-info-update");
 }
 
-void App::OnGpuProcessCrashed(base::TerminationStatus status) {
-  Emit("gpu-process-crashed",
-       status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
+void App::OnGpuProcessCrashed() {
+  Emit("gpu-process-crashed", true);
 }
 
 void App::BrowserChildProcessLaunchedAndConnected(
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index 840c0cb66da34..ebf3cf247b67c 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -153,7 +153,7 @@ class App : public ElectronBrowserClient::Delegate,
 
   // content::GpuDataManagerObserver:
   void OnGpuInfoUpdate() override;
-  void OnGpuProcessCrashed(base::TerminationStatus status) override;
+  void OnGpuProcessCrashed() override;
 
   // content::BrowserChildProcessObserver:
   void BrowserChildProcessLaunchedAndConnected(
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index bdd2eb4d19c0c..eb640eb3517c2 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -348,8 +348,6 @@ ElectronBrowserContext::GetURLLoaderFactory() {
   params->disable_web_security = false;
 
   auto* storage_partition = GetDefaultStoragePartition();
-  params->url_loader_network_observer =
-      storage_partition->CreateURLLoaderNetworkObserverForNavigationRequest(-1);
   storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
       std::move(factory_receiver), std::move(params));
   url_loader_factory_ =
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index cab9b82abe3a9..ad3ae6229fe0f 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -253,6 +253,7 @@ blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
 ElectronPermissionManager::SubscriptionId
 ElectronPermissionManager::SubscribePermissionStatusChange(
     content::PermissionType permission,
+    content::RenderProcessHost* render_process_host,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback) {
@@ -408,4 +409,12 @@ ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
       content::PermissionUtil::GetLastCommittedOriginAsURL(render_frame_host));
 }
 
+blink::mojom::PermissionStatus
+ElectronPermissionManager::GetPermissionStatusForWorker(
+    content::PermissionType permission,
+    content::RenderProcessHost* render_process_host,
+    const GURL& worker_origin) {
+  return GetPermissionStatus(permission, worker_origin, worker_origin);
+}
+
 }  // namespace electron
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index e823b3c18833b..4afce85ad80cc 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -117,8 +117,13 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
+  blink::mojom::PermissionStatus GetPermissionStatusForWorker(
+      content::PermissionType permission,
+      content::RenderProcessHost* render_process_host,
+      const GURL& worker_origin) override;
   SubscriptionId SubscribePermissionStatusChange(
       content::PermissionType permission,
+      content::RenderProcessHost* render_process_host,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
diff --git a/shell/browser/extensions/api/resources_private/resources_private_api.cc b/shell/browser/extensions/api/resources_private/resources_private_api.cc
index 48cb45dc2d0ac..d0a2ebfbd694b 100644
--- a/shell/browser/extensions/api/resources_private/resources_private_api.cc
+++ b/shell/browser/extensions/api/resources_private/resources_private_api.cc
@@ -47,7 +47,6 @@ void AddStringsForPdf(base::DictionaryValue* dict) {
       {"pageReload", IDS_PDF_PAGE_RELOAD_BUTTON},
       {"bookmarks", IDS_PDF_BOOKMARKS},
       {"labelPageNumber", IDS_PDF_LABEL_PAGE_NUMBER},
-      {"tooltipRotateCW", IDS_PDF_TOOLTIP_ROTATE_CW},
       {"tooltipDownload", IDS_PDF_TOOLTIP_DOWNLOAD},
       {"tooltipPrint", IDS_PDF_TOOLTIP_PRINT},
       {"tooltipFitToPage", IDS_PDF_TOOLTIP_FIT_PAGE},
diff --git a/shell/browser/extensions/electron_component_extension_resource_manager.cc b/shell/browser/extensions/electron_component_extension_resource_manager.cc
index 85ce840ee88f5..40e37cdffa7d0 100644
--- a/shell/browser/extensions/electron_component_extension_resource_manager.cc
+++ b/shell/browser/extensions/electron_component_extension_resource_manager.cc
@@ -39,8 +39,8 @@ ElectronComponentExtensionResourceManager::
   pdf_extension_util::AddAdditionalData(true, &pdf_strings);
 
   ui::TemplateReplacements pdf_viewer_replacements;
-  ui::TemplateReplacementsFromDictionaryValue(
-      base::Value::AsDictionaryValue(pdf_strings), &pdf_viewer_replacements);
+  ui::TemplateReplacementsFromDictionaryValue(pdf_strings.GetDict(),
+                                              &pdf_viewer_replacements);
   extension_template_replacements_[extension_misc::kPdfExtensionId] =
       std::move(pdf_viewer_replacements);
 #endif
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index 69d7f5e921956..efad257969a74 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -36,6 +36,7 @@ ElectronHidDelegate::~ElectronHidDelegate() = default;
 std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
     content::RenderFrameHost* render_frame_host,
     std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+    std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
     content::HidChooser::Callback callback) {
   electron::HidChooserContext* chooser_context =
       GetChooserContext(render_frame_host);
@@ -47,7 +48,7 @@ std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
     DeleteControllerForFrame(render_frame_host);
   }
   AddControllerForFrame(render_frame_host, std::move(filters),
-                        std::move(callback));
+                        std::move(exclusion_filters), std::move(callback));
 
   // Return a nullptr because the return value isn't used for anything, eg
   // there is no mechanism to cancel navigator.hid.requestDevice(). The return
@@ -156,12 +157,13 @@ HidChooserController* ElectronHidDelegate::ControllerForFrame(
 HidChooserController* ElectronHidDelegate::AddControllerForFrame(
     content::RenderFrameHost* render_frame_host,
     std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+    std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
     content::HidChooser::Callback callback) {
   auto* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   auto controller = std::make_unique<HidChooserController>(
-      render_frame_host, std::move(filters), std::move(callback), web_contents,
-      weak_factory_.GetWeakPtr());
+      render_frame_host, std::move(filters), std::move(exclusion_filters),
+      std::move(callback), web_contents, weak_factory_.GetWeakPtr());
   controller_map_.insert(
       std::make_pair(render_frame_host, std::move(controller)));
   return ControllerForFrame(render_frame_host);
diff --git a/shell/browser/hid/electron_hid_delegate.h b/shell/browser/hid/electron_hid_delegate.h
index 1b243c6ac15ee..0305828750035 100644
--- a/shell/browser/hid/electron_hid_delegate.h
+++ b/shell/browser/hid/electron_hid_delegate.h
@@ -31,6 +31,7 @@ class ElectronHidDelegate : public content::HidDelegate,
   std::unique_ptr<content::HidChooser> RunChooser(
       content::RenderFrameHost* render_frame_host,
       std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+      std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
       content::HidChooser::Callback callback) override;
   bool CanRequestDevicePermission(
       content::RenderFrameHost* render_frame_host) override;
@@ -67,6 +68,7 @@ class ElectronHidDelegate : public content::HidDelegate,
   HidChooserController* AddControllerForFrame(
       content::RenderFrameHost* render_frame_host,
       std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+      std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
       content::HidChooser::Callback callback);
 
   base::ScopedObservation<HidChooserContext,
diff --git a/shell/browser/hid/hid_chooser_controller.cc b/shell/browser/hid/hid_chooser_controller.cc
index 7000999a0c1af..039d7074b528d 100644
--- a/shell/browser/hid/hid_chooser_controller.cc
+++ b/shell/browser/hid/hid_chooser_controller.cc
@@ -40,6 +40,47 @@ std::string PhysicalDeviceIdFromDeviceInfo(
                                            : device.physical_device_id;
 }
 
+bool FilterMatch(const blink::mojom::HidDeviceFilterPtr& filter,
+                 const device::mojom::HidDeviceInfo& device) {
+  if (filter->device_ids) {
+    if (filter->device_ids->is_vendor()) {
+      if (filter->device_ids->get_vendor() != device.vendor_id)
+        return false;
+    } else if (filter->device_ids->is_vendor_and_product()) {
+      const auto& vendor_and_product =
+          filter->device_ids->get_vendor_and_product();
+      if (vendor_and_product->vendor != device.vendor_id)
+        return false;
+      if (vendor_and_product->product != device.product_id)
+        return false;
+    }
+  }
+
+  if (filter->usage) {
+    if (filter->usage->is_page()) {
+      const uint16_t usage_page = filter->usage->get_page();
+      auto find_it =
+          std::find_if(device.collections.begin(), device.collections.end(),
+                       [=](const device::mojom::HidCollectionInfoPtr& c) {
+                         return usage_page == c->usage->usage_page;
+                       });
+      if (find_it == device.collections.end())
+        return false;
+    } else if (filter->usage->is_usage_and_page()) {
+      const auto& usage_and_page = filter->usage->get_usage_and_page();
+      auto find_it = std::find_if(
+          device.collections.begin(), device.collections.end(),
+          [&usage_and_page](const device::mojom::HidCollectionInfoPtr& c) {
+            return usage_and_page->usage_page == c->usage->usage_page &&
+                   usage_and_page->usage == c->usage->usage;
+          });
+      if (find_it == device.collections.end())
+        return false;
+    }
+  }
+  return true;
+}
+
 }  // namespace
 
 namespace gin {
@@ -62,11 +103,13 @@ namespace electron {
 HidChooserController::HidChooserController(
     content::RenderFrameHost* render_frame_host,
     std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+    std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
     content::HidChooser::Callback callback,
     content::WebContents* web_contents,
     base::WeakPtr<ElectronHidDelegate> hid_delegate)
     : WebContentsObserver(web_contents),
       filters_(std::move(filters)),
+      exclusion_filters_(std::move(exclusion_filters)),
       callback_(std::move(callback)),
       origin_(content::WebContents::FromRenderFrameHost(render_frame_host)
                   ->GetMainFrame()
@@ -251,7 +294,7 @@ bool HidChooserController::DisplayDevice(
       return false;
   }
 
-  return FilterMatchesAny(device);
+  return FilterMatchesAny(device) && !IsExcluded(device);
 }
 
 bool HidChooserController::FilterMatchesAny(
@@ -260,44 +303,18 @@ bool HidChooserController::FilterMatchesAny(
     return true;
 
   for (const auto& filter : filters_) {
-    if (filter->device_ids) {
-      if (filter->device_ids->is_vendor()) {
-        if (filter->device_ids->get_vendor() != device.vendor_id)
-          continue;
-      } else if (filter->device_ids->is_vendor_and_product()) {
-        const auto& vendor_and_product =
-            filter->device_ids->get_vendor_and_product();
-        if (vendor_and_product->vendor != device.vendor_id)
-          continue;
-        if (vendor_and_product->product != device.product_id)
-          continue;
-      }
-    }
+    if (FilterMatch(filter, device))
+      return true;
+  }
 
-    if (filter->usage) {
-      if (filter->usage->is_page()) {
-        const uint16_t usage_page = filter->usage->get_page();
-        auto find_it =
-            std::find_if(device.collections.begin(), device.collections.end(),
-                         [=](const device::mojom::HidCollectionInfoPtr& c) {
-                           return usage_page == c->usage->usage_page;
-                         });
-        if (find_it == device.collections.end())
-          continue;
-      } else if (filter->usage->is_usage_and_page()) {
-        const auto& usage_and_page = filter->usage->get_usage_and_page();
-        auto find_it = std::find_if(
-            device.collections.begin(), device.collections.end(),
-            [&usage_and_page](const device::mojom::HidCollectionInfoPtr& c) {
-              return usage_and_page->usage_page == c->usage->usage_page &&
-                     usage_and_page->usage == c->usage->usage;
-            });
-        if (find_it == device.collections.end())
-          continue;
-      }
-    }
+  return false;
+}
 
-    return true;
+bool HidChooserController::IsExcluded(
+    const device::mojom::HidDeviceInfo& device) const {
+  for (const auto& exclusion_filter : exclusion_filters_) {
+    if (FilterMatch(exclusion_filter, device))
+      return true;
   }
 
   return false;
diff --git a/shell/browser/hid/hid_chooser_controller.h b/shell/browser/hid/hid_chooser_controller.h
index ed5ef443a154d..dde678ff981fb 100644
--- a/shell/browser/hid/hid_chooser_controller.h
+++ b/shell/browser/hid/hid_chooser_controller.h
@@ -42,11 +42,13 @@ class HidChooserController
   // is closed, either by selecting an item or by dismissing the chooser dialog.
   // The callback is called with the selected device, or nullptr if no device is
   // selected.
-  HidChooserController(content::RenderFrameHost* render_frame_host,
-                       std::vector<blink::mojom::HidDeviceFilterPtr> filters,
-                       content::HidChooser::Callback callback,
-                       content::WebContents* web_contents,
-                       base::WeakPtr<ElectronHidDelegate> hid_delegate);
+  HidChooserController(
+      content::RenderFrameHost* render_frame_host,
+      std::vector<blink::mojom::HidDeviceFilterPtr> filters,
+      std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
+      content::HidChooser::Callback callback,
+      content::WebContents* web_contents,
+      base::WeakPtr<ElectronHidDelegate> hid_delegate);
   HidChooserController(HidChooserController&) = delete;
   HidChooserController& operator=(HidChooserController&) = delete;
   ~HidChooserController() override;
@@ -68,6 +70,7 @@ class HidChooserController
   void OnGotDevices(std::vector<device::mojom::HidDeviceInfoPtr> devices);
   bool DisplayDevice(const device::mojom::HidDeviceInfo& device) const;
   bool FilterMatchesAny(const device::mojom::HidDeviceInfo& device) const;
+  bool IsExcluded(const device::mojom::HidDeviceInfo& device) const;
 
   // Add |device_info| to |device_map_|. The device is added to the chooser item
   // representing the physical device. If the chooser item does not yet exist, a
@@ -88,6 +91,7 @@ class HidChooserController
   void OnDeviceChosen(gin::Arguments* args);
 
   std::vector<blink::mojom::HidDeviceFilterPtr> filters_;
+  std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters_;
   content::HidChooser::Callback callback_;
   const url::Origin origin_;
   const int frame_tree_node_id_;
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
index 045e7d9dcff9e..17b85784c0de8 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
@@ -148,7 +148,7 @@ void ElectronDesktopWindowTreeHostLinux::UpdateClientDecorationHints(
   if (showing_frame) {
     insets = view->GetBorderDecorationInsets();
     if (base::i18n::IsRTL()) {
-      insets.Set(insets.top(), insets.right(), insets.bottom(), insets.left());
+      insets.set_left_right(insets.right(), insets.left());
     }
 
     input_insets = view->GetInputInsets();
diff --git a/shell/browser/ui/views/autofill_popup_view.cc b/shell/browser/ui/views/autofill_popup_view.cc
index fbe475d5b7e9d..ce651f28becf6 100644
--- a/shell/browser/ui/views/autofill_popup_view.cc
+++ b/shell/browser/ui/views/autofill_popup_view.cc
@@ -174,7 +174,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
   const int text_align =
       is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT : gfx::Canvas::TEXT_ALIGN_LEFT;
   gfx::Rect value_rect = entry_rect;
-  value_rect.Inset(kEndPadding, 0);
+  value_rect.Inset(gfx::Insets::VH(kEndPadding, 0));
 
   int x_align_left = value_rect.x();
   const int value_width = gfx::GetStringWidth(
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
index b0d7210ff5db7..4455ddb3727a6 100644
--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -178,7 +178,8 @@ gfx::Rect ClientFrameViewLinux::GetBoundsForClientView() const {
   gfx::Rect client_bounds = bounds();
   if (!frame_->IsFullscreen()) {
     client_bounds.Inset(GetBorderDecorationInsets());
-    client_bounds.Inset(0, GetTitlebarBounds().height(), 0, 0);
+    client_bounds.Inset(
+        gfx::Insets::TLBR(0, GetTitlebarBounds().height(), 0, 0));
   }
   return client_bounds;
 }
diff --git a/shell/browser/ui/views/win_caption_button.cc b/shell/browser/ui/views/win_caption_button.cc
index a3a52244ff206..46280ee4b1583 100644
--- a/shell/browser/ui/views/win_caption_button.cc
+++ b/shell/browser/ui/views/win_caption_button.cc
@@ -50,7 +50,7 @@ void WinCaptionButton::OnPaintBackground(gfx::Canvas* canvas) {
   const SkAlpha theme_alpha = SkColorGetA(bg_color);
 
   gfx::Rect bounds = GetContentsBounds();
-  bounds.Inset(0, 0, 0, 0);
+  bounds.Inset(gfx::Insets::TLBR(0, 0, 0, 0));
 
   canvas->FillRect(bounds, SkColorSetA(bg_color, theme_alpha));
 
@@ -145,7 +145,7 @@ void DrawRect(gfx::Canvas* canvas,
               const cc::PaintFlags& flags) {
   gfx::RectF rect_f(rect);
   float stroke_half_width = flags.getStrokeWidth() / 2;
-  rect_f.Inset(stroke_half_width, stroke_half_width);
+  rect_f.Inset(gfx::InsetsF::VH(stroke_half_width, stroke_half_width));
   canvas->DrawRect(rect_f, flags);
 }
 
@@ -197,7 +197,7 @@ void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
     case VIEW_ID_RESTORE_BUTTON: {
       // Bottom left ("in front") square.
       const int separation = std::floor(2 * scale);
-      symbol_rect.Inset(0, separation, separation, 0);
+      symbol_rect.Inset(gfx::Insets::TLBR(0, separation, separation, 0));
       DrawRect(canvas, symbol_rect, flags);
 
       // Top right ("behind") square.
diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index bf67ab5d82033..b5d56fa751481 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -132,7 +132,7 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
         // show the resize cursor when resizing is possible. The cost of which
         // is also maybe showing it over the portion of the DIP that isn't the
         // outermost pixel.
-        buttons.Inset(0, kCaptionButtonTopInset, 0, 0);
+        buttons.Inset(gfx::Insets::TLBR(0, kCaptionButtonTopInset, 0, 0));
         if (buttons.Contains(point))
           return HTNOWHERE;
       }
@@ -143,8 +143,8 @@ int WinFrameView::NonClientHitTest(const gfx::Point& point) {
     // pixels at the end of the top and bottom edges trigger diagonal resizing.
     constexpr int kResizeCornerWidth = 16;
     int window_component = GetHTComponentForFrame(
-        point, gfx::Insets(top_border_thickness, 0, 0, 0), top_border_thickness,
-        kResizeCornerWidth - FrameBorderThickness(),
+        point, gfx::Insets::TLBR(top_border_thickness, 0, 0, 0),
+        top_border_thickness, kResizeCornerWidth - FrameBorderThickness(),
         frame()->widget_delegate()->CanResize());
     if (window_component != HTNOWHERE)
       return window_component;
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 2e4e5bc9502e4..696798d9111aa 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -93,7 +93,7 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
     // monitors with different DPIs before changing this code.
     const int thickness = ::GetSystemMetrics(SM_CXSIZEFRAME) +
                           ::GetSystemMetrics(SM_CXPADDEDBORDER);
-    insets->Set(thickness, thickness, thickness, thickness);
+    *insets = gfx::Insets::TLBR(thickness, thickness, thickness, thickness);
     return true;
   }
   return false;
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 31d7bb7599625..ca93d5e0954bd 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1995,4 +1995,44 @@ describe('navigator.hid', () => {
       expect(device).to.equal('');
     }
   });
+
+  it('returns excludes a device when a exclusionFilter is specified', async () => {
+    const exclusionFilters = <any>[];
+    let haveDevices = false;
+    let checkForExcludedDevice = false;
+
+    w.webContents.session.on('select-hid-device', (event, details, callback) => {
+      if (details.deviceList.length > 0) {
+        details.deviceList.find((device) => {
+          if (device.name && device.name !== '' && device.serialNumber && device.serialNumber !== '') {
+            console.log('device is: ', device);
+            if (checkForExcludedDevice) {
+              const compareDevice = {
+                vendorId: device.vendorId,
+                productId: device.productId
+              };
+              expect(compareDevice).to.not.equal(exclusionFilters[0], 'excluded device should not be returned');
+            } else {
+              haveDevices = true;
+              exclusionFilters.push({
+                vendorId: device.vendorId,
+                productId: device.productId
+              });
+              return true;
+            }
+          }
+        });
+      }
+      callback();
+    });
+
+    await getDevices();
+    if (haveDevices) {
+      // We have devices to exclude, so check if exculsionFilters work
+      checkForExcludedDevice = true;
+      await w.webContents.executeJavaScript(`
+        navigator.hid.requestDevice({filters: [], exclusionFilters: ${JSON.stringify(exclusionFilters)}}).then(device => device.toString()).catch(err => err.toString());
+      `, true);
+    }
+  });
 });
diff --git a/spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js b/spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js
index a095bf69f490c..87ec0d6ada4f4 100644
--- a/spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js
+++ b/spec-main/fixtures/crash-cases/quit-on-crashed-event/index.js
@@ -15,5 +15,6 @@ app.once('ready', async () => {
       process.exit(details.exitCode);
     }
   });
-  await w.webContents.loadURL('chrome://checkcrash');
+  await w.webContents.loadURL('about:blank');
+  w.webContents.executeJavaScript('process.crash()');
 });
diff --git a/spec/static/main.js b/spec/static/main.js
index 675c90fb42a9f..d52fa1953a8c4 100644
--- a/spec/static/main.js
+++ b/spec/static/main.js
@@ -86,8 +86,14 @@ app.on('window-all-closed', function () {
   app.quit();
 });
 
-app.on('gpu-process-crashed', (event, killed) => {
-  console.log(`GPU process crashed (killed=${killed})`);
+app.on('child-process-gone', (event, details) => {
+  if (details.type === 'GPU' && details.reason !== 'clean-exit') {
+    if (details.reason === 'crashed') {
+      console.log('GPU process crashed');
+    } else {
+      console.log(`GPU process exited with code ${details.exitCode}`);
+    }
+  }
 });
 
 app.on('renderer-process-crashed', (event, contents, killed) => {

From c0d442364aaaf3e6ad4d1b93a9fce32f23675f43 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 12 Apr 2022 04:21:55 -0700
Subject: [PATCH 257/811] build: explicitly run scripts with python3 (#33720)

* build: explicitly run scripts with python3

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 build/js2c.py                                     | 2 +-
 build/npm-run.py                                  | 2 +-
 build/strip_framework.py                          | 2 +-
 build/zip.py                                      | 2 +-
 build/zip_libcxx.py                               | 2 +-
 patches/node/build_add_gn_build_files.patch       | 8 ++++----
 patches/squirrel.mac/build_add_gn_config.patch    | 4 ++--
 script/add-debug-link.py                          | 2 +-
 script/apply_all_patches.py                       | 2 +-
 script/check-relative-doc-links.py                | 2 +-
 script/copy-debug-symbols.py                      | 2 +-
 script/dbus_mock.py                               | 2 +-
 script/export_all_patches.py                      | 2 +-
 script/generate-config-gypi.py                    | 2 +-
 script/generate-zip-manifest.py                   | 2 +-
 script/git-export-patches                         | 2 +-
 script/git-import-patches                         | 2 +-
 script/lib/config.py                              | 2 +-
 script/lib/git.py                                 | 2 +-
 script/lib/patches.py                             | 2 +-
 script/lib/util.py                                | 2 +-
 script/native-tests.py                            | 2 +-
 script/patches-mtime-cache.py                     | 2 +-
 script/release/uploaders/upload-index-json.py     | 2 +-
 script/release/uploaders/upload-node-checksums.py | 2 +-
 script/release/uploaders/upload-node-headers.py   | 2 +-
 script/release/uploaders/upload-symbols.py        | 2 +-
 script/release/uploaders/upload.py                | 2 +-
 script/run-clang-format.py                        | 2 +-
 script/strip-binaries.py                          | 2 +-
 script/verify-chromedriver.py                     | 2 +-
 script/verify-ffmpeg.py                           | 2 +-
 script/verify-mksnapshot.py                       | 2 +-
 script/zip-symbols.py                             | 2 +-
 script/zip_manifests/check-zip-manifest.py        | 2 +-
 35 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/build/js2c.py b/build/js2c.py
index 0f7178baf0e08..7024e7391d5bf 100755
--- a/build/js2c.py
+++ b/build/js2c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import subprocess
diff --git a/build/npm-run.py b/build/npm-run.py
index bd0c9097bf113..49a6abac65d07 100644
--- a/build/npm-run.py
+++ b/build/npm-run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import os
 import subprocess
diff --git a/build/strip_framework.py b/build/strip_framework.py
index 1ba173dfc1c18..73cf424dde488 100755
--- a/build/strip_framework.py
+++ b/build/strip_framework.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 import subprocess
 import sys
diff --git a/build/zip.py b/build/zip.py
index 19fe514cd9d30..bfaf27c08b24b 100644
--- a/build/zip.py
+++ b/build/zip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import os
 import subprocess
diff --git a/build/zip_libcxx.py b/build/zip_libcxx.py
index 5eec83d2261b9..daa94fc8fb8a5 100644
--- a/build/zip_libcxx.py
+++ b/build/zip_libcxx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import os
 import subprocess
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index fbf050490c493..de7fc0acfc4d5 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -1811,11 +1811,11 @@ index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aac
  // which the Node binary being built supports.
 diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
 new file mode 100755
-index 0000000000000000000000000000000000000000..8f884a41f57630ac432eb85ebfc9b8bc82cddaca
+index 0000000000000000000000000000000000000000..87621ba1d7f1c80aadb81461824b0c2edab1de22
 --- /dev/null
 +++ b/tools/generate_gn_filenames_json.py
 @@ -0,0 +1,75 @@
-+#!/usr/bin/env python
++#!/usr/bin/env python3
 +import json
 +import os
 +import sys
@@ -1892,11 +1892,11 @@ index 0000000000000000000000000000000000000000..8f884a41f57630ac432eb85ebfc9b8bc
 +    f.write('\n')
 diff --git a/tools/generate_node_version_header.py b/tools/generate_node_version_header.py
 new file mode 100755
-index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2eee17e941
+index 0000000000000000000000000000000000000000..2a92eccfa582df361f2a889c0d9b32c1059baa7d
 --- /dev/null
 +++ b/tools/generate_node_version_header.py
 @@ -0,0 +1,25 @@
-+#!/usr/bin/env python
++#!/usr/bin/env python3
 +import re
 +import sys
 +
diff --git a/patches/squirrel.mac/build_add_gn_config.patch b/patches/squirrel.mac/build_add_gn_config.patch
index 1df38e3aaa3fa..4f6e3a0db339a 100644
--- a/patches/squirrel.mac/build_add_gn_config.patch
+++ b/patches/squirrel.mac/build_add_gn_config.patch
@@ -511,11 +511,11 @@ index 0000000000000000000000000000000000000000..bdfaf95f3eca65b3e0831db1b66f651d
 +}
 diff --git a/build/xcrun.py b/build/xcrun.py
 new file mode 100644
-index 0000000000000000000000000000000000000000..18ac587f80441106405d00fafd9ee1f25b147772
+index 0000000000000000000000000000000000000000..a7aeeb7d3e187bd91ef12ed860d1e37eaea31fc1
 --- /dev/null
 +++ b/build/xcrun.py
 @@ -0,0 +1,14 @@
-+#!/usr/bin/env python
++#!/usr/bin/env python3
 +from __future__ import print_function
 +import os
 +import subprocess
diff --git a/script/add-debug-link.py b/script/add-debug-link.py
index 201d726d8240e..167c9e2d93545 100755
--- a/script/add-debug-link.py
+++ b/script/add-debug-link.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import os
diff --git a/script/apply_all_patches.py b/script/apply_all_patches.py
index d3e21bd2e86fd..c2e83bea7798a 100755
--- a/script/apply_all_patches.py
+++ b/script/apply_all_patches.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import json
diff --git a/script/check-relative-doc-links.py b/script/check-relative-doc-links.py
index 7779a1c24eeda..f297253b6dd0e 100755
--- a/script/check-relative-doc-links.py
+++ b/script/check-relative-doc-links.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import os
diff --git a/script/copy-debug-symbols.py b/script/copy-debug-symbols.py
index 159387fadb60e..0ceff1a0e2e3f 100755
--- a/script/copy-debug-symbols.py
+++ b/script/copy-debug-symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import os
diff --git a/script/dbus_mock.py b/script/dbus_mock.py
index f7246452a8b54..c3b4932a74bf3 100644
--- a/script/dbus_mock.py
+++ b/script/dbus_mock.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import subprocess
diff --git a/script/export_all_patches.py b/script/export_all_patches.py
index f62c3b102830c..49d56d856be53 100644
--- a/script/export_all_patches.py
+++ b/script/export_all_patches.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import json
diff --git a/script/generate-config-gypi.py b/script/generate-config-gypi.py
index fee183951d87f..b7885da41c87b 100755
--- a/script/generate-config-gypi.py
+++ b/script/generate-config-gypi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import ast
diff --git a/script/generate-zip-manifest.py b/script/generate-zip-manifest.py
index c82e239d3d983..c7b6558f012f9 100755
--- a/script/generate-zip-manifest.py
+++ b/script/generate-zip-manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import zipfile
 import sys
diff --git a/script/git-export-patches b/script/git-export-patches
index bb76b29513b53..b8d9943be4617 100755
--- a/script/git-export-patches
+++ b/script/git-export-patches
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import sys
diff --git a/script/git-import-patches b/script/git-import-patches
index 053682f982d33..d1bdb4ef1b126 100755
--- a/script/git-import-patches
+++ b/script/git-import-patches
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import sys
diff --git a/script/lib/config.py b/script/lib/config.py
index 43f076f735bdf..b523475cf81e0 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import os
diff --git a/script/lib/git.py b/script/lib/git.py
index 3ea4808f8af37..aa3adb16158c1 100644
--- a/script/lib/git.py
+++ b/script/lib/git.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Git helper functions.
 
diff --git a/script/lib/patches.py b/script/lib/patches.py
index 8910dd4126685..99fd12df5e40a 100644
--- a/script/lib/patches.py
+++ b/script/lib/patches.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import codecs
 import os
diff --git a/script/lib/util.py b/script/lib/util.py
index c7f448331a7cd..2dc6c45777e0d 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import contextlib
diff --git a/script/native-tests.py b/script/native-tests.py
index f6dea2a8d216b..7a577bc75f434 100755
--- a/script/native-tests.py
+++ b/script/native-tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/script/patches-mtime-cache.py b/script/patches-mtime-cache.py
index 800d3b03cbb83..b173b0bc7fcf9 100644
--- a/script/patches-mtime-cache.py
+++ b/script/patches-mtime-cache.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index 41880d5667dae..2b09e55b88133 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import json
diff --git a/script/release/uploaders/upload-node-checksums.py b/script/release/uploaders/upload-node-checksums.py
index dfa8ef3595ad7..7df8bc1468c8f 100755
--- a/script/release/uploaders/upload-node-checksums.py
+++ b/script/release/uploaders/upload-node-checksums.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import hashlib
diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py
index 862eea96e8b02..77b72ae1d61a2 100755
--- a/script/release/uploaders/upload-node-headers.py
+++ b/script/release/uploaders/upload-node-headers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import glob
diff --git a/script/release/uploaders/upload-symbols.py b/script/release/uploaders/upload-symbols.py
index 3e877e64772db..402cb4b2d31c1 100755
--- a/script/release/uploaders/upload-symbols.py
+++ b/script/release/uploaders/upload-symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import glob
 import os
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index f255ad50acb0d..25078bbcc6302 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import argparse
diff --git a/script/run-clang-format.py b/script/run-clang-format.py
index a8d43e08ba83b..4d2e4b0641c0c 100644
--- a/script/run-clang-format.py
+++ b/script/run-clang-format.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """A wrapper script around clang-format, suitable for linting multiple files
 and to use for continuous integration.
 This is an alternative API for the clang-format command line.
diff --git a/script/strip-binaries.py b/script/strip-binaries.py
index 73fbc7ffad0c5..625218c5b6810 100755
--- a/script/strip-binaries.py
+++ b/script/strip-binaries.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import os
diff --git a/script/verify-chromedriver.py b/script/verify-chromedriver.py
index b754641dda65e..5244bb5c57b73 100644
--- a/script/verify-chromedriver.py
+++ b/script/verify-chromedriver.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/script/verify-ffmpeg.py b/script/verify-ffmpeg.py
index ee7de30fbc1b4..0ee4ffe3093f4 100755
--- a/script/verify-ffmpeg.py
+++ b/script/verify-ffmpeg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import os
diff --git a/script/verify-mksnapshot.py b/script/verify-mksnapshot.py
index 8e9d632c8e68a..47d0a4fa32842 100755
--- a/script/verify-mksnapshot.py
+++ b/script/verify-mksnapshot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import glob
diff --git a/script/zip-symbols.py b/script/zip-symbols.py
index 23521e823053f..c87c8a1e6b788 100755
--- a/script/zip-symbols.py
+++ b/script/zip-symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import argparse
diff --git a/script/zip_manifests/check-zip-manifest.py b/script/zip_manifests/check-zip-manifest.py
index 39a6e94e16989..4f5594b2c98f3 100755
--- a/script/zip_manifests/check-zip-manifest.py
+++ b/script/zip_manifests/check-zip-manifest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import zipfile
 import sys

From 1c53fc43311f4056bfad0b90c43690d9d757b6ef Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 06:00:49 -0700
Subject: [PATCH 258/811] Bump v20.0.0-nightly.20220412

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..7b0cc745e7233 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220412
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..2fcbb9042d5cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220412",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..4bf9083adcf9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220412
+ PRODUCTVERSION 20,0,0,20220412
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0287c3f51167853dd4405ad1c8ee8136e109a069 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 07:52:41 -0700
Subject: [PATCH 259/811] Revert "Bump v20.0.0-nightly.20220412"

This reverts commit 1c53fc43311f4056bfad0b90c43690d9d757b6ef.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7b0cc745e7233..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220412
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 2fcbb9042d5cc..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220412",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bf9083adcf9f..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220412
- PRODUCTVERSION 20,0,0,20220412
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 56ab3d73c6f9b2716281b53de3dfcbbbcc1f2188 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 08:05:06 -0700
Subject: [PATCH 260/811] Bump v20.0.0-nightly.20220412

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..7b0cc745e7233 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220412
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..2fcbb9042d5cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220412",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..4bf9083adcf9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220412
+ PRODUCTVERSION 20,0,0,20220412
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 48edb2c7070a1e28787c6b72a304d40971ab390a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:06:19 -0700
Subject: [PATCH 261/811] Revert "Bump v20.0.0-nightly.20220412"

This reverts commit 56ab3d73c6f9b2716281b53de3dfcbbbcc1f2188.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7b0cc745e7233..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220412
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 2fcbb9042d5cc..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220412",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bf9083adcf9f..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220412
- PRODUCTVERSION 20,0,0,20220412
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3057ff01201cd552ab8f7052bd2810f1bf4b4e3c Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 12 Apr 2022 21:47:15 +0200
Subject: [PATCH 262/811] docs: note safeStorage.isEncryptionAvailable() needs
 ready event (#33724)

---
 docs/api/safe-storage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/safe-storage.md b/docs/api/safe-storage.md
index d0a76ec87a996..e96c18bbf0795 100644
--- a/docs/api/safe-storage.md
+++ b/docs/api/safe-storage.md
@@ -20,7 +20,7 @@ Returns `boolean` - Whether encryption is available.
 
 On Linux, returns true if the secret key is
 available. On MacOS, returns true if Keychain is available.
-On Windows, returns true with no other preconditions.
+On Windows, returns true once the app has emitted the `ready` event.
 
 ### `safeStorage.encryptString(plainText)`
 

From 2ca46058cd3f532d49ea3b031ebc78a87e3232ad Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 12 Apr 2022 14:07:40 -0700
Subject: [PATCH 263/811] build: migrate urllib to python3 (#33737)

---
 script/release/uploaders/upload-index-json.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index 2b09e55b88133..a96ffbc556a5c 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -4,7 +4,7 @@
 import json
 import os
 import sys
-import urllib2
+from urllib.request import Request, urlopen
 
 sys.path.append(
   os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "/../.."))
@@ -28,12 +28,12 @@ def is_json(myjson):
 
 def get_content(retry_count = 5):
   try:
-    request = urllib2.Request(
+    request = Request(
       BASE_URL + version,
       headers={"Authorization" : authToken}
     )
 
-    proposed_content = urllib2.urlopen(
+    proposed_content = urlopen(
       request
     ).read()
 

From c5b93eaf179eb5e44091788c72ac517c96a2329d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 14:10:26 -0700
Subject: [PATCH 264/811] Bump v20.0.0-nightly.20220412

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..7b0cc745e7233 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220412
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..2fcbb9042d5cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220412",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..4bf9083adcf9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220412
+ PRODUCTVERSION 20,0,0,20220412
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b8c0ef97136799f1980da59a4a891143748f472e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 16:13:49 -0700
Subject: [PATCH 265/811] Revert "Bump v20.0.0-nightly.20220412"

This reverts commit c5b93eaf179eb5e44091788c72ac517c96a2329d.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7b0cc745e7233..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220412
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 2fcbb9042d5cc..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220412",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bf9083adcf9f..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220412
- PRODUCTVERSION 20,0,0,20220412
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7038d2d418569232fe197ff06a380d6d3076d808 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 16:14:58 -0700
Subject: [PATCH 266/811] Bump v20.0.0-nightly.20220412

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..7b0cc745e7233 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220412
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..2fcbb9042d5cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220412",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..4bf9083adcf9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220412
+ PRODUCTVERSION 20,0,0,20220412
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d804cd5de2312300f28d1bf649114cde14d76e3a Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 12 Apr 2022 16:23:07 -0700
Subject: [PATCH 267/811] build: add comment for enable_cet_shadow_stack
 (#33747)

---
 build/args/all.gn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/args/all.gn b/build/args/all.gn
index 1e31472914a6d..b0e8dda791c52 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -34,4 +34,7 @@ is_cfi = false
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
+# CET shadow stack is incompatible with v8, until v8 is CET compliant
+# enabling this flag causes main process crashes where CET is enabled
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false

From bfa5b2104494f4f1f1ea78e697ad85ae4ba74654 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 12 Apr 2022 21:00:03 -0700
Subject: [PATCH 268/811] docs: note reason for is_cfi = false (#33749)

---
 build/args/all.gn | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/args/all.gn b/build/args/all.gn
index b0e8dda791c52..b0400b0951ee8 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -29,8 +29,6 @@ dawn_enable_vulkan_validation_layers = false
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false
 
-is_cfi = false
-
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
@@ -38,3 +36,9 @@ allow_runtime_configurable_key_storage = true
 # enabling this flag causes main process crashes where CET is enabled
 # Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false
+
+# For similar reasons, disable CFI, which is not well supported in V8.
+# Chromium doesn't have any problems with this because they do not run
+# V8 in the browser process.
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
+is_cfi = false

From a9c52926c066b8c61a5e85c663c8d417c0ee3d7f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 21:25:04 -0700
Subject: [PATCH 269/811] Revert "Bump v20.0.0-nightly.20220412"

This reverts commit 7038d2d418569232fe197ff06a380d6d3076d808.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7b0cc745e7233..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220412
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 2fcbb9042d5cc..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220412",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bf9083adcf9f..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220412
- PRODUCTVERSION 20,0,0,20220412
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From de2f48b40ff32cf22ba2272bb2fa435e3c059b58 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 21:26:21 -0700
Subject: [PATCH 270/811] Bump v20.0.0-nightly.20220412

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..7b0cc745e7233 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220412
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..2fcbb9042d5cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220412",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..4bf9083adcf9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220412
+ PRODUCTVERSION 20,0,0,20220412
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4c4e02318fc651cd0a96ff79b8d146f02701a6b2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 23:49:32 -0700
Subject: [PATCH 271/811] Revert "Bump v20.0.0-nightly.20220412"

This reverts commit de2f48b40ff32cf22ba2272bb2fa435e3c059b58.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7b0cc745e7233..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220412
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index 2fcbb9042d5cc..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220412",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bf9083adcf9f..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220412
- PRODUCTVERSION 20,0,0,20220412
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 341b7bdf4ab7dd1a10471f57bf6f558985ff4cc0 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 13 Apr 2022 10:46:05 +0200
Subject: [PATCH 272/811] fix: #ARGB to #RGBA conversion (#33707)

* fix: argb to rgba conversion

* chore: remove logging import

* refactor: color_str -> converted_color_str
---
 shell/common/color_util.cc | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/shell/common/color_util.cc b/shell/common/color_util.cc
index afa4c7f7a40bc..73bbc162cca97 100644
--- a/shell/common/color_util.cc
+++ b/shell/common/color_util.cc
@@ -16,7 +16,7 @@
 
 namespace {
 
-bool IsHexFormat(const std::string& str) {
+bool IsHexFormatWithAlpha(const std::string& str) {
   // Must be either #ARGB or #AARRGGBB.
   bool is_hex_length = str.length() == 5 || str.length() == 9;
   if (str[0] != '#' || !is_hex_length)
@@ -35,20 +35,17 @@ namespace electron {
 SkColor ParseCSSColor(const std::string& color_string) {
   // ParseCssColorString expects RGBA and we historically use ARGB
   // so we need to convert before passing to ParseCssColorString.
-  std::string color_str = color_string;
-  if (IsHexFormat(color_str)) {
-    if (color_str.length() == 5) {
-      // #ARGB => #RGBA
-      std::swap(color_str[1], color_str[4]);
-    } else {
-      // #AARRGGBB => #RRGGBBAA
-      std::swap(color_str[1], color_str[7]);
-      std::swap(color_str[2], color_str[8]);
-    }
+  std::string converted_color_str;
+  if (IsHexFormatWithAlpha(color_string)) {
+    std::string temp = color_string;
+    int len = color_string.length() == 5 ? 1 : 2;
+    converted_color_str = temp.erase(1, len) + color_string.substr(1, len);
+  } else {
+    converted_color_str = color_string;
   }
 
   SkColor color;
-  if (!content::ParseCssColorString(color_str, &color))
+  if (!content::ParseCssColorString(converted_color_str, &color))
     color = SK_ColorWHITE;
 
   return color;

From bfbba9dad6b9a0c4ae25dfab65cc9ecfcea86745 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 13 Apr 2022 19:55:57 +0200
Subject: [PATCH 273/811] chore: add missing GN dep (#33758)

---
 chromium_src/BUILD.gn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 006e7373f2a68..fc0f33ed2e17a 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -360,6 +360,7 @@ source_set("plugins") {
     "//ppapi/shared_impl",
     "//services/device/public/mojom",
     "//skia",
+    "//storage/browser",
   ]
 }
 

From b66667b84350d25119d934cc7b683e3b88464908 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 13 Apr 2022 22:02:33 +0200
Subject: [PATCH 274/811] feat: allow `null` when subscribing notification
 (#33641)

* feat: allow null when subscribing notification

* docs: document null event
---
 docs/api/system-preferences.md                | 12 +++++--
 .../api/electron_api_system_preferences.h     |  8 ++---
 .../electron_api_system_preferences_mac.mm    | 29 +++++++++++-----
 spec-main/api-system-preferences-spec.ts      | 33 +++++++++++++++++++
 4 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/docs/api/system-preferences.md b/docs/api/system-preferences.md
index 154e5750f093d..6c0a6a388fb46 100644
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -84,7 +84,7 @@ that contains the user information dictionary sent along with the notification.
 
 ### `systemPreferences.subscribeNotification(event, callback)` _macOS_
 
-* `event` string
+* `event` string | null
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -109,9 +109,11 @@ example values of `event` are:
 * `AppleColorPreferencesChangedNotification`
 * `AppleShowScrollBarsSettingChanged`
 
+If `event` is null, the `NSDistributedNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc)  for more information.
+
 ### `systemPreferences.subscribeLocalNotification(event, callback)` _macOS_
 
-* `event` string
+* `event` string | null
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -122,9 +124,11 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSNotificationCenter` for local defaults.
 This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
 
+If `event` is null, the `NSNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
+
 ### `systemPreferences.subscribeWorkspaceNotification(event, callback)` _macOS_
 
-* `event` string
+* `event` string | null
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -135,6 +139,8 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSWorkspace.sharedWorkspace.notificationCenter`.
 This is necessary for events such as `NSWorkspaceDidActivateApplicationNotification`.
 
+If `event` is null, the `NSWorkspaceNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
+
 ### `systemPreferences.unsubscribeNotification(id)` _macOS_
 
 * `id` Integer
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index 592df523a3fea..d35dd5b947bea 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -76,17 +76,17 @@ class SystemPreferences
   void PostNotification(const std::string& name,
                         base::DictionaryValue user_info,
                         gin::Arguments* args);
-  int SubscribeNotification(const std::string& name,
+  int SubscribeNotification(v8::Local<v8::Value> maybe_name,
                             const NotificationCallback& callback);
   void UnsubscribeNotification(int id);
   void PostLocalNotification(const std::string& name,
                              base::DictionaryValue user_info);
-  int SubscribeLocalNotification(const std::string& name,
+  int SubscribeLocalNotification(v8::Local<v8::Value> maybe_name,
                                  const NotificationCallback& callback);
   void UnsubscribeLocalNotification(int request_id);
   void PostWorkspaceNotification(const std::string& name,
                                  base::DictionaryValue user_info);
-  int SubscribeWorkspaceNotification(const std::string& name,
+  int SubscribeWorkspaceNotification(v8::Local<v8::Value> maybe_name,
                                      const NotificationCallback& callback);
   void UnsubscribeWorkspaceNotification(int request_id);
   v8::Local<v8::Value> GetUserDefault(v8::Isolate* isolate,
@@ -130,7 +130,7 @@ class SystemPreferences
   ~SystemPreferences() override;
 
 #if BUILDFLAG(IS_MAC)
-  int DoSubscribeNotification(const std::string& name,
+  int DoSubscribeNotification(v8::Local<v8::Value> maybe_name,
                               const NotificationCallback& callback,
                               NotificationCenterKind kind);
   void DoUnsubscribeNotification(int request_id, NotificationCenterKind kind);
diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm
index 56fd1d396921c..70006a88dd157 100644
--- a/shell/browser/api/electron_api_system_preferences_mac.mm
+++ b/shell/browser/api/electron_api_system_preferences_mac.mm
@@ -154,10 +154,11 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 int SystemPreferences::SubscribeNotification(
-    const std::string& name,
+    v8::Local<v8::Value> maybe_name,
     const NotificationCallback& callback) {
   return DoSubscribeNotification(
-      name, callback, NotificationCenterKind::kNSDistributedNotificationCenter);
+      maybe_name, callback,
+      NotificationCenterKind::kNSDistributedNotificationCenter);
 }
 
 void SystemPreferences::UnsubscribeNotification(int request_id) {
@@ -174,9 +175,9 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 int SystemPreferences::SubscribeLocalNotification(
-    const std::string& name,
+    v8::Local<v8::Value> maybe_name,
     const NotificationCallback& callback) {
-  return DoSubscribeNotification(name, callback,
+  return DoSubscribeNotification(maybe_name, callback,
                                  NotificationCenterKind::kNSNotificationCenter);
 }
 
@@ -196,10 +197,11 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 int SystemPreferences::SubscribeWorkspaceNotification(
-    const std::string& name,
+    v8::Local<v8::Value> maybe_name,
     const NotificationCallback& callback) {
   return DoSubscribeNotification(
-      name, callback, NotificationCenterKind::kNSWorkspaceNotificationCenter);
+      maybe_name, callback,
+      NotificationCenterKind::kNSWorkspaceNotificationCenter);
 }
 
 void SystemPreferences::UnsubscribeWorkspaceNotification(int request_id) {
@@ -208,14 +210,25 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 int SystemPreferences::DoSubscribeNotification(
-    const std::string& name,
+    v8::Local<v8::Value> maybe_name,
     const NotificationCallback& callback,
     NotificationCenterKind kind) {
   int request_id = g_next_id++;
   __block NotificationCallback copied_callback = callback;
 
+  v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+  std::string name_str;
+  if (!(maybe_name->IsNull() ||
+        gin::ConvertFromV8(isolate, maybe_name, &name_str))) {
+    isolate->ThrowException(v8::Exception::Error(
+        gin::StringToV8(isolate, "Must pass null or a string")));
+    return -1;
+  }
+
+  auto* name = maybe_name->IsNull() ? nil : base::SysUTF8ToNSString(name_str);
+
   g_id_map[request_id] = [GetNotificationCenter(kind)
-      addObserverForName:base::SysUTF8ToNSString(name)
+      addObserverForName:name
                   object:nil
                    queue:nil
               usingBlock:^(NSNotification* notification) {
diff --git a/spec-main/api-system-preferences-spec.ts b/spec-main/api-system-preferences-spec.ts
index 3670527649302..38a16045ddb13 100644
--- a/spec-main/api-system-preferences-spec.ts
+++ b/spec-main/api-system-preferences-spec.ts
@@ -116,6 +116,39 @@ describe('systemPreferences module', () => {
     });
   });
 
+  ifdescribe(process.platform === 'darwin')('systemPreferences.subscribeNotification(event, callback)', () => {
+    it('throws an error if invalid arguments are passed', () => {
+      const badArgs = [123, {}, ['hi', 'bye'], new Date()];
+      for (const bad of badArgs) {
+        expect(() => {
+          systemPreferences.subscribeNotification(bad as any, () => {});
+        }).to.throw('Must pass null or a string');
+      }
+    });
+  });
+
+  ifdescribe(process.platform === 'darwin')('systemPreferences.subscribeLocalNotification(event, callback)', () => {
+    it('throws an error if invalid arguments are passed', () => {
+      const badArgs = [123, {}, ['hi', 'bye'], new Date()];
+      for (const bad of badArgs) {
+        expect(() => {
+          systemPreferences.subscribeNotification(bad as any, () => {});
+        }).to.throw('Must pass null or a string');
+      }
+    });
+  });
+
+  ifdescribe(process.platform === 'darwin')('systemPreferences.subscribeWorkspaceNotification(event, callback)', () => {
+    it('throws an error if invalid arguments are passed', () => {
+      const badArgs = [123, {}, ['hi', 'bye'], new Date()];
+      for (const bad of badArgs) {
+        expect(() => {
+          systemPreferences.subscribeWorkspaceNotification(bad as any, () => {});
+        }).to.throw('Must pass null or a string');
+      }
+    });
+  });
+
   ifdescribe(process.platform === 'darwin')('systemPreferences.getSystemColor(color)', () => {
     it('throws on invalid system colors', () => {
       const color = 'bad-color';

From 3d4d39d67b072a7c355dada2881cb6791e9e9f53 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Wed, 13 Apr 2022 14:51:00 -0700
Subject: [PATCH 275/811] chore: interpret bytes to string (#33766)

---
 script/release/uploaders/upload-index-json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index a96ffbc556a5c..e90eed678c028 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -56,7 +56,7 @@ def main():
 
     new_content = get_content()
 
-    with open(index_json, "w") as f:
+    with open(index_json, "wb") as f:
       f.write(new_content)
 
     store_artifact(OUT_DIR, 'atom-shell/dist', [index_json])

From 16f8d713ab05fe325a664f0fd79cb41c403c9755 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Thu, 14 Apr 2022 13:01:00 +0900
Subject: [PATCH 276/811] fix: apply senderFrame details to ipcMain port event
 (#33756)

---
 lib/browser/api/web-contents.ts | 1 +
 spec-main/api-ipc-spec.ts       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index a8abf03fa6360..b2407ee7e0a37 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -627,6 +627,7 @@ WebContents.prototype._init = function () {
   });
 
   this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
+    addSenderFrameToEvent(event);
     event.ports = ports.map(p => new MessagePortMain(p));
     ipcMain.emit(channel, event, message);
   });
diff --git a/spec-main/api-ipc-spec.ts b/spec-main/api-ipc-spec.ts
index 44ee2cfe498e8..0595531be86ff 100644
--- a/spec-main/api-ipc-spec.ts
+++ b/spec-main/api-ipc-spec.ts
@@ -212,6 +212,8 @@ describe('ipc module', () => {
       const [ev, msg] = await p;
       expect(msg).to.equal('hi');
       expect(ev.ports).to.have.length(1);
+      expect(ev.senderFrame.parent).to.be.null();
+      expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
       const [port] = ev.ports;
       expect(port).to.be.an.instanceOf(EventEmitter);
     });
@@ -226,6 +228,7 @@ describe('ipc module', () => {
       const [ev, msg] = await p;
       expect(msg).to.equal('hi');
       expect(ev.ports).to.deep.equal([]);
+      expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
     });
 
     it('can communicate between main and renderer', async () => {
@@ -241,6 +244,7 @@ describe('ipc module', () => {
       }})()`);
       const [ev] = await p;
       expect(ev.ports).to.have.length(1);
+      expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
       const [port] = ev.ports;
       port.start();
       port.postMessage(42);

From 7658edfa1abb0ce9713e4848d1c1af15f8cac479 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 14 Apr 2022 00:53:05 -0700
Subject: [PATCH 277/811] ci: manually install python@2 (#33785)

---
 .circleci/build_config.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index 6b075c4c68b38..d408eef59417a 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -506,6 +506,14 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
         ln -fs /usr/local/bin/gtar /usr/local/bin/tar
       fi
 
+step-install-python2-on-mac: &step-install-python2-on-mac
+  run:
+    name: Install python2 on macos
+    command: |
+      if [ "`uname`" == "Darwin" ]; then
+        brew install vertedinde/python2/python@2
+      fi
+
 step-gn-gen-default: &step-gn-gen-default
   run:
     name: Default GN gen
@@ -1039,6 +1047,7 @@ steps-electron-gn-check: &steps-electron-gn-check
     - attach_workspace:
         at: .
     - *step-depot-tools-add-to-path
+    - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
     - *step-gn-gen-default
@@ -1052,6 +1061,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     - *step-depot-tools-add-to-path
     - *step-restore-brew-cache
     - *step-install-gnutar-on-mac
+    - *step-install-python2-on-mac
     - *step-get-more-space-on-mac
     - *step-generate-deps-hash
     - *step-touch-sync-done
@@ -1086,6 +1096,7 @@ steps-native-tests: &steps-native-tests
     - attach_workspace:
         at: .
     - *step-depot-tools-add-to-path
+    - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
     - *step-gn-gen-default
@@ -1355,6 +1366,7 @@ commands:
             - run: rm -rf src/electron
       - *step-restore-brew-cache
       - *step-install-gnutar-on-mac
+      - *step-install-python2-on-mac
       - *step-save-brew-cache
       - when:
           condition: << parameters.checkout-and-assume-cache >>

From 233a39dbc9e07f5620798323309a2d065a27c21b Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 14 Apr 2022 12:35:36 +0200
Subject: [PATCH 278/811] fix: event propagation after exiting fullscreen on
 Windows (#33757)

---
 shell/browser/api/electron_api_web_contents.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 714d0d60c6076..caf9cdb41b3ea 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1342,6 +1342,11 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
   if (!owner_window_)
     return;
 
+  // This needs to be called before we exit fullscreen on the native window,
+  // or the controller will incorrectly think we weren't fullscreen and bail.
+  exclusive_access_manager_->fullscreen_controller()->ExitFullscreenModeForTab(
+      source);
+
   SetHtmlApiFullscreen(false);
 
   if (native_fullscreen_) {
@@ -1350,9 +1355,6 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
     // `chrome/browser/ui/exclusive_access/fullscreen_controller.cc`.
     source->GetRenderViewHost()->GetWidget()->SynchronizeVisualProperties();
   }
-
-  exclusive_access_manager_->fullscreen_controller()->ExitFullscreenModeForTab(
-      source);
 }
 
 void WebContents::RendererUnresponsive(

From dda8bc3cd1ec221b74df153a92131d5127713b01 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 06:13:26 -0700
Subject: [PATCH 279/811] Bump v20.0.0-nightly.20220414

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..0f98037c171fc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220414
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..cbe91e49e5d38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220414",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..b264c48dc0297 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220414
+ PRODUCTVERSION 20,0,0,20220414
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f5e874cbcbd7e5b94cdef7090852e466210ef38f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 07:03:05 -0700
Subject: [PATCH 280/811] Revert "Bump v20.0.0-nightly.20220414"

This reverts commit dda8bc3cd1ec221b74df153a92131d5127713b01.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0f98037c171fc..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220414
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index cbe91e49e5d38..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220414",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b264c48dc0297..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220414
- PRODUCTVERSION 20,0,0,20220414
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8b0af8609763366755223718c084568cda09276d Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 14 Apr 2022 18:07:51 -0700
Subject: [PATCH 281/811] ci: build python2 from source (#33793)

* ci: add python2 to publish jobs

* chore: install python2 via circle
---
 .circleci/build_config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/build_config.yml b/.circleci/build_config.yml
index d408eef59417a..d66ece9a80bac 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/build_config.yml
@@ -511,7 +511,8 @@ step-install-python2-on-mac: &step-install-python2-on-mac
     name: Install python2 on macos
     command: |
       if [ "`uname`" == "Darwin" ]; then
-        brew install vertedinde/python2/python@2
+        curl -O https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg
+        sudo installer -pkg python-2.7.18-macosx10.9.pkg -target /
       fi
 
 step-gn-gen-default: &step-gn-gen-default
@@ -1532,6 +1533,7 @@ commands:
             - *step-depot-tools-get
       - *step-depot-tools-add-to-path
       - *step-restore-brew-cache
+      - *step-install-python2-on-mac
       - *step-get-more-space-on-mac
       - when:
           condition: << parameters.checkout >>

From 99791f620b5adc6e87ab4f449e6c88b899fd4131 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 18:08:45 -0700
Subject: [PATCH 282/811] Bump v20.0.0-nightly.20220414

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..0f98037c171fc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220414
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..cbe91e49e5d38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220414",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..b264c48dc0297 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220414
+ PRODUCTVERSION 20,0,0,20220414
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 635b3a94c84333c0e4b1828663d0eb74e2e993f6 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 20:08:02 -0700
Subject: [PATCH 283/811] Revert "Bump v20.0.0-nightly.20220414"

This reverts commit 99791f620b5adc6e87ab4f449e6c88b899fd4131.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0f98037c171fc..dba45c6149e4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220414
\ No newline at end of file
+20.0.0-nightly.20220411
\ No newline at end of file
diff --git a/package.json b/package.json
index cbe91e49e5d38..bbea9c9644f22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220414",
+  "version": "20.0.0-nightly.20220411",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b264c48dc0297..c61fbb8edac8a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220414
- PRODUCTVERSION 20,0,0,20220414
+ FILEVERSION 20,0,0,20220411
+ PRODUCTVERSION 20,0,0,20220411
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From eee4232069a5dff4f980c68d1b0f2ea1524788e0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 20:08:45 -0700
Subject: [PATCH 284/811] Bump v20.0.0-nightly.20220414

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dba45c6149e4d..0f98037c171fc 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220411
\ No newline at end of file
+20.0.0-nightly.20220414
\ No newline at end of file
diff --git a/package.json b/package.json
index bbea9c9644f22..cbe91e49e5d38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220411",
+  "version": "20.0.0-nightly.20220414",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c61fbb8edac8a..b264c48dc0297 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220411
- PRODUCTVERSION 20,0,0,20220411
+ FILEVERSION 20,0,0,20220414
+ PRODUCTVERSION 20,0,0,20220414
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9d4aceb94045cc6ff292904a1c46f3d3a09a5d55 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Apr 2022 09:32:01 -0700
Subject: [PATCH 285/811] Bump v20.0.0-nightly.20220415

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0f98037c171fc..161f3d33e8dee 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220414
\ No newline at end of file
+20.0.0-nightly.20220415
\ No newline at end of file
diff --git a/package.json b/package.json
index cbe91e49e5d38..f633ed03dd69e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220414",
+  "version": "20.0.0-nightly.20220415",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b264c48dc0297..eb4631ae0aca0 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220414
- PRODUCTVERSION 20,0,0,20220414
+ FILEVERSION 20,0,0,20220415
+ PRODUCTVERSION 20,0,0,20220415
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 37b7e347fce555836d694f36f6ee5e2ea67db049 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 18 Apr 2022 13:24:32 +0900
Subject: [PATCH 286/811] fix: potential crash caused by dlopen different gtk
 libraries (#33650)

---
 BUILD.gn                                      |  59 ++++----
 patches/chromium/.patches                     |   2 +-
 .../chromium/make_gtk_getlibgtk_public.patch  |  52 +++++++
 patches/chromium/ui_gtk_public_header.patch   |  38 ------
 shell/browser/browser_linux.cc                |   2 +-
 shell/browser/electron_browser_main_parts.cc  |  12 +-
 .../linux/libnotify_notification.cc           |   2 +-
 shell/browser/ui/electron_gtk.fragment        |   1 +
 shell/browser/ui/electron_gtk.sigs            |   6 +
 shell/browser/ui/file_dialog_gtk.cc           | 127 +++---------------
 shell/browser/ui/message_box_gtk.cc           |   4 +-
 .../ui/views/client_frame_view_linux.cc       |   2 +-
 shell/browser/ui/views/menu_bar.cc            |   2 +-
 shell/common/application_info_linux.cc        |   2 +-
 shell/common/platform_util_linux.cc           |   2 +-
 15 files changed, 130 insertions(+), 183 deletions(-)
 create mode 100644 patches/chromium/make_gtk_getlibgtk_public.patch
 delete mode 100644 patches/chromium/ui_gtk_public_header.patch
 create mode 100644 shell/browser/ui/electron_gtk.fragment
 create mode 100644 shell/browser/ui/electron_gtk.sigs

diff --git a/BUILD.gn b/BUILD.gn
index 7b32da03ec35f..45def72146ec5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -43,6 +43,7 @@ if (is_mac) {
 
 if (is_linux) {
   import("//build/config/linux/pkg_config.gni")
+  import("//tools/generate_stubs/rules.gni")
 
   pkg_config("gio_unix") {
     packages = [ "gio-unix-2.0" ]
@@ -54,6 +55,38 @@ if (is_linux) {
       "gdk-pixbuf-2.0",
     ]
   }
+
+  generate_library_loader("libnotify_loader") {
+    name = "LibNotifyLoader"
+    output_h = "libnotify_loader.h"
+    output_cc = "libnotify_loader.cc"
+    header = "<libnotify/notify.h>"
+    config = ":libnotify_config"
+
+    functions = [
+      "notify_is_initted",
+      "notify_init",
+      "notify_get_server_caps",
+      "notify_get_server_info",
+      "notify_notification_new",
+      "notify_notification_add_action",
+      "notify_notification_set_image_from_pixbuf",
+      "notify_notification_set_timeout",
+      "notify_notification_set_urgency",
+      "notify_notification_set_hint_string",
+      "notify_notification_show",
+      "notify_notification_close",
+    ]
+  }
+
+  generate_stubs("electron_gtk_stubs") {
+    sigs = [ "shell/browser/ui/electron_gtk.sigs" ]
+    extra_header = "shell/browser/ui/electron_gtk.fragment"
+    output_name = "electron_gtk_stubs"
+    public_deps = [ "//ui/gtk:gtk_config" ]
+    logging_function = "LogNoop()"
+    logging_include = "ui/gtk/log_noop.h"
+  }
 }
 
 declare_args() {
@@ -253,31 +286,6 @@ copy("copy_shell_devtools_discovery_page") {
   outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
 }
 
-if (is_linux) {
-  generate_library_loader("libnotify_loader") {
-    name = "LibNotifyLoader"
-    output_h = "libnotify_loader.h"
-    output_cc = "libnotify_loader.cc"
-    header = "<libnotify/notify.h>"
-    config = ":libnotify_config"
-
-    functions = [
-      "notify_is_initted",
-      "notify_init",
-      "notify_get_server_caps",
-      "notify_get_server_info",
-      "notify_notification_new",
-      "notify_notification_add_action",
-      "notify_notification_set_image_from_pixbuf",
-      "notify_notification_set_timeout",
-      "notify_notification_set_urgency",
-      "notify_notification_set_hint_string",
-      "notify_notification_show",
-      "notify_notification_close",
-    ]
-  }
-}
-
 npm_action("electron_version_args") {
   script = "generate-version-json"
 
@@ -538,6 +546,7 @@ source_set("electron_lib") {
   if (is_linux) {
     libs = [ "xshmfence" ]
     deps += [
+      ":electron_gtk_stubs",
       ":libnotify_loader",
       "//build/config/linux/gtk",
       "//dbus",
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index cd928849ccf21..ff7ade0c3c84f 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -61,7 +61,6 @@ feat_enable_offscreen_rendering_with_viz_compositor.patch
 gpu_notify_when_dxdiag_request_fails.patch
 feat_allow_embedders_to_add_observers_on_created_hunspell.patch
 feat_add_onclose_to_messageport.patch
-ui_gtk_public_header.patch
 allow_in-process_windows_to_have_different_web_prefs.patch
 refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
 crash_allow_setting_more_options.patch
@@ -108,3 +107,4 @@ build_disable_partition_alloc_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
+make_gtk_getlibgtk_public.patch
diff --git a/patches/chromium/make_gtk_getlibgtk_public.patch b/patches/chromium/make_gtk_getlibgtk_public.patch
new file mode 100644
index 0000000000000..bf195bbaba7d3
--- /dev/null
+++ b/patches/chromium/make_gtk_getlibgtk_public.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Thu, 7 Apr 2022 20:30:16 +0900
+Subject: Make gtk::GetLibGtk public
+
+Allows embedders to get a handle to the gtk library
+already loaded in the process.
+
+diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
+index 7104a0d5f4489c687f3cb9e63bc7cbef59d2fa62..f0b9ed834a3f7310da09377f0b2105cf635ffeb7 100644
+--- a/ui/gtk/gtk_compat.cc
++++ b/ui/gtk/gtk_compat.cc
+@@ -86,12 +86,6 @@ void* GetLibGtk4(bool check = true) {
+   return libgtk4;
+ }
+ 
+-void* GetLibGtk() {
+-  if (GtkCheckVersion(4))
+-    return GetLibGtk4();
+-  return GetLibGtk3();
+-}
+-
+ bool LoadGtk3() {
+   if (!GetLibGtk3(false))
+     return false;
+@@ -133,6 +127,12 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
+ 
+ }  // namespace
+ 
++void* GetLibGtk() {
++  if (GtkCheckVersion(4))
++    return GetLibGtk4();
++  return GetLibGtk3();
++}
++
+ bool LoadGtk() {
+   static bool loaded = LoadGtkImpl();
+   return loaded;
+diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
+index 72981270fe26579211afcaf3c596a412f69f5fac..b5dbfde5b011d57d26960d245e0dc61cac9341e4 100644
+--- a/ui/gtk/gtk_compat.h
++++ b/ui/gtk/gtk_compat.h
+@@ -37,6 +37,9 @@ using SkColor = uint32_t;
+ 
+ namespace gtk {
+ 
++// Get handle to the currently loaded gtk library in the process.
++void* GetLibGtk();
++
+ // Loads libgtk and related libraries and returns true on success.
+ bool LoadGtk();
+ 
diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch
deleted file mode 100644
index 12f9984100bd6..0000000000000
--- a/patches/chromium/ui_gtk_public_header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <hop2deep@gmail.com>
-Date: Fri, 10 Apr 2020 17:47:18 -0700
-Subject: ui_gtk_public_header.patch
-
-Allow electron to depend on gtk_util.h and gtk_ui.h from //ui/gtk/
-
-diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
-index 4093df78da0bbb1d8df743942f364cf728ad3414..2f7c404307bfebb0e2890148cf9b0d6d9c68094f 100644
---- a/ui/gtk/BUILD.gn
-+++ b/ui/gtk/BUILD.gn
-@@ -69,7 +69,11 @@ generate_stubs("gtk_stubs") {
- }
- 
- component("gtk") {
--  public = [ "gtk_ui_factory.h" ]
-+  public = [
-+    "gtk_ui.h",
-+    "gtk_ui_factory.h",
-+    "gtk_util.h",
-+  ]
- 
-   sources = [
-     "gtk_color_mixers.cc",
-@@ -79,13 +83,11 @@ component("gtk") {
-     "gtk_key_bindings_handler.cc",
-     "gtk_key_bindings_handler.h",
-     "gtk_ui.cc",
--    "gtk_ui.h",
-     "gtk_ui_factory.cc",
-     "gtk_ui_platform.h",
-     "gtk_ui_platform_stub.cc",
-     "gtk_ui_platform_stub.h",
-     "gtk_util.cc",
--    "gtk_util.h",
-     "input_method_context_impl_gtk.cc",
-     "input_method_context_impl_gtk.h",
-     "native_theme_gtk.cc",
diff --git a/shell/browser/browser_linux.cc b/shell/browser/browser_linux.cc
index f47a46e8dd5c8..8b38c9ca67bf7 100644
--- a/shell/browser/browser_linux.cc
+++ b/shell/browser/browser_linux.cc
@@ -17,7 +17,7 @@
 
 #if BUILDFLAG(IS_LINUX)
 #include "shell/browser/linux/unity_service.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"  // nogncheck
 #endif
 
 namespace electron {
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 98344e65d95ac..a03835dd81e0e 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -69,11 +69,13 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
+#include "electron/electron_gtk_stubs.h"
 #include "ui/base/cursor/cursor_factory.h"
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gtk/gtk_ui_factory.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_compat.h"      // nogncheck
+#include "ui/gtk/gtk_ui_factory.h"  // nogncheck
+#include "ui/gtk/gtk_util.h"        // nogncheck
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
@@ -367,6 +369,12 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
   linux_ui->Initialize();
   DCHECK(ui::LinuxInputMethodContextFactory::instance());
 
+  // Try loading gtk symbols used by Electron.
+  electron::InitializeElectron_gtk(gtk::GetLibGtk());
+  if (!electron::IsElectron_gtkInitialized()) {
+    electron::UninitializeElectron_gtk();
+  }
+
   // Chromium does not respect GTK dark theme setting, but they may change
   // in future and this code might be no longer needed. Check the Chromium
   // issue to keep updated:
diff --git a/shell/browser/notifications/linux/libnotify_notification.cc b/shell/browser/notifications/linux/libnotify_notification.cc
index 8391566640c32..07d7135788de1 100644
--- a/shell/browser/notifications/linux/libnotify_notification.cc
+++ b/shell/browser/notifications/linux/libnotify_notification.cc
@@ -16,7 +16,7 @@
 #include "shell/common/application_info.h"
 #include "shell/common/platform_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"  // nogncheck
 
 namespace electron {
 
diff --git a/shell/browser/ui/electron_gtk.fragment b/shell/browser/ui/electron_gtk.fragment
new file mode 100644
index 0000000000000..74a31b23585ac
--- /dev/null
+++ b/shell/browser/ui/electron_gtk.fragment
@@ -0,0 +1 @@
+#include <gtk/gtk.h>
\ No newline at end of file
diff --git a/shell/browser/ui/electron_gtk.sigs b/shell/browser/ui/electron_gtk.sigs
new file mode 100644
index 0000000000000..568a270165cbb
--- /dev/null
+++ b/shell/browser/ui/electron_gtk.sigs
@@ -0,0 +1,6 @@
+GtkFileChooserNative* gtk_file_chooser_native_new(const gchar* title, GtkWindow* parent, GtkFileChooserAction action, const gchar* accept_label, const gchar* cancel_label);
+void gtk_native_dialog_set_modal(GtkNativeDialog* self, gboolean modal);
+void gtk_native_dialog_show(GtkNativeDialog* self);
+void gtk_native_dialog_hide(GtkNativeDialog* self);
+gint gtk_native_dialog_run(GtkNativeDialog* self);
+void gtk_native_dialog_destroy(GtkNativeDialog* self);
\ No newline at end of file
diff --git a/shell/browser/ui/file_dialog_gtk.cc b/shell/browser/ui/file_dialog_gtk.cc
index 440c06823cea3..7e5c7698cadfa 100644
--- a/shell/browser/ui/file_dialog_gtk.cc
+++ b/shell/browser/ui/file_dialog_gtk.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include <gmodule.h>
-
 #include <memory>
 #include <string>
 
@@ -11,6 +9,7 @@
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
+#include "electron/electron_gtk_stubs.h"
 #include "shell/browser/javascript_environment.h"
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/file_dialog.h"
@@ -18,32 +17,11 @@
 #include "shell/browser/unresponsive_suppressor.h"
 #include "shell/common/gin_converters/file_path_converter.h"
 #include "ui/base/glib/glib_signal.h"
-#include "ui/gtk/gtk_ui.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_ui.h"    // nogncheck
+#include "ui/gtk/gtk_util.h"  // nogncheck
 
 namespace file_dialog {
 
-static GModule* gtk_module;
-static absl::optional<bool> supports_gtk_file_chooser_native;
-
-using dl_gtk_native_dialog_show_t = void (*)(void*);
-using dl_gtk_native_dialog_destroy_t = void (*)(void*);
-using dl_gtk_native_dialog_set_modal_t = void (*)(void*, gboolean);
-using dl_gtk_native_dialog_run_t = int (*)(void*);
-using dl_gtk_native_dialog_hide_t = void (*)(void*);
-using dl_gtk_file_chooser_native_new_t = void* (*)(const char*,
-                                                   GtkWindow*,
-                                                   GtkFileChooserAction,
-                                                   const char*,
-                                                   const char*);
-
-static dl_gtk_native_dialog_show_t dl_gtk_native_dialog_show;
-static dl_gtk_native_dialog_destroy_t dl_gtk_native_dialog_destroy;
-static dl_gtk_native_dialog_set_modal_t dl_gtk_native_dialog_set_modal;
-static dl_gtk_native_dialog_run_t dl_gtk_native_dialog_run;
-static dl_gtk_native_dialog_hide_t dl_gtk_native_dialog_hide;
-static dl_gtk_file_chooser_native_new_t dl_gtk_file_chooser_native_new;
-
 DialogSettings::DialogSettings() = default;
 DialogSettings::DialogSettings(const DialogSettings&) = default;
 DialogSettings::~DialogSettings() = default;
@@ -53,85 +31,16 @@ namespace {
 static const int kPreviewWidth = 256;
 static const int kPreviewHeight = 512;
 
-void InitGtkFileChooserNativeSupport() {
-  // Return early if we have already setup the native functions or we have tried
-  // once before and failed. Avoid running expensive dynamic library operations.
-  if (supports_gtk_file_chooser_native) {
-    return;
-  }
-
-  // Mark that we have attempted to initialize support at least once
-  supports_gtk_file_chooser_native = false;
-
-  if (!g_module_supported()) {
-    return;
-  }
-
-  gtk_module = g_module_open("libgtk-3.so", G_MODULE_BIND_LAZY);
-  if (!gtk_module) {
-    return;
-  }
-
-  // Will never be unloaded
-  g_module_make_resident(gtk_module);
-
-  bool found = g_module_symbol(
-      gtk_module, "gtk_file_chooser_native_new",
-      reinterpret_cast<void**>(&dl_gtk_file_chooser_native_new));
-  if (!found) {
-    return;
-  }
-
-  found = g_module_symbol(
-      gtk_module, "gtk_native_dialog_set_modal",
-      reinterpret_cast<void**>(&dl_gtk_native_dialog_set_modal));
-  if (!found) {
-    return;
-  }
-
-  found =
-      g_module_symbol(gtk_module, "gtk_native_dialog_destroy",
-                      reinterpret_cast<void**>(&dl_gtk_native_dialog_destroy));
-  if (!found) {
-    return;
-  }
-
-  found = g_module_symbol(gtk_module, "gtk_native_dialog_show",
-                          reinterpret_cast<void**>(&dl_gtk_native_dialog_show));
-  if (!found) {
-    return;
-  }
-
-  found = g_module_symbol(gtk_module, "gtk_native_dialog_hide",
-                          reinterpret_cast<void**>(&dl_gtk_native_dialog_hide));
-  if (!found) {
-    return;
-  }
-
-  found = g_module_symbol(gtk_module, "gtk_native_dialog_run",
-                          reinterpret_cast<void**>(&dl_gtk_native_dialog_run));
-  if (!found) {
-    return;
-  }
-
-  supports_gtk_file_chooser_native =
-      dl_gtk_file_chooser_native_new && dl_gtk_native_dialog_set_modal &&
-      dl_gtk_native_dialog_destroy && dl_gtk_native_dialog_run &&
-      dl_gtk_native_dialog_show && dl_gtk_native_dialog_hide;
-}
-
 class FileChooserDialog {
  public:
   FileChooserDialog(GtkFileChooserAction action, const DialogSettings& settings)
       : parent_(
             static_cast<electron::NativeWindowViews*>(settings.parent_window)),
         filters_(settings.filters) {
-    InitGtkFileChooserNativeSupport();
-
     auto label = settings.button_label;
 
-    if (*supports_gtk_file_chooser_native) {
-      dialog_ = GTK_FILE_CHOOSER(dl_gtk_file_chooser_native_new(
+    if (electron::IsElectron_gtkInitialized()) {
+      dialog_ = GTK_FILE_CHOOSER(gtk_file_chooser_native_new(
           settings.title.c_str(), NULL, action,
           label.empty() ? nullptr : label.c_str(), nullptr));
     } else {
@@ -150,8 +59,8 @@ class FileChooserDialog {
 
     if (parent_) {
       parent_->SetEnabled(false);
-      if (*supports_gtk_file_chooser_native) {
-        dl_gtk_native_dialog_set_modal(static_cast<void*>(dialog_), TRUE);
+      if (electron::IsElectron_gtkInitialized()) {
+        gtk_native_dialog_set_modal(GTK_NATIVE_DIALOG(dialog_), TRUE);
       } else {
         gtk::SetGtkTransientForAura(GTK_WIDGET(dialog_),
                                     parent_->GetNativeWindow());
@@ -188,7 +97,7 @@ class FileChooserDialog {
     // org.freedesktop.portal.FileChooser portal. In the case of running through
     // the org.freedesktop.portal.FileChooser portal, anything having to do with
     // the update-preview signal or the preview widget will just be ignored.
-    if (!*supports_gtk_file_chooser_native) {
+    if (!electron::IsElectron_gtkInitialized()) {
       preview_ = gtk_image_new();
       g_signal_connect(dialog_, "update-preview",
                        G_CALLBACK(OnUpdatePreviewThunk), this);
@@ -197,8 +106,8 @@ class FileChooserDialog {
   }
 
   ~FileChooserDialog() {
-    if (*supports_gtk_file_chooser_native) {
-      dl_gtk_native_dialog_destroy(static_cast<void*>(dialog_));
+    if (electron::IsElectron_gtkInitialized()) {
+      gtk_native_dialog_destroy(GTK_NATIVE_DIALOG(dialog_));
     } else {
       gtk_widget_destroy(GTK_WIDGET(dialog_));
     }
@@ -236,8 +145,8 @@ class FileChooserDialog {
   void RunAsynchronous() {
     g_signal_connect(dialog_, "response", G_CALLBACK(OnFileDialogResponseThunk),
                      this);
-    if (*supports_gtk_file_chooser_native) {
-      dl_gtk_native_dialog_show(static_cast<void*>(dialog_));
+    if (electron::IsElectron_gtkInitialized()) {
+      gtk_native_dialog_show(GTK_NATIVE_DIALOG(dialog_));
     } else {
       gtk_widget_show_all(GTK_WIDGET(dialog_));
       gtk::GtkUi::GetPlatform()->ShowGtkWindow(GTK_WINDOW(dialog_));
@@ -305,8 +214,8 @@ class FileChooserDialog {
 };
 
 void FileChooserDialog::OnFileDialogResponse(GtkWidget* widget, int response) {
-  if (*supports_gtk_file_chooser_native) {
-    dl_gtk_native_dialog_hide(static_cast<void*>(dialog_));
+  if (electron::IsElectron_gtkInitialized()) {
+    gtk_native_dialog_hide(GTK_NATIVE_DIALOG(dialog_));
   } else {
     gtk_widget_hide(GTK_WIDGET(dialog_));
   }
@@ -371,7 +280,7 @@ bool CanPreview(const struct stat& st) {
 }
 
 void FileChooserDialog::OnUpdatePreview(GtkFileChooser* chooser) {
-  CHECK(!*supports_gtk_file_chooser_native);
+  CHECK(!electron::IsElectron_gtkInitialized());
   gchar* filename = gtk_file_chooser_get_preview_filename(chooser);
   if (!filename) {
     gtk_file_chooser_set_preview_widget_active(chooser, FALSE);
@@ -400,15 +309,15 @@ void FileChooserDialog::OnUpdatePreview(GtkFileChooser* chooser) {
 
 void ShowFileDialog(const FileChooserDialog& dialog) {
   // gtk_native_dialog_run() will call gtk_native_dialog_show() for us.
-  if (!*supports_gtk_file_chooser_native) {
+  if (!electron::IsElectron_gtkInitialized()) {
     gtk_widget_show_all(GTK_WIDGET(dialog.dialog()));
   }
 }
 
 int RunFileDialog(const FileChooserDialog& dialog) {
   int response = 0;
-  if (*supports_gtk_file_chooser_native) {
-    response = dl_gtk_native_dialog_run(static_cast<void*>(dialog.dialog()));
+  if (electron::IsElectron_gtkInitialized()) {
+    response = gtk_native_dialog_run(GTK_NATIVE_DIALOG(dialog.dialog()));
   } else {
     response = gtk_dialog_run(GTK_DIALOG(dialog.dialog()));
   }
diff --git a/shell/browser/ui/message_box_gtk.cc b/shell/browser/ui/message_box_gtk.cc
index 28b332d6f8adf..3efc453fc97bd 100644
--- a/shell/browser/ui/message_box_gtk.cc
+++ b/shell/browser/ui/message_box_gtk.cc
@@ -18,8 +18,8 @@
 #include "shell/browser/unresponsive_suppressor.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gtk/gtk_ui.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_ui.h"    // nogncheck
+#include "ui/gtk/gtk_util.h"  // nogncheck
 
 #if defined(USE_OZONE)
 #include "ui/base/ui_base_features.h"
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
index 4455ddb3727a6..a5e8067968583 100644
--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -22,7 +22,7 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gtk/gtk_compat.h"  // nogncheck
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"    // nogncheck
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/button/image_button.h"
diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index e56094075b275..380ce55efdf42 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -14,7 +14,7 @@
 #include "ui/views/layout/box_layout.h"
 
 #if BUILDFLAG(IS_LINUX)
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"  // nogncheck
 #endif
 
 #if BUILDFLAG(IS_WIN)
diff --git a/shell/common/application_info_linux.cc b/shell/common/application_info_linux.cc
index d7eb9d72875b8..cb043d1d0f907 100644
--- a/shell/common/application_info_linux.cc
+++ b/shell/common/application_info_linux.cc
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "electron/electron_version.h"
 #include "shell/common/platform_util.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"  // nogncheck
 
 namespace {
 
diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc
index 9d58f8fc959f4..ef8d8f8f0de01 100644
--- a/shell/common/platform_util_linux.cc
+++ b/shell/common/platform_util_linux.cc
@@ -28,7 +28,7 @@
 #include "dbus/object_proxy.h"
 #include "shell/common/platform_util_internal.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
-#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/gtk_util.h"  // nogncheck
 #include "url/gurl.h"
 
 #define ELECTRON_TRASH "ELECTRON_TRASH"

From fd191fc50b5ba483b314f04830ec427059337750 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:01:41 -0700
Subject: [PATCH 287/811] Bump v20.0.0-nightly.20220418

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 161f3d33e8dee..fd85ac3cfd285 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220415
\ No newline at end of file
+20.0.0-nightly.20220418
\ No newline at end of file
diff --git a/package.json b/package.json
index f633ed03dd69e..72c95b89025f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220415",
+  "version": "20.0.0-nightly.20220418",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index eb4631ae0aca0..e0d88a4007e14 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220415
- PRODUCTVERSION 20,0,0,20220415
+ FILEVERSION 20,0,0,20220418
+ PRODUCTVERSION 20,0,0,20220418
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b9c0166b4912dbba344a43d25a310f5a86633ace Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:35:44 -0700
Subject: [PATCH 288/811] Revert "Bump v20.0.0-nightly.20220418"

This reverts commit fd191fc50b5ba483b314f04830ec427059337750.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index fd85ac3cfd285..161f3d33e8dee 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220418
\ No newline at end of file
+20.0.0-nightly.20220415
\ No newline at end of file
diff --git a/package.json b/package.json
index 72c95b89025f5..f633ed03dd69e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220418",
+  "version": "20.0.0-nightly.20220415",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e0d88a4007e14..eb4631ae0aca0 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220418
- PRODUCTVERSION 20,0,0,20220418
+ FILEVERSION 20,0,0,20220415
+ PRODUCTVERSION 20,0,0,20220415
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0f087127de7228ad77dbaba524421932c46b4ef8 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 18 Apr 2022 22:36:17 +0900
Subject: [PATCH 289/811] chore: fix patch conflicts from 37b7e347 (#33818)

* chore: update patches

* chore: address review feedback
---
 BUILD.gn                                         | 7 +++++++
 patches/chromium/make_gtk_getlibgtk_public.patch | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 45def72146ec5..53096fff480c3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -79,6 +79,13 @@ if (is_linux) {
     ]
   }
 
+  # Generates electron_gtk_stubs.h header which contains
+  # stubs for extracting function ptrs from the gtk library.
+  # Function signatures for which stubs are required should be
+  # declared in electron_gtk.sigs, currently this file contains
+  # signatures for the functions used with native file chooser
+  # implementation. In future, this file can be extended to contain
+  # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
     sigs = [ "shell/browser/ui/electron_gtk.sigs" ]
     extra_header = "shell/browser/ui/electron_gtk.fragment"
diff --git a/patches/chromium/make_gtk_getlibgtk_public.patch b/patches/chromium/make_gtk_getlibgtk_public.patch
index bf195bbaba7d3..a6bce37ae4aea 100644
--- a/patches/chromium/make_gtk_getlibgtk_public.patch
+++ b/patches/chromium/make_gtk_getlibgtk_public.patch
@@ -7,7 +7,7 @@ Allows embedders to get a handle to the gtk library
 already loaded in the process.
 
 diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
-index 7104a0d5f4489c687f3cb9e63bc7cbef59d2fa62..f0b9ed834a3f7310da09377f0b2105cf635ffeb7 100644
+index 0ed04582106639911d9a4e0284ff880be9c3bc74..bfda81b08be52406048be9b96d2de59223d56ee7 100644
 --- a/ui/gtk/gtk_compat.cc
 +++ b/ui/gtk/gtk_compat.cc
 @@ -86,12 +86,6 @@ void* GetLibGtk4(bool check = true) {
@@ -23,7 +23,7 @@ index 7104a0d5f4489c687f3cb9e63bc7cbef59d2fa62..f0b9ed834a3f7310da09377f0b2105cf
  bool LoadGtk3() {
    if (!GetLibGtk3(false))
      return false;
-@@ -133,6 +127,12 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
+@@ -134,6 +128,12 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
  
  }  // namespace
  

From 5ae234d5e1d20bc9db5abb780d79b694a4ef09d7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:38:13 -0700
Subject: [PATCH 290/811] Bump v20.0.0-nightly.20220418

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 161f3d33e8dee..fd85ac3cfd285 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220415
\ No newline at end of file
+20.0.0-nightly.20220418
\ No newline at end of file
diff --git a/package.json b/package.json
index f633ed03dd69e..72c95b89025f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220415",
+  "version": "20.0.0-nightly.20220418",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index eb4631ae0aca0..e0d88a4007e14 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220415
- PRODUCTVERSION 20,0,0,20220415
+ FILEVERSION 20,0,0,20220418
+ PRODUCTVERSION 20,0,0,20220418
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 2d0ad043542d99d28332127915b70084409b5786 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 18 Apr 2022 07:09:54 -0700
Subject: [PATCH 291/811] docs: update security guide regarding ctx isolation
 (#33807)

---
 docs/api/context-bridge.md | 2 +-
 docs/breaking-changes.md   | 2 +-
 docs/tutorial/security.md  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/api/context-bridge.md b/docs/api/context-bridge.md
index c816b43ab64d8..5d62220bd6070 100644
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.
 
 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
 "Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
+[security](../tutorial/security.md#3-enable-context-isolation) docs.
 
 ## Methods
 
diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index 7dcbaaff47e3a..cf0e48d0df670 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -372,7 +372,7 @@ value.
 In Electron 12, `contextIsolation` will be enabled by default.  To restore
 the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
 
-We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
+We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation) for the security of your application.
 
 Another implication is that `require()` cannot be used in the renderer process unless
 `nodeIntegration` is `true` and `contextIsolation` is `false`.
diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index cda76d60b210a..0d98921a95afe 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -99,7 +99,7 @@ You should at least follow these steps to improve the security of your applicati
 
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
-3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
+3. [Enable context isolation in all renderers](#3-enable-context-isolation)
 4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
@@ -225,7 +225,7 @@ do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
 API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).
 
-### 3. Enable Context Isolation for remote content
+### 3. Enable Context Isolation
 
 :::info
 This recommendation is the default behavior in Electron since 12.0.0.

From 67332790375e0ed457f4517720355c9ec566de8f Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Mon, 18 Apr 2022 19:41:44 +0530
Subject: [PATCH 292/811] docs: document when BrowserWindow and BrowserView can
 be used (#33696)

We already document such info for other APIs, like the 'screen' API in
https://github.com/electron/electron/blob/f711fe6b5701196e5d803c04aab44bc62b392f8e/docs/api/screen.md?plain=1#L7-L8.
So we should do the same thing for these ones too.

Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 docs/api/browser-view.md   | 3 +++
 docs/api/browser-window.md | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/docs/api/browser-view.md b/docs/api/browser-view.md
index ed63f4a4881db..a2c5b03079a06 100644
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -11,6 +11,9 @@ relative to its owning window. It is meant to be an alternative to the
 
 Process: [Main](../glossary.md#main-process)
 
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ### Example
 
 ```javascript
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 44de118440190..4adb22ec0e6ea 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -4,6 +4,9 @@
 
 Process: [Main](../glossary.md#main-process)
 
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')

From 31c2b5703a75a5ff2bf0e68f472d9002fe866bfb Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Apr 2022 06:00:47 -0700
Subject: [PATCH 293/811] Bump v20.0.0-nightly.20220419

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index fd85ac3cfd285..b10011eae8d4d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220418
\ No newline at end of file
+20.0.0-nightly.20220419
\ No newline at end of file
diff --git a/package.json b/package.json
index 72c95b89025f5..6ce2a604bad91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220418",
+  "version": "20.0.0-nightly.20220419",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e0d88a4007e14..0ec25ddca319e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220418
- PRODUCTVERSION 20,0,0,20220418
+ FILEVERSION 20,0,0,20220419
+ PRODUCTVERSION 20,0,0,20220419
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 841e0a4e0ccae2b9fdac3944f7db1f23cb6a3c0a Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 19 Apr 2022 20:00:51 -0700
Subject: [PATCH 294/811] fix: include accessibility blink strings (#33840)

---
 electron_paks.gni | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/electron_paks.gni b/electron_paks.gni
index 2b089fa53b940..73d181d3f018d 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -184,6 +184,7 @@ template("electron_paks") {
       "${root_gen_dir}/components/strings/components_strings_",
       "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
       "${root_gen_dir}/services/strings/services_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
       "${root_gen_dir}/ui/strings/ax_strings_",
@@ -198,6 +199,7 @@ template("electron_paks") {
       "//device/bluetooth/strings",
       "//services/strings",
       "//third_party/blink/public/strings",
+      "//third_party/blink/public/strings:accessibility_strings",
       "//ui/strings:app_locale_settings",
       "//ui/strings:ax_strings",
       "//ui/strings:ui_strings",

From fec147a0cbff493a7ca1579a3eb0351c2c52cc7f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 06:01:22 -0700
Subject: [PATCH 295/811] Bump v20.0.0-nightly.20220420

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b10011eae8d4d..aa0390e8d18bb 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220419
\ No newline at end of file
+20.0.0-nightly.20220420
\ No newline at end of file
diff --git a/package.json b/package.json
index 6ce2a604bad91..fe2fbaa3e04be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220419",
+  "version": "20.0.0-nightly.20220420",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 0ec25ddca319e..34f9c73045a19 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220419
- PRODUCTVERSION 20,0,0,20220419
+ FILEVERSION 20,0,0,20220420
+ PRODUCTVERSION 20,0,0,20220420
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0c864837af77d6d8a59b6c44f982dcafc3d2fdde Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 20 Apr 2022 13:49:59 -0700
Subject: [PATCH 296/811] chore: use semantic-commit-action (#33857)

* chore: use semantic-commit-action

* Update semantic.yml
---
 .github/workflows/semantic.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/semantic.yml

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
new file mode 100644
index 0000000000000..11d62c9d62855
--- /dev/null
+++ b/.github/workflows/semantic.yml
@@ -0,0 +1,20 @@
+name: "Check Semantic Commit"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR Title
+    runs-on: ubuntu-latest
+    steps:
+      - name: semantic-pull-request
+        uses: amannn/action-semantic-pull-request@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          validateSingleCommit: false

From b53118ca28bcc9dcff3304f33d7c576a82b3f298 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Thu, 21 Apr 2022 05:52:15 +0900
Subject: [PATCH 297/811] fix: adopt partition alloc early initialization
 (#33832)

Refs https://chromium-review.googlesource.com/c/chromium/src/+/3298858
---
 BUILD.gn                       | 6 +++++-
 shell/app/electron_main_mac.cc | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index 53096fff480c3..039250e5a955a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -916,7 +916,10 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [ ":electron_framework+link" ]
+      deps = [
+        ":electron_framework+link",
+        "//base/allocator:early_zone_registration_mac",
+      ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
@@ -1077,6 +1080,7 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
+      "//base/allocator:early_zone_registration_mac",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc
index c0f9576fff7fe..c040db6624c63 100644
--- a/shell/app/electron_main_mac.cc
+++ b/shell/app/electron_main_mac.cc
@@ -5,6 +5,7 @@
 #include <cstdlib>
 #include <memory>
 
+#include "base/allocator/early_zone_registration_mac.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/fuses.h"
 #include "shell/app/electron_library_main.h"
@@ -28,6 +29,7 @@ namespace {
 }  // namespace
 
 int main(int argc, char* argv[]) {
+  partition_alloc::EarlyMallocZoneRegistration();
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)

From 00021a41b1905cbee93e775958c4fb50d473cda4 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Thu, 21 Apr 2022 10:38:47 +0900
Subject: [PATCH 298/811] chore: backport 7c9b3938d from libuv (#33815)

Backports https://github.com/libuv/libuv/pull/3597
---
 patches/node/.patches                         |   1 +
 ...acos_avoid_posix_spawnp_cwd_bug_3597.patch | 111 ++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 patches/node/macos_avoid_posix_spawnp_cwd_bug_3597.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index b04c145d37cf8..963b9aa10808e 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -43,3 +43,4 @@ macos_don_t_use_thread-unsafe_strtok_3524.patch
 process_fix_hang_after_note_exit_3521.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 fix_preserve_proper_method_names_as-is_in_error_stack.patch
+macos_avoid_posix_spawnp_cwd_bug_3597.patch
diff --git a/patches/node/macos_avoid_posix_spawnp_cwd_bug_3597.patch b/patches/node/macos_avoid_posix_spawnp_cwd_bug_3597.patch
new file mode 100644
index 0000000000000..f05f9ee5186e0
--- /dev/null
+++ b/patches/node/macos_avoid_posix_spawnp_cwd_bug_3597.patch
@@ -0,0 +1,111 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Fri, 15 Apr 2022 14:10:27 -0400
+Subject: macos: avoid posix_spawnp() cwd bug (#3597)
+
+macOS 10.15 has a bug where configuring the working directory with
+posix_spawn_file_actions_addchdir_np() makes posix_spawnp() fail with
+ENOENT even though the executable is spawned successfully.
+
+diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
+index c8816b85b7e531648064e739fb89257565ad64bb..de51bac3d0e8daf519d35c6a3994f1479590607a 100644
+--- a/deps/uv/src/unix/process.c
++++ b/deps/uv/src/unix/process.c
+@@ -671,27 +671,25 @@ static int uv__spawn_resolve_and_spawn(const uv_process_options_t* options,
+   if (options->env != NULL)
+     env = options->env;
+ 
+-  /* If options->file contains a slash, posix_spawn/posix_spawnp behave
+-   * the same, and don't involve PATH resolution at all. Otherwise, if
+-   * options->file does not include a slash, but no custom environment is
+-   * to be used, the environment used for path resolution as well for the
+-   * child process is that of the parent process, so posix_spawnp is the
+-   * way to go. */
+-  if (strchr(options->file, '/') != NULL || options->env == NULL) {
++  /* If options->file contains a slash, posix_spawn/posix_spawnp should behave
++   * the same, and do not involve PATH resolution at all. The libc
++   * `posix_spawnp` provided by Apple is buggy (since 10.15), so we now emulate it
++   * here, per https://github.com/libuv/libuv/pull/3583. */
++  if (strchr(options->file, '/') != NULL) {
+     do
+-      err = posix_spawnp(pid, options->file, actions, attrs, options->args, env);
++      err = posix_spawn(pid, options->file, actions, attrs, options->args, env);
+     while (err == EINTR);
+     return err;
+   }
+ 
+   /* Look for the definition of PATH in the provided env */
+-  path = uv__spawn_find_path_in_env(options->env);
++  path = uv__spawn_find_path_in_env(env);
+ 
+   /* The following resolution logic (execvpe emulation) is copied from
+    * https://git.musl-libc.org/cgit/musl/tree/src/process/execvp.c
+    * and adapted to work for our specific usage */
+ 
+-  /* If no path was provided in options->env, use the default value
++  /* If no path was provided in env, use the default value
+    * to look for the executable */
+   if (path == NULL)
+     path = _PATH_DEFPATH;
+diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
+index 199402e31406cf8ba360d54769461bb5285011ee..f8c08a4a7eb164ffff495c81e1f5df712084648b 100644
+--- a/deps/uv/test/test-list.h
++++ b/deps/uv/test/test-list.h
+@@ -322,6 +322,7 @@ TEST_DECLARE   (spawn_inherit_streams)
+ TEST_DECLARE   (spawn_quoted_path)
+ TEST_DECLARE   (spawn_tcp_server)
+ TEST_DECLARE   (spawn_exercise_sigchld_issue)
++TEST_DECLARE   (spawn_relative_path)
+ TEST_DECLARE   (fs_poll)
+ TEST_DECLARE   (fs_poll_getpath)
+ TEST_DECLARE   (fs_poll_close_request)
+@@ -954,6 +955,7 @@ TASK_LIST_START
+   TEST_ENTRY  (spawn_quoted_path)
+   TEST_ENTRY  (spawn_tcp_server)
+   TEST_ENTRY  (spawn_exercise_sigchld_issue)
++  TEST_ENTRY  (spawn_relative_path)
+   TEST_ENTRY  (fs_poll)
+   TEST_ENTRY  (fs_poll_getpath)
+   TEST_ENTRY  (fs_poll_close_request)
+diff --git a/deps/uv/test/test-spawn.c b/deps/uv/test/test-spawn.c
+index dfd5458ef37c664af9a55a8383bdb3121885db3b..de9c710020ef7da66e45f5617a8a697e698fa202 100644
+--- a/deps/uv/test/test-spawn.c
++++ b/deps/uv/test/test-spawn.c
+@@ -1981,3 +1981,37 @@ void spawn_stdin_stdout(void) {
+   }
+ }
+ #endif /* !_WIN32 */
++
++TEST_IMPL(spawn_relative_path) {
++  char* sep;
++
++  init_process_options("spawn_helper1", exit_cb);
++
++  exepath_size = sizeof(exepath) - 2;
++  ASSERT_EQ(0, uv_exepath(exepath, &exepath_size));
++  exepath[exepath_size] = '\0';
++
++  /* Poor man's basename(3). */
++  sep = strrchr(exepath, '/');
++  if (sep == NULL)
++    sep = strrchr(exepath, '\\');
++  ASSERT_NOT_NULL(sep);
++
++  /* Split into dirname and basename and make basename relative. */
++  memmove(sep + 2, sep, 1 + strlen(sep));
++  sep[0] = '\0';
++  sep[1] = '.';
++  sep[2] = '/';
++
++  options.cwd = exepath;
++  options.file = options.args[0] = sep + 1;
++
++  ASSERT_EQ(0, uv_spawn(uv_default_loop(), &process, &options));
++  ASSERT_EQ(0, uv_run(uv_default_loop(), UV_RUN_DEFAULT));
++
++  ASSERT_EQ(1, exit_cb_called);
++  ASSERT_EQ(1, close_cb_called);
++
++  MAKE_VALGRIND_HAPPY();
++  return 0;
++}

From 64517b36efb06464fcf6d2f214fd75d833fdb07a Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Thu, 21 Apr 2022 10:25:51 +0200
Subject: [PATCH 299/811] build: fix intermittent compilation failures on macOS
 (#33768)

* build: fix intermittent compilation failures on macOS

* chore: remove //base dependency from main executable

* chore: fix lint

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 BUILD.gn                       | 1 -
 shell/app/electron_main_mac.cc | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 039250e5a955a..883f9c4146e3a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1072,7 +1072,6 @@ if (is_mac) {
       "shell/app/electron_main_mac.cc",
       "shell/app/uv_stdio_fix.cc",
       "shell/app/uv_stdio_fix.h",
-      "shell/common/electron_constants.cc",
     ]
     include_dirs = [ "." ]
     deps = [
diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc
index c040db6624c63..c817df186e205 100644
--- a/shell/app/electron_main_mac.cc
+++ b/shell/app/electron_main_mac.cc
@@ -10,7 +10,6 @@
 #include "electron/fuses.h"
 #include "shell/app/electron_library_main.h"
 #include "shell/app/uv_stdio_fix.h"
-#include "shell/common/electron_constants.h"
 
 #if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
 #include <mach-o/dyld.h>
@@ -33,7 +32,8 @@ int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (electron::fuses::IsRunAsNodeEnabled() && IsEnvSet(electron::kRunAsNode)) {
+  if (electron::fuses::IsRunAsNodeEnabled() &&
+      IsEnvSet("ELECTRON_RUN_AS_NODE")) {
     return ElectronInitializeICUandStartNode(argc, argv);
   }
 #endif

From e864bc44c66de68e6b1645a41e79a1eda77538c2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 06:05:18 -0700
Subject: [PATCH 300/811] Bump v20.0.0-nightly.20220421

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index aa0390e8d18bb..1cebb017206ab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220420
\ No newline at end of file
+20.0.0-nightly.20220421
\ No newline at end of file
diff --git a/package.json b/package.json
index fe2fbaa3e04be..771724ee7b2d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220420",
+  "version": "20.0.0-nightly.20220421",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 34f9c73045a19..6778ac033fe5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220420
- PRODUCTVERSION 20,0,0,20220420
+ FILEVERSION 20,0,0,20220421
+ PRODUCTVERSION 20,0,0,20220421
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 33e9bfd99bd6b8802aa60fefcf3c87df2341b837 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 21 Apr 2022 14:34:25 -0700
Subject: [PATCH 301/811] build: improve circleci config (#33881)

* build: fix conditional restore of git cache

* build: split lint out of setup.yml
---
 .circleci/.gitignore                          |   1 +
 .circleci/config.yml                          | 117 ++++--------------
 .../{build_config.yml => config/base.yml}     |  57 +++++++--
 .circleci/config/build.js                     |  34 +++++
 .circleci/config/jobs/lint.yml                |  51 ++++++++
 .circleci/config/package.json                 |  10 ++
 .circleci/config/yarn.lock                    |  43 +++++++
 7 files changed, 207 insertions(+), 106 deletions(-)
 create mode 100644 .circleci/.gitignore
 rename .circleci/{build_config.yml => config/base.yml} (97%)
 create mode 100644 .circleci/config/build.js
 create mode 100644 .circleci/config/jobs/lint.yml
 create mode 100644 .circleci/config/package.json
 create mode 100644 .circleci/config/yarn.lock

diff --git a/.circleci/.gitignore b/.circleci/.gitignore
new file mode 100644
index 0000000000000..2b7d56379cacd
--- /dev/null
+++ b/.circleci/.gitignore
@@ -0,0 +1 @@
+config-staging
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 344b434438134..adcf9e502490c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ setup: true
 # Orbs
 orbs:
   path-filtering: circleci/path-filtering@0.1.0
+  continuation: circleci/continuation@0.2.0
 
 # All input parameters to pass to build config
 parameters:
@@ -43,103 +44,33 @@ parameters:
     default: all
     enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
 
-# Envs
-env-global: &env-global
-  ELECTRON_OUT_DIR: Default
-
-env-linux-medium: &env-linux-medium
-  <<: *env-global
-  NUMBER_OF_NINJA_PROCESSES: 3
-
-# Executors
-executors:
-  linux-docker:
-    parameters:
-      size:
-        description: "Docker executor size"
-        default: 2xlarge+
-        type: enum
-        enum: ["medium", "xlarge", "2xlarge+"]
-    docker:
-      - image: ghcr.io/electron/build:27db4a3e3512bfd2e47f58cea69922da0835f1d9
-    resource_class: << parameters.size >>
-
-# List of always run steps
-step-checkout-electron: &step-checkout-electron
-  checkout:
-    path: src/electron
-
-steps-lint: &steps-lint
-  steps:
-    - *step-checkout-electron
-    - run:
-        name: Setup third_party Depot Tools
-        command: |
-          # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
-          echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
-    - run:
-        name: Download GN Binary
-        command: |
-          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-          gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
-
-          cipd ensure -ensure-file - -root . \<<-CIPD
-          \$ServiceURL https://chrome-infra-packages.appspot.com/
-          @Subdir src/buildtools/linux64
-          gn/gn/linux-amd64 $gn_version
-          CIPD
-
-          echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
-    - run:
-        name: Download clang-format Binary
-        command: |
-          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-
-          sha1_path='buildtools/linux64/clang-format.sha1'
-          curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
-
-          download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
-    - run:
-        name: Run Lint
-        command: |
-          # gn.py tries to find a gclient root folder starting from the current dir.
-          # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-          touch .gclient
-          # Another option would be to checkout "buildtools" inside the Electron checkout,
-          # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-          cd src/electron
-          node script/yarn install --frozen-lockfile
-          node script/yarn lint
-    - run:
-        name: Run Script Typechecker
-        command: |
-          cd src/electron
-          node script/yarn tsc -p tsconfig.script.json
-
-# List of always run jobs.
 jobs:
-  lint:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-    <<: *steps-lint
-
-# Initial setup workflow
-workflows:
-  lint:
-    jobs:
-      # Job inherited from path-filtering orb
-      - path-filtering/filter:
+  generate-config:
+    docker:
+      - image: cimg/node:16.14
+    steps:
+      - checkout
+      - path-filtering/set-parameters:
           base-revision: main
-          # Params for mapping; `path-to-test parameter-to-set value-for-parameter` for each row
           mapping: |
             ^((?!docs/).)*$ run-build-mac true
             ^((?!docs/).)*$ run-build-linux true
             docs/.* run-docs-only true
             ^((?!docs/).)*$ run-docs-only false
-          config-path: .circleci/build_config.yml
-      - lint
+      - run:
+          command: |
+            cd .circleci/config
+            yarn
+            export CIRCLECI_BINARY="$HOME/circleci"
+            curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | DESTDIR=$CIRCLECI_BINARY bash
+            node build.js
+          name: Pack config.yml
+      - continuation/continue:
+          configuration_path: .circleci/config-staging/built.yml
+          parameters: /tmp/pipeline-parameters.json
+
+# Initial setup workflow
+workflows:
+  setup:
+    jobs:
+      - generate-config
diff --git a/.circleci/build_config.yml b/.circleci/config/base.yml
similarity index 97%
rename from .circleci/build_config.yml
rename to .circleci/config/base.yml
index d66ece9a80bac..a9f5ba36b3b61 100644
--- a/.circleci/build_config.yml
+++ b/.circleci/config/base.yml
@@ -927,12 +927,12 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
   restore_cache:
     keys:
-      - v12-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache
 step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
   restore_cache:
     keys:
-      - v5-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-marker-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache marker
 
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -941,10 +941,10 @@ step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
 step-maybe-restore-git-cache: &step-maybe-restore-git-cache
   restore_cache:
     paths:
-      - gclient-cache
+      - git-cache
     keys:
-      - v5-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
-      - v5-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}
+      - v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+      - v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}
     name: Conditionally restoring git cache
 
 step-restore-out-cache: &step-restore-out-cache
@@ -961,15 +961,15 @@ step-set-git-cache-path: &step-set-git-cache-path
     command: |
       # CircleCI does not support interpolation when setting environment variables.
       # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
-      echo 'export GIT_CACHE_PATH="$PWD/gclient-cache"' >> $BASH_ENV
+      echo 'export GIT_CACHE_PATH="$PWD/git-cache"' >> $BASH_ENV
 
 # Persist the git cache based on the hash of DEPS and .circle-sync-done
 # If the src cache was restored above then this will persist an empty cache
 step-save-git-cache: &step-save-git-cache
   save_cache:
     paths:
-      - gclient-cache
-    key: v5-gclient-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
+      - git-cache
+    key: v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
     name: Persisting git cache
 
 step-save-out-cache: &step-save-out-cache
@@ -1014,7 +1014,7 @@ step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
       - /var/portal
-    key: v12-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
     name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
   run:
@@ -1024,7 +1024,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
   save_cache:
     paths:
       - .src-cache-marker
-    key: v5-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
 
 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
   run:
@@ -1401,12 +1401,40 @@ commands:
             - *step-checkout-electron
             - *step-run-electron-only-hooks
             - *step-generate-deps-hash-cleanly
-            - *step-mark-sync-done
-            # Save git cache AFTER sync marked done because other jobs expect that to be the case
             - when:
                 condition: << parameters.save-git-cache >>
                 steps:
-                  - *step-save-git-cache            
+                  - *step-save-git-cache
+            # Mark sync as done _after_ saving the git cache so that it is uploaded
+            # only when the src cache was not present
+            # Their are theoretically two cases for this cache key
+            # 1. `vX-git-cache-DONE-{deps_hash}
+            # 2. `vX-git-cache-EMPTY-{deps_hash}
+            #
+            # Case (1) occurs when the flag file has "DONE" in it
+            # which only occurs when "step-mark-sync-done" is run
+            # or when the src cache was restored successfully as that
+            # flag file contains "DONE" in the src cache.
+            #
+            # Case (2) occurs when the flag file is empty, this occurs
+            # when the src cache was not restored and "step-mark-sync-done"
+            # has not run yet.
+            #
+            # Notably both of these cases also have completely different
+            # gclient cache states.
+            # In (1) the git cache is completely empty as we didn't run
+            # "gclient sync" because the src cache was restored.
+            # In (2) the git cache is full as we had to run "gclient sync"
+            #
+            # This allows us to do make the follow transitive assumption:
+            # In cases where the src cache is restored, saving the git cache
+            # will save an empty cache.  In cases where the src cache is built
+            # during this build the git cache will save a full cache.
+            #
+            # In order words if there is a src cache for a given DEPS hash
+            # the git cache restored will be empty.  But if the src cache
+            # is missing we will restore a useful git cache.
+            - *step-mark-sync-done
             - *step-minimize-workspace-size-from-checkout
             - *step-delete-git-directories
             - when:
@@ -2475,3 +2503,6 @@ workflows:
               ignore: /pull\/[0-9]+/
           requires:
             - mas-testing-arm64
+  lint:
+    jobs:
+      - lint
diff --git a/.circleci/config/build.js b/.circleci/config/build.js
new file mode 100644
index 0000000000000..4e255608a0905
--- /dev/null
+++ b/.circleci/config/build.js
@@ -0,0 +1,34 @@
+const cp = require('child_process');
+const fs = require('fs-extra');
+const path = require('path');
+const yaml = require('js-yaml');
+
+const STAGING_DIR = path.resolve(__dirname, '..', 'config-staging');
+
+function copyAndExpand(dir = './') {
+    const absDir = path.resolve(__dirname, dir);
+    const targetDir = path.resolve(STAGING_DIR, dir);
+
+    if (!fs.existsSync(targetDir)) {
+        fs.mkdirSync(targetDir);
+    }
+
+    for (const file of fs.readdirSync(absDir)) {
+        if (!file.endsWith('.yml')) {
+            if (fs.statSync(path.resolve(absDir, file)).isDirectory()) {
+                copyAndExpand(path.join(dir, file));
+            }
+            continue;
+        }
+
+        fs.writeFileSync(path.resolve(targetDir, file), yaml.dump(yaml.load(fs.readFileSync(path.resolve(absDir, file), 'utf8')), {
+            noRefs: true,
+        }));
+    }
+}
+
+if (fs.pathExists(STAGING_DIR)) fs.removeSync(STAGING_DIR);
+copyAndExpand();
+
+const output = cp.spawnSync(process.env.CIRCLECI_BINARY || 'circleci', ['config', 'pack', STAGING_DIR]);
+fs.writeFileSync(path.resolve(STAGING_DIR, 'built.yml'), output.stdout.toString());
diff --git a/.circleci/config/jobs/lint.yml b/.circleci/config/jobs/lint.yml
new file mode 100644
index 0000000000000..2137566547120
--- /dev/null
+++ b/.circleci/config/jobs/lint.yml
@@ -0,0 +1,51 @@
+executor:
+  name: linux-docker
+  size: medium
+steps:
+  - checkout:
+      path: src/electron
+  - run:
+      name: Setup third_party Depot Tools
+      command: |
+        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+        echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
+  - run:
+      name: Download GN Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
+
+        cipd ensure -ensure-file - -root . \<<-CIPD
+        \$ServiceURL https://chrome-infra-packages.appspot.com/
+        @Subdir src/buildtools/linux64
+        gn/gn/linux-amd64 $gn_version
+        CIPD
+
+        echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
+  - run:
+      name: Download clang-format Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+
+        sha1_path='buildtools/linux64/clang-format.sha1'
+        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
+
+        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
+  - run:
+      name: Run Lint
+      command: |
+        # gn.py tries to find a gclient root folder starting from the current dir.
+        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+        touch .gclient
+        # Another option would be to checkout "buildtools" inside the Electron checkout,
+        # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+        cd src/electron
+        node script/yarn install --frozen-lockfile
+        node script/yarn lint
+  - run:
+      name: Run Script Typechecker
+      command: |
+        cd src/electron
+        node script/yarn tsc -p tsconfig.script.json
diff --git a/.circleci/config/package.json b/.circleci/config/package.json
new file mode 100644
index 0000000000000..054dd7c11cc9e
--- /dev/null
+++ b/.circleci/config/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@electron/circleci-config",
+  "version": "0.0.0",
+  "private": true,
+  "license": "MIT",
+  "dependencies": {
+    "fs-extra": "^10.1.0",
+    "js-yaml": "^4.1.0"
+  }
+}
diff --git a/.circleci/config/yarn.lock b/.circleci/config/yarn.lock
new file mode 100644
index 0000000000000..51b2d9877643f
--- /dev/null
+++ b/.circleci/config/yarn.lock
@@ -0,0 +1,43 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+fs-extra@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==

From bb146e3deb15db0462c43e64ba1d2a5faccc9c6e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 06:01:30 -0700
Subject: [PATCH 302/811] Bump v20.0.0-nightly.20220422

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cebb017206ab..664ae84494ade 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220421
\ No newline at end of file
+20.0.0-nightly.20220422
\ No newline at end of file
diff --git a/package.json b/package.json
index 771724ee7b2d7..7f63479fea508 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220421",
+  "version": "20.0.0-nightly.20220422",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6778ac033fe5e..adece31432a58 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220421
- PRODUCTVERSION 20,0,0,20220421
+ FILEVERSION 20,0,0,20220422
+ PRODUCTVERSION 20,0,0,20220422
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0c8c755ffb13b18bdaf3f0533661fc8515a112bf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 09:17:29 -0700
Subject: [PATCH 303/811] Revert "Bump v20.0.0-nightly.20220422"

This reverts commit bb146e3deb15db0462c43e64ba1d2a5faccc9c6e.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 664ae84494ade..1cebb017206ab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220422
\ No newline at end of file
+20.0.0-nightly.20220421
\ No newline at end of file
diff --git a/package.json b/package.json
index 7f63479fea508..771724ee7b2d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220422",
+  "version": "20.0.0-nightly.20220421",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index adece31432a58..6778ac033fe5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220422
- PRODUCTVERSION 20,0,0,20220422
+ FILEVERSION 20,0,0,20220421
+ PRODUCTVERSION 20,0,0,20220421
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a5501d71182326b132648b4683d6819b1c28ae90 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 09:18:12 -0700
Subject: [PATCH 304/811] Bump v20.0.0-nightly.20220422

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cebb017206ab..664ae84494ade 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220421
\ No newline at end of file
+20.0.0-nightly.20220422
\ No newline at end of file
diff --git a/package.json b/package.json
index 771724ee7b2d7..7f63479fea508 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220421",
+  "version": "20.0.0-nightly.20220422",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6778ac033fe5e..adece31432a58 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220421
- PRODUCTVERSION 20,0,0,20220421
+ FILEVERSION 20,0,0,20220422
+ PRODUCTVERSION 20,0,0,20220422
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From e571417c522da40f7a66904bf332e7b6783d2cd3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 09:22:41 -0700
Subject: [PATCH 305/811] Revert "Bump v20.0.0-nightly.20220422"

This reverts commit a5501d71182326b132648b4683d6819b1c28ae90.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 664ae84494ade..1cebb017206ab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220422
\ No newline at end of file
+20.0.0-nightly.20220421
\ No newline at end of file
diff --git a/package.json b/package.json
index 7f63479fea508..771724ee7b2d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220422",
+  "version": "20.0.0-nightly.20220421",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index adece31432a58..6778ac033fe5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220422
- PRODUCTVERSION 20,0,0,20220422
+ FILEVERSION 20,0,0,20220421
+ PRODUCTVERSION 20,0,0,20220421
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 283e4826afb497e2a1b1ec5d158ea4df6282d1f1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:40:22 -0700
Subject: [PATCH 306/811] Bump v20.0.0-nightly.20220422

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cebb017206ab..664ae84494ade 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220421
\ No newline at end of file
+20.0.0-nightly.20220422
\ No newline at end of file
diff --git a/package.json b/package.json
index 771724ee7b2d7..7f63479fea508 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220421",
+  "version": "20.0.0-nightly.20220422",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6778ac033fe5e..adece31432a58 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220421
- PRODUCTVERSION 20,0,0,20220421
+ FILEVERSION 20,0,0,20220422
+ PRODUCTVERSION 20,0,0,20220422
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 53c3dd68b29e2a864aff9cb6d758a727e5665972 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:45:02 -0700
Subject: [PATCH 307/811] Revert "Bump v20.0.0-nightly.20220422"

This reverts commit 283e4826afb497e2a1b1ec5d158ea4df6282d1f1.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 664ae84494ade..1cebb017206ab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220422
\ No newline at end of file
+20.0.0-nightly.20220421
\ No newline at end of file
diff --git a/package.json b/package.json
index 7f63479fea508..771724ee7b2d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220422",
+  "version": "20.0.0-nightly.20220421",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index adece31432a58..6778ac033fe5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220422
- PRODUCTVERSION 20,0,0,20220422
+ FILEVERSION 20,0,0,20220421
+ PRODUCTVERSION 20,0,0,20220421
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f3e0517b6e1ddb0fbd05949007720d685fc86924 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 15:36:22 -0700
Subject: [PATCH 308/811] chore: bump chromium to 102.0.4999.0 (main) (#33731)

* chore: bump chromium in DEPS to 102.0.4999.0

* 3576640: Set OOM handler during V8 initialization

https://chromium-review.googlesource.com/c/chromium/src/+/3576640

* 3574964: Remove deprecated base::Value usage in print_settings_conversion code.

https://chromium-review.googlesource.com/c/chromium/src/+/3574964

* 3570062: Replicate Active state to render process for all RenderViews.

https://chromium-review.googlesource.com/c/chromium/src/+/3570062

* chore: fixup patch indices

* 3380402: Remove legacy SwiftShader

https://chromium-review.googlesource.com/c/chromium/src/+/3380402

* 3570254: [Local Fonts] Rename permission name from FONT_ACCESS to LOCAL_FONTS.

https://chromium-review.googlesource.com/c/chromium/src/+/3570254

* 3572172: Rename or remove several parameters involved in creation of MimeHandler streams

https://chromium-review.googlesource.com/c/chromium/src/+/3572172

* fix: add missing base/bits include

* chore: fix lint

* chore: remove ia32 Linux support

* chore: patch out swift-format cipd dep on macOS

* build: apply patch better

* build: reset all caches

* build: update zip manifests to remove swiftshared libraries

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3380402

* Revert "build: update zip manifests to remove swiftshared libraries"

This reverts commit 6aeec01ef1a79425a7b7d8c1cfb131a26b91c494.

* Revert "3380402: Remove legacy SwiftShader"

This reverts commit 4c7eebbbf2d0a459cc192959e17ae20f970c2da2.

* build: remove unused swiftshader egl libraries

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
---
 .circleci/config/base.yml                     | 145 ++----------------
 BUILD.gn                                      |  50 +++---
 DEPS                                          |   2 +-
 docs/development/build-instructions-linux.md  |   2 +-
 .../add_didinstallconditionalfeatures.patch   |   2 +-
 ..._scheduler_throttling_per_renderview.patch |   6 +-
 ..._windows_to_have_different_web_prefs.patch |  20 +--
 patches/chromium/blink_local_frame.patch      |   8 +-
 ..._depend_on_packed_resource_integrity.patch |  16 +-
 patches/chromium/can_create_window.patch      |  18 +--
 ..._v8_initialization_isolate_callbacks.patch |   4 +-
 ...screationoverridden_with_full_params.patch |   6 +-
 patches/chromium/dcheck.patch                 |   2 +-
 .../disable_compositor_recycling.patch        |   2 +-
 patches/chromium/disable_hidden.patch         |   8 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   2 +-
 .../extend_apply_webpreferences.patch         |   4 +-
 ..._raw_response_headers_from_urlloader.patch |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |  54 +++----
 .../chromium/gritsettings_resource_ids.patch  |   2 +-
 ...nse_interceptor_to_point_to_electron.patch |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 patches/chromium/isolate_holder.patch         |  22 +--
 .../mas_disable_remote_accessibility.patch    |   2 +-
 patches/chromium/printing.patch               |  54 +++----
 ...r_changes_to_the_webcontentsobserver.patch |  18 +--
 .../render_widget_host_view_base.patch        |   6 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 patches/chromium/web_contents.patch           |   2 +-
 patches/chromium/webview_cross_drag.patch     |   2 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 patches/v8/build_gn.patch                     |   8 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   8 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...eleted_cstors_in_cppheapcreateparams.patch |   2 +-
 script/release/ci-release-build.js            |   2 +-
 script/release/release.js                     |   6 -
 .../zip_manifests/dist_zip.mac.arm64.manifest |   2 -
 .../zip_manifests/dist_zip.mac.x64.manifest   |   2 -
 .../dist_zip.mac_mas.arm64.manifest           |   2 -
 .../dist_zip.mac_mas.x64.manifest             |   2 -
 .../streams_private/streams_private_api.cc    |  17 +-
 .../api/streams_private/streams_private_api.h |  20 +--
 shell/browser/javascript_environment.cc       |  12 +-
 .../gin_converters/content_converter.cc       |   4 +-
 49 files changed, 217 insertions(+), 375 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index a9f5ba36b3b61..82c78df50c64e 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -24,7 +24,7 @@ parameters:
   linux-publish-arch-limit:
     type: enum
     default: all
-    enum: ["all", "arm", "arm64", "x64", "ia32"]
+    enum: ["all", "arm", "arm64", "x64"]
 
   run-macos-publish:
     type: boolean
@@ -115,12 +115,6 @@ env-unittests: &env-unittests
   BUILD_TARGET: electron/spec:chromium_unittests
   TESTS_CONFIG: src/electron/spec/configs/unittests.yml
 
-# Build targets options.
-env-ia32: &env-ia32
-  GN_EXTRA_ARGS: 'target_cpu = "x86"'
-  NPM_CONFIG_ARCH: ia32
-  TARGET_ARCH: ia32
-
 env-arm: &env-arm
   GN_EXTRA_ARGS: 'target_cpu = "arm"'
   MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm
@@ -246,11 +240,20 @@ step-depot-tools-get: &step-depot-tools-get
     name: Get depot tools
     command: |
       git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
       if [ "`uname`" == "Darwin" ]; then
+        # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
         sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
       else
         sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+        # Remove swift-format dep from cipd on macOS until we send a patch upstream.
+        cd depot_tools
+        patch gclient.py -R \<<'EOF'
+      676,677c676
+      <         packages = dep_value.get('packages', [])
+      <         for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
+      ---
+      >         for package in dep_value.get('packages', []):
+      EOF
       fi
 
 step-depot-tools-add-to-path: &step-depot-tools-add-to-path
@@ -343,14 +346,14 @@ step-restore-brew-cache: &step-restore-brew-cache
       - /usr/local/Cellar/gnu-tar
       - /usr/local/bin/gtar
     keys:
-      - v4-brew-cache-{{ arch }}
+      - v5-brew-cache-{{ arch }}
 
 step-save-brew-cache: &step-save-brew-cache
   save_cache:
     paths:
       - /usr/local/Cellar/gnu-tar
       - /usr/local/bin/gtar
-    key: v4-brew-cache-{{ arch }}
+    key: v5-brew-cache-{{ arch }}
     name: Persisting brew cache
 
 step-get-more-space-on-mac: &step-get-more-space-on-mac
@@ -586,8 +589,6 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
       if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" == "Linux" ]; then
         if [ x"$TARGET_ARCH" == x ]; then
           target_cpu=x64
-        elif [ "$TARGET_ARCH" == "ia32" ]; then
-          target_cpu=x86
         else
           target_cpu="$TARGET_ARCH"
         fi
@@ -618,8 +619,6 @@ step-electron-dist-build: &step-electron-dist-build
             target_os=linux
             if [ x"$TARGET_ARCH" == x ]; then
               target_cpu=x64
-            elif [ "$TARGET_ARCH" == "ia32" ]; then
-              target_cpu=x86
             else
               target_cpu="$TARGET_ARCH"
             fi
@@ -952,7 +951,7 @@ step-restore-out-cache: &step-restore-out-cache
     paths:
       - ./src/out/Default
     keys:
-      - v9-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+      - v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
     name: Restoring out cache
 
 step-set-git-cache-path: &step-set-git-cache-path
@@ -976,7 +975,7 @@ step-save-out-cache: &step-save-out-cache
   save_cache:
     paths:
       - ./src/out/Default
-    key: v9-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    key: v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
     name: Persisting out cache
 
 step-run-electron-only-hooks: &step-run-electron-only-hooks
@@ -1802,54 +1801,6 @@ jobs:
                 attach: false
                 checkout: true
 
-  linux-ia32-testing:
-    executor: linux-docker
-    environment:
-      <<: *env-global
-      <<: *env-ia32
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
-          use-out-cache: false
-
-  linux-ia32-release:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-ia32
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
-
-  linux-ia32-publish:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-ia32
-      <<: *env-release-build
-      <<: *env-32bit-release
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
-    steps:
-      - run: echo running
-      - when:
-          condition:
-            or:
-              - equal: ["all", << pipeline.parameters.linux-publish-arch-limit >>]
-              - equal: ["ia32", << pipeline.parameters.linux-publish-arch-limit >>]
-          steps:
-            - electron-publish:
-                attach: false
-                checkout: true
 
   linux-arm-testing:
     executor: linux-docker
@@ -2240,60 +2191,6 @@ jobs:
       <<: *env-send-slack-notifications
     <<: *steps-verify-ffmpeg
 
-  linux-ia32-testing-tests:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    parallelism: 3
-    <<: *steps-tests
-
-  linux-ia32-testing-nan:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-nan
-
-  linux-ia32-testing-node:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-node
-
-  linux-ia32-release-tests:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-tests
-
-  linux-ia32-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-ia32
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-ffmpeg
-
   linux-arm-testing-tests:
     executor: linux-arm
     environment:
@@ -2371,8 +2268,6 @@ workflows:
     jobs:
     - linux-x64-publish:
         context: release-env
-    - linux-ia32-publish:
-        context: release-env
     - linux-arm-publish:
         context: release-env
     - linux-arm64-publish:
@@ -2426,16 +2321,6 @@ workflows:
       - linux-x64-testing-node:
           requires:
             - linux-x64-testing
-      - linux-ia32-testing
-      - linux-ia32-testing-tests:
-          requires:
-            - linux-ia32-testing
-      - linux-ia32-testing-nan:
-          requires:
-            - linux-ia32-testing
-      - linux-ia32-testing-node:
-          requires:
-            - linux-ia32-testing
       - linux-arm-testing
       - linux-arm-testing-tests:
           filters:
diff --git a/BUILD.gn b/BUILD.gn
index 883f9c4146e3a..fb64d22339ec1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -818,16 +818,11 @@ if (is_mac) {
     # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
     bundle_data("electron_swiftshader_binaries") {
       sources = [
-        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
-        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
         "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
         "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
       ]
       outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-      public_deps = [
-        "//ui/gl:swiftshader_egl_library_copy",
-        "//ui/gl:swiftshader_vk_library_copy",
-      ]
+      public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
     }
   }
   group("electron_angle_library") {
@@ -1123,21 +1118,18 @@ if (is_mac) {
       deps = [ ":electron_app" ]
     }
 
-    extract_symbols("swiftshader_egl_syms") {
-      binary = "$root_out_dir/libswiftshader_libEGL.dylib"
+    extract_symbols("egl_syms") {
+      binary = "$root_out_dir/ibEGL.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
-      deps =
-          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
+      dsym_file = "$root_out_dir/libEGL.dylib.dSYM/Contents/Resources/DWARF/libEGL.dylib"
+      deps = [ "//third_party/angle:libEGL" ]
     }
 
-    extract_symbols("swiftshader_gles_syms") {
-      binary = "$root_out_dir/libswiftshader_libGLESv2.dylib"
+    extract_symbols("gles_syms") {
+      binary = "$root_out_dir/libGLESv2.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libswiftshader_libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libGLESv2.dylib"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
-      ]
+      dsym_file = "$root_out_dir/libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libGLESv2.dylib"
+      deps = [ "//third_party/angle:libGLESv2" ]
     }
 
     extract_symbols("crashpad_handler_syms") {
@@ -1149,10 +1141,10 @@ if (is_mac) {
 
     group("electron_symbols") {
       deps = [
+        ":egl_syms",
         ":electron_app_syms",
         ":electron_framework_syms",
-        ":swiftshader_egl_syms",
-        ":swiftshader_gles_syms",
+        ":gles_syms",
       ]
 
       if (!is_mas_build) {
@@ -1307,27 +1299,23 @@ if (is_mac) {
       deps = [ ":electron_app" ]
     }
 
-    extract_symbols("swiftshader_egl_symbols") {
-      binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
+    extract_symbols("egl_symbols") {
+      binary = "$root_out_dir/libEGL$_target_shared_library_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps =
-          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
+      deps = [ "//third_party/angle:libEGL" ]
     }
 
-    extract_symbols("swiftshader_gles_symbols") {
-      binary =
-          "$root_out_dir/swiftshader/libGLESv2$_target_shared_library_suffix"
+    extract_symbols("gles_symbols") {
+      binary = "$root_out_dir/libGLESv2$_target_shared_library_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [
-        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
-      ]
+      deps = [ "//third_party/angle:libGLESv2" ]
     }
 
     group("electron_symbols") {
       deps = [
+        ":egl_symbols",
         ":electron_app_symbols",
-        ":swiftshader_egl_symbols",
-        ":swiftshader_gles_symbols",
+        ":gles_symbols",
       ]
     }
   }
diff --git a/DEPS b/DEPS
index 191d6b86c7db5..f6d9b49af0592 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.4989.0',
+    '102.0.4999.0',
   'node_version':
     'v16.14.2',
   'nan_version':
diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md
index 3bdd96863ceba..7663773e511b4 100644
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -82,7 +82,7 @@ $ sudo apt-get install libc6-dev-arm64-cross linux-libc-dev-arm64-cross \
                        g++-aarch64-linux-gnu
 ```
 
-And to cross-compile for `arm` or `ia32` targets, you should pass the
+And to cross-compile for `arm` or targets, you should pass the
 `target_cpu` parameter to `gn gen`:
 
 ```sh
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index be61078f2626f..0be836b9cb0d2 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,7 +23,7 @@ index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 448e5e6eab9e3bb98569a1d60619732173a396d2..88ba5eb82133a665cd5f9bdc52746c605c95509f 100644
+index 596dc721842c707844a771d64337e9cf0d82bfcc..b9eea3470139e1833b2b23d3b535b11235e2bc8e 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
 @@ -4465,6 +4465,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index b0d67115605e2..1e65be856e7b0 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -85,10 +85,10 @@ index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 0dc6c707cdbe14aec69f72575941c16a50ac2ce4..177e463358c3e8e94044f2ccc8eb2cf4a8ce7525 100644
+index d7b5e40a26026b7f4640c2f405fadab4a800e267..b2a2e38397fdf3e9bb52c4532a1d14463ed4110d 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3693,6 +3693,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3688,6 +3688,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 0dc6c707cdbe14aec69f72575941c16a50ac2ce4..177e463358c3e8e94044f2ccc8eb2cf4
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3704,7 +3711,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3699,7 +3706,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 4d55e26c12764..020ad8959be89 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index a422f50719e4c6a4fc96364d0370272695aab15f..eb310c01b11ccd2d8aeb8065dd4aa5e252b16f7c 100644
+index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab717847735dc63b17 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -141,6 +141,20 @@ WebPreferences::WebPreferences()
+@@ -140,6 +140,20 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -33,7 +33,7 @@ index a422f50719e4c6a4fc96364d0370272695aab15f..eb310c01b11ccd2d8aeb8065dd4aa5e2
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index e37be0929c0fc05f0e8e8bbe702cb6e2b6a4ac18..36a8ca7796a3e021df869ebacd7d76ed4d63e59d 100644
+index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadcc12afd1a 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -47,7 +47,7 @@ index e37be0929c0fc05f0e8e8bbe702cb6e2b6a4ac18..36a8ca7796a3e021df869ebacd7d76ed
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -147,6 +151,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -145,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index e37be0929c0fc05f0e8e8bbe702cb6e2b6a4ac18..36a8ca7796a3e021df869ebacd7d76ed
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index d682f3bf81da362cc6721817189ae0222ebad087..e1cf124e87b507a841044096d8325a4043fe2d1e 100644
+index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f0812c41aab 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,7 +79,7 @@ index d682f3bf81da362cc6721817189ae0222ebad087..e1cf124e87b507a841044096d8325a40
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -156,6 +157,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -152,6 +153,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
@@ -103,7 +103,7 @@ index d682f3bf81da362cc6721817189ae0222ebad087..e1cf124e87b507a841044096d8325a40
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index d09fed37e7a57e4f7399277dd116e306233019e4..87008b486c25918f5737880b97ca37d003434fac 100644
+index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691eccaf3cd7b19 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,7 +114,7 @@ index d09fed37e7a57e4f7399277dd116e306233019e4..87008b486c25918f5737880b97ca37d0
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -423,6 +424,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -418,6 +419,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -176,7 +176,7 @@ index d09fed37e7a57e4f7399277dd116e306233019e4..87008b486c25918f5737880b97ca37d0
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 90b34813bb0294cef5ef9d71daf1c09315eca590..6eac656fcea3dc76f978c23cf7f084b2d3f474a8 100644
+index d10d1b4c0b16ac9e863077cf60feca35fa2da329..1a49fb1a11f75aa3c79cd3cc1796957d0b9a5549 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,7 +187,7 @@ index 90b34813bb0294cef5ef9d71daf1c09315eca590..6eac656fcea3dc76f978c23cf7f084b2
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -208,6 +209,22 @@ struct WebPreferences {
+@@ -204,6 +205,22 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 7e4067aac72b2..48e5d3af2555f 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d26f32d11 100644
+index 0396836ad4ae67e26b6920afbcd702ccb24d391e..f207eda80b6cd1d3a739cc27499691ad1ac8e13e 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index da12f2f47f97628f1adeabc8900ffd16132afd7e..61d373f78520a063c7f86bde6869af9d
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index cf424b45c60ee6cd8fcb5bced73332ffd4b60c2d..17d59201aa0e4f077536ec29a3c59bd4e1d831a7 100644
+index b95ed440737ccdf32607c90831d13a482315d515..73f7aeee21f0116e46dad91cb9a088ab5adda6e3 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -542,10 +542,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index cf424b45c60ee6cd8fcb5bced73332ffd4b60c2d..17d59201aa0e4f077536ec29a3c59bd4
    if (!Client())
      return false;
  
-@@ -591,6 +587,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 4c64f9bb9664d..17729820471d9 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index ff2e479125f1a6d7cbb52e4f674cb836d4f6596c..f334b0b4fd4a6550c3b2baba870c5997f24db1ab 100644
+index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05e84bb846 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index ff2e479125f1a6d7cbb52e4f674cb836d4f6596c..f334b0b4fd4a6550c3b2baba870c5997
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 158bfba2bc80925c49821453df63664a571ad571..e0a7d98c75c9692ce13ff3f2fb97852e91ead91f 100644
+index 02e4b0e27f4a0d3409327ba929f78b129dc06385..dce624825dc8e9e545c15a0cb0427aa33877aa3e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4539,7 +4539,7 @@ static_library("browser") {
+@@ -4552,7 +4552,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 158bfba2bc80925c49821453df63664a571ad571..e0a7d98c75c9692ce13ff3f2fb97852e
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index f04d3f3303eace8a7ef6b996197c4ff58aca8c37..15b5311dcf2e43a8703b714e688da683392e9b36 100644
+index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c00b3d3af 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5984,7 +5984,6 @@ test("unit_tests") {
+@@ -5995,7 +5995,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index f04d3f3303eace8a7ef6b996197c4ff58aca8c37..15b5311dcf2e43a8703b714e688da683
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -6007,6 +6006,10 @@ test("unit_tests") {
+@@ -6018,6 +6017,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index f04d3f3303eace8a7ef6b996197c4ff58aca8c37..15b5311dcf2e43a8703b714e688da683
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6695,7 +6698,6 @@ test("unit_tests") {
+@@ -6706,7 +6709,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index f04d3f3303eace8a7ef6b996197c4ff58aca8c37..15b5311dcf2e43a8703b714e688da683
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6743,6 +6745,11 @@ test("unit_tests") {
+@@ -6754,6 +6756,11 @@ test("unit_tests") {
      if (is_chromeos) {
        deps += [ "//ui/chromeos" ]
      }
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 978b5c4c8e288..4fb371adedae3 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index c9f0b4a30f8df2ba2a12914b447cede52ed1ff85..a5d6618aac35f01e09a90bdafa9f60c8140b088c 100644
+index 9b08d7bbbda75390813ff07e0dc83bb9d16992a6..b47dc4a90a0294c5d7e73f01c496fd2b4f621400 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6937,6 +6937,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6939,6 +6939,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,7 +21,7 @@ index c9f0b4a30f8df2ba2a12914b447cede52ed1ff85..a5d6618aac35f01e09a90bdafa9f60c8
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6261962f55f065d4edc0641ce8927143468add8a..cf37734d313470c27d2d40bd90cb199234a1e99e 100644
+index d0092176fd24acb0657819d666e4f76ec65012ec..df03de0a810bbce796d5bc421b92000e02dbd449 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -3943,6 +3943,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -53,7 +53,7 @@ index 6261962f55f065d4edc0641ce8927143468add8a..cf37734d313470c27d2d40bd90cb1992
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 28144893598e6b4caa18cd23fea1da3ca1f406b1..8b83eb8c342499ec7a677cd849f0e3c17d955a38 100644
+index a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db0135c54290 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -569,6 +569,10 @@ struct CreateNewWindowParams {
@@ -68,10 +68,10 @@ index 28144893598e6b4caa18cd23fea1da3ca1f406b1..8b83eb8c342499ec7a677cd849f0e3c1
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 2a51c8c4d4cd21c0dc106dbb3b2e4e940a47319b..79479dd5fc7e0a9c27e75b85e1380c38f32f6fe7 100644
+index ffa24d4b6779226ea3b94afdf176939ea7e42e34..16fb4946cb3ea2d097e8ed05bb340cc3f0782ed6 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -578,6 +578,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -579,6 +579,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 2a51c8c4d4cd21c0dc106dbb3b2e4e940a47319b..79479dd5fc7e0a9c27e75b85e1380c38
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index d6ad990189520f7fc15e04c1c4bd03588d3ee81e..6aa01e2f4e8227f0c1cb78b88009728efccdd998 100644
+index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d563d5aafc 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -164,6 +164,7 @@ class NetworkService;
+@@ -165,6 +165,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index d6ad990189520f7fc15e04c1c4bd03588d3ee81e..6aa01e2f4e8227f0c1cb78b88009728e
  }  // namespace network
  
  namespace sandbox {
-@@ -953,6 +954,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -954,6 +955,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index 574913f05552a..dfbf2c9b770cd 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,10 +9,10 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 66dddc124ca48024cb9539529b787f6e9aa1fd5c..fd6dc712df185724ae88a40e643a26126e54d712 100644
+index 90d3a635eec331130b738d0839cc9fdfa60ce451..9eb900ff4449f277f8c5ab3ccc29b0aa725be356 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
+@@ -448,8 +448,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
    return {true, std::move(stringified_source)};
  }
  
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 2b88e17531304..1230a33e25953 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -183,7 +183,7 @@ index ed23267cd9f28f4e02d8374177f0bb697547cc2a..a979719f75ab4c9b49775ec3df5eff13
    }
    content::WebContents* CreateCustomWebContents(
 diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.cc b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
-index 1911b0558fad1d5834befa98e57a978e6e0b72da..cb85515f79617a32e2809ad6eb7f55e4ecc36b3f 100644
+index 1a6bbeea689901e23717d660e67f8d1abb21f799..85f7b42e7aadce3abcae9f9596403f9856771993 100644
 --- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
 +++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
 @@ -170,14 +170,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
@@ -246,7 +246,7 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 63b01c486f56499bbc2acff0b5abdbf24b0ce676..aeb111257740cd8c73e88c9b15d1f95fd49240c4 100644
+index b9309e1cbc4a8b701534aa8be2827c40d98d6678..c1b1bfc8333e93456178842db392eabff96bf4c9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -3891,8 +3891,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -316,7 +316,7 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 56b6d5d28fe21a2bea723060ad48ee0134e814a2..a3da9c86c0018e7f4810feb73ca32896cd6ce93c 100644
+index b652f1f30ce7043a0c8434d05a3b1da653aee1fc..259c62c60f302abebf167709b4a1c68ad5607129 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -402,8 +402,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 4832704e4e759..0b4fa1aa751ef 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index a4d74f8e59673d4734ef338235c027bd1c77e92e..6969d1c69ee215055bd49a2bf830416c9e8b62c8 100644
+index ab0afb79514e42acb87e94809ed4a2b7c736a825..23fb303820860a030643d6d5a1a449823bb146e8 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 @@ -515,8 +515,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index cb16038fb732b..85264ef143680 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 54a1142f17e2a63b86e1fab52ea90276091c85a4..df9381bf8dc4b2b85548c529038f60cc3185fcdd 100644
+index 18c77a5520ea2ae7cfee4eea3ed01fa8a588829d..557b77bea785108359b0c78f12c2b2afbdc2475d 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -511,7 +511,11 @@
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 8b054f701425d..4ccc6a9d37635 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 04bba6457636018af2f76f0e218076e993f47467..7e421c72e3cb9abd9c3dc6542afed08f3910df93 100644
+index 9e740edbf36dd7a30062c88f857103c56eebd729..7cda66952e0d3a67c32791ad3c7d7de8df03f876 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -808,6 +808,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,10 +20,10 @@ index 04bba6457636018af2f76f0e218076e993f47467..7e421c72e3cb9abd9c3dc6542afed08f
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index cb2dd8695096c4eda0b4c1782fa9ebd7a05e2b7b..22ba56a675f28abd9857e3c6d4b9908c568df016 100644
+index 23783e5e004b613c27fd753e1f7ff96d51fa5f68..225b4ea0c5ac74d6b6700c306182d003a972cedc 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -877,6 +877,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -886,6 +886,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
  
    SiteInstanceGroup* GetSiteInstanceGroup();
  
@@ -34,7 +34,7 @@ index cb2dd8695096c4eda0b4c1782fa9ebd7a05e2b7b..22ba56a675f28abd9857e3c6d4b9908c
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 907de04692ff86a3b287c5e66d4811ed1b31858e..035a168a8520ff28a832a79903dc3efdff596c05 100644
+index 5f29761ad8556e730dca6b076b87f6391313fb95..3e5f5a34150079bf74d612bff85b6875ad41d2e6 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 197e3b15b0834..e35ef06f99372 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,7 +11,7 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 88ba5eb82133a665cd5f9bdc52746c605c95509f..ceefc966e0b8f79e00d108de78f56f868f08ee67 100644
+index b9eea3470139e1833b2b23d3b535b11235e2bc8e..fbc1f6d8387e33cb7daafc96b7514897f067f008 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
 @@ -2377,7 +2377,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 1ffad5f73b38c..b6a0b701b7663 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 177e463358c3e8e94044f2ccc8eb2cf4a8ce7525..7efdb7a0cf2db85fadd0db0b6665bdf492f8f5bc 100644
+index b2a2e38397fdf3e9bb52c4532a1d14463ed4110d..9f0f209f279cc3dbe35efc12eb1e51449dfda470 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -160,6 +160,7 @@
@@ -23,7 +23,7 @@ index 177e463358c3e8e94044f2ccc8eb2cf4a8ce7525..7efdb7a0cf2db85fadd0db0b6665bdf4
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1780,6 +1781,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1777,6 +1778,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 9a069045d5097..c3215e637e3b0 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -103,7 +103,7 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 74365833e96d5a3c443e9160e1ada106026ada30..10bc715a2d0bd4cfe750ed222424dd4c7be37979 100644
+index 4c11fd542a66f514a6c36e684a34d0a62053c1f4..6852fd470c79e2fb041bf57a01e2b0b913cb94db 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -469,6 +469,7 @@ URLLoader::URLLoader(
@@ -123,7 +123,7 @@ index 74365833e96d5a3c443e9160e1ada106026ada30..10bc715a2d0bd4cfe750ed222424dd4c
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1407,6 +1408,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1411,6 +1412,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index e01dfbd4ead06..aa7e2ee965bab 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 5766344e7ca539e4ac8526eaa651f0079a9f01b1..ca02c970d0e83b24503a5128c5cf088d9e348f3b 100644
+index 07355cb194bd429a693e587072d11432d6c0888a..b74b4209931c6acd6bc2e93a100c3e65a834ead9 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1827,7 +1827,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1828,7 +1828,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 9b3efd6eefcaa..76a94c113f5b7 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index d3228eb29e921f63d74b7291814c7121f99bf8f8..739def8df363d8f33b194c7191a0016eefffcd9a 100644
+index 390ac74f01b5080880dcab65537a22fb7ef0cc41..103dc143f6310a2b9f0a834f7d25cf32207bea86 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3171,6 +3171,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3180,6 +3180,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index d3228eb29e921f63d74b7291814c7121f99bf8f8..739def8df363d8f33b194c7191a0016e
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 6aa01e2f4e8227f0c1cb78b88009728efccdd998..98830a0b12036025b69c74342329f95d74e2c623 100644
+index 9b988bb631ab759739ae01c918efb1d563d5aafc..4db1e6c2dbea27249ca15d5660b7fcd8c6736ad1 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -272,6 +272,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index c25fe7140292c..cfe45b10a0647 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -7,51 +7,51 @@ We don't use gin to create the V8 platform, because we need to inject Node
 things.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 00190da513499e6275d19bd99b6502db246cd33d..f273749bd026abb287ba33e03208a286e80a57a1 100644
+index 7b4b42449a60e9309135aae38213cb3b003337e0..7d9068b87eee4dbc3435ed6f67285d428dc85f52 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -121,9 +121,10 @@ IsolateHolder::~IsolateHolder() {
- void IsolateHolder::Initialize(ScriptMode mode,
-                                v8::ArrayBuffer::Allocator* allocator,
+@@ -123,9 +123,10 @@ void IsolateHolder::Initialize(ScriptMode mode,
                                 const intptr_t* reference_table,
--                               const std::string js_command_line_flags) {
-+                               const std::string js_command_line_flags,
+                                const std::string js_command_line_flags,
+                                v8::FatalErrorCallback fatal_error_callback,
+-                               v8::OOMErrorCallback oom_error_callback) {
++                               v8::OOMErrorCallback oom_error_callback,
 +                               bool create_v8_platform) {
    CHECK(allocator);
--  V8Initializer::Initialize(mode, js_command_line_flags);
-+  V8Initializer::Initialize(mode, js_command_line_flags, create_v8_platform);
+-  V8Initializer::Initialize(mode, js_command_line_flags, oom_error_callback);
++  V8Initializer::Initialize(mode, js_command_line_flags, oom_error_callback, create_v8_platform);
    g_array_buffer_allocator = allocator;
    g_reference_table = reference_table;
- }
+   g_fatal_error_callback = fatal_error_callback;
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 1e36669dfb275b8a7c4913c8465bd299c548ed3a..178023d52c9e8ef716ee215e7a243b1800357818 100644
+index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d064318627452ba852b2 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
 @@ -102,7 +102,8 @@ class GIN_EXPORT IsolateHolder {
-   static void Initialize(ScriptMode mode,
-                          v8::ArrayBuffer::Allocator* allocator,
                           const intptr_t* reference_table = nullptr,
--                         const std::string js_command_line_flags = {});
-+                         const std::string js_command_line_flags = {},
+                          const std::string js_command_line_flags = {},
+                          v8::FatalErrorCallback fatal_error_callback = nullptr,
+-                         v8::OOMErrorCallback oom_error_callback = nullptr);
++                         v8::OOMErrorCallback oom_error_callback = nullptr,
 +                         bool create_v8_platform = true);
  
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 6996e07dd19c0fa29fe658c6cb33adc60969e63e..ee480cc557db3bfd4ff9428324151d071ad1f444 100644
+index 9dddcdf88d56b32a9b8b9be529f0f13a03bd6e06..f4e5be79c1d3b92f6723f7b0c4d9a7f38c81ff99 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -351,7 +351,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
- 
+@@ -352,7 +352,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
--                               const std::string js_command_line_flags) {
-+                               const std::string js_command_line_flags,
+                                const std::string js_command_line_flags,
+-                               v8::OOMErrorCallback oom_error_callback) {
++                               v8::OOMErrorCallback oom_error_callback,
 +                               bool create_v8_platform) {
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
-@@ -361,7 +362,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+@@ -362,7 +363,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    // See https://crbug.com/v8/11043
    SetFlags(mode, js_command_line_flags);
  
@@ -59,18 +59,18 @@ index 6996e07dd19c0fa29fe658c6cb33adc60969e63e..ee480cc557db3bfd4ff9428324151d07
 +  if (create_v8_platform)
 +    v8::V8::InitializePlatform(V8Platform::Get());
  
-   // Set this early on as some initialization steps, such as the initialization
-   // of the virtual memory cage, already use V8's random number generator.
+   // Set this as early as possible in order to ensure OOM errors are reported
+   // correctly.
 diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
-index beeedc5737f6e60dde123200fbb6430a40366577..17ee4c894e89b7d2d12377475a5dd01910b61312 100644
+index da5b4017b4a8128bf620d4b43d4c2d183719265b..13a120c7fe8e69a44793473f3124c33d572a07a3 100644
 --- a/gin/v8_initializer.h
 +++ b/gin/v8_initializer.h
-@@ -29,7 +29,8 @@ class GIN_EXPORT V8Initializer {
-  public:
+@@ -31,7 +31,8 @@ class GIN_EXPORT V8Initializer {
    // This should be called by IsolateHolder::Initialize().
    static void Initialize(IsolateHolder::ScriptMode mode,
--                         const std::string js_command_line_flags = {});
-+                         const std::string js_command_line_flags = {},
+                          const std::string js_command_line_flags = {},
+-                         v8::OOMErrorCallback oom_error_callback = nullptr);
++                         v8::OOMErrorCallback oom_error_callback = nullptr,
 +                         bool create_v8_platform = true);
  
    // Get address and size information for currently loaded snapshot.
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index c3969f67ffd76..9737467116185 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index b036986b35dac88ab58d572a9e77bf0b1210411a..56f58636177cba954bdd24f8c43fc339a5e9b436 100644
+index 6a91282809a76ca60dd1b329c683705b127eb22a..a2672faad7c39c3d938c1c31abb6fd0d37582fbf 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
 @@ -954,6 +954,11 @@
diff --git a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
index 2b0621f918e82..af8133b783c0f 100644
--- a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
+++ b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
@@ -8,7 +8,7 @@ require a largeish patch to get working, so just redirect it to our
 implementation instead.
 
 diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
-index b5c0e1c131351a51e3c03918dfc10e92ca1bace1..c6fe2e473a9d8a5ed2854a69909eb360d052147a 100644
+index 9d7479bff662ca3c482e4672a9129e1f83100ebd..cfcc14087d9d5d9ab08ff9a5349a096ec75f4b6a 100644
 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 @@ -10,8 +10,8 @@
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index dff95cff6f340..5bf3a6a382a81 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index a8f53aaae2f2dd7e5af3b50a3bf80671a6276581..ee128e30c394c755306a62412b06d15503ccd2f2 100755
+index 694a67b7a0f622c7a8bfc1d46148398140d51384..00b588b268aa059ff84adbbc6ae266aa67e174b1 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/isolate_holder.patch b/patches/chromium/isolate_holder.patch
index bcf1ff58add19..70d8833b4744a 100644
--- a/patches/chromium/isolate_holder.patch
+++ b/patches/chromium/isolate_holder.patch
@@ -15,15 +15,15 @@ for us to register the isolate in between Isolate::Allocate and
 Isolate::Initialize.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index f273749bd026abb287ba33e03208a286e80a57a1..0159cd61a8e95d6cca51cdc855f1dea3ec965d6b 100644
+index 7d9068b87eee4dbc3435ed6f67285d428dc85f52..c0b8c6e5b49390b8a87d6a9d19605f6b6a1c3562 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
 @@ -59,7 +59,8 @@ IsolateHolder::IsolateHolder(
+     IsolateType isolate_type,
+     IsolateCreationMode isolate_creation_mode,
      v8::CreateHistogramCallback create_histogram_callback,
-     v8::AddHistogramSampleCallback add_histogram_sample_callback,
-     v8::FatalErrorCallback fatal_error_callback,
--    v8::OOMErrorCallback oom_error_callback)
-+    v8::OOMErrorCallback oom_error_callback,
+-    v8::AddHistogramSampleCallback add_histogram_sample_callback)
++    v8::AddHistogramSampleCallback add_histogram_sample_callback,
 +    v8::Isolate* isolate)
      : access_mode_(access_mode), isolate_type_(isolate_type) {
    CHECK(Initialized())
@@ -38,15 +38,15 @@ index f273749bd026abb287ba33e03208a286e80a57a1..0159cd61a8e95d6cca51cdc855f1dea3
                                                     access_mode_, task_runner);
    if (isolate_creation_mode == IsolateCreationMode::kCreateSnapshot) {
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 178023d52c9e8ef716ee215e7a243b1800357818..979fdc27efbe69c276894e0dc82e53ac2c4db7b4 100644
+index 4efc13c79ae742fa1925d064318627452ba852b2..978c0d144370162e65038cf8a2e125fbfd0f7ebf 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
-@@ -84,7 +84,8 @@ class GIN_EXPORT IsolateHolder {
+@@ -82,7 +82,8 @@ class GIN_EXPORT IsolateHolder {
+       IsolateType isolate_type,
+       IsolateCreationMode isolate_creation_mode = IsolateCreationMode::kNormal,
        v8::CreateHistogramCallback create_histogram_callback = nullptr,
-       v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr,
-       v8::FatalErrorCallback fatal_error_callback = nullptr,
--      v8::OOMErrorCallback oom_error_callback = nullptr);
-+      v8::OOMErrorCallback oom_error_callback = nullptr,
+-      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr);
++      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr,
 +      v8::Isolate* isolate = nullptr);
    IsolateHolder(const IsolateHolder&) = delete;
    IsolateHolder& operator=(const IsolateHolder&) = delete;
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 5dedbca657033..3b5355498e8b6 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -114,7 +114,7 @@ index 2b99d6a9f13f12a2a470fb6a5aa98c05f26a54c7..46d735add749d76c32f80512d00373b4
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 14fec4b1b39d995553b029ca7ec780ce29b27162..54a1142f17e2a63b86e1fab52ea90276091c85a4 100644
+index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8a588829d 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -252,8 +252,10 @@
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 09a9b9dd6df08..673afb1da0042 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -69,7 +69,7 @@ index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471
      NEW_DOC,
  
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index 5248f98e3d8e1469afe2ec87f696581cb0ff4687..4fe1faed3bb95407e2d25ea9c868bc0d615ba03c 100644
+index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb55883ea5fae5 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -88,7 +88,7 @@ index 5248f98e3d8e1469afe2ec87f696581cb0ff4687..4fe1faed3bb95407e2d25ea9c868bc0d
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -232,16 +232,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+@@ -230,16 +230,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -114,10 +114,10 @@ index 5248f98e3d8e1469afe2ec87f696581cb0ff4687..4fe1faed3bb95407e2d25ea9c868bc0d
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b899e5972 100644
+index 02dfcad0c6b208f7df4d2b10112739554f6ab75c..0774aa95ee1521b0e76fe72d8d9e8de4540f0ff1 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -305,7 +305,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -331,7 +331,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -127,7 +127,7 @@ index 56232bf979e90a01bb580c0a1972ae0860d994e9..96e05b5cd4b556a6ddb41664b5ff999b
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774bf8b4b9b9 100644
+index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b1071921e7cabb4 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -168,7 +168,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -193,7 +197,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -179,7 +179,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO(
+@@ -246,6 +252,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -187,7 +187,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO(
+@@ -255,8 +262,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -198,7 +198,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -294,12 +302,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -213,7 +213,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -307,7 +317,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -225,7 +225,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -331,7 +344,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -333,7 +346,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -236,7 +236,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
-@@ -484,7 +499,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -486,7 +501,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -246,7 +246,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -497,16 +513,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -499,16 +515,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -270,7 +270,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -622,11 +641,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -624,11 +643,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -285,7 +285,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -653,18 +675,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -658,18 +680,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -307,7 +307,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -674,6 +698,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -679,6 +703,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
    }
@@ -315,7 +315,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -699,14 +724,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -704,14 +729,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -332,7 +332,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
      return;
    }
  #endif
-@@ -729,7 +754,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
+@@ -734,7 +759,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
    PrintManager::PrintingFailed(cookie);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -340,7 +340,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  #endif
  
    ReleasePrinterQuery();
-@@ -744,6 +768,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -749,6 +773,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -352,7 +352,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -754,10 +783,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -759,10 +788,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -365,7 +365,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -817,6 +848,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -822,6 +853,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -377,7 +377,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -878,7 +914,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -883,7 +919,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -389,7 +389,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    if (!weak_this)
      return false;
  
-@@ -960,6 +999,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -965,6 +1004,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    UnregisterSystemPrintClient();
  #endif
  
@@ -403,7 +403,7 @@ index 9d17312dce6fb7619f0a7f1a05219f70561ea7a3..1d83d9ea04b582216b0244d038ca774b
    if (!print_job_)
      return;
  
-@@ -1009,7 +1055,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1014,7 +1060,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -809,17 +809,17 @@ index cd26f9ecf888c2a321890edd378ee0f8843a7f6c..958794f95fe8830b7e494340fbd53b0e
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index c4cdb402bc0aaa25b9118bad33a84b7f04cc94c4..8022f3599ec38d614272cde3109a7be2d9b2840e 100644
+index d0ef2181c649afe110c3c466a565a01cf6ae63a9..2daf9f02d41e04930fc4dad6d36ccbf3006dc175 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -120,7 +120,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
+@@ -119,7 +119,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
  
  mojom::ResultCode PrintingContext::UpdatePrintSettings(
      base::Value job_settings) {
 -  ResetSettings();
    {
      std::unique_ptr<PrintSettings> settings =
-         PrintSettingsFromJobSettings(job_settings);
+         PrintSettingsFromJobSettings(job_settings.GetDict());
 diff --git a/printing/printing_context.h b/printing/printing_context.h
 index 3f36303105b7979a1a771bf26b42596abe5b3cce..52f740bb832db4a8d76431d9bc77cab10bb7e0c7 100644
 --- a/printing/printing_context.h
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index ab990b94d8742..1fb2c1b47c131 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about `
 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779
 
 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h
-index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c379c9645 100644
+index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabcaa9c5f432 100644
 --- a/content/browser/renderer_host/render_widget_host_delegate.h
 +++ b/content/browser/renderer_host/render_widget_host_delegate.h
 @@ -14,6 +14,7 @@
@@ -19,7 +19,7 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
  #include "content/public/common/drop_data.h"
  #include "services/metrics/public/cpp/ukm_recorder.h"
  #include "third_party/abseil-cpp/absl/types/optional.h"
-@@ -252,6 +253,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate {
+@@ -257,6 +258,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate {
    // Returns the associated RenderViewHostDelegateView*, if possible.
    virtual RenderViewHostDelegateView* GetDelegateView();
  
@@ -30,10 +30,10 @@ index 059ff2b47e7aa8b9707e71ae9a1793bfdd86d319..529637f8b6af6b8b45f9de61d27b5e9c
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 7e421c72e3cb9abd9c3dc6542afed08f3910df93..218fe3eb6d6e2e4bce19776f25560aa7b81dfefa 100644
+index 7cda66952e0d3a67c32791ad3c7d7de8df03f876..8cb3a596593c52e776d546d25fb078003204faa6 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2067,6 +2067,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2080,6 +2080,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 7e421c72e3cb9abd9c3dc6542afed08f3910df93..218fe3eb6d6e2e4bce19776f25560aa7
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index cf37734d313470c27d2d40bd90cb199234a1e99e..63b01c486f56499bbc2acff0b5abdbf24b0ce676 100644
+index df03de0a810bbce796d5bc421b92000e02dbd449..b9309e1cbc4a8b701534aa8be2827c40d98d6678 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4506,6 +4506,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4519,6 +4519,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,12 +59,12 @@ index cf37734d313470c27d2d40bd90cb199234a1e99e..63b01c486f56499bbc2acff0b5abdbf2
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 207633738a6bb358c796c8bb42aa5805b753f61b..5766344e7ca539e4ac8526eaa651f0079a9f01b1 100644
+index 80aeacf4ad593a7d40dae6c9096ab0c700ab22d8..07355cb194bd429a693e587072d11432d6c0888a 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -961,6 +961,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
-       blink::mojom::FrameVisibility visibility) override;
+@@ -962,6 +962,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
+   void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
 +  void OnCursorChanged(const WebCursor& cursor) override;
    bool IsWidgetForPrimaryMainFrame(
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index 79d8bc6b449cb..ad382863c801c 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 7d6f0a7f7f65440b7827a2fe01d75998716b1bef..6aaa797b602f7fca7f78026311938c6c88efcfbd 100644
+index 1bdeb27db614d3ab535e536e7e433d9ee27fd9da..e478228a5729a2a2fa0a816e25a4f1a6fe996bac 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -658,6 +658,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -668,6 +668,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index 7d6f0a7f7f65440b7827a2fe01d75998716b1bef..6aaa797b602f7fca7f78026311938c6c
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index a5c773c9a78565230013b6219ec83621980defef..34b6650c766673274f0da3e539bf9a8e71c3d36e 100644
+index 5f2abc1943e2f25aa31c499ed7fd870a49ba5732..d3d6800e0920380bc9efe8dba35e03efe10e6a50 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 6e7b9f068b951..6b0998109b045 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 6b8f8778d17008582ab9edeae6d63dd1111182f3..ff2e479125f1a6d7cbb52e4f674cb836d4f6596c 100644
+index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1547,7 +1547,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1529,7 +1529,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 6b8f8778d17008582ab9edeae6d63dd1111182f3..ff2e479125f1a6d7cbb52e4f674cb836
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1576,6 +1576,12 @@ if (!is_android) {
+@@ -1558,6 +1558,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index ae352c1290d32..535a2d61a447d 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 6ee18591ecf3f73388384d82a6530a950ff580e7..c43e94bc7c53ec9573c2e0b869d93bfd73f7051a 100644
+index 24b18a620f3e60ed26dddfaa5d3133b5ede972fe..0377f156a23182d1a65fe5ef82f3f5203b98aed0 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1313,7 +1313,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1320,7 +1320,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index f71e73be0d009..645a763ee4263 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,7 +9,7 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index aeb111257740cd8c73e88c9b15d1f95fd49240c4..d00640770b8648116cb83d3a565f4b2f3ca37f8c 100644
+index c1b1bfc8333e93456178842db392eabff96bf4c9..1eee3bf88b5566b07cdb4f33fc03bf3d904ec6b9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
 @@ -3057,6 +3057,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 365473fa3413c..4821358337913 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,7 +8,7 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d0988f380b7b 100644
+index dad12d60cea0cd11302e38090eb9af204138b028..ee7615c26df635e433fe14d68dc0a724820f3d2a 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
 @@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 55e05e7be1181..c63e24436accf 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index a5d6618aac35f01e09a90bdafa9f60c8140b088c..9385e097701ef51ed375fcaa097cdbf14d7ef0c7 100644
+index b47dc4a90a0294c5d7e73f01c496fd2b4f621400..cf02dbe536eec67b77c85ceb73d285fcbde025fc 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6322,6 +6322,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6324,6 +6324,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index e0f0f0f0ab2ef..c17d287366fd4 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c5f46f1b0c565fa9f55f8ead1e9ef6dab9571e95..25df04a1e1fc0a2b4ba61d33384c33d076d471fa 100644
+index fec387d31eb5842f4fb0ff617f10b2254c0ee260..2385ccc74d41c10a3f61179f31073062250afcdc 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -605,7 +605,7 @@ config("internal_config") {
+@@ -606,7 +606,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index c5f46f1b0c565fa9f55f8ead1e9ef6dab9571e95..25df04a1e1fc0a2b4ba61d33384c33d0
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5823,7 +5823,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5826,7 +5826,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index c5f46f1b0c565fa9f55f8ead1e9ef6dab9571e95..25df04a1e1fc0a2b4ba61d33384c33d0
  
      deps = [
        ":v8_libbase",
-@@ -5861,6 +5861,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5864,6 +5864,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index f47cb07374a30..1e2876e1fb704 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index ac85fb294df295d65236a5e9143337989d2bf6e6..f7004b9aed1ea8c33695be5eda01150ed626c37b 100644
+index d22910b209c614162363938accfc86696719ad12..22af6bf24d672817bf620b9411d1b678b7a9800f 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9110,7 +9110,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9115,7 +9115,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index ac85fb294df295d65236a5e9143337989d2bf6e6..f7004b9aed1ea8c33695be5eda01150e
    isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 73263505e22956f10eaac4482d8a9ddf191edc13..083b488e0391224da0d13d7d2b80b3696619d59d 100644
+index 509ee8574736261307d9e270b7151197c6988649..00532d4dedf67c0764ca574b40e10ff0ce184762 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6161,9 +6161,9 @@ void Heap::TearDown() {
+@@ -6200,9 +6200,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 32f89f3419eab..01d7180fc6f13 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 29f753f4944541dd8dc11b4daff900cb45be42a8..21b85f6188b7b9cea577128d0957fc463dfe74ee 100644
+index 1310890fbec222c0edfda08ec962292d39aca8d1..5ff12eaa98887826b9a962c41f69480ca1d9dd3a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -605,6 +605,10 @@ config("internal_config") {
+@@ -606,6 +606,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -27,10 +27,10 @@ index 29f753f4944541dd8dc11b4daff900cb45be42a8..21b85f6188b7b9cea577128d0957fc46
      defines += [ "BUILDING_V8_SHARED" ]
    }
 diff --git a/src/base/macros.h b/src/base/macros.h
-index fcb9f8756fd3ce9b83fe4ef60ad02fb225ec32dd..57dcd3deab5f37420a427954699dd85175328f3d 100644
+index 61644ffe0582787578dc3848f87cc8c2a0e88bb7..cd3e11e4ff77a388d2325a015e1a71641a4924a0 100644
 --- a/src/base/macros.h
 +++ b/src/base/macros.h
-@@ -393,13 +393,17 @@ bool is_inbounds(float_t v) {
+@@ -387,13 +387,17 @@ bool is_inbounds(float_t v) {
  #ifdef V8_OS_WIN
  
  // Setup for Windows shared library export.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index d149375c1a9b0..f3d31e645c36a 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 25df04a1e1fc0a2b4ba61d33384c33d076d471fa..29f753f4944541dd8dc11b4daff900cb45be42a8 100644
+index 2385ccc74d41c10a3f61179f31073062250afcdc..1310890fbec222c0edfda08ec962292d39aca8d1 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5835,7 +5835,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5838,7 +5838,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
index bf4935b108d45..1eabe26bfd11c 100644
--- a/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
+++ b/patches/v8/revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
@@ -6,7 +6,7 @@ Subject: Revert "fix(cppgc): removed deleted cstors in CppHeapCreateParams"
 This reverts commit a66b09e5510d62ff469e72b1a8ff7f0ead1bf0f6.
 
 diff --git a/include/v8-cppgc.h b/include/v8-cppgc.h
-index 201773f59ddd3ce2ed61fe08cb58786aeed605cc..7761d87fd0a325a53d398bafcdeadd6a87f4f1c2 100644
+index 412154930f7d92b5e3932bf7a1cace16eee940e8..401e492210609f9c1b16a082ff9d97b8acd4fc61 100644
 --- a/include/v8-cppgc.h
 +++ b/include/v8-cppgc.h
 @@ -77,6 +77,9 @@ struct WrapperDescriptor final {
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 86189ba6a292d..61b413f76a1cd 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -22,7 +22,7 @@ const circleCIPublishWorkflows = [
 
 const circleCIPublishIndividualArches = {
   'macos-publish': ['osx-x64', 'mas-x64', 'osx-arm64', 'mas-arm64'],
-  'linux-publish': ['arm', 'arm64', 'ia32', 'x64']
+  'linux-publish': ['arm', 'arm64', 'x64']
 };
 
 const vstsArmJobs = [
diff --git a/script/release/release.js b/script/release/release.js
index f43cbf9a03560..83200e153e7f4 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -101,7 +101,6 @@ function assetsForVersion (version, validatingRelease) {
     `chromedriver-${version}-darwin-arm64.zip`,
     `chromedriver-${version}-linux-arm64.zip`,
     `chromedriver-${version}-linux-armv7l.zip`,
-    `chromedriver-${version}-linux-ia32.zip`,
     `chromedriver-${version}-linux-x64.zip`,
     `chromedriver-${version}-mas-x64.zip`,
     `chromedriver-${version}-mas-arm64.zip`,
@@ -120,8 +119,6 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-linux-arm64.zip`,
     `electron-${version}-linux-armv7l-symbols.zip`,
     `electron-${version}-linux-armv7l.zip`,
-    `electron-${version}-linux-ia32-symbols.zip`,
-    `electron-${version}-linux-ia32.zip`,
     `electron-${version}-linux-x64-debug.zip`,
     `electron-${version}-linux-x64-symbols.zip`,
     `electron-${version}-linux-x64.zip`,
@@ -150,13 +147,11 @@ function assetsForVersion (version, validatingRelease) {
     'libcxxabi_headers.zip',
     `libcxx-objects-${version}-linux-arm64.zip`,
     `libcxx-objects-${version}-linux-armv7l.zip`,
-    `libcxx-objects-${version}-linux-ia32.zip`,
     `libcxx-objects-${version}-linux-x64.zip`,
     `ffmpeg-${version}-darwin-x64.zip`,
     `ffmpeg-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-linux-arm64.zip`,
     `ffmpeg-${version}-linux-armv7l.zip`,
-    `ffmpeg-${version}-linux-ia32.zip`,
     `ffmpeg-${version}-linux-x64.zip`,
     `ffmpeg-${version}-mas-x64.zip`,
     `ffmpeg-${version}-mas-arm64.zip`,
@@ -167,7 +162,6 @@ function assetsForVersion (version, validatingRelease) {
     `mksnapshot-${version}-darwin-arm64.zip`,
     `mksnapshot-${version}-linux-arm64-x64.zip`,
     `mksnapshot-${version}-linux-armv7l-x64.zip`,
-    `mksnapshot-${version}-linux-ia32.zip`,
     `mksnapshot-${version}-linux-x64.zip`,
     `mksnapshot-${version}-mas-x64.zip`,
     `mksnapshot-${version}-mas-arm64.zip`,
diff --git a/script/zip_manifests/dist_zip.mac.arm64.manifest b/script/zip_manifests/dist_zip.mac.arm64.manifest
index 997413de941ee..d09ff34e0e259 100644
--- a/script/zip_manifests/dist_zip.mac.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac.arm64.manifest
@@ -15,8 +15,6 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libEGL.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libEGL.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libvk_swiftshader.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
diff --git a/script/zip_manifests/dist_zip.mac.x64.manifest b/script/zip_manifests/dist_zip.mac.x64.manifest
index d20306318cf65..a72fbeb79ea64 100644
--- a/script/zip_manifests/dist_zip.mac.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac.x64.manifest
@@ -15,8 +15,6 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libEGL.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libEGL.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libvk_swiftshader.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
diff --git a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
index 5f319b17895a3..ba4303603e46d 100644
--- a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
@@ -12,8 +12,6 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libEGL.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libEGL.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libvk_swiftshader.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
diff --git a/script/zip_manifests/dist_zip.mac_mas.x64.manifest b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
index 7736d9750d8e9..a62f594edae6f 100644
--- a/script/zip_manifests/dist_zip.mac_mas.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
@@ -12,8 +12,6 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libEGL.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libEGL.dylib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libswiftshader_libGLESv2.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libvk_swiftshader.dylib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
diff --git a/shell/browser/extensions/api/streams_private/streams_private_api.cc b/shell/browser/extensions/api/streams_private/streams_private_api.cc
index 4b0ef5df249b5..4ef72f4645b59 100644
--- a/shell/browser/extensions/api/streams_private/streams_private_api.cc
+++ b/shell/browser/extensions/api/streams_private/streams_private_api.cc
@@ -20,23 +20,15 @@ namespace extensions {
 
 void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
     const std::string& extension_id,
-    const std::string& view_id,
+    const std::string& stream_id,
     bool embedded,
     int frame_tree_node_id,
-    int render_process_id,
-    int render_frame_id,
     blink::mojom::TransferrableURLLoaderPtr transferrable_loader,
     const GURL& original_url) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  content::WebContents* web_contents = nullptr;
-  if (frame_tree_node_id != -1) {
-    web_contents =
-        content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
-  } else {
-    web_contents = content::WebContents::FromRenderFrameHost(
-        content::RenderFrameHost::FromID(render_process_id, render_frame_id));
-  }
+  content::WebContents* web_contents =
+      content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
   if (!web_contents)
     return;
 
@@ -66,8 +58,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
       tab_id, embedded, handler_url, extension_id,
       std::move(transferrable_loader), original_url);
   extensions::MimeHandlerStreamManager::Get(browser_context)
-      ->AddStream(view_id, std::move(stream_container), frame_tree_node_id,
-                  render_process_id, render_frame_id);
+      ->AddStream(stream_id, std::move(stream_container), frame_tree_node_id);
 }
 
 }  // namespace extensions
diff --git a/shell/browser/extensions/api/streams_private/streams_private_api.h b/shell/browser/extensions/api/streams_private/streams_private_api.h
index b5c6e573c4d8a..a580e97175fb2 100644
--- a/shell/browser/extensions/api/streams_private/streams_private_api.h
+++ b/shell/browser/extensions/api/streams_private/streams_private_api.h
@@ -15,24 +15,16 @@ namespace extensions {
 // rename and move it to make that clear. https://crbug.com/890401.
 class StreamsPrivateAPI {
  public:
-  // Send the onExecuteMimeTypeHandler event to |extension_id|. If the viewer is
-  // being opened in a BrowserPlugin, specify a non-empty |view_id| of the
-  // plugin. |embedded| should be set to whether the document is embedded
-  // within another document. The |frame_tree_node_id| parameter is used for the
-  // top level plugins case. (PDF, etc). If this parameter has a valid value
-  // then it overrides the |render_process_id| and |render_frame_id| parameters.
-  // The |render_process_id| is the id of the renderer process. The
-  // |render_frame_id| is the routing id of the RenderFrameHost.
-  //
-  // If the network service is not enabled, |stream| is used; otherwise,
-  // |transferrable_loader| and |original_url| are used instead.
+  // Send the onExecuteMimeTypeHandler event to |extension_id|. A non-empty
+  // |stream_id| will be used to identify the created stream during
+  // MimeHandlerViewGuest creation. |embedded| should be set to whether the
+  // document is embedded within another document. The |frame_tree_node_id|
+  // parameter is used for the top level plugins case. (PDF, etc).
   static void SendExecuteMimeTypeHandlerEvent(
       const std::string& extension_id,
-      const std::string& view_id,
+      const std::string& stream_id,
       bool embedded,
       int frame_tree_node_id,
-      int render_process_id,
-      int render_frame_id,
       blink::mojom::TransferrableURLLoaderPtr transferrable_loader,
       const GURL& original_url);
 };
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index e4c79c77f907b..9e714f31a6d9a 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -11,6 +11,7 @@
 
 #include "base/allocator/partition_alloc_features.h"
 #include "base/allocator/partition_allocator/partition_alloc.h"
+#include "base/bits.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/task/current_thread.h"
@@ -156,8 +157,6 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
                       gin::IsolateHolder::IsolateCreationMode::kNormal,
                       nullptr,
                       nullptr,
-                      nullptr,
-                      nullptr,
                       isolate_),
       locker_(isolate_) {
   isolate_->Enter();
@@ -343,10 +342,11 @@ v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
       tracing_controller, gin::V8Platform::PageAllocator());
 
   v8::V8::InitializePlatform(platform_);
-  gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
-                                 new ArrayBufferAllocator(),
-                                 nullptr /* external_reference_table */,
-                                 js_flags, false /* create_v8_platform */);
+  gin::IsolateHolder::Initialize(
+      gin::IsolateHolder::kNonStrictMode, new ArrayBufferAllocator(),
+      nullptr /* external_reference_table */, js_flags,
+      nullptr /* fatal_error_callback */, nullptr /* oom_error_callback */,
+      false /* create_v8_platform */);
 
   v8::Isolate* isolate = v8::Isolate::Allocate();
   platform_->RegisterIsolate(isolate, event_loop);
diff --git a/shell/common/gin_converters/content_converter.cc b/shell/common/gin_converters/content_converter.cc
index 600b525df71c7..362954d8e1171 100644
--- a/shell/common/gin_converters/content_converter.cc
+++ b/shell/common/gin_converters/content_converter.cc
@@ -154,8 +154,8 @@ v8::Local<v8::Value> Converter<content::PermissionType>::ToV8(
       return StringToV8(isolate, "clipboard-read");
     case content::PermissionType::CLIPBOARD_SANITIZED_WRITE:
       return StringToV8(isolate, "clipboard-sanitized-write");
-    case content::PermissionType::FONT_ACCESS:
-      return StringToV8(isolate, "font-access");
+    case content::PermissionType::LOCAL_FONTS:
+      return StringToV8(isolate, "local-fonts");
     case content::PermissionType::IDLE_DETECTION:
       return StringToV8(isolate, "idle-detection");
     case content::PermissionType::MIDI_SYSEX:

From f48a921d14bf47d09daba0bdf22919cc27a9218b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 06:02:58 -0700
Subject: [PATCH 309/811] Bump v20.0.0-nightly.20220425

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cebb017206ab..31ee7e25ca0c5 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220421
\ No newline at end of file
+20.0.0-nightly.20220425
\ No newline at end of file
diff --git a/package.json b/package.json
index 771724ee7b2d7..0569a345910b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220421",
+  "version": "20.0.0-nightly.20220425",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6778ac033fe5e..b5e7d3644c1b3 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220421
- PRODUCTVERSION 20,0,0,20220421
+ FILEVERSION 20,0,0,20220425
+ PRODUCTVERSION 20,0,0,20220425
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0a73f60423d30c4287a49bac7855b3480bfcdbe9 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 06:47:42 -0700
Subject: [PATCH 310/811] Revert "Bump v20.0.0-nightly.20220425"

This reverts commit f48a921d14bf47d09daba0bdf22919cc27a9218b.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 31ee7e25ca0c5..1cebb017206ab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220425
\ No newline at end of file
+20.0.0-nightly.20220421
\ No newline at end of file
diff --git a/package.json b/package.json
index 0569a345910b6..771724ee7b2d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220425",
+  "version": "20.0.0-nightly.20220421",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b5e7d3644c1b3..6778ac033fe5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220425
- PRODUCTVERSION 20,0,0,20220425
+ FILEVERSION 20,0,0,20220421
+ PRODUCTVERSION 20,0,0,20220421
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6a1748da0608428fe902a3fc04a27899cd9803ad Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 25 Apr 2022 11:14:16 -0400
Subject: [PATCH 311/811] ci: update release script to handle new CircleCI
 configs (#33914)

---
 script/release/ci-release-build.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 61b413f76a1cd..2e716bb67de2e 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -110,12 +110,12 @@ async function getCircleCIWorkflowId (pipelineId) {
     switch (pipelineInfo.state) {
       case 'created': {
         const workflows = await circleCIRequest(`${pipelineInfoUrl}/workflow`, 'GET');
-        // The logic below expects two workflow.items: publish [0] & setup [1]
-        if (workflows.items.length === 2) {
+        // The logic below expects three workflow.items: publish, lint, & setup
+        if (workflows.items.length === 3) {
           workflowId = workflows.items.find(item => item.name.includes('publish')).id;
           break;
         }
-        console.log('Unxpected number of workflows, response was:', pipelineInfo);
+        console.log('Unxpected number of workflows, response was:', workflows);
         workflowId = -1;
         break;
       }

From 028a72daaccc6f9085ffd54a51c07bbf427c76fa Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 25 Apr 2022 17:00:32 -0400
Subject: [PATCH 312/811] build: fix macos release GN gen (#33915)

---
 BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index fb64d22339ec1..6e77ca50491de 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1119,7 +1119,7 @@ if (is_mac) {
     }
 
     extract_symbols("egl_syms") {
-      binary = "$root_out_dir/ibEGL.dylib"
+      binary = "$root_out_dir/libEGL.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
       dsym_file = "$root_out_dir/libEGL.dylib.dSYM/Contents/Resources/DWARF/libEGL.dylib"
       deps = [ "//third_party/angle:libEGL" ]

From 40c022ad6939dfe0227969596cdd4bf51378fd64 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 14:01:18 -0700
Subject: [PATCH 313/811] Bump v20.0.0-nightly.20220425

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 1cebb017206ab..31ee7e25ca0c5 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220421
\ No newline at end of file
+20.0.0-nightly.20220425
\ No newline at end of file
diff --git a/package.json b/package.json
index 771724ee7b2d7..0569a345910b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220421",
+  "version": "20.0.0-nightly.20220425",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6778ac033fe5e..b5e7d3644c1b3 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220421
- PRODUCTVERSION 20,0,0,20220421
+ FILEVERSION 20,0,0,20220425
+ PRODUCTVERSION 20,0,0,20220425
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From bfabd671123f49256d9bca91c2bc49ab8e6a10b4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 26 Apr 2022 06:01:17 -0700
Subject: [PATCH 314/811] Bump v20.0.0-nightly.20220426

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 31ee7e25ca0c5..51a0063d6f6ff 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220425
\ No newline at end of file
+20.0.0-nightly.20220426
\ No newline at end of file
diff --git a/package.json b/package.json
index 0569a345910b6..31cfc887bd44c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220425",
+  "version": "20.0.0-nightly.20220426",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b5e7d3644c1b3..7b9d064e38e2d 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220425
- PRODUCTVERSION 20,0,0,20220425
+ FILEVERSION 20,0,0,20220426
+ PRODUCTVERSION 20,0,0,20220426
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6d5501d0bda8e8abfedc2560302ddb08bf8ab308 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 26 Apr 2022 15:21:59 -0700
Subject: [PATCH 315/811] build: use dev-cdn instead of sysroots s3 bucket
 (#33922)

---
 patches/chromium/sysroot.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/chromium/sysroot.patch b/patches/chromium/sysroot.patch
index 4dd9ad00ae567..715b58b173cd0 100644
--- a/patches/chromium/sysroot.patch
+++ b/patches/chromium/sysroot.patch
@@ -7,7 +7,7 @@ Make chrome's install-sysroot scripts point to our custom sysroot builds,
 which include extra deps that Electron needs (e.g. libnotify)
 
 diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
-index eaa1c2edfd6fba471312fdb4eb3917b50e38e018..1824d513f6296985b5a3758f7e052ed77dcf0e0f 100755
+index eaa1c2edfd6fba471312fdb4eb3917b50e38e018..74140d29ed56ce54e39940e7bffa3778db983f27 100755
 --- a/build/linux/sysroot_scripts/install-sysroot.py
 +++ b/build/linux/sysroot_scripts/install-sysroot.py
 @@ -41,9 +41,11 @@ except ImportError:
@@ -19,8 +19,8 @@ index eaa1c2edfd6fba471312fdb4eb3917b50e38e018..1824d513f6296985b5a3758f7e052ed7
  
 -URL_PREFIX = 'https://commondatastorage.googleapis.com'
 -URL_PATH = 'chrome-linux-sysroot/toolchain'
-+URL_PREFIX = 'https://s3.amazonaws.com'
-+URL_PATH = 'electronjs-sysroots/toolchain'
++URL_PREFIX = 'https://dev-cdn.electronjs.org'
++URL_PATH = 'linux-sysroots'
  
  VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el')
  

From 160d6923db04432ae583de228c5ca22436d838c1 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 26 Apr 2022 23:14:59 -0700
Subject: [PATCH 316/811] build: improve CI speeds and reduce CI costs (#33904)

* rely on src cache instead of workspace
* run some tasks in the background and "thread join" later
* merge some ninja build commands to reduce overhead
---
 .circleci/config/base.yml       | 218 ++++++++++++++++----------------
 BUILD.gn                        |   4 +
 script/node-disabled-tests.json |   1 +
 3 files changed, 114 insertions(+), 109 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 82c78df50c64e..45e1803b0e058 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -339,6 +339,19 @@ step-setup-goma-for-build: &step-setup-goma-for-build
       echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
       echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
       cd ..
+      touch "${TMPDIR:=/tmp}"/.goma-ready
+    background: true
+
+step-wait-for-goma: &step-wait-for-goma
+  run:
+    name: Wait for Goma
+    command: |
+      until [ -f "${TMPDIR:=/tmp}"/.goma-ready ]
+      do
+          sleep 5
+      done
+      echo "Goma ready"
+    no_output_timeout: 2m
 
 step-restore-brew-cache: &step-restore-brew-cache
   restore_cache:
@@ -574,14 +587,6 @@ step-electron-build: &step-electron-build
       cp out/Default/.ninja_log out/electron_ninja_log
       node electron/script/check-symlinks.js
 
-step-native-unittests-build: &step-native-unittests-build
-  run:
-    name: Build native test targets
-    no_output_timeout: 30m
-    command: |
-      cd src
-      ninja -C out/Default shell_browser_ui_unittests -j $NUMBER_OF_NINJA_PROCESSES
-
 step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
   run:
     name: Strip electron binaries
@@ -598,38 +603,6 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
         electron/script/add-debug-link.py --target-cpu="$target_cpu" --debug-dir=out/Default/debug
       fi
 
-step-electron-dist-build: &step-electron-dist-build
-  run:
-    name: Build dist.zip
-    command: |
-      cd src
-      if [ "$SKIP_DIST_ZIP" != "1" ]; then
-        ninja -C out/Default electron:electron_dist_zip
-        if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
-          if [ "`uname`" == "Darwin" ]; then
-            target_os=mac
-            target_cpu=x64
-            if [ x"$MAS_BUILD" == x"true" ]; then
-              target_os=mac_mas
-            fi
-            if [ "$TARGET_ARCH" == "arm64" ]; then
-              target_cpu=arm64
-            fi
-          elif [ "`uname`" == "Linux" ]; then
-            target_os=linux
-            if [ x"$TARGET_ARCH" == x ]; then
-              target_cpu=x64
-            else
-              target_cpu="$TARGET_ARCH"
-            fi
-          else
-            echo "Unknown system: `uname`"
-            exit 1
-          fi
-          electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.$target_cpu.manifest
-        fi
-      fi
-
 step-electron-chromedriver-build: &step-electron-chromedriver-build
   run:
     name: Build chromedriver.zip
@@ -682,7 +655,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/dist.zip
       - src/out/Default/mksnapshot.zip
       - src/out/Default/chromedriver.zip
-      - src/out/Default/shell_browser_ui_unittests
       - src/out/Default/gen/node_headers
       - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
@@ -794,6 +766,7 @@ step-show-goma-stats: &step-show-goma-stats
       $LOCAL_GOMA_DIR/diagnose_goma_log.py
       true
     when: always
+    background: true
 
 step-mksnapshot-build: &step-mksnapshot-build
   run:
@@ -822,13 +795,6 @@ step-mksnapshot-build: &step-mksnapshot-build
         (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
       fi
 
-step-nodejs-build-test-executable: &step-nodejs-build-test-executable
-  run:
-    name: Build Node.js Test Executables
-    command: |
-      cd src
-      ninja -C out/Default third_party/electron_node:overlapped-checker
-
 step-hunspell-build: &step-hunspell-build
   run:
     name: hunspell build
@@ -1044,12 +1010,16 @@ step-ts-compile: &step-ts-compile
 # List of all steps.
 steps-electron-gn-check: &steps-electron-gn-check
   steps:
-    - attach_workspace:
-        at: .
+    - *step-checkout-electron
+    - *step-depot-tools-get
     - *step-depot-tools-add-to-path
     - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - maybe-restore-portaled-src-cache
+    - *step-wait-for-goma
     - *step-gn-gen-default
     - *step-gn-check
 
@@ -1063,6 +1033,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     - *step-install-gnutar-on-mac
     - *step-install-python2-on-mac
     - *step-get-more-space-on-mac
+    - *step-setup-goma-for-build
     - *step-generate-deps-hash
     - *step-touch-sync-done
     - maybe-restore-portaled-src-cache
@@ -1082,7 +1053,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
 
     - *step-depot-tools-add-to-path
     - *step-setup-env-for-build
-    - *step-setup-goma-for-build
+    - *step-wait-for-goma
     - *step-get-more-space-on-mac
     - *step-install-npm-deps-on-mac
     - *step-fix-sync
@@ -1099,6 +1070,7 @@ steps-native-tests: &steps-native-tests
     - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
+    - *step-wait-for-goma
     - *step-gn-gen-default
 
     - run:
@@ -1284,7 +1256,6 @@ commands:
               fi
             }
             mv_if_exist src/out/Default/dist.zip
-            mv_if_exist src/out/Default/shell_browser_ui_unittests
             mv_if_exist src/out/Default/gen/node_headers.tar.gz
             mv_if_exist src/out/Default/symbols.zip
             mv_if_exist src/out/Default/mksnapshot.zip
@@ -1322,6 +1293,44 @@ commands:
       - *step-checkout-electron
       - *step-run-electron-only-hooks
       - *step-generate-deps-hash-cleanly
+
+  step-electron-dist-build:
+    parameters:
+      additional-targets:
+        type: string
+        default: ''
+    steps:
+      - run:
+          name: Build dist.zip
+          command: |
+            cd src
+            if [ "$SKIP_DIST_ZIP" != "1" ]; then
+              ninja -C out/Default electron:electron_dist_zip << parameters.additional-targets >>
+              if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
+                if [ "`uname`" == "Darwin" ]; then
+                  target_os=mac
+                  target_cpu=x64
+                  if [ x"$MAS_BUILD" == x"true" ]; then
+                    target_os=mac_mas
+                  fi
+                  if [ "$TARGET_ARCH" == "arm64" ]; then
+                    target_cpu=arm64
+                  fi
+                elif [ "`uname`" == "Linux" ]; then
+                  target_os=linux
+                  if [ x"$TARGET_ARCH" == x ]; then
+                    target_cpu=x64
+                  else
+                    target_cpu="$TARGET_ARCH"
+                  fi
+                else
+                  echo "Unknown system: `uname`"
+                  exit 1
+                fi
+                electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.$target_cpu.manifest
+              fi
+            fi
+
   electron-build:
     parameters:
       attach:
@@ -1368,6 +1377,10 @@ commands:
       - *step-install-gnutar-on-mac
       - *step-install-python2-on-mac
       - *step-save-brew-cache
+      - when:
+          condition: << parameters.build >>
+          steps:
+            - *step-setup-goma-for-build
       - when:
           condition: << parameters.checkout-and-assume-cache >>
           steps:
@@ -1462,7 +1475,7 @@ commands:
           steps:
             - *step-depot-tools-add-to-path
             - *step-setup-env-for-build
-            - *step-setup-goma-for-build
+            - *step-wait-for-goma
             - *step-get-more-space-on-mac
             - *step-fix-sync
             - *step-delete-git-directories
@@ -1475,16 +1488,8 @@ commands:
             - *step-gn-gen-default
             - *step-electron-build
             - *step-maybe-electron-dist-strip
-            - *step-electron-dist-build
-
-            # Native test targets
-            - *step-native-unittests-build
-
-            # Node.js headers
-            - *step-nodejs-headers-build
-
-            # Node.js test executable
-            - *step-nodejs-build-test-executable
+            - step-electron-dist-build:
+                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
 
             - *step-show-goma-stats
 
@@ -1502,13 +1507,14 @@ commands:
                   - *step-ffmpeg-gn-gen
                   - *step-ffmpeg-build
 
-            # hunspell
-            - *step-hunspell-build
-
       # Save all data needed for a further tests run.
       - when:
           condition: << parameters.persist >>
           steps:
+            - *step-minimize-workspace-size-from-checkout
+            - run: |
+                rm -rf src/third_party/electron_node/deps/openssl
+                rm -rf src/third_party/electron_node/deps/v8
             - *step-persist-data-for-tests
 
       - when:
@@ -1575,6 +1581,7 @@ commands:
       - *step-fix-sync
       - *step-setup-env-for-build
       - *step-setup-goma-for-build
+      - *step-wait-for-goma
       - *step-gn-gen-default
 
       # Electron app
@@ -1582,7 +1589,7 @@ commands:
       - *step-show-goma-stats
       - *step-maybe-generate-breakpad-symbols
       - *step-maybe-electron-dist-strip
-      - *step-electron-dist-build
+      - step-electron-dist-build
       - *step-maybe-zip-symbols
 
       # mksnapshot
@@ -1623,20 +1630,10 @@ jobs:
     <<: *steps-electron-ts-compile-for-doc-change
 
   # Layer 1: Checkout.
-  linux-checkout-for-workspace:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
-
   linux-make-src-cache:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1687,22 +1684,10 @@ jobs:
           persist-checkout: true
           restore-src-cache: false
 
-  mac-checkout-for-workspace:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-macos-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
-
   mac-make-src-cache:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1727,7 +1712,8 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: true
+          checkout: false
+          checkout-and-assume-cache: true
           use-out-cache: false
 
   linux-x64-testing-asan:
@@ -1767,6 +1753,7 @@ jobs:
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
   linux-x64-release:
@@ -1815,7 +1802,8 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: true
+          checkout: false
+          checkout-and-assume-cache: true
           use-out-cache: false
 
   linux-arm-release:
@@ -1867,7 +1855,8 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: true
+          checkout: false
+          checkout-and-assume-cache: true
           use-out-cache: false
 
   linux-arm64-testing-gn-check:
@@ -1878,6 +1867,7 @@ jobs:
       <<: *env-linux-medium
       <<: *env-arm64
       <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
   linux-arm64-release:
@@ -1939,6 +1929,7 @@ jobs:
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
   osx-publish-x64-skip-checkout:
@@ -2029,6 +2020,7 @@ jobs:
       <<: *env-machine-mac
       <<: *env-mas
       <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
   mas-publish-x64-skip-checkout:
@@ -2301,14 +2293,19 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-linux >>]
     jobs:
-      - linux-checkout-for-workspace
       - linux-make-src-cache
-      - linux-x64-testing
-      - linux-x64-testing-asan
-      - linux-x64-testing-no-run-as-node
+      - linux-x64-testing:
+          requires:
+            - linux-make-src-cache
+      - linux-x64-testing-asan:
+          requires:
+            - linux-make-src-cache
+      - linux-x64-testing-no-run-as-node:
+          requires:
+            - linux-make-src-cache
       - linux-x64-testing-gn-check:
           requires:
-            - linux-checkout-for-workspace
+            - linux-make-src-cache
       - linux-x64-testing-tests:
           requires:
             - linux-x64-testing
@@ -2321,7 +2318,9 @@ workflows:
       - linux-x64-testing-node:
           requires:
             - linux-x64-testing
-      - linux-arm-testing
+      - linux-arm-testing:
+          requires:
+            - linux-make-src-cache
       - linux-arm-testing-tests:
           filters:
             branches:
@@ -2329,7 +2328,9 @@ workflows:
               ignore: /pull\/[0-9]+/        
           requires:
             - linux-arm-testing      
-      - linux-arm64-testing
+      - linux-arm64-testing:
+          requires:
+            - linux-make-src-cache
       - linux-arm64-testing-tests:
           filters:
             branches:
@@ -2339,7 +2340,7 @@ workflows:
             - linux-arm64-testing
       - linux-arm64-testing-gn-check:
           requires:
-            - linux-checkout-for-workspace
+            - linux-make-src-cache
 
   build-mac:
     when:
@@ -2348,14 +2349,13 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
-      - mac-checkout-for-workspace
       - mac-make-src-cache
       - osx-testing-x64:
           requires:
             - mac-make-src-cache
       - osx-testing-x64-gn-check:
           requires:
-            - mac-checkout-for-workspace
+            - mac-make-src-cache
       - osx-testing-x64-tests:
           requires:
             - osx-testing-x64
@@ -2374,7 +2374,7 @@ workflows:
             - mac-make-src-cache
       - mas-testing-x64-gn-check:
           requires:
-            - mac-checkout-for-workspace
+            - mac-make-src-cache
       - mas-testing-x64-tests:
           requires:
             - mas-testing-x64
diff --git a/BUILD.gn b/BUILD.gn
index 6e77ca50491de..60ab4cac8106c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1281,6 +1281,10 @@ if (is_mac) {
       if (!is_component_build && is_component_ffmpeg) {
         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
       }
+
+      if (is_linux) {
+        deps += [ "//sandbox/linux:chrome_sandbox" ]
+      }
     }
   }
 
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index bfaf96bf9415d..579502c128b9d 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -26,6 +26,7 @@
   "parallel/test-http2-clean-output",
   "parallel/test-https-agent-session-reuse",
   "parallel/test-https-options-boolean-check",
+  "parallel/test-icu-minimum-version",
   "parallel/test-inspector-multisession-ws",
   "parallel/test-inspector-port-zero-cluster",
   "parallel/test-inspector-tracing-domain",

From a00544c7452a2f742a39d88c64898305e7f26290 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Apr 2022 06:00:58 -0700
Subject: [PATCH 317/811] Bump v20.0.0-nightly.20220427

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 51a0063d6f6ff..34ebd7aa06ead 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220426
\ No newline at end of file
+20.0.0-nightly.20220427
\ No newline at end of file
diff --git a/package.json b/package.json
index 31cfc887bd44c..c7a7de0ab3bdf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220426",
+  "version": "20.0.0-nightly.20220427",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 7b9d064e38e2d..21cb688d5998c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220426
- PRODUCTVERSION 20,0,0,20220426
+ FILEVERSION 20,0,0,20220427
+ PRODUCTVERSION 20,0,0,20220427
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d2c3e7811728164de7a3f98ae7414bed79d957ff Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Wed, 27 Apr 2022 10:37:26 -0700
Subject: [PATCH 318/811] build: actually verify az urls too (#33929)

---
 script/release/release.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/release.js b/script/release/release.js
index 83200e153e7f4..14464d5b76a63 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -81,7 +81,7 @@ async function validateReleaseAssets (release, validatingRelease) {
     const s3RemoteFiles = s3RemoteFilesForVersion(release.tag_name);
     await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
     const azRemoteFiles = azRemoteFilesForVersion(release.tag_name);
-    await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
+    await verifyShasumsForRemoteFiles(azRemoteFiles, true);
   }
 }
 

From f91b24deb5d573563b0fd904ea24cbf078d7660e Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Wed, 27 Apr 2022 12:54:52 -0700
Subject: [PATCH 319/811] build: ensure sync-done file exists during git cache
 save (#33949)

---
 .circleci/config/base.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 45e1803b0e058..09aedd08a9e19 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -1413,6 +1413,7 @@ commands:
             - *step-checkout-electron
             - *step-run-electron-only-hooks
             - *step-generate-deps-hash-cleanly
+            - *step-touch-sync-done
             - when:
                 condition: << parameters.save-git-cache >>
                 steps:

From 15c931201ab880de84009baa59b9bc5923e1ef67 Mon Sep 17 00:00:00 2001
From: Baoshuo Ren <i@baoshuo.ren>
Date: Thu, 28 Apr 2022 03:56:01 +0800
Subject: [PATCH 320/811] chore: remove git.io (#33933)

* chore: remove git.io

All links on git.io will stop redirecting after April 29, 2022.

- https://github.blog/changelog/2022-04-25-git-io-deprecation/

* fix: lint

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

Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 shell/browser/native_window_mac.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 7ed794206322e..7093717e07681 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -364,7 +364,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     // Don't show title bar.
     [window_ setTitlebarAppearsTransparent:YES];
     [window_ setTitleVisibility:NSWindowTitleHidden];
-    // Remove non-transparent corners, see http://git.io/vfonD.
+    // Remove non-transparent corners, see
+    // https://github.com/electron/electron/issues/517.
     [window_ setOpaque:NO];
     // Show window buttons if titleBarStyle is not "normal".
     if (title_bar_style_ == TitleBarStyle::kNormal) {

From b5297ea8e2380b9174c26d5a35b1a73c2c9566d0 Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Thu, 28 Apr 2022 15:45:23 +0530
Subject: [PATCH 321/811] docs: fix return type of setJumpList() in
 electron.d.ts (#33910)

Before:
```ts
setJumpList(categories: (JumpListCategory[]) | (null)): void;
```

After:
```ts
setJumpList(categories: (JumpListCategory[]) | (null)): ('ok' | 'error' | 'invalidSeparatorError' | 'fileTypeRegistrationError' | 'customCategoryAccessDeniedError');
```

Fixes: https://github.com/electron/electron/issues/33909
Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 docs/api/app.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api/app.md b/docs/api/app.md
index 5970bf58e57cf..2aec42c48ae93 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -864,6 +864,8 @@ Returns `Object`:
 
 * `categories` [JumpListCategory[]](structures/jump-list-category.md) | `null` - Array of `JumpListCategory` objects.
 
+Returns `string`
+
 Sets or removes a custom Jump List for the application, and returns one of the
 following strings:
 

From b3530d5df8bc5341fe172ec4b3cf945b9f174fc7 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 28 Apr 2022 03:17:05 -0700
Subject: [PATCH 322/811] build: use smaller resource_class because goma
 (#33905)

---
 .circleci/config/base.yml | 190 +++++++++++---------------------------
 1 file changed, 53 insertions(+), 137 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 09aedd08a9e19..d420933d73598 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -41,9 +41,8 @@ executors:
     parameters:
       size:
         description: "Docker executor size"
-        default: 2xlarge+
         type: enum
-        enum: ["medium", "xlarge", "2xlarge+"]
+        enum: ["medium", "xlarge", "2xlarge"]
     docker:
       - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
     resource_class: << parameters.size >>
@@ -52,12 +51,11 @@ executors:
     parameters:
       size:
         description: "macOS executor size"
-        default: macos.x86.medium.gen2
         type: enum
         enum: ["macos.x86.medium.gen2", "large"]
       xcode:
         description: "xcode version"
-        default: "12.4.0"
+        default: 13.3.0
         type: enum
         enum: ["12.4.0", "13.3.0"]
 
@@ -1623,7 +1621,9 @@ commands:
 jobs:
   # Layer 0: Docs. Standalone.
   ts-compile-doc-change:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: medium
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1646,32 +1646,10 @@ jobs:
           save-git-cache: true
           checkout-to-create-src-cache: true
 
-  linux-checkout-for-native-tests:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
-
-  linux-checkout-for-native-tests-with-no-patches:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      GCLIENT_EXTRA_ARGS: '--custom-var=apply_patches=False --custom-var=checkout_pyyaml=True'
-    steps:
-      - electron-build:
-          persist: false
-          build: false
-          checkout: true
-          persist-checkout: true
-
   mac-checkout:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1704,7 +1682,9 @@ jobs:
 
   # Layer 2: Builds.
   linux-x64-testing:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1718,7 +1698,9 @@ jobs:
           use-out-cache: false
 
   linux-x64-testing-asan:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1734,7 +1716,9 @@ jobs:
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       <<: *env-testing-build
@@ -1757,21 +1741,10 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
-  linux-x64-release:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: true
-
   linux-x64-publish:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1791,7 +1764,9 @@ jobs:
 
 
   linux-arm-testing:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1807,22 +1782,10 @@ jobs:
           checkout-and-assume-cache: true
           use-out-cache: false
 
-  linux-arm-release:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-arm
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
-
   linux-arm-publish:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -1844,7 +1807,9 @@ jobs:
                 checkout: true
 
   linux-arm64-testing:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -1871,22 +1836,10 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-electron-gn-check
 
-  linux-arm64-release:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge-release
-      <<: *env-arm64
-      <<: *env-release-build
-      <<: *env-send-slack-notifications
-      <<: *env-ninja-status
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
-
   linux-arm64-publish:
-    executor: linux-docker
+    executor:
+      name: linux-docker
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -1909,7 +1862,7 @@ jobs:
   osx-testing-x64:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1926,7 +1879,7 @@ jobs:
   osx-testing-x64-gn-check:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-machine-mac
       <<: *env-testing-build
@@ -1936,7 +1889,7 @@ jobs:
   osx-publish-x64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1957,7 +1910,7 @@ jobs:
   osx-publish-arm64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1979,7 +1932,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1998,7 +1951,7 @@ jobs:
   mas-testing-x64:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-mas
@@ -2016,7 +1969,7 @@ jobs:
   mas-testing-x64-gn-check:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-machine-mac
       <<: *env-mas
@@ -2027,7 +1980,7 @@ jobs:
   mas-publish-x64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-mas
@@ -2048,7 +2001,7 @@ jobs:
   mas-publish-arm64-skip-checkout:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2070,7 +2023,7 @@ jobs:
   mas-testing-arm64:
     executor:
       name: macos
-      xcode: "13.3.0"
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2087,41 +2040,6 @@ jobs:
           attach: true
 
   # Layer 3: Tests.
-  linux-x64-unittests:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-unittests
-      <<: *env-headless-testing
-    <<: *steps-native-tests
-
-  linux-x64-disabled-unittests:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-unittests
-      <<: *env-headless-testing
-      TESTS_ARGS: '--only-disabled-tests'
-    <<: *steps-native-tests
-
-  linux-x64-chromium-unittests:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-unittests
-      <<: *env-headless-testing
-      TESTS_ARGS: '--include-disabled-tests'
-    <<: *steps-native-tests
-
-  linux-x64-browsertests:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-browsertests
-      <<: *env-testing-build
-      <<: *env-headless-testing
-    <<: *steps-native-tests
-
   linux-x64-testing-tests:
     executor:
       name: linux-docker
@@ -2157,22 +2075,14 @@ jobs:
     <<: *steps-test-nan
 
   linux-x64-testing-node:
-    executor: linux-docker
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-test-node
-
-  linux-x64-release-tests:
     executor:
       name: linux-docker
-      size: medium
+      size: xlarge
     environment:
       <<: *env-linux-medium
       <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-tests
+      <<: *env-stack-dumping
+    <<: *steps-test-node
 
   linux-x64-verify-ffmpeg:
     executor:
@@ -2203,7 +2113,10 @@ jobs:
     <<: *steps-tests
 
   osx-testing-x64-tests:
-    executor: macos      
+    executor:
+      name: macos
+      xcode: 12.4.0
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping
@@ -2219,7 +2132,10 @@ jobs:
     <<: *steps-tests
 
   mas-testing-x64-tests:
-    executor: macos
+    executor:
+      name: macos
+      xcode: 12.4.0
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-stack-dumping

From 097da1d4ba79a78215eb324a23c0ac0cfcae29d5 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Apr 2022 06:01:07 -0700
Subject: [PATCH 323/811] Bump v20.0.0-nightly.20220428

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 34ebd7aa06ead..05b50a0190220 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220427
\ No newline at end of file
+20.0.0-nightly.20220428
\ No newline at end of file
diff --git a/package.json b/package.json
index c7a7de0ab3bdf..292a2b4c1b398 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220427",
+  "version": "20.0.0-nightly.20220428",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 21cb688d5998c..6f9d788a56e44 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220427
- PRODUCTVERSION 20,0,0,20220427
+ FILEVERSION 20,0,0,20220428
+ PRODUCTVERSION 20,0,0,20220428
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 192a7fad0d548d1883c58bdf95ab7a2ff1391881 Mon Sep 17 00:00:00 2001
From: Jacek Oleksy <35292764+pr0t4zy@users.noreply.github.com>
Date: Thu, 28 Apr 2022 16:28:27 +0200
Subject: [PATCH 324/811] fix: disable MallocNanoZone on mac (#33704)

---
 shell/browser/resources/mac/Info.plist  | 5 +++++
 shell/common/resources/mac/Info.plist   | 5 +++++
 shell/renderer/resources/mac/Info.plist | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/shell/browser/resources/mac/Info.plist b/shell/browser/resources/mac/Info.plist
index 29a0823c1504b..39ca2170dee22 100644
--- a/shell/browser/resources/mac/Info.plist
+++ b/shell/browser/resources/mac/Info.plist
@@ -41,6 +41,11 @@
     <false/>
     <key>NSQuitAlwaysKeepsWindows</key>
     <false/>
+    <key>LSEnvironment</key>
+    <dict>
+      <key>MallocNanoZone</key>
+      <string>0</string>
+    </dict>
     <key>NSMicrophoneUsageDescription</key>
     <string>This app needs access to the microphone</string>
     <key>NSCameraUsageDescription</key>
diff --git a/shell/common/resources/mac/Info.plist b/shell/common/resources/mac/Info.plist
index 1d585534067bf..3aa1e88b39efa 100644
--- a/shell/common/resources/mac/Info.plist
+++ b/shell/common/resources/mac/Info.plist
@@ -14,5 +14,10 @@
 	<true/>
 	<key>CFBundleVersion</key>
 	<string>${ELECTRON_VERSION}</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>MallocNanoZone</key>
+		<string>0</string>
+	</dict>
 </dict>
 </plist>
diff --git a/shell/renderer/resources/mac/Info.plist b/shell/renderer/resources/mac/Info.plist
index 2d39d2a9845a9..219fa59997db4 100644
--- a/shell/renderer/resources/mac/Info.plist
+++ b/shell/renderer/resources/mac/Info.plist
@@ -12,5 +12,10 @@
   <true/>
   <key>NSSupportsAutomaticGraphicsSwitching</key>
   <true/>
+  <key>LSEnvironment</key>
+  <dict>
+    <key>MallocNanoZone</key>
+    <string>0</string>
+  </dict>
 </dict>
 </plist>

From fb534c927ae3ca696f0de3a10f90d447dd4fd52c Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 29 Apr 2022 02:34:12 +0200
Subject: [PATCH 325/811] refactor: better solution for resizable frameless
 DCHECK (#33790)

* refactor: better solution for resizable frameless DCHECK

* fix: also implement TargetForRectin WinFrameView
---
 shell/browser/ui/views/frameless_view.cc | 10 +++++++++
 shell/browser/ui/views/frameless_view.h  |  5 ++++-
 shell/browser/ui/views/win_frame_view.cc | 27 +++++++++++++++++-------
 shell/browser/ui/views/win_frame_view.h  |  3 +++
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/shell/browser/ui/views/frameless_view.cc b/shell/browser/ui/views/frameless_view.cc
index d2d0b2fdc5e85..e171a7e5049bf 100644
--- a/shell/browser/ui/views/frameless_view.cc
+++ b/shell/browser/ui/views/frameless_view.cc
@@ -112,6 +112,16 @@ void FramelessView::UpdateWindowTitle() {}
 
 void FramelessView::SizeConstraintsChanged() {}
 
+views::View* FramelessView::TargetForRect(views::View* root,
+                                          const gfx::Rect& rect) {
+  CHECK_EQ(root, this);
+
+  if (NonClientHitTest(rect.origin()) != HTCLIENT)
+    return this;
+
+  return NonClientFrameView::TargetForRect(root, rect);
+}
+
 gfx::Size FramelessView::CalculatePreferredSize() const {
   return frame_->non_client_view()
       ->GetWindowBoundsForClientBounds(
diff --git a/shell/browser/ui/views/frameless_view.h b/shell/browser/ui/views/frameless_view.h
index 80868f90c89c0..f88f543757e1e 100644
--- a/shell/browser/ui/views/frameless_view.h
+++ b/shell/browser/ui/views/frameless_view.h
@@ -47,7 +47,10 @@ class FramelessView : public views::NonClientFrameView {
   void UpdateWindowTitle() override;
   void SizeConstraintsChanged() override;
 
-  // Overridden from View:
+  // views::ViewTargeterDelegate:
+  views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
+
+  // views::View:
   gfx::Size CalculatePreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index b5d56fa751481..8a25bcdd73e8e 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -34,14 +34,6 @@ void WinFrameView::Init(NativeWindowViews* window, views::Widget* frame) {
   window_ = window;
   frame_ = frame;
 
-  // Prevent events from trickling down the views hierarchy here, since
-  // when a given resizable window is frameless we only want to use
-  // FramelessView's ResizingBorderHitTest in
-  // ShouldDescendIntoChildForEventHandling. See
-  // https://chromium-review.googlesource.com/c/chromium/src/+/3251980.
-  if (!window_->has_frame() && window_->IsResizable())
-    frame_->client_view()->SetCanProcessEventsWithinSubtree(false);
-
   if (window->IsWindowControlsOverlayEnabled()) {
     caption_button_container_ =
         AddChildView(std::make_unique<WinCaptionButtonContainer>(this));
@@ -83,6 +75,25 @@ int WinFrameView::FrameBorderThickness() const {
              : display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
 }
 
+views::View* WinFrameView::TargetForRect(views::View* root,
+                                         const gfx::Rect& rect) {
+  if (NonClientHitTest(rect.origin()) != HTCLIENT) {
+    // Custom system titlebar returns non HTCLIENT value, however event should
+    // be handled by the view, not by the system, because there are no system
+    // buttons underneath.
+    if (!ShouldCustomDrawSystemTitlebar()) {
+      return this;
+    }
+    auto local_point = rect.origin();
+    ConvertPointToTarget(parent(), caption_button_container_, &local_point);
+    if (!caption_button_container_->HitTestPoint(local_point)) {
+      return this;
+    }
+  }
+
+  return NonClientFrameView::TargetForRect(root, rect);
+}
+
 int WinFrameView::NonClientHitTest(const gfx::Point& point) {
   if (window_->has_frame())
     return frame_->client_view()->NonClientHitTest(point);
diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h
index 76b8e64bd184e..460474e03bb66 100644
--- a/shell/browser/ui/views/win_frame_view.h
+++ b/shell/browser/ui/views/win_frame_view.h
@@ -61,6 +61,9 @@ class WinFrameView : public FramelessView {
 
   int FrameBorderThickness() const;
 
+  // views::ViewTargeterDelegate:
+  views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
+
   // Returns the thickness of the window border for the top edge of the frame,
   // which is sometimes different than FrameBorderThickness(). Does not include
   // the titlebar/tabstrip area. If |restored| is true, this is calculated as if

From 015185ad5aa54721e434ba0cd9296ffa8642c680 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 28 Apr 2022 22:17:19 -0700
Subject: [PATCH 326/811] fix: fix FirstPartySetsHandler initialization
 (#33971)

---
 shell/browser/net/system_network_context_manager.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index d1f474d59ead7..552df5c6b2a18 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -20,6 +20,7 @@
 #include "components/os_crypt/os_crypt.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/first_party_sets_handler.h"
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/network_service_util.h"
@@ -288,6 +289,11 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
       base::FeatureList::IsEnabled(features::kAsyncDns),
       default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
 
+  // Initializes first party sets component
+  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
+  content::FirstPartySetsHandler::GetInstance()->SetPublicFirstPartySets(
+      base::File());
+
   std::string app_name = electron::Browser::Get()->GetName();
 #if BUILDFLAG(IS_MAC)
   KeychainPassword::GetServiceName() = app_name + " Safe Storage";

From ce562b68890043ae3404be27b088b20a91420c0e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 29 Apr 2022 06:01:34 -0700
Subject: [PATCH 327/811] Bump v20.0.0-nightly.20220429

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 05b50a0190220..40b6e6ed257e3 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220428
\ No newline at end of file
+20.0.0-nightly.20220429
\ No newline at end of file
diff --git a/package.json b/package.json
index 292a2b4c1b398..ad229b28c5629 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220428",
+  "version": "20.0.0-nightly.20220429",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6f9d788a56e44..cc32846033b8e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220428
- PRODUCTVERSION 20,0,0,20220428
+ FILEVERSION 20,0,0,20220429
+ PRODUCTVERSION 20,0,0,20220429
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b55f9d868a0dd7f7096fc2316e5cbdfbcb7f3c27 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Sat, 30 Apr 2022 13:29:05 +0200
Subject: [PATCH 328/811] spec: allow connections to port 2049 (#33983)

---
 spec/static/main.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/static/main.js b/spec/static/main.js
index d52fa1953a8c4..075d699ede5cc 100644
--- a/spec/static/main.js
+++ b/spec/static/main.js
@@ -28,6 +28,13 @@ v8.setFlagsFromString('--expose_gc');
 app.commandLine.appendSwitch('js-flags', '--expose_gc');
 app.commandLine.appendSwitch('ignore-certificate-errors');
 app.commandLine.appendSwitch('disable-renderer-backgrounding');
+// Some ports are considered to be "unsafe" by Chromium
+// but Windows on Microsoft-hosted agents sometimes assigns one of them
+// to a Node.js server. Chromium refuses to establish a connection
+// and the whole app crashes with the "Error: net::ERR_UNSAFE_PORT" error.
+// Let's allow connections to those ports to avoid test failures.
+// Use a comma-separated list of ports as a flag value, e.g. "666,667,668".
+app.commandLine.appendSwitch('explicitly-allowed-ports', '2049');
 
 // Disable security warnings (the security warnings test will enable them)
 process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;

From 682d2e3f78b51f1a2b0e293250bcdfa360a0e7d6 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 2 May 2022 07:49:13 +0200
Subject: [PATCH 329/811] build: allow script/spec-runner.js with empty list of
 runners (#33982)

---
 script/spec-runner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/spec-runner.js b/script/spec-runner.js
index 31162d32a76e1..11502c2da0c23 100755
--- a/script/spec-runner.js
+++ b/script/spec-runner.js
@@ -41,8 +41,8 @@ const runners = new Map([
 const specHashPath = path.resolve(__dirname, '../spec/.hash');
 
 let runnersToRun = null;
-if (args.runners) {
-  runnersToRun = args.runners.split(',');
+if (args.runners !== undefined) {
+  runnersToRun = args.runners.split(',').filter(value => value);
   if (!runnersToRun.every(r => [...runners.keys()].includes(r))) {
     console.log(`${fail} ${runnersToRun} must be a subset of [${[...runners.keys()].join(' | ')}]`);
     process.exit(1);

From 6f851afab53e17df4b9c76cbcf82ef2a51f4d040 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 2 May 2022 06:01:26 -0700
Subject: [PATCH 330/811] Bump v20.0.0-nightly.20220502

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 40b6e6ed257e3..7a838bf298a9d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220429
\ No newline at end of file
+20.0.0-nightly.20220502
\ No newline at end of file
diff --git a/package.json b/package.json
index ad229b28c5629..52e8ff7a1853e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220429",
+  "version": "20.0.0-nightly.20220502",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index cc32846033b8e..eb462713a0338 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220429
- PRODUCTVERSION 20,0,0,20220429
+ FILEVERSION 20,0,0,20220502
+ PRODUCTVERSION 20,0,0,20220502
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 14f07d7814e3ffd64d18213129ff4a4cfa50e1e1 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 2 May 2022 08:20:30 -0700
Subject: [PATCH 331/811] fix: move FirstPartySets into the browser process
 (#33998)

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3448551
---
 shell/browser/electron_browser_main_parts.cc        | 6 ++++++
 shell/browser/net/system_network_context_manager.cc | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index a03835dd81e0e..defb91ab6e1da 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -25,6 +25,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/device_service.h"
+#include "content/public/browser/first_party_sets_handler.h"
 #include "content/public/browser/web_ui_controller_factory.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
@@ -416,6 +417,11 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
   // url::Add*Scheme are not threadsafe, this helps prevent data races.
   url::LockSchemeRegistries();
 
+  // The First-Party Sets feature always expects to be initialized
+  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3448551
+  content::FirstPartySetsHandler::GetInstance()->SetPublicFirstPartySets(
+      base::File());
+
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   extensions_client_ = std::make_unique<ElectronExtensionsClient>();
   extensions::ExtensionsClient::Set(extensions_client_.get());
diff --git a/shell/browser/net/system_network_context_manager.cc b/shell/browser/net/system_network_context_manager.cc
index 552df5c6b2a18..d1f474d59ead7 100644
--- a/shell/browser/net/system_network_context_manager.cc
+++ b/shell/browser/net/system_network_context_manager.cc
@@ -20,7 +20,6 @@
 #include "components/os_crypt/os_crypt.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/first_party_sets_handler.h"
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/network_service_util.h"
@@ -289,11 +288,6 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
       base::FeatureList::IsEnabled(features::kAsyncDns),
       default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
 
-  // Initializes first party sets component
-  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
-  content::FirstPartySetsHandler::GetInstance()->SetPublicFirstPartySets(
-      base::File());
-
   std::string app_name = electron::Browser::Get()->GetName();
 #if BUILDFLAG(IS_MAC)
   KeychainPassword::GetServiceName() = app_name + " Safe Storage";

From 9901d2f28173d9df4286bf4aa0f8c0726b184ec0 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Mon, 2 May 2022 08:54:17 -0700
Subject: [PATCH 332/811] fix: support mixed-case extensions in Linux file
 dialogs (#33918)

---
 shell/browser/ui/file_dialog_gtk.cc | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/shell/browser/ui/file_dialog_gtk.cc b/shell/browser/ui/file_dialog_gtk.cc
index 7e5c7698cadfa..74df37b57d5f1 100644
--- a/shell/browser/ui/file_dialog_gtk.cc
+++ b/shell/browser/ui/file_dialog_gtk.cc
@@ -31,6 +31,25 @@ namespace {
 static const int kPreviewWidth = 256;
 static const int kPreviewHeight = 512;
 
+std::string MakeCaseInsensitivePattern(const std::string& extension) {
+  std::string pattern("*.");
+
+  for (std::size_t i = 0, n = extension.size(); i < n; i++) {
+    char ch = extension[i];
+    if (!base::IsAsciiAlpha(ch)) {
+      pattern.push_back(ch);
+      continue;
+    }
+
+    pattern.push_back('[');
+    pattern.push_back(base::ToLowerASCII(ch));
+    pattern.push_back(base::ToUpperASCII(ch));
+    pattern.push_back(']');
+  }
+
+  return pattern;
+}
+
 class FileChooserDialog {
  public:
   FileChooserDialog(GtkFileChooserAction action, const DialogSettings& settings)
@@ -252,12 +271,8 @@ void FileChooserDialog::AddFilters(const Filters& filters) {
     GtkFileFilter* gtk_filter = gtk_file_filter_new();
 
     for (const auto& extension : filter.second) {
-      // guarantee a pure lowercase variant
-      std::string file_extension = base::ToLowerASCII("*." + extension);
-      gtk_file_filter_add_pattern(gtk_filter, file_extension.c_str());
-      // guarantee a pure uppercase variant
-      file_extension = base::ToUpperASCII("*." + extension);
-      gtk_file_filter_add_pattern(gtk_filter, file_extension.c_str());
+      std::string pattern = MakeCaseInsensitivePattern(extension);
+      gtk_file_filter_add_pattern(gtk_filter, pattern.c_str());
     }
 
     gtk_file_filter_set_name(gtk_filter, filter.first.c_str());

From e1ed96b574a016c58b274ce0026432c05f5ad2aa Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 2 May 2022 10:09:23 -0700
Subject: [PATCH 333/811] test: scope internal test fixtures under
 `@electron-ci` (#33822)

* test: scope internal test fixtures under `@electron`

* Missed references

* Move packages from @electron to @electron-ci scope

* Fix tests
---
 .../api/native-window-open-native-addon.html         |  2 +-
 spec-main/fixtures/module/echo-renamed.js            |  2 +-
 spec-main/fixtures/module/echo.js                    |  2 +-
 spec-main/fixtures/module/uv-dlopen.js               |  2 +-
 spec-main/fixtures/native-addon/echo/package.json    |  3 +--
 .../fixtures/native-addon/uv-dlopen/package.json     |  2 +-
 spec-main/modules-spec.ts                            |  8 ++++++--
 spec-main/package.json                               |  4 ++--
 spec-main/yarn.lock                                  | 12 ++++++------
 9 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/spec-main/fixtures/api/native-window-open-native-addon.html b/spec-main/fixtures/api/native-window-open-native-addon.html
index 27c24a60b7550..c1cd5cea755a1 100644
--- a/spec-main/fixtures/api/native-window-open-native-addon.html
+++ b/spec-main/fixtures/api/native-window-open-native-addon.html
@@ -7,7 +7,7 @@
   let requireError
 
   try {
-    echo = require('echo')
+    echo = require('@electron-ci/echo')
   } catch (error) {
     requireError = error
   }
diff --git a/spec-main/fixtures/module/echo-renamed.js b/spec-main/fixtures/module/echo-renamed.js
index 7b4b195f88f94..6dfa05f914a3c 100644
--- a/spec-main/fixtures/module/echo-renamed.js
+++ b/spec-main/fixtures/module/echo-renamed.js
@@ -1,6 +1,6 @@
 let echo;
 try {
-  echo = require('echo');
+  echo = require('@electron-ci/echo');
 } catch (e) {
   process.exit(1);
 }
diff --git a/spec-main/fixtures/module/echo.js b/spec-main/fixtures/module/echo.js
index 915d0e3393893..ae1b31dd9bed9 100644
--- a/spec-main/fixtures/module/echo.js
+++ b/spec-main/fixtures/module/echo.js
@@ -2,5 +2,5 @@ process.on('uncaughtException', function (err) {
   process.send(err.message);
 });
 
-const echo = require('echo');
+const echo = require('@electron-ci/echo');
 process.send(echo('ok'));
diff --git a/spec-main/fixtures/module/uv-dlopen.js b/spec-main/fixtures/module/uv-dlopen.js
index c2f0cb94b7872..2f1e3413f3255 100644
--- a/spec-main/fixtures/module/uv-dlopen.js
+++ b/spec-main/fixtures/module/uv-dlopen.js
@@ -1 +1 @@
-require('uv-dlopen');
+require('@electron-ci/uv-dlopen');
diff --git a/spec-main/fixtures/native-addon/echo/package.json b/spec-main/fixtures/native-addon/echo/package.json
index 650586e326125..74956d42a0e27 100644
--- a/spec-main/fixtures/native-addon/echo/package.json
+++ b/spec-main/fixtures/native-addon/echo/package.json
@@ -1,6 +1,5 @@
-
 {
   "main": "./lib/echo.js",
-  "name": "echo",
+  "name": "@electron-ci/echo",
   "version": "0.0.1"
 }
diff --git a/spec-main/fixtures/native-addon/uv-dlopen/package.json b/spec-main/fixtures/native-addon/uv-dlopen/package.json
index 32d7aeb11c7cc..f6844acfeb0f4 100644
--- a/spec-main/fixtures/native-addon/uv-dlopen/package.json
+++ b/spec-main/fixtures/native-addon/uv-dlopen/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "uv-dlopen",
+  "name": "@electron-ci/uv-dlopen",
   "version": "0.0.1",
   "main": "index.js"
 }
diff --git a/spec-main/modules-spec.ts b/spec-main/modules-spec.ts
index 8554bc525dab2..a83797961fcf7 100644
--- a/spec-main/modules-spec.ts
+++ b/spec-main/modules-spec.ts
@@ -21,7 +21,11 @@ describe('modules support', () => {
       it('can be required in renderer', async () => {
         const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
         w.loadURL('about:blank');
-        await expect(w.webContents.executeJavaScript('{ require(\'echo\'); null }')).to.be.fulfilled();
+        await expect(
+          w.webContents.executeJavaScript(
+            "{ require('@electron-ci/echo'); null }"
+          )
+        ).to.be.fulfilled();
       });
 
       ifit(features.isRunAsNodeEnabled())('can be required in node binary', async function () {
@@ -53,7 +57,7 @@ describe('modules support', () => {
       it('can be required in renderer', async () => {
         const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
         w.loadURL('about:blank');
-        await expect(w.webContents.executeJavaScript('{ require(\'uv-dlopen\'); null }')).to.be.fulfilled();
+        await expect(w.webContents.executeJavaScript('{ require(\'@electron-ci/uv-dlopen\'); null }')).to.be.fulfilled();
       });
 
       ifit(features.isRunAsNodeEnabled())('can be required in node binary', async function () {
diff --git a/spec-main/package.json b/spec-main/package.json
index dfbfd1330da34..1635e32313cda 100644
--- a/spec-main/package.json
+++ b/spec-main/package.json
@@ -4,13 +4,13 @@
   "main": "index.js",
   "version": "0.1.0",
   "devDependencies": {
+    "@electron-ci/echo": "file:./fixtures/native-addon/echo",
+    "@electron-ci/uv-dlopen": "file:./fixtures/native-addon/uv-dlopen/",
     "@types/sinon": "^9.0.4",
     "@types/ws": "^7.2.0",
     "busboy": "^0.3.1",
-    "echo": "file:fixtures/native-addon/echo",
     "q": "^1.5.1",
     "sinon": "^9.0.1",
-    "uv-dlopen": "./fixtures/native-addon/uv-dlopen/",
     "ws": "^7.4.6"
   },
   "dependencies": {
diff --git a/spec-main/yarn.lock b/spec-main/yarn.lock
index 6f6264a60426e..28e15239334c4 100644
--- a/spec-main/yarn.lock
+++ b/spec-main/yarn.lock
@@ -2,6 +2,12 @@
 # yarn lockfile v1
 
 
+"@electron-ci/echo@file:./fixtures/native-addon/echo":
+  version "0.0.1"
+
+"@electron-ci/uv-dlopen@file:./fixtures/native-addon/uv-dlopen":
+  version "0.0.1"
+
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
@@ -320,9 +326,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-"echo@file:fixtures/native-addon/echo":
-  version "0.0.1"
-
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -949,9 +952,6 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uv-dlopen@./fixtures/native-addon/uv-dlopen/:
-  version "0.0.1"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"

From a71936e395b761023a49ff36e9cd9da27a56d6c1 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 2 May 2022 21:08:20 -0400
Subject: [PATCH 334/811] test: skip flaky test on 32-bit Windows (#34021)

---
 spec-main/crash-spec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec-main/crash-spec.ts b/spec-main/crash-spec.ts
index eb9718dac5acd..803d9117d1a13 100644
--- a/spec-main/crash-spec.ts
+++ b/spec-main/crash-spec.ts
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
+import { ifit } from './spec-helpers';
 
 const fixturePath = path.resolve(__dirname, 'fixtures', 'crash-cases');
 
@@ -41,7 +42,8 @@ describe('crash cases', () => {
   const cases = fs.readdirSync(fixturePath);
 
   for (const crashCase of cases) {
-    it(`the "${crashCase}" case should not crash`, () => {
+    // TODO(jkleinsc) fix this flaky test on Windows 32-bit
+    ifit(process.platform !== 'win32' || process.arch !== 'ia32' || crashCase !== 'quit-on-crashed-event')(`the "${crashCase}" case should not crash`, () => {
       const fixture = path.resolve(fixturePath, crashCase);
       const argsFile = path.resolve(fixture, 'electron.args');
       const args = [fixture];

From 7dee5179cb0f4a79056204a243aa3317fbe711a6 Mon Sep 17 00:00:00 2001
From: Ruben R <git@cha0s.io>
Date: Mon, 2 May 2022 20:36:06 -0500
Subject: [PATCH 335/811] Handle SIGUSR2 (#33589)

`start-server-webpack-plugin` uses `SIGUSR2` to signal an HMR update to a server process: https://github.com/ericclemmons/start-server-webpack-plugin/blob/master/src/StartServerPlugin.js#L70

Note that this signal does not actually kill the child process, but merely functions as a message-passing system.
---
 script/start.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/start.js b/script/start.js
index 0ba6e56a1fcb1..94ecfeac87952 100644
--- a/script/start.js
+++ b/script/start.js
@@ -14,3 +14,4 @@ const handleTerminationSignal = (signal) =>
 
 handleTerminationSignal('SIGINT');
 handleTerminationSignal('SIGTERM');
+handleTerminationSignal('SIGUSR2');

From f887000d505cb6dbc4d195c03f38cef943f135fd Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Tue, 3 May 2022 13:09:18 +0530
Subject: [PATCH 336/811] fix: make BrowserWindow#isFocused() return false when
 blur() is called on macOS (#33734)

The isFocused() method on macOS works by checking if the selected
BrowserWindow is a key window. Unfortunately, this didn't work well
with blur() because it wasn't calling any macOS APIs that would change
the key status of the window. Hence, this changes the implementation of
blur() to call orderOut first, which removes the key
status of the window. Then when the orderBack function is called, it
moves the window to the back of its level in the screen list, without
changing the key window.

Fixes: https://github.com/electron/electron/issues/33732
Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 shell/browser/native_window_mac.mm   |   1 +
 spec-main/api-browser-window-spec.ts | 128 ++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 2 deletions(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 7093717e07681..e370f2e47e8ef 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -507,6 +507,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     [[NSApplication sharedApplication] activateIgnoringOtherApps:NO];
     [window_ makeKeyAndOrderFront:nil];
   } else {
+    [window_ orderOut:nil];
     [window_ orderBack:nil];
   }
 }
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index d783cde6b8883..37c5c269c7981 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -760,13 +760,137 @@ describe('BrowserWindow module', () => {
         w.focus();
         expect(w.isVisible()).to.equal(false);
       });
+
+      ifit(process.platform !== 'win32')('focuses a blurred window', async () => {
+        {
+          const isBlurred = emittedOnce(w, 'blur');
+          const isShown = emittedOnce(w, 'show');
+          w.show();
+          w.blur();
+          await isShown;
+          await isBlurred;
+        }
+        expect(w.isFocused()).to.equal(false);
+        w.focus();
+        expect(w.isFocused()).to.equal(true);
+      });
+
+      ifit(process.platform !== 'linux')('acquires focus status from the other windows', async () => {
+        const w1 = new BrowserWindow({ show: false });
+        const w2 = new BrowserWindow({ show: false });
+        const w3 = new BrowserWindow({ show: false });
+        {
+          const isFocused3 = emittedOnce(w3, 'focus');
+          const isShown1 = emittedOnce(w1, 'show');
+          const isShown2 = emittedOnce(w2, 'show');
+          const isShown3 = emittedOnce(w3, 'show');
+          w1.show();
+          w2.show();
+          w3.show();
+          await isShown1;
+          await isShown2;
+          await isShown3;
+          await isFocused3;
+        }
+        // TODO(RaisinTen): Investigate why this assertion fails only on Linux.
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(true);
+
+        w1.focus();
+        expect(w1.isFocused()).to.equal(true);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(false);
+
+        w2.focus();
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(true);
+        expect(w3.isFocused()).to.equal(false);
+
+        w3.focus();
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(true);
+
+        {
+          const isClosed1 = emittedOnce(w1, 'closed');
+          const isClosed2 = emittedOnce(w2, 'closed');
+          const isClosed3 = emittedOnce(w3, 'closed');
+          w1.destroy();
+          w2.destroy();
+          w3.destroy();
+          await isClosed1;
+          await isClosed2;
+          await isClosed3;
+        }
+      });
     });
 
-    describe('BrowserWindow.blur()', () => {
-      it('removes focus from window', () => {
+    // TODO(RaisinTen): Make this work on Windows too.
+    // Refs: https://github.com/electron/electron/issues/20464.
+    ifdescribe(process.platform !== 'win32')('BrowserWindow.blur()', () => {
+      it('removes focus from window', async () => {
+        {
+          const isFocused = emittedOnce(w, 'focus');
+          const isShown = emittedOnce(w, 'show');
+          w.show();
+          await isShown;
+          await isFocused;
+        }
+        expect(w.isFocused()).to.equal(true);
         w.blur();
         expect(w.isFocused()).to.equal(false);
       });
+
+      ifit(process.platform !== 'linux')('transfers focus status to the next window', async () => {
+        const w1 = new BrowserWindow({ show: false });
+        const w2 = new BrowserWindow({ show: false });
+        const w3 = new BrowserWindow({ show: false });
+        {
+          const isFocused3 = emittedOnce(w3, 'focus');
+          const isShown1 = emittedOnce(w1, 'show');
+          const isShown2 = emittedOnce(w2, 'show');
+          const isShown3 = emittedOnce(w3, 'show');
+          w1.show();
+          w2.show();
+          w3.show();
+          await isShown1;
+          await isShown2;
+          await isShown3;
+          await isFocused3;
+        }
+        // TODO(RaisinTen): Investigate why this assertion fails only on Linux.
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(true);
+
+        w3.blur();
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(true);
+        expect(w3.isFocused()).to.equal(false);
+
+        w2.blur();
+        expect(w1.isFocused()).to.equal(true);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(false);
+
+        w1.blur();
+        expect(w1.isFocused()).to.equal(false);
+        expect(w2.isFocused()).to.equal(false);
+        expect(w3.isFocused()).to.equal(true);
+
+        {
+          const isClosed1 = emittedOnce(w1, 'closed');
+          const isClosed2 = emittedOnce(w2, 'closed');
+          const isClosed3 = emittedOnce(w3, 'closed');
+          w1.destroy();
+          w2.destroy();
+          w3.destroy();
+          await isClosed1;
+          await isClosed2;
+          await isClosed3;
+        }
+      });
     });
 
     describe('BrowserWindow.getFocusedWindow()', () => {

From 08937334966fa484539252b21758ea38745dd60c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 06:02:57 -0700
Subject: [PATCH 337/811] Bump v20.0.0-nightly.20220503

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7a838bf298a9d..d1882459cb9ec 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220502
\ No newline at end of file
+20.0.0-nightly.20220503
\ No newline at end of file
diff --git a/package.json b/package.json
index 52e8ff7a1853e..1b8e8b0bd5b63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220502",
+  "version": "20.0.0-nightly.20220503",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index eb462713a0338..e11e7c06200d0 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220502
- PRODUCTVERSION 20,0,0,20220502
+ FILEVERSION 20,0,0,20220503
+ PRODUCTVERSION 20,0,0,20220503
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 658407df7aa5300091028a37b42f9914940ab21c Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 3 May 2022 17:49:01 +0200
Subject: [PATCH 338/811] test: fix require('echo') ->
 require('@electron-ci/echo') (#34026)

---
 spec/fixtures/pages/native-module.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/fixtures/pages/native-module.html b/spec/fixtures/pages/native-module.html
index 78d928f2366c0..922a09aeeddfe 100644
--- a/spec/fixtures/pages/native-module.html
+++ b/spec/fixtures/pages/native-module.html
@@ -2,7 +2,7 @@
 <body>
 <script type="text/javascript" charset="utf-8">
   var path = require('path');
-  console.log(typeof require(path.join(__dirname, '..', '..', '..', 'spec-main', 'node_modules', 'echo')));
+  console.log(typeof require(path.join(__dirname, '..', '..', '..', 'spec-main', 'node_modules', '@electron-ci', 'echo')));
 </script>
 </body>
 </html>

From 747dfe585151e8971ae4b2a1aa002708d2faf12b Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 3 May 2022 12:06:25 -0700
Subject: [PATCH 339/811] build: remove dead circle config bits (#34034)

---
 .circleci/config/base.yml | 98 ++++-----------------------------------
 1 file changed, 8 insertions(+), 90 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index d420933d73598..ddd55364e9601 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -681,13 +681,6 @@ step-electron-dist-unzip: &step-electron-dist-unzip
       #    passed.
       unzip -:o dist.zip
 
-step-ffmpeg-unzip: &step-ffmpeg-unzip
-  run:
-    name: Unzip ffmpeg.zip
-    command: |
-      cd src/out/ffmpeg
-      unzip -:o ffmpeg.zip
-
 step-mksnapshot-unzip: &step-mksnapshot-unzip
   run:
     name: Unzip mksnapshot.zip
@@ -716,13 +709,6 @@ step-ffmpeg-build: &step-ffmpeg-build
       cd src
       ninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES
 
-step-verify-ffmpeg: &step-verify-ffmpeg
-  run:
-    name: Verify ffmpeg
-    command: |
-      cd src
-      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-
 step-verify-mksnapshot: &step-verify-mksnapshot
   run:
     name: Verify mksnapshot
@@ -1060,53 +1046,6 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
     #Compile ts/js to verify doc change didn't break anything
     - *step-ts-compile
 
-steps-native-tests: &steps-native-tests
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-install-python2-on-mac
-    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
-    - *step-wait-for-goma
-    - *step-gn-gen-default
-
-    - run:
-        name: Build tests
-        command: |
-          cd src
-          ninja -C out/Default $BUILD_TARGET
-    - *step-show-goma-stats
-
-    - *step-setup-linux-for-headless-testing
-    - run:
-        name: Run tests
-        command: |
-          mkdir test_results
-          python src/electron/script/native-tests.py run \
-            --config $TESTS_CONFIG \
-            --tests-dir src/out/Default \
-            --output-dir test_results  \
-            $TESTS_ARGS
-
-    - store_artifacts:
-        path: test_results
-        destination: test_results  # Put it in the root folder.
-    - store_test_results:
-        path: test_results
-
-steps-verify-ffmpeg: &steps-verify-ffmpeg
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-ffmpeg-unzip
-    - *step-setup-linux-for-headless-testing
-
-    - *step-verify-ffmpeg
-    - *step-maybe-notify-slack-failure
-
 steps-tests: &steps-tests
   steps:
     - attach_workspace:
@@ -1886,7 +1825,7 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  osx-publish-x64-skip-checkout:
+  osx-publish-x64:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1907,7 +1846,7 @@ jobs:
                 attach: true
                 checkout: false
 
-  osx-publish-arm64-skip-checkout:
+  osx-publish-arm64:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1977,7 +1916,7 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  mas-publish-x64-skip-checkout:
+  mas-publish-x64:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1998,7 +1937,7 @@ jobs:
                 attach: true
                 checkout: false
 
-  mas-publish-arm64-skip-checkout:
+  mas-publish-arm64:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -2084,16 +2023,6 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-test-node
 
-  linux-x64-verify-ffmpeg:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-headless-testing
-      <<: *env-send-slack-notifications
-    <<: *steps-verify-ffmpeg
-
   linux-arm-testing-tests:
     executor: linux-arm
     environment:
@@ -2150,17 +2079,6 @@ jobs:
       <<: *env-apple-silicon
     <<: *steps-tests
 
-  # Layer 4: Summary.
-  linux-release-summary:
-    executor:
-      name: linux-docker
-      size: medium
-    environment:
-      <<: *env-linux-medium
-      <<: *env-send-slack-notifications
-    steps:
-      - *step-maybe-notify-slack-success
-
 # List all workflows
 workflows:
   docs-only:
@@ -2186,19 +2104,19 @@ workflows:
     when: << pipeline.parameters.run-macos-publish >>
     jobs:
     - mac-checkout
-    - osx-publish-x64-skip-checkout:
+    - osx-publish-x64:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-x64-skip-checkout:
+    - mas-publish-x64:
         requires:
           - mac-checkout
         context: release-env
-    - osx-publish-arm64-skip-checkout:
+    - osx-publish-arm64:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-arm64-skip-checkout:
+    - mas-publish-arm64:
         requires:
           - mac-checkout
         context: release-env

From 349cd98b0a5517ffeb3bf2c277af4b2bae130565 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 4 May 2022 08:56:45 +0200
Subject: [PATCH 340/811] test: fix nativeModulesEnabled in
 spec/webview-spec.js (#34027)

---
 spec/webview-spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 0b649d1bd77ad..f4af0158f2c85 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -7,7 +7,7 @@ const { emittedOnce, waitForEvent } = require('./events-helpers');
 const { ifdescribe, ifit, delay } = require('./spec-helpers');
 
 const features = process._linkedBinding('electron_common_features');
-const nativeModulesEnabled = process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS;
+const nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS;
 
 /* Most of the APIs here don't use standard callbacks */
 /* eslint-disable standard/no-callback-literal */

From 60f1e5e0085e20a9e704d608e4a424fe4955faca Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Wed, 4 May 2022 01:29:30 -0700
Subject: [PATCH 341/811] test: unflake some focus tests (#34061)

* spec: unflake some focus tests

* test: disable flaky webFrame visibiilty spec
---
 spec-main/api-browser-window-spec.ts | 10 +++++-----
 spec-main/api-web-frame-main-spec.ts |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 37c5c269c7981..94bdc956a5b68 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -694,12 +694,12 @@ describe('BrowserWindow module', () => {
     });
 
     describe('BrowserWindow.show()', () => {
-      it('should focus on window', () => {
-        w.show();
+      it('should focus on window', async () => {
+        await emittedOnce(w, 'focus', () => w.show());
         expect(w.isFocused()).to.equal(true);
       });
-      it('should make the window visible', () => {
-        w.show();
+      it('should make the window visible', async () => {
+        await emittedOnce(w, 'focus', () => w.show());
         expect(w.isVisible()).to.equal(true);
       });
       it('emits when window is shown', async () => {
@@ -895,7 +895,7 @@ describe('BrowserWindow module', () => {
 
     describe('BrowserWindow.getFocusedWindow()', () => {
       it('returns the opener window when dev tools window is focused', async () => {
-        w.show();
+        await emittedOnce(w, 'focus', () => w.show());
         w.webContents.openDevTools({ mode: 'undocked' });
         await emittedOnce(w.webContents, 'devtools-focused');
         expect(BrowserWindow.getFocusedWindow()).to.equal(w);
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index 49545c4eaf992..7f947f7f54922 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -137,7 +137,9 @@ describe('webFrameMain module', () => {
   });
 
   describe('WebFrame.visibilityState', () => {
-    it('should match window state', async () => {
+    // TODO(MarshallOfSound): Fix flaky test
+    // @flaky-test
+    it.skip('should match window state', async () => {
       const w = new BrowserWindow({ show: true });
       await w.loadURL('about:blank');
       const webFrame = w.webContents.mainFrame;

From 4fad376b0e0fbe837f34b6666fa7c0ae031ce206 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 4 May 2022 06:04:36 -0700
Subject: [PATCH 342/811] Bump v20.0.0-nightly.20220504

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d1882459cb9ec..5234c946d816e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220503
\ No newline at end of file
+20.0.0-nightly.20220504
\ No newline at end of file
diff --git a/package.json b/package.json
index 1b8e8b0bd5b63..21dc2cac61987 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220503",
+  "version": "20.0.0-nightly.20220504",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e11e7c06200d0..e6d07029086e6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220503
- PRODUCTVERSION 20,0,0,20220503
+ FILEVERSION 20,0,0,20220504
+ PRODUCTVERSION 20,0,0,20220504
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 2091343b78e5b3b865f406a72a4047df9a6486cf Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 4 May 2022 16:30:05 +0200
Subject: [PATCH 343/811] refactor: initialize member variables directly
 (#34046)

---
 lib/browser/api/net.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/browser/api/net.ts b/lib/browser/api/net.ts
index 80351c0cdbaae..6438eb0230c16 100644
--- a/lib/browser/api/net.ts
+++ b/lib/browser/api/net.ts
@@ -36,17 +36,14 @@ const discardableDuplicateHeaders = new Set([
 ]);
 
 class IncomingMessage extends Readable {
-  _shouldPush: boolean;
-  _data: (Buffer | null)[];
+  _shouldPush: boolean = false;
+  _data: (Buffer | null)[] = [];
   _responseHead: NodeJS.ResponseHead;
-  _resume: (() => void) | null;
+  _resume: (() => void) | null = null;
 
   constructor (responseHead: NodeJS.ResponseHead) {
     super();
-    this._shouldPush = false;
-    this._data = [];
     this._responseHead = responseHead;
-    this._resume = null;
   }
 
   get statusCode () {

From 5b648854d59180cc9d72c6def8849ec59489bba6 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <raymondzhao@microsoft.com>
Date: Wed, 4 May 2022 10:30:30 -0700
Subject: [PATCH 344/811] fix: requestSingleInstanceLock API sometimes hangs
 (#33777)

---
 ...ransfer_to_requestsingleinstancelock.patch | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index 07752f798efa4..a539bdab51ef7 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -282,7 +282,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f941384b249a5d 100644
+index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d05018b627 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
 @@ -21,6 +21,7 @@
@@ -406,7 +406,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
  bool ProcessLaunchNotification(
      const ProcessSingleton::NotificationCallback& notification_callback,
      UINT message,
-@@ -151,16 +233,23 @@ bool ProcessLaunchNotification(
+@@ -151,16 +233,35 @@ bool ProcessLaunchNotification(
  
    // Handle the WM_COPYDATA message from another process.
    const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
@@ -423,18 +423,30 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
  
 -  *result = notification_callback.Run(parsed_command_line, current_directory) ?
 -      TRUE : FALSE;
++  // notification_callback.Run waits for StoreAck to
++  // run to completion before moving onwards.
++  // Therefore, we cannot directly send the SendBackAck
++  // callback instead, as it would hang the program
++  // during the ConnectNamedPipe call.
 +  g_write_ack_callback_called = false;
 +  *result = notification_callback.Run(parsed_command_line, current_directory,
 +                                      std::move(additional_data),
 +                                      base::BindRepeating(&StoreAck))
 +                ? TRUE
 +                : FALSE;
-+  g_ack_timer.Start(FROM_HERE, base::Seconds(0),
-+                    base::BindOnce(&SendBackAck));
++  if (*result) {
++    // If *result is TRUE, we return NOTIFY_SUCCESS.
++    // Only for that case does the second process read
++    // the acknowledgement. Therefore, only send back
++    // the acknowledgement if *result is TRUE,
++    // otherwise the program hangs during the ConnectNamedPipe call.
++    g_ack_timer.Start(FROM_HERE, base::Seconds(0),
++                      base::BindOnce(&SendBackAck));
++  }
    return true;
  }
  
-@@ -261,9 +350,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -261,9 +362,13 @@ bool ProcessSingleton::EscapeVirtualization(
  ProcessSingleton::ProcessSingleton(
      const std::string& program_name,
      const base::FilePath& user_data_dir,
@@ -449,7 +461,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
        program_name_(program_name),
        is_app_sandboxed_(is_app_sandboxed),
        is_virtualized_(false),
-@@ -278,6 +371,37 @@ ProcessSingleton::~ProcessSingleton() {
+@@ -278,6 +383,37 @@ ProcessSingleton::~ProcessSingleton() {
      ::CloseHandle(lock_file_);
  }
  
@@ -487,7 +499,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
  // Code roughly based on Mozilla.
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
-@@ -290,8 +414,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+@@ -290,8 +426,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
      return PROCESS_NONE;
    }
  
@@ -498,7 +510,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
        return PROCESS_NOTIFIED;
      case chrome::NOTIFY_FAILED:
        remote_window_ = NULL;
-@@ -429,6 +554,18 @@ bool ProcessSingleton::Create() {
+@@ -429,6 +566,18 @@ bool ProcessSingleton::Create() {
            << "Lock file can not be created! Error code: " << error;
  
        if (lock_file_ != INVALID_HANDLE_VALUE) {
@@ -517,7 +529,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..a3d4dd1efc950033855a1f2783f94138
          // Set the window's title to the path of our user data directory so
          // other Chrome instances can decide if they should forward to us.
          TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
-@@ -456,6 +593,7 @@ bool ProcessSingleton::Create() {
+@@ -456,6 +605,7 @@ bool ProcessSingleton::Create() {
  }
  
  void ProcessSingleton::Cleanup() {

From 706d585eb8b2ba2fb396f1f673df9c61ad6161bc Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Thu, 5 May 2022 01:41:52 -0700
Subject: [PATCH 345/811] build: fix run-clang-format extension matching
 (#34076)

---
 script/run-clang-format.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/script/run-clang-format.py b/script/run-clang-format.py
index 4d2e4b0641c0c..33548391c23e1 100644
--- a/script/run-clang-format.py
+++ b/script/run-clang-format.py
@@ -55,8 +55,7 @@ def list_files(files, recursive=False, extensions=None, exclude=None):
                         x for x in fpaths if not fnmatch.fnmatch(x, pattern)
                     ]
                 for fp in fpaths:
-                    ext = os.path.splitext(f)[1][1:]
-                    print(ext)
+                    ext = os.path.splitext(fp)[1][1:]
                     if ext in extensions:
                         out.append(fp)
         else:

From 323f7d4c19b232ec5661d9d87fcecaf6918d8abf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 06:01:44 -0700
Subject: [PATCH 346/811] Bump v20.0.0-nightly.20220505

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 5234c946d816e..0c1167e43a995 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220504
\ No newline at end of file
+20.0.0-nightly.20220505
\ No newline at end of file
diff --git a/package.json b/package.json
index 21dc2cac61987..93cbb7fdbb453 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220504",
+  "version": "20.0.0-nightly.20220505",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e6d07029086e6..ba4beeefb1fdd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220504
- PRODUCTVERSION 20,0,0,20220504
+ FILEVERSION 20,0,0,20220505
+ PRODUCTVERSION 20,0,0,20220505
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 90eb47f70ba0ba1b89933ba505f6cc8805411bcf Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 5 May 2022 15:53:39 +0200
Subject: [PATCH 347/811] fix: offscreen rendering crash on input select
 (#34069)

---
 .../osr/osr_render_widget_host_view.cc        | 29 +++++------------
 .../browser/osr/osr_render_widget_host_view.h |  2 +-
 shell/browser/osr/osr_video_consumer.cc       | 31 ++++++++++++++-----
 shell/browser/osr/osr_video_consumer.h        |  2 +-
 4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc
index f24cf051c5e96..7edfd582b2d24 100644
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -397,7 +397,7 @@ void OffScreenRenderWidgetHostView::ResetFallbackToFirstNavigationSurface() {
 
 void OffScreenRenderWidgetHostView::InitAsPopup(
     content::RenderWidgetHostView* parent_host_view,
-    const gfx::Rect& pos,
+    const gfx::Rect& bounds,
     const gfx::Rect& anchor_rect) {
   DCHECK_EQ(parent_host_view_, parent_host_view);
   DCHECK_EQ(widget_type_, content::WidgetType::kPopup);
@@ -411,13 +411,10 @@ void OffScreenRenderWidgetHostView::InitAsPopup(
       base::BindRepeating(&OffScreenRenderWidgetHostView::OnPopupPaint,
                           parent_host_view_->weak_ptr_factory_.GetWeakPtr());
 
-  popup_position_ = pos;
+  popup_position_ = bounds;
 
-  ResizeRootLayer(false);
+  ResizeRootLayer(true);
   SetPainting(parent_host_view_->IsPainting());
-  if (video_consumer_) {
-    video_consumer_->SizeChanged();
-  }
   Show();
 }
 
@@ -688,13 +685,8 @@ void OffScreenRenderWidgetHostView::OnPaint(const gfx::Rect& damage_rect,
 
 gfx::Size OffScreenRenderWidgetHostView::SizeInPixels() {
   float sf = GetDeviceScaleFactor();
-  if (IsPopupWidget()) {
-    return gfx::ToFlooredSize(
-        gfx::ConvertSizeToPixels(popup_position_.size(), sf));
-  } else {
-    return gfx::ToFlooredSize(
-        gfx::ConvertSizeToPixels(GetViewBounds().size(), sf));
-  }
+  return gfx::ToFlooredSize(
+      gfx::ConvertSizeToPixels(GetViewBounds().size(), sf));
 }
 
 void OffScreenRenderWidgetHostView::CompositeFrame(
@@ -995,7 +987,7 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
       display::Screen::GetScreen()->GetDisplayNearestView(GetNativeView());
   const float scaleFactor = display.device_scale_factor();
   float sf = GetDeviceScaleFactor();
-  const bool scaleFactorDidChange = scaleFactor != sf;
+  const bool sf_did_change = scaleFactor != sf;
 
   // Initialize a screen_infos_ struct as needed, to cache the scale factor.
   if (screen_infos_.screen_infos.empty()) {
@@ -1003,14 +995,9 @@ void OffScreenRenderWidgetHostView::ResizeRootLayer(bool force) {
   }
   screen_infos_.mutable_current().device_scale_factor = scaleFactor;
 
-  gfx::Size size;
-  if (!IsPopupWidget())
-    size = GetViewBounds().size();
-  else
-    size = popup_position_.size();
+  gfx::Size size = GetViewBounds().size();
 
-  if (!force && !scaleFactorDidChange &&
-      size == GetRootLayer()->bounds().size())
+  if (!force && !sf_did_change && size == GetRootLayer()->bounds().size())
     return;
 
   GetRootLayer()->SetBounds(gfx::Rect(size));
diff --git a/shell/browser/osr/osr_render_widget_host_view.h b/shell/browser/osr/osr_render_widget_host_view.h
index 874fd68268b3d..d047e702941ae 100644
--- a/shell/browser/osr/osr_render_widget_host_view.h
+++ b/shell/browser/osr/osr_render_widget_host_view.h
@@ -121,7 +121,7 @@ class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
 
   void ResetFallbackToFirstNavigationSurface() override;
   void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
-                   const gfx::Rect& pos,
+                   const gfx::Rect& bounds,
                    const gfx::Rect& anchor_rect) override;
   void UpdateCursor(const content::WebCursor&) override;
   void SetIsLoading(bool is_loading) override;
diff --git a/shell/browser/osr/osr_video_consumer.cc b/shell/browser/osr/osr_video_consumer.cc
index aeb60a7b5b28e..a8240681f814e 100644
--- a/shell/browser/osr/osr_video_consumer.cc
+++ b/shell/browser/osr/osr_video_consumer.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "media/base/limits.h"
 #include "media/base/video_frame_metadata.h"
 #include "media/capture/mojom/video_capture_buffer.mojom.h"
 #include "media/capture/mojom/video_capture_types.mojom.h"
@@ -13,6 +14,21 @@
 #include "shell/browser/osr/osr_render_widget_host_view.h"
 #include "ui/gfx/skbitmap_operations.h"
 
+namespace {
+
+bool IsValidMinAndMaxFrameSize(gfx::Size min_frame_size,
+                               gfx::Size max_frame_size) {
+  // Returns true if
+  // 0 < |min_frame_size| <= |max_frame_size| <= media::limits::kMaxDimension.
+  return 0 < min_frame_size.width() && 0 < min_frame_size.height() &&
+         min_frame_size.width() <= max_frame_size.width() &&
+         min_frame_size.height() <= max_frame_size.height() &&
+         max_frame_size.width() <= media::limits::kMaxDimension &&
+         max_frame_size.height() <= media::limits::kMaxDimension;
+}
+
+}  // namespace
+
 namespace electron {
 
 OffScreenVideoConsumer::OffScreenVideoConsumer(
@@ -21,11 +37,11 @@ OffScreenVideoConsumer::OffScreenVideoConsumer(
     : callback_(callback),
       view_(view),
       video_capturer_(view->CreateVideoCapturer()) {
-  video_capturer_->SetResolutionConstraints(view_->SizeInPixels(),
-                                            view_->SizeInPixels(), true);
   video_capturer_->SetAutoThrottlingEnabled(false);
   video_capturer_->SetMinSizeChangePeriod(base::TimeDelta());
   video_capturer_->SetFormat(media::PIXEL_FORMAT_ARGB);
+
+  SizeChanged(view_->SizeInPixels());
   SetFrameRate(view_->GetFrameRate());
 }
 
@@ -43,9 +59,10 @@ void OffScreenVideoConsumer::SetFrameRate(int frame_rate) {
   video_capturer_->SetMinCapturePeriod(base::Seconds(1) / frame_rate);
 }
 
-void OffScreenVideoConsumer::SizeChanged() {
-  video_capturer_->SetResolutionConstraints(view_->SizeInPixels(),
-                                            view_->SizeInPixels(), true);
+void OffScreenVideoConsumer::SizeChanged(const gfx::Size& size_in_pixels) {
+  DCHECK(IsValidMinAndMaxFrameSize(size_in_pixels, size_in_pixels));
+  video_capturer_->SetResolutionConstraints(size_in_pixels, size_in_pixels,
+                                            true);
   video_capturer_->RequestRefreshFrame();
 }
 
@@ -58,9 +75,7 @@ void OffScreenVideoConsumer::OnFrameCaptured(
   auto& data_region = data->get_read_only_shmem_region();
 
   if (!CheckContentRect(content_rect)) {
-    gfx::Size view_size = view_->SizeInPixels();
-    video_capturer_->SetResolutionConstraints(view_size, view_size, true);
-    video_capturer_->RequestRefreshFrame();
+    SizeChanged(view_->SizeInPixels());
     return;
   }
 
diff --git a/shell/browser/osr/osr_video_consumer.h b/shell/browser/osr/osr_video_consumer.h
index c6687965441e8..ee6bf0aafd419 100644
--- a/shell/browser/osr/osr_video_consumer.h
+++ b/shell/browser/osr/osr_video_consumer.h
@@ -33,7 +33,7 @@ class OffScreenVideoConsumer : public viz::mojom::FrameSinkVideoConsumer {
 
   void SetActive(bool active);
   void SetFrameRate(int frame_rate);
-  void SizeChanged();
+  void SizeChanged(const gfx::Size& size_in_pixels);
 
  private:
   // viz::mojom::FrameSinkVideoConsumer implementation.

From a2a8e493eb28622541986615c2608f5ceba0fda7 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 5 May 2022 11:42:38 -0700
Subject: [PATCH 348/811] test: unflake some more tests (#34084)

* test: unflake webview fullscreen test

* test: unflake net throttle test

* Update spec-main/api-net-spec.ts

Co-authored-by: Jeremy Rose <jeremya@chromium.org>

Co-authored-by: Jeremy Rose <jeremya@chromium.org>
---
 spec-main/api-net-spec.ts | 7 ++++++-
 spec-main/webview-spec.ts | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/spec-main/api-net-spec.ts b/spec-main/api-net-spec.ts
index 2386aacaff80a..fc70135fa38ed 100644
--- a/spec-main/api-net-spec.ts
+++ b/spec-main/api-net-spec.ts
@@ -1811,7 +1811,12 @@ describe('net module', () => {
       urlRequest.on('response', () => {});
       urlRequest.end();
       await delay(2000);
-      expect(numChunksSent).to.be.at.most(20);
+      // TODO(nornagon): I think this ought to max out at 20, but in practice
+      // it seems to exceed that sometimes. This is at 25 to avoid test flakes,
+      // but we should investigate if there's actually something broken here and
+      // if so fix it and reset this to max at 20, and if not then delete this
+      // comment.
+      expect(numChunksSent).to.be.at.most(25);
     });
   });
 
diff --git a/spec-main/webview-spec.ts b/spec-main/webview-spec.ts
index 01b93a66e2307..7c7315eca85b6 100644
--- a/spec-main/webview-spec.ts
+++ b/spec-main/webview-spec.ts
@@ -435,6 +435,11 @@ describe('<webview> tag', function () {
     };
 
     afterEach(closeAllWindows);
+    afterEach(async () => {
+      // The leaving animation is un-observable but can interfere with future tests
+      // Specifically this is async on macOS but can be on other platforms too
+      await delay(1000);
+    });
 
     // TODO(jkleinsc) fix this test on arm64 macOS.  It causes the tests following it to fail/be flaky
     ifit(process.platform !== 'darwin' || process.arch !== 'arm64')('should make parent frame element fullscreen too', async () => {

From d8a7219d07d5afae515d198d09c7e395af69941a Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Thu, 5 May 2022 11:50:21 -0700
Subject: [PATCH 349/811] chore: stop using v8::Locker everywhere (#34078)

---
 shell/browser/api/electron_api_app.cc                   | 4 ----
 shell/browser/api/electron_api_auto_updater.cc          | 2 --
 shell/browser/api/electron_api_base_window.cc           | 2 --
 shell/browser/api/electron_api_browser_window.cc        | 1 -
 shell/browser/api/electron_api_data_pipe_holder.cc      | 1 -
 shell/browser/api/electron_api_debugger.cc              | 2 --
 shell/browser/api/electron_api_desktop_capturer.cc      | 2 --
 shell/browser/api/electron_api_menu.cc                  | 1 -
 shell/browser/api/electron_api_session.cc               | 1 -
 shell/browser/api/electron_api_tray.cc                  | 1 -
 shell/browser/api/electron_api_web_contents.cc          | 6 ------
 shell/browser/api/electron_api_web_frame_main.cc        | 1 -
 shell/browser/event_emitter_mixin.h                     | 1 -
 shell/browser/javascript_environment.cc                 | 2 --
 shell/browser/net/node_stream_loader.cc                 | 2 --
 shell/browser/printing/print_preview_message_handler.cc | 2 --
 shell/browser/ui/file_dialog_mac.mm                     | 1 -
 shell/browser/ui/file_dialog_win.cc                     | 2 --
 shell/common/api/electron_bindings.cc                   | 1 -
 shell/common/gin_helper/event_emitter.h                 | 1 -
 shell/common/gin_helper/pinnable.h                      | 1 -
 shell/common/gin_helper/promise.cc                      | 4 ----
 shell/common/node_bindings.cc                           | 2 --
 23 files changed, 43 deletions(-)

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 3b04c8ee2ea2a..5964a4933f302 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -802,7 +802,6 @@ bool App::CanCreateWindow(
     bool opener_suppressed,
     bool* no_javascript_access) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(opener);
@@ -828,7 +827,6 @@ void App::AllowCertificateError(
     base::OnceCallback<void(content::CertificateRequestResultType)> callback) {
   auto adapted_callback = base::AdaptCallbackForRepeating(std::move(callback));
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   bool prevent_default = Emit(
       "certificate-error", WebContents::FromOrCreate(isolate, web_contents),
@@ -1086,7 +1084,6 @@ std::string App::GetLocaleCountryCode() {
 void App::OnFirstInstanceAck(
     const base::span<const uint8_t>* first_instance_data) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   base::Value data_to_send;
   if (first_instance_data) {
@@ -1120,7 +1117,6 @@ void App::OnSecondInstance(
     const std::vector<uint8_t> additional_data,
     const ProcessSingleton::NotificationAckCallback& ack_callback) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Value> data_value =
       DeserializeV8Value(isolate, std::move(additional_data));
diff --git a/shell/browser/api/electron_api_auto_updater.cc b/shell/browser/api/electron_api_auto_updater.cc
index e49dcea4c5ea6..c8f2c4fece090 100644
--- a/shell/browser/api/electron_api_auto_updater.cc
+++ b/shell/browser/api/electron_api_auto_updater.cc
@@ -32,7 +32,6 @@ AutoUpdater::~AutoUpdater() {
 
 void AutoUpdater::OnError(const std::string& message) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> wrapper;
   if (GetWrapper(isolate).ToLocal(&wrapper)) {
@@ -49,7 +48,6 @@ void AutoUpdater::OnError(const std::string& message,
                           const int code,
                           const std::string& domain) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Object> wrapper;
   if (GetWrapper(isolate).ToLocal(&wrapper)) {
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
index 3024eba2098ec..3291cf5e7506f 100644
--- a/shell/browser/api/electron_api_base_window.cc
+++ b/shell/browser/api/electron_api_base_window.cc
@@ -209,7 +209,6 @@ void BaseWindow::OnWindowWillResize(const gfx::Rect& new_bounds,
                                     const gfx::ResizeEdge& edge,
                                     bool* prevent_default) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   gin_helper::Dictionary info = gin::Dictionary::CreateEmpty(isolate);
   info.Set("edge", edge);
@@ -309,7 +308,6 @@ void BaseWindow::OnSystemContextMenu(int x, int y, bool* prevent_default) {
 void BaseWindow::OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) {
   if (IsWindowMessageHooked(message)) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     messages_callback_map_[message].Run(
         ToBuffer(isolate, static_cast<void*>(&w_param), sizeof(WPARAM)),
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index e71b15fc0d575..92178079b3506 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -349,7 +349,6 @@ void BrowserWindow::UpdateWindowControlsOverlay(
 
 void BrowserWindow::CloseImmediately() {
   // Close all child windows before closing current window.
-  v8::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   for (v8::Local<v8::Value> value : child_windows_.Values(isolate())) {
     gin::Handle<BrowserWindow> child;
diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
index 85ee9204f4ec4..ebe585b88bd46 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -107,7 +107,6 @@ class DataPipeReader {
     //
     // Note that the lifetime of the native buffer belongs to us, and we will
     // free memory when JS buffer gets garbage collected.
-    v8::Locker locker(promise_.isolate());
     v8::HandleScope handle_scope(promise_.isolate());
     v8::Local<v8::Value> buffer =
         node::Buffer::New(promise_.isolate(), &buffer_.front(), buffer_.size(),
diff --git a/shell/browser/api/electron_api_debugger.cc b/shell/browser/api/electron_api_debugger.cc
index 2569e24b3d390..69c8ea7bcebfa 100644
--- a/shell/browser/api/electron_api_debugger.cc
+++ b/shell/browser/api/electron_api_debugger.cc
@@ -43,8 +43,6 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
   DCHECK(agent_host == agent_host_);
 
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
 
   base::StringPiece message_str(reinterpret_cast<const char*>(message.data()),
diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc
index 00721e52bfcf8..bea6a03547e58 100644
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -155,7 +155,6 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
       if (!webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(
               &device_names)) {
         v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-        v8::Locker locker(isolate);
         v8::HandleScope scope(isolate);
         gin_helper::CallMethod(this, "_onerror", "Failed to get sources.");
 
@@ -191,7 +190,6 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
 
   if (!capture_window_ && !capture_screen_) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     gin_helper::CallMethod(this, "_onfinished", captured_sources_);
 
diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc
index b77b46d3541e5..ff18a7e76b98b 100644
--- a/shell/browser/api/electron_api_menu.cc
+++ b/shell/browser/api/electron_api_menu.cc
@@ -146,7 +146,6 @@ void Menu::OnMenuWillShow(ui::SimpleMenuModel* source) {
 base::OnceClosure Menu::BindSelfToClosure(base::OnceClosure callback) {
   // return ((callback, ref) => { callback() }).bind(null, callback, this)
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope scope(isolate);
   v8::Local<v8::Object> self;
   if (GetWrapper(isolate).ToLocal(&self)) {
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index ac6b38cdb58f4..19be4a8f3df88 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -372,7 +372,6 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
   if (item->IsSavePackageDownload())
     return;
 
-  v8::Locker locker(isolate_);
   v8::HandleScope handle_scope(isolate_);
   auto handle = DownloadItem::FromOrCreate(isolate_, item);
   if (item->GetState() == download::DownloadItem::INTERRUPTED)
diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc
index 312fec8b09ddf..dc57b2cbfe293 100644
--- a/shell/browser/api/electron_api_tray.cc
+++ b/shell/browser/api/electron_api_tray.cc
@@ -389,7 +389,6 @@ gfx::Rect Tray::GetBounds() {
 bool Tray::CheckAlive() {
   if (!tray_icon_) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     gin_helper::ErrorThrower(isolate).ThrowError("Tray is destroyed");
     return false;
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index caf9cdb41b3ea..f27eb39170c74 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1041,7 +1041,6 @@ void WebContents::WebContentsCreatedWithFullParams(
   tracker->body = params.body;
 
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
 
   gin_helper::Dictionary dict;
@@ -1073,7 +1072,6 @@ bool WebContents::IsWebContentsCreationOverridden(
 void WebContents::SetNextChildWebPreferences(
     const gin_helper::Dictionary preferences) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   // Store these prefs for when Chrome calls WebContentsCreatedWithFullParams
   // with the new child contents.
@@ -1105,7 +1103,6 @@ void WebContents::AddNewContents(
 
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
 
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   auto api_web_contents =
       CreateAndTake(isolate, std::move(new_contents), Type::kBrowserWindow);
@@ -1392,7 +1389,6 @@ void WebContents::FindReply(content::WebContents* web_contents,
     return;
 
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   gin_helper::Dictionary result = gin::Dictionary::CreateEmpty(isolate);
   result.Set("requestId", request_id);
@@ -1991,7 +1987,6 @@ void WebContents::DevToolsFocused() {
 
 void WebContents::DevToolsOpened() {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   DCHECK(inspectable_web_contents_);
   DCHECK(inspectable_web_contents_->GetDevToolsWebContents());
@@ -2015,7 +2010,6 @@ void WebContents::DevToolsOpened() {
 
 void WebContents::DevToolsClosed() {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   devtools_web_contents_.Reset();
 
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index e7ba32a33f782..d39943e4d64cb 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -108,7 +108,6 @@ void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
 bool WebFrameMain::CheckRenderFrame() const {
   if (render_frame_disposed_) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Render frame was disposed before WebFrameMain could be accessed");
diff --git a/shell/browser/event_emitter_mixin.h b/shell/browser/event_emitter_mixin.h
index 101e4d5e4591a..4f796c55ea8a2 100644
--- a/shell/browser/event_emitter_mixin.h
+++ b/shell/browser/event_emitter_mixin.h
@@ -29,7 +29,6 @@ class EventEmitterMixin {
   template <typename... Args>
   bool Emit(base::StringPiece name, Args&&... args) {
     v8::Isolate* isolate = electron::JavascriptEnvironment::GetIsolate();
-    v8::Locker locker(isolate);
     v8::HandleScope handle_scope(isolate);
     v8::Local<v8::Object> wrapper;
     if (!static_cast<T*>(this)->GetWrapper(isolate).ToLocal(&wrapper))
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 9e714f31a6d9a..8b9c46c8d509a 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -171,7 +171,6 @@ JavascriptEnvironment::~JavascriptEnvironment() {
   platform_->DrainTasks(isolate_);
 
   {
-    v8::Locker locker(isolate_);
     v8::HandleScope scope(isolate_);
     context_.Get(isolate_)->Exit();
   }
@@ -370,7 +369,6 @@ void JavascriptEnvironment::OnMessageLoopCreated() {
 void JavascriptEnvironment::OnMessageLoopDestroying() {
   DCHECK(microtasks_runner_);
   {
-    v8::Locker locker(isolate_);
     v8::HandleScope scope(isolate_);
     gin_helper::CleanedUpAtExit::DoCleanup();
   }
diff --git a/shell/browser/net/node_stream_loader.cc b/shell/browser/net/node_stream_loader.cc
index c4d264a578390..74ec0e0f295f7 100644
--- a/shell/browser/net/node_stream_loader.cc
+++ b/shell/browser/net/node_stream_loader.cc
@@ -30,7 +30,6 @@ NodeStreamLoader::NodeStreamLoader(
 }
 
 NodeStreamLoader::~NodeStreamLoader() {
-  v8::Locker locker(isolate_);
   v8::Isolate::Scope isolate_scope(isolate_);
   v8::HandleScope handle_scope(isolate_);
 
@@ -154,7 +153,6 @@ void NodeStreamLoader::DidWrite(MojoResult result) {
 }
 
 void NodeStreamLoader::On(const char* event, EventCallback callback) {
-  v8::Locker locker(isolate_);
   v8::Isolate::Scope isolate_scope(isolate_);
   v8::HandleScope handle_scope(isolate_);
 
diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc
index 172bd53e33d15..18890ee0ce7c5 100644
--- a/shell/browser/printing/print_preview_message_handler.cc
+++ b/shell/browser/printing/print_preview_message_handler.cc
@@ -24,7 +24,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
-#include "shell/common/gin_helper/locker.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 
 #include "shell/common/node_includes.h"
@@ -250,7 +249,6 @@ void PrintPreviewMessageHandler::ResolvePromise(
   gin_helper::Promise<v8::Local<v8::Value>> promise = GetPromise(request_id);
 
   v8::Isolate* isolate = promise.isolate();
-  gin_helper::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(
       v8::Local<v8::Context>::New(isolate, promise.GetContext()));
diff --git a/shell/browser/ui/file_dialog_mac.mm b/shell/browser/ui/file_dialog_mac.mm
index d4572bdd7e1fe..94c84e9672d00 100644
--- a/shell/browser/ui/file_dialog_mac.mm
+++ b/shell/browser/ui/file_dialog_mac.mm
@@ -307,7 +307,6 @@ void ResolvePromiseInNextTick(gin_helper::Promise<v8::Local<v8::Value>> promise,
           [](gin_helper::Promise<v8::Local<v8::Value>> promise,
              v8::Global<v8::Value> global) {
             v8::Isolate* isolate = promise.isolate();
-            v8::Locker locker(isolate);
             v8::HandleScope handle_scope(isolate);
             v8::Local<v8::Value> value = global.Get(isolate);
             promise.Resolve(value);
diff --git a/shell/browser/ui/file_dialog_win.cc b/shell/browser/ui/file_dialog_win.cc
index 18fc06b0b7063..7cd094d2d6692 100644
--- a/shell/browser/ui/file_dialog_win.cc
+++ b/shell/browser/ui/file_dialog_win.cc
@@ -221,7 +221,6 @@ void ShowOpenDialog(const DialogSettings& settings,
                     gin_helper::Promise<gin_helper::Dictionary> promise) {
   auto done = [](gin_helper::Promise<gin_helper::Dictionary> promise,
                  bool success, std::vector<base::FilePath> result) {
-    v8::Locker locker(promise.isolate());
     v8::HandleScope handle_scope(promise.isolate());
     gin::Dictionary dict = gin::Dictionary::CreateEmpty(promise.isolate());
     dict.Set("canceled", !success);
@@ -271,7 +270,6 @@ void ShowSaveDialog(const DialogSettings& settings,
                     gin_helper::Promise<gin_helper::Dictionary> promise) {
   auto done = [](gin_helper::Promise<gin_helper::Dictionary> promise,
                  bool success, base::FilePath result) {
-    v8::Locker locker(promise.isolate());
     v8::HandleScope handle_scope(promise.isolate());
     gin::Dictionary dict = gin::Dictionary::CreateEmpty(promise.isolate());
     dict.Set("canceled", !success);
diff --git a/shell/common/api/electron_bindings.cc b/shell/common/api/electron_bindings.cc
index 50509dec3401a..5cd1930a8bcd2 100644
--- a/shell/common/api/electron_bindings.cc
+++ b/shell/common/api/electron_bindings.cc
@@ -250,7 +250,6 @@ void ElectronBindings::DidReceiveMemoryDump(
     bool success,
     std::unique_ptr<memory_instrumentation::GlobalMemoryDump> global_dump) {
   v8::Isolate* isolate = promise.isolate();
-  gin_helper::Locker locker(isolate);
   v8::HandleScope handle_scope(isolate);
   gin_helper::MicrotasksScope microtasks_scope(isolate, true);
   v8::Context::Scope context_scope(
diff --git a/shell/common/gin_helper/event_emitter.h b/shell/common/gin_helper/event_emitter.h
index 90af3f7478df4..58b8d07a43f86 100644
--- a/shell/common/gin_helper/event_emitter.h
+++ b/shell/common/gin_helper/event_emitter.h
@@ -61,7 +61,6 @@ class EventEmitter : public gin_helper::Wrappable<T> {
   // this.emit(name, new Event(), args...);
   template <typename... Args>
   bool Emit(base::StringPiece name, Args&&... args) {
-    v8::Locker locker(isolate());
     v8::HandleScope handle_scope(isolate());
     v8::Local<v8::Object> wrapper = GetWrapper();
     if (wrapper.IsEmpty())
diff --git a/shell/common/gin_helper/pinnable.h b/shell/common/gin_helper/pinnable.h
index 42b98f55179d8..a5e5f68cc6236 100644
--- a/shell/common/gin_helper/pinnable.h
+++ b/shell/common/gin_helper/pinnable.h
@@ -14,7 +14,6 @@ class Pinnable {
  protected:
   // Prevent the object from being garbage collected until Unpin() is called.
   void Pin(v8::Isolate* isolate) {
-    v8::Locker locker(isolate);
     v8::HandleScope scope(isolate);
     v8::Local<v8::Value> wrapper;
     if (static_cast<T*>(this)->GetWrapper(isolate).ToLocal(&wrapper)) {
diff --git a/shell/common/gin_helper/promise.cc b/shell/common/gin_helper/promise.cc
index e17881ef2c4a6..67c56cc2cf578 100644
--- a/shell/common/gin_helper/promise.cc
+++ b/shell/common/gin_helper/promise.cc
@@ -24,7 +24,6 @@ PromiseBase::~PromiseBase() = default;
 PromiseBase& PromiseBase::operator=(PromiseBase&&) = default;
 
 v8::Maybe<bool> PromiseBase::Reject() {
-  gin_helper::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   gin_helper::MicrotasksScope microtasks_scope(isolate());
   v8::Context::Scope context_scope(GetContext());
@@ -33,7 +32,6 @@ v8::Maybe<bool> PromiseBase::Reject() {
 }
 
 v8::Maybe<bool> PromiseBase::Reject(v8::Local<v8::Value> except) {
-  gin_helper::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   gin_helper::MicrotasksScope microtasks_scope(isolate());
   v8::Context::Scope context_scope(GetContext());
@@ -42,7 +40,6 @@ v8::Maybe<bool> PromiseBase::Reject(v8::Local<v8::Value> except) {
 }
 
 v8::Maybe<bool> PromiseBase::RejectWithErrorMessage(base::StringPiece message) {
-  gin_helper::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   gin_helper::MicrotasksScope microtasks_scope(isolate());
   v8::Context::Scope context_scope(GetContext());
@@ -85,7 +82,6 @@ v8::Local<v8::Promise> Promise<void>::ResolvedPromise(v8::Isolate* isolate) {
 }
 
 v8::Maybe<bool> Promise<void>::Resolve() {
-  gin_helper::Locker locker(isolate());
   v8::HandleScope handle_scope(isolate());
   gin_helper::MicrotasksScope microtasks_scope(isolate());
   v8::Context::Scope context_scope(GetContext());
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 15560da0cb71b..5d0a89992f84f 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -628,8 +628,6 @@ void NodeBindings::UvRunOnce() {
   if (!env)
     return;
 
-  // Use Locker in browser process.
-  gin_helper::Locker locker(env->isolate());
   v8::HandleScope handle_scope(env->isolate());
 
   // Enter node context while dealing with uv events.

From a401360057cab274e8552736647f7a1e1793c54e Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 6 May 2022 02:46:36 +0200
Subject: [PATCH 350/811] refactor: prevent RemoveFromLoginItems() from
 mounting volumes from login items (#34068)

---
 shell/browser/browser_mac.mm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index 1094747b41130..9821e0b0a3803 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -318,26 +318,32 @@
   return settings;
 }
 
+// Some logic here copied from GetLoginItemForApp in base/mac/mac_util.mm
 void RemoveFromLoginItems() {
 #pragma clang diagnostic push  // https://crbug.com/1154377
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  // logic to find the login item copied from GetLoginItemForApp in
-  // base/mac/mac_util.mm
   base::ScopedCFTypeRef<LSSharedFileListRef> login_items(
       LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL));
   if (!login_items.get()) {
     LOG(ERROR) << "Couldn't get a Login Items list.";
     return;
   }
+
   base::scoped_nsobject<NSArray> login_items_array(
       base::mac::CFToNSCast(LSSharedFileListCopySnapshot(login_items, NULL)));
   NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]];
-  for (NSUInteger i = 0; i < [login_items_array count]; ++i) {
+  for (id login_item in login_items_array.get()) {
     LSSharedFileListItemRef item =
-        reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]);
+        reinterpret_cast<LSSharedFileListItemRef>(login_item);
+
+    // kLSSharedFileListDoNotMountVolumes is used so that we don't trigger
+    // mounting when it's not expected by a user. Just listing the login
+    // items should not cause any side-effects.
     base::ScopedCFTypeRef<CFErrorRef> error;
-    CFURLRef item_url_ref =
-        LSSharedFileListItemCopyResolvedURL(item, 0, error.InitializeInto());
+    base::ScopedCFTypeRef<CFURLRef> item_url_ref(
+        LSSharedFileListItemCopyResolvedURL(
+            item, kLSSharedFileListDoNotMountVolumes, error.InitializeInto()));
+
     if (!error && item_url_ref) {
       base::ScopedCFTypeRef<CFURLRef> item_url(item_url_ref);
       if (CFEqual(item_url, url)) {

From 0696320d28157539febd4547c872be7ff50d5f60 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 5 May 2022 21:40:34 -0700
Subject: [PATCH 351/811] build: remove S3 uploads (#34104)

---
 .circleci/config.yml                          |  1 +
 script/lib/azput.js                           |  7 +---
 script/lib/config.py                          | 11 -----
 script/lib/s3put.js                           | 40 -------------------
 script/lib/util.py                            | 21 +---------
 script/release/release.js                     | 11 -----
 script/release/uploaders/upload-index-json.py |  2 +-
 .../uploaders/upload-node-checksums.py        |  2 +-
 .../release/uploaders/upload-node-headers.py  | 10 ++---
 script/release/uploaders/upload-symbols.py    |  4 +-
 script/release/uploaders/upload.py            |  5 ++-
 11 files changed, 16 insertions(+), 98 deletions(-)
 delete mode 100644 script/lib/s3put.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index adcf9e502490c..b7556c5783095 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,6 +14,7 @@ parameters:
     type: boolean
     default: false
   
+  # TODO (vertedinde): migrate this variable to upload-to-az
   upload-to-s3:
     type: string
     default: '1'
diff --git a/script/lib/azput.js b/script/lib/azput.js
index 0e6a75cd2ad8f..6abd0220db768 100644
--- a/script/lib/azput.js
+++ b/script/lib/azput.js
@@ -20,12 +20,7 @@ let anErrorOccurred = false;
 function next (done) {
   const file = files.shift();
   if (!file) return done();
-  let key = filenameToKey(file);
-  // TODO: When we drop s3put, migrate the key to not include atom-shell in the callsites
-  key = key.replace('atom-shell/dist/', 'headers/dist/');
-  key = key.replace('atom-shell/symbols/', 'symbols/');
-  key = key.replace('atom-shell/tmp/', 'checksums-scratchpad/');
-  key = key.replace('electron-artifacts/', 'release-builds/');
+  const key = filenameToKey(file);
 
   const [containerName, ...keyPath] = key.split('/');
   const blobKey = keyPath.join('/');
diff --git a/script/lib/config.py b/script/lib/config.py
index b523475cf81e0..7ba2163ab4a30 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -53,17 +53,6 @@ def get_env_var(name):
   return value
 
 
-def s3_config():
-  config = (get_env_var('S3_BUCKET'),
-            get_env_var('S3_ACCESS_KEY'),
-            get_env_var('S3_SECRET_KEY'))
-  message = ('Error: Please set the $ELECTRON_S3_BUCKET, '
-             '$ELECTRON_S3_ACCESS_KEY, and '
-             '$ELECTRON_S3_SECRET_KEY environment variables')
-  assert all(len(c) for c in config), message
-  return config
-
-
 def enable_verbose_mode():
   print('Running in verbose mode')
   global verbose_mode
diff --git a/script/lib/s3put.js b/script/lib/s3put.js
deleted file mode 100644
index 8f92b6d95decf..0000000000000
--- a/script/lib/s3put.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* eslint-disable camelcase */
-const AWS = require('aws-sdk');
-const fs = require('fs');
-const path = require('path');
-AWS.config.update({ region: 'us-west-2' });
-const s3 = new AWS.S3({ apiVersion: '2006-03-01' });
-
-const args = require('minimist')(process.argv.slice(2));
-
-let { bucket, prefix = '/', key_prefix = '', grant, _: files } = args;
-if (prefix && !prefix.endsWith(path.sep)) prefix = path.resolve(prefix) + path.sep;
-
-function filenameToKey (file) {
-  file = path.resolve(file);
-  if (file.startsWith(prefix)) file = file.substr(prefix.length - 1);
-  return key_prefix + (path.sep === '\\' ? file.replace(/\\/g, '/') : file);
-}
-
-let anErrorOccurred = false;
-function next (done) {
-  const file = files.shift();
-  if (!file) return done();
-  const key = filenameToKey(file);
-  console.log(`Uploading '${file}' to bucket '${bucket}' with key '${key}'...`);
-  s3.upload({
-    Bucket: bucket,
-    Key: key,
-    Body: fs.createReadStream(file),
-    ACL: grant
-  }, (err, data) => {
-    if (err) {
-      console.error(err);
-      anErrorOccurred = true;
-    }
-    next(done);
-  });
-}
-next(() => {
-  process.exit(anErrorOccurred ? 1 : 0);
-});
diff --git a/script/lib/util.py b/script/lib/util.py
index 2dc6c45777e0d..05d476e93ab26 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -15,7 +15,7 @@
   from urllib2 import urlopen
 import zipfile
 
-from lib.config import is_verbose_mode, s3_config
+from lib.config import is_verbose_mode
 
 ELECTRON_DIR = os.path.abspath(
   os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
@@ -156,26 +156,9 @@ def get_electron_version():
     return 'v' + f.read().strip()
 
 def store_artifact(prefix, key_prefix, files):
-  # Legacy S3 Bucket
-  s3put(prefix, key_prefix, files)
-  # New AZ Storage
+  # Azure Storage
   azput(prefix, key_prefix, files)
 
-def s3put(prefix, key_prefix, files):
-  bucket, access_key, secret_key = s3_config()
-  env = os.environ.copy()
-  env['AWS_ACCESS_KEY_ID'] = access_key
-  env['AWS_SECRET_ACCESS_KEY'] = secret_key
-  output = execute([
-    'node',
-    os.path.join(os.path.dirname(__file__), 's3put.js'),
-    '--bucket', bucket,
-    '--prefix', prefix,
-    '--key_prefix', key_prefix,
-    '--grant', 'public-read',
-  ] + files, env)
-  print(output)
-
 def azput(prefix, key_prefix, files):
   env = os.environ.copy()
   output = execute([
diff --git a/script/release/release.js b/script/release/release.js
index 14464d5b76a63..221d7bd6d7cf4 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -78,8 +78,6 @@ async function validateReleaseAssets (release, validatingRelease) {
           console.log(`${fail} error verifyingShasums`, err);
         });
     }
-    const s3RemoteFiles = s3RemoteFilesForVersion(release.tag_name);
-    await verifyShasumsForRemoteFiles(s3RemoteFiles, true);
     const azRemoteFiles = azRemoteFilesForVersion(release.tag_name);
     await verifyShasumsForRemoteFiles(azRemoteFiles, true);
   }
@@ -195,15 +193,6 @@ const cloudStoreFilePaths = (version) => [
   'SHASUMS256.txt'
 ];
 
-function s3RemoteFilesForVersion (version) {
-  const bucket = 'https://gh-contractor-zcbenz.s3.amazonaws.com/';
-  const versionPrefix = `${bucket}atom-shell/dist/${version}/`;
-  return cloudStoreFilePaths(version).map((filePath) => ({
-    file: filePath,
-    url: `${versionPrefix}${filePath}`
-  }));
-}
-
 function azRemoteFilesForVersion (version) {
   const azCDN = 'https://artifacts.electronjs.org/headers/';
   const versionPrefix = `${azCDN}dist/${version}/`;
diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index e90eed678c028..568016a218509 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -59,7 +59,7 @@ def main():
     with open(index_json, "wb") as f:
       f.write(new_content)
 
-    store_artifact(OUT_DIR, 'atom-shell/dist', [index_json])
+    store_artifact(OUT_DIR, 'headers/dist/', [index_json])
 
 
 if __name__ == '__main__':
diff --git a/script/release/uploaders/upload-node-checksums.py b/script/release/uploaders/upload-node-checksums.py
index 7df8bc1468c8f..6e36ca30d2a07 100755
--- a/script/release/uploaders/upload-node-checksums.py
+++ b/script/release/uploaders/upload-node-checksums.py
@@ -29,7 +29,7 @@ def main():
   ]
 
   if args.target_dir is None:
-    store_artifact(directory, 'atom-shell/dist/{0}'.format(args.version),
+    store_artifact(directory, 'headers/dist/{0}'.format(args.version),
                    checksums)
   else:
     copy_files(checksums, args.target_dir)
diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py
index 77b72ae1d61a2..d70a5b704ac2a 100755
--- a/script/release/uploaders/upload-node-headers.py
+++ b/script/release/uploaders/upload-node-headers.py
@@ -45,9 +45,9 @@ def upload_node(version):
       versioned_header_tar = header_tar.format(version)
       shutil.copy2(generated_tar, os.path.join(GEN_DIR, versioned_header_tar))
 
-    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
+    store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
                    glob.glob('node-*.tar.gz'))
-    store_artifact(GEN_DIR, 'atom-shell/dist/{0}'.format(version),
+    store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
                    glob.glob('iojs-*.tar.gz'))
 
   if PLATFORM == 'win32':
@@ -73,13 +73,13 @@ def upload_node(version):
     shutil.copy2(electron_lib, v4_node_lib)
 
     # Upload the node.lib.
-    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [node_lib])
+    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [node_lib])
 
     # Upload the iojs.lib.
-    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version), [iojs_lib])
+    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [iojs_lib])
 
     # Upload the v4 node.lib.
-    store_artifact(DIST_DIR, 'atom-shell/dist/{0}'.format(version),
+    store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version),
                    [v4_node_lib])
 
 
diff --git a/script/release/uploaders/upload-symbols.py b/script/release/uploaders/upload-symbols.py
index 402cb4b2d31c1..bb0286777e0ec 100755
--- a/script/release/uploaders/upload-symbols.py
+++ b/script/release/uploaders/upload-symbols.py
@@ -56,7 +56,7 @@ def main():
 
   files += glob.glob(SYMBOLS_DIR + '/*/*/*.src.zip')
 
-  # The file upload needs to be atom-shell/symbols/:symbol_name/:hash/:symbol
+  # The file upload needs to be symbols/:symbol_name/:hash/:symbol
   os.chdir(SYMBOLS_DIR)
   files = [os.path.relpath(f, os.getcwd()) for f in files]
 
@@ -84,7 +84,7 @@ def run_symstore(pdb, dest, product):
 
 
 def upload_symbols(files):
-  store_artifact(SYMBOLS_DIR, 'atom-shell/symbols',
+  store_artifact(SYMBOLS_DIR, 'symbols',
         files)
 
 
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 25078bbcc6302..a25d67523ab64 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -343,8 +343,9 @@ def upload_electron(release, file_path, args):
     pass
 
   # if upload_to_s3 is set, skip github upload.
+  # todo (vertedinde): migrate this variable to upload_to_az
   if args.upload_to_s3:
-    key_prefix = 'electron-artifacts/{0}_{1}'.format(args.version,
+    key_prefix = 'release-builds/{0}_{1}'.format(args.version,
                                                      args.upload_timestamp)
     store_artifact(os.path.dirname(file_path), key_prefix, [file_path])
     upload_sha256_checksum(args.version, file_path, key_prefix)
@@ -369,7 +370,7 @@ def upload_io_to_github(release, filename, filepath, version):
 def upload_sha256_checksum(version, file_path, key_prefix=None):
   checksum_path = '{}.sha256sum'.format(file_path)
   if key_prefix is None:
-    key_prefix = 'atom-shell/tmp/{0}'.format(version)
+    key_prefix = 'checksums-scratchpad/{0}'.format(version)
   sha256 = hashlib.sha256()
   with open(file_path, 'rb') as f:
     sha256.update(f.read())

From 808efd89ed6575078194ccea08680516a0f5c984 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Fri, 6 May 2022 02:42:34 -0700
Subject: [PATCH 352/811] build: use azure function to hash assets instead of
 lambda (#34117)

---
 script/release/get-url-hash.js | 47 ++++++++++++++--------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/script/release/get-url-hash.js b/script/release/get-url-hash.js
index 0633567a7dd90..ae91fac30e526 100644
--- a/script/release/get-url-hash.js
+++ b/script/release/get-url-hash.js
@@ -1,34 +1,25 @@
-const AWS = require('aws-sdk');
-
-const lambda = new AWS.Lambda({
-  credentials: {
-    accessKeyId: process.env.AWS_LAMBDA_EXECUTE_KEY,
-    secretAccessKey: process.env.AWS_LAMBDA_EXECUTE_SECRET
-  },
-  region: 'us-east-1'
-});
+const got = require('got');
+const url = require('url');
 
 module.exports = async function getUrlHash (targetUrl, algorithm = 'sha256', attempts = 3) {
+  const options = {
+    code: process.env.ELECTRON_ARTIFACT_HASHER_FUNCTION_KEY,
+    targetUrl,
+    algorithm
+  };
+  const search = new url.URLSearchParams(options);
+  const functionUrl = url.format({
+    protocol: 'https:',
+    hostname: 'electron-artifact-hasher.azurewebsites.net',
+    pathname: '/api/HashArtifact',
+    search: search.toString()
+  });
   try {
-    return new Promise((resolve, reject) => {
-      lambda.invoke({
-        FunctionName: 'hasher',
-        Payload: JSON.stringify({
-          targetUrl,
-          algorithm
-        })
-      }, (err, data) => {
-        if (err) return reject(err);
-        try {
-          const response = JSON.parse(data.Payload);
-          if (response.statusCode !== 200) return reject(new Error('non-200 status code received from hasher function'));
-          if (!response.hash) return reject(new Error('Successful lambda call but failed to get valid hash'));
-          resolve(response.hash);
-        } catch (err) {
-          return reject(err);
-        }
-      });
-    });
+    const resp = await got(functionUrl);
+    if (resp.statusCode !== 200) throw new Error('non-200 status code received from hasher function');
+    if (!resp.body) throw new Error('Successful lambda call but failed to get valid hash');
+
+    return resp.body.trim();
   } catch (err) {
     if (attempts > 1) {
       console.error('Failed to get URL hash for', targetUrl, 'we will retry', err);

From 0f2da5c8306e6a4f2ad404ac25c598da53eca80b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 06:01:48 -0700
Subject: [PATCH 353/811] Bump v20.0.0-nightly.20220506

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0c1167e43a995..df17f7c29105e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220505
\ No newline at end of file
+20.0.0-nightly.20220506
\ No newline at end of file
diff --git a/package.json b/package.json
index 93cbb7fdbb453..da3a8ce01cc1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220505",
+  "version": "20.0.0-nightly.20220506",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ba4beeefb1fdd..2a2ef5843bf70 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220505
- PRODUCTVERSION 20,0,0,20220505
+ FILEVERSION 20,0,0,20220506
+ PRODUCTVERSION 20,0,0,20220506
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0d35084adabea009b81bb07ed6f05d4a4d68d314 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 08:14:11 -0700
Subject: [PATCH 354/811] Revert "Bump v20.0.0-nightly.20220506"

This reverts commit 0f2da5c8306e6a4f2ad404ac25c598da53eca80b.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index df17f7c29105e..0c1167e43a995 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220506
\ No newline at end of file
+20.0.0-nightly.20220505
\ No newline at end of file
diff --git a/package.json b/package.json
index da3a8ce01cc1d..93cbb7fdbb453 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220506",
+  "version": "20.0.0-nightly.20220505",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2a2ef5843bf70..ba4beeefb1fdd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220506
- PRODUCTVERSION 20,0,0,20220506
+ FILEVERSION 20,0,0,20220505
+ PRODUCTVERSION 20,0,0,20220505
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 2900bc55aa7481b2bd8841108cdb9b3e0261b3e0 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Fri, 6 May 2022 12:57:18 -0700
Subject: [PATCH 355/811] build: remove ending slash upload-index-json (#34125)

---
 script/release/uploaders/upload-index-json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py
index 568016a218509..348023cf2cbd3 100755
--- a/script/release/uploaders/upload-index-json.py
+++ b/script/release/uploaders/upload-index-json.py
@@ -59,7 +59,7 @@ def main():
     with open(index_json, "wb") as f:
       f.write(new_content)
 
-    store_artifact(OUT_DIR, 'headers/dist/', [index_json])
+    store_artifact(OUT_DIR, 'headers/dist', [index_json])
 
 
 if __name__ == '__main__':

From 1bdbb69351f1989d10718cf5dce4eb91bfc1ec19 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 12:58:25 -0700
Subject: [PATCH 356/811] Bump v20.0.0-nightly.20220506

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0c1167e43a995..df17f7c29105e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220505
\ No newline at end of file
+20.0.0-nightly.20220506
\ No newline at end of file
diff --git a/package.json b/package.json
index 93cbb7fdbb453..da3a8ce01cc1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220505",
+  "version": "20.0.0-nightly.20220506",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ba4beeefb1fdd..2a2ef5843bf70 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220505
- PRODUCTVERSION 20,0,0,20220505
+ FILEVERSION 20,0,0,20220506
+ PRODUCTVERSION 20,0,0,20220506
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3ba60de51d38b0384b38948f28314efa6a5447f9 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <raymondzhao@microsoft.com>
Date: Fri, 6 May 2022 13:24:14 -0700
Subject: [PATCH 357/811] docs: add missing ackCallback parameter (#34126)

---
 docs/api/app.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 2aec42c48ae93..e10e20fcd5d22 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -1001,7 +1001,7 @@ const gotTheLock = app.requestSingleInstanceLock(additionalData)
 if (!gotTheLock) {
   app.quit()
 } else {
-  app.on('second-instance', (event, commandLine, workingDirectory, additionalData) => {
+  app.on('second-instance', (event, commandLine, workingDirectory, additionalData, ackCallback) => {
     // We must call preventDefault if we're sending back data.
     event.preventDefault()
     // Print out data received from the second instance.

From dd7dfd7ecd4a79ca0aa4c126b516dd7d3ac3e5a6 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 06:01:36 -0700
Subject: [PATCH 358/811] Bump v20.0.0-nightly.20220509

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index df17f7c29105e..813858b4a9d49 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220506
\ No newline at end of file
+20.0.0-nightly.20220509
\ No newline at end of file
diff --git a/package.json b/package.json
index da3a8ce01cc1d..a8be96a419284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220506",
+  "version": "20.0.0-nightly.20220509",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2a2ef5843bf70..896668b38e784 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220506
- PRODUCTVERSION 20,0,0,20220506
+ FILEVERSION 20,0,0,20220509
+ PRODUCTVERSION 20,0,0,20220509
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6fea35271c67c6ad69cf026560cb221054a505a8 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 9 May 2022 06:34:17 -0700
Subject: [PATCH 359/811] build: change upload-to-s3 vars to upload-to-storage
 (#34105)

* build: change upload-to-s3 vars to upload-to-az

* build: change upload-to-az to upload-to-storage
---
 .circleci/config.yml               |  3 +--
 .circleci/config/base.yml          | 22 +++++++++++-----------
 appveyor.yml                       |  8 ++++----
 script/release/ci-release-build.js |  6 +++---
 script/release/uploaders/upload.py | 18 +++++++++---------
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7556c5783095..372018b9e2532 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,8 +14,7 @@ parameters:
     type: boolean
     default: false
   
-  # TODO (vertedinde): migrate this variable to upload-to-az
-  upload-to-s3:
+  upload-to-storage:
     type: string
     default: '1'
 
diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index ddd55364e9601..454a7a59152b9 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-s3:
+  upload-to-storage:
     type: string
     default: '1'
 
@@ -637,9 +637,9 @@ step-electron-publish: &step-electron-publish
       fi
 
       cd src/electron
-      if [ "$UPLOAD_TO_S3" == "1" ]; then
-        echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --verbose --upload_to_s3
+      if [ "$UPLOAD_TO_STORAGE" == "1" ]; then
+        echo 'Uploading Electron release distribution to Azure'
+        script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
       else
         echo 'Uploading Electron release distribution to Github releases'
         script/release/uploaders/upload.py --verbose
@@ -1687,7 +1687,7 @@ jobs:
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1731,7 +1731,7 @@ jobs:
       <<: *env-release-build
       <<: *env-32bit-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1784,7 +1784,7 @@ jobs:
       <<: *env-arm64
       <<: *env-release-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1832,7 +1832,7 @@ jobs:
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1854,7 +1854,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-release-build
       <<: *env-apple-silicon
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1924,7 +1924,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-mas
       <<: *env-release-build
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
     steps:
       - run: echo running
       - when:
@@ -1945,7 +1945,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
       <<: *env-release-build
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
       <<: *env-ninja-status
     steps:
       - run: echo running
diff --git a/appveyor.yml b/appveyor.yml
index d716dad15c70c..f693c7d634e8a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@
 #  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
+#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
 #      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
@@ -229,9 +229,9 @@ deploy_script:
   - cd electron
   - ps: >-
       if (Test-Path Env:\ELECTRON_RELEASE) {
-        if (Test-Path Env:\UPLOAD_TO_S3) {
-          Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --verbose --upload_to_s3
+        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
+          Write-Output "Uploading Electron release distribution to azure"
+          & python script\release\uploaders\upload.py --verbose --upload_to_storage
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
           & python script\release\uploaders\upload.py --verbose
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 2e716bb67de2e..31ac6a3b74962 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -62,9 +62,9 @@ async function circleCIcall (targetBranch, workflowName, options) {
     parameters: {}
   };
   if (options.ghRelease) {
-    buildRequest.parameters['upload-to-s3'] = '0';
+    buildRequest.parameters['upload-to-storage'] = '0';
   } else {
-    buildRequest.parameters['upload-to-s3'] = '1';
+    buildRequest.parameters['upload-to-storage'] = '1';
   }
   buildRequest.parameters[`run-${workflowName}`] = true;
   if (options.arch) {
@@ -205,7 +205,7 @@ async function callAppVeyor (targetBranch, job, options) {
   };
 
   if (!options.ghRelease) {
-    environmentVariables.UPLOAD_TO_S3 = 1;
+    environmentVariables.UPLOAD_TO_STORAGE = 1;
   }
 
   const requestOpts = {
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index a25d67523ab64..69c4bbfa5720d 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -47,7 +47,7 @@ def main():
   args = parse_args()
   if args.verbose:
     enable_verbose_mode()
-  if args.upload_to_s3:
+  if args.upload_to_storage:
     utcnow = datetime.datetime.utcnow()
     args.upload_timestamp = utcnow.strftime('%Y%m%d')
 
@@ -64,7 +64,7 @@ def main():
   if not release['draft']:
     tag_exists = True
 
-  if not args.upload_to_s3:
+  if not args.upload_to_storage:
     assert release['exists'], \
           'Release does not exist; cannot upload to GitHub!'
     assert tag_exists == args.overwrite, \
@@ -148,7 +148,7 @@ def main():
       OUT_DIR, 'hunspell_dictionaries.zip')
     upload_electron(release, hunspell_dictionaries_zip, args)
 
-  if not tag_exists and not args.upload_to_s3:
+  if not tag_exists and not args.upload_to_storage:
     # Upload symbols to symbol server.
     run_python_upload_script('upload-symbols.py')
     if PLATFORM == 'win32':
@@ -174,9 +174,9 @@ def parse_args():
   parser.add_argument('-p', '--publish-release',
                       help='Publish the release',
                       action='store_true')
-  parser.add_argument('-s', '--upload_to_s3',
-                      help='Upload assets to s3 bucket',
-                      dest='upload_to_s3',
+  parser.add_argument('-s', '--upload_to_storage',
+                      help='Upload assets to azure bucket',
+                      dest='upload_to_storage',
                       action='store_true',
                       default=False,
                       required=False)
@@ -342,9 +342,9 @@ def upload_electron(release, file_path, args):
   except NonZipFileError:
     pass
 
-  # if upload_to_s3 is set, skip github upload.
-  # todo (vertedinde): migrate this variable to upload_to_az
-  if args.upload_to_s3:
+  # if upload_to_storage is set, skip github upload.
+  # todo (vertedinde): migrate this variable to upload_to_storage
+  if args.upload_to_storage:
     key_prefix = 'release-builds/{0}_{1}'.format(args.version,
                                                      args.upload_timestamp)
     store_artifact(os.path.dirname(file_path), key_prefix, [file_path])

From 03e68e2efeee34715a5b37e6f7065ac8487f2485 Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Mon, 9 May 2022 19:08:53 +0530
Subject: [PATCH 360/811] fix: fix a crash in `safeStorage` on Linux (#33913)

On Linux, `isEncryptionAvailable()` was crashing instead of returning a
boolean before the 'ready' event was emitted by the app. The reason of
the crash is that [`CreateKeyStorage()`](https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/os_crypt_linux.cc;l=74;drc=35be6215ec8f09e50176f36753c68f26c63d1885;bpv=1;bpt=0)
expects the config to be set but the function responsible for setting the
config, [`SetConfig()`](https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/os_crypt_linux.cc;l=237;drc=35be6215ec8f09e50176f36753c68f26c63d1885;bpv=1;bpt=0),
is called only after the app is ready inside [`PostCreateMainMessageLoop()`](https://github.com/electron/electron/blob/main/shell/browser/electron_browser_main_parts.cc#L499).
So this changes `IsEncryptionAvailable()` to return `false` when the app
is not ready on Linux and uses that instead of the raw API in other
places like `EncryptString()` and `DecryptString()`.

Fixes: https://github.com/electron/electron/issues/32206
Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 docs/api/safe-storage.md                      |  4 +-
 .../browser/api/electron_api_safe_storage.cc  | 21 +++++++++-
 spec-main/api-safe-storage-spec.ts            | 19 +++++++++
 .../crash-cases/safe-storage/index.js         | 39 +++++++++++++++++++
 4 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 spec-main/fixtures/crash-cases/safe-storage/index.js

diff --git a/docs/api/safe-storage.md b/docs/api/safe-storage.md
index e96c18bbf0795..471351c9c1cd3 100644
--- a/docs/api/safe-storage.md
+++ b/docs/api/safe-storage.md
@@ -18,8 +18,8 @@ The `safeStorage` module has the following methods:
 
 Returns `boolean` - Whether encryption is available.
 
-On Linux, returns true if the secret key is
-available. On MacOS, returns true if Keychain is available.
+On Linux, returns true if the app has emitted the `ready` event and the secret key is available.
+On MacOS, returns true if Keychain is available.
 On Windows, returns true once the app has emitted the `ready` event.
 
 ### `safeStorage.encryptString(plainText)`
diff --git a/shell/browser/api/electron_api_safe_storage.cc b/shell/browser/api/electron_api_safe_storage.cc
index ba1396cf28332..d0e3a73bcdb0d 100644
--- a/shell/browser/api/electron_api_safe_storage.cc
+++ b/shell/browser/api/electron_api_safe_storage.cc
@@ -31,12 +31,24 @@ void SetElectronCryptoReady(bool ready) {
 #endif
 
 bool IsEncryptionAvailable() {
+#if BUILDFLAG(IS_LINUX)
+  // Calling IsEncryptionAvailable() before the app is ready results in a crash
+  // on Linux.
+  // Refs: https://github.com/electron/electron/issues/32206.
+  if (!Browser::Get()->is_ready())
+    return false;
+#endif
   return OSCrypt::IsEncryptionAvailable();
 }
 
 v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
                                    const std::string& plaintext) {
-  if (!OSCrypt::IsEncryptionAvailable()) {
+  if (!IsEncryptionAvailable()) {
+    if (!Browser::Get()->is_ready()) {
+      gin_helper::ErrorThrower(isolate).ThrowError(
+          "safeStorage cannot be used before app is ready");
+      return v8::Local<v8::Value>();
+    }
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "
@@ -59,7 +71,12 @@ v8::Local<v8::Value> EncryptString(v8::Isolate* isolate,
 }
 
 std::string DecryptString(v8::Isolate* isolate, v8::Local<v8::Value> buffer) {
-  if (!OSCrypt::IsEncryptionAvailable()) {
+  if (!IsEncryptionAvailable()) {
+    if (!Browser::Get()->is_ready()) {
+      gin_helper::ErrorThrower(isolate).ThrowError(
+          "safeStorage cannot be used before app is ready");
+      return "";
+    }
     gin_helper::ErrorThrower(isolate).ThrowError(
         "Error while decrypting the ciphertext provided to "
         "safeStorage.decryptString. "
diff --git a/spec-main/api-safe-storage-spec.ts b/spec-main/api-safe-storage-spec.ts
index b89f909513bd1..098095e2fde06 100644
--- a/spec-main/api-safe-storage-spec.ts
+++ b/spec-main/api-safe-storage-spec.ts
@@ -12,8 +12,27 @@ import * as fs from 'fs';
 *
 * Because all encryption methods are gated by isEncryptionAvailable, the methods will never return the correct values
 * when run on CI and linux.
+* Refs: https://github.com/electron/electron/issues/30424.
 */
 
+describe('safeStorage module', () => {
+  it('safeStorage before and after app is ready', async () => {
+    const appPath = path.join(__dirname, 'fixtures', 'crash-cases', 'safe-storage');
+    const appProcess = cp.spawn(process.execPath, [appPath]);
+
+    let output = '';
+    appProcess.stdout.on('data', data => { output += data; });
+    appProcess.stderr.on('data', data => { output += data; });
+
+    const code = (await emittedOnce(appProcess, 'exit'))[0] ?? 1;
+
+    if (code !== 0 && output) {
+      console.log(output);
+    }
+    expect(code).to.equal(0);
+  });
+});
+
 ifdescribe(process.platform !== 'linux')('safeStorage module', () => {
   after(async () => {
     const pathToEncryptedString = path.resolve(__dirname, 'fixtures', 'api', 'safe-storage', 'encrypted.txt');
diff --git a/spec-main/fixtures/crash-cases/safe-storage/index.js b/spec-main/fixtures/crash-cases/safe-storage/index.js
new file mode 100644
index 0000000000000..151751820a8d5
--- /dev/null
+++ b/spec-main/fixtures/crash-cases/safe-storage/index.js
@@ -0,0 +1,39 @@
+const { app, safeStorage } = require('electron');
+const { expect } = require('chai');
+
+(async () => {
+  if (!app.isReady()) {
+    // isEncryptionAvailable() returns false before the app is ready on
+    // Linux: https://github.com/electron/electron/issues/32206
+    // and
+    // Windows: https://github.com/electron/electron/issues/33640.
+    expect(safeStorage.isEncryptionAvailable()).to.equal(process.platform === 'darwin');
+    if (safeStorage.isEncryptionAvailable()) {
+      const plaintext = 'plaintext';
+      const ciphertext = safeStorage.encryptString(plaintext);
+      expect(Buffer.isBuffer(ciphertext)).to.equal(true);
+      expect(safeStorage.decryptString(ciphertext)).to.equal(plaintext);
+    } else {
+      expect(() => safeStorage.encryptString('plaintext')).to.throw(/safeStorage cannot be used before app is ready/);
+      expect(() => safeStorage.decryptString(Buffer.from(''))).to.throw(/safeStorage cannot be used before app is ready/);
+    }
+  }
+  await app.whenReady();
+  // isEncryptionAvailable() will always return false on CI due to a mocked
+  // dbus as mentioned above.
+  expect(safeStorage.isEncryptionAvailable()).to.equal(process.platform !== 'linux');
+  if (safeStorage.isEncryptionAvailable()) {
+    const plaintext = 'plaintext';
+    const ciphertext = safeStorage.encryptString(plaintext);
+    expect(Buffer.isBuffer(ciphertext)).to.equal(true);
+    expect(safeStorage.decryptString(ciphertext)).to.equal(plaintext);
+  } else {
+    expect(() => safeStorage.encryptString('plaintext')).to.throw(/Encryption is not available/);
+    expect(() => safeStorage.decryptString(Buffer.from(''))).to.throw(/Decryption is not available/);
+  }
+})()
+  .then(app.quit)
+  .catch((err) => {
+    console.error(err);
+    app.exit(1);
+  });

From 9483e714c46cfa134209691b29b4ab5cf9fdb2ac Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 May 2022 23:26:57 +0900
Subject: [PATCH 361/811] feat: allow customizing browser data location
 (#33554)

* feat: redirect Electron/Chromium cache location

* fix: network services should also use browserData

* test: browserData

* chore: no need to explicitly create dir

* feat: browserData => sessionData

* test: check existings of specific items

* docs: add background on userData and sessionData

Co-authored-by: emmanuel.kimmerlin@thomsonreuters.com <emmanuel.kimmerlin@thomsonreuters.com>
---
 docs/api/app.md                               | 18 +++++--
 shell/app/electron_main_delegate.cc           |  5 +-
 shell/browser/api/electron_api_app.cc         |  2 +
 shell/browser/browser_process_impl.cc         |  2 +-
 shell/browser/electron_browser_client.cc      |  8 +--
 shell/browser/electron_browser_context.cc     |  3 +-
 shell/browser/electron_browser_main_parts.cc  |  2 +-
 shell/browser/ui/devtools_manager_delegate.cc |  6 +--
 shell/common/electron_paths.h                 |  3 +-
 spec-main/api-app-spec.ts                     | 50 ++++++++++++++++++-
 spec-main/fixtures/apps/set-path/main.js      | 43 ++++++++++++++++
 spec-main/fixtures/apps/set-path/package.json |  4 ++
 12 files changed, 128 insertions(+), 18 deletions(-)
 create mode 100644 spec-main/fixtures/apps/set-path/main.js
 create mode 100644 spec-main/fixtures/apps/set-path/package.json

diff --git a/docs/api/app.md b/docs/api/app.md
index e10e20fcd5d22..16207e255c60e 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -635,8 +635,18 @@ Returns `string` - The current application directory.
     * `%APPDATA%` on Windows
     * `$XDG_CONFIG_HOME` or `~/.config` on Linux
     * `~/Library/Application Support` on macOS
-  * `userData` The directory for storing your app's configuration files, which by
-    default it is the `appData` directory appended with your app's name.
+  * `userData` The directory for storing your app's configuration files, which
+    by default is the `appData` directory appended with your app's name. By
+    convention files storing user data should be written to this directory, and
+    it is not recommended to write large files here because some environments
+    may backup this directory to cloud storage.
+  * `sessionData` The directory for storing data generated by `Session`, such
+    as localStorage, cookies, disk cache, downloaded dictionaries, network
+    state, devtools files. By default this points to `userData`. Chromium may
+    write very large disk cache here, so if your app does not rely on browser
+    storage like localStorage or cookies to save user data, it is recommended
+    to set this directory to other locations to avoid polluting the `userData`
+    directory.
   * `temp` Temporary directory.
   * `exe` The current executable file.
   * `module` The `libchromiumcontent` library.
@@ -686,9 +696,9 @@ In that case, the directory should be created with `fs.mkdirSync` or similar.
 
 You can only override paths of a `name` defined in `app.getPath`.
 
-By default, web pages' cookies and caches will be stored under the `userData`
+By default, web pages' cookies and caches will be stored under the `sessionData`
 directory. If you want to change this location, you have to override the
-`userData` path before the `ready` event of the `app` module is emitted.
+`sessionData` path before the `ready` event of the `app` module is emitted.
 
 ### `app.getVersion()`
 
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index e1769670fb8ba..a0ca93fc63e30 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -134,11 +134,14 @@ bool ElectronPathProvider(int key, base::FilePath* result) {
       break;
     case chrome::DIR_APP_DICTIONARIES:
       // TODO(nornagon): can we just default to using Chrome's logic here?
-      if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
+      if (!base::PathService::Get(DIR_SESSION_DATA, &cur))
         return false;
       cur = cur.Append(base::FilePath::FromUTF8Unsafe("Dictionaries"));
       create_dir = true;
       break;
+    case DIR_SESSION_DATA:
+      // By default and for backward, equivalent to DIR_USER_DATA.
+      return base::PathService::Get(chrome::DIR_USER_DATA, result);
     case DIR_USER_CACHE: {
 #if BUILDFLAG(IS_POSIX)
       int parent_key = base::DIR_CACHE;
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 5964a4933f302..6bd1d052e6cf0 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -473,6 +473,8 @@ IconLoader::IconSize GetIconSizeByString(const std::string& size) {
 int GetPathConstant(const std::string& name) {
   if (name == "appData")
     return DIR_APP_DATA;
+  else if (name == "sessionData")
+    return DIR_SESSION_DATA;
   else if (name == "userData")
     return chrome::DIR_USER_DATA;
   else if (name == "cache")
diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc
index 5f0bdc532ab6d..31653e104f8c5 100644
--- a/shell/browser/browser_process_impl.cc
+++ b/shell/browser/browser_process_impl.cc
@@ -110,7 +110,7 @@ void BrowserProcessImpl::PostEarlyInitialization() {
   // Only use a persistent prefs store when cookie encryption is enabled as that
   // is the only key that needs it
   base::FilePath prefs_path;
-  CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &prefs_path));
+  CHECK(base::PathService::Get(electron::DIR_SESSION_DATA, &prefs_path));
   prefs_path = prefs_path.Append(FILE_PATH_LITERAL("Local State"));
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   scoped_refptr<JsonPrefStore> user_pref_store =
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 6db8fbec2119b..f1d4d25077aac 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1139,11 +1139,11 @@ void ElectronBrowserClient::OnNetworkServiceCreated(
 
 std::vector<base::FilePath>
 ElectronBrowserClient::GetNetworkContextsParentDirectory() {
-  base::FilePath user_data_dir;
-  base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  DCHECK(!user_data_dir.empty());
+  base::FilePath session_data;
+  base::PathService::Get(DIR_SESSION_DATA, &session_data);
+  DCHECK(!session_data.empty());
 
-  return {user_data_dir};
+  return {session_data};
 }
 
 std::string ElectronBrowserClient::GetProduct() {
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index eb640eb3517c2..5d3c74ad3d054 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -120,8 +120,7 @@ ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
   base::StringToInt(command_line->GetSwitchValueASCII(switches::kDiskCacheSize),
                     &max_cache_size_);
 
-  CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));
-
+  base::PathService::Get(DIR_SESSION_DATA, &path_);
   if (!in_memory && !partition.empty())
     path_ = path_.Append(FILE_PATH_LITERAL("Partitions"))
                 .Append(base::FilePath::FromUTF8Unsafe(
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index defb91ab6e1da..5245db81376d3 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -501,7 +501,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
   // https://source.chromium.org/chromium/chromium/src/+/master:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
   config->should_use_preference =
       command_line.HasSwitch(::switches::kEnableEncryptionSelection);
-  base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
+  base::PathService::Get(DIR_SESSION_DATA, &config->user_data_path);
   OSCrypt::SetConfig(std::move(config));
 #endif
 #if BUILDFLAG(IS_POSIX)
diff --git a/shell/browser/ui/devtools_manager_delegate.cc b/shell/browser/ui/devtools_manager_delegate.cc
index 40773b35b2f21..a9aac3cace877 100644
--- a/shell/browser/ui/devtools_manager_delegate.cc
+++ b/shell/browser/ui/devtools_manager_delegate.cc
@@ -91,10 +91,10 @@ const char kBrowserCloseMethod[] = "Browser.close";
 
 // static
 void DevToolsManagerDelegate::StartHttpHandler() {
-  base::FilePath user_dir;
-  base::PathService::Get(chrome::DIR_USER_DATA, &user_dir);
+  base::FilePath session_data;
+  base::PathService::Get(DIR_SESSION_DATA, &session_data);
   content::DevToolsAgentHost::StartRemoteDebuggingServer(
-      CreateSocketFactory(), user_dir, base::FilePath());
+      CreateSocketFactory(), session_data, base::FilePath());
 }
 
 DevToolsManagerDelegate::DevToolsManagerDelegate() = default;
diff --git a/shell/common/electron_paths.h b/shell/common/electron_paths.h
index 6854e97d6ae48..c614f992940bb 100644
--- a/shell/common/electron_paths.h
+++ b/shell/common/electron_paths.h
@@ -23,7 +23,8 @@ enum {
   PATH_START = 11000,
 
   DIR_USER_CACHE = PATH_START,  // Directory where user cache can be written.
-  DIR_APP_LOGS,                 // Directory where app logs live
+  DIR_APP_LOGS,                 // Directory where app logs live.
+  DIR_SESSION_DATA,             // Where cookies, localStorage are stored.
 
 #if BUILDFLAG(IS_WIN)
   DIR_RECENT,  // Directory where recent files live
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 0389b70931a07..f1af0bc512159 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -3,7 +3,7 @@ import * as cp from 'child_process';
 import * as https from 'https';
 import * as http from 'http';
 import * as net from 'net';
-import * as fs from 'fs';
+import * as fs from 'fs-extra';
 import * as path from 'path';
 import { promisify } from 'util';
 import { app, BrowserWindow, Menu, session, net as electronNet } from 'electron/main';
@@ -1078,6 +1078,54 @@ describe('app module', () => {
 
       expect(() => { app.getPath(badPath as any); }).to.throw();
     });
+
+    describe('sessionData', () => {
+      const appPath = path.join(__dirname, 'fixtures', 'apps', 'set-path');
+      const appName = fs.readJsonSync(path.join(appPath, 'package.json')).name;
+      const userDataPath = path.join(app.getPath('appData'), appName);
+      const tempBrowserDataPath = path.join(app.getPath('temp'), appName);
+
+      const sessionFiles = [
+        'Preferences',
+        'Code Cache',
+        'Local Storage',
+        'IndexedDB',
+        'Service Worker'
+      ];
+      const hasSessionFiles = (dir: string) => {
+        for (const file of sessionFiles) {
+          if (!fs.existsSync(path.join(dir, file))) {
+            return false;
+          }
+        }
+        return true;
+      };
+
+      beforeEach(() => {
+        fs.removeSync(userDataPath);
+        fs.removeSync(tempBrowserDataPath);
+      });
+
+      it('writes to userData by default', () => {
+        expect(hasSessionFiles(userDataPath)).to.equal(false);
+        cp.spawnSync(process.execPath, [appPath]);
+        expect(hasSessionFiles(userDataPath)).to.equal(true);
+      });
+
+      it('can be changed', () => {
+        expect(hasSessionFiles(userDataPath)).to.equal(false);
+        cp.spawnSync(process.execPath, [appPath, 'sessionData', tempBrowserDataPath]);
+        expect(hasSessionFiles(userDataPath)).to.equal(false);
+        expect(hasSessionFiles(tempBrowserDataPath)).to.equal(true);
+      });
+
+      it('changing userData affects default sessionData', () => {
+        expect(hasSessionFiles(userDataPath)).to.equal(false);
+        cp.spawnSync(process.execPath, [appPath, 'userData', tempBrowserDataPath]);
+        expect(hasSessionFiles(userDataPath)).to.equal(false);
+        expect(hasSessionFiles(tempBrowserDataPath)).to.equal(true);
+      });
+    });
   });
 
   describe('setAppLogsPath(path)', () => {
diff --git a/spec-main/fixtures/apps/set-path/main.js b/spec-main/fixtures/apps/set-path/main.js
new file mode 100644
index 0000000000000..efc6a624eef5b
--- /dev/null
+++ b/spec-main/fixtures/apps/set-path/main.js
@@ -0,0 +1,43 @@
+const http = require('http');
+const { app, ipcMain, BrowserWindow } = require('electron');
+
+if (process.argv.length > 3) {
+  app.setPath(process.argv[2], process.argv[3]);
+}
+
+const html = `
+<script>
+async function main() {
+  localStorage.setItem('myCat', 'Tom')
+  const db = indexedDB.open('db-name', 1)
+  await new Promise(resolve => db.onsuccess = resolve)
+  await navigator.serviceWorker.register('sw.js', {scope: './'})
+}
+
+main().then(() => {
+  require('electron').ipcRenderer.send('success')
+})
+</script>
+`;
+
+const js = 'console.log("From service worker")';
+
+app.once('ready', () => {
+  ipcMain.on('success', () => {
+    app.quit();
+  });
+
+  const server = http.createServer((request, response) => {
+    if (request.url === '/') {
+      response.writeHead(200, { 'Content-Type': 'text/html' });
+      response.end(html);
+    } else if (request.url === '/sw.js') {
+      response.writeHead(200, { 'Content-Type': 'text/javascript' });
+      response.end(js);
+    }
+  }).listen(0, '127.0.0.1', () => {
+    const serverUrl = 'http://127.0.0.1:' + server.address().port;
+    const mainWindow = new BrowserWindow({ show: false, webPreferences: { webSecurity: true, nodeIntegration: true, contextIsolation: false } });
+    mainWindow.loadURL(serverUrl);
+  });
+});
diff --git a/spec-main/fixtures/apps/set-path/package.json b/spec-main/fixtures/apps/set-path/package.json
new file mode 100644
index 0000000000000..84edf0f3a389a
--- /dev/null
+++ b/spec-main/fixtures/apps/set-path/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron-test-set-path",
+  "main": "main.js"
+}

From 00368aca37c838decd414920e3a9db6447444ea6 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 10 May 2022 05:37:50 +0900
Subject: [PATCH 362/811] chore: stub gtk_native_dialog_get_type (#34141)

---
 shell/browser/ui/electron_gtk.sigs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/browser/ui/electron_gtk.sigs b/shell/browser/ui/electron_gtk.sigs
index 568a270165cbb..451fc74a953d6 100644
--- a/shell/browser/ui/electron_gtk.sigs
+++ b/shell/browser/ui/electron_gtk.sigs
@@ -3,4 +3,5 @@ void gtk_native_dialog_set_modal(GtkNativeDialog* self, gboolean modal);
 void gtk_native_dialog_show(GtkNativeDialog* self);
 void gtk_native_dialog_hide(GtkNativeDialog* self);
 gint gtk_native_dialog_run(GtkNativeDialog* self);
-void gtk_native_dialog_destroy(GtkNativeDialog* self);
\ No newline at end of file
+void gtk_native_dialog_destroy(GtkNativeDialog* self);
+GType gtk_native_dialog_get_type(void);
\ No newline at end of file

From 53912118243ed64378e98f1c92b1d06e3919288b Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 18:55:49 -0400
Subject: [PATCH 363/811] chore: bump node to v16.15.0 (main) (#33947)

* chore: bump node in DEPS to v16.15.0

* chore: update patches

* src: allow preventing InitializeInspector in env

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

* chore: update node gn filenames

* crypto: change default check(Host|Email) behavior

* Revert "crypto: change default check(Host|Email) behavior"

This reverts commit 1f1eb23702fe9dfc09470248d6c1a673f42b80fe.

* update node crypto tests to work with boringssl

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 DEPS                                          |  2 +-
 patches/node/.patches                         |  2 -
 patches/node/build_add_gn_build_files.patch   | 12 ++-
 ...de_entrypoint_to_be_a_builtin_module.patch |  8 +-
 .../chore_fix_-wimplicit-fallthrough.patch    | 10 +--
 ...owserglobals_from_global_not_process.patch |  2 +-
 ...is_on_64bit_arch_and_ptr_compression.patch |  4 +-
 ...nalhandler_to_environment_to_prevent.patch | 28 +++----
 .../node/feat_initialize_asar_support.patch   |  6 +-
 ..._values_for_variables_in_common_gypi.patch |  4 +-
 ...everse_jsargs_defines_in_common_gypi.patch |  6 +-
 ...reventing_initializeinspector_in_env.patch | 81 -------------------
 .../fix_crypto_tests_to_run_with_bssl.patch   | 49 +++++++++--
 ...console_window_when_creating_process.patch | 25 ------
 ...se_tracing_tracingcontroller_instead.patch |  8 +-
 ...ingssl_and_openssl_incompatibilities.patch | 14 ++--
 .../pass_all_globals_through_require.patch    |  4 +-
 ...dder_overriding_of_internal_fs_calls.patch |  4 +-
 ...cess_fork_to_use_execute_script_with.patch |  2 +-
 ...rash_when_sharedarraybuffer_disabled.patch |  4 +-
 ...to_provide_a_custom_pageallocator_to.patch |  6 +-
 .../node/worker_thread_add_asar_support.patch | 10 +--
 shell/common/node_bindings.cc                 |  2 +-
 23 files changed, 111 insertions(+), 182 deletions(-)
 delete mode 100644 patches/node/fix_allow_preventing_initializeinspector_in_env.patch
 delete mode 100644 patches/node/fix_don_t_create_console_window_when_creating_process.patch

diff --git a/DEPS b/DEPS
index f6d9b49af0592..32458aa34c76b 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '102.0.4999.0',
   'node_version':
-    'v16.14.2',
+    'v16.15.0',
   'nan_version':
     # The following commit hash of NAN is v2.14.2 with *only* changes to the
     # test suite. This should be updated to a specific tag when one becomes
diff --git a/patches/node/.patches b/patches/node/.patches
index 963b9aa10808e..d1df090471f84 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -13,7 +13,6 @@ chore_read_nobrowserglobals_from_global_not_process.patch
 enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
 fix_handle_boringssl_and_openssl_incompatibilities.patch
 fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
-fix_allow_preventing_initializeinspector_in_env.patch
 src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
 fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
@@ -22,7 +21,6 @@ fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
 chore_fix_-wimplicit-fallthrough.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
-fix_don_t_create_console_window_when_creating_process.patch
 fix_serdes_test.patch
 darwin_remove_eprototype_error_workaround_3405.patch
 darwin_translate_eprototype_to_econnreset_3413.patch
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index de7fc0acfc4d5..788c5dc5bcf6d 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -973,10 +973,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
 +}
 diff --git a/filenames.json b/filenames.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424afb63ca5
+index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6de1bd518
 --- /dev/null
 +++ b/filenames.json
-@@ -0,0 +1,612 @@
+@@ -0,0 +1,616 @@
 +// This file is automatically generated by generate_gn_filenames_json.py
 +// DO NOT EDIT
 +{
@@ -1233,6 +1233,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
 +    "lib/internal/cluster/primary.js",
 +    "lib/internal/cluster/utils.js",
 +    "lib/internal/cluster/child.js",
++    "lib/internal/webstreams/compression.js",
 +    "lib/internal/webstreams/util.js",
 +    "lib/internal/webstreams/writablestream.js",
 +    "lib/internal/webstreams/readablestream.js",
@@ -1314,6 +1315,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
 +    "lib/internal/modules/package_json_reader.js",
 +    "lib/internal/modules/esm/module_job.js",
 +    "lib/internal/modules/esm/assert.js",
++    "lib/internal/modules/esm/fetch_module.js",
 +    "lib/internal/modules/esm/get_source.js",
 +    "lib/internal/modules/esm/translators.js",
 +    "lib/internal/modules/esm/resolve.js",
@@ -1323,6 +1325,7 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
 +    "lib/internal/modules/esm/initialize_import_meta.js",
 +    "lib/internal/modules/esm/module_map.js",
 +    "lib/internal/modules/esm/get_format.js",
++    "lib/internal/modules/esm/formats.js",
 +    "lib/internal/modules/esm/loader.js",
 +    "lib/internal/modules/cjs/helpers.js",
 +    "lib/internal/modules/cjs/loader.js",
@@ -1381,7 +1384,8 @@ index 0000000000000000000000000000000000000000..d2d196a59037ed32800ab6981c6a7424
 +    "deps/acorn/acorn/dist/acorn.js",
 +    "deps/acorn/acorn-walk/dist/walk.js",
 +    "deps/cjs-module-lexer/lexer.js",
-+    "deps/cjs-module-lexer/dist/lexer.js"
++    "deps/cjs-module-lexer/dist/lexer.js",
++    "deps/undici/undici.js"
 +  ],
 +  "node_sources": [
 +    "src/api/async_resource.cc",
@@ -1795,7 +1799,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
 +  args = rebase_path(inputs + outputs, root_build_dir)
 +}
 diff --git a/src/node_version.h b/src/node_version.h
-index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aacb48a6f60 100644
+index 29c9be6366d63be7b340b35cea141e4d7e7f71cc..587735f2ddc0e5d93edd8644d121c6fb31fc4378 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@
diff --git a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
index b921424c37b37..63740ebc306f6 100644
--- a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
+++ b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
@@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form
 of this.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07b9db76a0 100644
+index b184a0d9ae3434af746be269495e9e4c80c58091..899d5a906683e8967746e10a6de452e99e236903 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -95,11 +95,13 @@ function patchProcessObject(expandArgv1) {
+@@ -103,11 +103,13 @@ function patchProcessObject(expandArgv1) {
    if (expandArgv1 && process.argv[1] &&
        !StringPrototypeStartsWith(process.argv[1], '-')) {
      // Expand process.argv[1] into a full path.
@@ -31,10 +31,10 @@ index 3c5e6fe40070f52d8b3f4e9757485845c1d6dbed..2af6b11c97ecdca3c40792ab35c69b07
    }
  
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index caca939942cb721a3efde7005b0a987a19237a8b..2d30a56a87ff8657cddb3d9e6af5bd9f81deffdb 100644
+index 5195ff2da0496f2bfb9112d336c38040f662087b..5c62e367f2dd7d112096551f1c34ee67ce1a5c3a 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1077,6 +1077,13 @@ Module.prototype._compile = function(content, filename) {
+@@ -1079,6 +1079,13 @@ Module.prototype._compile = function(content, filename) {
    if (getOptionValue('--inspect-brk') && process._eval == null) {
      if (!resolvedArgv) {
        // We enter the repl if we're not given a filename argument.
diff --git a/patches/node/chore_fix_-wimplicit-fallthrough.patch b/patches/node/chore_fix_-wimplicit-fallthrough.patch
index 5b3103652136e..41f961ad0e5c9 100644
--- a/patches/node/chore_fix_-wimplicit-fallthrough.patch
+++ b/patches/node/chore_fix_-wimplicit-fallthrough.patch
@@ -18,10 +18,10 @@ index 8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8..63e1149f0c4a39cb944114e5824d6074
      "-Wno-unreachable-code-return",
      "-Wno-unused-but-set-variable",
 diff --git a/deps/nghttp2/lib/nghttp2_hd.c b/deps/nghttp2/lib/nghttp2_hd.c
-index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a36f35f73 100644
+index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275cc1656469 100644
 --- a/deps/nghttp2/lib/nghttp2_hd.c
 +++ b/deps/nghttp2/lib/nghttp2_hd.c
-@@ -1891,7 +1891,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -1892,7 +1892,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
          rv = NGHTTP2_ERR_HEADER_COMP;
          goto fail;
        }
@@ -30,7 +30,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
      case NGHTTP2_HD_STATE_INFLATE_START:
      case NGHTTP2_HD_STATE_OPCODE:
        if ((*in & 0xe0u) == 0x20u) {
-@@ -2001,7 +2001,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -2002,7 +2002,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
        inflater->left = 0;
        inflater->shift = 0;
        DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -39,7 +39,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
      case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
        rfin = 0;
        rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-@@ -2085,7 +2085,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
+@@ -2086,7 +2086,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
        inflater->left = 0;
        inflater->shift = 0;
        DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
@@ -49,7 +49,7 @@ index 5e8693152599215261e47b152d565bbd9a0083e7..6d54e91dea6d77ad8925ad0452fd2a0a
        rfin = 0;
        rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
 diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
-index 36f1179f72a22595dda0b98927d87e2098cad4df..f007dbf410b1bdc5d1f603aa85c3a4f0704e9741 100644
+index 380a47c1b1e82b015c271e2818aed0baf982aa2d..2f3997709cd07f6f8294f985f60b2e1e4b85a2cf 100644
 --- a/deps/nghttp2/lib/nghttp2_session.c
 +++ b/deps/nghttp2/lib/nghttp2_session.c
 @@ -2644,10 +2644,10 @@ static int session_after_frame_sent1(nghttp2_session *session) {
diff --git a/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch b/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
index a666b1d9744f7..b47a91bbe02ed 100644
--- a/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
+++ b/patches/node/chore_read_nobrowserglobals_from_global_not_process.patch
@@ -7,7 +7,7 @@ This is used so that we can modify the flag at runtime where
 config can only be set at compile time.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 085dd7e09d31fb1800b3596cc068637e1956ba52..9e0f811b2a37f45a9d8162dff7c9d5c935b856d6 100644
+index 8c31d0202b70ec9784b4289a175a62fd9fd85f8c..2b4c7a933d7f87050f7342e6c3ae2070e3dde030 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
 @@ -209,7 +209,7 @@ const {
diff --git a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
index 6b9b4d53271ba..d6ef9a68a08c7 100644
--- a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
+++ b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
@@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid
 out in memory on 64-bit machines, and will summarily fail to work.
 
 diff --git a/common.gypi b/common.gypi
-index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3f5e8eece 100644
+index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..7ffd577817d3c6ae7164dd3945479aedcee9640e 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -64,7 +64,7 @@
@@ -20,7 +20,7 @@ index b86c3f3bbeddfa57c223ff066451fd3e1ce1315d..59e6a857060a35ca52cff2b44bc412a3
  
      # Disable V8 untrusted code mitigations.
      # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-@@ -130,6 +130,9 @@
+@@ -133,6 +133,9 @@
          'v8_enable_pointer_compression': 0,
          'v8_enable_31bit_smis_on_64bit_arch': 0,
        }],
diff --git a/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
index 3deaaeccdc157..eff6170cab0b4 100644
--- a/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
+++ b/patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
@@ -7,11 +7,11 @@ Subject: feat: add kNoStartDebugSignalHandler to Environment to prevent
 This patch should be upstreamed, it allows embedders to prevent the call to StartDebugSignalHandler which handles SIGUSR1 and starts the inspector agent.  Apps that have --inspect disabled also don't want SIGUSR1 to have this affect.
 
 diff --git a/src/env-inl.h b/src/env-inl.h
-index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1dfeacab3 100644
+index 4a34393cad7e071bf27947418be6b3d9bdd42f98..b9834a797c89f707d1e4978587af66ebf11591d4 100644
 --- a/src/env-inl.h
 +++ b/src/env-inl.h
-@@ -886,6 +886,10 @@ inline bool Environment::should_initialize_inspector() const {
-   return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
+@@ -886,6 +886,10 @@ inline bool Environment::no_global_search_paths() const {
+          !options_->global_search_paths;
  }
  
 +inline bool Environment::should_start_debug_signal_handler() const {
@@ -22,22 +22,22 @@ index 2da8174fe9e4209f4705af0a1cf8bca5928f088c..954602f3fc7c3344509bb57530840bb1
    return emit_filehandle_warning_;
  }
 diff --git a/src/env.h b/src/env.h
-index 2554c530f2ca7078ed0cca03968b31f56027231b..1fbf965788f9c68d2999f38b40d39579f746d768 100644
+index cda7a52fa1ffc66d7ba42de3a275f49093f8557d..86f3c718ada13ee71e5af87e1b3772f39274cf43 100644
 --- a/src/env.h
 +++ b/src/env.h
 @@ -1216,6 +1216,7 @@ class Environment : public MemoryRetainer {
+   inline bool tracks_unmanaged_fds() const;
    inline bool hide_console_windows() const;
    inline bool no_global_search_paths() const;
-   inline bool should_initialize_inspector() const;
 +  inline bool should_start_debug_signal_handler() const;
    inline uint64_t thread_id() const;
    inline worker::Worker* worker_context() const;
    Environment* worker_parent_env() const;
 diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
-index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a4099ca1966c 100644
+index 5fc533741d7c8d7a8471b3c3c6a334c0e9e43501..2c36a0b132cf1b21595ac39619b99d316ad81d9e 100644
 --- a/src/inspector_agent.cc
 +++ b/src/inspector_agent.cc
-@@ -680,8 +680,10 @@ bool Agent::Start(const std::string& path,
+@@ -690,8 +690,10 @@ bool Agent::Start(const std::string& path,
                                StartIoThreadAsyncCallback));
      uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
      start_io_thread_async.data = this;
@@ -51,19 +51,19 @@ index fd9f514b9b6a7b7b1c1a6f5fe834f51266156596..14565f6885b3f88194b3b8efb340a409
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.h b/src/node.h
-index b2b766f242e02593631be087fceaf63f71d74284..535df2d8dfb48ddc4d01e94565fdc527aed15ef7 100644
+index 0a9f5139276eb2e102b41a586adf61fa563b47d6..0b807cb25f9eb52b2100f0e2a7c25344790967cf 100644
 --- a/src/node.h
 +++ b/src/node.h
-@@ -444,7 +444,11 @@ enum Flags : uint64_t {
-   // Controls whether or not the Environment should call InitializeInspector.
+@@ -445,7 +445,11 @@ enum Flags : uint64_t {
    // This control is needed by embedders who may not want to initialize the V8
-   // inspector in situations where it already exists.
--  kNoInitializeInspector = 1 << 8
-+  kNoInitializeInspector = 1 << 8,
+   // inspector in situations where one has already been created,
+   // e.g. Blink's in Chromium.
+-  kNoCreateInspector = 1 << 9
++  kNoCreateInspector = 1 << 9,
 +  // Controls where or not the InspectorAgent for this Environment should
 +  // call StartDebugSignalHandler.  This control is needed by embedders who may
 +  // not want to allow other processes to start the V8 inspector.
-+  kNoStartDebugSignalHandler = 1 << 9
++  kNoStartDebugSignalHandler = 1 << 10
  };
  }  // namespace EnvironmentFlags
  
diff --git a/patches/node/feat_initialize_asar_support.patch b/patches/node/feat_initialize_asar_support.patch
index 350139338d233..a7901aba7994f 100644
--- a/patches/node/feat_initialize_asar_support.patch
+++ b/patches/node/feat_initialize_asar_support.patch
@@ -6,10 +6,10 @@ Subject: feat: initialize asar support
 This patch initializes asar support in Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index f21ba048b4863863e6c7b740f410775776a7649a..3c5e6fe40070f52d8b3f4e9757485845c1d6dbed 100644
+index 8de57a5666131ff0c9f7ad844498e1bd3c357a70..b184a0d9ae3434af746be269495e9e4c80c58091 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -76,6 +76,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
+@@ -84,6 +84,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
    assert(!CJSLoader.hasLoadedAnyUserCJSModule);
    loadPreloadModules();
    initializeFrozenIntrinsics();
@@ -17,7 +17,7 @@ index f21ba048b4863863e6c7b740f410775776a7649a..3c5e6fe40070f52d8b3f4e9757485845
  }
  
  function patchProcessObject(expandArgv1) {
-@@ -477,6 +478,10 @@ function loadPreloadModules() {
+@@ -540,6 +541,10 @@ function loadPreloadModules() {
    }
  }
  
diff --git a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
index 3278701357152..aba4b338e5f86 100644
--- a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
+++ b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
@@ -7,10 +7,10 @@ common.gypi is a file that's included in the node header bundle, despite
 the fact that we do not build node with gyp.
 
 diff --git a/common.gypi b/common.gypi
-index be30169cf58d9759320f1763ede7e0ce89be3aa2..b86c3f3bbeddfa57c223ff066451fd3e1ce1315d 100644
+index bdc2c105abeddc4c8e434ead05ebc0d7d82cfae8..3fd1d4ddddc109dfd87f4ba6115948f1c31b1261 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -81,6 +81,23 @@
+@@ -84,6 +84,23 @@
  
      ##### end V8 defaults #####
  
diff --git a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
index cc2b2f0f7cbb4..b8578ea1afcc4 100644
--- a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+++ b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
@@ -6,7 +6,7 @@ Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi
 This can be removed once node upgrades V8 and inevitably has to do this exact same thing.  Also hi node people if you are looking at this.
 
 diff --git a/common.gypi b/common.gypi
-index 59e6a857060a35ca52cff2b44bc412a3f5e8eece..7741f97758282d1c601eecf263cb4ce1510be284 100644
+index 7ffd577817d3c6ae7164dd3945479aedcee9640e..6674f9f9b8880c40db579664fa40f62ad0139368 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -65,6 +65,7 @@
@@ -17,7 +17,7 @@ index 59e6a857060a35ca52cff2b44bc412a3f5e8eece..7741f97758282d1c601eecf263cb4ce1
  
      # Disable V8 untrusted code mitigations.
      # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-@@ -79,6 +80,7 @@
+@@ -82,6 +83,7 @@
      # TODO(refack): make v8-perfetto happen
      'v8_use_perfetto': 0,
  
@@ -25,7 +25,7 @@ index 59e6a857060a35ca52cff2b44bc412a3f5e8eece..7741f97758282d1c601eecf263cb4ce1
      ##### end V8 defaults #####
  
      # When building native modules using 'npm install' with the system npm,
-@@ -398,6 +400,9 @@
+@@ -401,6 +403,9 @@
        ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
          'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
        }],
diff --git a/patches/node/fix_allow_preventing_initializeinspector_in_env.patch b/patches/node/fix_allow_preventing_initializeinspector_in_env.patch
deleted file mode 100644
index 8cfa46d3819e0..0000000000000
--- a/patches/node/fix_allow_preventing_initializeinspector_in_env.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Tue, 22 Sep 2020 19:44:30 -0700
-Subject: fix: allow preventing InitializeInspector in env
-
-https://github.com/nodejs/node/commit/8c5ad1392f30cfe6b107e9bd85f4cb918ba04aab
-made it such that env->InitializeInspector was called in CreateEnvironment
-no matter what, which creates an issue for Electron, as the V8 inspector
-already exists in the renderer process and therefore we only want to
-initialize it in the browser process. This adds a new
-EnvironmentFlags option which allows preventing that invocation.
-
-diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 523d252e08974a10f9a53fb46d3345669cec3380..5bf19a0dda42849159d954181058897c45d280fd 100644
---- a/src/api/environment.cc
-+++ b/src/api/environment.cc
-@@ -344,12 +344,14 @@ Environment* CreateEnvironment(
-   Environment* env = new Environment(
-       isolate_data, context, args, exec_args, nullptr, flags, thread_id);
- #if HAVE_INSPECTOR
--  if (inspector_parent_handle) {
--    env->InitializeInspector(
--        std::move(static_cast<InspectorParentHandleImpl*>(
--            inspector_parent_handle.get())->impl));
--  } else {
--    env->InitializeInspector({});
-+  if (env->should_initialize_inspector()) {
-+    if (inspector_parent_handle) {
-+      env->InitializeInspector(
-+          std::move(static_cast<InspectorParentHandleImpl*>(
-+              inspector_parent_handle.get())->impl));
-+    } else {
-+      env->InitializeInspector({});
-+    }
-   }
- #endif
- 
-diff --git a/src/env-inl.h b/src/env-inl.h
-index e679780900abc9f6b6d1d6baa52576df278be8c7..2da8174fe9e4209f4705af0a1cf8bca5928f088c 100644
---- a/src/env-inl.h
-+++ b/src/env-inl.h
-@@ -882,6 +882,10 @@ inline bool Environment::no_global_search_paths() const {
-          !options_->global_search_paths;
- }
- 
-+inline bool Environment::should_initialize_inspector() const {
-+  return (flags_ & EnvironmentFlags::kNoInitializeInspector) == 0;
-+}
-+
- bool Environment::filehandle_close_warning() const {
-   return emit_filehandle_warning_;
- }
-diff --git a/src/env.h b/src/env.h
-index 7aa5822abf11f1858d1ef8551cfc7a8c3d931f1e..2554c530f2ca7078ed0cca03968b31f56027231b 100644
---- a/src/env.h
-+++ b/src/env.h
-@@ -1215,6 +1215,7 @@ class Environment : public MemoryRetainer {
-   inline bool tracks_unmanaged_fds() const;
-   inline bool hide_console_windows() const;
-   inline bool no_global_search_paths() const;
-+  inline bool should_initialize_inspector() const;
-   inline uint64_t thread_id() const;
-   inline worker::Worker* worker_context() const;
-   Environment* worker_parent_env() const;
-diff --git a/src/node.h b/src/node.h
-index 70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8..7ca7502e086190c87ae6a61dca2192253894e906 100644
---- a/src/node.h
-+++ b/src/node.h
-@@ -439,7 +439,11 @@ enum Flags : uint64_t {
-   // $HOME/.node_modules and $NODE_PATH. This is used by standalone apps that
-   // do not expect to have their behaviors changed because of globally
-   // installed modules.
--  kNoGlobalSearchPaths = 1 << 7
-+  kNoGlobalSearchPaths = 1 << 7,
-+  // Controls whether or not the Environment should call InitializeInspector.
-+  // This control is needed by embedders who may not want to initialize the V8
-+  // inspector in situations where it already exists.
-+  kNoInitializeInspector = 1 << 8
- };
- }  // namespace EnvironmentFlags
- 
diff --git a/patches/node/fix_crypto_tests_to_run_with_bssl.patch b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
index 20e89d87ef6be..44a303b93a03b 100644
--- a/patches/node/fix_crypto_tests_to_run_with_bssl.patch
+++ b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
@@ -31,7 +31,7 @@ index 4e3c32fdcd23fbe3e74bd5e624b739d224689f33..19d65aae7fa8ec9f9b907733ead17a20
  // Test Parallel Execution w/ KeyObject is threadsafe in openssl3
  {
 diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
-index 21c5af6cfe3e5eef64fc2d4dcc63c55b1d79ad51..b21eb4b97ad778304b3a4e8d549e109614350dfb 100644
+index 3749895769ffc9947143aee9aeb126628262bc84..f769fc37dbd81d5a0219236921e0bcb0de416463 100644
 --- a/test/parallel/test-crypto-authenticated.js
 +++ b/test/parallel/test-crypto-authenticated.js
 @@ -50,7 +50,9 @@ const errMessages = {
@@ -739,7 +739,7 @@ index d1782359277dc52d7a60830a6dd958544d610e6b..4c781f062bc505b860b821773070551f
 +  assert.match(legacyObject.serialNumber, legacyObjectCheck.serialNumberPattern);
  }
 diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
-index 58441be4d093f06cac3d47e2fa752f2354a49f8a..36a91946c8ad23250a47c433c1216ec9cb14f0e1 100644
+index a8ceb169de2b3de73f062083c42292babc673e73..a3bb574d0e5dc85b4ba3fb0b3bd8782fbb8c8700 100644
 --- a/test/parallel/test-crypto.js
 +++ b/test/parallel/test-crypto.js
 @@ -67,7 +67,7 @@ assert.throws(() => {
@@ -769,16 +769,16 @@ index 58441be4d093f06cac3d47e2fa752f2354a49f8a..36a91946c8ad23250a47c433c1216ec9
           !('opensslErrorStack' in err);
  });
  
-@@ -137,8 +137,6 @@ assert(crypto.getHashes().includes('sha1'));
+@@ -150,8 +150,6 @@ assert(crypto.getHashes().includes('sha1'));
  assert(crypto.getHashes().includes('sha256'));
  assert(!crypto.getHashes().includes('SHA1'));
  assert(!crypto.getHashes().includes('SHA256'));
 -assert(crypto.getHashes().includes('RSA-SHA1'));
 -assert(!crypto.getHashes().includes('rsa-sha1'));
  validateList(crypto.getHashes());
- 
- // Assume that we have at least secp384r1.
-@@ -172,7 +170,7 @@ const encodingError = {
+ // Make sure all of the hashes are supported by OpenSSL
+ for (const algo of crypto.getHashes())
+@@ -188,7 +186,7 @@ const encodingError = {
  // hex input that's not a power of two should throw, not assert in C++ land.
  ['createCipher', 'createDecipher'].forEach((funcName) => {
    assert.throws(
@@ -787,7 +787,7 @@ index 58441be4d093f06cac3d47e2fa752f2354a49f8a..36a91946c8ad23250a47c433c1216ec9
      (error) => {
        assert.ok(!('opensslErrorStack' in error));
        if (common.hasFipsCrypto) {
-@@ -224,15 +222,15 @@ assert.throws(() => {
+@@ -240,15 +238,15 @@ assert.throws(() => {
      library: 'rsa routines',
    } : {
      name: 'Error',
@@ -808,7 +808,7 @@ index 58441be4d093f06cac3d47e2fa752f2354a49f8a..36a91946c8ad23250a47c433c1216ec9
  if (!common.hasOpenSSL3) {
    assert.throws(() => {
      // The correct header inside `rsa_private_pkcs8_bad.pem` should have been
-@@ -260,7 +258,7 @@ if (!common.hasOpenSSL3) {
+@@ -276,7 +274,7 @@ if (!common.hasOpenSSL3) {
      return true;
    });
  }
@@ -1010,3 +1010,36 @@ index 1094845c73e14313860ad476fb7baba2a11b5af4..51972b4b34b191ac59145889dbf2da5c
  };
  
  function generateWrappingKeys() {
+diff --git a/test/parallel/test-x509-escaping.js b/test/parallel/test-x509-escaping.js
+index 99418e4c0bf21c26d5ba0ad9d617419abc625593..fc129b26ea13895353d6ede26bb2d91695c94ba4 100644
+--- a/test/parallel/test-x509-escaping.js
++++ b/test/parallel/test-x509-escaping.js
+@@ -425,11 +425,11 @@ const { hasOpenSSL3 } = common;
+   assert.strictEqual(certX509.subjectAltName, 'DNS:evil.example.com');
+ 
+   // The newer X509Certificate API allows customizing this behavior:
+-  assert.strictEqual(certX509.checkHost(servername), servername);
++  assert.strictEqual(certX509.checkHost(servername), undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'default' }),
+                      undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'always' }),
+-                     servername);
++                     undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'never' }),
+                      undefined);
+ 
+@@ -464,11 +464,11 @@ const { hasOpenSSL3 } = common;
+   assert.strictEqual(certX509.subjectAltName, 'IP Address:1.2.3.4');
+ 
+   // The newer X509Certificate API allows customizing this behavior:
+-  assert.strictEqual(certX509.checkHost(servername), servername);
++  assert.strictEqual(certX509.checkHost(servername), undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'default' }),
+-                     servername);
++                     undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'always' }),
+-                     servername);
++                     undefined);
+   assert.strictEqual(certX509.checkHost(servername, { subject: 'never' }),
+                      undefined);
+ 
diff --git a/patches/node/fix_don_t_create_console_window_when_creating_process.patch b/patches/node/fix_don_t_create_console_window_when_creating_process.patch
deleted file mode 100644
index 2ae896f558c86..0000000000000
--- a/patches/node/fix_don_t_create_console_window_when_creating_process.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raymond Zhao <raymondzhao@microsoft.com>
-Date: Tue, 4 Jan 2022 16:11:41 -0800
-Subject: fix: Don't create console window when creating process
-
-This patch prevents console windows from being created during
-execSync calls, or spawnSync calls where shell is true. Otherwise,
-Windows users will see command prompts pop up for those calls.
-
-The patch has been upstreamed at https://github.com/nodejs/node/pull/41412.
-
-diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
-index 1141aceae984fba6ed07cd272a79d4007b9b03fe..afd08519d7f8974adff4060513f6160519a0b6b3 100644
---- a/src/spawn_sync.cc
-+++ b/src/spawn_sync.cc
-@@ -810,6 +810,9 @@ Maybe<int> SyncProcessRunner::ParseOptions(Local<Value> js_value) {
-   if (js_win_hide->BooleanValue(isolate))
-     uv_process_options_.flags |= UV_PROCESS_WINDOWS_HIDE;
- 
-+  if (env()->hide_console_windows())
-+    uv_process_options_.flags |= UV_PROCESS_WINDOWS_HIDE_CONSOLE;
-+
-   Local<Value> js_wva =
-       js_options->Get(context, env()->windows_verbatim_arguments_string())
-           .ToLocalChecked();
diff --git a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
index 97e7fb79cfe5a..b374abb78a810 100644
--- a/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
+++ b/patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
@@ -7,10 +7,10 @@ Subject: fix: expose tracing::Agent and use tracing::TracingController instead
 This API is used by Electron to create Node's tracing controller.
 
 diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 0fb750c5abbe00740f2095ec397c823e26666199..523d252e08974a10f9a53fb46d3345669cec3380 100644
+index 55b895c235f51eb7bcbd8cd4065b42a05208026a..1add2976e7c48e6704400b9ea0795b934ab0bfc2 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
-@@ -459,6 +459,10 @@ MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env) {
+@@ -461,6 +461,10 @@ MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env) {
    return env->platform();
  }
  
@@ -22,7 +22,7 @@ index 0fb750c5abbe00740f2095ec397c823e26666199..523d252e08974a10f9a53fb46d334566
      int thread_pool_size,
      node::tracing::TracingController* tracing_controller) {
 diff --git a/src/node.h b/src/node.h
-index 5b1404ff8e290a505a1143b582494e9a3319a183..70518ba49b3bcbfaf2e46ba8ddc3f04236bc27b8 100644
+index 966edcd041be1bded2c3a86e5734d2849019c372..9b9ff1c86ceeaeca828328065e2ad5573ea17fc5 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -118,6 +118,7 @@ namespace node {
@@ -33,7 +33,7 @@ index 5b1404ff8e290a505a1143b582494e9a3319a183..70518ba49b3bcbfaf2e46ba8ddc3f042
  class TracingController;
  
  }
-@@ -518,6 +519,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
+@@ -523,6 +524,8 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> PrepareStackTraceCallback(
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(Environment* env);
  NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env);
  
diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
index f7b4c08817e12..5f0d8ae50dab9 100644
--- a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
+++ b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -17,10 +17,10 @@ Upstreams:
 - https://github.com/nodejs/node/pull/39136
 
 diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
-index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda45426038d199 100644
+index a5aa39c23c1708ac27564a1a77a9f05fc07791e2..630a3400e74f20b1dbee17027c7dbe8688fed4b2 100644
 --- a/src/crypto/crypto_common.cc
 +++ b/src/crypto/crypto_common.cc
-@@ -176,7 +176,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
+@@ -162,7 +162,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
    const unsigned char* buf;
    size_t len;
    size_t rem;
@@ -29,7 +29,7 @@ index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda4542
    if (!SSL_client_hello_get0_ext(
            ssl.get(),
            TLSEXT_TYPE_application_layer_protocol_negotiation,
-@@ -189,13 +189,15 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
+@@ -175,13 +175,15 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
    len = (buf[0] << 8) | buf[1];
    if (len + 2 != rem) return nullptr;
    return reinterpret_cast<const char*>(buf + 3);
@@ -46,7 +46,7 @@ index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda4542
    if (!SSL_client_hello_get0_ext(
            ssl.get(),
            TLSEXT_TYPE_server_name,
-@@ -217,6 +219,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
+@@ -203,6 +205,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
    if (len + 2 > rem)
      return nullptr;
    return reinterpret_cast<const char*>(buf + 5);
@@ -55,7 +55,7 @@ index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda4542
  }
  
  const char* GetServerName(SSL* ssl) {
-@@ -224,7 +228,10 @@ const char* GetServerName(SSL* ssl) {
+@@ -210,7 +214,10 @@ const char* GetServerName(SSL* ssl) {
  }
  
  bool SetGroups(SecureContext* sc, const char* groups) {
@@ -66,7 +66,7 @@ index f830da2cfba18ae2f7ad02fa862122780c956c80..51b26af969d5c84c741563297fda4542
  }
  
  const char* X509ErrorCode(long err) {  // NOLINT(runtime/int)
-@@ -1126,14 +1133,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
+@@ -1101,14 +1108,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
      Environment* env,
      const SSLPointer& ssl) {
    EscapableHandleScope scope(env->isolate());
@@ -304,7 +304,7 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
  }  // namespace
  
 diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
-index 5060fc3f2fbd67d8b33975f2512cbd7cf7fedf1a..4f86810f8366b490ca2293cd1a811e69a199f708 100644
+index c431159e6f77f8c86844bcadb86012b056d03372..0ce3a8f219a2952f660ff72a6ce36ee109add649 100644
 --- a/src/crypto/crypto_util.h
 +++ b/src/crypto/crypto_util.h
 @@ -16,7 +16,9 @@
diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch
index ee776addc06a7..63e91ad95678d 100644
--- a/patches/node/pass_all_globals_through_require.patch
+++ b/patches/node/pass_all_globals_through_require.patch
@@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
 (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
 
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index cfe2982bf22c245d3249a743e341c9948d98c18b..2c188ae0b5cb86493a7fd701c343b36370369f20 100644
+index b4902850c7fec5bb67c9566f40ca1cdd2ba17b55..200c352cfd7321c47f37776589cfca397cad5d25 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -127,6 +127,13 @@ const {
@@ -23,7 +23,7 @@ index cfe2982bf22c245d3249a743e341c9948d98c18b..2c188ae0b5cb86493a7fd701c343b363
  const {
    isProxy
  } = require('internal/util/types');
-@@ -1098,10 +1105,12 @@ Module.prototype._compile = function(content, filename) {
+@@ -1100,10 +1107,12 @@ Module.prototype._compile = function(content, filename) {
    if (requireDepth === 0) statCache = new SafeMap();
    if (inspectorWrapper) {
      result = inspectorWrapper(compiledWrapper, thisValue, exports,
diff --git a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
index ff492a0b6b9b0..c6ffa555f14c1 100644
--- a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
+++ b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch
@@ -7,7 +7,7 @@ We use this to allow node's 'fs' module to read from ASAR files as if they were
 a real filesystem.
 
 diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
-index 1393cc20f45db69c9e133e25ac9428fcb6d81100..085dd7e09d31fb1800b3596cc068637e1956ba52 100644
+index dfae7675e16a6a81e40c69d85004fc841cadf738..8c31d0202b70ec9784b4289a175a62fd9fd85f8c 100644
 --- a/lib/internal/bootstrap/node.js
 +++ b/lib/internal/bootstrap/node.js
 @@ -66,6 +66,10 @@ setupBuffer();
@@ -22,7 +22,7 @@ index 1393cc20f45db69c9e133e25ac9428fcb6d81100..085dd7e09d31fb1800b3596cc068637e
  const nativeModule = internalBinding('native_module');
  
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
-index 2c188ae0b5cb86493a7fd701c343b36370369f20..caca939942cb721a3efde7005b0a987a19237a8b 100644
+index 200c352cfd7321c47f37776589cfca397cad5d25..5195ff2da0496f2bfb9112d336c38040f662087b 100644
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
 @@ -86,7 +86,7 @@ const fs = require('fs');
diff --git a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
index 67c1845b31c13..5157829f69aa6 100644
--- a/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
+++ b/patches/node/refactor_alter_child_process_fork_to_use_execute_script_with.patch
@@ -7,7 +7,7 @@ Subject: refactor: alter child_process.fork to use execute script with
 When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary.
 
 diff --git a/lib/child_process.js b/lib/child_process.js
-index a7ef8ba1e4af1aaabf88ea424b0a101397f7eb16..9cd99a7440ee4d2273fe94a0d51b4bf4051f612d 100644
+index 415010241cdabac42ea79601c464bae4a2081c78..5c202237ecdf32afe89b5a5b4dfc2cf648fb9d23 100644
 --- a/lib/child_process.js
 +++ b/lib/child_process.js
 @@ -160,6 +160,15 @@ function fork(modulePath, args = [], options) {
diff --git a/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch b/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
index 510461bd8a1be..dae469157d32e 100644
--- a/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
+++ b/patches/node/repl_fix_crash_when_sharedarraybuffer_disabled.patch
@@ -25,7 +25,7 @@ index a771b1813731edf4f0dd60f3505799e389f1d876..b9461677e2d7d1df192e752496e62cca
    bench.start();
    for (let i = 0; i < n; i++)
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index 65827ecd593ffb050484152fc6d31411fd3e4dcc..2e5d6b01d86e34549c1c7a3d3128350cad2b0c47 100644
+index a8167b86ca2e5a11b2628e20063849e85a200a8c..110a3ed1637b642b1d83fb36549cced151b9c5cd 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
 @@ -9,7 +9,7 @@ const {
@@ -37,7 +37,7 @@ index 65827ecd593ffb050484152fc6d31411fd3e4dcc..2e5d6b01d86e34549c1c7a3d3128350c
  } = primordials;
  
  const {
-@@ -142,6 +142,9 @@ port.on('message', (message) => {
+@@ -146,6 +146,9 @@ port.on('message', (message) => {
      const originalCwd = process.cwd;
  
      process.cwd = function() {
diff --git a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
index 08195a21f54d5..81619a8926da2 100644
--- a/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
+++ b/patches/node/src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
@@ -12,7 +12,7 @@ allocator that does handle these cases.
 Upstreamed in https://github.com/nodejs/node/pull/38362.
 
 diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 5bf19a0dda42849159d954181058897c45d280fd..03078ff3869fcd17101f1cdaf77f725dbbfa43e8 100644
+index 1add2976e7c48e6704400b9ea0795b934ab0bfc2..2abf5994405e8da2a04d1b23b75ccd3658398474 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
 @@ -475,8 +475,9 @@ MultiIsolatePlatform* CreatePlatform(
@@ -40,7 +40,7 @@ index 5bf19a0dda42849159d954181058897c45d280fd..03078ff3869fcd17101f1cdaf77f725d
  
  MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
 diff --git a/src/node.h b/src/node.h
-index 7ca7502e086190c87ae6a61dca2192253894e906..b2b766f242e02593631be087fceaf63f71d74284 100644
+index 9b9ff1c86ceeaeca828328065e2ad5573ea17fc5..0a9f5139276eb2e102b41a586adf61fa563b47d6 100644
 --- a/src/node.h
 +++ b/src/node.h
 @@ -332,7 +332,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {
@@ -53,7 +53,7 @@ index 7ca7502e086190c87ae6a61dca2192253894e906..b2b766f242e02593631be087fceaf63f
  };
  
  enum IsolateSettingsFlags {
-@@ -528,7 +529,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
+@@ -529,7 +530,8 @@ NODE_EXTERN node::tracing::Agent* CreateAgent();
  NODE_DEPRECATED("Use MultiIsolatePlatform::Create() instead",
      NODE_EXTERN MultiIsolatePlatform* CreatePlatform(
          int thread_pool_size,
diff --git a/patches/node/worker_thread_add_asar_support.patch b/patches/node/worker_thread_add_asar_support.patch
index 070774bf05748..0fd22dff59e46 100644
--- a/patches/node/worker_thread_add_asar_support.patch
+++ b/patches/node/worker_thread_add_asar_support.patch
@@ -7,10 +7,10 @@ This patch initializes asar support in workers threads in
 Node.js.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 2af6b11c97ecdca3c40792ab35c69b07b9db76a0..e79ce2b79a5f88a315ac013b6e12534ba1531d6b 100644
+index 899d5a906683e8967746e10a6de452e99e236903..4c459b58b5a048d9d8a4f15f4011e7cce68089f4 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -498,6 +498,7 @@ module.exports = {
+@@ -563,6 +563,7 @@ module.exports = {
    loadPreloadModules,
    setupTraceCategoryState,
    setupInspectorHooks,
@@ -19,10 +19,10 @@ index 2af6b11c97ecdca3c40792ab35c69b07b9db76a0..e79ce2b79a5f88a315ac013b6e12534b
    initializeCJSLoader,
    initializeWASI
 diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
-index 2e5d6b01d86e34549c1c7a3d3128350cad2b0c47..74ab84ca39a01269925ca0e326e4aa8894fce8a1 100644
+index 110a3ed1637b642b1d83fb36549cced151b9c5cd..50da62d11bf87c333322264f26e5b427efc7d46b 100644
 --- a/lib/internal/main/worker_thread.js
 +++ b/lib/internal/main/worker_thread.js
-@@ -27,6 +27,7 @@ const {
+@@ -29,6 +29,7 @@ const {
    initializeReport,
    initializeSourceMapsHandlers,
    loadPreloadModules,
@@ -30,7 +30,7 @@ index 2e5d6b01d86e34549c1c7a3d3128350cad2b0c47..74ab84ca39a01269925ca0e326e4aa88
    setupTraceCategoryState
  } = require('internal/bootstrap/pre_execution');
  
-@@ -154,6 +155,8 @@ port.on('message', (message) => {
+@@ -158,6 +159,8 @@ port.on('message', (message) => {
      };
      workerIo.sharedCwdCounter = cwdCounter;
  
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 5d0a89992f84f..4b2157f3c5f05 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -480,7 +480,7 @@ node::Environment* NodeBindings::CreateEnvironment(
     // in renderer processes this should be blink. We need to tell Node.js
     // not to register its handler (overriding blinks) in non-browser processes.
     flags |= node::EnvironmentFlags::kNoRegisterESMLoader |
-             node::EnvironmentFlags::kNoInitializeInspector;
+             node::EnvironmentFlags::kNoCreateInspector;
   }
 
   if (!electron::fuses::IsNodeCliInspectEnabled()) {

From 030087c1c7a38b84dfa6ba285e128861abd19173 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 06:01:41 -0700
Subject: [PATCH 364/811] Bump v20.0.0-nightly.20220510

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 813858b4a9d49..0051dcc52a37d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220509
\ No newline at end of file
+20.0.0-nightly.20220510
\ No newline at end of file
diff --git a/package.json b/package.json
index a8be96a419284..2af9df60248f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220509",
+  "version": "20.0.0-nightly.20220510",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 896668b38e784..40001eb458055 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220509
- PRODUCTVERSION 20,0,0,20220509
+ FILEVERSION 20,0,0,20220510
+ PRODUCTVERSION 20,0,0,20220510
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 55726599887b79a29d0825f2206bd079da340f57 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 08:37:52 -0700
Subject: [PATCH 365/811] Revert "Bump v20.0.0-nightly.20220510"

This reverts commit 030087c1c7a38b84dfa6ba285e128861abd19173.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0051dcc52a37d..813858b4a9d49 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220510
\ No newline at end of file
+20.0.0-nightly.20220509
\ No newline at end of file
diff --git a/package.json b/package.json
index 2af9df60248f5..a8be96a419284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220510",
+  "version": "20.0.0-nightly.20220509",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 40001eb458055..896668b38e784 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220510
- PRODUCTVERSION 20,0,0,20220510
+ FILEVERSION 20,0,0,20220509
+ PRODUCTVERSION 20,0,0,20220509
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b94f25c28719389c99a961a046d4f093c219b9e4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 09:05:20 -0700
Subject: [PATCH 366/811] Bump v20.0.0-nightly.20220510

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 813858b4a9d49..0051dcc52a37d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220509
\ No newline at end of file
+20.0.0-nightly.20220510
\ No newline at end of file
diff --git a/package.json b/package.json
index a8be96a419284..2af9df60248f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220509",
+  "version": "20.0.0-nightly.20220510",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 896668b38e784..40001eb458055 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220509
- PRODUCTVERSION 20,0,0,20220509
+ FILEVERSION 20,0,0,20220510
+ PRODUCTVERSION 20,0,0,20220510
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c8fbabae480e0be01fa42de8edc8250f4912cace Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 09:14:27 -0700
Subject: [PATCH 367/811] Revert "Bump v20.0.0-nightly.20220510"

This reverts commit b94f25c28719389c99a961a046d4f093c219b9e4.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0051dcc52a37d..813858b4a9d49 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220510
\ No newline at end of file
+20.0.0-nightly.20220509
\ No newline at end of file
diff --git a/package.json b/package.json
index 2af9df60248f5..a8be96a419284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220510",
+  "version": "20.0.0-nightly.20220509",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 40001eb458055..896668b38e784 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220510
- PRODUCTVERSION 20,0,0,20220510
+ FILEVERSION 20,0,0,20220509
+ PRODUCTVERSION 20,0,0,20220509
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4fc42092b8d9363fa6da3f31204de5ec1e33e631 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 10:27:54 -0700
Subject: [PATCH 368/811] Bump v20.0.0-nightly.20220510

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 813858b4a9d49..0051dcc52a37d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220509
\ No newline at end of file
+20.0.0-nightly.20220510
\ No newline at end of file
diff --git a/package.json b/package.json
index a8be96a419284..2af9df60248f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220509",
+  "version": "20.0.0-nightly.20220510",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 896668b38e784..40001eb458055 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220509
- PRODUCTVERSION 20,0,0,20220509
+ FILEVERSION 20,0,0,20220510
+ PRODUCTVERSION 20,0,0,20220510
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7f5346b9545a9d6bf0de514fee24d0e0442a4047 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 10:33:23 -0700
Subject: [PATCH 369/811] Revert "Bump v20.0.0-nightly.20220510"

This reverts commit 4fc42092b8d9363fa6da3f31204de5ec1e33e631.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0051dcc52a37d..813858b4a9d49 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220510
\ No newline at end of file
+20.0.0-nightly.20220509
\ No newline at end of file
diff --git a/package.json b/package.json
index 2af9df60248f5..a8be96a419284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220510",
+  "version": "20.0.0-nightly.20220509",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 40001eb458055..896668b38e784 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220510
- PRODUCTVERSION 20,0,0,20220510
+ FILEVERSION 20,0,0,20220509
+ PRODUCTVERSION 20,0,0,20220509
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 627c2987ba1d3b8b4204b3e8762782885a8f490b Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 10 May 2022 13:24:40 -0700
Subject: [PATCH 370/811] fix: create singleton pipename from user & executable
 (#34139)

* fix: create singleton pipename from user & executable

* fix: use process id & main thread id for pipe name

* fix: write rand to file using WIN method

* fix: remove file rand, add user_name to pipe

* chore: style fixes, shorten program_name & user_name

* fix: remove user_name
---
 ...ransfer_to_requestsingleinstancelock.patch | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index a539bdab51ef7..61eeec59f5705 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -282,10 +282,20 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d05018b627 100644
+index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dca04470f1 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -21,6 +21,7 @@
+@@ -13,14 +13,17 @@
+ #include "base/command_line.h"
+ #include "base/debug/activity_tracker.h"
+ #include "base/files/file_path.h"
++#include "base/files/file_util.h"
+ #include "base/logging.h"
+ #include "base/metrics/histogram_functions.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "base/process/process.h"
+ #include "base/process/process_info.h"
++#include "base/rand_util.h"
  #include "base/strings/string_number_conversions.h"
  #include "base/strings/utf_string_conversions.h"
  #include "base/time/time.h"
@@ -293,11 +303,10 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
  #include "base/trace_event/base_tracing.h"
  #include "base/win/registry.h"
  #include "base/win/scoped_handle.h"
-@@ -45,6 +46,14 @@
+@@ -45,6 +48,13 @@
  namespace {
  
  const char kLockfile[] = "lockfile";
-+const LPCWSTR kPipeName = L"\\\\.\\pipe\\electronAckPipe";
 +const DWORD kPipeTimeout = 10000;
 +const DWORD kMaxMessageLength = 32 * 1024;
 +
@@ -308,7 +317,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
  
  // A helper class that acquires the given |mutex| while the AutoLockMutex is in
  // scope.
-@@ -80,10 +89,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
+@@ -80,10 +90,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
  
  bool ParseCommandLine(const COPYDATASTRUCT* cds,
                        base::CommandLine* parsed_command_line,
@@ -323,7 +332,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
    static const int min_message_size = 7;
    if (cds->cbData < min_message_size * sizeof(wchar_t) ||
        cds->cbData % sizeof(wchar_t) != 0) {
-@@ -133,11 +144,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+@@ -133,11 +145,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
      const std::wstring cmd_line =
          msg.substr(second_null + 1, third_null - second_null);
      *parsed_command_line = base::CommandLine::FromString(cmd_line);
@@ -406,7 +415,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
  bool ProcessLaunchNotification(
      const ProcessSingleton::NotificationCallback& notification_callback,
      UINT message,
-@@ -151,16 +233,35 @@ bool ProcessLaunchNotification(
+@@ -151,16 +234,35 @@ bool ProcessLaunchNotification(
  
    // Handle the WM_COPYDATA message from another process.
    const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
@@ -446,7 +455,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
    return true;
  }
  
-@@ -261,9 +362,13 @@ bool ProcessSingleton::EscapeVirtualization(
+@@ -261,9 +363,13 @@ bool ProcessSingleton::EscapeVirtualization(
  ProcessSingleton::ProcessSingleton(
      const std::string& program_name,
      const base::FilePath& user_data_dir,
@@ -461,16 +470,26 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
        program_name_(program_name),
        is_app_sandboxed_(is_app_sandboxed),
        is_virtualized_(false),
-@@ -278,6 +383,37 @@ ProcessSingleton::~ProcessSingleton() {
+@@ -278,6 +384,47 @@ ProcessSingleton::~ProcessSingleton() {
      ::CloseHandle(lock_file_);
  }
  
-+void ReadAck(const ProcessSingleton::NotificationAckCallback& ack_callback) {
++void ReadAck(const ProcessSingleton::NotificationAckCallback& ack_callback,
++             const std::string program_name,
++             base::FilePath& user_data_dir) {
 +  // We are reading the ack from the first instance.
 +  // First, wait for the pipe.
-+  ::WaitNamedPipe(kPipeName, NMPWAIT_USE_DEFAULT_WAIT);
++  HWND remote_window = chrome::FindRunningChromeWindow(user_data_dir);
++  DWORD process_id;
++  DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
++  std::string identifier = base::NumberToString(process_id) +
++      base::NumberToString(thread_id);
++  std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
++        program_name);
++  const LPCWSTR w_pipe_name = pipe_name.c_str();
++  ::WaitNamedPipe(w_pipe_name, NMPWAIT_USE_DEFAULT_WAIT);
 +
-+  HANDLE read_ack_pipe = ::CreateFile(kPipeName,
++  HANDLE read_ack_pipe = ::CreateFile(w_pipe_name,
 +    GENERIC_READ,
 +    FILE_SHARE_READ,
 +    NULL,
@@ -499,23 +518,31 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
  // Code roughly based on Mozilla.
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
    TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
-@@ -290,8 +426,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+@@ -290,8 +437,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
      return PROCESS_NONE;
    }
  
 -  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
 +  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, additional_data_)) {
      case chrome::NOTIFY_SUCCESS:
-+      ReadAck(notification_ack_callback_);
++      ReadAck(notification_ack_callback_, program_name_, user_data_dir_);
        return PROCESS_NOTIFIED;
      case chrome::NOTIFY_FAILED:
        remote_window_ = NULL;
-@@ -429,6 +566,18 @@ bool ProcessSingleton::Create() {
+@@ -429,6 +577,26 @@ bool ProcessSingleton::Create() {
            << "Lock file can not be created! Error code: " << error;
  
        if (lock_file_ != INVALID_HANDLE_VALUE) {
 +        // We are the first instance. Create a pipe to send out ack data.
-+        ack_pipe_ = ::CreateNamedPipe(kPipeName,
++        // Create a per-process pipename using a combination of the
++        // username, process id, thread id, and program name. Pipe names max
++        // at 256 characters, can include any character other than a backslash
++        std::string identifier = base::NumberToString(::GetCurrentProcessId()) +
++              base::NumberToString(::GetCurrentThreadId());
++        std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
++              program_name_);
++        const LPCWSTR w_pipe_name = pipe_name.c_str();
++        ack_pipe_ = ::CreateNamedPipe(w_pipe_name,
 +          PIPE_ACCESS_OUTBOUND,
 +          PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS,
 +          PIPE_UNLIMITED_INSTANCES,
@@ -529,7 +556,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..3bb74c08cd78b11cd9925a6bfafc62d0
          // Set the window's title to the path of our user data directory so
          // other Chrome instances can decide if they should forward to us.
          TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
-@@ -456,6 +605,7 @@ bool ProcessSingleton::Create() {
+@@ -456,6 +624,7 @@ bool ProcessSingleton::Create() {
  }
  
  void ProcessSingleton::Cleanup() {

From e76cf3e2ed01e1b7199a336463c21b5b8904c745 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 10 May 2022 23:26:07 +0200
Subject: [PATCH 371/811] fix: building node modules with Visual Studio 2017
 (#34109)

---
 patches/v8/.patches                                 |  2 +-
 ...recated_attribute_for_older_msvc_versions.patch} | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename patches/v8/{fix_build_deprecated_attirbute_for_older_msvc_versions.patch => fix_build_deprecated_attribute_for_older_msvc_versions.patch} (72%)

diff --git a/patches/v8/.patches b/patches/v8/.patches
index 1e5615f3ce254..67b42548459b7 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -4,6 +4,6 @@ dcheck.patch
 export_symbols_needed_for_windows_build.patch
 workaround_an_undefined_symbol_error.patch
 do_not_export_private_v8_symbols_on_windows.patch
-fix_build_deprecated_attirbute_for_older_msvc_versions.patch
+fix_build_deprecated_attribute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
diff --git a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
similarity index 72%
rename from patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
rename to patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index def8b4cf37dd3..547b2778ac3c0 100644
--- a/patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -1,15 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Deepak Mohan <hop2deep@gmail.com>
 Date: Tue, 28 Jan 2020 15:48:03 -0800
-Subject: fix: usage of c++ [[deprecated]] attirbute for older msvc versions
+Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 
-VS 2015 update 3 has a bug where [[deprecated]] attribute cannot
-be applied to constructor declarations, this is fixed in 2017 and
-higher versions, but native module compiling with this version
-will have an issue.
+This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503ef79e2f5 100644
+index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef74c2ab57 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
@@ -20,7 +17,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503
  // A macro (V8_DEPRECATED) to mark classes or functions as deprecated.
  #if defined(V8_DEPRECATION_WARNINGS)
 -# define V8_DEPRECATED(message) [[deprecated(message)]]
-+# if defined(_MSC_VER) && _MSC_VER <= 1900
++# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
 +#   define V8_DEPRECATED(message) __declspec(deprecated(message))
 +# else
 +#   define V8_DEPRECATED(message) [[deprecated(message)]]
@@ -33,7 +30,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503
  // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
  #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
 -# define V8_DEPRECATE_SOON(message) [[deprecated(message)]]
-+# if defined(_MSC_VER) && _MSC_VER <= 1900
++# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
 +#   define V8_DEPRECATE_SOON(message) __declspec(deprecated(message))
 +# else
 +#   define V8_DEPRECATE_SOON(message) [[deprecated(message)]]

From 9bcbe70dbe4b4e34fc9a75f971fb30ed8a5be831 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 10 May 2022 14:26:53 -0700
Subject: [PATCH 372/811] test: run node specs with py3 (#34154)

---
 script/node-spec-runner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/node-spec-runner.js b/script/node-spec-runner.js
index 340ff1d9f63b7..16c51af15db82 100644
--- a/script/node-spec-runner.js
+++ b/script/node-spec-runner.js
@@ -55,7 +55,7 @@ const getCustomOptions = () => {
 async function main () {
   const options = args.default ? defaultOptions : getCustomOptions();
 
-  const testChild = cp.spawn('python', options, {
+  const testChild = cp.spawn('python3', options, {
     env: {
       ...process.env,
       ELECTRON_RUN_AS_NODE: 'true',

From 5633c45c198e22b434fa5ca1a4805ed0109cbf7c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 18:39:00 -0700
Subject: [PATCH 373/811] Bump v20.0.0-nightly.20220510

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 813858b4a9d49..0051dcc52a37d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220509
\ No newline at end of file
+20.0.0-nightly.20220510
\ No newline at end of file
diff --git a/package.json b/package.json
index a8be96a419284..2af9df60248f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220509",
+  "version": "20.0.0-nightly.20220510",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 896668b38e784..40001eb458055 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220509
- PRODUCTVERSION 20,0,0,20220509
+ FILEVERSION 20,0,0,20220510
+ PRODUCTVERSION 20,0,0,20220510
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a853a6ce9f7936da1e17c989bece89108e481e57 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 18:40:53 -0700
Subject: [PATCH 374/811] Revert "Bump v20.0.0-nightly.20220510"

This reverts commit 5633c45c198e22b434fa5ca1a4805ed0109cbf7c.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0051dcc52a37d..813858b4a9d49 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220510
\ No newline at end of file
+20.0.0-nightly.20220509
\ No newline at end of file
diff --git a/package.json b/package.json
index 2af9df60248f5..a8be96a419284 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220510",
+  "version": "20.0.0-nightly.20220509",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 40001eb458055..896668b38e784 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220510
- PRODUCTVERSION 20,0,0,20220510
+ FILEVERSION 20,0,0,20220509
+ PRODUCTVERSION 20,0,0,20220509
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 79e1881b2a7e797a90474e93e881399c0d22742f Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 11 May 2022 17:39:51 +0900
Subject: [PATCH 375/811] chore: rm
 enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch (#34157)

* chore: rm enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch

* chore: update patch
---
 patches/node/.patches                         |  3 +-
 ...is_on_64bit_arch_and_ptr_compression.patch | 32 -------------------
 ...everse_jsargs_defines_in_common_gypi.patch | 15 +++------
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index d1df090471f84..e5114a032fb62 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -10,9 +10,7 @@ refactor_allow_embedder_overriding_of_internal_fs_calls.patch
 chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
 chore_add_context_to_context_aware_module_prevention.patch
 chore_read_nobrowserglobals_from_global_not_process.patch
-enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
 fix_handle_boringssl_and_openssl_incompatibilities.patch
-fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
 src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
 fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
@@ -42,3 +40,4 @@ process_fix_hang_after_note_exit_3521.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 fix_preserve_proper_method_names_as-is_in_error_stack.patch
 macos_avoid_posix_spawnp_cwd_bug_3597.patch
+fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
diff --git a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch b/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
deleted file mode 100644
index d6ef9a68a08c7..0000000000000
--- a/patches/node/enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Tue, 10 Dec 2019 15:02:21 -0800
-Subject: enable 31 bit smis on 64bit arch and ptr compression
-
-This aligns with the defaults set on the Chromium build. Without this, native
-node modules will have different (wrong) ideas about how v8 structs are laid
-out in memory on 64-bit machines, and will summarily fail to work.
-
-diff --git a/common.gypi b/common.gypi
-index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..7ffd577817d3c6ae7164dd3945479aedcee9640e 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -64,7 +64,7 @@
-     # options but default values are required here as this file is also used by
-     # node-gyp to build addons.
-     'v8_enable_pointer_compression%': 0,
--    'v8_enable_31bit_smis_on_64bit_arch%': 0,
-+    'v8_enable_31bit_smis_on_64bit_arch%': 1,
- 
-     # Disable V8 untrusted code mitigations.
-     # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-@@ -133,6 +133,9 @@
-         'v8_enable_pointer_compression': 0,
-         'v8_enable_31bit_smis_on_64bit_arch': 0,
-       }],
-+      ['target_arch == "arm64" or target_arch == "x64"', {
-+        'v8_enable_pointer_compression': 1,
-+      }],
-       ['target_arch in "ppc64 s390x"', {
-         'v8_enable_backtrace': 1,
-       }],
diff --git a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
index b8578ea1afcc4..5716a2d57dc79 100644
--- a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+++ b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
@@ -6,26 +6,19 @@ Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi
 This can be removed once node upgrades V8 and inevitably has to do this exact same thing.  Also hi node people if you are looking at this.
 
 diff --git a/common.gypi b/common.gypi
-index 7ffd577817d3c6ae7164dd3945479aedcee9640e..6674f9f9b8880c40db579664fa40f62ad0139368 100644
+index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..fd4e0b38eb6ecf81b23186ec663499d1e685fdf8 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -65,6 +65,7 @@
-     # node-gyp to build addons.
-     'v8_enable_pointer_compression%': 0,
-     'v8_enable_31bit_smis_on_64bit_arch%': 1,
-+    'v8_enable_reverse_jsargs%': 1,
- 
-     # Disable V8 untrusted code mitigations.
-     # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-@@ -82,6 +83,7 @@
+@@ -82,6 +82,8 @@
      # TODO(refack): make v8-perfetto happen
      'v8_use_perfetto': 0,
  
++    'v8_enable_reverse_jsargs%': 1,
 +
      ##### end V8 defaults #####
  
      # When building native modules using 'npm install' with the system npm,
-@@ -401,6 +403,9 @@
+@@ -398,6 +400,9 @@
        ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
          'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
        }],

From 64dc90824b43b5ab18bbfd3c687a51207956298b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 11 May 2022 06:01:00 -0700
Subject: [PATCH 376/811] Bump v20.0.0-nightly.20220511

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 813858b4a9d49..d493702e49f5e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220509
\ No newline at end of file
+20.0.0-nightly.20220511
\ No newline at end of file
diff --git a/package.json b/package.json
index a8be96a419284..e79c315e5aabc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220509",
+  "version": "20.0.0-nightly.20220511",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 896668b38e784..91f7d5fe92db3 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220509
- PRODUCTVERSION 20,0,0,20220509
+ FILEVERSION 20,0,0,20220511
+ PRODUCTVERSION 20,0,0,20220511
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6063d4f8df7298b6fbc66cc71e76c04e913faaf3 Mon Sep 17 00:00:00 2001
From: FantasqueX <voidren@outlook.com>
Date: Wed, 11 May 2022 22:05:59 +0800
Subject: [PATCH 377/811] docs: fix typo in quick-start.md (#34149)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to Jetbrains LanguageTool, "Consider using All the. "
---
 docs/tutorial/quick-start.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index 64d82d61dfdb4..cd54e26e9b9b2 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -404,7 +404,7 @@ app.on('window-all-closed', () => {
 ```js
 // preload.js
 
-// All of the Node.js APIs are available in the preload process.
+// All the Node.js APIs are available in the preload process.
 // It has the same sandbox as a Chrome extension.
 window.addEventListener('DOMContentLoaded', () => {
   const replaceText = (selector, text) => {

From c512993744145e594c9ee8d55e5c4190c943f841 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Wed, 11 May 2022 08:27:23 -0700
Subject: [PATCH 378/811] build: re-enable 32-bit Windows symbol generation
 (#34162)

---
 appveyor.yml                       |  9 +++------
 script/release/release.js          |  5 ++---
 script/release/uploaders/upload.py | 14 ++++++--------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f693c7d634e8a..540fd50f0df75 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -180,19 +180,16 @@ build_script:
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
-  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
+      if ($env:GN_CONFIG -eq 'release') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        if ($env:TARGET_ARCH -ne 'ia32') {
-          python electron\script\zip-symbols.py
-          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
-        }
+        python electron\script\zip-symbols.py
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
diff --git a/script/release/release.js b/script/release/release.js
index 221d7bd6d7cf4..c3c8d6363b120 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -128,9 +128,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    // TODO(jkleinsc) Symbol generation on 32-bit Windows is temporarily disabled due to failures
-    // `electron-${version}-win32-ia32-pdb.zip`,
-    // `electron-${version}-win32-ia32-symbols.zip`,
+    `electron-${version}-win32-ia32-pdb.zip`,
+    `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
     `electron-${version}-win32-x64-symbols.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 69c4bbfa5720d..a73955786e47c 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,10 +76,9 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    if (get_target_arch() != 'ia32' or PLATFORM != 'win32'):
-      symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-      shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
-      upload_electron(release, symbols_zip, args)
+    symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
+    upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
       api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@@ -96,10 +95,9 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
     upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
-    if get_target_arch() != 'ia32':
-      pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
-      shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
-      upload_electron(release, pdb_zip, args)
+    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+    upload_electron(release, pdb_zip, args)
   elif PLATFORM == 'linux':
     debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)

From 6f8a36f4047ba6300f93d4470193d6b54afabacf Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 11 May 2022 13:23:24 -0400
Subject: [PATCH 379/811] test: fixup done being called multiple times (#34175)

---
 spec-main/api-browser-window-spec.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 94bdc956a5b68..1b5f4260b8489 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3516,9 +3516,14 @@ describe('BrowserWindow module', () => {
   describe('beginFrameSubscription method', () => {
     it('does not crash when callback returns nothing', (done) => {
       const w = new BrowserWindow({ show: false });
+      let called = false;
       w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'));
       w.webContents.on('dom-ready', () => {
         w.webContents.beginFrameSubscription(function () {
+          // This callback might be called twice.
+          if (called) return;
+          called = true;
+
           // Pending endFrameSubscription to next tick can reliably reproduce
           // a crash which happens when nothing is returned in the callback.
           setTimeout(() => {

From dd6ce91f5766c9eea0ffca23e42ef8766851e0a2 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 11 May 2022 20:34:33 +0200
Subject: [PATCH 380/811] fix: call loadUrl when opening new windows from links
 (#34159)

* fix: call loadUrl when opening new windows from links

* spec: add regression test
---
 lib/browser/guest-window-manager.ts           | 22 +++++++
 spec-main/api-browser-window-spec.ts          | 20 ++++++
 .../apps/open-new-window-from-link/index.html | 11 ++++
 .../apps/open-new-window-from-link/main.js    | 64 +++++++++++++++++++
 .../new-window-page.html                      | 11 ++++
 .../open-new-window-from-link/package.json    |  4 ++
 .../apps/open-new-window-from-link/preload.js |  3 +
 7 files changed, 135 insertions(+)
 create mode 100644 spec-main/fixtures/apps/open-new-window-from-link/index.html
 create mode 100644 spec-main/fixtures/apps/open-new-window-from-link/main.js
 create mode 100644 spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html
 create mode 100644 spec-main/fixtures/apps/open-new-window-from-link/package.json
 create mode 100644 spec-main/fixtures/apps/open-new-window-from-link/preload.js

diff --git a/lib/browser/guest-window-manager.ts b/lib/browser/guest-window-manager.ts
index baa446ab91dae..76da71b15abcf 100644
--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -78,6 +78,19 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
     ...browserWindowOptions
   });
 
+  if (!guest) {
+    // When we open a new window from a link (via OpenURLFromTab),
+    // the browser process is responsible for initiating navigation
+    // in the new window.
+    window.loadURL(url, {
+      httpReferrer: referrer,
+      ...(postData && {
+        postData,
+        extraHeaders: formatPostDataHeaders(postData as Electron.UploadRawData[])
+      })
+    });
+  }
+
   handleWindowLifecycleEvents({ embedder, frameName, guest: window, outlivesOpener });
 
   embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, referrer, postData });
@@ -243,6 +256,15 @@ export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {
   };
 }
 
+function formatPostDataHeaders (postData: PostData) {
+  if (!postData) return;
+
+  const { contentType, boundary } = parseContentTypeFormat(postData);
+  if (boundary != null) { return `content-type: ${contentType}; boundary=${boundary}`; }
+
+  return `content-type: ${contentType}`;
+}
+
 const MULTIPART_CONTENT_TYPE = 'multipart/form-data';
 const URL_ENCODED_CONTENT_TYPE = 'application/x-www-form-urlencoded';
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 1b5f4260b8489..6d76851d82b2e 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1937,6 +1937,26 @@ describe('BrowserWindow module', () => {
     });
   });
 
+  describe('Opening a BrowserWindow from a link', () => {
+    let appProcess: childProcess.ChildProcessWithoutNullStreams | undefined;
+
+    afterEach(() => {
+      if (appProcess && !appProcess.killed) {
+        appProcess.kill();
+        appProcess = undefined;
+      }
+    });
+
+    it('can properly open and load a new window from a link', async () => {
+      const appPath = path.join(__dirname, 'fixtures', 'apps', 'open-new-window-from-link');
+
+      appProcess = childProcess.spawn(process.execPath, [appPath]);
+
+      const [code] = await emittedOnce(appProcess, 'exit');
+      expect(code).to.equal(0);
+    });
+  });
+
   describe('BrowserWindow.fromWebContents(webContents)', () => {
     afterEach(closeAllWindows);
 
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/index.html b/spec-main/fixtures/apps/open-new-window-from-link/index.html
new file mode 100644
index 0000000000000..b7584564e0010
--- /dev/null
+++ b/spec-main/fixtures/apps/open-new-window-from-link/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'">
+    <title>Hello World!</title>
+  </head>
+  <body>
+    <a href="./new-window-page.html">Open New Window</a>
+  </body>
+</html>
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/main.js b/spec-main/fixtures/apps/open-new-window-from-link/main.js
new file mode 100644
index 0000000000000..7d41b3bb29ee5
--- /dev/null
+++ b/spec-main/fixtures/apps/open-new-window-from-link/main.js
@@ -0,0 +1,64 @@
+const { app, BrowserWindow } = require('electron');
+const path = require('path');
+
+async function createWindow () {
+  const mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600,
+    x: 100,
+    y: 100,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js'),
+      contextIsolation: false,
+      nodeIntegration: true
+    }
+  });
+
+  await mainWindow.loadFile('index.html');
+
+  const rect = await mainWindow.webContents.executeJavaScript('JSON.parse(JSON.stringify(document.querySelector("a").getBoundingClientRect()))');
+  const x = rect.x + rect.width / 2;
+  const y = rect.y + rect.height / 2;
+
+  function click (x, y, options) {
+    x = Math.floor(x);
+    y = Math.floor(y);
+    mainWindow.webContents.sendInputEvent({
+      type: 'mouseDown',
+      button: 'left',
+      x,
+      y,
+      clickCount: 1,
+      ...options
+    });
+
+    mainWindow.webContents.sendInputEvent({
+      type: 'mouseUp',
+      button: 'left',
+      x,
+      y,
+      clickCount: 1,
+      ...options
+    });
+  }
+
+  click(x, y, { modifiers: ['shift'] });
+}
+
+app.whenReady().then(() => {
+  app.on('web-contents-created', (e, wc) => {
+    wc.on('render-process-gone', (e, details) => {
+      console.error(details);
+      process.exit(1);
+    });
+
+    wc.on('did-finish-load', () => {
+      const title = wc.getTitle();
+      if (title === 'Window From Link') {
+        process.exit(0);
+      }
+    });
+  });
+
+  createWindow();
+});
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html b/spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html
new file mode 100644
index 0000000000000..ac919774f3b27
--- /dev/null
+++ b/spec-main/fixtures/apps/open-new-window-from-link/new-window-page.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'">
+    <title>Window From Link</title>
+  </head>
+  <body>
+    I'm a window opened from a link!
+  </body>
+</html>
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/package.json b/spec-main/fixtures/apps/open-new-window-from-link/package.json
new file mode 100644
index 0000000000000..ff9319a62ae99
--- /dev/null
+++ b/spec-main/fixtures/apps/open-new-window-from-link/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron-test-open-new-window-from-link",
+  "main": "main.js"
+}
diff --git a/spec-main/fixtures/apps/open-new-window-from-link/preload.js b/spec-main/fixtures/apps/open-new-window-from-link/preload.js
new file mode 100644
index 0000000000000..edb91c4291072
--- /dev/null
+++ b/spec-main/fixtures/apps/open-new-window-from-link/preload.js
@@ -0,0 +1,3 @@
+window.addEventListener('click', e => {
+  console.log('click', e);
+});

From 4f8a84360603230059ffc4ca5f90b60708cc4869 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 11 May 2022 16:01:56 -0400
Subject: [PATCH 381/811] docs: clarify added/removed events on device APIs
 (#34177)

---
 docs/api/session.md                      | 28 +++++++++++++++++-------
 docs/fiddles/features/web-hid/main.js    | 20 ++++++++++-------
 docs/fiddles/features/web-serial/main.js | 21 +++++++++++-------
 docs/tutorial/devices.md                 | 13 +++++++----
 4 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index 5dc29aba9b6d7..ab2ecdb701de7 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -253,9 +253,11 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted when a new HID device becomes available. For example, when a new USB device is plugged in.
-
-This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
+Emitted after `navigator.hid.requestDevice` has been called and
+`select-hid-device` has fired if a new device becomes available before
+the callback from `select-hid-device` is called.  This event is intended for
+use when using a UI to ask users to pick a device so that the UI can be updated
+with the newly added device.
 
 #### Event: 'hid-device-removed'
 
@@ -266,9 +268,11 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted when a HID device has been removed.  For example, this event will fire when a USB device is unplugged.
-
-This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
+Emitted after `navigator.hid.requestDevice` has been called and
+`select-hid-device` has fired if a device has been removed before the callback
+from `select-hid-device` is called.  This event is intended for use when using
+a UI to ask users to pick a device so that the UI can be updated to remove the
+specified device.
 
 #### Event: 'select-serial-port'
 
@@ -348,7 +352,11 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
+Emitted after `navigator.serial.requestPort` has been called and
+`select-serial-port` has fired if a new serial port becomes available before
+the callback from `select-serial-port` is called.  This event is intended for
+use when using a UI to ask users to pick a port so that the UI can be updated
+with the newly added port.
 
 #### Event: 'serial-port-removed'
 
@@ -358,7 +366,11 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a serial port has been removed.  For example, this event will fire when a USB device is unplugged.
+Emitted after `navigator.serial.requestPort` has been called and
+`select-serial-port` has fired if a serial port has been removed before the
+callback from `select-serial-port` is called.  This event is intended for use
+when using a UI to ask users to pick a port so that the UI can be updated
+to remove the specified port.
 
 ### Instance Methods
 
diff --git a/docs/fiddles/features/web-hid/main.js b/docs/fiddles/features/web-hid/main.js
index cb61e188a0fd0..3304457db822f 100644
--- a/docs/fiddles/features/web-hid/main.js
+++ b/docs/fiddles/features/web-hid/main.js
@@ -8,20 +8,24 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => {
+    //Add events to handle devices being added or removed before the callback on
+    //`select-hid-device` is called.
+    mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
+      console.log('hid-device-added FIRED WITH', device)
+      //Optionally update details.deviceList
+    })
+  
+    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
+      console.log('hid-device-removed FIRED WITH', device)
+      //Optionally update details.deviceList
+    })
+
     event.preventDefault()
     if (details.deviceList && details.deviceList.length > 0) {
       callback(details.deviceList[0].deviceId)
     }
   })
 
-  mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
-    console.log('hid-device-added FIRED WITH', device)
-  })
-
-  mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
-    console.log('hid-device-removed FIRED WITH', device)
-  })
-
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'hid' && details.securityOrigin === 'file:///') {
       return true
diff --git a/docs/fiddles/features/web-serial/main.js b/docs/fiddles/features/web-serial/main.js
index c6bd996724d2e..37b9f35c27b2f 100644
--- a/docs/fiddles/features/web-serial/main.js
+++ b/docs/fiddles/features/web-serial/main.js
@@ -8,6 +8,19 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
+
+    //Add listeners to handle ports being added or removed before the callback for `select-serial-port`
+    //is called.
+    mainWindow.webContents.session.on('serial-port-added', (event, port) => {
+      console.log('serial-port-added FIRED WITH', port)
+      //Optionally update portList to add the new port
+    })
+  
+    mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
+      console.log('serial-port-removed FIRED WITH', port)
+      //Optionally update portList to remove the port
+    })
+
     event.preventDefault()
     if (portList && portList.length > 0) {
       callback(portList[0].portId)
@@ -16,14 +29,6 @@ function createWindow () {
     }
   })
 
-  mainWindow.webContents.session.on('serial-port-added', (event, port) => {
-    console.log('serial-port-added FIRED WITH', port)
-  })
-
-  mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
-    console.log('serial-port-removed FIRED WITH', port)
-  })
-
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'serial' && details.securityOrigin === 'file:///') {
       return true
diff --git a/docs/tutorial/devices.md b/docs/tutorial/devices.md
index c5a81fc994f90..7ce513caf9a5f 100644
--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -36,8 +36,10 @@ the WebHID API:
   can be used to select a HID device when a call to
   `navigator.hid.requestDevice` is made.  Additionally the [`hid-device-added`](../api/session.md#event-hid-device-added)
   and [`hid-device-removed`](../api/session.md#event-hid-device-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged during the
-  `navigator.hid.requestDevice` process.
+  on the Session can be used to handle devices being plugged in or unplugged
+  when handling the `select-hid-device` event.
+  **Note:** These events only fire until the callback from `select-hid-device`
+  is called.  They are not intended to be used as a generic hid device listener.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.hid.requestDevice`.  Additionally,
@@ -82,8 +84,11 @@ There are several additional APIs for working with the Web Serial API:
 
 * The [`serial-port-added`](../api/session.md#event-serial-port-added)
   and [`serial-port-removed`](../api/session.md#event-serial-port-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged during the
-  `navigator.serial.requestPort` process.
+  on the Session can be used to handle devices being plugged in or unplugged
+  when handling the `select-serial-port` event.
+  **Note:** These events only fire until the callback from `select-serial-port`
+  is called.  They are not intended to be used as a generic serial port
+  listener.
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.serial.requestPort`.  Additionally,

From d67532ee9f836857bc43989fbb8376d1fe769a48 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 11 May 2022 22:41:06 +0200
Subject: [PATCH 382/811] fix: crash when loading extension with missing
 manifest (#34168)

* fix: crash when loading extension missing manifest

* Update electron_paks.gni

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

Co-authored-by: Robo <hop2deep@gmail.com>
---
 electron_paks.gni                                      | 2 ++
 spec-main/extensions-spec.ts                           | 6 ++++++
 spec-main/fixtures/extensions/missing-manifest/main.js | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 spec-main/fixtures/extensions/missing-manifest/main.js

diff --git a/electron_paks.gni b/electron_paks.gni
index 73d181d3f018d..ed8e3c45dd996 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -183,6 +183,7 @@ template("electron_paks") {
       "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
       "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
+      "${root_gen_dir}/extensions/strings/extensions_strings_",
       "${root_gen_dir}/services/strings/services_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
@@ -197,6 +198,7 @@ template("electron_paks") {
       "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//device/bluetooth/strings",
+      "//extensions/strings",
       "//services/strings",
       "//third_party/blink/public/strings",
       "//third_party/blink/public/strings:accessibility_strings",
diff --git a/spec-main/extensions-spec.ts b/spec-main/extensions-spec.ts
index 5c382d53e03b3..b2dc6d7f96c21 100644
--- a/spec-main/extensions-spec.ts
+++ b/spec-main/extensions-spec.ts
@@ -110,6 +110,12 @@ describe('chrome extensions', () => {
     expect(bg).to.equal('red');
   });
 
+  it('does not crash when loading an extension with missing manifest', async () => {
+    const customSession = session.fromPartition(`persist:${uuid.v4()}`);
+    const promise = customSession.loadExtension(path.join(fixtures, 'extensions', 'missing-manifest'));
+    await expect(promise).to.eventually.be.rejectedWith(/Manifest file is missing or unreadable/);
+  });
+
   it('does not crash when failing to load an extension', async () => {
     const customSession = session.fromPartition(`persist:${uuid.v4()}`);
     const promise = customSession.loadExtension(path.join(fixtures, 'extensions', 'load-error'));
diff --git a/spec-main/fixtures/extensions/missing-manifest/main.js b/spec-main/fixtures/extensions/missing-manifest/main.js
new file mode 100644
index 0000000000000..d1e760d7b9d07
--- /dev/null
+++ b/spec-main/fixtures/extensions/missing-manifest/main.js
@@ -0,0 +1 @@
+console.log('oh no where is my manifest');

From ba3aca8200aaaa40c9641171b7c867d1aea065e7 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 12 May 2022 00:41:58 -0700
Subject: [PATCH 383/811] test: fix background transparency flake (#34190)

---
 spec-main/api-browser-window-spec.ts                        | 6 ++++--
 .../fixtures/apps/background-color-transparent/main.js      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 6d76851d82b2e..b938b483b8c5e 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1828,7 +1828,7 @@ describe('BrowserWindow module', () => {
   });
 
   ifdescribe(process.platform === 'darwin')('BrowserWindow.setVibrancy(type)', () => {
-    let appProcess: childProcess.ChildProcessWithoutNullStreams | undefined;
+    let appProcess: childProcess.ChildProcessWithoutNullStreams | childProcess.ChildProcess | undefined;
 
     afterEach(() => {
       if (appProcess && !appProcess.killed) {
@@ -1859,7 +1859,9 @@ describe('BrowserWindow module', () => {
     it('Allows setting a transparent window via CSS', async () => {
       const appPath = path.join(__dirname, 'fixtures', 'apps', 'background-color-transparent');
 
-      appProcess = childProcess.spawn(process.execPath, [appPath]);
+      appProcess = childProcess.spawn(process.execPath, [appPath], {
+        stdio: 'inherit'
+      });
 
       const [code] = await emittedOnce(appProcess, 'exit');
       expect(code).to.equal(0);
diff --git a/spec-main/fixtures/apps/background-color-transparent/main.js b/spec-main/fixtures/apps/background-color-transparent/main.js
index 8d1da05c6c1db..3086db0dc6b97 100644
--- a/spec-main/fixtures/apps/background-color-transparent/main.js
+++ b/spec-main/fixtures/apps/background-color-transparent/main.js
@@ -21,6 +21,7 @@ async function createWindow () {
     transparent: true,
     vibrancy: 'under-window',
     webPreferences: {
+      backgroundThrottling: false,
       contextIsolation: false,
       nodeIntegration: true
     }
@@ -43,6 +44,7 @@ ipcMain.on('set-transparent', async () => {
   colors.transparent = result[0].hex();
 
   const { green, transparent } = colors;
+  console.log({ green, transparent });
   process.exit(green === transparent ? 1 : 0);
 });
 

From ff5f66395ec82b812a5a25711a09563f4be4b406 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Thu, 12 May 2022 04:18:42 -0400
Subject: [PATCH 384/811] chore: upgrade extract-zip for installer (#34166)

---
 npm/install.js   | 13 ++-----------
 npm/package.json |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/npm/install.js b/npm/install.js
index 932bfa6c150c3..069701adee67a 100755
--- a/npm/install.js
+++ b/npm/install.js
@@ -70,17 +70,8 @@ function isInstalled () {
 
 // unzips and makes path.txt point at the correct executable
 function extractFile (zipPath) {
-  return new Promise((resolve, reject) => {
-    extract(zipPath, { dir: path.join(__dirname, 'dist') }, err => {
-      if (err) return reject(err);
-
-      fs.writeFile(path.join(__dirname, 'path.txt'), platformPath, err => {
-        if (err) return reject(err);
-
-        resolve();
-      });
-    });
-  });
+  return extract(zipPath, { dir: path.join(__dirname, 'dist') })
+    .then(() => fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath));
 }
 
 function getPlatformPath () {
diff --git a/npm/package.json b/npm/package.json
index 6a5df9ee0b824..3926e40a17fcc 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -10,9 +10,9 @@
   "dependencies": {
     "@electron/get": "^1.14.1",
     "@types/node": "^16.11.26",
-    "extract-zip": "^1.0.3"
+    "extract-zip": "^2.0.1"
   },
   "engines": {
-    "node": ">= 8.6"
+    "node": ">= 10.17.0"
   }
 }

From 142e1f667bff0ae755406876295205708a4cd887 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 06:02:20 -0700
Subject: [PATCH 385/811] Bump v20.0.0-nightly.20220512

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d493702e49f5e..9f4746656d966 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220511
\ No newline at end of file
+20.0.0-nightly.20220512
\ No newline at end of file
diff --git a/package.json b/package.json
index e79c315e5aabc..7a18be70b374b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220511",
+  "version": "20.0.0-nightly.20220512",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 91f7d5fe92db3..69536776773cd 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220511
- PRODUCTVERSION 20,0,0,20220511
+ FILEVERSION 20,0,0,20220512
+ PRODUCTVERSION 20,0,0,20220512
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a8103691ac33b6a71e127532cdea26d2de12d708 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 12 May 2022 16:14:11 +0200
Subject: [PATCH 386/811] fix: tray icon not highlighting on empty menu
 (#34173)

---
 shell/browser/ui/tray_icon_cocoa.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm
index 0a37e4fea727e..789a993adb9f5 100644
--- a/shell/browser/ui/tray_icon_cocoa.mm
+++ b/shell/browser/ui/tray_icon_cocoa.mm
@@ -190,9 +190,9 @@ - (void)mouseDown:(NSEvent*)event {
       gfx::ScreenPointFromNSPoint([event locationInWindow]),
       ui::EventFlagsFromModifiers([event modifierFlags]));
 
-  // Pass click to superclass to show menu. Custom mouseUp handler won't be
-  // invoked.
-  if (menuController_) {
+  // Pass click to superclass to show menu if one exists and has a non-zero
+  // number of items. Custom mouseUp handler won't be invoked in this case.
+  if (menuController_ && [[menuController_ menu] numberOfItems] > 0) {
     [self handleClickNotifications:event];
     [super mouseDown:event];
   } else {

From 8b5613efcbd322ea19407f8655b4691b09c3b2b4 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 13 May 2022 02:20:45 +0200
Subject: [PATCH 387/811] fix: fetching PDF element from `WebLocalFrame`
 (#34176)

fix: fetching PDF element from WebLocalFrame
---
 .../print_render_frame_helper_delegate.cc     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/shell/renderer/printing/print_render_frame_helper_delegate.cc b/shell/renderer/printing/print_render_frame_helper_delegate.cc
index 8eb83a3be249a..ab952cd6e009d 100644
--- a/shell/renderer/printing/print_render_frame_helper_delegate.cc
+++ b/shell/renderer/printing/print_render_frame_helper_delegate.cc
@@ -10,6 +10,7 @@
 #include "third_party/blink/public/web/web_local_frame.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
+#include "chrome/common/pdf_util.h"
 #include "extensions/common/constants.h"
 #include "extensions/renderer/guest_view/mime_handler_view/post_message_support.h"
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
@@ -24,22 +25,11 @@ PrintRenderFrameHelperDelegate::~PrintRenderFrameHelperDelegate() = default;
 blink::WebElement PrintRenderFrameHelperDelegate::GetPdfElement(
     blink::WebLocalFrame* frame) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  GURL url = frame->GetDocument().Url();
-  bool inside_pdf_extension =
-      url.SchemeIs(extensions::kExtensionScheme) &&
-      url.host_piece() == extension_misc::kPdfExtensionId;
-  if (inside_pdf_extension) {
-    // <object> with id="plugin" is created in
-    // chrome/browser/resources/pdf/pdf_viewer_base.js.
-    auto viewer_element = frame->GetDocument().GetElementById("viewer");
-    if (!viewer_element.IsNull() && !viewer_element.ShadowRoot().IsNull()) {
-      auto plugin_element =
-          viewer_element.ShadowRoot().QuerySelector("#plugin");
-      if (!plugin_element.IsNull()) {
-        return plugin_element;
-      }
-    }
-    NOTREACHED();
+  if (frame->Parent() &&
+      IsPdfInternalPluginAllowedOrigin(frame->Parent()->GetSecurityOrigin())) {
+    auto plugin_element = frame->GetDocument().QuerySelector("embed");
+    DCHECK(!plugin_element.IsNull());
+    return plugin_element;
   }
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
   return blink::WebElement();

From b06737fdaccdbb43e90a4547d0d578d9d158509e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 06:01:28 -0700
Subject: [PATCH 388/811] Bump v20.0.0-nightly.20220513

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9f4746656d966..ed3214e989ac1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220512
\ No newline at end of file
+20.0.0-nightly.20220513
\ No newline at end of file
diff --git a/package.json b/package.json
index 7a18be70b374b..2b516b363066f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220512",
+  "version": "20.0.0-nightly.20220513",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 69536776773cd..dae3ae1f2f42b 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220512
- PRODUCTVERSION 20,0,0,20220512
+ FILEVERSION 20,0,0,20220513
+ PRODUCTVERSION 20,0,0,20220513
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From cc411946d72f69e3d6991f5a4a35bf8416b2ad66 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 06:02:41 -0700
Subject: [PATCH 389/811] Bump v20.0.0-nightly.20220516

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index ed3214e989ac1..b59af459922b5 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220513
\ No newline at end of file
+20.0.0-nightly.20220516
\ No newline at end of file
diff --git a/package.json b/package.json
index 2b516b363066f..51ce8ed89fc86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220513",
+  "version": "20.0.0-nightly.20220516",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index dae3ae1f2f42b..4d2bd5a0da1e7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220513
- PRODUCTVERSION 20,0,0,20220513
+ FILEVERSION 20,0,0,20220516
+ PRODUCTVERSION 20,0,0,20220516
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7af0b58c9871f6e3690f8228cdf51b4235d1596d Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 16 May 2022 18:14:27 +0200
Subject: [PATCH 390/811] test: add `setTitlebarOverlay` spec (#34221)

spec: add setTitlebarOverlay spec
---
 spec-main/api-browser-window-spec.ts | 67 ++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index b938b483b8c5e..adbfd107c5e9a 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2245,9 +2245,15 @@ describe('BrowserWindow module', () => {
       const overlayEnabled = await w.webContents.executeJavaScript('navigator.windowControlsOverlay.visible');
       expect(overlayEnabled).to.be.true('overlayEnabled');
       const overlayRectPreMax = await w.webContents.executeJavaScript('getJSOverlayProperties()');
-      await w.maximize();
-      const max = await w.isMaximized();
-      expect(max).to.equal(true);
+
+      if (!w.isMaximized()) {
+        const maximize = emittedOnce(w, 'maximize');
+        w.show();
+        w.maximize();
+        await maximize;
+      }
+
+      expect(w.isMaximized()).to.be.true('not maximized');
       const overlayRectPostMax = await w.webContents.executeJavaScript('getJSOverlayProperties()');
 
       expect(overlayRectPreMax.y).to.equal(0);
@@ -2269,6 +2275,61 @@ describe('BrowserWindow module', () => {
     });
   });
 
+  ifdescribe(process.platform === 'win32')('BrowserWindow.setTitlebarOverlay', () => {
+    afterEach(closeAllWindows);
+    afterEach(() => { ipcMain.removeAllListeners('geometrychange'); });
+
+    it('correctly updates the height of the overlay', async () => {
+      const testOverlay = async (w: BrowserWindow, size: Number) => {
+        const overlayHTML = path.join(__dirname, 'fixtures', 'pages', 'overlay.html');
+        w.loadFile(overlayHTML);
+        await emittedOnce(ipcMain, 'geometrychange');
+
+        const overlayEnabled = await w.webContents.executeJavaScript('navigator.windowControlsOverlay.visible');
+        expect(overlayEnabled).to.be.true('overlayEnabled');
+        const { height: preMaxHeight } = await w.webContents.executeJavaScript('getJSOverlayProperties()');
+
+        if (!w.isMaximized()) {
+          const maximize = emittedOnce(w, 'maximize');
+          w.show();
+          w.maximize();
+          await maximize;
+        }
+
+        expect(w.isMaximized()).to.be.true('not maximized');
+        const { x, y, width, height } = await w.webContents.executeJavaScript('getJSOverlayProperties()');
+        expect(x).to.equal(0);
+        expect(y).to.equal(0);
+        expect(width).to.be.greaterThan(0);
+        expect(height).to.equal(size);
+        expect(preMaxHeight).to.equal(size);
+      };
+
+      const INITIAL_SIZE = 40;
+      const w = new BrowserWindow({
+        show: false,
+        width: 400,
+        height: 400,
+        titleBarStyle: 'hidden',
+        webPreferences: {
+          nodeIntegration: true,
+          contextIsolation: false
+        },
+        titleBarOverlay: {
+          height: INITIAL_SIZE
+        }
+      });
+
+      await testOverlay(w, INITIAL_SIZE);
+
+      w.setTitleBarOverlay({
+        height: INITIAL_SIZE + 10
+      });
+
+      await testOverlay(w, INITIAL_SIZE + 10);
+    });
+  });
+
   ifdescribe(process.platform === 'darwin')('"enableLargerThanScreen" option', () => {
     afterEach(closeAllWindows);
     it('can move the window out of screen', () => {

From 4aba68a59d11da6f45a9333511f4efd92b0e08ef Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 16 May 2022 22:18:01 +0200
Subject: [PATCH 391/811] docs: add missing explanation for
 [angle|dawn]_enable_vulkan_validation_layers = false (#34216)

---
 build/args/all.gn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/args/all.gn b/build/args/all.gn
index b0400b0951ee8..f1de439d833fc 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -21,6 +21,9 @@ proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
+
+# Removes DLLs from the build, which are only meant to be used for Chromium development.
+# See https://github.com/electron/electron/pull/17985
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 

From 125c324a497767e6f892928aac8cd002d706504d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 06:03:06 -0700
Subject: [PATCH 392/811] Bump v20.0.0-nightly.20220517

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b59af459922b5..29b78854c172d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220516
\ No newline at end of file
+20.0.0-nightly.20220517
\ No newline at end of file
diff --git a/package.json b/package.json
index 51ce8ed89fc86..b5bd7c8e0bf1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220516",
+  "version": "20.0.0-nightly.20220517",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4d2bd5a0da1e7..de054d840ebb6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220516
- PRODUCTVERSION 20,0,0,20220516
+ FILEVERSION 20,0,0,20220517
+ PRODUCTVERSION 20,0,0,20220517
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ccde8994b53d9ef0b2136452746f14348d86e00f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 08:12:04 -0700
Subject: [PATCH 393/811] Revert "Bump v20.0.0-nightly.20220517"

This reverts commit 125c324a497767e6f892928aac8cd002d706504d.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 29b78854c172d..b59af459922b5 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220517
\ No newline at end of file
+20.0.0-nightly.20220516
\ No newline at end of file
diff --git a/package.json b/package.json
index b5bd7c8e0bf1d..51ce8ed89fc86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220517",
+  "version": "20.0.0-nightly.20220516",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index de054d840ebb6..4d2bd5a0da1e7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220517
- PRODUCTVERSION 20,0,0,20220517
+ FILEVERSION 20,0,0,20220516
+ PRODUCTVERSION 20,0,0,20220516
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4e3587c7c6e051193c6bbe346192ff08d2b594c1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 08:15:20 -0700
Subject: [PATCH 394/811] Bump v20.0.0-nightly.20220517

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b59af459922b5..29b78854c172d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220516
\ No newline at end of file
+20.0.0-nightly.20220517
\ No newline at end of file
diff --git a/package.json b/package.json
index 51ce8ed89fc86..b5bd7c8e0bf1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220516",
+  "version": "20.0.0-nightly.20220517",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4d2bd5a0da1e7..de054d840ebb6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220516
- PRODUCTVERSION 20,0,0,20220516
+ FILEVERSION 20,0,0,20220517
+ PRODUCTVERSION 20,0,0,20220517
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 97c9451efc3035a1072b1ff87aee125f7a9fa053 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 17 May 2022 17:50:27 +0200
Subject: [PATCH 395/811] fix: WCO crash on bad `titlebarStyle` (#34140)

fix: WCO crash on bad titlebarStyle
---
 shell/browser/ui/views/win_frame_view.cc |  4 ++--
 spec-main/api-browser-window-spec.ts     | 27 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index 8a25bcdd73e8e..cea0b2937c92a 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -55,8 +55,8 @@ SkColor WinFrameView::GetReadableFeatureColor(SkColor background_color) {
 }
 
 void WinFrameView::InvalidateCaptionButtons() {
-  // Ensure that the caption buttons container exists
-  DCHECK(caption_button_container_);
+  if (!caption_button_container_)
+    return;
 
   caption_button_container_->InvalidateLayout();
   caption_button_container_->SchedulePaint();
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index adbfd107c5e9a..4d348bb924c47 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2,10 +2,8 @@ import { expect } from 'chai';
 import * as childProcess from 'child_process';
 import * as path from 'path';
 import * as fs from 'fs';
-import * as os from 'os';
 import * as qs from 'querystring';
 import * as http from 'http';
-import * as semver from 'semver';
 import { AddressInfo } from 'net';
 import { app, BrowserWindow, BrowserView, dialog, ipcMain, OnBeforeSendHeadersListenerDetails, protocol, screen, webContents, session, WebContents, BrowserWindowConstructorOptions } from 'electron/main';
 
@@ -2150,7 +2148,7 @@ describe('BrowserWindow module', () => {
     });
   });
 
-  ifdescribe(process.platform === 'win32' || (process.platform === 'darwin' && semver.gte(os.release(), '14.0.0')))('"titleBarStyle" option', () => {
+  ifdescribe(['win32', 'darwin'].includes(process.platform))('"titleBarStyle" option', () => {
     const testWindowsOverlay = async (style: any) => {
       const w = new BrowserWindow({
         show: false,
@@ -2219,7 +2217,7 @@ describe('BrowserWindow module', () => {
     });
   });
 
-  ifdescribe(process.platform === 'win32' || (process.platform === 'darwin' && semver.gte(os.release(), '14.0.0')))('"titleBarOverlay" option', () => {
+  ifdescribe(['win32', 'darwin'].includes(process.platform))('"titleBarOverlay" option', () => {
     const testWindowsOverlayHeight = async (size: any) => {
       const w = new BrowserWindow({
         show: false,
@@ -2279,6 +2277,27 @@ describe('BrowserWindow module', () => {
     afterEach(closeAllWindows);
     afterEach(() => { ipcMain.removeAllListeners('geometrychange'); });
 
+    it('does not crash when an invalid titleBarStyle was initially set', () => {
+      const win = new BrowserWindow({
+        show: false,
+        webPreferences: {
+          nodeIntegration: true,
+          contextIsolation: false
+        },
+        titleBarOverlay: {
+          color: '#0000f0',
+          symbolColor: '#ffffff'
+        },
+        titleBarStyle: 'hiddenInset'
+      });
+
+      expect(() => {
+        win.setTitleBarOverlay({
+          color: '#000000'
+        });
+      }).to.not.throw();
+    });
+
     it('correctly updates the height of the overlay', async () => {
       const testOverlay = async (w: BrowserWindow, size: Number) => {
         const overlayHTML = path.join(__dirname, 'fixtures', 'pages', 'overlay.html');

From 04b33b319b7fca9fbf415d67953643f9b29e2160 Mon Sep 17 00:00:00 2001
From: mkiki01 <56228074+mkiki01@users.noreply.github.com>
Date: Tue, 17 May 2022 11:59:24 -0400
Subject: [PATCH 396/811] docs: added units to <webview>.print() pageSize
 option (#34088)

---
 docs/api/webview-tag.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/webview-tag.md b/docs/api/webview-tag.md
index c2eab361cfd94..865b101168ad6 100644
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -556,7 +556,7 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
   * `header` string (optional) - string to be printed as page header.
   * `footer` string (optional) - string to be printed as page footer.
   * `pageSize` string | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` in microns.
 
 Returns `Promise<void>`
 

From 61374019c03ab1af8584550277318ba7c2adb0ca Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 12:48:40 -0400
Subject: [PATCH 397/811] chore: bump chromium to 103.0.5046.0 (main) (#33906)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: bump chromium in DEPS to 103.0.5020.0

* chore: bump chromium in DEPS to 103.0.5022.0

* chore: bump chromium in DEPS to 103.0.5024.0

* chore: update patches

* 3587410: [Printing] Remove JobEventDetails

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410

* chore: bump chromium in DEPS to 103.0.5026.0

* chore: update patches

* 3577218: WebUI: Delete webui_resources.grd and related GN targets.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218

* chore: bump chromium in DEPS to 103.0.5028.0

* chore: update patches

* 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297

* 3560622: serial: Add SerialPort.forget() method

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622

* 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708

* chore: fix authorization flags lint error

* 3583363: Remove net wrappers around base/strings/escape.h

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363

* fixup! 3560622: serial: Add SerialPort.forget() method

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622

* 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem"

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589

* 3584006: Remove IsRenderViewLive from content public

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006

* 3596174: [api] Remove APIs for resurrecting finalizers

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174

* 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244

* chore: bump chromium in DEPS to 103.0.5030.0

* chore: update patches

* chore: bump chromium in DEPS to 103.0.5032.0

* chore: bump chromium in DEPS to 103.0.5034.0

* chore: bump chromium in DEPS to 103.0.5036.0

* chore: update patches

* 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363

* 3593199: Remove content::PermissionType references and replace them with blink::PermissionType

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199

* 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244

* chore: lint

* chore: bump chromium in DEPS to 103.0.5038.0

* chore: update patches

* fixup! 3560622: serial: Add SerialPort.forget() method

* 3606495: mac screen capture: add metric

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495

* chore: bump chromium in DEPS to 103.0.5040.0

* chore: update patches

* 3590840: Add IPs to DnsOverHttpsServerConfig

https://chromium-review.googlesource.com/c/chromium/src/+/3590840

* stub functions for ElectronSerialDelegate and SerialChooserController to fix link

* 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h!

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412

* 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944

* fixup! 3566412: [base] Remove base/android dependency on post_task.h and off…
e3ea3e1
…icially remove post_task.h!

* chore: update process_singleton patches for content::GetIOThreadTaskRunner({})

Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655

* chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412

* chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo

* chore: migrate Linux/Windows methods off of post_task.h

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412

* 64908: Stop building legacy SwiftShader GL in Chromium

https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908

* 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245

* chore: bump chromium in DEPS to 103.0.5042.0

* chore: update patches

* 3571804: [api] Advance API deprecation for V8 version v10.2

https://chromium-review.googlesource.com/c/v8/v8/+/3571804

* fixup! 3571804: [api] Advance API deprecation for V8 version v10.2

* build: fix run-clang-format extension matching

* lint

* fix windows build

* how is clang-format still not working for me

* chore: update patches

* 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient.

https://chromium-review.googlesource.com/c/chromium/src/+/3623985

* no need to implement WillProvidePublicFirstPartySets; the default is false

* 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.*

https://chromium-review.googlesource.com/c/chromium/src/+/3601036

* 3583363: Remove net wrappers around base/strings/escape.h

https://chromium-review.googlesource.com/c/chromium/src/+/3583363

* lint

* chore: bump chromium in DEPS to 103.0.5044.0

* fix conflicts

* chore: update patches

* upgrade nan

* pin version of nan in tests

* replace my hacky deprecated override fix with the fix from upstream

* revert runtime dcheck in v8

* pin nan version at root too

* refactor: tell gyp to use c++17 when building with our node

* Revert "refactor: tell gyp to use c++17 when building with our node"

This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192.

* Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192.

This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348.

* disable sequential/test-cpu-prof-kill for now

* also sequential/test-diagnostic-dir-cpu-prof

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 BUILD.gn                                      |   2 +-
 DEPS                                          |   7 +-
 chromium_src/BUILD.gn                         |   2 +
 electron_paks.gni                             |   1 -
 package.json                                  |   5 +-
 patches/chromium/.patches                     |   1 +
 patches/chromium/accelerator.patch            |   2 +-
 ...client_precreatemessageloop_callback.patch |   6 +-
 .../add_didinstallconditionalfeatures.patch   |  18 +-
 ...pedcliboardwriter_writeunsaferawdata.patch |   2 +-
 ..._scheduler_throttling_per_renderview.patch |  28 +-
 ..._windows_to_have_different_web_prefs.patch |  24 +-
 ...leges_in_unsandboxed_child_processes.patch |   4 +-
 patches/chromium/blink_local_frame.patch      |  12 +-
 ..._node_processes_as_browser_processes.patch |   8 +-
 .../build_add_electron_tracing_category.patch |   2 +-
 ...build_disable_print_content_analysis.patch |  28 ++
 ..._depend_on_packed_resource_integrity.patch |  35 ++-
 .../build_libc_as_static_library.patch        |   2 +-
 patches/chromium/can_create_window.patch      |  34 +--
 ...screationoverridden_with_full_params.patch |  20 +-
 patches/chromium/chrome_key_systems.patch     |   2 +-
 ...allow_disabling_compression_on_linux.patch |  14 +-
 .../crash_allow_setting_more_options.patch    |   4 +-
 patches/chromium/dcheck.patch                 |   4 +-
 .../disable_color_correct_rendering.patch     |  12 +-
 .../disable_compositor_recycling.patch        |  14 +-
 patches/chromium/disable_hidden.patch         |  10 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |   4 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 ...locator_for_usage_outside_of_the_gin.patch |   4 +-
 ...xpose_setuseragent_on_networkcontext.patch |  12 +-
 .../extend_apply_webpreferences.patch         |   6 +-
 ...ransfer_to_requestsingleinstancelock.patch |  29 ++-
 .../feat_add_onclose_to_messageport.patch     |   6 +-
 ...screen_rendering_with_viz_compositor.patch |  10 +-
 ..._raw_response_headers_from_urlloader.patch |  30 +--
 .../chromium/fix_export_zlib_symbols.patch    |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   4 +-
 ...rmissions_checks_in_exclusive_access.patch |  32 ++-
 ...out_profile_refs_in_accessibility_ui.patch |   4 +-
 ..._properly_honor_printing_page_ranges.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |   2 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |  12 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 .../chromium/make_gtk_getlibgtk_public.patch  |   6 +-
 .../mas-cgdisplayusesforcetogray.patch        |   4 +-
 ...as_avoid_usage_of_private_macos_apis.patch |   6 +-
 .../mas_disable_custom_window_frame.patch     |   8 +-
 .../mas_disable_remote_accessibility.patch    |  42 +--
 .../chromium/mas_disable_remote_layer.patch   |   4 +-
 patches/chromium/mas_no_private_api.patch     |   2 +-
 ...emote_certificate_verification_logic.patch |  24 +-
 .../chromium/notification_provenance.patch    |  12 +-
 patches/chromium/picture-in-picture.patch     |   8 +-
 ...utofill_colors_to_the_color_pipeline.patch |  12 +-
 patches/chromium/printing.patch               | 241 ++++++++----------
 patches/chromium/process_singleton.patch      |  32 +--
 patches/chromium/proxy_config_monitor.patch   |   8 +-
 ...r_changes_to_the_webcontentsobserver.patch |  12 +-
 ...store_base_adaptcallbackforrepeating.patch |   4 +-
 .../render_widget_host_view_mac.patch         |  14 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   4 +-
 ...andboxed_ppapi_processes_skip_zygote.patch |   6 +-
 patches/chromium/web_contents.patch           |  12 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  16 +-
 ...feat_add_hook_to_notify_script_ready.patch |  12 +-
 patches/nan/.patches                          |   2 +-
 ...use_new_constructor_for_scriptorigin.patch |  42 ---
 ...nstructor_for_scriptorigin_when_17_x.patch |  29 +++
 patches/node/.patches                         |   1 +
 .../src_update_importmoduledynamically.patch  |  56 ++++
 patches/v8/.patches                           |   1 +
 patches/v8/build_gn.patch                     |   8 +-
 patches/v8/dcheck.patch                       |  20 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...dcheck_for_node_stream_array_buffers.patch |   2 +-
 ..._terminating_exception_in_microtasks.patch |  61 +++++
 script/lib/config.py                          |   2 -
 script/nan-spec-runner.js                     |   2 +-
 script/node-disabled-tests.json               |   2 +
 script/spec-runner.js                         |   5 +
 .../zip_manifests/dist_zip.linux.arm.manifest |   2 -
 .../dist_zip.linux.arm64.manifest             |   2 -
 .../zip_manifests/dist_zip.linux.x64.manifest |   2 -
 .../zip_manifests/dist_zip.linux.x86.manifest |   2 -
 .../zip_manifests/dist_zip.win.arm64.manifest |   2 -
 .../zip_manifests/dist_zip.win.ia32.manifest  |   2 -
 .../zip_manifests/dist_zip.win.x64.manifest   |   2 -
 shell/app/electron_main_delegate.cc           |   2 +
 shell/browser/api/electron_api_app.cc         |  10 +-
 shell/browser/api/electron_api_base_window.h  |   5 +-
 shell/browser/api/electron_api_menu_mac.mm    |   1 -
 .../browser/api/electron_api_native_theme.cc  |   5 +-
 .../api/electron_api_power_save_blocker.cc    |   1 -
 shell/browser/api/electron_api_session.cc     |   7 +-
 .../browser/api/electron_api_web_contents.cc  |   9 +-
 shell/browser/api/electron_api_web_contents.h |  11 +-
 shell/browser/certificate_manager_model.cc    |   9 +-
 shell/browser/electron_browser_client.cc      |  20 +-
 shell/browser/electron_browser_client.h       |   2 +-
 shell/browser/electron_browser_context.cc     |   5 +-
 shell/browser/electron_browser_main_parts.cc  |  25 +-
 shell/browser/electron_browser_main_parts.h   |   3 +-
 .../electron_browser_main_parts_posix.cc      |   1 -
 .../electron_download_manager_delegate.cc     |  13 +-
 shell/browser/electron_permission_manager.cc  |  50 ++--
 shell/browser/electron_permission_manager.h   |  39 ++-
 .../electron_management_api_delegate.cc       |   1 -
 .../electron_extension_message_filter.cc      |   3 +-
 .../extensions/electron_extension_system.cc   |  12 +-
 .../electron_extensions_browser_client.cc     |   5 +-
 shell/browser/mac/in_app_purchase.mm          |   5 +-
 shell/browser/mac/in_app_purchase_observer.mm |   5 +-
 shell/browser/mac/in_app_purchase_product.mm  |   5 +-
 shell/browser/native_window_mac.mm            |   9 +-
 shell/browser/net/asar/asar_url_loader.cc     |   1 -
 .../win/windows_toast_notification.cc         |  13 +-
 .../osr/osr_render_widget_host_view.cc        |   9 +-
 .../printing/print_preview_message_handler.cc |   5 +-
 .../serial/electron_serial_delegate.cc        |  13 +
 .../browser/serial/electron_serial_delegate.h |   6 +
 .../browser/serial/serial_chooser_context.cc  |  22 ++
 shell/browser/serial/serial_chooser_context.h |  18 ++
 .../serial/serial_chooser_controller.cc       |   4 +
 .../serial/serial_chooser_controller.h        |   3 +-
 .../browser/ui/cocoa/electron_bundle_mover.mm |   7 +-
 .../ui/cocoa/electron_menu_controller.mm      |   7 +-
 shell/browser/ui/devtools_manager_delegate.cc |   4 +-
 shell/browser/ui/file_dialog_mac.mm           |   5 +-
 shell/browser/ui/gtk/app_indicator_icon.cc    |   1 -
 shell/browser/ui/inspectable_web_contents.cc  |   1 -
 shell/browser/ui/message_box_mac.mm           |   5 +-
 shell/browser/ui/message_box_win.cc           |   1 -
 shell/browser/ui/tray_icon_cocoa.mm           |   5 +-
 .../ui/views/electron_views_delegate_win.cc   |   1 -
 shell/browser/ui/views/menu_bar.cc            |   3 +-
 shell/browser/ui/views/menu_delegate.cc       |   5 +-
 shell/browser/ui/webui/accessibility_ui.cc    |   4 +-
 shell/browser/ui/win/dialog_thread.h          |   6 +-
 .../browser/web_contents_permission_helper.cc |  37 ++-
 .../browser/web_contents_permission_helper.h  |  12 +-
 shell/browser/web_contents_zoom_controller.cc |   2 +-
 shell/common/asar/archive.cc                  |   1 -
 .../gin_converters/content_converter.cc       |  60 ++---
 .../common/gin_converters/content_converter.h |   6 +-
 shell/common/gin_helper/callback.cc           |   2 +-
 shell/common/gin_helper/locker.cc             |   6 +
 shell/common/gin_helper/locker.h              |   6 +-
 shell/common/gin_helper/promise.cc            |   4 +-
 shell/common/gin_helper/promise.h             |   9 +-
 shell/common/platform_util_win.cc             |   5 +-
 shell/common/v8_value_converter.cc            |  14 +-
 .../api/electron_api_context_bridge.cc        |  23 +-
 .../renderer/api/electron_api_ipc_renderer.cc |   1 -
 shell/renderer/api/electron_api_web_frame.cc  |  10 +-
 shell/renderer/renderer_client_base.cc        |   6 +-
 spec/package.json                             |   3 +
 spec/yarn.lock                                |   7 +-
 168 files changed, 1009 insertions(+), 873 deletions(-)
 create mode 100644 patches/chromium/build_disable_print_content_analysis.patch
 delete mode 100644 patches/nan/use_new_constructor_for_scriptorigin.patch
 create mode 100644 patches/nan/use_new_constructor_for_scriptorigin_when_17_x.patch
 create mode 100644 patches/node/src_update_importmoduledynamically.patch
 create mode 100644 patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch

diff --git a/BUILD.gn b/BUILD.gn
index 60ab4cac8106c..107f317be548f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -561,8 +561,8 @@ source_set("electron_lib") {
       "//ui/base/ime/linux",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
-      "//ui/gtk",
       "//ui/views/controls/webview",
+      "//ui/views/linux_ui:linux_ui_factory",
       "//ui/wm",
     ]
     if (ozone_platform_x11) {
diff --git a/DEPS b/DEPS
index 32458aa34c76b..8d2532547f4fd 100644
--- a/DEPS
+++ b/DEPS
@@ -2,14 +2,11 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.4999.0',
+    '103.0.5044.0',
   'node_version':
     'v16.15.0',
   'nan_version':
-    # The following commit hash of NAN is v2.14.2 with *only* changes to the
-    # test suite. This should be updated to a specific tag when one becomes
-    # available.
-    '65b32af46e9d7fab2e4ff657751205b3865f4920',
+    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':
     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
 
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index fc0f33ed2e17a..41aad0ed3b942 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -89,6 +89,8 @@ static_library("chrome") {
       "//chrome/browser/icon_loader_mac.mm",
       "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
       "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
       "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
       "//chrome/browser/process_singleton_mac.mm",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
diff --git a/electron_paks.gni b/electron_paks.gni
index ed8e3c45dd996..2c5ae0b0c8c10 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -67,7 +67,6 @@ template("electron_extra_paks") {
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
-      "$root_gen_dir/ui/resources/webui_resources.pak",
       "$target_gen_dir/electron_resources.pak",
     ]
     deps = [
diff --git a/package.json b/package.json
index b5bd7c8e0bf1d..4e2b0088f4820 100644
--- a/package.json
+++ b/package.json
@@ -141,5 +141,8 @@
     "DEPS": [
       "node script/gen-hunspell-filenames.js"
     ]
+  },
+  "resolutions": {
+    "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
   }
-}
\ No newline at end of file
+}
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index ff7ade0c3c84f..f4512709cbcc5 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -108,3 +108,4 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
+build_disable_print_content_analysis.patch
diff --git a/patches/chromium/accelerator.patch b/patches/chromium/accelerator.patch
index 04f4464c2dbbf..58c927f03d6bb 100644
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= and Ctrl-Plus show up as such
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 2468b2c5881821d6f8e24a0e7c42243427b384ad..7e44c97edabf5ae012ff4f84d1404d8f223a13fe 100644
+index 783202623cc15168c726180fe232751551c43798..7cf5449a61a31bebbaffd920129daf1866211d7c 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 2440aa84adfbf..9176b7a52a1ad 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c571b710e 100644
+index e0ff6fae1e96699e7cb54c9e82a3c68a8e95602b..2179a906bb6c93fbfaa8e7b7e64fddfaab034e94 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -240,6 +240,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -241,6 +241,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -346,7 +350,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -347,7 +351,6 @@ int GpuMain(MainFunctionParams parameters) {
    GpuProcess gpu_process(io_thread_priority);
  #endif
  
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 0be836b9cb0d2..52a2c7249d7d4 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 596dc721842c707844a771d64337e9cf0d82bfcc..b9eea3470139e1833b2b23d3b535b11235e2bc8e 100644
+index abcd95ad39d8d66e1a7149e89bc6bfe2a8197d19..1b021461f214287c94fb22b17d980c19e3f07dde 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4465,6 +4465,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4489,6 +4489,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -79,10 +79,10 @@ index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b09415
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4871ae81f 100644
+index 810726792cba326f66df5a8d0d833eaee4975594..635fb45b0a9d1716bd45d8b6c5dbc5f9fbf0ffa8 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -298,6 +298,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,10 +92,10 @@ index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8774b9dc7 100644
+index 772748673a5854349ba2be28abe21b7ff3f8541f..b3ebd622a61187f718ca16ac8cfeb189d35584d2 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-@@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
+@@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
      web_frame_->Client()->DidCreateScriptContext(context, world_id);
  }
  
@@ -110,7 +110,7 @@ index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 420d82ed07017deba3298c5454666c09240dd23d..15407fb95dcf25875eb76a41fe1834c1f0a53528 100644
+index 200f0c57df1f15428b45a228adfee8fd5465ecbf..ec8cad0a94b31561096fdaba1a75fb54c96d3f7e 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 420d82ed07017deba3298c5454666c09240dd23d..15407fb95dcf25875eb76a41fe1834c1
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 8087d1f62e9b1a8ac33a9e92c10a7cb8b8363e08..845c3329674d99dd385316dbfd1287fa3566a60e 100644
+index acd3b33c64f1534555c14047e29c18f31a1e8f92..63a9e0695efb0f357c0c3298175da9bbdc78a41c 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -357,6 +357,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -352,6 +352,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}
diff --git a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
index 01c36b3c68ded..89a42e0df8307 100644
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -8,7 +8,7 @@ was removed as part of the Raw Clipboard API scrubbing.
 https://bugs.chromium.org/p/chromium/issues/detail?id=1217643
 
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
-index 3009acd40eee36bc3d4dd8642f0ce5e6476da973..1d52ce84184a3ca94e4e0f04d331bf56d75e07d0 100644
+index 1eb1d0fe4696f26e7de43fc8797c283e9e6db042..766f8d8df866ce7fbc337cecceb715cced39643c 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.cc
 +++ b/ui/base/clipboard/scoped_clipboard_writer.cc
 @@ -227,6 +227,16 @@ void ScopedClipboardWriter::WriteEncodedDataTransferEndpointForTesting(
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 1e65be856e7b0..5d2aae9b16dfa 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 32df5050f5a66c4b4f0981d3777a3b5a4fac9629..d8d9982bc6bd6e472677707b326a5dafa9b7fcf5 100644
+index f19a15f85afe2d754833667d8c272c75da3de0b2..18de1a2533b479a6090ed412987f0b5c3922c711 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -660,6 +660,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -661,6 +661,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,11 +22,11 @@ index 32df5050f5a66c4b4f0981d3777a3b5a4fac9629..d8d9982bc6bd6e472677707b326a5daf
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index a099eed10dd061994bff696519099c3ef7437a46..a1f1e9b55272e70b4acd5d1f1515fba7d91538fa 100644
+index 64f6ebe2a86a659da70f32cdbdb961384adca43f..2fc1062eb798a233f0eede6dd945f25d633e5f8f 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
-   bool IsRenderViewLive() const override;
+@@ -136,6 +136,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+   void EnablePreferredSizeMode() override;
    void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
  
 +  void SetSchedulerThrottling(bool allowed) override;
@@ -34,10 +34,10 @@ index a099eed10dd061994bff696519099c3ef7437a46..a1f1e9b55272e70b4acd5d1f1515fba7
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index a6fe708878eb9afba9a68e0be71ba2c0b2a84d7d..5cc81ceb44d0a8baee3ebcc63aa4137b1e9ef08e 100644
+index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da4689b7a2 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
-@@ -80,6 +80,9 @@ class CONTENT_EXPORT RenderViewHost {
+@@ -77,6 +77,9 @@ class CONTENT_EXPORT RenderViewHost {
    virtual void WriteIntoTrace(
        perfetto::TracedProto<TraceProto> context) const = 0;
  
@@ -61,10 +61,10 @@ index fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618
    // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
    // it in the same order in the .cc file as it was in the header.
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b0c766610 100644
+index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319b1a5ec28 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
-@@ -97,4 +97,7 @@ interface PageBroadcast {
+@@ -108,4 +108,7 @@ interface PageBroadcast {
  
    // Sent to whole page, but should only be used by the main frame.
    SetPageBaseBackgroundColor(skia.mojom.SkColor? color);
@@ -73,7 +73,7 @@ index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919f8241393 100644
+index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de372dd5be 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
 @@ -364,6 +364,7 @@ class WebView {
@@ -85,10 +85,10 @@ index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index d7b5e40a26026b7f4640c2f405fadab4a800e267..b2a2e38397fdf3e9bb52c4532a1d14463ed4110d 100644
+index 9704d8d8a4ee9e36c1a61c6723ce1039320014b6..cd14dd54e3c7bb56e82cbd6c566c11018b4deb94 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3688,6 +3688,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3698,6 +3698,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index d7b5e40a26026b7f4640c2f405fadab4a800e267..b2a2e38397fdf3e9bb52c4532a1d1446
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3699,7 +3706,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3709,7 +3716,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,7 +113,7 @@ index d7b5e40a26026b7f4640c2f405fadab4a800e267..b2a2e38397fdf3e9bb52c4532a1d1446
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 08a54c62b7f4eeb6a8b0e0cb192723e1aecad915..1eeb122ac5db86c53d328a308dc2b7a4a5ca9fed 100644
+index 51ab4f029e467fa5ea2663af38445d9565e19fe4..18005ca7a272d7731a4b8eeeac92ce163c2a262e 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
 @@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 020ad8959be89..a5496a4828377 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab717847735dc63b17 100644
+index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..c6dc3cebfb32489a5e50b850ed02a066bf3f258e 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -140,6 +140,20 @@ WebPreferences::WebPreferences()
+@@ -142,6 +142,20 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -33,13 +33,13 @@ index 4e51622d725ad0ee448ea1794c209aae7f78e09a..df6e9ed6fda9e6fa695fa3ab71784773
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadcc12afd1a 100644
+index 187fd8d9818693262256d5cbddd5e02659ba903d..f166517f4e70ced310253539fb6197f6b3af559c 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -22,6 +22,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
-       !data.ReadSansSerifFontFamilyMap(&out->sans_serif_font_family_map) ||
+@@ -23,6 +23,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        !data.ReadCursiveFontFamilyMap(&out->cursive_font_family_map) ||
        !data.ReadFantasyFontFamilyMap(&out->fantasy_font_family_map) ||
+       !data.ReadMathFontFamilyMap(&out->math_font_family_map) ||
 +      // Begin Electron-specific WebPreferences.
 +      !data.ReadPreloads(&out->preloads) ||
 +      !data.ReadPreload(&out->preload) ||
@@ -47,7 +47,7 @@ index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadc
        !data.ReadLazyFrameLoadingDistanceThresholdsPx(
            &out->lazy_frame_loading_distance_thresholds_px) ||
        !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -145,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -148,6 +152,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +68,7 @@ index 16e7501cf2da98d0046d65102e634af31c1f6c39..53fbfdb4837fe444c3564523068faadc
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f0812c41aab 100644
+index 59947bfd3c042e5f7d3993967fece9b519f93472..368ec7fb398409cd6386269934eaffcce356793f 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,7 +79,7 @@ index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f08
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -152,6 +153,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -154,6 +155,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
@@ -103,7 +103,7 @@ index b2b3be2019209d3810bb0dc570e2a1ebcf702ad8..0ff23de6bd73d6d0ba82402ec39d2f08
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691eccaf3cd7b19 100644
+index bd425a5869477de9095c6a41c683609d065b08c0..3a5d7450aa40e8a7614e83f316d3d0fb59583381 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,7 +114,7 @@ index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691ecca
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -418,6 +419,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -428,6 +429,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
@@ -176,7 +176,7 @@ index 30fd01c6e804d05091ff6147ac570901a8d998b9..4acd2df36ab6928947b5defe8691ecca
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index d10d1b4c0b16ac9e863077cf60feca35fa2da329..1a49fb1a11f75aa3c79cd3cc1796957d0b9a5549 100644
+index 738ac646e075f7a37ba2a263c7799a755e63d3fb..80d6ae17d34ef5c7fd14e21c4e1ee3ed4ef9c5fe 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,7 +187,7 @@ index d10d1b4c0b16ac9e863077cf60feca35fa2da329..1a49fb1a11f75aa3c79cd3cc1796957d
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -204,6 +205,22 @@ struct WebPreferences {
+@@ -206,6 +207,22 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
index 617c5e656d99e..233e57bce4f26 100644
--- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
+++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
@@ -6,10 +6,10 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index f60ad777ab7698a4518d3b1b61ade29e7c618a3a..c7781bdb49f8a92aa9ee1d8dd1af03fa9cf2dfe3 100644
+index 80db4cb5941ee84db1534c070c4daefef76d0faf..cf40ac56a9ce4bd4a28eb511b5f37d148e4be6ac 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
-@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
+@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
    if (GetProcessType() == switches::kRendererProcess) {
      const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
      options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 48e5d3af2555f..b682f15b7e390 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 0396836ad4ae67e26b6920afbcd702ccb24d391e..f207eda80b6cd1d3a739cc27499691ad1ac8e13e 100644
+index c136ea03ea961ce419d42c60efc646e4ddfe5693..4e635c3775df0f1b3b3d7551fba8f8d59d1b541b 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
  
    DCHECK(!IsDetached());
  
@@ -33,7 +33,7 @@ index 0396836ad4ae67e26b6920afbcd702ccb24d391e..f207eda80b6cd1d3a739cc27499691ad
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -153,6 +145,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -154,6 +146,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,10 +49,10 @@ index 0396836ad4ae67e26b6920afbcd702ccb24d391e..f207eda80b6cd1d3a739cc27499691ad
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index b95ed440737ccdf32607c90831d13a482315d515..73f7aeee21f0116e46dad91cb9a088ab5adda6e3 100644
+index 019b87a77fb7306bacdcda20e388cdfb8d3a6be8..f972ae236566248d3179d147e9692322153e326d 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index b95ed440737ccdf32607c90831d13a482315d515..73f7aeee21f0116e46dad91cb9a088ab
    if (!Client())
      return false;
  
-@@ -592,6 +588,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -593,6 +589,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
index 1222c47289414..f550c068a4fe7 100644
--- a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
+++ b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
@@ -10,10 +10,10 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa6025207d80 100644
+index 3933fa761768b5a45891bfef4c2c2123b92fc276..2eb52b71d7ebc7525cceffbecc99db6751429afd 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -718,8 +718,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
+@@ -719,8 +719,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
    log_path[log_path_len] = '\0';
    info.log_filename = log_path;
  #endif
@@ -29,7 +29,7 @@ index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa60
    info.distro = base::g_linux_distro;
    info.distro_length = my_strlen(base::g_linux_distro);
    info.upload = upload;
-@@ -2025,8 +2030,13 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2027,8 +2032,13 @@ void InitCrashReporter(const std::string& process_type) {
        process_type == kWebViewSingleProcessType ||
        process_type == kBrowserProcessType ||
  #endif
@@ -40,6 +40,6 @@ index 43f6d476f3ee2759cf41c492f932522994e7ddec..8df14f416ee321e1259433715a61fa60
 +    g_is_node = true;
 +  }
 +
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !BUILDFLAG(IS_CHROMEOS)
    SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
  #endif
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index 6c074efcaf841..ff503b7c6cb89 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 0736e7021761e6019e1b52448d21ffdb73b964fc..571b553e9aaa98739851d0ff312eefe9f6a75596 100644
+index 7528d88c5d40571f1dcbd02201128ba2eed0cf08..ae50430c441539eb6152a926d382fb0552f3c358 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -80,6 +80,7 @@
diff --git a/patches/chromium/build_disable_print_content_analysis.patch b/patches/chromium/build_disable_print_content_analysis.patch
new file mode 100644
index 0000000000000..7dff09c3e4eea
--- /dev/null
+++ b/patches/chromium/build_disable_print_content_analysis.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <vertedinde@electronjs.org>
+Date: Sun, 1 May 2022 18:01:42 -0700
+Subject: build: disable print_content_analysis
+
+Print Content Analysis enables enterprise users to scan to-be-printed
+pages and documents for sensitive data if the OnPrintEnterpriseConnector
+policy is enabled. A conversation with the Chromium team confirmed
+this feature was intended for enterprise Chrome users and not embedders,
+so we're disabling it to prevent build issues/additional unneeded files.
+
+This patch can be removed when enable_print_content_analysis can be more
+easily enabled or disabled by default with buildflags.
+
+diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
+index 559ac76d4e4b9d9c1824c4da186a6b0f7619fcca..72855e0c5fadb286b67144b34ff71f45e1434c73 100644
+--- a/printing/buildflags/buildflags.gni
++++ b/printing/buildflags/buildflags.gni
+@@ -36,8 +36,7 @@ declare_args() {
+ 
+   # Enable snapshotting a page when printing for its content to be analyzed for
+   # sensitive content by enterprise users.
+-  enable_print_content_analysis =
+-      is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac
++  enable_print_content_analysis = is_chromeos_ash || is_chromeos_lacros
+ }
+ 
+ declare_args() {
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 17729820471d9..cfbf7076545a7 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05e84bb846 100644
+index 99ab95668a7d3a31339b576b4a3a6038f39c2795..92f43eac6d654ff8ebe57d291c4f77aa1b029895 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -171,11 +171,16 @@ if (!is_android && !is_mac) {
+@@ -173,11 +173,16 @@ if (!is_android && !is_mac) {
          "common/crash_keys.h",
        ]
  
@@ -33,10 +33,10 @@ index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 02e4b0e27f4a0d3409327ba929f78b129dc06385..dce624825dc8e9e545c15a0cb0427aa33877aa3e 100644
+index cb28e691fb863fe7739a7ca536170e6c7a76a315..eacc853e2b9fc3c9e448f419e02d7378da310e9e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4552,7 +4552,7 @@ static_library("browser") {
+@@ -4588,7 +4588,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 02e4b0e27f4a0d3409327ba929f78b129dc06385..dce624825dc8e9e545c15a0cb0427aa3
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c00b3d3af 100644
+index 24a27fb4a47678be448d597c7e430ce28d23be11..664e9b0378d5b7c09fa66b7a10c7f938da14aab9 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5995,7 +5995,6 @@ test("unit_tests") {
+@@ -5841,7 +5841,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -6018,6 +6017,10 @@ test("unit_tests") {
+@@ -5864,6 +5863,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6706,7 +6709,6 @@ test("unit_tests") {
+@@ -6757,7 +6760,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,15 +76,14 @@ index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6754,6 +6756,11 @@ test("unit_tests") {
-     if (is_chromeos) {
-       deps += [ "//ui/chromeos" ]
+@@ -6856,6 +6858,10 @@ test("unit_tests") {
      }
+   }
+ 
++  if (!is_electron_build) {
++    deps += [ "//chrome:packed_resources_integrity_hash" ]
++  }
 +
-+    if (!is_electron_build) {
-+      deps += [ "//chrome:packed_resources_integrity_hash" ]
-+    }
-+
-     if (is_chromeos_ash) {
-       deps += [
-         "//ash/assistant/model",
+   if (is_chromeos_ash) {
+     sources -= [
+       "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index 15419321d710c..f0bd3d9fd8ef3 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index a53cc9066a3485ff6829e3c410eb523de7d074d6..9697e2dc2d0892fc7f1007d62488c2f2f24ec92f 100644
+index 74b6ad644d49c003996db0eab225ea30ac17420a..0a1ba3510be3047bfc34e603c5aaafbf15908269 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 4fb371adedae3..7844ee1c891a6 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 9b08d7bbbda75390813ff07e0dc83bb9d16992a6..b47dc4a90a0294c5d7e73f01c496fd2b4f621400 100644
+index aa0be995df8c2f9fa0d84922d30c7e1cdf9025c8..e588b460aa32b4c984d593ed54e10310b59ace9b 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6939,6 +6939,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6840,6 +6840,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 9b08d7bbbda75390813ff07e0dc83bb9d16992a6..b47dc4a90a0294c5d7e73f01c496fd2b
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index d0092176fd24acb0657819d666e4f76ec65012ec..df03de0a810bbce796d5bc421b92000e02dbd449 100644
+index 6da28755d61f8957b0e6b6d0f1e669c2dbb347fa..a96bb634eb5c5405abb62b88d576e5e3ed354caa 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3943,6 +3943,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3951,6 +3951,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index d0092176fd24acb0657819d666e4f76ec65012ec..df03de0a810bbce796d5bc421b92000e
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3987,12 +3995,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3995,12 +4003,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -68,10 +68,10 @@ index a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db01
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index ffa24d4b6779226ea3b94afdf176939ea7e42e34..16fb4946cb3ea2d097e8ed05bb340cc3f0782ed6 100644
+index 984205b3d1bb4acfde6c5d106118a88f866af341..e33a5c9c6d493cd4ac2664ea10390193e3e53fcc 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -579,6 +579,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -581,6 +581,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index ffa24d4b6779226ea3b94afdf176939ea7e42e34..16fb4946cb3ea2d097e8ed05bb340cc3
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d563d5aafc 100644
+index 7e22f3e0b84f3e6b1ef7b1c5176665b38bd53629..f6d98708c436447ee6c93acb5d476719c238ca9c 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -165,6 +165,7 @@ class NetworkService;
+@@ -168,6 +168,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d5
  }  // namespace network
  
  namespace sandbox {
-@@ -954,6 +955,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -959,6 +960,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d5
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c6439b692 100644
+index 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904ce9c6db8 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -124,7 +124,7 @@ index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd482d8eb3f3 100644
+index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b8f35f497 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,7 +150,7 @@ index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd48
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index f7fbc40e8df8b996d6079f2e691771529ca42497..5580f245477b713d0f1f92ca9d15de847c4f8c92 100644
+index 89b07508aef80680a847c106fea0e2fa58ff964b..6630af3583a6bac6135d46644280d6444fe981b8 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -33,6 +33,7 @@
@@ -173,7 +173,7 @@ index f7fbc40e8df8b996d6079f2e691771529ca42497..5580f245477b713d0f1f92ca9d15de84
        /*is_opener_navigation=*/false, request.HasUserGesture(),
        // `openee_can_access_opener_origin` only matters for opener navigations,
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 4379497806bf7c85ade2f4e4554d6a60c4ec966c..fa860bbcf0c12df33dae69d25b01587676a1b79e 100644
+index 2e7c332565ebe33b00ab7fff96a6a8dfc61422a6..0ab061f51d1d0c93f23bfcf5ba051172cea37eb8 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
 @@ -438,6 +438,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -186,7 +186,7 @@ index 4379497806bf7c85ade2f4e4554d6a60c4ec966c..fa860bbcf0c12df33dae69d25b015876
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index d4eb4d482b2641585d501131c64b90cc9dbcfd18..132a5d86279b9a2cb4364b9c6d3e89e12d55052e 100644
+index 00e2a8c21d4f0ef00c942498251fa44065da63c0..0fc4b092fa276063e05f990bf920fecd60c6d26c 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
 @@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
@@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 00af75f5295251fb19c874d2b7d877c4a53f7f12..c0042534907dfca1789b8dde2ffa11956d3e029e 100644
+index ea47699384318126fef1a8c4cc3cb881cdc8e624..22d63b9f89913878518294f19afc85550196ca3e 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2076,6 +2076,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2088,6 +2088,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 1230a33e25953..492d73768b2f9 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 70ee9049e3cb73f55bed81c3e08037df2f4c9e07..8d230826aaf867d9046a6b9ac93a60f4750e52be 100644
+index 1837aac53e6e13aebb0eee00249b305e0c7192c9..cf0b500239f635decc718fb9cfceb3f3f5be23c6 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1786,12 +1786,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1798,12 +1798,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index 70ee9049e3cb73f55bed81c3e08037df2f4c9e07..8d230826aaf867d9046a6b9ac93a60f4
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 5edda102ff59ccb30d2150a88e75e8fb65379fca..82aaa442bca9e7a5e57315ace0b1c62e40ec1d24 100644
+index 631c30c8f153e72cd92de457d8ba6f44574edbe6..a24181efacd35c3d7b9b0bcdc066dd0a0f7bc43a 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -808,8 +808,7 @@ class Browser : public TabStripModelObserver,
+@@ -828,8 +828,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b9309e1cbc4a8b701534aa8be2827c40d98d6678..c1b1bfc8333e93456178842db392eabff96bf4c9 100644
+index 1b616ba52d9c77c64c7f24a0d204ce36641dce38..0303ae1c4d8681bc1bf56eb9ff1fc13afd678706 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3891,8 +3891,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3899,8 +3899,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index b9309e1cbc4a8b701534aa8be2827c40d98d6678..c1b1bfc8333e93456178842db392eabf
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a8e0463b1 100644
+index c01e06b08b1cca7a663e30476a551904ce9c6db8..9f50a8721560f734270308776f2f37ad49a8cb91 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -274,7 +274,7 @@ index 7bb1680553c405a9016cfd67eca5fa3c6439b692..3aa2cca04340098859e1072eaa80a46a
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index eeafde1fa6067804665954525eafdd482d8eb3f3..b17f371aa489a5b61c28fbcd316b19815f072df9 100644
+index 2556c044b6e28501a5fac9b0040e623b8f35f497..4c6cd654551b2f5cfd59a5271a8d95a9e6862d3c 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -344,10 +344,10 @@ index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec48
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index 424c5f89440dccc29f3431e034d0a4fd4f647a00..8d40d0bd30fc28e841eedb3f34be3c033db62449 100644
+index d2497be79bb5d7943589bb928e2fbe13f76aa3e3..54adf30432cf178f2d00630420e45cfa95551b54 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -402,8 +402,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -404,8 +404,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index 2c9718a540923..62e2ef85c1b9f 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index ff769b9855810bfe3761079ddae286fc8aa5602f..1fea025e8fc1d4e2496f117780fa4d0eb2f2e983 100644
+index 587144562fffda66cee9cbd23b16fb4e8607d208..a41bb82f8dcf292cf23aa8781bd5a5c52f11e578 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
diff --git a/patches/chromium/crash_allow_disabling_compression_on_linux.patch b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
index 6f4a3b926bbc6..bfe7658c28575 100644
--- a/patches/chromium/crash_allow_disabling_compression_on_linux.patch
+++ b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
@@ -13,10 +13,10 @@ Ultimately we should remove the option to disable compression, and
 subsequently remove this patch.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb880264464787eb32 100644
+index 2eb52b71d7ebc7525cceffbecc99db6751429afd..d3ff2942d831745efed440be0fe1e82441a39ff7 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -110,6 +110,8 @@ void SetUploadURL(const std::string& url) {
+@@ -111,6 +111,8 @@ void SetUploadURL(const std::string& url) {
    DCHECK(!g_upload_url);
    g_upload_url = strdup(url.c_str());
  }
@@ -25,9 +25,9 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
  #endif
  
  bool g_is_node = false;
-@@ -1322,56 +1324,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1324,56 +1326,60 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
  
- #else   // BUILDFLAG(IS_CHROMEOS_ASH)
+ #else   // BUILDFLAG(IS_CHROMEOS)
  
 -  // Compress |dumpfile| with gzip.
 -  const pid_t gzip_child = sys_fork();
@@ -127,7 +127,7 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
    static const char header_msg[] =
        "--header=Content-Type: multipart/form-data; boundary=";
    const size_t header_content_type_size =
-@@ -1398,7 +1404,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
+@@ -1400,7 +1406,8 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
    static const char kWgetBinary[] = "/usr/bin/wget";
    const char* args[] = {
        kWgetBinary,
@@ -137,9 +137,9 @@ index 8df14f416ee321e1259433715a61fa6025207d80..1d7f38d3f89d9c7f110cc9eb88026446
        header_content_type,
        post_file,
        g_upload_url,
-@@ -2039,6 +2046,7 @@ void InitCrashReporter(const std::string& process_type) {
+@@ -2041,6 +2048,7 @@ void InitCrashReporter(const std::string& process_type) {
  
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+ #if !BUILDFLAG(IS_CHROMEOS)
    SetUploadURL(GetCrashReporterClient()->GetUploadUrl());
 +  g_compress_uploads = GetCrashReporterClient()->GetShouldCompressUploads();
  #endif
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index ff3fe7c4fcfae..fb4565d06bf81 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -9,10 +9,10 @@ rate-limiting, compression and global annotations.
 This should be upstreamed.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 823e49a234e3dd31bf6527c2e4efa96f3d23f1f2..43f6d476f3ee2759cf41c492f932522994e7ddec 100644
+index 4ed2558351e37dde0eb35b6eb32f442346ff2490..3933fa761768b5a45891bfef4c2c2123b92fc276 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
-@@ -112,6 +112,7 @@ void SetUploadURL(const std::string& url) {
+@@ -113,6 +113,7 @@ void SetUploadURL(const std::string& url) {
  }
  #endif
  
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index 0b4fa1aa751ef..ccc3ddcd8566f 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
 diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index ab0afb79514e42acb87e94809ed4a2b7c736a825..23fb303820860a030643d6d5a1a449823bb146e8 100644
+index 21e7b1cbada3856a7d91040c259be80ae95df07e..b19206ba58725f949403469a3e1d221b12833581 100644
 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
 +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -515,8 +515,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
+@@ -542,8 +542,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
                                 ->GetPageScaleConstraintsSet()
                                 .FinalConstraints()
                                 .initial_scale;
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 297cb3869dcbe..f5a01a7b3ca69 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 14e13169de8b5e808e3284792237bef9939b1e00..7628a96dc8b2c9e8128cd462138d3487304c6e10 100644
+index f3f1d19619717f0f0493ab1ec90f47fd16bdd574..10bdf83528295d50cde496ade386a3546aa7bfc2 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1894,6 +1894,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1880,6 +1880,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -228,7 +228,7 @@ index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb0
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 8cd9a960ca1de81857af60daa91596c1dbb17786..7455afe4d81eac31fe3792a4459834a7f968918c 100644
+index 11e2a00aaffeba9379c0f2c41e6300d3020c7a88..9cfd058861a506bc3d6f72e5ed4a37b60ff4454b 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -240,10 +240,10 @@ index 8cd9a960ca1de81857af60daa91596c1dbb17786..7455afe4d81eac31fe3792a4459834a7
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 927e182bbba7a3700fd20c8c964da7cc162c4210..f099940c5b8fd92c04401cfbd231c04cb413d286 100644
+index 0c8d0735523d388d0e68d2ad0b20a1c2525502ed..089b8e85776874938cfdafad0c3576562a78c1b0 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -197,6 +197,7 @@
+@@ -198,6 +198,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
  #include "ui/display/display_switches.h"
@@ -251,7 +251,7 @@ index 927e182bbba7a3700fd20c8c964da7cc162c4210..f099940c5b8fd92c04401cfbd231c04c
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3213,6 +3214,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3217,6 +3218,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 85264ef143680..522db3317eff0 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,19 +6,19 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 18c77a5520ea2ae7cfee4eea3ed01fa8a588829d..557b77bea785108359b0c78f12c2b2afbdc2475d 100644
+index c37193c2207fb4f20993a35e2ac6fde8f0727a45..8e81312b1424d37c756bbb93cb4020a693c9b380 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -511,7 +511,11 @@
-     return;
- 
-   host()->WasHidden();
+@@ -531,7 +531,11 @@
+       browser_compositor_->GetDelegatedFrameHost()->HasSavedFrame();
+   if (has_saved_frame)
+     TRACE_EVENT_BEGIN("cc", "RWHVMac::WasOccluded with saved frame");
 -  browser_compositor_->SetRenderWidgetHostIsHidden(true);
 +  // Consider the RWHV occluded only if it is not attached to a window
 +  // (e.g. unattached BrowserView). Otherwise we treat it as visible to
 +  // prevent unnecessary compositor recycling.
 +  const bool unattached = ![GetInProcessNSView() window];
 +  browser_compositor_->SetRenderWidgetHostIsHidden(unattached);
+   if (has_saved_frame)
+     TRACE_EVENT_END("cc");
  }
- 
- void RenderWidgetHostViewMac::SetSize(const gfx::Size& size) {
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 4ccc6a9d37635..5073b1291fd86 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 9e740edbf36dd7a30062c88f857103c56eebd729..7cda66952e0d3a67c32791ad3c7d7de8df03f876 100644
+index 730ac0aaf36da1842c7add66fbaea58baadf2e74..fcc45c987cfce94f5378d4aeee1cfe703178e133 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -808,6 +808,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  
@@ -20,10 +20,10 @@ index 9e740edbf36dd7a30062c88f857103c56eebd729..7cda66952e0d3a67c32791ad3c7d7de8
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 23783e5e004b613c27fd753e1f7ff96d51fa5f68..225b4ea0c5ac74d6b6700c306182d003a972cedc 100644
+index 2ae96b816427148f4f0adf39c549d37fe3d02619..0288d36642629d7ec1846cd977f378ff9c0afd40 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -886,6 +886,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -879,6 +879,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
  
    SiteInstanceGroup* GetSiteInstanceGroup();
  
@@ -34,7 +34,7 @@ index 23783e5e004b613c27fd753e1f7ff96d51fa5f68..225b4ea0c5ac74d6b6700c306182d003
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 5f29761ad8556e730dca6b076b87f6391313fb95..3e5f5a34150079bf74d612bff85b6875ad41d2e6 100644
+index a3eb86299d8d34262347ee093940e61af6eab348..cb99fd2eb69bba9b133664fb68076eeeb9576818 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index 075e38265e551..c7593e21241c2 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index cd286b4925b3d2d9e74caecee759360488f2b8ba..0bc714a78e58719824ffeba8ced7854474fa6e92 100644
+index cfc5263749fa3068ad3699892bc4060891d7a0ef..f0aa5f66bc62efb2ea2d105d86dc3a8ea13e5eec 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1177,6 +1177,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1293,6 +1293,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index cd286b4925b3d2d9e74caecee759360488f2b8ba..0bc714a78e58719824ffeba8ced78544
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1223,6 +1224,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1339,6 +1340,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 4b690a546db81..c5f653eb03980 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -6,7 +6,7 @@ Subject: Don't run PCScan functions if PCScan is disabled
 PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
 
 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
-index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a932b214235 100644
+index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944fae3694f 100644
 --- a/base/allocator/partition_allocator/memory_reclaimer.cc
 +++ b/base/allocator/partition_allocator/memory_reclaimer.cc
 @@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {
@@ -49,7 +49,7 @@ index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be2
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 8542c0d0d49511298cca800a59796b1e4271a3d8..1d0eeff5800f2ccf3f1fb6b1356c8cd067cfd945 100644
+index 5b179a2d15cfc4997410d9467bf9484f5cae0b9f..98296aa4e8d75e94b141694c592dfa83627861ff 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -30,6 +30,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index e35ef06f99372..ca244bbc8639c 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index b9eea3470139e1833b2b23d3b535b11235e2bc8e..fbc1f6d8387e33cb7daafc96b7514897f067f008 100644
+index 1b021461f214287c94fb22b17d980c19e3f07dde..76691715d09a62a1edc0306dcac1d3e7e312fb1d 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2377,7 +2377,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2398,7 +2398,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index aa6aa6d8e388e..74d7b3fecb28e 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,10 +21,10 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 952023235d9f1905b64195f625dbb3b1af97f908..3d8b4cc17584e7ae8be0b77a073a0453bcd5b3ef 100644
+index 1a41a282f054d8ca93db19dc5df7f1de14cb8e44..452372aa40947531452c7ad7226a4ee6b0adfccb 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
-@@ -366,6 +366,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
+@@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
    return g_page_allocator.Pointer();
  }
  
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index 6e3c56031e7f0..714a99251bbb5 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 98268925da14d61256f8dee3aa899f17ce7acaf6..1abdc204e278383818dc073f96c90e91ec1f3fb9 100644
+index 6a331146e6fbf23e4177176f67fe534141579eb7..7f6974b8fbfe052902e6c0a55d386fb3a8b26558 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1404,6 +1404,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1407,6 +1407,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index 98268925da14d61256f8dee3aa899f17ce7acaf6..1abdc204e278383818dc073f96c90e91
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 58671094857cdfe5d853c8a284d51bc1b8a09660..7af71839aa1bc970370a91cd35f3cbefe06e67e5 100644
+index 620d7b7b733cc9749775c2bcabcebdedafe6ba0b..984e1f04c01006b7f038538c16ad2dd224925731 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -302,6 +302,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -298,6 +298,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 58671094857cdfe5d853c8a284d51bc1b8a09660..7af71839aa1bc970370a91cd35f3cbef
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index b52e5a2230e96d55d7886bde331a505c58dd093a..757dd77b06cba44e832e86e729e44b1e9a427c49 100644
+index 0450b50b5545d9b8f9025553167bed2e78157130..1b772288816ee770ee47cb59cf6c93439729320e 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1087,6 +1087,9 @@ interface NetworkContext {
+@@ -1090,6 +1090,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index b6a0b701b7663..c6d16910db2d2 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index b2a2e38397fdf3e9bb52c4532a1d14463ed4110d..9f0f209f279cc3dbe35efc12eb1e51449dfda470 100644
+index cd14dd54e3c7bb56e82cbd6c566c11018b4deb94..0b0b3a03a64ae6a321eeb27619f4f0ae5ee388cc 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -160,6 +160,7 @@
+@@ -159,6 +159,7 @@
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
@@ -23,7 +23,7 @@ index b2a2e38397fdf3e9bb52c4532a1d14463ed4110d..9f0f209f279cc3dbe35efc12eb1e5144
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1777,6 +1778,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1785,6 +1786,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
index 61eeec59f5705..cd4f452726579 100644
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
@@ -96,10 +96,10 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..5b701b1361707b610ed60c344e441e67
    // Return true if the given pid is one of our child processes.
    // Assumes that the current pid is the root of all pids of the current
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190f7d1137d 100644
+index 9bb12894da06fc7d281daced754b240afa9bedeb..52717600e7346daeb0726c177162c718da53500a 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -146,7 +146,7 @@ const char kACKToken[] = "ACK";
+@@ -145,7 +145,7 @@ const char kACKToken[] = "ACK";
  const char kShutdownToken[] = "SHUTDOWN";
  const char kTokenDelimiter = '\0';
  const int kMaxMessageLength = 32 * 1024;
@@ -108,7 +108,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
  
  bool g_disable_prompt = false;
  bool g_skip_is_chrome_process_check = false;
-@@ -612,6 +612,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -611,6 +611,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -116,7 +116,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
                       SocketReader* reader);
  
   private:
-@@ -636,6 +637,9 @@ class ProcessSingleton::LinuxWatcher
+@@ -635,6 +636,9 @@ class ProcessSingleton::LinuxWatcher
    // The ProcessSingleton that owns us.
    ProcessSingleton* const parent_;
  
@@ -126,7 +126,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
    std::set<std::unique_ptr<SocketReader>, base::UniquePtrComparator> readers_;
  };
  
-@@ -666,16 +670,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -665,16 +669,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -154,7 +154,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
      LOG(WARNING) << "Not handling interprocess notification as browser"
                      " is shutting down";
      // Send back "SHUTDOWN" message, so that the client process can start up
-@@ -685,6 +694,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
+@@ -684,6 +693,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
    }
  }
  
@@ -177,7 +177,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
  void ProcessSingleton::LinuxWatcher::RemoveSocketReader(SocketReader* reader) {
    DCHECK_CURRENTLY_ON(BrowserThread::IO);
    DCHECK(reader);
-@@ -720,7 +745,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -719,7 +744,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
@@ -187,7 +187,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
    const size_t kMinMessageLength = std::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -750,10 +776,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -749,10 +775,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -217,7 +217,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -782,8 +826,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -781,8 +825,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -231,7 +231,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -902,7 +950,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -901,7 +949,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -241,7 +241,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -912,11 +961,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -911,11 +960,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();
@@ -263,7 +263,7 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
    // Send the message
    if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
      // Try to kill the other process, because it might have been dead.
-@@ -958,6 +1017,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -957,6 +1016,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
        linux_ui->NotifyWindowManagerStartupComplete();
  #endif
  
@@ -282,10 +282,10 @@ index be2c417c07a4206fac4a9a6c03e516fd0493c942..78f74b0b21242553b6af98628dc48190
      return PROCESS_NOTIFIED;
    }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dca04470f1 100644
+index 0c87fc8ccb4511904f19b76ae5e03a5df6664391..83ede77121c5dadbde8b0a4132de1dba6eeb5b52 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -13,14 +13,17 @@
+@@ -13,15 +13,18 @@
  #include "base/command_line.h"
  #include "base/debug/activity_tracker.h"
  #include "base/files/file_path.h"
@@ -295,6 +295,7 @@ index ec725b44296266bea1a51aea889463a0bba8449c..6355e5c73ba9df9bdb9ff48205d909dc
  #include "base/metrics/histogram_macros.h"
  #include "base/process/process.h"
  #include "base/process/process_info.h"
+ #include "base/strings/escape.h"
 +#include "base/rand_util.h"
  #include "base/strings/string_number_conversions.h"
  #include "base/strings/utf_string_conversions.h"
diff --git a/patches/chromium/feat_add_onclose_to_messageport.patch b/patches/chromium/feat_add_onclose_to_messageport.patch
index 01d4fd5beeb27..61f192d132639 100644
--- a/patches/chromium/feat_add_onclose_to_messageport.patch
+++ b/patches/chromium/feat_add_onclose_to_messageport.patch
@@ -10,10 +10,10 @@ get this standardised, but in lieu of that, this makes MessagePort a
 whole bunch more useful!
 
 diff --git a/third_party/blink/renderer/core/messaging/message_port.cc b/third_party/blink/renderer/core/messaging/message_port.cc
-index a284d187968914b4304eb49362b2a8ccafa5e5c2..d6f8bf39c47cfc622dec5736d82ccc308d406cfa 100644
+index b72ede668172bd8202b1d52736e4eb4ffe84d619..7ec7e3883925b50b064682e8976d09b18222d637 100644
 --- a/third_party/blink/renderer/core/messaging/message_port.cc
 +++ b/third_party/blink/renderer/core/messaging/message_port.cc
-@@ -162,6 +162,7 @@ void MessagePort::close() {
+@@ -166,6 +166,7 @@ void MessagePort::close() {
      Entangle(pipe.TakePort0());
    }
    closed_ = true;
@@ -22,7 +22,7 @@ index a284d187968914b4304eb49362b2a8ccafa5e5c2..d6f8bf39c47cfc622dec5736d82ccc30
  
  void MessagePort::Entangle(MessagePortDescriptor port) {
 diff --git a/third_party/blink/renderer/core/messaging/message_port.h b/third_party/blink/renderer/core/messaging/message_port.h
-index c5e0fefac929d4a484488761741d42f2b002f7a1..83d7901d99ad01ba039ea1ffa3dbee2595fc31ff 100644
+index 30d13d1e47e3acc7df6ce5c627fd7b3a32c3edc4..f9baba3c6d13992508da48a13c97bb10c8ec56e0 100644
 --- a/third_party/blink/renderer/core/messaging/message_port.h
 +++ b/third_party/blink/renderer/core/messaging/message_port.h
 @@ -120,6 +120,13 @@ class CORE_EXPORT MessagePort : public EventTargetWithInlineData,
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 77ff74d4b5934..b4f87cd57376f 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 002b3ddfb0f77b787b74ee088578e3eb813d0192..a9003a98546bbfe78e2d30457a032218cc263441 100644
+index fe988e3bbcf0c9deb5592f24fdeda3016114e3bf..da82b0458d0c87cf4de793007b826984d010cbb2 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -139,6 +139,8 @@ viz_component("service") {
@@ -503,7 +503,7 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index df92bab44402330869b44aa76bb40fc20e33b16a..2b3fbaee17c0a8bb7b04cd4c4edb13626dd1bb27 100644
+index 4e38e0f49054cef3fd1a712c89608ce39003edeb..427882f8ed0d85c6e4170b213c3a3678b60a62df 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 @@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(
@@ -621,7 +621,7 @@ index 80bff73a5886e8e79d7d91de5e27bc747fcfce02..8bc43d1359fa2551713992d6ccb73949
    raw_ptr<Layer> root_layer_ = nullptr;
  
 diff --git a/ui/gfx/ca_layer_params.h b/ui/gfx/ca_layer_params.h
-index c5fb29b30b9c5b7483998c567ed9a479d8743939..dc10d78315f76a3914ccd6e2e99af97fa909918b 100644
+index 12e115cd6a128d8d150abc786d4d38b1d5119d91..b6320de28750333bee7ee83393849f4eb0a956ac 100644
 --- a/ui/gfx/ca_layer_params.h
 +++ b/ui/gfx/ca_layer_params.h
 @@ -6,6 +6,7 @@
@@ -632,7 +632,7 @@ index c5fb29b30b9c5b7483998c567ed9a479d8743939..dc10d78315f76a3914ccd6e2e99af97f
  #include "ui/gfx/geometry/size.h"
  #include "ui/gfx/gfx_export.h"
  
-@@ -41,6 +42,8 @@ struct GFX_EXPORT CALayerParams {
+@@ -51,6 +52,8 @@ struct GFX_EXPORT CALayerParams {
    gfx::ScopedRefCountedIOSurfaceMachPort io_surface_mach_port;
  #endif
  
@@ -653,7 +653,7 @@ index de00e766ba17532e10dcf5d0fd31fa344920a9f7..7aaedf83ad22dcc1d2dd39a31cf7e08b
    float scale_factor;
  };
 diff --git a/ui/gfx/mojom/ca_layer_params_mojom_traits.cc b/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
-index c7035798bd867f51b39f36f1be79293bf2b5cc12..131446361de812f9b915483bca2b6d2165b65e3d 100644
+index a80185658d82c67713e578d176955c442f0568ab..e29003b3b6def9a1f842139f4269893a2609a601 100644
 --- a/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
 +++ b/ui/gfx/mojom/ca_layer_params_mojom_traits.cc
 @@ -52,6 +52,9 @@ bool StructTraits<gfx::mojom::CALayerParamsDataView, gfx::CALayerParams>::Read(
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index c3215e637e3b0..d48c35ad8194c 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -17,43 +17,43 @@ headers, moving forward we should find a way in upstream to provide
 access to these headers for loader clients created on the browser process.
 
 diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
-index 87868727a78223baef9ffd2591f49fced240ef4e..f6a6ff28f33e2d1c065f2abeb96733b2d28a6ea1 100644
+index a15e3c4bed344364f9c43e3f0b5c494d58dff789..24e3b291f8c25de2a0b82184fd731538b6586f86 100644
 --- a/services/network/public/cpp/resource_request.cc
 +++ b/services/network/public/cpp/resource_request.cc
 @@ -233,6 +233,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
           do_not_prompt_for_login == request.do_not_prompt_for_login &&
-          is_main_frame == request.is_main_frame &&
+          is_outermost_main_frame == request.is_outermost_main_frame &&
           transition_type == request.transition_type &&
 +         report_raw_headers == request.report_raw_headers &&
           previews_state == request.previews_state &&
           upgrade_if_insecure == request.upgrade_if_insecure &&
           is_revalidating == request.is_revalidating &&
 diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
-index 8b9a7b36f53a4cfcd159ac18c06d1724072013c8..ef0191bae8a07e531ae129cf32b22f4930c5e266 100644
+index 2ff43cc1ef683707001bf22c9b030bf6e7223e0f..cfaf9170666f04407adb5738ce6723900d234735 100644
 --- a/services/network/public/cpp/resource_request.h
 +++ b/services/network/public/cpp/resource_request.h
-@@ -156,6 +156,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
+@@ -158,6 +158,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
    bool do_not_prompt_for_login = false;
-   bool is_main_frame = false;
+   bool is_outermost_main_frame = false;
    int transition_type = 0;
 +  bool report_raw_headers = false;
    int previews_state = 0;
    bool upgrade_if_insecure = false;
    bool is_revalidating = false;
 diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
-index 1fcf54cac11c38352e14774cd08bcaa162443e9c..5356da11391d52a8f9aaa57a27616cee6dc0f2b6 100644
+index 4f2740ebf2dc4bee423cdbb72cae128f28a03f12..d3f531429598b3666aaba655356155c470e8b645 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.cc
 +++ b/services/network/public/cpp/url_request_mojom_traits.cc
 @@ -209,6 +209,7 @@ bool StructTraits<
    out->do_not_prompt_for_login = data.do_not_prompt_for_login();
-   out->is_main_frame = data.is_main_frame();
+   out->is_outermost_main_frame = data.is_outermost_main_frame();
    out->transition_type = data.transition_type();
 +  out->report_raw_headers = data.report_raw_headers();
    out->previews_state = data.previews_state();
    out->upgrade_if_insecure = data.upgrade_if_insecure();
    out->is_revalidating = data.is_revalidating();
 diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
-index 3a1c5bd943c110514e4da06491190476d6e6de38..6a80fb16242865d398bcbcd380893ccc9a3fe167 100644
+index 069768e7ca727fc2ad8f5379900ad4a959a87f4f..3e6bc18564e2a3cdbac9af686636f75d64082464 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.h
 +++ b/services/network/public/cpp/url_request_mojom_traits.h
 @@ -269,6 +269,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@@ -67,7 +67,7 @@ index 3a1c5bd943c110514e4da06491190476d6e6de38..6a80fb16242865d398bcbcd380893ccc
      return request.previews_state;
    }
 diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
-index 79b5d03ded03ced9e6ff4d17d10935004bfb0062..923883fd010f9621c790dd5381a7e1f0cb36e740 100644
+index ef3e8e68621402db5a97977f49ac74c438b0a563..aa1c1bcf7ca30adde4c25ed9bd8ed8a70eb919e0 100644
 --- a/services/network/public/mojom/url_request.mojom
 +++ b/services/network/public/mojom/url_request.mojom
 @@ -312,6 +312,9 @@ struct URLRequest {
@@ -103,10 +103,10 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 4c11fd542a66f514a6c36e684a34d0a62053c1f4..6852fd470c79e2fb041bf57a01e2b0b913cb94db 100644
+index 44ea9794a42eb9d2f0bcff722a05e530dbfff10c..318da554d3326b376898689c80b576979c564c5e 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -469,6 +469,7 @@ URLLoader::URLLoader(
+@@ -468,6 +468,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index 4c11fd542a66f514a6c36e684a34d0a62053c1f4..6852fd470c79e2fb041bf57a01e2b0b9
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -636,7 +637,7 @@ URLLoader::URLLoader(
+@@ -620,7 +621,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 4c11fd542a66f514a6c36e684a34d0a62053c1f4..6852fd470c79e2fb041bf57a01e2b0b9
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1411,6 +1412,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1347,6 +1348,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
@@ -144,10 +144,10 @@ index 4c11fd542a66f514a6c36e684a34d0a62053c1f4..6852fd470c79e2fb041bf57a01e2b0b9
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 53822d17b20f4e6d163d0dc84eea6c455254a5f7..c494a63b0c1dcb39120e8aabc84a60ebbf2ff224 100644
+index abc8ecdcd717b06552af7cf5c4e4e8f60db16ec1..4f633b5a818388f6cfd30a15496c94dde1e2b48c 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -502,6 +502,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -497,6 +497,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  
diff --git a/patches/chromium/fix_export_zlib_symbols.patch b/patches/chromium/fix_export_zlib_symbols.patch
index 079d44b8eafbd..154bc672224a3 100644
--- a/patches/chromium/fix_export_zlib_symbols.patch
+++ b/patches/chromium/fix_export_zlib_symbols.patch
@@ -6,10 +6,10 @@ Subject: fix: export zlib symbols
 This patch sets ZLIB_DLL so that we properly export zlib symbols.
 
 diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
-index 49f52e1f8b1e505481a124a55ab91a7dd5ec571c..2cb7ee4f708808433e638bf62cb9a465c3651944 100644
+index 999b1de1b2ba1fff5dd92173300dc22b9aa5a865..2132d8ef92acd39bffe3bebddb80b4317e1f52b8 100644
 --- a/third_party/zlib/BUILD.gn
 +++ b/third_party/zlib/BUILD.gn
-@@ -312,6 +312,10 @@ component("zlib") {
+@@ -313,6 +313,10 @@ component("zlib") {
    defines = []
    deps = []
  
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index aa7e2ee965bab..6fa77fb4b861a 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 07355cb194bd429a693e587072d11432d6c0888a..b74b4209931c6acd6bc2e93a100c3e65a834ead9 100644
+index df1633d59070e19592a52f02a76bdd9006d7c6f0..e599e866d2f5e72259e5b34b65510a06b3209784 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1828,7 +1828,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1820,7 +1820,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
index 4fd3f5b2054b5..0d8d675b6f839 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
@@ -14,7 +14,7 @@ but it's not strictly necessary for this API to work to spec.
 Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbbdd7f157b 100644
+index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..9fb77b8d7c3d9cb49dcb3ac1f2495fa52f53932e 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 @@ -16,12 +16,16 @@
@@ -34,7 +34,7 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
  #include "chrome/common/chrome_switches.h"
  #include "content/public/browser/navigation_details.h"
  #include "content/public/browser/navigation_entry.h"
-@@ -159,6 +163,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -165,6 +169,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      return;
    }
  
@@ -42,7 +42,7 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
    if (base::FeatureList::IsEnabled(
            blink::features::kWindowPlacementFullscreenCompanionWindow)) {
      if (!popunder_preventer_)
-@@ -166,6 +171,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -172,6 +177,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      else
        popunder_preventer_->WillActivateWebContents(web_contents);
    }
@@ -50,7 +50,7 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
  
    // Keep the current state. |SetTabWithExclusiveAccess| may change the return
    // value of |IsWindowFullscreenForTabOrPending|.
-@@ -218,7 +224,9 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -221,7 +227,9 @@ void FullscreenController::EnterFullscreenModeForTab(
  }
  
  void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -60,7 +60,7 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
  
    if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
      // During tab capture of fullscreen-within-tab views, the browser window
-@@ -263,11 +271,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
+@@ -276,11 +284,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
  void FullscreenController::FullscreenTabOpeningPopup(
      content::WebContents* opener,
      content::WebContents* popup) {
@@ -74,7 +74,7 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
  }
  
  void FullscreenController::OnTabDeactivated(
-@@ -417,13 +427,9 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -443,17 +453,15 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -88,18 +88,24 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
      return;
 -  }
  #endif
- 
+   started_fullscreen_transition_ = true;
    toggled_into_fullscreen_ = true;
-@@ -436,6 +442,7 @@ void FullscreenController::EnterFullscreenModeInternal(
++#if 0
+   bool entering_tab_fullscreen = option == TAB && !tab_fullscreen_;
++#endif
+   GURL url;
+   if (option == TAB) {
+     url = GetRequestingOrigin();
+@@ -463,6 +471,7 @@ void FullscreenController::EnterFullscreenModeInternal(
        url = extension_caused_fullscreen_;
    }
  
 +#if 0
-   if (display_id != display::kInvalidDisplayId) {
+   if (option == TAB && display_id != display::kInvalidDisplayId) {
      // Check, but do not prompt, for permission to request a specific screen.
      // Sites generally need permission to get the display id in the first place.
-@@ -449,6 +456,7 @@ void FullscreenController::EnterFullscreenModeInternal(
-       display_id = display::kInvalidDisplayId;
+@@ -480,6 +489,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+           GetDisplayId(WebContents::FromRenderFrameHost(requesting_frame));
      }
    }
 +#endif
@@ -107,10 +113,10 @@ index 41cd193087f8d4f246993e96da96ea0523ab50ed..96cd17afad81037ce94ca3ea3583ebbb
    if (option == BROWSER)
      base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
-index 7bd40f52ef5f6b04a7ea114ec4d18c8a98ec6d42..fb04fed5cc1e2e255c9e67c180fababe1fbb3fe0 100644
+index f0841982cb296079c8b943067564d74bc1b7067c..49f59fc2c12c98faada52e0e7c8c9c6e6251b599 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
-@@ -222,10 +222,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
+@@ -242,10 +242,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
    // Used in testing to set the state to tab fullscreen.
    bool is_tab_fullscreen_for_testing_ = false;
  
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 6994d7d5bdc0c..fd64b412b8433 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,10 +7,10 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index ee30fddfeb034d14ae05cb5957026f65f32a4fd4..aa38a6e0cc4c0ac57469bb67c85dae3b8ce19bc2 100644
+index 35568a00ef94ca0db2cbb0325634ce8d2a881e12..a8ea8eaabb7cf3248b19af93bf5002f88e23fd8d 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
-@@ -21,7 +21,10 @@
+@@ -22,7 +22,10 @@
  #include "base/values.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index d67ab8eee59c7..d174f13c97b6c 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -100,10 +100,10 @@ index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5b
    } else {
      // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index 804166d8844da5bd889f014e79d59d0cd75f5490..35ef412756a2c63394e5f2587b5bc73eadae4d60 100644
+index d0143dc64f818ee662694576ce2aa9488114f1c7..e3cbaa1b9c91805f8a4f81e110c8a85591b5f380 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
-@@ -239,6 +239,24 @@ void PrintDialogGtk::UpdateSettings(
+@@ -242,6 +242,24 @@ void PrintDialogGtk::UpdateSettings(
  
    gtk_print_settings_set_n_copies(gtk_settings_, settings->copies());
    gtk_print_settings_set_collate(gtk_settings_, settings->collate());
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 76a94c113f5b7..ab8887f56ccd2 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 390ac74f01b5080880dcab65537a22fb7ef0cc41..103dc143f6310a2b9f0a834f7d25cf32207bea86 100644
+index 2b8e23df6545ca438c4af8434120cc40c70e09ec..049350bc63d627e85b239d23b976c3a62381fd57 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3180,6 +3180,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3206,6 +3206,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 390ac74f01b5080880dcab65537a22fb7ef0cc41..103dc143f6310a2b9f0a834f7d25cf32
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 9b988bb631ab759739ae01c918efb1d563d5aafc..4db1e6c2dbea27249ca15d5660b7fcd8c6736ad1 100644
+index f6d98708c436447ee6c93acb5d476719c238ca9c..505279149690d469fa979010435373e40a5c8c43 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -272,6 +272,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -274,6 +274,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index cfe45b10a0647..cf2e47b7c03da 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,7 +38,7 @@ index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d06431862745
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 9dddcdf88d56b32a9b8b9be529f0f13a03bd6e06..f4e5be79c1d3b92f6723f7b0c4d9a7f38c81ff99 100644
+index 072387786cc70f7d0b7d3d31cebf86af69f98a30..9df4d0aa257e7b4ecacd8c7a4ad392c4a33ff177 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
 @@ -352,7 +352,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index a5004a9488601..6aa34e52cb665 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index e9c3f3dee36a44d40844a88dbb899f593d03c907..c8dc226ce7c87fa84da5c99760f12538e367bbc9 100644
+index bbdd4dcc4bc327b99db11629422cc92a9d477256..0f21c9a6e4da03e4af7a8ea692ce71bb008827ed 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
 @@ -230,6 +230,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -28,10 +28,10 @@ index e9c3f3dee36a44d40844a88dbb899f593d03c907..c8dc226ce7c87fa84da5c99760f12538
  
  void GpuDataManagerImpl::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index 4ed951d5829e87431a1f9f84f0317978cb673e31..82f9a2f97e71848ece8d04effc083db94a45d495 100644
+index 0a01900683c73778565f9059b293bbe863d2d070..cd4e58f73e7d5bd0f9f41b1ec63031666e6b978e 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
-@@ -124,6 +124,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
+@@ -128,6 +128,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
    // BrowserMainParts override instead.
    void PostCreateThreads();
    void TerminateInfoCollectionGpuProcess();
@@ -40,10 +40,10 @@ index 4ed951d5829e87431a1f9f84f0317978cb673e31..82f9a2f97e71848ece8d04effc083db9
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 53402e4d706f58c26498015c1a5c33b4f7ceabc7..c14ce99ec72881133a5bf2bd90369ee0211f6ca1 100644
+index 260a2d4ef5df85291eda27a0f7066646d31dacfe..1f83ab4a9b22b35dd2b9053553121b49e1c42ca1 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1215,6 +1215,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1232,6 +1232,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
@@ -57,7 +57,7 @@ index 53402e4d706f58c26498015c1a5c33b4f7ceabc7..c14ce99ec72881133a5bf2bd90369ee0
  
  void GpuDataManagerImplPrivate::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index ac0afe687650da564187127dc7ea93a47acde719..237e3f00b1451be43949a797ef1b35885b958a5d 100644
+index 85a4d09a54922205d416538ea97c7f2b5897f86a..acba97124a8643c7452bea63e91533cbfa7e182c 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
 @@ -90,6 +90,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 9737467116185..9ac43a88997b6 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 6a91282809a76ca60dd1b329c683705b127eb22a..a2672faad7c39c3d938c1c31abb6fd0d37582fbf 100644
+index 6cda63d5c6a0b7b2b41d01382b73dbdeea3651de..174e6a5265ec4186934a0bd0619ecf02073f4fe1 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -954,6 +954,11 @@
+@@ -962,6 +962,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 5bf3a6a382a81..78f43d3d3642d 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 694a67b7a0f622c7a8bfc1d46148398140d51384..00b588b268aa059ff84adbbc6ae266aa67e174b1 100755
+index 36786064cd26faf4968e8ee90fb382e95247e4de..ce9f4b6a0d4f3350f89e9ba4f02a5cbb064524c4 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -298,6 +298,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index b44a477877ab9..a068b1a12a451 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 85a55e9bbb7403b031c512fa5e010cbb0487d9c6..31c83eab4781725540f57e1e66c6f7e7c0b85d8b 100644
+index 0a0c6eb9567a96f569c25bad8ea98b4cd165b04a..0ce83c22636fce72e613893df30ca52b142077fd 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -247,11 +247,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -252,11 +252,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/make_gtk_getlibgtk_public.patch b/patches/chromium/make_gtk_getlibgtk_public.patch
index a6bce37ae4aea..dd4dec37023ec 100644
--- a/patches/chromium/make_gtk_getlibgtk_public.patch
+++ b/patches/chromium/make_gtk_getlibgtk_public.patch
@@ -7,7 +7,7 @@ Allows embedders to get a handle to the gtk library
 already loaded in the process.
 
 diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
-index 0ed04582106639911d9a4e0284ff880be9c3bc74..bfda81b08be52406048be9b96d2de59223d56ee7 100644
+index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..40b706ed7cde206e98274025148604760b7477f9 100644
 --- a/ui/gtk/gtk_compat.cc
 +++ b/ui/gtk/gtk_compat.cc
 @@ -86,12 +86,6 @@ void* GetLibGtk4(bool check = true) {
@@ -37,10 +37,10 @@ index 0ed04582106639911d9a4e0284ff880be9c3bc74..bfda81b08be52406048be9b96d2de592
    static bool loaded = LoadGtkImpl();
    return loaded;
 diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
-index 72981270fe26579211afcaf3c596a412f69f5fac..b5dbfde5b011d57d26960d245e0dc61cac9341e4 100644
+index 57e55b9e749b43d327deff449a530e1f435a8e8b..2245974f91be4a691d82f54b55e12e44ae2000c5 100644
 --- a/ui/gtk/gtk_compat.h
 +++ b/ui/gtk/gtk_compat.h
-@@ -37,6 +37,9 @@ using SkColor = uint32_t;
+@@ -34,6 +34,9 @@ using SkColor = uint32_t;
  
  namespace gtk {
  
diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch
index 50554c76583ba..2793f24611e78 100644
--- a/patches/chromium/mas-cgdisplayusesforcetogray.patch
+++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of CGDisplayUsesForceToGray
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 21778ef0c7657937987fdc70bf9ceb9439aebf15..2f6e1390a3b824d80832e47f6c368e757e2d9806 100644
+index 335e8a576f9a66a20b5720dfd083708bf490587e..0abf4ae5c58bd841c013775f6df0b6065d6d77b1 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -162,7 +162,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
+@@ -156,7 +156,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
      display.set_color_depth(Display::kDefaultBitsPerPixel);
      display.set_depth_per_component(Display::kDefaultBitsPerComponent);
    }
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 81d1ad3dbb10e..825fccf47cfa2 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -14,10 +14,10 @@ Disable usage of the following private APIs in MAS builds:
 * AudioDeviceDuck
 
 diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
-index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9a6d0bacc 100644
+index dd14c8cfa32ab0bb2e92f192c54a494c4f5b4fb7..2c6f0b336c97bc23995e9fe8cdc7f72a69f54e64 100644
 --- a/base/enterprise_util_mac.mm
 +++ b/base/enterprise_util_mac.mm
-@@ -168,6 +168,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
+@@ -189,6 +189,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
  DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
    static DeviceUserDomainJoinState state = [] {
      DeviceUserDomainJoinState state{false, false};
@@ -31,7 +31,7 @@ index bbb851e1cafb37ebaa67e4577598fab25c90fde6..6ab12e5505b5ba545e7e0cc8c93d3ba9
  
      @autoreleasepool {
        ODSession* session = [ODSession defaultSession];
-@@ -274,5 +281,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
+@@ -295,5 +302,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
  
    return state;
  }
diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch
index e64c5fd2f5049..7579f306131a4 100644
--- a/patches/chromium/mas_disable_custom_window_frame.patch
+++ b/patches/chromium/mas_disable_custom_window_frame.patch
@@ -75,7 +75,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b
 +
  @end
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
-index 5a23ea7558814eec59eda349bc7194afcb70d01e..c9147bbe5a225291552082434e5db34239394139 100644
+index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807eb797316 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 @@ -17,6 +17,7 @@ class NativeWidgetNSWindowBridge;
@@ -95,7 +95,7 @@ index 5a23ea7558814eec59eda349bc7194afcb70d01e..c9147bbe5a225291552082434e5db342
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 83e08e8e56f8fdfe5c321c33b451b9bde8ee819a..f48d8ac4816e2d775c16758e086eb56ad456bd01 100644
+index 622b25c637ba14f287cbcdb4781967564d7e9eff..a21fe0aa19069a748b41e7d0781e20031c40fbfc 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 @@ -16,7 +16,9 @@
@@ -126,7 +126,7 @@ index 83e08e8e56f8fdfe5c321c33b451b9bde8ee819a..f48d8ac4816e2d775c16758e086eb56a
  @implementation NativeWidgetMacNSWindow {
   @private
    base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
-@@ -186,6 +192,8 @@ - (BOOL)hasViewsMenuActive {
+@@ -209,6 +215,8 @@ - (BOOL)hasViewsMenuActive {
  
  // NSWindow overrides.
  
@@ -135,7 +135,7 @@ index 83e08e8e56f8fdfe5c321c33b451b9bde8ee819a..f48d8ac4816e2d775c16758e086eb56a
  + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    if (windowStyle & NSWindowStyleMaskTitled) {
      if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
-@@ -197,6 +205,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
+@@ -220,6 +228,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    return [super frameViewClassForStyleMask:windowStyle];
  }
  
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 3b5355498e8b6..426b8591f4b1c 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -11,7 +11,7 @@ needs to think it's coming from the PWA process). I think it can just be chopped
 out -- if there are any side-effects, we should be able to work around them.
 
 diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components/remote_cocoa/app_shim/application_bridge.mm
-index 04691696ee653b95cf046edfd464b1a800a38abe..b567b1e1fa9e5103a6219292a649f8807f0aa7ae 100644
+index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063f77f707a 100644
 --- a/components/remote_cocoa/app_shim/application_bridge.mm
 +++ b/components/remote_cocoa/app_shim/application_bridge.mm
 @@ -51,6 +51,7 @@
@@ -44,10 +44,10 @@ index 04691696ee653b95cf046edfd464b1a800a38abe..b567b1e1fa9e5103a6219292a649f880
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 6394980da8ab8b38e29693ccedfc3827ac111a4c..7fff28ee83475963f80987f7736ac866daa7dad2 100644
+index 26a2fa4c0f39ea0254bee322f355d92a55ba3b4e..e42de9720456161c187d41d39487ee3272fa1cf9 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -567,10 +567,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -583,10 +583,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -61,10 +61,10 @@ index 6394980da8ab8b38e29693ccedfc3827ac111a4c..7fff28ee83475963f80987f7736ac866
    // Beware: This view was briefly removed (in favor of a bare CALayer) in
    // crrev/c/1236675. The ordering of unassociated layers relative to NSView
 diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-index 2cd40c288f42937688e4f846a002779158ada68f..f4c7bb0ab75835bfdbd100ce852646bf77817c9e 100644
+index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4fb37ae38 100644
 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
 +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-@@ -73,8 +73,10 @@ id GetFocusedBrowserAccessibilityElement() override {
+@@ -74,8 +74,10 @@ id GetFocusedBrowserAccessibilityElement() override {
      return nil;
    }
    void SetAccessibilityWindow(NSWindow* window) override {
@@ -75,7 +75,7 @@ index 2cd40c288f42937688e4f846a002779158ada68f..f4c7bb0ab75835bfdbd100ce852646bf
    }
  
    void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event,
-@@ -136,8 +138,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
+@@ -137,8 +139,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
  
    mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_;
    std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_;
@@ -87,7 +87,7 @@ index 2cd40c288f42937688e4f846a002779158ada68f..f4c7bb0ab75835bfdbd100ce852646bf
  }
  
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 2b99d6a9f13f12a2a470fb6a5aa98c05f26a54c7..46d735add749d76c32f80512d00373b442248c6a 100644
+index 0048862cb89d519b8c1c111f923e6dd960c855d6..c7b9124462b0779ed4d1b27fe167e653bf5c6be5 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
 @@ -49,7 +49,9 @@ class ScopedPasswordInputEnabler;
@@ -114,10 +114,10 @@ index 2b99d6a9f13f12a2a470fb6a5aa98c05f26a54c7..46d735add749d76c32f80512d00373b4
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8a588829d 100644
+index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8f0727a45 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -252,8 +252,10 @@
+@@ -255,8 +255,10 @@
  void RenderWidgetHostViewMac::MigrateNSViewBridge(
      remote_cocoa::mojom::Application* remote_cocoa_application,
      uint64_t parent_ns_view_id) {
@@ -128,7 +128,7 @@ index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1519,8 +1521,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1541,8 +1543,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8
    return [GetInProcessNSView() window];
  }
  
-@@ -1564,9 +1568,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1586,9 +1590,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2061,12 +2067,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2083,12 +2089,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,11 +167,11 @@ index 961c759eca96ffc0ffcf40cfdaf42388f47d9c2b..18c77a5520ea2ae7cfee4eea3ed01fa8
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 244b208e6a7872ea4d25fcf74a78abc9248a9ac3..45bafcaaa10641ca3a8306a6685ee9ed730d1e02 100644
+index 2e39255bdb26664e8bc2d0abb26c2359c9b84bd3..1425e9935b599b01fd53f43d0415a77002c92f00 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -319,6 +319,13 @@ component("base") {
-     ]
+@@ -329,6 +329,13 @@ component("base") {
+     sources += [ "resource/resource_bundle_lacros.cc" ]
    }
  
 +  if (is_mas_build) {
@@ -205,7 +205,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index d4051a7a8755c7b10d4df3746cb2857471f07c45..de04616893d1c97e3607eb5a4b942733ae597b05 100644
+index c93aedbce83c398a55c478df60d5ba6dd5324a0b..dfa1983e5605d14e44efae3c1418b4e53c392333 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
 @@ -31,7 +31,9 @@
@@ -218,7 +218,7 @@ index d4051a7a8755c7b10d4df3746cb2857471f07c45..de04616893d1c97e3607eb5a4b942733
  @class NSView;
  
  namespace remote_cocoa {
-@@ -449,11 +451,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -452,11 +454,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -233,10 +233,10 @@ index d4051a7a8755c7b10d4df3746cb2857471f07c45..de04616893d1c97e3607eb5a4b942733
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index c9294c5358401da716b6d8d2846e20e9a04f4e2d..c9a3cdee33e3aa8bfbfa9c6678c2828a94b90061 100644
+index 1c4c4a774e4d5e199ae50e8df4499a497d3b0674..b2265079021d10e2944b9474fafe32ccca95d3de 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -297,14 +297,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -296,14 +296,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +259,7 @@ index c9294c5358401da716b6d8d2846e20e9a04f4e2d..c9a3cdee33e3aa8bfbfa9c6678c2828a
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1288,6 +1296,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1287,6 +1295,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index c9294c5358401da716b6d8d2846e20e9a04f4e2d..c9a3cdee33e3aa8bfbfa9c6678c2828a
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1295,14 +1304,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1294,14 +1303,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index 940e9864b669b..d9abef548d026 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -40,7 +40,7 @@ index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 767d3f6454ef3150354911ed683f5485bb83fbbb..f273b56276c1b277b307f6c4c061e08d12daea42 100644
+index 547a5c4260b28d651d470e06c4c4e6bfa77ef966..01fee4e6b104aad68d52f30c9af3e9072f078e0c 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 @@ -60,7 +60,7 @@
@@ -60,7 +60,7 @@ index 767d3f6454ef3150354911ed683f5485bb83fbbb..f273b56276c1b277b307f6c4c061e08d
  }
  
  template <typename BaseClass>
-@@ -149,7 +150,9 @@
+@@ -160,7 +161,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index 8a03d6be4a747..b28e29487b800 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -122,7 +122,7 @@ index c15f3a631292b538698625328fb429ee3c9964f5..37e038753ecf1b82ec92c06b2c0729b5
  }
  
 diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
-index 3f7dce0281f7b5a540d7b9377ef14a8a6aa9a2fa..11d8419791f3e45d5242081422d452d4fc703833 100644
+index d342eb4e9fc94de4365d86c2d1af4b85a8bf63a3..012f9ce97d9ed6b00deb718a88f432e053cb3bd1 100644
 --- a/device/bluetooth/bluetooth_adapter_mac.mm
 +++ b/device/bluetooth/bluetooth_adapter_mac.mm
 @@ -42,6 +42,7 @@
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 43c8aae94a345..0bfd677514878 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17ce7acaf6 100644
+index 12d74d8751802b06198952682bfc99f18e5f8df8..6a331146e6fbf23e4177176f67fe534141579eb7 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -127,6 +127,11 @@
+@@ -128,6 +128,11 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "url/gurl.h"
  
@@ -22,7 +22,7 @@ index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -435,6 +440,91 @@ bool GetFullDataFilePath(
+@@ -436,6 +441,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -114,7 +114,7 @@ index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -732,6 +822,13 @@ void NetworkContext::SetClient(
+@@ -733,6 +823,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,7 +128,7 @@ index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2298,6 +2395,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2301,6 +2398,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,10 +139,10 @@ index e9a56db142f5f31e567bff7414db110f600fc7f2..98268925da14d61256f8dee3aa899f17
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 53e3f293150e725cd1261f09a8f9bfcb5371a76c..58671094857cdfe5d853c8a284d51bc1b8a09660 100644
+index bcd47e726ad4d320cac3c3341d87b9a3ca2c4065..620d7b7b733cc9749775c2bcabcebdedafe6ba0b 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -108,6 +108,7 @@ class URLMatcher;
+@@ -105,6 +105,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -150,7 +150,7 @@ index 53e3f293150e725cd1261f09a8f9bfcb5371a76c..58671094857cdfe5d853c8a284d51bc1
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -240,6 +241,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -236,6 +237,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,7 +159,7 @@ index 53e3f293150e725cd1261f09a8f9bfcb5371a76c..58671094857cdfe5d853c8a284d51bc1
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -827,6 +830,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -823,6 +826,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -169,10 +169,10 @@ index 53e3f293150e725cd1261f09a8f9bfcb5371a76c..58671094857cdfe5d853c8a284d51bc1
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index b2beaa762bfe88b56ac24d35646b6e6cbc630816..b52e5a2230e96d55d7886bde331a505c58dd093a 100644
+index cc3f99007db46a488d7f8dacd3ede4a90e1d2ae3..0450b50b5545d9b8f9025553167bed2e78157130 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -281,6 +281,17 @@ struct NetworkContextFilePaths {
+@@ -282,6 +282,17 @@ struct NetworkContextFilePaths {
    bool trigger_migration = false;
  };
  
@@ -190,7 +190,7 @@ index b2beaa762bfe88b56ac24d35646b6e6cbc630816..b52e5a2230e96d55d7886bde331a505c
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -830,6 +841,9 @@ interface NetworkContext {
+@@ -833,6 +844,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index b4277e3d63f55..5df86e0449e32 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -7,7 +7,7 @@ Pass RenderFrameHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.
 
 diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
-index 83b33e3f521aa79942ba3446a8b161a4e4e23da1..24f409f673797b6e8bb1da680343ea1ddc083e4f 100644
+index 362fedd0a0b654db546a73ff84c7e0676097e824..f1f6e2a36a6764ef12827fdab16818061b007959 100644
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
 @@ -195,6 +195,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
@@ -31,7 +31,7 @@ index b0e64049d411305d58802fd290bb0480e9b36fee..4afcf3b7a5b841409b0e1c4c2f32fd48
        const GURL& origin,
        const GURL& document_url,
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index 32a61e73658d33dcd0fe1640094c8b79dde0be37..3c3650e0f8364a5c86bd11a6f11ca559a97f5900 100644
+index a3df152caabcadaba454f73f58763a89fdea4247..ba76f2f294a2eab8581b5ef8d879cb464f14cb1f 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
 @@ -82,10 +82,12 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
@@ -77,7 +77,7 @@ index dc8de24c86f1769680ce7830844d35dfef7eb7e7..fcd99361fa8c895d6bd89bacb9fb94e7
  
    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-index 7461d5079f9cb0f257fbb93248c98be9409d38e7..4ddb9e40f0441b378d73ac75d99ae64c90d32b58 100644
+index fe015fa7d7813115a2c6a23a00cb509c4c16cd93..88e04351204c786d0fc72a99ccc421f76fc26ef9 100644
 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
 +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
 @@ -129,7 +129,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
@@ -90,7 +90,7 @@ index 7461d5079f9cb0f257fbb93248c98be9409d38e7..4ddb9e40f0441b378d73ac75d99ae64c
          notification_service_remote_.BindNewPipeAndPassReceiver());
  
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index 1195296c6f925e6c4f52f61866cf4b7f824af4e9..d3142bef0856c5cd7f4822ee9dcaedaef74a12d3 100644
+index fc24d16beb5a0ae61bf3123d0594287031d69ddf..6a6edfa8f919ffca815cc0f50fcde0b09067d494 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
 @@ -282,13 +282,14 @@ void PlatformNotificationContextImpl::Shutdown() {
@@ -130,10 +130,10 @@ index 69f000e5cd25c6d89c88238873f638923bafdf0e..4f0068a92a0e99e2b34f105954689c7b
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index b769a06dc9443317a1073738c6fd38816ebeb186..20a697be32f7e27a9fa33d0225c94520aa5ebf2e 100644
+index 36830abdfa49fed9b8294ca33065816faa672e18..36b4e75828436df4274b522bdf75e88e1112aab6 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2083,7 +2083,8 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2085,7 +2085,8 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index 4e2dbb1fe2106..c7f550e631fc7 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index 3309906bcae27ba89d73ce4fba49843a10cd31f6..987917a440480130d35f34f85c27ff7c27632fd9 100644
+index 27e776fcf770b0ef72151d98d07778badabe807e..f7fb7850497a289ca8627752ba952d9f59468079 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 @@ -15,15 +15,19 @@
@@ -113,7 +113,7 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157acd9edd56 100644
+index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..9dfdd0288391aac31556c716d24c66d123fbd783 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
 @@ -14,9 +14,11 @@
@@ -138,7 +138,7 @@ index 850b34e3b40f7ff1848c66158976db079e0853bd..74178fd4752e9c469d50ccafda61157a
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..b9b2b4aa7d168cd7a83c36edbe4f7dc30565c921 100644
+index c1d2614f3ae3e7256db95a2cd3c5253ab6b25bd0..cabe6f261c863c35882deb8f850194e27f78a4f9 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
@@ -162,7 +162,7 @@ index c24fdd1360e582293a8b21b2f29dc6bc02b564c9..b9b2b4aa7d168cd7a83c36edbe4f7dc3
  #include "chrome/browser/shell_integration_win.h"
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
-@@ -167,7 +169,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
+@@ -166,7 +168,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
    overlay_window->Init(std::move(params));
    overlay_window->OnRootViewReady();
  
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index 8dc0b14a55140..4d30cc3869be4 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index d1a9c517a69bcc79a4b42f8eb8b6fcc3cea2f4da..04569140589c25d37bad2cd5ff979cfc6b1f3f43 100644
+index 14d91a0d19c01a856a9614b127a4ef3655614684..a243dd71886af7c5313b16a8522a50ae50af5959 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
-@@ -125,6 +125,16 @@
+@@ -128,6 +128,16 @@
    E_CPONLY(kColorOverlayScrollbarStrokeHoveredDark) \
    E_CPONLY(kColorOverlayScrollbarStrokeHoveredLight) \
    E_CPONLY(kColorProgressBar) \
@@ -28,7 +28,7 @@ index d1a9c517a69bcc79a4b42f8eb8b6fcc3cea2f4da..04569140589c25d37bad2cd5ff979cfc
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -177,6 +187,7 @@
+@@ -180,6 +190,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@@ -37,10 +37,10 @@ index d1a9c517a69bcc79a4b42f8eb8b6fcc3cea2f4da..04569140589c25d37bad2cd5ff979cfc
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
-index b404ef6063c3a6c542565de46458b7401f129963..ce6fca0516d91b8acfe5fe6bc89bc09ae03a17d6 100644
+index 8b5b8c6321aaf668ad90870a0567c1a97d268323..8296b2c017f1774c1a38d931add2b7cac4f57dfe 100644
 --- a/ui/color/ui_color_mixer.cc
 +++ b/ui/color/ui_color_mixer.cc
-@@ -143,6 +143,17 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -149,6 +149,17 @@ void AddUiColorMixer(ColorProvider* provider,
        SetAlpha(GetColorWithMaxContrast(kColorOverlayScrollbarFillHoveredLight),
                 gfx::kGoogleGreyAlpha500);
    mixer[kColorProgressBar] = {kColorAccent};
@@ -58,7 +58,7 @@ index b404ef6063c3a6c542565de46458b7401f129963..ce6fca0516d91b8acfe5fe6bc89bc09a
    mixer[kColorSeparator] = {kColorMidground};
    mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
    mixer[kColorShadowValueAmbientShadowElevationThree] =
-@@ -218,6 +229,7 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -228,6 +239,7 @@ void AddUiColorMixer(ColorProvider* provider,
    mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
    mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
        kColorTreeNodeForegroundSelectedFocused};
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 673afb1da0042..ac87ae19ab3c7 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
-index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644
+index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dcf54817e9 100644
 --- a/chrome/browser/printing/print_job.cc
 +++ b/chrome/browser/printing/print_job.cc
-@@ -89,6 +89,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
+@@ -90,6 +90,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
    return base::FeatureList::IsEnabled(features::kPrintWithReducedRasterization);
  }
  
@@ -22,7 +22,7 @@ index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac0
  PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
    // TODO(thestig): Figure out why crbug.com/1083911 occurred, which is likely
    // because `web_contents` was null. As a result, this section has many more
-@@ -97,6 +98,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
+@@ -98,6 +99,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
        web_contents ? web_contents->GetBrowserContext() : nullptr;
    return context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
  }
@@ -30,7 +30,7 @@ index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac0
  
  #endif  // BUILDFLAG(IS_WIN)
  
-@@ -356,8 +358,10 @@ void PrintJob::StartPdfToEmfConversion(
+@@ -351,8 +353,10 @@ void PrintJob::StartPdfToEmfConversion(
  
    const PrintSettings& settings = document()->settings();
  
@@ -42,7 +42,7 @@ index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac0
  
    using RenderMode = PdfRenderSettings::Mode;
    RenderMode mode = print_with_reduced_rasterization
-@@ -447,8 +451,10 @@ void PrintJob::StartPdfToPostScriptConversion(
+@@ -442,8 +446,10 @@ void PrintJob::StartPdfToPostScriptConversion(
    if (ps_level2) {
      mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
    } else {
@@ -54,22 +54,8 @@ index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac0
                 ? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3_WITH_TYPE42_FONTS
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
-diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
-index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471c359553b 100644
---- a/chrome/browser/printing/print_job.h
-+++ b/chrome/browser/printing/print_job.h
-@@ -261,6 +261,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
-  public:
-   // Event type.
-   enum Type {
-+    // Print... dialog box has been closed with CANCEL button.
-+    USER_INIT_CANCELED,
-+
-     // A new document started printing.
-     NEW_DOC,
- 
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb55883ea5fae5 100644
+index ee713c5686d4ea8a5d73cebf74e67381b685cff6..375ce3294727b84bf0071681c7bc35c772e4e3b9 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -88,7 +74,7 @@ index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb5588
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -230,16 +230,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
+@@ -229,16 +229,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -114,10 +100,10 @@ index f989f040cb9ff6df001225057202fb1653ade9fc..8a7dd2a4c4e9f5c778a8a35658cb5588
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index 02dfcad0c6b208f7df4d2b10112739554f6ab75c..0774aa95ee1521b0e76fe72d8d9e8de4540f0ff1 100644
+index dd27bbf387718d6abda5080e7d2c609cd0eaff17..8837cf2aeaa2f87d51be8d00aa356c8a2c5e15c7 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -331,7 +331,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -345,7 +345,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -127,7 +113,7 @@ index 02dfcad0c6b208f7df4d2b10112739554f6ab75c..0774aa95ee1521b0e76fe72d8d9e8de4
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b1071921e7cabb4 100644
+index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..a082dd9ee23b6d4918c194161386b973039d3ff6 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -143,15 +129,15 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  #include "components/prefs/pref_service.h"
  #include "components/printing/browser/print_composite_client.h"
  #include "components/printing/browser/print_manager_utils.h"
-@@ -49,6 +49,7 @@
+@@ -48,6 +48,7 @@
+ #include "content/public/browser/render_frame_host.h"
  #include "content/public/browser/render_process_host.h"
- #include "content/public/browser/render_view_host.h"
  #include "content/public/browser/web_contents.h"
 +#include "chrome/grit/generated_resources.h"
  #include "mojo/public/cpp/system/buffer.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/metafile_skia.h"
-@@ -88,6 +89,8 @@ using PrintSettingsCallback =
+@@ -87,6 +88,8 @@ using PrintSettingsCallback =
      base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
@@ -160,7 +146,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -96,6 +99,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -95,6 +98,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -168,7 +154,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -193,7 +197,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -192,7 +196,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -179,7 +165,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -246,6 +252,7 @@ void ScriptedPrintReplyOnIO(
+@@ -245,6 +251,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -187,7 +173,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -255,8 +262,9 @@ void ScriptedPrintReplyOnIO(
+@@ -254,8 +261,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -198,7 +184,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -294,12 +302,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -293,12 +301,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -213,7 +199,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -307,7 +317,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -306,7 +316,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -225,18 +211,17 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -333,7 +346,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -332,6 +345,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
--  GetPrintRenderFrame(rfh)->PrintRequestedPages();
 +  callback_ = std::move(callback);
 +
 +  GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
  
-   for (auto& observer : GetObservers())
-     observer.OnPrintNow(rfh);
-@@ -486,7 +501,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+ #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
+   enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
+@@ -500,7 +516,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -246,7 +231,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -499,16 +515,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -513,16 +530,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -270,7 +255,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -624,11 +643,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -638,11 +658,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -285,8 +270,8 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -658,18 +680,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
-     base::Value job_settings,
+@@ -672,18 +695,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+     base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 +#if 0 // Printing is always enabled.
@@ -297,7 +282,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    }
 -
 +#endif
-   if (!job_settings.FindIntKey(kSettingPrinterType)) {
+   if (!job_settings.FindInt(kSettingPrinterType)) {
      UpdatePrintSettingsReply(std::move(callback),
                               CreateEmptyPrintPagesParamsPtr(), false);
      return;
@@ -307,15 +292,15 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -679,6 +703,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -693,6 +718,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
-       job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
+       job_settings.Set(kSettingRasterizePdfDpi, value);
    }
 +#endif
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -704,14 +729,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -718,14 +744,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -332,15 +317,15 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
      return;
    }
  #endif
-@@ -734,7 +759,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
-   PrintManager::PrintingFailed(cookie);
+@@ -763,7 +789,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+   PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
 -  ShowPrintErrorDialog();
  #endif
  
    ReleasePrinterQuery();
-@@ -749,6 +773,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -778,6 +803,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -352,7 +337,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -759,10 +788,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -788,10 +818,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -365,7 +350,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -822,6 +853,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -851,6 +883,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -377,7 +362,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -883,7 +919,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -908,7 +945,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -389,7 +374,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    if (!weak_this)
      return false;
  
-@@ -965,6 +1004,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -987,6 +1027,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    UnregisterSystemPrintClient();
  #endif
  
@@ -403,7 +388,7 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
    if (!print_job_)
      return;
  
-@@ -1014,7 +1060,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1036,7 +1083,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -412,11 +397,20 @@ index 3a3f733c45e08e461a74d2458172c38ec0e572bf..ae520ae7e671183887a4703c3b107192
      return true;
  
    if (!cookie) {
+@@ -1144,7 +1191,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+ }
+ 
+ void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
+-  GetPrintRenderFrame(rfh)->PrintRequestedPages();
++  GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
+ 
+   for (auto& observer : GetObservers())
+     observer.OnPrintNow(rfh);
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61ddde6cd552 100644
+index 746df417a23f7760818ba265d4a7d589dec8bf34..5566e7dc2929a2542c599fed91fb1eeeb866e7bb 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
-@@ -37,6 +37,8 @@ namespace printing {
+@@ -41,6 +41,8 @@ namespace printing {
  class PrintQueriesQueue;
  class PrinterQuery;
  
@@ -425,7 +419,7 @@ index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61dd
  // Base class for managing the print commands for a WebContents.
  class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
   public:
-@@ -58,7 +60,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -64,7 +66,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Prints the current document immediately. Since the rendering is
    // asynchronous, the actual printing will not be completed on the return of
    // this function. Returns false if printing is impossible at the moment.
@@ -437,15 +431,15 @@ index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61dd
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Prints the document in `print_data` with settings specified in
-@@ -106,6 +111,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
-                      ScriptedPrintCallback callback) override;
+@@ -113,6 +118,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    void ShowInvalidPrinterSettingsError() override;
-   void PrintingFailed(int32_t cookie) override;
+   void PrintingFailed(int32_t cookie,
+                       mojom::PrintFailureReason reason) override;
 +  void UserInitCanceled();
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -207,7 +213,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -241,7 +247,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -455,7 +449,7 @@ index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61dd
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -262,9 +269,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -314,9 +321,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -472,94 +466,68 @@ index 3a4cfa1e44d781a94030dec6992ffd6f6391020f..d14804d02cc61b6f75d47893f6dd61dd
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-index 879004c790d57b28e7a816ebf560971876c17168..334509d3ab45af4bb7877f656ca5aca7ee1bce00 100644
+index aa727261738698610fab5abd3618d0d0f0d29792..8f95dae637ce25a073872ecdf229f14cc6d0614c 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-@@ -20,7 +20,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
+@@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
  
  FakePrintRenderFrame::~FakePrintRenderFrame() = default;
  
 -void FakePrintRenderFrame::PrintRequestedPages() {}
 +void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value /*settings*/) {}
  
- void FakePrintRenderFrame::PrintForSystemDialog() {}
- 
+ void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params) {
+   NOTREACHED();
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-index 10f46664d8337d6be2fac24d9a6933429f3b2c2b..6de833f2da3ae85cf0752284146974f2026ab174 100644
+index 5f4d6e314b21351e3e5912e3a43ef87774343085..2a93fe0139025d1a40b3f8e81378ee4213ac27c1 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-@@ -24,7 +24,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
+@@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
  
   private:
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
 +  void PrintRequestedPages(bool silent, ::base::Value settings) override;
+   void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
-       mojo::PendingAssociatedRemote<mojom::PrintPreviewUI> preview) override;
 diff --git a/components/printing/browser/print_to_pdf/pdf_print_manager.cc b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
-index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e534428dc49 100644
+index 82591f8c2abbc1a180ef62f7264a68ca279e9b9c..ad27a15ba3028af1046482192dec789df5dda7b2 100644
 --- a/components/printing/browser/print_to_pdf/pdf_print_manager.cc
 +++ b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
-@@ -116,7 +116,8 @@ void PdfPrintManager::PrintToPdf(
-   set_cookie(print_pages_params_->params->document_cookie);
+@@ -132,7 +132,8 @@ void PdfPrintManager::PrintToPdf(
+   set_cookie(print_pages_params->params->document_cookie);
    callback_ = std::move(callback);
  
--  GetPrintRenderFrame(rfh)->PrintRequestedPages();
+-  GetPrintRenderFrame(rfh)->PrintWithParams(std::move(print_pages_params));
 +  // TODO(electron-maintainers): do something with job_settings here?
 +  GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
  }
  
  void PdfPrintManager::GetDefaultPrintSettings(
-@@ -138,14 +139,14 @@ void PdfPrintManager::ScriptedPrint(
-   if (!printing_rfh_) {
-     DLOG(ERROR) << "Unexpected message received before PrintToPdf is "
-                    "called: ScriptedPrint";
--    std::move(callback).Run(std::move(default_param));
-+    std::move(callback).Run(std::move(default_param), true/*canceled*/);
-     return;
-   }
-   if (params->is_scripted &&
-       GetCurrentTargetFrame()->IsNestedWithinFencedFrame()) {
-     DLOG(ERROR) << "Unexpected message received. Script Print is not allowed"
-                    " in a fenced frame.";
--    std::move(callback).Run(std::move(default_param));
-+    std::move(callback).Run(std::move(default_param), true/*canceled*/);
-     return;
-   }
-   absl::variant<printing::PageRanges, PageRangeError> page_ranges =
-@@ -162,7 +163,7 @@ void PdfPrintManager::ScriptedPrint(
-         break;
-     }
-     ReleaseJob(print_result);
--    std::move(callback).Run(std::move(default_param));
-+    std::move(callback).Run(std::move(default_param), true/*canceled*/);
-     return;
-   }
- 
-@@ -170,7 +171,7 @@ void PdfPrintManager::ScriptedPrint(
-   print_pages_params_->pages = printing::PageRange::GetPages(
-       absl::get<printing::PageRanges>(page_ranges));
- 
--  std::move(callback).Run(print_pages_params_->Clone());
-+  std::move(callback).Run(print_pages_params_->Clone(), false/*canceled*/);
+@@ -147,7 +148,7 @@ void PdfPrintManager::ScriptedPrint(
+   auto default_param = printing::mojom::PrintPagesParams::New();
+   default_param->params = printing::mojom::PrintParams::New();
+   DLOG(ERROR) << "Scripted print is not supported";
+-  std::move(callback).Run(std::move(default_param));
++  std::move(callback).Run(std::move(default_param), true/*canceled*/);
  }
  
  void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index 6cd585d597315940be144506b9bb819137a7981e..8ea9c38a46460edd237f003ddd7362240a02887e 100644
+index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..fa53eb1c9dd4e7a6b321bdd4cda2164b95244323 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
-@@ -275,7 +275,7 @@ interface PrintPreviewUI {
+@@ -280,7 +280,7 @@ enum PrintFailureReason {
  interface PrintRenderFrame {
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page, and then switch back the CSS to display media type.
 -  PrintRequestedPages();
 +  PrintRequestedPages(bool silent, mojo_base.mojom.DeprecatedDictionaryValue settings);
  
-   // Tells the RenderFrame to switch the CSS to print media type, render every
-   // requested page using the print preview document's frame/node, and then
-@@ -342,7 +342,7 @@ interface PrintManagerHost {
+   // Requests the frame to be printed with specified parameters. This is used
+   // to programmatically produce PDF by request from the browser (e.g. over
+@@ -362,7 +362,7 @@ interface PrintManagerHost {
    // Request the print settings from the user. This step is about showing
    // UI to the user to select the final print settings.
    [Sync]
@@ -569,18 +537,18 @@ index 6cd585d597315940be144506b9bb819137a7981e..8ea9c38a46460edd237f003ddd736224
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8bdd9963fa 100644
+index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9567214a1 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
-@@ -40,6 +40,7 @@
- #include "printing/metafile_skia.h"
+@@ -42,6 +42,7 @@
  #include "printing/mojom/print.mojom.h"
+ #include "printing/page_number.h"
  #include "printing/print_job_constants.h"
 +#include "printing/print_settings.h"
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1264,7 +1265,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1277,7 +1278,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -590,7 +558,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
      if (!weak_this)
        return;
  
-@@ -1295,7 +1297,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1308,7 +1310,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -599,7 +567,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1310,7 +1312,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1323,7 +1325,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -608,7 +576,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1341,7 +1343,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1389,7 +1391,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -618,7 +586,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1390,6 +1393,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1438,6 +1441,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -627,7 +595,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1942,7 +1947,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2051,7 +2056,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -637,7 +605,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -1957,7 +1963,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2066,7 +2072,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -648,7 +616,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -1965,7 +1973,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2074,7 +2082,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -657,7 +625,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -1984,8 +1992,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2093,8 +2101,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -674,7 +642,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2233,36 +2248,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2327,36 +2342,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -695,7 +663,8 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
 +    bool canceled = false;
 +    int cookie =
 +      print_pages_params_ ? print_pages_params_->params->document_cookie : 0;
-+    GetPrintManagerHost()->UpdatePrintSettings(cookie, new_settings.Clone(), &settings, &canceled);
++    GetPrintManagerHost()->UpdatePrintSettings(
++      cookie, new_settings.GetDict().Clone(), &settings, &canceled);
 +    if (canceled)
 +      return false;
 +  }
@@ -738,7 +707,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2406,7 +2436,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2481,7 +2512,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -747,7 +716,7 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2657,18 +2687,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
+@@ -2725,18 +2756,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
  }
  
  bool PrintRenderFrameHelper::CheckForCancel() {
@@ -768,19 +737,19 @@ index 36852ff8edee8da4ca43cf84c316f1f0eaff9fe0..7be102bae492701cddefc1623af4fe8b
  
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index cd26f9ecf888c2a321890edd378ee0f8843a7f6c..958794f95fe8830b7e494340fbd53b0e92a498e3 100644
+index 220b28a7e63625fe8b76290f0d2f40dd32cae255..72801431a5d19f31c1a7db785b0cbaee8e65cca3 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
-@@ -257,7 +257,7 @@ class PrintRenderFrameHelper
+@@ -255,7 +255,7 @@ class PrintRenderFrameHelper
        mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
  
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
 +  void PrintRequestedPages(bool silent, base::Value settings) override;
+   void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void PrintForSystemDialog() override;
-   void SetPrintPreviewUI(
-@@ -324,7 +324,9 @@ class PrintRenderFrameHelper
+@@ -327,7 +327,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -791,7 +760,7 @@ index cd26f9ecf888c2a321890edd378ee0f8843a7f6c..958794f95fe8830b7e494340fbd53b0e
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -333,12 +335,14 @@ class PrintRenderFrameHelper
+@@ -336,12 +338,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.
@@ -809,19 +778,19 @@ index cd26f9ecf888c2a321890edd378ee0f8843a7f6c..958794f95fe8830b7e494340fbd53b0e
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index d0ef2181c649afe110c3c466a565a01cf6ae63a9..2daf9f02d41e04930fc4dad6d36ccbf3006dc175 100644
+index 8a8fcefa9da92a044f5bdf6a2f242048b325d442..6dae33514675d6843736b2c9a767a4b72cb103fa 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -119,7 +119,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
+@@ -117,7 +117,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
  
  mojom::ResultCode PrintingContext::UpdatePrintSettings(
-     base::Value job_settings) {
+     base::Value::Dict job_settings) {
 -  ResetSettings();
    {
      std::unique_ptr<PrintSettings> settings =
-         PrintSettingsFromJobSettings(job_settings.GetDict());
+         PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 3f36303105b7979a1a771bf26b42596abe5b3cce..52f740bb832db4a8d76431d9bc77cab10bb7e0c7 100644
+index 2c8ef23f7cb75a743fa18e3c613f7c719988028c..265005d6d51f861aa7ccd7e0eba7809b3c652dae 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
 @@ -170,6 +170,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index e5d125cd0dbb9..0d6d8328df700 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -75,7 +75,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd0493c942 100644
+index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240afa9bedeb 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -54,6 +54,7 @@
@@ -86,15 +86,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  #include <type_traits>
  
  #include "base/base_paths.h"
-@@ -80,6 +81,7 @@
- #include "base/strings/utf_string_conversions.h"
- #include "base/task/sequenced_task_runner_helpers.h"
- #include "base/task/single_thread_task_runner.h"
-+#include "base/task/post_task.h"
- #include "base/threading/platform_thread.h"
- #include "base/threading/thread_task_runner_handle.h"
- #include "base/time/time.h"
-@@ -96,9 +98,11 @@
+@@ -96,9 +97,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -106,7 +98,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  
  #if defined(TOOLKIT_VIEWS) && \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -347,6 +351,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+@@ -347,6 +350,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -116,7 +108,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -366,6 +373,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -366,6 +372,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -124,7 +116,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -406,6 +414,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -406,6 +413,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -146,7 +138,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -773,6 +796,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -773,6 +795,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -157,13 +149,13 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -945,6 +972,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -945,6 +971,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
 +void ProcessSingleton::StartListeningOnSocket() {
 +  watcher_ = base::MakeRefCounted<LinuxWatcher>(this);
-+  base::PostTask(FROM_HERE, {BrowserThread::IO},
++  content::GetIOThreadTaskRunner({})->PostTask(FROM_HERE,
 +                 base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening,
 +                                watcher_, sock_));
 +}
@@ -178,7 +170,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1044,14 +1085,32 @@ bool ProcessSingleton::Create() {
+@@ -1044,14 +1084,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -216,7 +208,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1094,10 +1153,13 @@ bool ProcessSingleton::Create() {
+@@ -1094,10 +1152,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
@@ -235,10 +227,10 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..be2c417c07a4206fac4a9a6c03e516fd
    return true;
  }
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index e2312c65623a3f54ecbc18058720ccae53822e76..ec725b44296266bea1a51aea889463a0bba8449c 100644
+index 363c18e4d9d5c0fe30f843d32df67e97e3d73111..0c87fc8ccb4511904f19b76ae5e03a5df6664391 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
-@@ -28,7 +28,9 @@
+@@ -29,7 +29,9 @@
  #include "base/win/wmi.h"
  #include "chrome/browser/process_singleton_internal.h"
  #include "chrome/browser/shell_integration.h"
diff --git a/patches/chromium/proxy_config_monitor.patch b/patches/chromium/proxy_config_monitor.patch
index 155415a59b428..6b489214e651e 100644
--- a/patches/chromium/proxy_config_monitor.patch
+++ b/patches/chromium/proxy_config_monitor.patch
@@ -6,7 +6,7 @@ Subject: proxy_config_monitor.patch
 Allow monitoring proxy config changes for a pref service.
 
 diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
-index 88fad9811069e7851363c8068f9702a9019669cc..526d951589f2757835fded706f4e448a8bb9daae 100644
+index d05a82a9c369a42cddebb1af1546a5ba6ae59c9f..7a263e3e6cc2a6bd27ec61598d9aae81c12d16e0 100644
 --- a/chrome/browser/net/proxy_config_monitor.cc
 +++ b/chrome/browser/net/proxy_config_monitor.cc
 @@ -11,7 +11,9 @@
@@ -34,7 +34,7 @@ index 88fad9811069e7851363c8068f9702a9019669cc..526d951589f2757835fded706f4e448a
  ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    DCHECK(profile);
-@@ -56,6 +59,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
+@@ -57,6 +60,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
  
    proxy_config_service_->AddObserver(this);
  }
@@ -42,7 +42,7 @@ index 88fad9811069e7851363c8068f9702a9019669cc..526d951589f2757835fded706f4e448a
  
  ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
-@@ -133,9 +137,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
+@@ -134,9 +138,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
  void ProxyConfigMonitor::OnPACScriptError(int32_t line_number,
                                            const std::string& details) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -54,7 +54,7 @@ index 88fad9811069e7851363c8068f9702a9019669cc..526d951589f2757835fded706f4e448a
  }
  
  void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
-@@ -149,9 +155,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
+@@ -150,9 +156,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
      // controlled.
      return;
    }
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 1fb2c1b47c131..576ccc34bd1d6 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 7cda66952e0d3a67c32791ad3c7d7de8df03f876..8cb3a596593c52e776d546d25fb078003204faa6 100644
+index fcc45c987cfce94f5378d4aeee1cfe703178e133..d78ca15f4d589b6789908168c00d9e403e62d6f4 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2080,6 +2080,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2081,6 +2081,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 7cda66952e0d3a67c32791ad3c7d7de8df03f876..8cb3a596593c52e776d546d25fb07800
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index df03de0a810bbce796d5bc421b92000e02dbd449..b9309e1cbc4a8b701534aa8be2827c40d98d6678 100644
+index a96bb634eb5c5405abb62b88d576e5e3ed354caa..1b616ba52d9c77c64c7f24a0d204ce36641dce38 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4519,6 +4519,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4527,6 +4527,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index df03de0a810bbce796d5bc421b92000e02dbd449..b9309e1cbc4a8b701534aa8be2827c40
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 80aeacf4ad593a7d40dae6c9096ab0c700ab22d8..07355cb194bd429a693e587072d11432d6c0888a 100644
+index 6b6fc6881c88b72c164d786c036b2e56ccd43ac8..df1633d59070e19592a52f02a76bdd9006d7c6f0 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -962,6 +962,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -954,6 +954,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
diff --git a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
index ae36800e4a5dc..66ec1ac0489e0 100644
--- a/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
+++ b/patches/chromium/refactor_restore_base_adaptcallbackforrepeating.patch
@@ -12,10 +12,10 @@ should be removed as soon as those have been updated. Patching because
 every instance is a FTBFS that prevents testing any one instance's fix.
 
 diff --git a/base/callback_helpers.h b/base/callback_helpers.h
-index 460442d9c0f894f78b29b33c027320511511dbcc..30068c219aa497892e10290be0fe5734ded8b23c 100644
+index 49ce51acb678886e0c679caa42e616400ab3bd48..760d97e8614195c8106b07b8477cf91a5dbebc15 100644
 --- a/base/callback_helpers.h
 +++ b/base/callback_helpers.h
-@@ -95,6 +95,22 @@ class OnceCallbackHolder final {
+@@ -96,6 +96,22 @@ class OnceCallbackHolder final {
  
  }  // namespace internal
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index 88293ba5df857..4742a2456d48e 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,10 +10,10 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66dc8d9d5da 100644
+index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4087ce4ff 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-@@ -154,6 +154,15 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
  
  }  // namespace
  
@@ -29,7 +29,7 @@ index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66d
  // These are not documented, so use only after checking -respondsToSelector:.
  @interface NSApplication (UndocumentedSpeechMethods)
  - (void)speakString:(NSString*)string;
-@@ -610,6 +619,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+@@ -611,6 +620,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -39,7 +39,7 @@ index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66d
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -686,6 +698,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -687,6 +699,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -50,7 +50,7 @@ index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66d
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -1005,6 +1021,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -1006,6 +1022,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSKeyDown &&
                                !(modifierFlags & NSCommandKeyMask);
  
@@ -61,7 +61,7 @@ index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66d
    // We only handle key down events and just simply forward other events.
    if (eventType != NSKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1751,9 +1771,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1769,9 +1789,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66d
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1762,7 +1784,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1780,7 +1802,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 6b0998109b045..ad3734548752a 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4 100644
+index 5c564fe889ca6621ff33d31d8d2fff93563093eb..99ab95668a7d3a31339b576b4a3a6038f39c2795 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1529,7 +1529,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1534,7 +1534,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..3c40d999a9545051e91a9f0ad3bf7ca2
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1558,6 +1558,12 @@ if (!is_android) {
+@@ -1563,6 +1563,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 535a2d61a447d..38a37c6c62911 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 24b18a620f3e60ed26dddfaa5d3133b5ede972fe..0377f156a23182d1a65fe5ef82f3f5203b98aed0 100644
+index f81f1104399a42009f7705585716579d4c17ad03..d08e4c8223078230e35afd21b6f98ec839664ea9 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1320,7 +1320,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1343,7 +1343,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index e10c15ba036d4..c60a1ac2733bb 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 20a697be32f7e27a9fa33d0225c94520aa5ebf2e..927e182bbba7a3700fd20c8c964da7cc162c4210 100644
+index 36b4e75828436df4274b522bdf75e88e1112aab6..0c8d0735523d388d0e68d2ad0b20a1c2525502ed 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1786,9 +1786,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1791,9 +1791,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
index 5ce4605f1e1ea..7e9b3c98af489 100644
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@@ -6,10 +6,10 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.
 
 diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-index 28e6c85b65b782c5b788b3e2283db070d4490c7a..87dc089b7c36d72d623c73cd5aba196f00a0d1f1 100644
+index b0279116fef365106926dd3b5e4cd5f0670c70ae..0b9e71de7a94d8b19b3534e8b8b9a5d56193567b 100644
 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-@@ -7,6 +7,7 @@
+@@ -8,6 +8,7 @@
  #include "build/build_config.h"
  #include "content/public/common/content_switches.h"
  #include "sandbox/policy/mojom/sandbox.mojom.h"
@@ -17,7 +17,7 @@ index 28e6c85b65b782c5b788b3e2283db070d4490c7a..87dc089b7c36d72d623c73cd5aba196f
  
  #if BUILDFLAG(IS_WIN)
  #include "base/win/windows_version.h"
-@@ -53,6 +54,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
+@@ -54,6 +55,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
  ZygoteHandle PpapiPluginSandboxedProcessLauncherDelegate::GetZygote() {
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 645a763ee4263..a01f4031ad26c 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c1b1bfc8333e93456178842db392eabff96bf4c9..1eee3bf88b5566b07cdb4f33fc03bf3d904ec6b9 100644
+index 0303ae1c4d8681bc1bf56eb9ff1fc13afd678706..7a38e596eededae649e8380ab99c6ce7f472aa77 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3057,6 +3057,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3065,6 +3065,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -23,12 +23,12 @@ index c1b1bfc8333e93456178842db392eabff96bf4c9..1eee3bf88b5566b07cdb4f33fc03bf3d
 +
 +  if (!view_) {
 +
-   WebContentsViewDelegate* delegate =
+   std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3067,6 +3074,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
-     view_.reset(CreateWebContentsView(this, delegate,
-                                       &render_view_host_delegate_view_));
+@@ -3075,6 +3082,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+     view_ = CreateWebContentsView(this, std::move(delegate),
+                                   &render_view_host_delegate_view_);
    }
 +  }  // !view_
    CHECK(render_view_host_delegate_view_);
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 4821358337913..064c5466aee67 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index dad12d60cea0cd11302e38090eb9af204138b028..ee7615c26df635e433fe14d68dc0a724820f3d2a 100644
+index c842bf34f1510071875220c7d81d60300d459b82..18f26143d5b8f6d1aeb4b21ffecd4cdf50081159 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -900,10 +900,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // for the outermost view. Inner `WebContents` will have a
    // `WebContentsViewChildFrame` so when dragging between an inner
    // `WebContents` and its embedder the view IDs will be the same.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index c63e24436accf..f6c4cbc526fed 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index b47dc4a90a0294c5d7e73f01c496fd2b4f621400..cf02dbe536eec67b77c85ceb73d285fcbde025fc 100644
+index e588b460aa32b4c984d593ed54e10310b59ace9b..2dd0997bc183685cbb0b6f34b4a254af0a09bdd5 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6324,6 +6324,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6223,6 +6223,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 4bd7a399681ec..00b3be1ea6281 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -26,10 +26,10 @@ index eb8968c2a86102d0d3a21f07c394f1c360083c6c..025ef3f70a5ae34faf8c6013fbfba171
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index dbde0706007b8f202fcca5fc05562979617b0183..2adea2c2edabf3c401e9dcd228f1d57c08066059 100644
+index 16322f245b51465d77b08c0c5d4da0b79ba8ae03..bd63f484db056d099bada03a0d3aab7742016110 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -949,6 +949,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -966,6 +966,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index dbde0706007b8f202fcca5fc05562979617b0183..2adea2c2edabf3c401e9dcd228f1d57c
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index e7d0d3e7c08c2f6e83726e7fa2557847d148a0ed..c6e0a728150db2b5af41e12304c88d57e51faa43 100644
+index 213b0b9c28974aecbdd2dd1297dfa21cd716a337..f77763977aee112b854ade93b59172247599a16b 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -208,6 +208,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -209,6 +209,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -55,10 +55,10 @@ index e7d0d3e7c08c2f6e83726e7fa2557847d148a0ed..c6e0a728150db2b5af41e12304c88d57
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 0825226fae036b1e5503b66dabe4bd92ad6ee9bb..3cbb1ed9ef65cb9044a76b0a1686f6ab019c87b5 100644
+index 3f8fbe6330051d96715706801efdefcb2ee3b971..be0eb834ba868bb7f6f40e08277f4475a6a92f7d 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -714,6 +714,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -722,6 +722,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -67,10 +67,10 @@ index 0825226fae036b1e5503b66dabe4bd92ad6ee9bb..3cbb1ed9ef65cb9044a76b0a1686f6ab
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index 68c38d2045c7c23650bd56717081bb001a4e690e..e0e08d4bdf9521ed5c1940d31665d1b675119f0d 100644
+index 265e4bed408747b5b22d2e930bc64fb2cb2c3b25..892b3e58443f1a82a6a41c6d52df7d2d701b377d 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -732,6 +732,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -734,6 +734,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
      nested_runner_->QuitNow();
    }
  
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 11730d37c9627..4d3c34796e359 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -35,10 +35,10 @@ index 025ef3f70a5ae34faf8c6013fbfba171c7f501ac..cea3f3dc05f91927f4ee8be5eec85ec2
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 2adea2c2edabf3c401e9dcd228f1d57c08066059..7c76b39ea82dd600b72288cccc571660b653b150 100644
+index bd63f484db056d099bada03a0d3aab7742016110..7aea168344138d6210216997047bdcd8edfab6cc 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -961,6 +961,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -978,6 +978,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index 2adea2c2edabf3c401e9dcd228f1d57c08066059..7c76b39ea82dd600b72288cccc571660
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index c6e0a728150db2b5af41e12304c88d57e51faa43..7fa7dab64506ddc60e27096412ea7e93608a3394 100644
+index f77763977aee112b854ade93b59172247599a16b..f3518973a5e071bf428d928f20255c208cf4d0b9 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -208,6 +208,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -209,6 +209,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -65,10 +65,10 @@ index c6e0a728150db2b5af41e12304c88d57e51faa43..7fa7dab64506ddc60e27096412ea7e93
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 3cbb1ed9ef65cb9044a76b0a1686f6ab019c87b5..c7694b4a89c16d02f946598bcf66aa3d241af83e 100644
+index be0eb834ba868bb7f6f40e08277f4475a6a92f7d..00db8b6bdbf005a9aac20ede6ce810aefac4d03e 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -714,6 +714,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -722,6 +722,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/nan/.patches b/patches/nan/.patches
index 5a0539df8d7b2..3b26a944836c5 100644
--- a/patches/nan/.patches
+++ b/patches/nan/.patches
@@ -1 +1 @@
-use_new_constructor_for_scriptorigin.patch
+use_new_constructor_for_scriptorigin_when_17_x.patch
diff --git a/patches/nan/use_new_constructor_for_scriptorigin.patch b/patches/nan/use_new_constructor_for_scriptorigin.patch
deleted file mode 100644
index dfa36b750afc2..0000000000000
--- a/patches/nan/use_new_constructor_for_scriptorigin.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Rose <nornagon@nornagon.net>
-Date: Fri, 28 Jan 2022 13:46:07 -0800
-Subject: use new constructor for ScriptOrigin
-
-https://chromium-review.googlesource.com/c/v8/v8/+/3395880
-
-diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
-index 64c857996c4626f3a447bdb796d4d581a37d9299..95a12f9521b8c9bed0e5eed85b6e56917069ea09 100644
---- a/test/cpp/nannew.cpp
-+++ b/test/cpp/nannew.cpp
-@@ -248,7 +248,7 @@ NAN_METHOD(testScript) {
- 
- #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
-   (V8_MAJOR_VERSION == 8 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 9))
--  ScriptOrigin origin(New("foo").ToLocalChecked(), 5);
-+  ScriptOrigin origin(v8::Isolate::GetCurrent(), New("foo").ToLocalChecked(), 5);
- #else
-   ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
- #endif
-diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
-index 5b54c0cedaaa824be71b8c6fee948139a34d3310..f0aa65cc80741d57ba6675f7d5d5908b24f601c5 100644
---- a/test/cpp/news.cpp
-+++ b/test/cpp/news.cpp
-@@ -114,7 +114,7 @@ NAN_METHOD(NewScript) {
- }
- 
- NAN_METHOD(NewScript2) {
--  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
-+  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
-   v8::Local<UnboundScript> script =
-       New<UnboundScript>(
-           New("2+4").ToLocalChecked()
-@@ -131,7 +131,7 @@ NAN_METHOD(CompileScript) {
- }
- 
- NAN_METHOD(CompileScript2) {
--  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
-+  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
-   v8::Local<BoundScript> script =
-       CompileScript(New("2+4").ToLocalChecked(), origin).ToLocalChecked();
-   info.GetReturnValue().Set(
diff --git a/patches/nan/use_new_constructor_for_scriptorigin_when_17_x.patch b/patches/nan/use_new_constructor_for_scriptorigin_when_17_x.patch
new file mode 100644
index 0000000000000..e2c18d2e64dd3
--- /dev/null
+++ b/patches/nan/use_new_constructor_for_scriptorigin_when_17_x.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Thu, 5 May 2022 14:14:36 -0700
+Subject: use new constructor for ScriptOrigin when >= 17.x
+
+https://chromium-review.googlesource.com/c/v8/v8/+/3395880
+
+diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
+index a218167c7e3a5ec90c6668943cb395dba2bbe3a7..08557d5478d5400445603deffd721525ecbf746e 100644
+--- a/test/cpp/news.cpp
++++ b/test/cpp/news.cpp
+@@ -115,7 +115,7 @@ NAN_METHOD(NewScript) {
+ 
+ NAN_METHOD(NewScript2) {
+   v8::ScriptOrigin origin(
+-#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
++#if NODE_MODULE_VERSION >= NODE_17_0_MODULE_VERSION
+     info.GetIsolate(),
+ #endif
+     New<v8::String>("x").ToLocalChecked());
+@@ -136,7 +136,7 @@ NAN_METHOD(CompileScript) {
+ 
+ NAN_METHOD(CompileScript2) {
+   v8::ScriptOrigin origin(
+-#if NODE_MODULE_VERSION >= NODE_18_0_MODULE_VERSION
++#if NODE_MODULE_VERSION >= NODE_17_0_MODULE_VERSION
+     info.GetIsolate(),
+ #endif
+     New<v8::String>("x").ToLocalChecked());
diff --git a/patches/node/.patches b/patches/node/.patches
index e5114a032fb62..52db7b54f608f 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -40,4 +40,5 @@ process_fix_hang_after_note_exit_3521.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 fix_preserve_proper_method_names_as-is_in_error_stack.patch
 macos_avoid_posix_spawnp_cwd_bug_3597.patch
+src_update_importmoduledynamically.patch
 fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
diff --git a/patches/node/src_update_importmoduledynamically.patch b/patches/node/src_update_importmoduledynamically.patch
new file mode 100644
index 0000000000000..9f657d234096e
--- /dev/null
+++ b/patches/node/src_update_importmoduledynamically.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Camillo Bruni <cbruni@chromium.org>
+Date: Mon, 15 Nov 2021 15:34:38 +0100
+Subject: src: update ImportModuleDynamically
+
+PR-URL: https://github.com/nodejs/node/pull/41610
+Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
+Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
+Reviewed-By: Darshan Sen <raisinten@gmail.com>
+Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
+
+diff --git a/src/module_wrap.cc b/src/module_wrap.cc
+index aeb0d2cb37313bdbb00abe065c91362cac5dcb9a..1e049d7258d21c7d7049f393ecfa1b4f53325910 100644
+--- a/src/module_wrap.cc
++++ b/src/module_wrap.cc
+@@ -46,7 +46,6 @@ using v8::PrimitiveArray;
+ using v8::Promise;
+ using v8::ScriptCompiler;
+ using v8::ScriptOrigin;
+-using v8::ScriptOrModule;
+ using v8::String;
+ using v8::UnboundModuleScript;
+ using v8::Undefined;
+@@ -559,7 +558,8 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback(
+ 
+ static MaybeLocal<Promise> ImportModuleDynamically(
+     Local<Context> context,
+-    Local<ScriptOrModule> referrer,
++    Local<v8::Data> host_defined_options,
++    Local<Value> resource_name,
+     Local<String> specifier,
+     Local<FixedArray> import_assertions) {
+   Isolate* isolate = context->GetIsolate();
+@@ -574,7 +574,7 @@ static MaybeLocal<Promise> ImportModuleDynamically(
+   Local<Function> import_callback =
+     env->host_import_module_dynamically_callback();
+ 
+-  Local<PrimitiveArray> options = referrer->GetHostDefinedOptions();
++  Local<FixedArray> options = host_defined_options.As<FixedArray>();
+   if (options->Length() != HostDefinedOptions::kLength) {
+     Local<Promise::Resolver> resolver;
+     if (!Promise::Resolver::New(context).ToLocal(&resolver)) return {};
+@@ -588,11 +588,11 @@ static MaybeLocal<Promise> ImportModuleDynamically(
+ 
+   Local<Value> object;
+ 
+-  int type = options->Get(isolate, HostDefinedOptions::kType)
++  int type = options->Get(context, HostDefinedOptions::kType)
+                  .As<Number>()
+                  ->Int32Value(context)
+                  .ToChecked();
+-  uint32_t id = options->Get(isolate, HostDefinedOptions::kID)
++  uint32_t id = options->Get(context, HostDefinedOptions::kID)
+                     .As<Number>()
+                     ->Uint32Value(context)
+                     .ToChecked();
diff --git a/patches/v8/.patches b/patches/v8/.patches
index 67b42548459b7..4e14f3e14ced3 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -7,3 +7,4 @@ do_not_export_private_v8_symbols_on_windows.patch
 fix_build_deprecated_attribute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
+revert_runtime_dhceck_terminating_exception_in_microtasks.patch
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index c17d287366fd4..8ee43c0a6de39 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index fec387d31eb5842f4fb0ff617f10b2254c0ee260..2385ccc74d41c10a3f61179f31073062250afcdc 100644
+index 44b4f154b416eb9b145d2abe89f3e92d507cea77..8e8e20fcbda71ec98e949d3e5c582b30dfe67e06 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -606,7 +606,7 @@ config("internal_config") {
+@@ -608,7 +608,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index fec387d31eb5842f4fb0ff617f10b2254c0ee260..2385ccc74d41c10a3f61179f31073062
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5826,7 +5826,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5876,7 +5876,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index fec387d31eb5842f4fb0ff617f10b2254c0ee260..2385ccc74d41c10a3f61179f31073062
  
      deps = [
        ":v8_libbase",
-@@ -5864,6 +5864,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5914,6 +5914,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 1e2876e1fb704..0e23dc675bcc3 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,32 +6,32 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index d22910b209c614162363938accfc86696719ad12..22af6bf24d672817bf620b9411d1b678b7a9800f 100644
+index 6d478369375952e5af9bef922dba900067a79774..4c8bfb25e9fb2f9f9afcc57a61aff003f9db8e77 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9115,7 +9115,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9123,7 +9123,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
 -  DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
-+  //DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
-   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
-   isolate->default_microtask_queue()->PerformCheckpoint(this);
++  // DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
+   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
+   i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 509ee8574736261307d9e270b7151197c6988649..00532d4dedf67c0764ca574b40e10ff0ce184762 100644
+index a1d4680b02e9d22a3804f88b4249b10986044ade..74369f2e9fc3ecc4cc41a989ecc04cd554417b0b 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6200,9 +6200,9 @@ void Heap::TearDown() {
+@@ -6230,9 +6230,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
 -  DCHECK(gc_prologue_callbacks_.end() ==
 -         std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
 -                   GCCallbackTuple(callback, gc_type, data)));
-+//  DCHECK(gc_prologue_callbacks_.end() ==
-+//         std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
-+//                   GCCallbackTuple(callback, gc_type, data)));
++  // DCHECK(gc_prologue_callbacks_.end() ==
++  //        std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
++  //                  GCCallbackTuple(callback, gc_type, data)));
    gc_prologue_callbacks_.emplace_back(callback, gc_type, data);
  }
  
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 01d7180fc6f13..ef5e00434e88e 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 1310890fbec222c0edfda08ec962292d39aca8d1..5ff12eaa98887826b9a962c41f69480ca1d9dd3a 100644
+index bf50ab9cf353f67cba37266a8d3ae298afb5a87c..cc2f9cca18e9229ef949183dd876db91e3021318 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -606,6 +606,10 @@ config("internal_config") {
+@@ -608,6 +608,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index f3d31e645c36a..2a2002ed82572 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 2385ccc74d41c10a3f61179f31073062250afcdc..1310890fbec222c0edfda08ec962292d39aca8d1 100644
+index 8e8e20fcbda71ec98e949d3e5c582b30dfe67e06..bf50ab9cf353f67cba37266a8d3ae298afb5a87c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5838,7 +5838,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5888,7 +5888,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
index 267c4b8797500..9bffebef93014 100644
--- a/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
+++ b/patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
@@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
 when support is synchronized across both v8 and node.
 
 diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
-index 7c6dec2b52514085a731f78a551370d54912b5e9..2e8332b9fa6a6a3f55e78f29f710afa02c268b99 100644
+index dd59d5d6afc7c8e0b309d4e8928cd2bb7e682884..f3445a71aa02683dc40221b2eee1a80071629fef 100644
 --- a/src/objects/js-array-buffer.cc
 +++ b/src/objects/js-array-buffer.cc
 @@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
new file mode 100644
index 0000000000000..ee43f87b0374f
--- /dev/null
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Mon, 9 May 2022 17:09:21 -0700
+Subject: Revert "[runtime] DHCECK terminating exception in Microtasks"
+
+This reverts commit bccb536c98181e8a6e9cf0b6342311adbbf61aca.
+
+diff --git a/src/builtins/builtins-microtask-queue-gen.cc b/src/builtins/builtins-microtask-queue-gen.cc
+index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904af5d71f7 100644
+--- a/src/builtins/builtins-microtask-queue-gen.cc
++++ b/src/builtins/builtins-microtask-queue-gen.cc
+@@ -118,7 +118,6 @@ void MicrotaskQueueBuiltinsAssembler::PrepareForContext(
+ void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
+     TNode<Context> current_context, TNode<Microtask> microtask) {
+   CSA_DCHECK(this, TaggedIsNotSmi(microtask));
+-  CSA_DCHECK(this, Word32BinaryNot(IsExecutionTerminating()));
+ 
+   StoreRoot(RootIndex::kCurrentMicrotask, microtask);
+   TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
+diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
+index d1f275afcc7f8c6adcb4c8abf9aea04b6492f38f..2b82b08a6f7cf1b7023bbdb897bfdab6bd48da5e 100644
+--- a/src/codegen/code-stub-assembler.cc
++++ b/src/codegen/code-stub-assembler.cc
+@@ -6170,12 +6170,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+   StoreFullTaggedNoWriteBarrier(pending_message, message);
+ }
+ 
+-TNode<BoolT> CodeStubAssembler::IsExecutionTerminating() {
+-  TNode<HeapObject> pending_message = GetPendingMessage();
+-  return TaggedEqual(pending_message,
+-                     LoadRoot(RootIndex::kTerminationException));
+-}
+-
+ TNode<BoolT> CodeStubAssembler::InstanceTypeEqual(TNode<Int32T> instance_type,
+                                                   int type) {
+   return Word32Equal(instance_type, Int32Constant(type));
+diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
+index 123795af961c81278b947c9e8f012158d61c49df..7ac8af40f442025735498651931ab97904af6ecb 100644
+--- a/src/codegen/code-stub-assembler.h
++++ b/src/codegen/code-stub-assembler.h
+@@ -2522,7 +2522,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+ 
+   TNode<HeapObject> GetPendingMessage();
+   void SetPendingMessage(TNode<HeapObject> message);
+-  TNode<BoolT> IsExecutionTerminating();
+ 
+   // Type checks.
+   // Check whether the map is for an object with special properties, such as a
+diff --git a/src/execution/microtask-queue.cc b/src/execution/microtask-queue.cc
+index 2bea5d45bb0605877ad430882c914dddeb2c51c5..12a626900d0295be0b250cd6d4692ab4e329c681 100644
+--- a/src/execution/microtask-queue.cc
++++ b/src/execution/microtask-queue.cc
+@@ -179,8 +179,6 @@ int MicrotaskQueue::RunMicrotasks(Isolate* isolate) {
+                      processed_microtask_count);
+   }
+ 
+-  DCHECK_IMPLIES(isolate->has_scheduled_exception(),
+-                 maybe_result.is_null() && maybe_exception.is_null());
+   // If execution is terminating, clean up and propagate that to TryCatch scope.
+   if (maybe_result.is_null() && maybe_exception.is_null()) {
+     delete[] ring_buffer_;
diff --git a/script/lib/config.py b/script/lib/config.py
index 7ba2163ab4a30..883a0374bc251 100644
--- a/script/lib/config.py
+++ b/script/lib/config.py
@@ -21,8 +21,6 @@
   'libGLESv2.so',
   'libffmpeg.so',
   'libvk_swiftshader.so',
-  'swiftshader/libEGL.so',
-  'swiftshader/libGLESv2.so',
 ]
 
 verbose_mode = False
diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
index 5bd0faa6da5e6..f7934c76a629a 100644
--- a/script/nan-spec-runner.js
+++ b/script/nan-spec-runner.js
@@ -36,7 +36,7 @@ async function main () {
   // file and pull cflags_cc from it instead of using bespoke code here?
   // I think it's unlikely to work; but if it does, it would be more futureproof
   const cxxflags = [
-    '-std=c++14',
+    '-std=c++17',
     '-nostdinc++',
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++', 'trunk', 'include')}"`,
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index 579502c128b9d..ba2bc83e85ac3 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -125,6 +125,8 @@
   "report/test-report-uv-handles",
   "report/test-report-worker",
   "report/test-report-writereport",
+  "sequential/test-cpu-prof-kill",
+  "sequential/test-diagnostic-dir-cpu-prof",
   "sequential/test-tls-connect",
   "wpt/test-webcrypto"
 ]
diff --git a/script/spec-runner.js b/script/spec-runner.js
index 11502c2da0c23..ce16865f1089d 100755
--- a/script/spec-runner.js
+++ b/script/spec-runner.js
@@ -230,8 +230,13 @@ async function runMainProcessElectronTests () {
 }
 
 async function installSpecModules (dir) {
+  // v8 headers use c++17 so override the gyp default of -std=c++14,
+  // but don't clobber any other CXXFLAGS that were passed into spec-runner.js
+  const CXXFLAGS = ['-std=c++17', process.env.CXXFLAGS].filter(x => !!x).join(' ');
+
   const nodeDir = path.resolve(BASE, `out/${utils.getOutDir({ shouldLog: true })}/gen/node_headers`);
   const env = Object.assign({}, process.env, {
+    CXXFLAGS,
     npm_config_nodedir: nodeDir,
     npm_config_msvs_version: '2019',
     npm_config_yes: 'true'
diff --git a/script/zip_manifests/dist_zip.linux.arm.manifest b/script/zip_manifests/dist_zip.linux.arm.manifest
index 82bcb68f4d167..224d2f036d572 100644
--- a/script/zip_manifests/dist_zip.linux.arm.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm.manifest
@@ -69,8 +69,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.so
-swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.arm64.manifest b/script/zip_manifests/dist_zip.linux.arm64.manifest
index 82bcb68f4d167..224d2f036d572 100644
--- a/script/zip_manifests/dist_zip.linux.arm64.manifest
+++ b/script/zip_manifests/dist_zip.linux.arm64.manifest
@@ -69,8 +69,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.so
-swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.x64.manifest b/script/zip_manifests/dist_zip.linux.x64.manifest
index 82bcb68f4d167..224d2f036d572 100644
--- a/script/zip_manifests/dist_zip.linux.x64.manifest
+++ b/script/zip_manifests/dist_zip.linux.x64.manifest
@@ -69,8 +69,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.so
-swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.linux.x86.manifest b/script/zip_manifests/dist_zip.linux.x86.manifest
index 82bcb68f4d167..224d2f036d572 100644
--- a/script/zip_manifests/dist_zip.linux.x86.manifest
+++ b/script/zip_manifests/dist_zip.linux.x86.manifest
@@ -69,8 +69,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.so
-swiftshader/libGLESv2.so
 vk_swiftshader_icd.json
 v8_context_snapshot.bin
 version
diff --git a/script/zip_manifests/dist_zip.win.arm64.manifest b/script/zip_manifests/dist_zip.win.arm64.manifest
index 9ae29943b772f..20a089bcd67c6 100755
--- a/script/zip_manifests/dist_zip.win.arm64.manifest
+++ b/script/zip_manifests/dist_zip.win.arm64.manifest
@@ -65,8 +65,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.dll
-swiftshader/libGLESv2.dll
 vk_swiftshader_icd.json
 vk_swiftshader.dll
 vulkan-1.dll
diff --git a/script/zip_manifests/dist_zip.win.ia32.manifest b/script/zip_manifests/dist_zip.win.ia32.manifest
index cb7d05e9a4ec7..5d8deb41a53b8 100644
--- a/script/zip_manifests/dist_zip.win.ia32.manifest
+++ b/script/zip_manifests/dist_zip.win.ia32.manifest
@@ -66,8 +66,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.dll
-swiftshader/libGLESv2.dll
 vk_swiftshader_icd.json
 vk_swiftshader.dll
 vulkan-1.dll
diff --git a/script/zip_manifests/dist_zip.win.x64.manifest b/script/zip_manifests/dist_zip.win.x64.manifest
index cb7d05e9a4ec7..5d8deb41a53b8 100644
--- a/script/zip_manifests/dist_zip.win.x64.manifest
+++ b/script/zip_manifests/dist_zip.win.x64.manifest
@@ -66,8 +66,6 @@ locales/zh-TW.pak
 resources.pak
 resources/default_app.asar
 snapshot_blob.bin
-swiftshader/libEGL.dll
-swiftshader/libGLESv2.dll
 vk_swiftshader_icd.json
 vk_swiftshader.dll
 vulkan-1.dll
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index a0ca93fc63e30..b757c598891bc 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -253,6 +253,8 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
 
   auto env = base::Environment::Create();
 
+  gin_helper::Locker::SetIsBrowserProcess(IsBrowserProcess(command_line));
+
   // Enable convenient stack printing. This is enabled by default in
   // non-official builds.
   if (env->HasVar(kElectronEnableStackDumping))
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 6bd1d052e6cf0..1cff2713debe4 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -35,6 +35,7 @@
 #include "crypto/crypto_buildflags.h"
 #include "media/audio/audio_manager.h"
 #include "net/dns/public/dns_over_https_config.h"
+#include "net/dns/public/dns_over_https_server_config.h"
 #include "net/dns/public/util.h"
 #include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
@@ -1680,17 +1681,18 @@ void ConfigureHostResolver(v8::Isolate* isolate,
 
     // Validate individual server templates prior to batch-assigning to
     // doh_config.
+    std::vector<net::DnsOverHttpsServerConfig> servers;
     for (const std::string& server_template : secure_dns_server_strings) {
-      absl::optional<net::DnsOverHttpsConfig> server_config =
-          net::DnsOverHttpsConfig::FromString(server_template);
+      absl::optional<net::DnsOverHttpsServerConfig> server_config =
+          net::DnsOverHttpsServerConfig::FromString(server_template);
       if (!server_config.has_value()) {
         thrower.ThrowTypeError(std::string("not a valid DoH template: ") +
                                server_template);
         return;
       }
+      servers.push_back(*server_config);
     }
-    doh_config = *net::DnsOverHttpsConfig::FromStrings(
-        std::move(secure_dns_server_strings));
+    doh_config = net::DnsOverHttpsConfig(std::move(servers));
   }
 
   if (opts.Has("enableAdditionalDnsQueryTypes") &&
diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
index 7651ddd0e653c..9dfc40f84bf22 100644
--- a/shell/browser/api/electron_api_base_window.h
+++ b/shell/browser/api/electron_api_base_window.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "gin/handle.h"
@@ -258,8 +257,8 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
 
   template <typename... Args>
   void EmitEventSoon(base::StringPiece eventName) {
-    base::PostTask(
-        FROM_HERE, {content::BrowserThread::UI},
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE,
         base::BindOnce(base::IgnoreResult(&BaseWindow::Emit<Args...>),
                        weak_factory_.GetWeakPtr(), eventName));
   }
diff --git a/shell/browser/api/electron_api_menu_mac.mm b/shell/browser/api/electron_api_menu_mac.mm
index c57391b19487f..c61a02dca5d42 100644
--- a/shell/browser/api/electron_api_menu_mac.mm
+++ b/shell/browser/api/electron_api_menu_mac.mm
@@ -10,7 +10,6 @@
 #include "base/mac/scoped_sending_event.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/current_thread.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc
index 7c511685d1afa..6c60eaead4147 100644
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "gin/handle.h"
@@ -39,8 +38,8 @@ void NativeTheme::OnNativeThemeUpdatedOnUI() {
 }
 
 void NativeTheme::OnNativeThemeUpdated(ui::NativeTheme* theme) {
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(&NativeTheme::OnNativeThemeUpdatedOnUI,
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&NativeTheme::OnNativeThemeUpdatedOnUI,
                                 base::Unretained(this)));
 }
 
diff --git a/shell/browser/api/electron_api_power_save_blocker.cc b/shell/browser/api/electron_api_power_save_blocker.cc
index 34a11086d50d7..22126be69e78f 100644
--- a/shell/browser/api/electron_api_power_save_blocker.cc
+++ b/shell/browser/api/electron_api_power_save_blocker.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/callback_helpers.h"
-#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/browser/device_service.h"
 #include "gin/dictionary.h"
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index 19be4a8f3df88..d86e62dc7c8ad 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -17,7 +17,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -622,7 +621,7 @@ void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
   permission_manager->SetPermissionRequestHandler(base::BindRepeating(
       [](ElectronPermissionManager::RequestHandler* handler,
          content::WebContents* web_contents,
-         content::PermissionType permission_type,
+         blink::PermissionType permission_type,
          ElectronPermissionManager::StatusCallback callback,
          const base::Value& details) {
         handler->Run(web_contents, permission_type,
@@ -951,8 +950,8 @@ void Session::Preconnect(const gin_helper::Dictionary& options,
   }
 
   DCHECK_GT(num_sockets_to_preconnect, 0);
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&StartPreconnectOnUI, base::Unretained(browser_context_),
                      url, num_sockets_to_preconnect));
 }
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index f27eb39170c74..501e3cac4005d 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -18,7 +18,6 @@
 #include "base/no_destructor.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/current_thread.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/scoped_blocking_call.h"
 #include "base/threading/sequenced_task_runner_handle.h"
@@ -995,8 +994,8 @@ void WebContents::Destroy() {
   if (Browser::Get()->is_shutting_down() || IsGuest()) {
     DeleteThisIfAlive();
   } else {
-    base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                   base::BindOnce(
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE, base::BindOnce(
                        [](base::WeakPtr<WebContents> contents) {
                          if (contents)
                            contents->DeleteThisIfAlive();
@@ -3450,7 +3449,7 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
 void WebContents::GrantDevicePermission(
     const url::Origin& origin,
     const base::Value* device,
-    content::PermissionType permissionType,
+    blink::PermissionType permissionType,
     content::RenderFrameHost* render_frame_host) {
   granted_devices_[render_frame_host->GetFrameTreeNodeId()][permissionType]
                   [origin]
@@ -3460,7 +3459,7 @@ void WebContents::GrantDevicePermission(
 
 std::vector<base::Value> WebContents::GetGrantedDevices(
     const url::Origin& origin,
-    content::PermissionType permissionType,
+    blink::PermissionType permissionType,
     content::RenderFrameHost* render_frame_host) {
   const auto& devices_for_frame_host_it =
       granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 996c90cbbbc39..96940a3f32ea7 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -21,7 +21,6 @@
 #include "content/common/frame.mojom.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/keyboard_event_processing_result.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -43,6 +42,7 @@
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/pinnable.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 #include "ui/base/models/image_model.h"
 #include "ui/gfx/image/image.h"
 
@@ -61,7 +61,8 @@ class ScriptExecutor;
 
 namespace blink {
 struct DeviceEmulationParams;
-}
+// enum class PermissionType;
+}  // namespace blink
 
 namespace gin_helper {
 class Dictionary;
@@ -97,7 +98,7 @@ namespace api {
 
 using DevicePermissionMap = std::map<
     int,
-    std::map<content::PermissionType,
+    std::map<blink::PermissionType,
              std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>>;
 
 // Wrapper around the content::WebContents.
@@ -439,7 +440,7 @@ class WebContents : public ExclusiveAccessContext,
   // To be used in place of ObjectPermissionContextBase::GrantObjectPermission.
   void GrantDevicePermission(const url::Origin& origin,
                              const base::Value* device,
-                             content::PermissionType permissionType,
+                             blink::PermissionType permissionType,
                              content::RenderFrameHost* render_frame_host);
 
   // Returns the list of devices that |origin| has been granted permission to
@@ -447,7 +448,7 @@ class WebContents : public ExclusiveAccessContext,
   // ObjectPermissionContextBase::GetGrantedObjects.
   std::vector<base::Value> GetGrantedDevices(
       const url::Origin& origin,
-      content::PermissionType permissionType,
+      blink::PermissionType permissionType,
       content::RenderFrameHost* render_frame_host);
 
   // disable copy
diff --git a/shell/browser/certificate_manager_model.cc b/shell/browser/certificate_manager_model.cc
index e20503f20be4a..ea89a09b18901 100644
--- a/shell/browser/certificate_manager_model.cc
+++ b/shell/browser/certificate_manager_model.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -72,8 +71,8 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
 void CertificateManagerModel::Create(content::BrowserContext* browser_context,
                                      CreationCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTask(FROM_HERE, {BrowserThread::IO},
-                 base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
+  content::GetIOThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
                                 browser_context->GetResourceContext(),
                                 std::move(callback)));
 }
@@ -145,8 +144,8 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   bool is_user_db_available = !!cert_db->GetPublicSlot();
-  base::PostTask(
-      FROM_HERE, {BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
                      is_user_db_available, std::move(callback)));
 }
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index f1d4d25077aac..b7ac2c5043709 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -21,11 +21,11 @@
 #include "base/no_destructor.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
+#include "base/strings/escape.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -57,7 +57,6 @@
 #include "electron/shell/common/api/api.mojom.h"
 #include "extensions/browser/api/messaging/messaging_api_message_filter.h"
 #include "mojo/public/cpp/bindings/binder_map.h"
-#include "net/base/escape.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "ppapi/host/ppapi_host.h"
@@ -395,9 +394,8 @@ ElectronBrowserClient* ElectronBrowserClient::Get() {
 // static
 void ElectronBrowserClient::SetApplicationLocale(const std::string& locale) {
   if (!BrowserThread::IsThreadInitialized(BrowserThread::IO) ||
-      !base::PostTask(
-          FROM_HERE, {BrowserThread::IO},
-          base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) {
+      !content::GetIOThreadTaskRunner({})->PostTask(
+          FROM_HERE, base::BindOnce(&SetApplicationLocaleOnIOThread, locale))) {
     g_io_thread_application_locale.Get() = locale;
   }
   *g_application_locale = locale;
@@ -964,10 +962,8 @@ ElectronBrowserClient::GetSystemNetworkContext() {
 }
 
 std::unique_ptr<content::BrowserMainParts>
-ElectronBrowserClient::CreateBrowserMainParts(
-    content::MainFunctionParams params) {
-  auto browser_main_parts =
-      std::make_unique<ElectronBrowserMainParts>(std::move(params));
+ElectronBrowserClient::CreateBrowserMainParts(bool /* is_integration_test */) {
+  auto browser_main_parts = std::make_unique<ElectronBrowserMainParts>();
 
 #if BUILDFLAG(IS_MAC)
   browser_main_parts_ = browser_main_parts.get();
@@ -1038,7 +1034,7 @@ void HandleExternalProtocolInUI(
   if (!permission_helper)
     return;
 
-  GURL escaped_url(net::EscapeExternalHandlerValue(url.spec()));
+  GURL escaped_url(base::EscapeExternalHandlerValue(url.spec()));
   auto callback = base::BindOnce(&OnOpenExternal, escaped_url);
   permission_helper->RequestOpenExternalPermission(std::move(callback),
                                                    has_user_gesture, url);
@@ -1057,8 +1053,8 @@ bool ElectronBrowserClient::HandleExternalProtocol(
     const absl::optional<url::Origin>& initiating_origin,
     content::RenderFrameHost* initiator_document,
     mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) {
-  base::PostTask(
-      FROM_HERE, {BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&HandleExternalProtocolInUI, url,
                      std::move(web_contents_getter), has_user_gesture));
   return true;
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index a19b04c4a6851..b4b2ee87bee12 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -181,7 +181,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
   std::unique_ptr<content::DevToolsManagerDelegate>
   CreateDevToolsManagerDelegate() override;
   std::unique_ptr<content::BrowserMainParts> CreateBrowserMainParts(
-      content::MainFunctionParams params) override;
+      bool /* is_integration_test */) override;
   base::FilePath GetDefaultDownloadDirectory() override;
   scoped_refptr<network::SharedURLLoaderFactory>
   GetSystemSharedURLLoaderFactory() override;
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index 5d3c74ad3d054..a23f6a9c7fa09 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -14,8 +14,8 @@
 #include "base/files/file_path.h"
 #include "base/no_destructor.h"
 #include "base/path_service.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/common/chrome_paths.h"
@@ -33,7 +33,6 @@
 #include "content/public/browser/cors_origin_pattern_setter.h"
 #include "content/public/browser/shared_cors_origin_access_list.h"
 #include "content/public/browser/storage_partition.h"
-#include "net/base/escape.h"
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
 #include "services/network/public/mojom/network_context.mojom.h"
@@ -88,7 +87,7 @@ namespace {
 
 // Convert string to lower case and escape it.
 std::string MakePartitionName(const std::string& input) {
-  return net::EscapePath(base::ToLowerASCII(input));
+  return base::EscapePath(base::ToLowerASCII(input));
 }
 
 }  // namespace
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 5245db81376d3..2cbd8065807fd 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -74,11 +74,11 @@
 #include "ui/base/cursor/cursor_factory.h"
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gtk/gtk_compat.h"      // nogncheck
-#include "ui/gtk/gtk_ui_factory.h"  // nogncheck
-#include "ui/gtk/gtk_util.h"        // nogncheck
+#include "ui/gtk/gtk_compat.h"  // nogncheck
+#include "ui/gtk/gtk_util.h"    // nogncheck
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/views/linux_ui/linux_ui.h"
+#include "ui/views/linux_ui/linux_ui_factory.h"
 #endif
 
 #if BUILDFLAG(IS_WIN)
@@ -179,8 +179,7 @@ class DarkThemeObserver : public ui::NativeThemeObserver {
 // static
 ElectronBrowserMainParts* ElectronBrowserMainParts::self_ = nullptr;
 
-ElectronBrowserMainParts::ElectronBrowserMainParts(
-    const content::MainFunctionParams& params)
+ElectronBrowserMainParts::ElectronBrowserMainParts()
     : fake_browser_process_(std::make_unique<BrowserProcessImpl>()),
       browser_(std::make_unique<Browser>()),
       node_bindings_(
@@ -347,8 +346,8 @@ int ElectronBrowserMainParts::PreCreateThreads() {
 }
 
 void ElectronBrowserMainParts::PostCreateThreads() {
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::IO},
+  content::GetIOThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&tracing::TracingSamplerProfiler::CreateOnChildThread));
 }
 
@@ -366,8 +365,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
 
 void ElectronBrowserMainParts::ToolkitInitialized() {
 #if BUILDFLAG(IS_LINUX)
-  auto linux_ui = BuildGtkUi();
-  linux_ui->Initialize();
+  auto linux_ui = CreateLinuxUi();
   DCHECK(ui::LinuxInputMethodContextFactory::instance());
 
   // Try loading gtk symbols used by Electron.
@@ -417,11 +415,6 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
   // url::Add*Scheme are not threadsafe, this helps prevent data races.
   url::LockSchemeRegistries();
 
-  // The First-Party Sets feature always expects to be initialized
-  // CL: https://chromium-review.googlesource.com/c/chromium/src/+/3448551
-  content::FirstPartySetsHandler::GetInstance()->SetPublicFirstPartySets(
-      base::File());
-
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
   extensions_client_ = std::make_unique<ElectronExtensionsClient>();
   extensions::ExtensionsClient::Set(extensions_client_.get());
@@ -446,8 +439,8 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
   if (command_line->HasSwitch(switches::kRemoteDebuggingPipe)) {
     // --remote-debugging-pipe
     auto on_disconnect = base::BindOnce([]() {
-      base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                     base::BindOnce([]() { Browser::Get()->Quit(); }));
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE, base::BindOnce([]() { Browser::Get()->Quit(); }));
     });
     content::DevToolsAgentHost::StartRemoteDebuggingPipeHandler(
         std::move(on_disconnect));
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index e41097ef35826..d0f813544f8d2 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -12,7 +12,6 @@
 #include "base/timer/timer.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_main_parts.h"
-#include "content/public/common/main_function_params.h"
 #include "electron/buildflags/buildflags.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/geolocation_control.mojom.h"
@@ -67,7 +66,7 @@ class DarkThemeObserver;
 
 class ElectronBrowserMainParts : public content::BrowserMainParts {
  public:
-  explicit ElectronBrowserMainParts(const content::MainFunctionParams& params);
+  ElectronBrowserMainParts();
   ~ElectronBrowserMainParts() override;
 
   // disable copy
diff --git a/shell/browser/electron_browser_main_parts_posix.cc b/shell/browser/electron_browser_main_parts_posix.cc
index 6640dd2e3c4b3..1eb33ae28c98f 100644
--- a/shell/browser/electron_browser_main_parts_posix.cc
+++ b/shell/browser/electron_browser_main_parts_posix.cc
@@ -15,7 +15,6 @@
 
 #include "base/debug/leak_annotations.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index 7558535ca29c7..917a3a466e9cd 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -10,7 +10,6 @@
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/common/pref_names.h"
@@ -144,7 +143,8 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
     std::move(callback).Run(
         path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-        item->GetMixedContentStatus(), path, base::FilePath(), absl::nullopt,
+        item->GetMixedContentStatus(), path, base::FilePath(),
+        std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
 }
@@ -184,7 +184,8 @@ void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone(
   std::move(download_callback)
       .Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-           item->GetMixedContentStatus(), path, base::FilePath(), absl::nullopt,
+           item->GetMixedContentStatus(), path, base::FilePath(),
+           std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
            interrupt_reason);
 }
 
@@ -204,7 +205,8 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN,
-        download->GetForcedFilePath(), base::FilePath(), absl::nullopt,
+        download->GetForcedFilePath(), base::FilePath(),
+        std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
@@ -217,7 +219,8 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         save_path, download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN, save_path,
-        base::FilePath(), absl::nullopt,
+        base::FilePath(), std::string() /*mime_type*/,
+        absl::nullopt /*download_schedule*/,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index ad3ae6229fe0f..6970369b80432 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -13,7 +13,6 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/permission_controller.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -30,6 +29,7 @@
 #include "shell/common/gin_converters/frame_converter.h"
 #include "shell/common/gin_converters/value_converter.h"
 #include "shell/common/gin_helper/event_emitter_caller.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 
 namespace electron {
 
@@ -54,7 +54,7 @@ void PermissionRequestResponseCallbackWrapper(
 class ElectronPermissionManager::PendingRequest {
  public:
   PendingRequest(content::RenderFrameHost* render_frame_host,
-                 const std::vector<content::PermissionType>& permissions,
+                 const std::vector<blink::PermissionType>& permissions,
                  StatusesCallback callback)
       : render_process_id_(render_frame_host->GetProcess()->GetID()),
         render_frame_id_(render_frame_host->GetGlobalId()),
@@ -69,10 +69,10 @@ class ElectronPermissionManager::PendingRequest {
 
     if (status == blink::mojom::PermissionStatus::GRANTED) {
       const auto permission = permissions_[permission_id];
-      if (permission == content::PermissionType::MIDI_SYSEX) {
+      if (permission == blink::PermissionType::MIDI_SYSEX) {
         content::ChildProcessSecurityPolicy::GetInstance()
             ->GrantSendMidiSysExMessage(render_process_id_);
-      } else if (permission == content::PermissionType::GEOLOCATION) {
+      } else if (permission == blink::PermissionType::GEOLOCATION) {
         ElectronBrowserMainParts::Get()
             ->GetGeolocationControl()
             ->UserDidOptIntoLocationServices();
@@ -99,7 +99,7 @@ class ElectronPermissionManager::PendingRequest {
   int render_process_id_;
   content::GlobalRenderFrameHostId render_frame_id_;
   StatusesCallback callback_;
-  std::vector<content::PermissionType> permissions_;
+  std::vector<blink::PermissionType> permissions_;
   std::vector<blink::mojom::PermissionStatus> results_;
   size_t remaining_results_;
 };
@@ -133,7 +133,7 @@ void ElectronPermissionManager::SetDevicePermissionHandler(
 }
 
 void ElectronPermissionManager::RequestPermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
@@ -144,21 +144,21 @@ void ElectronPermissionManager::RequestPermission(
 }
 
 void ElectronPermissionManager::RequestPermissionWithDetails(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
     const base::DictionaryValue* details,
     StatusCallback response_callback) {
   RequestPermissionsWithDetails(
-      std::vector<content::PermissionType>(1, permission), render_frame_host,
+      std::vector<blink::PermissionType>(1, permission), render_frame_host,
       requesting_origin, user_gesture, details,
       base::BindOnce(PermissionRequestResponseCallbackWrapper,
                      std::move(response_callback)));
 }
 
 void ElectronPermissionManager::RequestPermissions(
-    const std::vector<content::PermissionType>& permissions,
+    const std::vector<blink::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
@@ -169,7 +169,7 @@ void ElectronPermissionManager::RequestPermissions(
 }
 
 void ElectronPermissionManager::RequestPermissionsWithDetails(
-    const std::vector<content::PermissionType>& permissions,
+    const std::vector<blink::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
@@ -183,11 +183,11 @@ void ElectronPermissionManager::RequestPermissionsWithDetails(
   if (request_handler_.is_null()) {
     std::vector<blink::mojom::PermissionStatus> statuses;
     for (auto permission : permissions) {
-      if (permission == content::PermissionType::MIDI_SYSEX) {
+      if (permission == blink::PermissionType::MIDI_SYSEX) {
         content::ChildProcessSecurityPolicy::GetInstance()
             ->GrantSendMidiSysExMessage(
                 render_frame_host->GetProcess()->GetID());
-      } else if (permission == content::PermissionType::GEOLOCATION) {
+      } else if (permission == blink::PermissionType::GEOLOCATION) {
         ElectronBrowserMainParts::Get()
             ->GetGeolocationControl()
             ->UserDidOptIntoLocationServices();
@@ -234,12 +234,12 @@ void ElectronPermissionManager::OnPermissionResponse(
 }
 
 void ElectronPermissionManager::ResetPermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {}
 
 blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   base::DictionaryValue details;
@@ -252,7 +252,7 @@ blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
 
 ElectronPermissionManager::SubscriptionId
 ElectronPermissionManager::SubscribePermissionStatusChange(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderProcessHost* render_process_host,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
@@ -264,7 +264,7 @@ void ElectronPermissionManager::UnsubscribePermissionStatusChange(
     SubscriptionId id) {}
 
 bool ElectronPermissionManager::CheckPermissionWithDetails(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const base::DictionaryValue* details) const {
@@ -285,10 +285,10 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
       "isMainFrame",
       render_frame_host && render_frame_host->GetParent() == nullptr);
   switch (permission) {
-    case content::PermissionType::AUDIO_CAPTURE:
+    case blink::PermissionType::AUDIO_CAPTURE:
       mutable_details.SetStringKey("mediaType", "audio");
       break;
-    case content::PermissionType::VIDEO_CAPTURE:
+    case blink::PermissionType::VIDEO_CAPTURE:
       mutable_details.SetStringKey("mediaType", "video");
       break;
     default:
@@ -299,7 +299,7 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
 }
 
 bool ElectronPermissionManager::CheckDevicePermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const url::Origin& origin,
     const base::Value* device,
     content::RenderFrameHost* render_frame_host) const {
@@ -314,7 +314,7 @@ bool ElectronPermissionManager::CheckDevicePermission(
 
       for (const auto& granted_device : granted_devices) {
         if (permission ==
-            static_cast<content::PermissionType>(
+            static_cast<blink::PermissionType>(
                 WebContentsPermissionHelper::PermissionType::HID)) {
           if (device->FindIntKey(kHidVendorIdKey) !=
                   granted_device.FindIntKey(kHidVendorIdKey) ||
@@ -332,7 +332,7 @@ bool ElectronPermissionManager::CheckDevicePermission(
               *device_serial_number == *serial_number)
             return true;
         } else if (permission ==
-                   static_cast<content::PermissionType>(
+                   static_cast<blink::PermissionType>(
                        WebContentsPermissionHelper::PermissionType::SERIAL)) {
 #if BUILDFLAG(IS_WIN)
           if (device->FindStringKey(kDeviceInstanceIdKey) ==
@@ -374,7 +374,7 @@ bool ElectronPermissionManager::CheckDevicePermission(
 }
 
 void ElectronPermissionManager::GrantDevicePermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const url::Origin& origin,
     const base::Value* device,
     content::RenderFrameHost* render_frame_host) const {
@@ -390,7 +390,7 @@ void ElectronPermissionManager::GrantDevicePermission(
 
 blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForFrame(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin) {
   base::DictionaryValue details;
@@ -402,7 +402,7 @@ ElectronPermissionManager::GetPermissionStatusForFrame(
 
 blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host) {
   return GetPermissionStatus(
       permission, render_frame_host->GetLastCommittedOrigin().GetURL(),
@@ -411,7 +411,7 @@ ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
 
 blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForWorker(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     content::RenderProcessHost* render_process_host,
     const GURL& worker_origin) {
   return GetPermissionStatus(permission, worker_origin, worker_origin);
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index 4afce85ad80cc..74e4ab7c5b34e 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -39,12 +39,12 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
   using StatusesCallback = base::OnceCallback<void(
       const std::vector<blink::mojom::PermissionStatus>&)>;
   using RequestHandler = base::RepeatingCallback<void(content::WebContents*,
-                                                      content::PermissionType,
+                                                      blink::PermissionType,
                                                       StatusCallback,
                                                       const base::Value&)>;
   using CheckHandler =
       base::RepeatingCallback<bool(content::WebContents*,
-                                   content::PermissionType,
+                                   blink::PermissionType,
                                    const GURL& requesting_origin,
                                    const base::Value&)>;
 
@@ -57,49 +57,48 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
   void SetDevicePermissionHandler(const DeviceCheckHandler& handler);
 
   // content::PermissionControllerDelegate:
-  void RequestPermission(content::PermissionType permission,
+  void RequestPermission(blink::PermissionType permission,
                          content::RenderFrameHost* render_frame_host,
                          const GURL& requesting_origin,
                          bool user_gesture,
                          StatusCallback callback) override;
-  void RequestPermissionWithDetails(content::PermissionType permission,
+  void RequestPermissionWithDetails(blink::PermissionType permission,
                                     content::RenderFrameHost* render_frame_host,
                                     const GURL& requesting_origin,
                                     bool user_gesture,
                                     const base::DictionaryValue* details,
                                     StatusCallback callback);
-  void RequestPermissions(
-      const std::vector<content::PermissionType>& permissions,
-      content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
-      bool user_gesture,
-      StatusesCallback callback) override;
+  void RequestPermissions(const std::vector<blink::PermissionType>& permissions,
+                          content::RenderFrameHost* render_frame_host,
+                          const GURL& requesting_origin,
+                          bool user_gesture,
+                          StatusesCallback callback) override;
   void RequestPermissionsWithDetails(
-      const std::vector<content::PermissionType>& permissions,
+      const std::vector<blink::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       bool user_gesture,
       const base::DictionaryValue* details,
       StatusesCallback callback);
   blink::mojom::PermissionStatus GetPermissionStatusForFrame(
-      content::PermissionType permission,
+      blink::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin) override;
   blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
-      content::PermissionType permission,
+      blink::PermissionType permission,
       content::RenderFrameHost* render_frame_host) override;
 
-  bool CheckPermissionWithDetails(content::PermissionType permission,
+  bool CheckPermissionWithDetails(blink::PermissionType permission,
                                   content::RenderFrameHost* render_frame_host,
                                   const GURL& requesting_origin,
                                   const base::DictionaryValue* details) const;
 
-  bool CheckDevicePermission(content::PermissionType permission,
+  bool CheckDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
                              const base::Value* object,
                              content::RenderFrameHost* render_frame_host) const;
 
-  void GrantDevicePermission(content::PermissionType permission,
+  void GrantDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
                              const base::Value* object,
                              content::RenderFrameHost* render_frame_host) const;
@@ -110,19 +109,19 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
                             blink::mojom::PermissionStatus status);
 
   // content::PermissionControllerDelegate:
-  void ResetPermission(content::PermissionType permission,
+  void ResetPermission(blink::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
   blink::mojom::PermissionStatus GetPermissionStatus(
-      content::PermissionType permission,
+      blink::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
   blink::mojom::PermissionStatus GetPermissionStatusForWorker(
-      content::PermissionType permission,
+      blink::PermissionType permission,
       content::RenderProcessHost* render_process_host,
       const GURL& worker_origin) override;
   SubscriptionId SubscribePermissionStatusChange(
-      content::PermissionType permission,
+      blink::PermissionType permission,
       content::RenderProcessHost* render_process_host,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
diff --git a/shell/browser/extensions/api/management/electron_management_api_delegate.cc b/shell/browser/extensions/api/management/electron_management_api_delegate.cc
index 94eadd90b28dd..0b5558857f85e 100644
--- a/shell/browser/extensions/api/management/electron_management_api_delegate.cc
+++ b/shell/browser/extensions/api/management/electron_management_api_delegate.cc
@@ -13,7 +13,6 @@
 #include "base/strings/strcat.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "chrome/common/extensions/extension_metrics.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/webui_url_constants.h"
diff --git a/shell/browser/extensions/electron_extension_message_filter.cc b/shell/browser/extensions/electron_extension_message_filter.cc
index 2da25a7627d25..e01dd2b21209f 100644
--- a/shell/browser/extensions/electron_extension_message_filter.cc
+++ b/shell/browser/extensions/electron_extension_message_filter.cc
@@ -14,7 +14,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -78,7 +77,7 @@ void ElectronExtensionMessageFilter::OnDestruct() const {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     delete this;
   } else {
-    base::DeleteSoon(FROM_HERE, {BrowserThread::UI}, this);
+    content::GetUIThreadTaskRunner({})->DeleteSoon(FROM_HERE, this);
   }
 }
 
diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc
index 2d757a3e99401..be8485e912e2d 100644
--- a/shell/browser/extensions/electron_extension_system.cc
+++ b/shell/browser/extensions/electron_extension_system.cc
@@ -13,7 +13,6 @@
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
-#include "base/task/post_task.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/browser_resources.h"
 #include "components/value_store/value_store_factory_impl.h"
@@ -204,11 +203,12 @@ AppSorting* ElectronExtensionSystem::app_sorting() {
 void ElectronExtensionSystem::RegisterExtensionWithRequestContexts(
     const Extension* extension,
     base::OnceClosure callback) {
-  base::PostTaskAndReply(FROM_HERE, {BrowserThread::IO},
-                         base::BindOnce(&InfoMap::AddExtension, info_map(),
-                                        base::RetainedRef(extension),
-                                        base::Time::Now(), false, false),
-                         std::move(callback));
+  content::GetIOThreadTaskRunner({})->PostTaskAndReply(
+      FROM_HERE,
+      base::BindOnce(&InfoMap::AddExtension, info_map(),
+                     base::RetainedRef(extension), base::Time::Now(), false,
+                     false),
+      std::move(callback));
 }
 
 void ElectronExtensionSystem::UnregisterExtensionWithRequestContexts(
diff --git a/shell/browser/extensions/electron_extensions_browser_client.cc b/shell/browser/extensions/electron_extensions_browser_client.cc
index 26007fc9069dd..30a0935db736b 100644
--- a/shell/browser/extensions/electron_extensions_browser_client.cc
+++ b/shell/browser/extensions/electron_extensions_browser_client.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
-#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/chrome_url_request_util.h"
 #include "chrome/common/chrome_paths.h"
@@ -301,8 +300,8 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
     std::unique_ptr<base::ListValue> args,
     bool dispatch_to_off_the_record_profiles) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(
-        FROM_HERE, {BrowserThread::UI},
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE,
         base::BindOnce(
             &ElectronExtensionsBrowserClient::BroadcastEventToRenderers,
             base::Unretained(this), histogram_value, event_name,
diff --git a/shell/browser/mac/in_app_purchase.mm b/shell/browser/mac/in_app_purchase.mm
index 23c8ad22a6766..10194f49a7987 100644
--- a/shell/browser/mac/in_app_purchase.mm
+++ b/shell/browser/mac/in_app_purchase.mm
@@ -9,7 +9,6 @@
 
 #include "base/bind.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -122,8 +121,8 @@ - (void)checkout:(SKProduct*)product {
  */
 - (void)runCallback:(bool)isProductValid {
   if (callback_) {
-    base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                   base::BindOnce(std::move(callback_), isProductValid));
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE, base::BindOnce(std::move(callback_), isProductValid));
   }
   // Release this delegate.
   [self release];
diff --git a/shell/browser/mac/in_app_purchase_observer.mm b/shell/browser/mac/in_app_purchase_observer.mm
index f76093063b707..abf210960a512 100644
--- a/shell/browser/mac/in_app_purchase_observer.mm
+++ b/shell/browser/mac/in_app_purchase_observer.mm
@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -75,8 +74,8 @@ - (void)runCallback:(NSArray*)transactions {
   }
 
   // Send the callback to the browser thread.
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(callback_, converted));
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(callback_, converted));
 }
 
 /**
diff --git a/shell/browser/mac/in_app_purchase_product.mm b/shell/browser/mac/in_app_purchase_product.mm
index 1bd4eb1664f9d..6165946261a35 100644
--- a/shell/browser/mac/in_app_purchase_product.mm
+++ b/shell/browser/mac/in_app_purchase_product.mm
@@ -10,7 +10,6 @@
 
 #include "base/bind.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -83,8 +82,8 @@ - (void)productsRequest:(SKProductsRequest*)request
   }
 
   // Send the callback to the browser thread.
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(std::move(callback_), converted));
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(std::move(callback_), converted));
 
   [self release];
 }
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index e370f2e47e8ef..c23cb268b66d2 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -16,7 +16,6 @@
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
 #include "components/remote_cocoa/browser/scoped_cg_window_id.h"
 #include "content/public/browser/browser_accessibility_state.h"
@@ -1000,8 +999,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   if (!is_simple_fullscreen_)
     return;
 
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(&NativeWindow::UpdateFrame, GetWeakPtr()));
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&NativeWindow::UpdateFrame, GetWeakPtr()));
 }
 
 void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
@@ -1779,8 +1778,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&NativeWindow::RedrawTrafficLights, GetWeakPtr()));
 }
 
diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc
index 7c39b2ed0b8b7..684aadc0897fc 100644
--- a/shell/browser/net/asar/asar_url_loader.cc
+++ b/shell/browser/net/asar/asar_url_loader.cc
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "base/strings/stringprintf.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "content/public/browser/file_url_loader.h"
 #include "electron/fuses.h"
diff --git a/shell/browser/notifications/win/windows_toast_notification.cc b/shell/browser/notifications/win/windows_toast_notification.cc
index d3dc051753d34..05d508bbe59c0 100644
--- a/shell/browser/notifications/win/windows_toast_notification.cc
+++ b/shell/browser/notifications/win/windows_toast_notification.cc
@@ -15,7 +15,6 @@
 #include "base/logging.h"
 #include "base/strings/string_util_win.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/notifications/notification_delegate.h"
@@ -600,8 +599,8 @@ ToastEventHandler::~ToastEventHandler() = default;
 IFACEMETHODIMP ToastEventHandler::Invoke(
     ABI::Windows::UI::Notifications::IToastNotification* sender,
     IInspectable* args) {
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&Notification::NotificationClicked, notification_));
   if (IsDebuggingNotifications())
     LOG(INFO) << "Notification clicked";
@@ -612,8 +611,8 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
 IFACEMETHODIMP ToastEventHandler::Invoke(
     ABI::Windows::UI::Notifications::IToastNotification* sender,
     ABI::Windows::UI::Notifications::IToastDismissedEventArgs* e) {
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&Notification::NotificationDismissed, notification_));
   if (IsDebuggingNotifications())
     LOG(INFO) << "Notification dismissed";
@@ -628,8 +627,8 @@ IFACEMETHODIMP ToastEventHandler::Invoke(
   e->get_ErrorCode(&error);
   std::string errorMessage =
       "Notification failed. HRESULT:" + std::to_string(error);
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(&Notification::NotificationFailed,
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&Notification::NotificationFailed,
                                 notification_, errorMessage));
   if (IsDebuggingNotifications())
     LOG(INFO) << errorMessage;
diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc
index 7edfd582b2d24..82ff89a30dbf5 100644
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -12,7 +12,6 @@
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
-#include "base/task/post_task.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "components/viz/common/features.h"
@@ -757,8 +756,8 @@ void OffScreenRenderWidgetHostView::ReleaseResize() {
   hold_resize_ = false;
   if (pending_resize_) {
     pending_resize_ = false;
-    base::PostTask(
-        FROM_HERE, {content::BrowserThread::UI},
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE,
         base::BindOnce(
             &OffScreenRenderWidgetHostView::SynchronizeVisualProperties,
             weak_ptr_factory_.GetWeakPtr()));
@@ -862,8 +861,8 @@ void OffScreenRenderWidgetHostView::SendMouseWheelEvent(
         // Scrolling outside of the popup widget so destroy it.
         // Execute asynchronously to avoid deleting the widget from inside some
         // other callback.
-        base::PostTask(
-            FROM_HERE, {content::BrowserThread::UI},
+        content::GetUIThreadTaskRunner({})->PostTask(
+            FROM_HERE,
             base::BindOnce(&OffScreenRenderWidgetHostView::CancelWidget,
                            popup_host_view_->weak_ptr_factory_.GetWeakPtr()));
       }
diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc
index 18890ee0ce7c5..d1ba8734d368b 100644
--- a/shell/browser/printing/print_preview_message_handler.cc
+++ b/shell/browser/printing/print_preview_message_handler.cc
@@ -11,7 +11,6 @@
 #include "base/memory/read_only_shared_memory_region.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
@@ -42,8 +41,8 @@ void StopWorker(int document_cookie) {
   std::unique_ptr<printing::PrinterQuery> printer_query =
       queue->PopPrinterQuery(document_cookie);
   if (printer_query.get()) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(&printing::PrinterQuery::StopWorker,
+    content::GetIOThreadTaskRunner({})->PostTask(
+        FROM_HERE, base::BindOnce(&printing::PrinterQuery::StopWorker,
                                   std::move(printer_query)));
   }
 }
diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc
index c2b6df45041d8..42b01a77f3d1b 100644
--- a/shell/browser/serial/electron_serial_delegate.cc
+++ b/shell/browser/serial/electron_serial_delegate.cc
@@ -81,6 +81,19 @@ void ElectronSerialDelegate::RemoveObserver(content::RenderFrameHost* frame,
   }
 }
 
+void ElectronSerialDelegate::RevokePortPermissionWebInitiated(
+    content::RenderFrameHost* frame,
+    const base::UnguessableToken& token) {
+  // TODO(nornagon/jkleinsc): pass this on to the chooser context
+}
+
+const device::mojom::SerialPortInfo* ElectronSerialDelegate::GetPortInfo(
+    content::RenderFrameHost* frame,
+    const base::UnguessableToken& token) {
+  // TODO(nornagon/jkleinsc): pass this on to the chooser context
+  return nullptr;
+}
+
 SerialChooserController* ElectronSerialDelegate::ControllerForFrame(
     content::RenderFrameHost* render_frame_host) {
   auto mapping = controller_map_.find(render_frame_host);
diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h
index ef9c4af749ff4..1153bcd8ad297 100644
--- a/shell/browser/serial/electron_serial_delegate.h
+++ b/shell/browser/serial/electron_serial_delegate.h
@@ -39,6 +39,12 @@ class ElectronSerialDelegate : public content::SerialDelegate {
                    Observer* observer) override;
   void RemoveObserver(content::RenderFrameHost* frame,
                       Observer* observer) override;
+  void RevokePortPermissionWebInitiated(
+      content::RenderFrameHost* frame,
+      const base::UnguessableToken& token) override;
+  const device::mojom::SerialPortInfo* GetPortInfo(
+      content::RenderFrameHost* frame,
+      const base::UnguessableToken& token) override;
 
   void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);
 
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
index 04156f3bee584..c4001b529946f 100644
--- a/shell/browser/serial/serial_chooser_context.cc
+++ b/shell/browser/serial/serial_chooser_context.cc
@@ -90,6 +90,11 @@ SerialChooserContext::SerialChooserContext() = default;
 
 SerialChooserContext::~SerialChooserContext() = default;
 
+void SerialChooserContext::OnPermissionRevoked(const url::Origin& origin) {
+  for (auto& observer : port_observer_list_)
+    observer.OnPermissionRevoked(origin);
+}
+
 void SerialChooserContext::GrantPortPermission(
     const url::Origin& origin,
     const device::mojom::SerialPortInfo& port,
@@ -116,6 +121,16 @@ bool SerialChooserContext::HasPortPermission(
                                                       render_frame_host);
 }
 
+void SerialChooserContext::RevokePortPermissionWebInitiated(
+    const url::Origin& origin,
+    const base::UnguessableToken& token) {
+  auto it = port_info_.find(token);
+  if (it == port_info_.end())
+    return;
+
+  return OnPermissionRevoked(origin);
+}
+
 // static
 bool SerialChooserContext::CanStorePersistentEntry(
     const device::mojom::SerialPortInfo& port) {
@@ -150,6 +165,13 @@ bool SerialChooserContext::CanStorePersistentEntry(
 #endif  // BUILDFLAG(IS_WIN)
 }
 
+const device::mojom::SerialPortInfo* SerialChooserContext::GetPortInfo(
+    const base::UnguessableToken& token) {
+  DCHECK(is_initialized_);
+  auto it = port_info_.find(token);
+  return it == port_info_.end() ? nullptr : it->second.get();
+}
+
 device::mojom::SerialPortManager* SerialChooserContext::GetPortManager() {
   EnsurePortManagerConnection();
   return port_manager_.get();
diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h
index 657ee7b10016c..2296668874115 100644
--- a/shell/browser/serial/serial_chooser_context.h
+++ b/shell/browser/serial/serial_chooser_context.h
@@ -55,6 +55,9 @@ class SerialChooserContext : public KeyedService,
   SerialChooserContext(const SerialChooserContext&) = delete;
   SerialChooserContext& operator=(const SerialChooserContext&) = delete;
 
+  // ObjectPermissionContextBase::PermissionObserver:
+  void OnPermissionRevoked(const url::Origin& origin);
+
   // Serial-specific interface for granting and checking permissions.
   void GrantPortPermission(const url::Origin& origin,
                            const device::mojom::SerialPortInfo& port,
@@ -72,15 +75,30 @@ class SerialChooserContext : public KeyedService,
 
   base::WeakPtr<SerialChooserContext> AsWeakPtr();
 
+  bool is_initialized_ = false;
+
+  // Map from port token to port info.
+  std::map<base::UnguessableToken, device::mojom::SerialPortInfoPtr> port_info_;
+
   // SerialPortManagerClient implementation.
   void OnPortAdded(device::mojom::SerialPortInfoPtr port) override;
   void OnPortRemoved(device::mojom::SerialPortInfoPtr port) override;
+  void RevokePortPermissionWebInitiated(const url::Origin& origin,
+                                        const base::UnguessableToken& token);
+  // Only call this if you're sure |port_info_| has been initialized
+  // before-hand. The returned raw pointer is owned by |port_info_| and will be
+  // destroyed when the port is removed.
+  const device::mojom::SerialPortInfo* GetPortInfo(
+      const base::UnguessableToken& token);
 
  private:
   void EnsurePortManagerConnection();
   void SetUpPortManagerConnection(
       mojo::PendingRemote<device::mojom::SerialPortManager> manager);
   void OnPortManagerConnectionError();
+  void RevokeObjectPermissionInternal(const url::Origin& origin,
+                                      const base::Value& object,
+                                      bool revoked_by_website);
 
   mojo::Remote<device::mojom::SerialPortManager> port_manager_;
   mojo::Receiver<device::mojom::SerialPortManagerClient> client_receiver_{this};
diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc
index 695d1f3161c66..5adfc5e63c583 100644
--- a/shell/browser/serial/serial_chooser_controller.cc
+++ b/shell/browser/serial/serial_chooser_controller.cc
@@ -116,6 +116,10 @@ void SerialChooserController::OnPortRemoved(
   }
 }
 
+void SerialChooserController::OnPortManagerConnectionError() {
+  // TODO(nornagon/jkleinsc): report event
+}
+
 void SerialChooserController::OnDeviceChosen(const std::string& port_id) {
   if (port_id.empty()) {
     RunCallback(/*port=*/nullptr);
diff --git a/shell/browser/serial/serial_chooser_controller.h b/shell/browser/serial/serial_chooser_controller.h
index 368cf18652a99..5635ea8bed743 100644
--- a/shell/browser/serial/serial_chooser_controller.h
+++ b/shell/browser/serial/serial_chooser_controller.h
@@ -46,7 +46,8 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
   // SerialChooserContext::PortObserver:
   void OnPortAdded(const device::mojom::SerialPortInfo& port) override;
   void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
-  void OnPortManagerConnectionError() override {}
+  void OnPortManagerConnectionError() override;
+  void OnPermissionRevoked(const url::Origin& origin) override {}
 
  private:
   api::Session* GetSession();
diff --git a/shell/browser/ui/cocoa/electron_bundle_mover.mm b/shell/browser/ui/cocoa/electron_bundle_mover.mm
index b7e61f97059dc..881b49c9fa467 100644
--- a/shell/browser/ui/cocoa/electron_bundle_mover.mm
+++ b/shell/browser/ui/cocoa/electron_bundle_mover.mm
@@ -291,9 +291,10 @@
 
   AuthorizationItem myItems = {kAuthorizationRightExecute, 0, NULL, 0};
   AuthorizationRights myRights = {1, &myItems};
-  AuthorizationFlags myFlags = (AuthorizationFlags)(
-      kAuthorizationFlagInteractionAllowed | kAuthorizationFlagExtendRights |
-      kAuthorizationFlagPreAuthorize);
+  AuthorizationFlags myFlags =
+      (AuthorizationFlags)(kAuthorizationFlagInteractionAllowed |
+                           kAuthorizationFlagExtendRights |
+                           kAuthorizationFlagPreAuthorize);
 
   err = AuthorizationCopyRights(myAuthorizationRef, &myRights, NULL, myFlags,
                                 NULL);
diff --git a/shell/browser/ui/cocoa/electron_menu_controller.mm b/shell/browser/ui/cocoa/electron_menu_controller.mm
index d2ffeb77637a3..8725c8001162c 100644
--- a/shell/browser/ui/cocoa/electron_menu_controller.mm
+++ b/shell/browser/ui/cocoa/electron_menu_controller.mm
@@ -12,7 +12,6 @@
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/mac/url_conversions.h"
@@ -227,7 +226,8 @@ - (void)cancel {
     if (model_)
       model_->MenuWillClose();
     if (!closeCallback.is_null()) {
-      base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(closeCallback));
+      content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE,
+                                                   std::move(closeCallback));
     }
   }
 }
@@ -536,7 +536,8 @@ - (void)menuDidClose:(NSMenu*)menu {
     // Post async task so that itemSelected runs before the close callback
     // deletes the controller from the map which deallocates it
     if (!closeCallback.is_null()) {
-      base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(closeCallback));
+      content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE,
+                                                   std::move(closeCallback));
     }
   }
 }
diff --git a/shell/browser/ui/devtools_manager_delegate.cc b/shell/browser/ui/devtools_manager_delegate.cc
index a9aac3cace877..2945d50cd5727 100644
--- a/shell/browser/ui/devtools_manager_delegate.cc
+++ b/shell/browser/ui/devtools_manager_delegate.cc
@@ -117,8 +117,8 @@ void DevToolsManagerDelegate::HandleCommand(
     // Since we only have one method and it is supposed to close Electron,
     // we don't need to add this complexity. Should we decide to support
     // methods like Browser.setWindowBounds, we'll need to do it though.
-    base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                   base::BindOnce([]() { Browser::Get()->Quit(); }));
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE, base::BindOnce([]() { Browser::Get()->Quit(); }));
     return;
   }
   std::move(callback).Run(message);
diff --git a/shell/browser/ui/file_dialog_mac.mm b/shell/browser/ui/file_dialog_mac.mm
index 94c84e9672d00..00c88c9bfe84a 100644
--- a/shell/browser/ui/file_dialog_mac.mm
+++ b/shell/browser/ui/file_dialog_mac.mm
@@ -16,7 +16,6 @@
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -301,8 +300,8 @@ void ResolvePromiseInNextTick(gin_helper::Promise<v8::Local<v8::Value>> promise,
   // users will run in the microtask, we have to delay the resolution until
   // next tick, otherwise crash like this may happen:
   // https://github.com/electron/electron/issues/26884
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(
           [](gin_helper::Promise<v8::Local<v8::Value>> promise,
              v8::Global<v8::Value> global) {
diff --git a/shell/browser/ui/gtk/app_indicator_icon.cc b/shell/browser/ui/gtk/app_indicator_icon.cc
index a6ccb75cb79c4..4d45bbda91b79 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.cc
+++ b/shell/browser/ui/gtk/app_indicator_icon.cc
@@ -20,7 +20,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/ui/gtk/app_indicator_icon_menu.h"
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index f249de999c7fd..2c2594ef3ff83 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -19,7 +19,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "base/values.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
diff --git a/shell/browser/ui/message_box_mac.mm b/shell/browser/ui/message_box_mac.mm
index faad840b68c3c..7af541819db5d 100644
--- a/shell/browser/ui/message_box_mac.mm
+++ b/shell/browser/ui/message_box_mac.mm
@@ -17,7 +17,6 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/no_destructor.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/native_window.h"
@@ -178,8 +177,8 @@ void ShowMessageBox(const MessageBoxSettings& settings,
       // users will run in the callback, we have to delay running the callback
       // until next tick, otherwise crash like this may happen:
       // https://github.com/electron/electron/issues/26884
-      base::PostTask(
-          FROM_HERE, {content::BrowserThread::UI},
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE,
           base::BindOnce(std::move(callback_), response, suppressed));
     };
     [alert beginSheetModalForWindow:window completionHandler:handler];
diff --git a/shell/browser/ui/message_box_win.cc b/shell/browser/ui/message_box_win.cc
index ab494bd6d59ab..02499bf9c9c23 100644
--- a/shell/browser/ui/message_box_win.cc
+++ b/shell/browser/ui/message_box_win.cc
@@ -16,7 +16,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
-#include "base/task/post_task.h"
 #include "base/win/scoped_gdi_object.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_window_views.h"
diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm
index 789a993adb9f5..25776c7ca6aba 100644
--- a/shell/browser/ui/tray_icon_cocoa.mm
+++ b/shell/browser/ui/tray_icon_cocoa.mm
@@ -10,7 +10,6 @@
 #include "base/message_loop/message_pump_mac.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task/current_thread.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/ui/cocoa/NSString+ANSI.h"
@@ -365,8 +364,8 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
 
 void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos,
                                      ElectronMenuModel* menu_model) {
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&TrayIconCocoa::PopUpOnUI, weak_factory_.GetWeakPtr(),
                      base::Unretained(menu_model)));
 }
diff --git a/shell/browser/ui/views/electron_views_delegate_win.cc b/shell/browser/ui/views/electron_views_delegate_win.cc
index a25fb6f29abf7..e9453422ca8f4 100644
--- a/shell/browser/ui/views/electron_views_delegate_win.cc
+++ b/shell/browser/ui/views/electron_views_delegate_win.cc
@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 
 namespace {
diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index 380ce55efdf42..8e72000d131b1 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -38,8 +38,7 @@ MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
   RefreshColorCache(theme);
   UpdateViewColors();
 #if BUILDFLAG(IS_WIN)
-  SetBackground(
-      views::CreateThemedSolidBackground(this, ui::kColorMenuBackground));
+  SetBackground(views::CreateThemedSolidBackground(ui::kColorMenuBackground));
   background_color_ = GetBackground()->get_color();
 #endif
   SetFocusBehavior(FocusBehavior::ALWAYS);
diff --git a/shell/browser/ui/views/menu_delegate.cc b/shell/browser/ui/views/menu_delegate.cc
index 3a088af6348c4..c6effd2707aaf 100644
--- a/shell/browser/ui/views/menu_delegate.cc
+++ b/shell/browser/ui/views/menu_delegate.cc
@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/browser/ui/views/menu_bar.h"
@@ -134,8 +133,8 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
     button_to_open_ = button;
     // Switching menu asynchronously to avoid crash.
     if (!switch_in_progress) {
-      base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                     base::BindOnce(&views::MenuRunner::Cancel,
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE, base::BindOnce(&views::MenuRunner::Cancel,
                                     base::Unretained(menu_runner_.get())));
     }
   }
diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc
index 92b3d1e4a13bc..15e0b2311e433 100644
--- a/shell/browser/ui/webui/accessibility_ui.cc
+++ b/shell/browser/ui/webui/accessibility_ui.cc
@@ -13,6 +13,7 @@
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
+#include "base/strings/escape.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -37,7 +38,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui_data_source.h"
-#include "net/base/escape.h"
 #include "shell/browser/native_window.h"
 #include "shell/browser/window_list.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -95,7 +95,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
   target_data->SetInteger(kProcessIdField, process_id);
   target_data->SetInteger(kRoutingIdField, routing_id);
   target_data->SetString(kUrlField, url.spec());
-  target_data->SetString(kNameField, net::EscapeForHTML(name));
+  target_data->SetString(kNameField, base::EscapeForHTML(name));
   target_data->SetInteger(kPidField, base::GetProcId(handle));
   target_data->SetString(kFaviconUrlField, favicon_url.spec());
   target_data->SetInteger(kAccessibilityModeField, accessibility_mode.mode());
diff --git a/shell/browser/ui/win/dialog_thread.h b/shell/browser/ui/win/dialog_thread.h
index 80172d272b4a4..8984d998f3f8b 100644
--- a/shell/browser/ui/win/dialog_thread.h
+++ b/shell/browser/ui/win/dialog_thread.h
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/memory/scoped_refptr.h"
-#include "base/task/post_task.h"
+#include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace dialog_thread {
@@ -33,8 +33,8 @@ void Run(base::OnceCallback<R()> execute, base::OnceCallback<void(R)> done) {
           [](TaskRunner task_runner, base::OnceCallback<R()> execute,
              base::OnceCallback<void(R)> done) {
             R r = std::move(execute).Run();
-            base::PostTask(
-                FROM_HERE, {content::BrowserThread::UI},
+            content::GetUIThreadTaskRunner({})->PostTask(
+                FROM_HERE,
                 base::BindOnce(
                     [](TaskRunner task_runner, base::OnceCallback<void(R)> done,
                        R r) {
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 2fd8cb0a6c699..55e28d2ed0381 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -61,7 +61,7 @@ WebContentsPermissionHelper::WebContentsPermissionHelper(
 WebContentsPermissionHelper::~WebContentsPermissionHelper() = default;
 
 void WebContentsPermissionHelper::RequestPermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
     const base::DictionaryValue* details) {
@@ -75,7 +75,7 @@ void WebContentsPermissionHelper::RequestPermission(
 }
 
 bool WebContentsPermissionHelper::CheckPermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const base::DictionaryValue* details) const {
   auto* rfh = web_contents_->GetMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
@@ -86,7 +86,7 @@ bool WebContentsPermissionHelper::CheckPermission(
 }
 
 bool WebContentsPermissionHelper::CheckDevicePermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const url::Origin& origin,
     const base::Value* device,
     content::RenderFrameHost* render_frame_host) const {
@@ -97,7 +97,7 @@ bool WebContentsPermissionHelper::CheckDevicePermission(
 }
 
 void WebContentsPermissionHelper::GrantDevicePermission(
-    content::PermissionType permission,
+    blink::PermissionType permission,
     const url::Origin& origin,
     const base::Value* device,
     content::RenderFrameHost* render_frame_host) const {
@@ -110,7 +110,7 @@ void WebContentsPermissionHelper::GrantDevicePermission(
 void WebContentsPermissionHelper::RequestFullscreenPermission(
     base::OnceCallback<void(bool)> callback) {
   RequestPermission(
-      static_cast<content::PermissionType>(PermissionType::FULLSCREEN),
+      static_cast<blink::PermissionType>(PermissionType::FULLSCREEN),
       std::move(callback));
 }
 
@@ -135,14 +135,13 @@ void WebContentsPermissionHelper::RequestMediaAccessPermission(
 
   // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
   // are presented as same type in content_converter.h.
-  RequestPermission(content::PermissionType::AUDIO_CAPTURE, std::move(callback),
+  RequestPermission(blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
                     false, &details);
 }
 
 void WebContentsPermissionHelper::RequestWebNotificationPermission(
     base::OnceCallback<void(bool)> callback) {
-  RequestPermission(content::PermissionType::NOTIFICATIONS,
-                    std::move(callback));
+  RequestPermission(blink::PermissionType::NOTIFICATIONS, std::move(callback));
 }
 
 void WebContentsPermissionHelper::RequestPointerLockPermission(
@@ -151,7 +150,7 @@ void WebContentsPermissionHelper::RequestPointerLockPermission(
     base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
         callback) {
   RequestPermission(
-      static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
+      static_cast<blink::PermissionType>(PermissionType::POINTER_LOCK),
       base::BindOnce(std::move(callback), web_contents_, user_gesture,
                      last_unlocked_by_target),
       user_gesture);
@@ -164,7 +163,7 @@ void WebContentsPermissionHelper::RequestOpenExternalPermission(
   base::DictionaryValue details;
   details.SetString("externalURL", url.spec());
   RequestPermission(
-      static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
+      static_cast<blink::PermissionType>(PermissionType::OPEN_EXTERNAL),
       std::move(callback), user_gesture, &details);
 }
 
@@ -176,7 +175,7 @@ bool WebContentsPermissionHelper::CheckMediaAccessPermission(
   details.SetString("mediaType", MediaStreamTypeToString(type));
   // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
   // are presented as same type in content_converter.h.
-  return CheckPermission(content::PermissionType::AUDIO_CAPTURE, &details);
+  return CheckPermission(blink::PermissionType::AUDIO_CAPTURE, &details);
 }
 
 bool WebContentsPermissionHelper::CheckSerialAccessPermission(
@@ -184,7 +183,7 @@ bool WebContentsPermissionHelper::CheckSerialAccessPermission(
   base::DictionaryValue details;
   details.SetString("securityOrigin", embedding_origin.GetURL().spec());
   return CheckPermission(
-      static_cast<content::PermissionType>(PermissionType::SERIAL), &details);
+      static_cast<blink::PermissionType>(PermissionType::SERIAL), &details);
 }
 
 bool WebContentsPermissionHelper::CheckSerialPortPermission(
@@ -192,7 +191,7 @@ bool WebContentsPermissionHelper::CheckSerialPortPermission(
     base::Value device,
     content::RenderFrameHost* render_frame_host) const {
   return CheckDevicePermission(
-      static_cast<content::PermissionType>(PermissionType::SERIAL), origin,
+      static_cast<blink::PermissionType>(PermissionType::SERIAL), origin,
       &device, render_frame_host);
 }
 
@@ -201,7 +200,7 @@ void WebContentsPermissionHelper::GrantSerialPortPermission(
     base::Value device,
     content::RenderFrameHost* render_frame_host) const {
   return GrantDevicePermission(
-      static_cast<content::PermissionType>(PermissionType::SERIAL), origin,
+      static_cast<blink::PermissionType>(PermissionType::SERIAL), origin,
       &device, render_frame_host);
 }
 
@@ -210,7 +209,7 @@ bool WebContentsPermissionHelper::CheckHIDAccessPermission(
   base::DictionaryValue details;
   details.SetString("securityOrigin", embedding_origin.GetURL().spec());
   return CheckPermission(
-      static_cast<content::PermissionType>(PermissionType::HID), &details);
+      static_cast<blink::PermissionType>(PermissionType::HID), &details);
 }
 
 bool WebContentsPermissionHelper::CheckHIDDevicePermission(
@@ -218,8 +217,8 @@ bool WebContentsPermissionHelper::CheckHIDDevicePermission(
     base::Value device,
     content::RenderFrameHost* render_frame_host) const {
   return CheckDevicePermission(
-      static_cast<content::PermissionType>(PermissionType::HID), origin,
-      &device, render_frame_host);
+      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
+      render_frame_host);
 }
 
 void WebContentsPermissionHelper::GrantHIDDevicePermission(
@@ -227,8 +226,8 @@ void WebContentsPermissionHelper::GrantHIDDevicePermission(
     base::Value device,
     content::RenderFrameHost* render_frame_host) const {
   return GrantDevicePermission(
-      static_cast<content::PermissionType>(PermissionType::HID), origin,
-      &device, render_frame_host);
+      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
+      render_frame_host);
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index 639dcd8a8829a..a34dd74a4412e 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -7,9 +7,9 @@
 
 #include "base/values.h"
 #include "content/public/browser/media_stream_request.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 
 namespace electron {
 
@@ -25,7 +25,7 @@ class WebContentsPermissionHelper
       delete;
 
   enum class PermissionType {
-    POINTER_LOCK = static_cast<int>(content::PermissionType::NUM) + 1,
+    POINTER_LOCK = static_cast<int>(blink::PermissionType::NUM) + 1,
     FULLSCREEN,
     OPEN_EXTERNAL,
     SERIAL,
@@ -73,20 +73,20 @@ class WebContentsPermissionHelper
   explicit WebContentsPermissionHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsPermissionHelper>;
 
-  void RequestPermission(content::PermissionType permission,
+  void RequestPermission(blink::PermissionType permission,
                          base::OnceCallback<void(bool)> callback,
                          bool user_gesture = false,
                          const base::DictionaryValue* details = nullptr);
 
-  bool CheckPermission(content::PermissionType permission,
+  bool CheckPermission(blink::PermissionType permission,
                        const base::DictionaryValue* details) const;
 
-  bool CheckDevicePermission(content::PermissionType permission,
+  bool CheckDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
                              const base::Value* device,
                              content::RenderFrameHost* render_frame_host) const;
 
-  void GrantDevicePermission(content::PermissionType permission,
+  void GrantDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
                              const base::Value* device,
                              content::RenderFrameHost* render_frame_host) const;
diff --git a/shell/browser/web_contents_zoom_controller.cc b/shell/browser/web_contents_zoom_controller.cc
index 0cf515f05729a..fafc0c450aa94 100644
--- a/shell/browser/web_contents_zoom_controller.cc
+++ b/shell/browser/web_contents_zoom_controller.cc
@@ -46,7 +46,7 @@ void WebContentsZoomController::SetEmbedderZoomController(
 }
 
 void WebContentsZoomController::SetZoomLevel(double level) {
-  if (!web_contents()->GetRenderViewHost()->IsRenderViewLive() ||
+  if (!web_contents()->GetMainFrame()->IsRenderFrameLive() ||
       blink::PageZoomValuesEqual(GetZoomLevel(), level) ||
       zoom_mode_ == ZoomMode::kDisabled)
     return;
diff --git a/shell/common/asar/archive.cc b/shell/common/asar/archive.cc
index 709950fd65841..58b89d537549d 100644
--- a/shell/common/asar/archive.cc
+++ b/shell/common/asar/archive.cc
@@ -15,7 +15,6 @@
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "electron/fuses.h"
diff --git a/shell/common/gin_converters/content_converter.cc b/shell/common/gin_converters/content_converter.cc
index 362954d8e1171..f2456f4eda450 100644
--- a/shell/common/gin_converters/content_converter.cc
+++ b/shell/common/gin_converters/content_converter.cc
@@ -134,67 +134,67 @@ bool Converter<blink::mojom::PermissionStatus>::FromV8(
 }
 
 // static
-v8::Local<v8::Value> Converter<content::PermissionType>::ToV8(
+v8::Local<v8::Value> Converter<blink::PermissionType>::ToV8(
     v8::Isolate* isolate,
-    const content::PermissionType& val) {
+    const blink::PermissionType& val) {
   using PermissionType = electron::WebContentsPermissionHelper::PermissionType;
   // Based on mappings from content/browser/devtools/protocol/browser_handler.cc
   // Not all permissions are currently used by Electron but this will future
   // proof these conversions.
   switch (val) {
-    case content::PermissionType::ACCESSIBILITY_EVENTS:
+    case blink::PermissionType::ACCESSIBILITY_EVENTS:
       return StringToV8(isolate, "accessibility-events");
-    case content::PermissionType::AR:
+    case blink::PermissionType::AR:
       return StringToV8(isolate, "ar");
-    case content::PermissionType::BACKGROUND_FETCH:
+    case blink::PermissionType::BACKGROUND_FETCH:
       return StringToV8(isolate, "background-fetch");
-    case content::PermissionType::BACKGROUND_SYNC:
+    case blink::PermissionType::BACKGROUND_SYNC:
       return StringToV8(isolate, "background-sync");
-    case content::PermissionType::CLIPBOARD_READ_WRITE:
+    case blink::PermissionType::CLIPBOARD_READ_WRITE:
       return StringToV8(isolate, "clipboard-read");
-    case content::PermissionType::CLIPBOARD_SANITIZED_WRITE:
+    case blink::PermissionType::CLIPBOARD_SANITIZED_WRITE:
       return StringToV8(isolate, "clipboard-sanitized-write");
-    case content::PermissionType::LOCAL_FONTS:
+    case blink::PermissionType::LOCAL_FONTS:
       return StringToV8(isolate, "local-fonts");
-    case content::PermissionType::IDLE_DETECTION:
+    case blink::PermissionType::IDLE_DETECTION:
       return StringToV8(isolate, "idle-detection");
-    case content::PermissionType::MIDI_SYSEX:
+    case blink::PermissionType::MIDI_SYSEX:
       return StringToV8(isolate, "midiSysex");
-    case content::PermissionType::NFC:
+    case blink::PermissionType::NFC:
       return StringToV8(isolate, "nfc");
-    case content::PermissionType::NOTIFICATIONS:
+    case blink::PermissionType::NOTIFICATIONS:
       return StringToV8(isolate, "notifications");
-    case content::PermissionType::PAYMENT_HANDLER:
+    case blink::PermissionType::PAYMENT_HANDLER:
       return StringToV8(isolate, "payment-handler");
-    case content::PermissionType::PERIODIC_BACKGROUND_SYNC:
+    case blink::PermissionType::PERIODIC_BACKGROUND_SYNC:
       return StringToV8(isolate, "periodic-background-sync");
-    case content::PermissionType::DURABLE_STORAGE:
+    case blink::PermissionType::DURABLE_STORAGE:
       return StringToV8(isolate, "persistent-storage");
-    case content::PermissionType::GEOLOCATION:
+    case blink::PermissionType::GEOLOCATION:
       return StringToV8(isolate, "geolocation");
-    case content::PermissionType::CAMERA_PAN_TILT_ZOOM:
-    case content::PermissionType::AUDIO_CAPTURE:
-    case content::PermissionType::VIDEO_CAPTURE:
+    case blink::PermissionType::CAMERA_PAN_TILT_ZOOM:
+    case blink::PermissionType::AUDIO_CAPTURE:
+    case blink::PermissionType::VIDEO_CAPTURE:
       return StringToV8(isolate, "media");
-    case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
+    case blink::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return StringToV8(isolate, "mediaKeySystem");
-    case content::PermissionType::MIDI:
+    case blink::PermissionType::MIDI:
       return StringToV8(isolate, "midi");
-    case content::PermissionType::WAKE_LOCK_SCREEN:
+    case blink::PermissionType::WAKE_LOCK_SCREEN:
       return StringToV8(isolate, "screen-wake-lock");
-    case content::PermissionType::SENSORS:
+    case blink::PermissionType::SENSORS:
       return StringToV8(isolate, "sensors");
-    case content::PermissionType::STORAGE_ACCESS_GRANT:
+    case blink::PermissionType::STORAGE_ACCESS_GRANT:
       return StringToV8(isolate, "storage-access");
-    case content::PermissionType::VR:
+    case blink::PermissionType::VR:
       return StringToV8(isolate, "vr");
-    case content::PermissionType::WAKE_LOCK_SYSTEM:
+    case blink::PermissionType::WAKE_LOCK_SYSTEM:
       return StringToV8(isolate, "system-wake-lock");
-    case content::PermissionType::WINDOW_PLACEMENT:
+    case blink::PermissionType::WINDOW_PLACEMENT:
       return StringToV8(isolate, "window-placement");
-    case content::PermissionType::DISPLAY_CAPTURE:
+    case blink::PermissionType::DISPLAY_CAPTURE:
       return StringToV8(isolate, "display-capture");
-    case content::PermissionType::NUM:
+    case blink::PermissionType::NUM:
       break;
   }
 
diff --git a/shell/common/gin_converters/content_converter.h b/shell/common/gin_converters/content_converter.h
index e157b9f4a05f4..5482813214629 100644
--- a/shell/common/gin_converters/content_converter.h
+++ b/shell/common/gin_converters/content_converter.h
@@ -7,10 +7,10 @@
 
 #include <utility>
 
-#include "content/public/browser/permission_type.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/stop_find_action.h"
 #include "gin/converter.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 #include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
 #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
 
@@ -47,9 +47,9 @@ struct Converter<blink::mojom::PermissionStatus> {
 };
 
 template <>
-struct Converter<content::PermissionType> {
+struct Converter<blink::PermissionType> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const content::PermissionType& val);
+                                   const blink::PermissionType& val);
 };
 
 template <>
diff --git a/shell/common/gin_helper/callback.cc b/shell/common/gin_helper/callback.cc
index 569fc5d570bf7..4c68b5e14f4fc 100644
--- a/shell/common/gin_helper/callback.cc
+++ b/shell/common/gin_helper/callback.cc
@@ -15,7 +15,7 @@ namespace {
 struct TranslaterHolder {
   explicit TranslaterHolder(v8::Isolate* isolate)
       : handle(isolate, v8::External::New(isolate, this)) {
-    handle.SetWeak(this, &GC, v8::WeakCallbackType::kFinalizer);
+    handle.SetWeak(this, &GC, v8::WeakCallbackType::kParameter);
   }
   ~TranslaterHolder() {
     if (!handle.IsEmpty()) {
diff --git a/shell/common/gin_helper/locker.cc b/shell/common/gin_helper/locker.cc
index 0c7be54cd4ea8..dbbaf7879fc46 100644
--- a/shell/common/gin_helper/locker.cc
+++ b/shell/common/gin_helper/locker.cc
@@ -13,4 +13,10 @@ Locker::Locker(v8::Isolate* isolate) {
 
 Locker::~Locker() = default;
 
+void Locker::SetIsBrowserProcess(bool is_browser_process) {
+  g_is_browser_process = is_browser_process;
+}
+
+bool Locker::g_is_browser_process = false;
+
 }  // namespace gin_helper
diff --git a/shell/common/gin_helper/locker.h b/shell/common/gin_helper/locker.h
index 09eee5aa7ff60..9fb11ad4b358d 100644
--- a/shell/common/gin_helper/locker.h
+++ b/shell/common/gin_helper/locker.h
@@ -23,13 +23,17 @@ class Locker {
 
   // Returns whether current process is browser process, currently we detect it
   // by checking whether current has used V8 Lock, but it might be a bad idea.
-  static inline bool IsBrowserProcess() { return v8::Locker::WasEverUsed(); }
+  static inline bool IsBrowserProcess() { return g_is_browser_process; }
+
+  static void SetIsBrowserProcess(bool is_browser_process);
 
  private:
   void* operator new(size_t size);
   void operator delete(void*, size_t);
 
   std::unique_ptr<v8::Locker> locker_;
+
+  static bool g_is_browser_process;
 };
 
 }  // namespace gin_helper
diff --git a/shell/common/gin_helper/promise.cc b/shell/common/gin_helper/promise.cc
index 67c56cc2cf578..bc34dfa6310b9 100644
--- a/shell/common/gin_helper/promise.cc
+++ b/shell/common/gin_helper/promise.cc
@@ -65,8 +65,8 @@ v8::Local<v8::Promise::Resolver> PromiseBase::GetInner() const {
 void Promise<void>::ResolvePromise(Promise<void> promise) {
   if (gin_helper::Locker::IsBrowserProcess() &&
       !content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
-    base::PostTask(
-        FROM_HERE, {content::BrowserThread::UI},
+    content::GetUIThreadTaskRunner({})->PostTask(
+        FROM_HERE,
         base::BindOnce([](Promise<void> promise) { promise.Resolve(); },
                        std::move(promise)));
   } else {
diff --git a/shell/common/gin_helper/promise.h b/shell/common/gin_helper/promise.h
index 961ce961a65e3..c720b588d7718 100644
--- a/shell/common/gin_helper/promise.h
+++ b/shell/common/gin_helper/promise.h
@@ -11,7 +11,6 @@
 #include <utility>
 
 #include "base/strings/string_piece.h"
-#include "base/task/post_task.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "shell/common/gin_converters/std_converter.h"
@@ -48,8 +47,8 @@ class PromiseBase {
   static void RejectPromise(PromiseBase&& promise, base::StringPiece errmsg) {
     if (gin_helper::Locker::IsBrowserProcess() &&
         !content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
-      base::PostTask(
-          FROM_HERE, {content::BrowserThread::UI},
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE,
           base::BindOnce(
               // Note that this callback can not take StringPiece,
               // as StringPiece only references string internally and
@@ -91,8 +90,8 @@ class Promise : public PromiseBase {
   static void ResolvePromise(Promise<RT> promise, RT result) {
     if (gin_helper::Locker::IsBrowserProcess() &&
         !content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
-      base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                     base::BindOnce([](Promise<RT> promise,
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE, base::BindOnce([](Promise<RT> promise,
                                        RT result) { promise.Resolve(result); },
                                     std::move(promise), std::move(result)));
     } else {
diff --git a/shell/common/platform_util_win.cc b/shell/common/platform_util_win.cc
index 7df712d8f049e..a89c1c42ba6ee 100644
--- a/shell/common/platform_util_win.cc
+++ b/shell/common/platform_util_win.cc
@@ -21,9 +21,9 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "base/strings/escape.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "base/threading/scoped_blocking_call.h"
 #include "base/win/registry.h"
@@ -32,7 +32,6 @@
 #include "base/win/windows_version.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/escape.h"
 #include "shell/common/electron_paths.h"
 #include "ui/base/win/shell.h"
 #include "url/gurl.h"
@@ -243,7 +242,7 @@ std::string OpenExternalOnWorkerThread(
   // parameters unexpected by the external program. This url should already
   // have been escaped.
   std::wstring escaped_url =
-      L"\"" + base::UTF8ToWide(net::EscapeExternalHandlerValue(url.spec())) +
+      L"\"" + base::UTF8ToWide(base::EscapeExternalHandlerValue(url.spec())) +
       L"\"";
   std::wstring working_dir = options.working_dir.value();
 
diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc
index 00235ec21057d..a46c4fb1a4b35 100644
--- a/shell/common/v8_value_converter.cc
+++ b/shell/common/v8_value_converter.cc
@@ -389,9 +389,10 @@ std::unique_ptr<base::Value> V8ValueConverter::FromV8Array(
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
-  if (!val->CreationContext().IsEmpty() &&
-      val->CreationContext() != isolate->GetCurrentContext())
-    scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
+  if (!val->GetCreationContextChecked().IsEmpty() &&
+      val->GetCreationContextChecked() != isolate->GetCurrentContext())
+    scope =
+        std::make_unique<v8::Context::Scope>(val->GetCreationContextChecked());
 
   auto result = std::make_unique<base::ListValue>();
 
@@ -445,9 +446,10 @@ std::unique_ptr<base::Value> V8ValueConverter::FromV8Object(
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
   // that context, but change back after val is converted.
-  if (!val->CreationContext().IsEmpty() &&
-      val->CreationContext() != isolate->GetCurrentContext())
-    scope = std::make_unique<v8::Context::Scope>(val->CreationContext());
+  if (!val->GetCreationContextChecked().IsEmpty() &&
+      val->GetCreationContextChecked() != isolate->GetCurrentContext())
+    scope =
+        std::make_unique<v8::Context::Scope>(val->GetCreationContextChecked());
 
   auto result = std::make_unique<base::DictionaryValue>();
   v8::Local<v8::Array> property_names;
diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc
index f1e93b724e993..22f8c0adada0d 100644
--- a/shell/renderer/api/electron_api_context_bridge.cc
+++ b/shell/renderer/api/electron_api_context_bridge.cc
@@ -188,7 +188,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
       // creation context of the original method.  If it's not we proceed
       // with the proxy logic
       if (maybe_original_fn.ToLocal(&proxy_func) && proxy_func->IsFunction() &&
-          proxy_func.As<v8::Object>()->CreationContext() ==
+          proxy_func.As<v8::Object>()->GetCreationContextChecked() ==
               destination_context) {
         return v8::MaybeLocal<v8::Value>(proxy_func);
       }
@@ -408,7 +408,8 @@ void ProxyFunctionWrapper(const v8::FunctionCallbackInfo<v8::Value>& info) {
     return;
 
   v8::Local<v8::Function> func = func_value.As<v8::Function>();
-  v8::Local<v8::Context> func_owning_context = func->CreationContext();
+  v8::Local<v8::Context> func_owning_context =
+      func->GetCreationContextChecked();
 
   {
     v8::Context::Scope func_owning_context_scope(func_owning_context);
@@ -636,9 +637,9 @@ void OverrideGlobalValueFromIsolatedWorld(
   {
     v8::Context::Scope main_context_scope(main_context);
     context_bridge::ObjectCache object_cache;
-    v8::MaybeLocal<v8::Value> maybe_proxy =
-        PassValueToOtherContext(value->CreationContext(), main_context, value,
-                                &object_cache, support_dynamic_properties, 1);
+    v8::MaybeLocal<v8::Value> maybe_proxy = PassValueToOtherContext(
+        value->GetCreationContextChecked(), main_context, value, &object_cache,
+        support_dynamic_properties, 1);
     DCHECK(!maybe_proxy.IsEmpty());
     auto proxy = maybe_proxy.ToLocalChecked();
 
@@ -672,16 +673,16 @@ bool OverrideGlobalPropertyFromIsolatedWorld(
     v8::Local<v8::Value> getter_proxy;
     v8::Local<v8::Value> setter_proxy;
     if (!getter->IsNullOrUndefined()) {
-      v8::MaybeLocal<v8::Value> maybe_getter_proxy =
-          PassValueToOtherContext(getter->CreationContext(), main_context,
-                                  getter, &object_cache, false, 1);
+      v8::MaybeLocal<v8::Value> maybe_getter_proxy = PassValueToOtherContext(
+          getter->GetCreationContextChecked(), main_context, getter,
+          &object_cache, false, 1);
       DCHECK(!maybe_getter_proxy.IsEmpty());
       getter_proxy = maybe_getter_proxy.ToLocalChecked();
     }
     if (!setter->IsNullOrUndefined() && setter->IsObject()) {
-      v8::MaybeLocal<v8::Value> maybe_setter_proxy =
-          PassValueToOtherContext(getter->CreationContext(), main_context,
-                                  setter, &object_cache, false, 1);
+      v8::MaybeLocal<v8::Value> maybe_setter_proxy = PassValueToOtherContext(
+          getter->GetCreationContextChecked(), main_context, setter,
+          &object_cache, false, 1);
       DCHECK(!maybe_setter_proxy.IsEmpty());
       setter_proxy = maybe_setter_proxy.ToLocalChecked();
     }
diff --git a/shell/renderer/api/electron_api_ipc_renderer.cc b/shell/renderer/api/electron_api_ipc_renderer.cc
index 6f24ed17c4a3d..97f7010643b6d 100644
--- a/shell/renderer/api/electron_api_ipc_renderer.cc
+++ b/shell/renderer/api/electron_api_ipc_renderer.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "base/task/post_task.h"
 #include "base/values.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 5f2ea089056a8..f48d2f4c73fea 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -102,7 +102,7 @@ struct Converter<blink::WebCssOrigin> {
 namespace electron {
 
 content::RenderFrame* GetRenderFrame(v8::Local<v8::Object> value) {
-  v8::Local<v8::Context> context = value->CreationContext();
+  v8::Local<v8::Context> context = value->GetCreationContextChecked();
   if (context.IsEmpty())
     return nullptr;
   blink::WebLocalFrame* frame = blink::WebLocalFrame::FrameForContext(context);
@@ -161,9 +161,9 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
     {
       v8::TryCatch try_catch(isolate);
       context_bridge::ObjectCache object_cache;
-      maybe_result = PassValueToOtherContext(result->CreationContext(),
-                                             promise_.GetContext(), result,
-                                             &object_cache, false, 0);
+      maybe_result = PassValueToOtherContext(
+          result->GetCreationContextChecked(), promise_.GetContext(), result,
+          &object_cache, false, 0);
       if (maybe_result.IsEmpty() || try_catch.HasCaught()) {
         success = false;
       }
@@ -206,7 +206,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
         bool should_clone_value =
             !(value->IsObject() &&
               promise_.GetContext() ==
-                  value.As<v8::Object>()->CreationContext()) &&
+                  value.As<v8::Object>()->GetCreationContextChecked()) &&
             value->IsObject();
         if (should_clone_value) {
           CopyResultToCallingContextAndFinalize(isolate,
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index 0302f37f7ccf3..ed5fba4a45cf7 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -601,7 +601,7 @@ void RendererClientBase::AllowGuestViewElementDefinition(
     v8::Local<v8::Object> context,
     v8::Local<v8::Function> register_cb) {
   v8::HandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context->CreationContext());
+  v8::Context::Scope context_scope(context->GetCreationContextChecked());
   blink::WebCustomElement::EmbedderNamesAllowedScope embedder_names_scope;
 
   content::RenderFrame* render_frame = GetRenderFrame(context);
@@ -609,8 +609,8 @@ void RendererClientBase::AllowGuestViewElementDefinition(
     return;
 
   render_frame->GetWebFrame()->RequestExecuteV8Function(
-      context->CreationContext(), register_cb, v8::Null(isolate), 0, nullptr,
-      nullptr);
+      context->GetCreationContextChecked(), register_cb, v8::Null(isolate), 0,
+      nullptr, nullptr);
 }
 
 }  // namespace electron
diff --git a/spec/package.json b/spec/package.json
index 38ab98be7c26b..5102db8eab7c5 100644
--- a/spec/package.json
+++ b/spec/package.json
@@ -30,5 +30,8 @@
   },
   "dependencies": {
     "mocha-appveyor-reporter": "^0.4.2"
+  },
+  "resolutions": {
+    "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
   }
 }
diff --git a/spec/yarn.lock b/spec/yarn.lock
index db24b66cc2cb1..bc0113391a384 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -685,10 +685,9 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-nan@2.x, nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+nan@2.x, nan@^2.12.1, nan@nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac:
+  version "2.15.0"
+  resolved "https://codeload.github.com/nodejs/nan/tar.gz/16fa32231e2ccd89d2804b3f765319128b20c4ac"
 
 oauth-sign@~0.9.0:
   version "0.9.0"

From 24361525362aaa87672e8266903bd9f21a412eab Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 18 May 2022 06:00:56 -0700
Subject: [PATCH 398/811] Bump v20.0.0-nightly.20220518

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 4 ++--
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 29b78854c172d..01bb8bd7104a2 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220517
\ No newline at end of file
+20.0.0-nightly.20220518
\ No newline at end of file
diff --git a/package.json b/package.json
index 4e2b0088f4820..0c6200f435ee3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220517",
+  "version": "20.0.0-nightly.20220518",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
@@ -145,4 +145,4 @@
   "resolutions": {
     "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
   }
-}
+}
\ No newline at end of file
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index de054d840ebb6..19f83d73ecd7c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220517
- PRODUCTVERSION 20,0,0,20220517
+ FILEVERSION 20,0,0,20220518
+ PRODUCTVERSION 20,0,0,20220518
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 455544dfb6b8fb4e3912c54d69379d88cd1250ef Mon Sep 17 00:00:00 2001
From: Sofia Nguy <sofianguy@gmail.com>
Date: Wed, 18 May 2022 09:39:40 -0700
Subject: [PATCH 399/811] docs: Update release dates for E20 (#34267)

---
 docs/tutorial/electron-timelines.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/electron-timelines.md b/docs/tutorial/electron-timelines.md
index 91ea556110ee1..e98f5b14ed11d 100644
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -22,11 +22,12 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 | 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 | 🚫 |
 | 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 | 🚫 |
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
-| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | ✅ |
-| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | ✅ |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
+| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | 🚫 |
 | 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
 | 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
-| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | TBD | ✅ |
+| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | v16.14 | ✅ |
+| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | TBD | ✅ |
 
 **Notes:**
 

From 73e0bf973d2b7835290d61cab6638309a21a2719 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 19 May 2022 10:03:02 +0200
Subject: [PATCH 400/811] fix: delayed bounds when moving/resizing and
 preventing default (#34204)

---
 shell/browser/native_window_views_win.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index 12ae336acc2f3..52aedf38d62e2 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -296,6 +296,7 @@ bool NativeWindowViews::PreHandleMSG(UINT message,
                              &prevent_default);
       if (prevent_default) {
         ::GetWindowRect(hwnd, reinterpret_cast<RECT*>(l_param));
+        pending_bounds_change_.reset();
         return true;  // Tells Windows that the Sizing is handled.
       }
       return false;
@@ -334,6 +335,7 @@ bool NativeWindowViews::PreHandleMSG(UINT message,
       NotifyWindowWillMove(dpi_bounds, &prevent_default);
       if (!movable_ || prevent_default) {
         ::GetWindowRect(hwnd, reinterpret_cast<RECT*>(l_param));
+        pending_bounds_change_.reset();
         return true;  // Tells Windows that the Move is handled. If not true,
                       // frameless windows can be moved using
                       // -webkit-app-region: drag elements.

From 588005a9d5a74b953961605579cf4ad6f8dc2b20 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 19 May 2022 10:05:07 +0200
Subject: [PATCH 401/811] fix: DCHECK on `webContents.print()` (#34271)

---
 patches/chromium/printing.patch               | 56 ++++++-------
 .../browser/api/electron_api_web_contents.cc  | 80 +++++++++----------
 shell/browser/api/electron_api_web_contents.h |  2 +-
 3 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index ac87ae19ab3c7..2b9df64a7bf5e 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -113,7 +113,7 @@ index dd27bbf387718d6abda5080e7d2c609cd0eaff17..8837cf2aeaa2f87d51be8d00aa356c8a
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..a082dd9ee23b6d4918c194161386b973039d3ff6 100644
+index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc9c122ae3 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -206,7 +206,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..a082dd9ee23b6d4918c194161386b973
 -bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
 +bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
 +                                    bool silent,
-+                                    base::Value settings,
++                                    base::Value::Dict settings,
 +                                    CompletionCallback callback)  {
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
@@ -402,12 +402,12 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..a082dd9ee23b6d4918c194161386b973
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
 -  GetPrintRenderFrame(rfh)->PrintRequestedPages();
-+  GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
++  GetPrintRenderFrame(rfh)->PrintRequestedPages(/*silent=*/true, /*job_settings=*/base::Value::Dict());
  
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 746df417a23f7760818ba265d4a7d589dec8bf34..5566e7dc2929a2542c599fed91fb1eeeb866e7bb 100644
+index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0de6669400 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
 @@ -41,6 +41,8 @@ namespace printing {
@@ -426,7 +426,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..5566e7dc2929a2542c599fed91fb1eee
 -  virtual bool PrintNow(content::RenderFrameHost* rfh);
 +  virtual bool PrintNow(content::RenderFrameHost* rfh,
 +                        bool silent = true,
-+                        base::Value settings = {},
++                        base::Value::Dict settings = {},
 +                        CompletionCallback callback = {});
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -466,7 +466,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..5566e7dc2929a2542c599fed91fb1eee
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-index aa727261738698610fab5abd3618d0d0f0d29792..8f95dae637ce25a073872ecdf229f14cc6d0614c 100644
+index aa727261738698610fab5abd3618d0d0f0d29792..2793fbc33e66cf9d7e3fc5e10f0d01730f3b935d 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 @@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
@@ -474,12 +474,12 @@ index aa727261738698610fab5abd3618d0d0f0d29792..8f95dae637ce25a073872ecdf229f14c
  FakePrintRenderFrame::~FakePrintRenderFrame() = default;
  
 -void FakePrintRenderFrame::PrintRequestedPages() {}
-+void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value /*settings*/) {}
++void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value::Dict /*settings*/) {}
  
  void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params) {
    NOTREACHED();
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-index 5f4d6e314b21351e3e5912e3a43ef87774343085..2a93fe0139025d1a40b3f8e81378ee4213ac27c1 100644
+index 5f4d6e314b21351e3e5912e3a43ef87774343085..8627c8305686654dca7cd9c26433592e934d4eb0 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 @@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
@@ -487,7 +487,7 @@ index 5f4d6e314b21351e3e5912e3a43ef87774343085..2a93fe0139025d1a40b3f8e81378ee42
   private:
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
-+  void PrintRequestedPages(bool silent, ::base::Value settings) override;
++  void PrintRequestedPages(bool silent, ::base::Value::Dict settings) override;
    void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
@@ -515,7 +515,7 @@ index 82591f8c2abbc1a180ef62f7264a68ca279e9b9c..ad27a15ba3028af1046482192dec789d
  
  void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..fa53eb1c9dd4e7a6b321bdd4cda2164b95244323 100644
+index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..2cfcd810c9507c434e673064b63e8fbc95172537 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
 @@ -280,7 +280,7 @@ enum PrintFailureReason {
@@ -523,7 +523,7 @@ index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..fa53eb1c9dd4e7a6b321bdd4cda2164b
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page, and then switch back the CSS to display media type.
 -  PrintRequestedPages();
-+  PrintRequestedPages(bool silent, mojo_base.mojom.DeprecatedDictionaryValue settings);
++  PrintRequestedPages(bool silent, mojo_base.mojom.DictionaryValue settings);
  
    // Requests the frame to be printed with specified parameters. This is used
    // to programmatically produce PDF by request from the browser (e.g. over
@@ -537,7 +537,7 @@ index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..fa53eb1c9dd4e7a6b321bdd4cda2164b
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9567214a1 100644
+index db8913ae41d46d14fd15c6127e126e4b129dc4b8..ddbc3b0d5a00af9de84e1b0aadc44adb6ff84495 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -554,7 +554,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
  
 -    Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
 +    Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
-+          false /* silent */, base::DictionaryValue() /* new_settings */);
++          false /* silent */, base::Value::Dict() /* new_settings */);
      if (!weak_this)
        return;
  
@@ -563,7 +563,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
  }
  
 -void PrintRenderFrameHelper::PrintRequestedPages() {
-+void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value settings) {
++void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value::Dict settings) {
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
@@ -582,7 +582,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
    Print(frame, print_preview_context_.source_node(),
 -        PrintRequestType::kRegular);
 +        PrintRequestType::kRegular, false,
-+        base::DictionaryValue());
++        base::Value::Dict());
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -601,7 +601,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
 -          PrintRequestType::kRegular);
 +          PrintRequestType::kRegular, false /* silent */,
-+          base::DictionaryValue() /* new_settings */);
++          base::Value::Dict() /* new_settings */);
      // Check if |this| is still valid.
      if (!weak_this)
        return;
@@ -612,7 +612,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
 -                                   PrintRequestType print_request_type) {
 +                                   PrintRequestType print_request_type,
 +                                   bool silent,
-+                                   base::Value settings) {
++                                   base::Value::Dict settings) {
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
@@ -621,7 +621,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
  
    uint32_t expected_page_count = 0;
 -  if (!CalculateNumberOfPages(frame, node, &expected_page_count)) {
-+  if (!CalculateNumberOfPages(frame, node, &expected_page_count, base::Value::AsDictionaryValue(settings))) {
++  if (!CalculateNumberOfPages(frame, node, &expected_page_count, std::move(settings))) {
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
@@ -652,10 +652,10 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
 -  GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
 +bool PrintRenderFrameHelper::InitPrintSettings(
 +    bool fit_to_paper_size,
-+    const base::DictionaryValue& new_settings) {
++    base::Value::Dict new_settings) {
 +  mojom::PrintPagesParamsPtr settings;
 +
-+  if (new_settings.DictEmpty()) {
++  if (new_settings.empty()) {
 +    settings = mojom::PrintPagesParams::New();
 +    settings->params = mojom::PrintParams::New();
 +    GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
@@ -664,7 +664,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
 +    int cookie =
 +      print_pages_params_ ? print_pages_params_->params->document_cookie : 0;
 +    GetPrintManagerHost()->UpdatePrintSettings(
-+      cookie, new_settings.GetDict().Clone(), &settings, &canceled);
++      cookie, std::move(new_settings), &settings, &canceled);
 +    if (canceled)
 +      return false;
 +  }
@@ -699,11 +699,11 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
 +    blink::WebLocalFrame* frame,
 +    const blink::WebNode& node,
 +    uint32_t* number_of_pages,
-+    const base::DictionaryValue& settings) {
++    base::Value::Dict settings) {
    DCHECK(frame);
    bool fit_to_paper_size = !IsPrintingPdfFrame(frame, node);
 -  if (!InitPrintSettings(fit_to_paper_size)) {
-+  if (!InitPrintSettings(fit_to_paper_size, settings)) {
++  if (!InitPrintSettings(fit_to_paper_size, std::move(settings))) {
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
@@ -737,7 +737,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..64ee08e9091e4d67ff55097bc22177d9
  
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index 220b28a7e63625fe8b76290f0d2f40dd32cae255..72801431a5d19f31c1a7db785b0cbaee8e65cca3 100644
+index 220b28a7e63625fe8b76290f0d2f40dd32cae255..cff9e35fab9df680c3c39467c50ddb033c2e6cba 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -255,7 +255,7 @@ class PrintRenderFrameHelper
@@ -745,7 +745,7 @@ index 220b28a7e63625fe8b76290f0d2f40dd32cae255..72801431a5d19f31c1a7db785b0cbaee
  
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
-+  void PrintRequestedPages(bool silent, base::Value settings) override;
++  void PrintRequestedPages(bool silent, base::Value::Dict settings) override;
    void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    void PrintForSystemDialog() override;
@@ -756,7 +756,7 @@ index 220b28a7e63625fe8b76290f0d2f40dd32cae255..72801431a5d19f31c1a7db785b0cbaee
 -             PrintRequestType print_request_type);
 +             PrintRequestType print_request_type,
 +             bool silent,
-+             base::Value settings);
++             base::Value::Dict settings);
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
@@ -766,14 +766,14 @@ index 220b28a7e63625fe8b76290f0d2f40dd32cae255..72801431a5d19f31c1a7db785b0cbaee
    // Used only for native printing workflow.
 -  bool InitPrintSettings(bool fit_to_paper_size);
 +  bool InitPrintSettings(bool fit_to_paper_size,
-+                         const base::DictionaryValue& settings);
++                         base::Value::Dict new_settings);
  
    // Calculate number of pages in source document.
    bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
                                const blink::WebNode& node,
 -                              uint32_t* number_of_pages);
 +                              uint32_t* number_of_pages,
-+                              const base::DictionaryValue& settings);
++                              base::Value::Dict settings);
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 501e3cac4005d..60a8a5846d60a 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2586,7 +2586,7 @@ bool WebContents::IsCurrentlyAudible() {
 
 #if BUILDFLAG(ENABLE_PRINTING)
 void WebContents::OnGetDefaultPrinter(
-    base::Value print_settings,
+    base::Value::Dict print_settings,
     printing::CompletionCallback print_callback,
     std::u16string device_name,
     bool silent,
@@ -2616,7 +2616,7 @@ void WebContents::OnGetDefaultPrinter(
     return;
   }
 
-  print_settings.SetStringKey(printing::kSettingDeviceName, printer_name);
+  print_settings.Set(printing::kSettingDeviceName, printer_name);
 
   auto* print_view_manager =
       PrintViewManagerElectron::FromWebContents(web_contents());
@@ -2635,7 +2635,7 @@ void WebContents::OnGetDefaultPrinter(
 void WebContents::Print(gin::Arguments* args) {
   gin_helper::Dictionary options =
       gin::Dictionary::CreateEmpty(args->isolate());
-  base::Value settings(base::Value::Type::DICTIONARY);
+  base::Value::Dict settings;
 
   if (args->Length() >= 1 && !args->GetNext(&options)) {
     gin_helper::ErrorThrower(args->isolate())
@@ -2656,8 +2656,7 @@ void WebContents::Print(gin::Arguments* args) {
 
   bool print_background = false;
   options.Get("printBackground", &print_background);
-  settings.SetBoolKey(printing::kSettingShouldPrintBackgrounds,
-                      print_background);
+  settings.Set(printing::kSettingShouldPrintBackgrounds, print_background);
 
   // Set custom margin settings
   gin_helper::Dictionary margins =
@@ -2666,28 +2665,26 @@ void WebContents::Print(gin::Arguments* args) {
     printing::mojom::MarginType margin_type =
         printing::mojom::MarginType::kDefaultMargins;
     margins.Get("marginType", &margin_type);
-    settings.SetIntKey(printing::kSettingMarginsType,
-                       static_cast<int>(margin_type));
+    settings.Set(printing::kSettingMarginsType, static_cast<int>(margin_type));
 
     if (margin_type == printing::mojom::MarginType::kCustomMargins) {
-      base::Value custom_margins(base::Value::Type::DICTIONARY);
+      base::Value::Dict custom_margins;
       int top = 0;
       margins.Get("top", &top);
-      custom_margins.SetIntKey(printing::kSettingMarginTop, top);
+      custom_margins.Set(printing::kSettingMarginTop, top);
       int bottom = 0;
       margins.Get("bottom", &bottom);
-      custom_margins.SetIntKey(printing::kSettingMarginBottom, bottom);
+      custom_margins.Set(printing::kSettingMarginBottom, bottom);
       int left = 0;
       margins.Get("left", &left);
-      custom_margins.SetIntKey(printing::kSettingMarginLeft, left);
+      custom_margins.Set(printing::kSettingMarginLeft, left);
       int right = 0;
       margins.Get("right", &right);
-      custom_margins.SetIntKey(printing::kSettingMarginRight, right);
-      settings.SetPath(printing::kSettingMarginsCustom,
-                       std::move(custom_margins));
+      custom_margins.Set(printing::kSettingMarginRight, right);
+      settings.Set(printing::kSettingMarginsCustom, std::move(custom_margins));
     }
   } else {
-    settings.SetIntKey(
+    settings.Set(
         printing::kSettingMarginsType,
         static_cast<int>(printing::mojom::MarginType::kDefaultMargins));
   }
@@ -2697,12 +2694,12 @@ void WebContents::Print(gin::Arguments* args) {
   options.Get("color", &print_color);
   auto const color_model = print_color ? printing::mojom::ColorModel::kColor
                                        : printing::mojom::ColorModel::kGray;
-  settings.SetIntKey(printing::kSettingColor, static_cast<int>(color_model));
+  settings.Set(printing::kSettingColor, static_cast<int>(color_model));
 
   // Is the orientation landscape or portrait.
   bool landscape = false;
   options.Get("landscape", &landscape);
-  settings.SetBoolKey(printing::kSettingLandscape, landscape);
+  settings.Set(printing::kSettingLandscape, landscape);
 
   // We set the default to the system's default printer and only update
   // if at the Chromium level if the user overrides.
@@ -2717,21 +2714,21 @@ void WebContents::Print(gin::Arguments* args) {
 
   int scale_factor = 100;
   options.Get("scaleFactor", &scale_factor);
-  settings.SetIntKey(printing::kSettingScaleFactor, scale_factor);
+  settings.Set(printing::kSettingScaleFactor, scale_factor);
 
   int pages_per_sheet = 1;
   options.Get("pagesPerSheet", &pages_per_sheet);
-  settings.SetIntKey(printing::kSettingPagesPerSheet, pages_per_sheet);
+  settings.Set(printing::kSettingPagesPerSheet, pages_per_sheet);
 
   // True if the user wants to print with collate.
   bool collate = true;
   options.Get("collate", &collate);
-  settings.SetBoolKey(printing::kSettingCollate, collate);
+  settings.Set(printing::kSettingCollate, collate);
 
   // The number of individual copies to print
   int copies = 1;
   options.Get("copies", &copies);
-  settings.SetIntKey(printing::kSettingCopies, copies);
+  settings.Set(printing::kSettingCopies, copies);
 
   // Strings to be printed as headers and footers if requested by the user.
   std::string header;
@@ -2740,53 +2737,52 @@ void WebContents::Print(gin::Arguments* args) {
   options.Get("footer", &footer);
 
   if (!(header.empty() && footer.empty())) {
-    settings.SetBoolKey(printing::kSettingHeaderFooterEnabled, true);
+    settings.Set(printing::kSettingHeaderFooterEnabled, true);
 
-    settings.SetStringKey(printing::kSettingHeaderFooterTitle, header);
-    settings.SetStringKey(printing::kSettingHeaderFooterURL, footer);
+    settings.Set(printing::kSettingHeaderFooterTitle, header);
+    settings.Set(printing::kSettingHeaderFooterURL, footer);
   } else {
-    settings.SetBoolKey(printing::kSettingHeaderFooterEnabled, false);
+    settings.Set(printing::kSettingHeaderFooterEnabled, false);
   }
 
   // We don't want to allow the user to enable these settings
   // but we need to set them or a CHECK is hit.
-  settings.SetIntKey(printing::kSettingPrinterType,
-                     static_cast<int>(printing::mojom::PrinterType::kLocal));
-  settings.SetBoolKey(printing::kSettingShouldPrintSelectionOnly, false);
-  settings.SetBoolKey(printing::kSettingRasterizePdf, false);
+  settings.Set(printing::kSettingPrinterType,
+               static_cast<int>(printing::mojom::PrinterType::kLocal));
+  settings.Set(printing::kSettingShouldPrintSelectionOnly, false);
+  settings.Set(printing::kSettingRasterizePdf, false);
 
   // Set custom page ranges to print
   std::vector<gin_helper::Dictionary> page_ranges;
   if (options.Get("pageRanges", &page_ranges)) {
-    base::Value page_range_list(base::Value::Type::LIST);
+    base::Value::List page_range_list;
     for (auto& range : page_ranges) {
       int from, to;
       if (range.Get("from", &from) && range.Get("to", &to)) {
-        base::Value range(base::Value::Type::DICTIONARY);
+        base::Value::Dict range;
         // Chromium uses 1-based page ranges, so increment each by 1.
-        range.SetIntKey(printing::kSettingPageRangeFrom, from + 1);
-        range.SetIntKey(printing::kSettingPageRangeTo, to + 1);
+        range.Set(printing::kSettingPageRangeFrom, from + 1);
+        range.Set(printing::kSettingPageRangeTo, to + 1);
         page_range_list.Append(std::move(range));
       } else {
         continue;
       }
     }
-    if (!page_range_list.GetListDeprecated().empty())
-      settings.SetPath(printing::kSettingPageRange, std::move(page_range_list));
+    if (!page_range_list.empty())
+      settings.Set(printing::kSettingPageRange, std::move(page_range_list));
   }
 
   // Duplex type user wants to use.
   printing::mojom::DuplexMode duplex_mode =
       printing::mojom::DuplexMode::kSimplex;
   options.Get("duplexMode", &duplex_mode);
-  settings.SetIntKey(printing::kSettingDuplexMode,
-                     static_cast<int>(duplex_mode));
+  settings.Set(printing::kSettingDuplexMode, static_cast<int>(duplex_mode));
 
   // We've already done necessary parameter sanitization at the
   // JS level, so we can simply pass this through.
   base::Value media_size(base::Value::Type::DICTIONARY);
   if (options.Get("mediaSize", &media_size))
-    settings.SetKey(printing::kSettingMediaSize, std::move(media_size));
+    settings.Set(printing::kSettingMediaSize, std::move(media_size));
 
   // Set custom dots per inch (dpi)
   gin_helper::Dictionary dpi_settings;
@@ -2794,13 +2790,13 @@ void WebContents::Print(gin::Arguments* args) {
   if (options.Get("dpi", &dpi_settings)) {
     int horizontal = 72;
     dpi_settings.Get("horizontal", &horizontal);
-    settings.SetIntKey(printing::kSettingDpiHorizontal, horizontal);
+    settings.Set(printing::kSettingDpiHorizontal, horizontal);
     int vertical = 72;
     dpi_settings.Get("vertical", &vertical);
-    settings.SetIntKey(printing::kSettingDpiVertical, vertical);
+    settings.Set(printing::kSettingDpiVertical, vertical);
   } else {
-    settings.SetIntKey(printing::kSettingDpiHorizontal, dpi);
-    settings.SetIntKey(printing::kSettingDpiVertical, dpi);
+    settings.Set(printing::kSettingDpiHorizontal, dpi);
+    settings.Set(printing::kSettingDpiVertical, dpi);
   }
 
   print_task_runner_->PostTaskAndReplyWithResult(
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 96940a3f32ea7..c4311007d34fe 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -223,7 +223,7 @@ class WebContents : public ExclusiveAccessContext,
   void HandleNewRenderFrame(content::RenderFrameHost* render_frame_host);
 
 #if BUILDFLAG(ENABLE_PRINTING)
-  void OnGetDefaultPrinter(base::Value print_settings,
+  void OnGetDefaultPrinter(base::Value::Dict print_settings,
                            printing::CompletionCallback print_callback,
                            std::u16string device_name,
                            bool silent,

From 17c8ec765bd40add42e22bd72a56317bfb9b2dbd Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 06:00:53 -0700
Subject: [PATCH 402/811] Bump v20.0.0-nightly.20220519

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 01bb8bd7104a2..73fa88d8e382b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220518
\ No newline at end of file
+20.0.0-nightly.20220519
\ No newline at end of file
diff --git a/package.json b/package.json
index 0c6200f435ee3..0cc61420d5ac7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220518",
+  "version": "20.0.0-nightly.20220519",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 19f83d73ecd7c..c287fb7a5eca4 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220518
- PRODUCTVERSION 20,0,0,20220518
+ FILEVERSION 20,0,0,20220519
+ PRODUCTVERSION 20,0,0,20220519
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 5ff94e7f2becc435e4e7c66e112686461b74e95b Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Thu, 19 May 2022 14:34:58 -0400
Subject: [PATCH 403/811] fix: crash when creating interface for speculative
 frame (#33919)

---
 .../browser/api/electron_api_web_contents.cc  |  2 +-
 .../api/electron_api_web_frame_main.cc        | 33 +++++++++++--------
 .../browser/api/electron_api_web_frame_main.h |  5 +--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 60a8a5846d60a..639f20eda2717 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1505,7 +1505,7 @@ void WebContents::HandleNewRenderFrame(
 
   auto* web_frame = WebFrameMain::FromRenderFrameHost(render_frame_host);
   if (web_frame)
-    web_frame->Connect();
+    web_frame->MaybeSetupMojoConnection();
 }
 
 void WebContents::OnBackgroundColorChanged() {
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index d39943e4d64cb..f8bc7c9efcd11 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -96,13 +96,15 @@ void WebFrameMain::Destroyed() {
 void WebFrameMain::MarkRenderFrameDisposed() {
   render_frame_ = nullptr;
   render_frame_disposed_ = true;
+  TeardownMojoConnection();
 }
 
 void WebFrameMain::UpdateRenderFrameHost(content::RenderFrameHost* rfh) {
   // Should only be called when swapping frames.
   render_frame_disposed_ = false;
   render_frame_ = rfh;
-  renderer_api_.reset();
+  TeardownMojoConnection();
+  MaybeSetupMojoConnection();
 }
 
 bool WebFrameMain::CheckRenderFrame() const {
@@ -181,20 +183,30 @@ void WebFrameMain::Send(v8::Isolate* isolate,
 }
 
 const mojo::Remote<mojom::ElectronRenderer>& WebFrameMain::GetRendererApi() {
+  MaybeSetupMojoConnection();
+  return renderer_api_;
+}
+
+void WebFrameMain::MaybeSetupMojoConnection() {
   if (!renderer_api_) {
     pending_receiver_ = renderer_api_.BindNewPipeAndPassReceiver();
-    if (render_frame_->IsRenderFrameCreated()) {
-      render_frame_->GetRemoteInterfaces()->GetInterface(
-          std::move(pending_receiver_));
-    }
     renderer_api_.set_disconnect_handler(base::BindOnce(
         &WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr()));
   }
-  return renderer_api_;
+  // Wait for RenderFrame to be created in renderer before accessing remote.
+  if (pending_receiver_ && render_frame_->IsRenderFrameCreated()) {
+    render_frame_->GetRemoteInterfaces()->GetInterface(
+        std::move(pending_receiver_));
+  }
 }
 
-void WebFrameMain::OnRendererConnectionError() {
+void WebFrameMain::TeardownMojoConnection() {
   renderer_api_.reset();
+  pending_receiver_.reset();
+}
+
+void WebFrameMain::OnRendererConnectionError() {
+  TeardownMojoConnection();
 }
 
 void WebFrameMain::PostMessage(v8::Isolate* isolate,
@@ -314,13 +326,6 @@ std::vector<content::RenderFrameHost*> WebFrameMain::FramesInSubtree() const {
   return frame_hosts;
 }
 
-void WebFrameMain::Connect() {
-  if (pending_receiver_) {
-    render_frame_->GetRemoteInterfaces()->GetInterface(
-        std::move(pending_receiver_));
-  }
-}
-
 void WebFrameMain::DOMContentLoaded() {
   Emit("dom-ready");
 }
diff --git a/shell/browser/api/electron_api_web_frame_main.h b/shell/browser/api/electron_api_web_frame_main.h
index 23a3b657fd45c..b45264db59627 100644
--- a/shell/browser/api/electron_api_web_frame_main.h
+++ b/shell/browser/api/electron_api_web_frame_main.h
@@ -82,6 +82,9 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
   void UpdateRenderFrameHost(content::RenderFrameHost* rfh);
 
   const mojo::Remote<mojom::ElectronRenderer>& GetRendererApi();
+  void MaybeSetupMojoConnection();
+  void TeardownMojoConnection();
+  void OnRendererConnectionError();
 
   // WebFrameMain can outlive its RenderFrameHost pointer so we need to check
   // whether its been disposed of prior to accessing it.
@@ -112,8 +115,6 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
   std::vector<content::RenderFrameHost*> Frames() const;
   std::vector<content::RenderFrameHost*> FramesInSubtree() const;
 
-  void OnRendererConnectionError();
-  void Connect();
   void DOMContentLoaded();
 
   mojo::Remote<mojom::ElectronRenderer> renderer_api_;

From ba7dedcc6f8b91c1fb4950d66217818394059272 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 06:00:58 -0700
Subject: [PATCH 404/811] Bump v20.0.0-nightly.20220520

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 73fa88d8e382b..6192d2481c149 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220519
\ No newline at end of file
+20.0.0-nightly.20220520
\ No newline at end of file
diff --git a/package.json b/package.json
index 0cc61420d5ac7..d00836e491354 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220519",
+  "version": "20.0.0-nightly.20220520",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c287fb7a5eca4..2913518590be8 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220519
- PRODUCTVERSION 20,0,0,20220519
+ FILEVERSION 20,0,0,20220520
+ PRODUCTVERSION 20,0,0,20220520
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ff13fa8f0a9ea589830ad2868011f510e652fb16 Mon Sep 17 00:00:00 2001
From: Varun Sharma <varunsh@stepsecurity.io>
Date: Sat, 21 May 2022 17:35:26 -0700
Subject: [PATCH 405/811] ci: Add GitHub token permissions for workflows
 (#34298)

ci: add GitHub token permissions
---
 .github/workflows/semantic.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
index 11d62c9d62855..6158b510bb03b 100644
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -7,8 +7,14 @@ on:
       - edited
       - synchronize
 
+permissions:
+  contents: read
+
 jobs:
   main:
+    permissions:
+      pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
+      statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
     name: Validate PR Title
     runs-on: ubuntu-latest
     steps:

From 38c21b7acad9f7ee234a190addad5f25f59440de Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Sun, 22 May 2022 22:20:54 -0700
Subject: [PATCH 406/811] revert: add first-instance-ack event to the
 `app.requestSingleInstanceLock()` flow (#34297)

fix: revert "feat: add first-instance-ack event to the `app.requestSingleInstanceLock()` flow"
---
 docs/api/app.md                               |  40 +-
 patches/chromium/.patches                     |   2 +-
 ...d_data_parameter_to_processsingleton.patch | 347 ++++++++++
 ...ransfer_to_requestsingleinstancelock.patch | 640 ------------------
 shell/browser/api/electron_api_app.cc         |  69 +-
 shell/browser/api/electron_api_app.h          |   9 +-
 spec-main/api-app-spec.ts                     | 114 +---
 spec/fixtures/api/singleton-data/main.js      |  41 +-
 8 files changed, 400 insertions(+), 862 deletions(-)
 create mode 100644 patches/chromium/feat_add_data_parameter_to_processsingleton.patch
 delete mode 100644 patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch

diff --git a/docs/api/app.md b/docs/api/app.md
index 16207e255c60e..94b8c954fc443 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -484,7 +484,6 @@ Returns:
 * `argv` string[] - An array of the second instance's command line arguments
 * `workingDirectory` string - The second instance's working directory
 * `additionalData` unknown - A JSON object of additional data passed from the second instance
-* `ackCallback` unknown - A function that can be used to send data back to the second instance
 
 This event will be emitted inside the primary instance of your application
 when a second instance has been executed and calls `app.requestSingleInstanceLock()`.
@@ -496,35 +495,12 @@ non-minimized.
 
 **Note:** If the second instance is started by a different user than the first, the `argv` array will not include the arguments.
 
-**Note:** `ackCallback` allows the user to send data back to the
-second instance during the `app.requestSingleInstanceLock()` flow.
-This callback can be used for cases where the second instance
-needs to obtain additional information from the first instance
-before quitting.
-
-Currently, the limit on the message size is kMaxMessageLength,
-or around 32kB. To be safe, keep the amount of data passed to 31kB at most.
-
-In order to call the callback, `event.preventDefault()` must be called, first.
-If the callback is not called in either case, `null` will be sent back.
-If `event.preventDefault()` is not called, but `ackCallback` is called
-by the user in the event, then the behaviour is undefined.
-
 This event is guaranteed to be emitted after the `ready` event of `app`
 gets emitted.
 
 **Note:** Extra command line arguments might be added by Chromium,
 such as `--original-process-start-time`.
 
-### Event: 'first-instance-ack'
-
-Returns:
-
-* `event` Event
-* `additionalData` unknown - A JSON object of additional data passed from the first instance, in response to the first instance's `second-instance` event.
-
-This event will be emitted within the second instance during the call to `app.requestSingleInstanceLock()`, when the first instance calls the `ackCallback` provided by the `second-instance` event handler.
-
 ## Methods
 
 The `app` object has the following methods:
@@ -998,33 +974,21 @@ starts:
 const { app } = require('electron')
 let myWindow = null
 
-app.on('first-instance-ack', (event, additionalData) => {
-  // Print out the ack received from the first instance.
-  // Note this event handler must come before the requestSingleInstanceLock call.
-  // Expected output: '{"myAckKey":"myAckValue"}'
-  console.log(JSON.stringify(additionalData))
-})
-
 const additionalData = { myKey: 'myValue' }
 const gotTheLock = app.requestSingleInstanceLock(additionalData)
 
 if (!gotTheLock) {
   app.quit()
 } else {
-  app.on('second-instance', (event, commandLine, workingDirectory, additionalData, ackCallback) => {
-    // We must call preventDefault if we're sending back data.
-    event.preventDefault()
+  app.on('second-instance', (event, commandLine, workingDirectory, additionalData) => {
     // Print out data received from the second instance.
-    // Expected output: '{"myKey":"myValue"}'
-    console.log(JSON.stringify(additionalData))
+    console.log(additionalData)
 
     // Someone tried to run a second instance, we should focus our window.
     if (myWindow) {
       if (myWindow.isMinimized()) myWindow.restore()
       myWindow.focus()
     }
-    const ackData = { myAckKey: 'myAckValue' }
-    ackCallback(ackData)
   })
 
   // Create myWindow, load the rest of the app, etc...
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index f4512709cbcc5..cc794e8aec179 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -96,11 +96,11 @@ chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
 process_singleton.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+feat_add_data_parameter_to_processsingleton.patch
 load_v8_snapshot_in_browser_process.patch
 fix_patch_out_permissions_checks_in_exclusive_access.patch
 fix_aspect_ratio_with_max_size.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
-feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
diff --git a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
new file mode 100644
index 0000000000000..8a8f913281124
--- /dev/null
+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
@@ -0,0 +1,347 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Raymond Zhao <raymondzhao@microsoft.com>
+Date: Tue, 7 Sep 2021 14:54:25 -0700
+Subject: feat: Add data parameter to ProcessSingleton
+
+This patch adds an additional_data parameter to the constructor of
+ProcessSingleton, so that the second instance can send additional
+data over to the first instance while requesting the ProcessSingleton
+lock.
+
+On the Electron side, we then expose an extra parameter to the
+app.requestSingleInstanceLock API so that users can pass in a JSON
+object for the second instance to send to the first instance.
+
+diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
+index 5a64220aaf1309832dc0ad543e353de67fe0a779..55a2a78ce166a65cd11b26e0aa31968f6a10bec8 100644
+--- a/chrome/browser/process_singleton.h
++++ b/chrome/browser/process_singleton.h
+@@ -18,6 +18,7 @@
+ #include "base/files/file_path.h"
+ #include "base/memory/ref_counted.h"
+ #include "base/process/process.h"
++#include "base/containers/span.h"
+ #include "ui/gfx/native_widget_types.h"
+ 
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
+@@ -99,22 +100,25 @@ class ProcessSingleton {
+   // handled within the current browser instance or false if the remote process
+   // should handle it (i.e., because the current process is shutting down).
+   using NotificationCallback =
+-      base::RepeatingCallback<bool(const base::CommandLine& command_line,
+-                                   const base::FilePath& current_directory)>;
++       base::RepeatingCallback<bool(const base::CommandLine& command_line,
++                                   const base::FilePath& current_directory,
++                                   const std::vector<const uint8_t> additional_data)>;
+ 
+ #if BUILDFLAG(IS_WIN)
+   ProcessSingleton(const std::string& program_name,
+                    const base::FilePath& user_data_dir,
++                   const base::span<const uint8_t> additional_data,
+                    bool is_sandboxed,
+                    const NotificationCallback& notification_callback);
+ #else
+   ProcessSingleton(const base::FilePath& user_data_dir,
++                   const base::span<const uint8_t> additional_data,
+                    const NotificationCallback& notification_callback);
++#endif
+ 
+   ProcessSingleton(const ProcessSingleton&) = delete;
+   ProcessSingleton& operator=(const ProcessSingleton&) = delete;
+ 
+-#endif
+   ~ProcessSingleton();
+ 
+   // Notify another process, if available. Otherwise sets ourselves as the
+@@ -177,7 +181,10 @@ class ProcessSingleton {
+ #endif
+ 
+  private:
++  // A callback to run when the first instance receives data from the second.
+   NotificationCallback notification_callback_;  // Handler for notifications.
++  // Custom data to pass to the other instance during notify.
++  base::span<const uint8_t> additional_data_;
+ 
+ #if BUILDFLAG(IS_WIN)
+   bool EscapeVirtualization(const base::FilePath& user_data_dir);
+diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
+index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc4e2f5751 100644
+--- a/chrome/browser/process_singleton_posix.cc
++++ b/chrome/browser/process_singleton_posix.cc
+@@ -611,6 +611,7 @@ class ProcessSingleton::LinuxWatcher
+   // |reader| is for sending back ACK message.
+   void HandleMessage(const std::string& current_dir,
+                      const std::vector<std::string>& argv,
++                     const std::vector<const uint8_t> additional_data,
+                      SocketReader* reader);
+ 
+  private:
+@@ -665,13 +666,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+ }
+ 
+ void ProcessSingleton::LinuxWatcher::HandleMessage(
+-    const std::string& current_dir, const std::vector<std::string>& argv,
++    const std::string& current_dir,
++    const std::vector<std::string>& argv,
++    const std::vector<const uint8_t> additional_data,
+     SocketReader* reader) {
+   DCHECK(ui_task_runner_->BelongsToCurrentThread());
+   DCHECK(reader);
+ 
+   if (parent_->notification_callback_.Run(base::CommandLine(argv),
+-                                          base::FilePath(current_dir))) {
++                                          base::FilePath(current_dir),
++                                          std::move(additional_data))) {
+     // Send back "ACK" message to prevent the client process from starting up.
+     reader->FinishWithACK(kACKToken, std::size(kACKToken) - 1);
+   } else {
+@@ -719,7 +723,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+     }
+   }
+ 
+-  // Validate the message.  The shortest message is kStartToken\0x\0x
++  // Validate the message.  The shortest message kStartToken\0\00
++  // The shortest message with additional data is kStartToken\0\00\00\0.
+   const size_t kMinMessageLength = std::size(kStartToken) + 4;
+   if (bytes_read_ < kMinMessageLength) {
+     buf_[bytes_read_] = 0;
+@@ -749,10 +754,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+   tokens.erase(tokens.begin());
+   tokens.erase(tokens.begin());
+ 
++  size_t num_args;
++  base::StringToSizeT(tokens[0], &num_args);
++  std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
++
++  std::vector<const uint8_t> additional_data;
++  if (tokens.size() >= 3 + num_args) {
++    size_t additional_data_size;
++    base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
++    std::string remaining_args = base::JoinString(
++        base::make_span(tokens.begin() + 2 + num_args, tokens.end()),
++        std::string(1, kTokenDelimiter));
++    const uint8_t* additional_data_bits =
++        reinterpret_cast<const uint8_t*>(remaining_args.c_str());
++    additional_data = std::vector<const uint8_t>(
++        additional_data_bits, additional_data_bits + additional_data_size);
++  }
++
+   // Return to the UI thread to handle opening a new browser tab.
+   ui_task_runner_->PostTask(
+       FROM_HERE, base::BindOnce(&ProcessSingleton::LinuxWatcher::HandleMessage,
+-                                parent_, current_dir, tokens, this));
++                                parent_, current_dir, command_line,
++                                std::move(additional_data), this));
+   fd_watch_controller_.reset();
+ 
+   // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
+@@ -781,8 +804,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+ //
+ ProcessSingleton::ProcessSingleton(
+     const base::FilePath& user_data_dir,
++    const base::span<const uint8_t> additional_data,
+     const NotificationCallback& notification_callback)
+     : notification_callback_(notification_callback),
++      additional_data_(additional_data),
+       current_pid_(base::GetCurrentProcId()),
+       watcher_(new LinuxWatcher(this)) {
+   socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
+@@ -901,7 +926,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+              sizeof(socket_timeout));
+ 
+   // Found another process, prepare our command line
+-  // format is "START\0<current dir>\0<argv[0]>\0...\0<argv[n]>".
++  // format is "START\0<current-dir>\0<n-args>\0<argv[0]>\0...\0<argv[n]>
++  // \0<additional-data-length>\0<additional-data>".
+   std::string to_send(kStartToken);
+   to_send.push_back(kTokenDelimiter);
+ 
+@@ -911,11 +937,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+   to_send.append(current_dir.value());
+ 
+   const std::vector<std::string>& argv = cmd_line.argv();
++  to_send.push_back(kTokenDelimiter);
++  to_send.append(base::NumberToString(argv.size()));
+   for (auto it = argv.begin(); it != argv.end(); ++it) {
+     to_send.push_back(kTokenDelimiter);
+     to_send.append(*it);
+   }
+ 
++  size_t data_to_send_size = additional_data_.size_bytes();
++  if (data_to_send_size) {
++    to_send.push_back(kTokenDelimiter);
++    to_send.append(base::NumberToString(data_to_send_size));
++    to_send.push_back(kTokenDelimiter);
++    to_send.append(reinterpret_cast<const char*>(additional_data_.data()), data_to_send_size);
++  }
++
+   // Send the message
+   if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
+     // Try to kill the other process, because it might have been dead.
+diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
+index 0c87fc8ccb4511904f19b76ae5e03a5df6664391..c34d4fe10781e6b9286a43176f7312da4e815caf 100644
+--- a/chrome/browser/process_singleton_win.cc
++++ b/chrome/browser/process_singleton_win.cc
+@@ -80,10 +80,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
+ 
+ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+                       base::CommandLine* parsed_command_line,
+-                      base::FilePath* current_directory) {
++                      base::FilePath* current_directory,
++                      std::vector<const uint8_t>* parsed_additional_data) {
+   // We should have enough room for the shortest command (min_message_size)
+   // and also be a multiple of wchar_t bytes. The shortest command
+-  // possible is L"START\0\0" (empty current directory and command line).
++  // possible is L"START\0\0" (empty command line, current directory,
++  // and additional data).
+   static const int min_message_size = 7;
+   if (cds->cbData < min_message_size * sizeof(wchar_t) ||
+       cds->cbData % sizeof(wchar_t) != 0) {
+@@ -133,6 +135,37 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
+     const std::wstring cmd_line =
+         msg.substr(second_null + 1, third_null - second_null);
+     *parsed_command_line = base::CommandLine::FromString(cmd_line);
++
++    const std::wstring::size_type fourth_null =
++        msg.find_first_of(L'\0', third_null + 1);
++    if (fourth_null == std::wstring::npos ||
++        fourth_null == msg.length()) {
++      // No additional data was provided.
++      return true;
++    }
++
++    // Get length of the additional data.
++    const std::wstring additional_data_length_string =
++        msg.substr(third_null + 1, fourth_null - third_null);
++    size_t additional_data_length;
++    base::StringToSizeT(additional_data_length_string, &additional_data_length);
++
++    const std::wstring::size_type fifth_null =
++        msg.find_first_of(L'\0', fourth_null + 1);
++    if (fifth_null == std::wstring::npos ||
++        fifth_null == msg.length()) {
++      LOG(WARNING) << "Invalid format for start command, we need a string in 6 "
++        "parts separated by NULLs";
++    }
++
++    // Get the actual additional data.
++    const std::wstring additional_data =
++        msg.substr(fourth_null + 1, fifth_null - fourth_null);
++    const uint8_t* additional_data_bytes =
++        reinterpret_cast<const uint8_t*>(additional_data.c_str());
++    *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
++        additional_data_bytes + additional_data_length);
++
+     return true;
+   }
+   return false;
+@@ -154,13 +187,14 @@ bool ProcessLaunchNotification(
+ 
+   base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
+   base::FilePath current_directory;
+-  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
++  std::vector<const uint8_t> additional_data;
++  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory, &additional_data)) {
+     *result = TRUE;
+     return true;
+   }
+ 
+-  *result = notification_callback.Run(parsed_command_line, current_directory) ?
+-      TRUE : FALSE;
++  *result = notification_callback.Run(parsed_command_line,
++      current_directory, std::move(additional_data)) ? TRUE : FALSE;
+   return true;
+ }
+ 
+@@ -261,9 +295,11 @@ bool ProcessSingleton::EscapeVirtualization(
+ ProcessSingleton::ProcessSingleton(
+     const std::string& program_name,
+     const base::FilePath& user_data_dir,
++    const base::span<const uint8_t> additional_data,
+     bool is_app_sandboxed,
+     const NotificationCallback& notification_callback)
+     : notification_callback_(notification_callback),
++      additional_data_(additional_data),
+       program_name_(program_name),
+       is_app_sandboxed_(is_app_sandboxed),
+       is_virtualized_(false),
+@@ -290,7 +326,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
+     return PROCESS_NONE;
+   }
+ 
+-  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
++  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, additional_data_)) {
+     case chrome::NOTIFY_SUCCESS:
+       return PROCESS_NOTIFIED;
+     case chrome::NOTIFY_FAILED:
+diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
+index b64ed1d155a30582e48c9cdffcee9d0f25a53a6a..cfdb2d75532d270e3dd548eb7475a6cdbddf1016 100644
+--- a/chrome/browser/win/chrome_process_finder.cc
++++ b/chrome/browser/win/chrome_process_finder.cc
+@@ -36,7 +36,9 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
+   return base::win::MessageWindow::FindWindow(user_data_dir.value());
+ }
+ 
+-NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
++NotifyChromeResult AttemptToNotifyRunningChrome(
++    HWND remote_window,
++    const base::span<const uint8_t> additional_data) {
+   TRACE_EVENT0("startup", "AttemptToNotifyRunningChrome");
+ 
+   DCHECK(remote_window);
+@@ -50,7 +52,8 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
+   }
+ 
+   // Send the command line to the remote chrome window.
+-  // Format is "START\0<<<current directory>>>\0<<<commandline>>>".
++  // Format is
++  // "START\0<current-directory>\0<command-line>\0<additional-data-length>\0<additional-data>".
+   std::wstring to_send(L"START\0", 6);  // want the NULL in the string.
+   base::FilePath cur_dir;
+   if (!base::GetCurrentDirectory(&cur_dir)) {
+@@ -64,6 +67,22 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
+       base::CommandLine::ForCurrentProcess()->GetCommandLineString());
+   to_send.append(L"\0", 1);  // Null separator.
+ 
++  size_t additional_data_size = additional_data.size_bytes();
++  if (additional_data_size) {
++    // Send over the size, because the reinterpret cast to wchar_t could
++    // add padding.
++    to_send.append(base::UTF8ToWide(base::NumberToString(additional_data_size)));
++    to_send.append(L"\0", 1);  // Null separator.
++
++    size_t padded_size = additional_data_size / sizeof(wchar_t);
++    if (additional_data_size % sizeof(wchar_t) != 0) {
++      padded_size++;
++    }
++    to_send.append(reinterpret_cast<const wchar_t*>(additional_data.data()),
++                   padded_size);
++    to_send.append(L"\0", 1);  // Null separator.
++  }
++
+   // Allow the current running browser window to make itself the foreground
+   // window (otherwise it will just flash in the taskbar).
+   ::AllowSetForegroundWindow(process_id);
+diff --git a/chrome/browser/win/chrome_process_finder.h b/chrome/browser/win/chrome_process_finder.h
+index 5516673cee019f6060077091e59498bf9038cd6e..8edea5079b46c2cba67833114eb9c21d85cfc22d 100644
+--- a/chrome/browser/win/chrome_process_finder.h
++++ b/chrome/browser/win/chrome_process_finder.h
+@@ -7,6 +7,7 @@
+ 
+ #include <windows.h>
+ 
++#include "base/containers/span.h"
+ #include "base/time/time.h"
+ 
+ namespace base {
+@@ -27,7 +28,9 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir);
+ // Attempts to send the current command line to an already running instance of
+ // Chrome via a WM_COPYDATA message.
+ // Returns true if a running Chrome is found and successfully notified.
+-NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window);
++NotifyChromeResult AttemptToNotifyRunningChrome(
++    HWND remote_window,
++    const base::span<const uint8_t> additional_data);
+ 
+ // Changes the notification timeout to |new_timeout|, returns the old timeout.
+ base::TimeDelta SetNotificationTimeoutForTesting(base::TimeDelta new_timeout);
diff --git a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch b/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
deleted file mode 100644
index cd4f452726579..0000000000000
--- a/patches/chromium/feat_add_data_transfer_to_requestsingleinstancelock.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raymond Zhao <raymondzhao@microsoft.com>
-Date: Tue, 7 Sep 2021 14:54:25 -0700
-Subject: feat: Add data transfer mechanism to requestSingleInstanceLock flow
-
-This patch adds code that allows for the second instance to send
-additional data to the first instance, and for the first instance
-to send additional data back to the second instance, during the
-app.requestSingleInstanceLock call.
-
-Firstly, this patch adds an additional_data parameter
-to the constructor of ProcessSingleton, so that the second instance
-can send additional data over to the first instance
-while requesting the ProcessSingleton lock.
-
-Then, we add additional processing to the second-instance event, both
-so the first instance can receive additional data from the second
-instance, but also so the second instance can send back additional
-data to the first instance if needed.
-
-diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 5a64220aaf1309832dc0ad543e353de67fe0a779..5b701b1361707b610ed60c344e441e67ca701362 100644
---- a/chrome/browser/process_singleton.h
-+++ b/chrome/browser/process_singleton.h
-@@ -18,6 +18,7 @@
- #include "base/files/file_path.h"
- #include "base/memory/ref_counted.h"
- #include "base/process/process.h"
-+#include "base/containers/span.h"
- #include "ui/gfx/native_widget_types.h"
- 
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
-@@ -93,6 +94,9 @@ class ProcessSingleton {
- 
-   static constexpr int kNumNotifyResults = LAST_VALUE + 1;
- 
-+  using NotificationAckCallback =
-+      base::RepeatingCallback<void(const base::span<const uint8_t>* ack_data)>;
-+
-   // Implement this callback to handle notifications from other processes. The
-   // callback will receive the command line and directory with which the other
-   // Chrome process was launched. Return true if the command line will be
-@@ -100,21 +104,27 @@ class ProcessSingleton {
-   // should handle it (i.e., because the current process is shutting down).
-   using NotificationCallback =
-       base::RepeatingCallback<bool(const base::CommandLine& command_line,
--                                   const base::FilePath& current_directory)>;
-+                                   const base::FilePath& current_directory,
-+                                   const std::vector<uint8_t> additional_data,
-+                                   const NotificationAckCallback& ack_callback)>;
- 
- #if BUILDFLAG(IS_WIN)
-   ProcessSingleton(const std::string& program_name,
-                    const base::FilePath& user_data_dir,
-+                   const base::span<const uint8_t> additional_data,
-                    bool is_sandboxed,
--                   const NotificationCallback& notification_callback);
-+                   const NotificationCallback& notification_callback,
-+                   const NotificationAckCallback& ack_notification_callback);
- #else
-   ProcessSingleton(const base::FilePath& user_data_dir,
--                   const NotificationCallback& notification_callback);
-+                   const base::span<const uint8_t> additional_data,
-+                   const NotificationCallback& notification_callback,
-+                   const NotificationAckCallback& ack_notification_callback);
-+#endif
- 
-   ProcessSingleton(const ProcessSingleton&) = delete;
-   ProcessSingleton& operator=(const ProcessSingleton&) = delete;
- 
--#endif
-   ~ProcessSingleton();
- 
-   // Notify another process, if available. Otherwise sets ourselves as the
-@@ -177,7 +187,13 @@ class ProcessSingleton {
- #endif
- 
-  private:
--  NotificationCallback notification_callback_;  // Handler for notifications.
-+  // A callback to run when the first instance receives data from the second.
-+  NotificationCallback notification_callback_;
-+  // A callback to run when the second instance
-+  // receives an acknowledgement from the first.
-+  NotificationAckCallback notification_ack_callback_;
-+  // Custom data to pass to the other instance during notify.
-+  base::span<const uint8_t> additional_data_;
- 
- #if BUILDFLAG(IS_WIN)
-   bool EscapeVirtualization(const base::FilePath& user_data_dir);
-@@ -190,6 +206,7 @@ class ProcessSingleton {
-   HANDLE lock_file_;
-   base::FilePath user_data_dir_;
-   ShouldKillRemoteProcessCallback should_kill_remote_process_callback_;
-+  HANDLE ack_pipe_;
- #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
-   // Return true if the given pid is one of our child processes.
-   // Assumes that the current pid is the root of all pids of the current
-diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 9bb12894da06fc7d281daced754b240afa9bedeb..52717600e7346daeb0726c177162c718da53500a 100644
---- a/chrome/browser/process_singleton_posix.cc
-+++ b/chrome/browser/process_singleton_posix.cc
-@@ -145,7 +145,7 @@ const char kACKToken[] = "ACK";
- const char kShutdownToken[] = "SHUTDOWN";
- const char kTokenDelimiter = '\0';
- const int kMaxMessageLength = 32 * 1024;
--const int kMaxACKMessageLength = std::size(kShutdownToken) - 1;
-+const int kMaxACKMessageLength = kMaxMessageLength;
- 
- bool g_disable_prompt = false;
- bool g_skip_is_chrome_process_check = false;
-@@ -611,6 +611,7 @@ class ProcessSingleton::LinuxWatcher
-   // |reader| is for sending back ACK message.
-   void HandleMessage(const std::string& current_dir,
-                      const std::vector<std::string>& argv,
-+                     const std::vector<uint8_t> additional_data,
-                      SocketReader* reader);
- 
-  private:
-@@ -635,6 +636,9 @@ class ProcessSingleton::LinuxWatcher
-   // The ProcessSingleton that owns us.
-   ProcessSingleton* const parent_;
- 
-+  bool ack_callback_called_ = false;
-+  void AckCallback(SocketReader* reader, const base::span<const uint8_t>* response);
-+
-   std::set<std::unique_ptr<SocketReader>, base::UniquePtrComparator> readers_;
- };
- 
-@@ -665,16 +669,21 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
- }
- 
- void ProcessSingleton::LinuxWatcher::HandleMessage(
--    const std::string& current_dir, const std::vector<std::string>& argv,
-+    const std::string& current_dir,
-+    const std::vector<std::string>& argv,
-+    const std::vector<uint8_t> additional_data,
-     SocketReader* reader) {
-   DCHECK(ui_task_runner_->BelongsToCurrentThread());
-   DCHECK(reader);
- 
--  if (parent_->notification_callback_.Run(base::CommandLine(argv),
--                                          base::FilePath(current_dir))) {
--    // Send back "ACK" message to prevent the client process from starting up.
--    reader->FinishWithACK(kACKToken, std::size(kACKToken) - 1);
--  } else {
-+  auto wrapped_ack_callback =
-+      base::BindRepeating(&ProcessSingleton::LinuxWatcher::AckCallback,
-+                          base::Unretained(this), reader);
-+  ack_callback_called_ = false;
-+  if (!parent_->notification_callback_.Run(base::CommandLine(argv),
-+                                          base::FilePath(current_dir),
-+                                          std::move(additional_data),
-+                                          wrapped_ack_callback)) {
-     LOG(WARNING) << "Not handling interprocess notification as browser"
-                     " is shutting down";
-     // Send back "SHUTDOWN" message, so that the client process can start up
-@@ -684,6 +693,22 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
-   }
- }
- 
-+void ProcessSingleton::LinuxWatcher::AckCallback(
-+    SocketReader* reader,
-+    const base::span<const uint8_t>* response) {
-+  // Send back "ACK" message to prevent the client process from starting up.
-+  if (!ack_callback_called_) {
-+    ack_callback_called_ = true;
-+    std::string ack_message;
-+    ack_message.append(kACKToken, std::size(kACKToken) - 1);
-+    if (response && response->size_bytes()) {
-+      ack_message.append(reinterpret_cast<const char*>(response->data()),
-+                         response->size_bytes());
-+    }
-+    reader->FinishWithACK(ack_message.c_str(), ack_message.size());
-+  }
-+}
-+
- void ProcessSingleton::LinuxWatcher::RemoveSocketReader(SocketReader* reader) {
-   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-   DCHECK(reader);
-@@ -719,7 +744,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
-     }
-   }
- 
--  // Validate the message.  The shortest message is kStartToken\0x\0x
-+  // Validate the message.  The shortest message kStartToken\0\00
-+  // The shortest message with additional data is kStartToken\0\00\00\0.
-   const size_t kMinMessageLength = std::size(kStartToken) + 4;
-   if (bytes_read_ < kMinMessageLength) {
-     buf_[bytes_read_] = 0;
-@@ -749,10 +775,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
-   tokens.erase(tokens.begin());
-   tokens.erase(tokens.begin());
- 
-+  size_t num_args;
-+  base::StringToSizeT(tokens[0], &num_args);
-+  std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
-+
-+  std::vector<uint8_t> additional_data;
-+  if (tokens.size() >= 3 + num_args) {
-+    size_t additional_data_size;
-+    base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
-+    std::string remaining_args = base::JoinString(
-+        base::make_span(tokens.begin() + 2 + num_args, tokens.end()),
-+        std::string(1, kTokenDelimiter));
-+    const uint8_t* additional_data_bits =
-+        reinterpret_cast<const uint8_t*>(remaining_args.c_str());
-+    additional_data = std::vector<uint8_t>(additional_data_bits,
-+        additional_data_bits + additional_data_size);
-+  }
-+
-   // Return to the UI thread to handle opening a new browser tab.
-   ui_task_runner_->PostTask(
-       FROM_HERE, base::BindOnce(&ProcessSingleton::LinuxWatcher::HandleMessage,
--                                parent_, current_dir, tokens, this));
-+                                parent_, current_dir, command_line,
-+                                std::move(additional_data), this));
-   fd_watch_controller_.reset();
- 
-   // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -781,8 +825,12 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
- //
- ProcessSingleton::ProcessSingleton(
-     const base::FilePath& user_data_dir,
--    const NotificationCallback& notification_callback)
-+    const base::span<const uint8_t> additional_data,
-+    const NotificationCallback& notification_callback,
-+    const NotificationAckCallback& notification_ack_callback)
-     : notification_callback_(notification_callback),
-+      notification_ack_callback_(notification_ack_callback),
-+      additional_data_(additional_data),
-       current_pid_(base::GetCurrentProcId()),
-       watcher_(new LinuxWatcher(this)) {
-   socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -901,7 +949,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
-              sizeof(socket_timeout));
- 
-   // Found another process, prepare our command line
--  // format is "START\0<current dir>\0<argv[0]>\0...\0<argv[n]>".
-+  // format is "START\0<current-dir>\0<n-args>\0<argv[0]>\0...\0<argv[n]>
-+  // \0<additional-data-length>\0<additional-data>".
-   std::string to_send(kStartToken);
-   to_send.push_back(kTokenDelimiter);
- 
-@@ -911,11 +960,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
-   to_send.append(current_dir.value());
- 
-   const std::vector<std::string>& argv = cmd_line.argv();
-+  to_send.push_back(kTokenDelimiter);
-+  to_send.append(base::NumberToString(argv.size()));
-   for (auto it = argv.begin(); it != argv.end(); ++it) {
-     to_send.push_back(kTokenDelimiter);
-     to_send.append(*it);
-   }
- 
-+  size_t data_to_send_size = additional_data_.size_bytes();
-+  if (data_to_send_size) {
-+    to_send.push_back(kTokenDelimiter);
-+    to_send.append(base::NumberToString(data_to_send_size));
-+    to_send.push_back(kTokenDelimiter);
-+    to_send.append(reinterpret_cast<const char*>(additional_data_.data()), data_to_send_size);
-+  }
-+
-   // Send the message
-   if (!WriteToSocket(socket.fd(), to_send.data(), to_send.length())) {
-     // Try to kill the other process, because it might have been dead.
-@@ -957,6 +1016,17 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
-       linux_ui->NotifyWindowManagerStartupComplete();
- #endif
- 
-+    size_t ack_data_len = len - (std::size(kACKToken) - 1);
-+    if (ack_data_len) {
-+      const uint8_t* raw_ack_data =
-+          reinterpret_cast<const uint8_t*>(buf + std::size(kACKToken) - 1);
-+      base::span<const uint8_t> ack_data =
-+          base::make_span(raw_ack_data, raw_ack_data + ack_data_len);
-+      notification_ack_callback_.Run(&ack_data);
-+    } else {
-+      notification_ack_callback_.Run(nullptr);
-+    }
-+
-     // Assume the other process is handling the request.
-     return PROCESS_NOTIFIED;
-   }
-diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 0c87fc8ccb4511904f19b76ae5e03a5df6664391..83ede77121c5dadbde8b0a4132de1dba6eeb5b52 100644
---- a/chrome/browser/process_singleton_win.cc
-+++ b/chrome/browser/process_singleton_win.cc
-@@ -13,15 +13,18 @@
- #include "base/command_line.h"
- #include "base/debug/activity_tracker.h"
- #include "base/files/file_path.h"
-+#include "base/files/file_util.h"
- #include "base/logging.h"
- #include "base/metrics/histogram_functions.h"
- #include "base/metrics/histogram_macros.h"
- #include "base/process/process.h"
- #include "base/process/process_info.h"
- #include "base/strings/escape.h"
-+#include "base/rand_util.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/utf_string_conversions.h"
- #include "base/time/time.h"
-+#include "base/timer/timer.h"
- #include "base/trace_event/base_tracing.h"
- #include "base/win/registry.h"
- #include "base/win/scoped_handle.h"
-@@ -45,6 +48,13 @@
- namespace {
- 
- const char kLockfile[] = "lockfile";
-+const DWORD kPipeTimeout = 10000;
-+const DWORD kMaxMessageLength = 32 * 1024;
-+
-+std::unique_ptr<std::vector<uint8_t>> g_ack_data;
-+base::OneShotTimer g_ack_timer;
-+HANDLE g_write_ack_pipe;
-+bool g_write_ack_callback_called = false;
- 
- // A helper class that acquires the given |mutex| while the AutoLockMutex is in
- // scope.
-@@ -80,10 +90,12 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
- 
- bool ParseCommandLine(const COPYDATASTRUCT* cds,
-                       base::CommandLine* parsed_command_line,
--                      base::FilePath* current_directory) {
-+                      base::FilePath* current_directory,
-+                      std::vector<uint8_t>* parsed_additional_data) {
-   // We should have enough room for the shortest command (min_message_size)
-   // and also be a multiple of wchar_t bytes. The shortest command
--  // possible is L"START\0\0" (empty current directory and command line).
-+  // possible is L"START\0\0" (empty command line, current directory,
-+  // and additional data).
-   static const int min_message_size = 7;
-   if (cds->cbData < min_message_size * sizeof(wchar_t) ||
-       cds->cbData % sizeof(wchar_t) != 0) {
-@@ -133,11 +145,82 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
-     const std::wstring cmd_line =
-         msg.substr(second_null + 1, third_null - second_null);
-     *parsed_command_line = base::CommandLine::FromString(cmd_line);
-+
-+    const std::wstring::size_type fourth_null =
-+        msg.find_first_of(L'\0', third_null + 1);
-+    if (fourth_null == std::wstring::npos ||
-+        fourth_null == msg.length()) {
-+      // No additional data was provided.
-+      return true;
-+    }
-+
-+    // Get length of the additional data.
-+    const std::wstring additional_data_length_string =
-+        msg.substr(third_null + 1, fourth_null - third_null);
-+    size_t additional_data_length;
-+    base::StringToSizeT(additional_data_length_string, &additional_data_length);
-+
-+    const std::wstring::size_type fifth_null =
-+        msg.find_first_of(L'\0', fourth_null + 1);
-+    if (fifth_null == std::wstring::npos ||
-+        fifth_null == msg.length()) {
-+      LOG(WARNING) << "Invalid format for start command, we need a string in 6 "
-+        "parts separated by NULLs";
-+    }
-+
-+    // Get the actual additional data.
-+    const std::wstring additional_data =
-+        msg.substr(fourth_null + 1, fifth_null - fourth_null);
-+    const uint8_t* additional_data_bytes =
-+        reinterpret_cast<const uint8_t*>(additional_data.c_str());
-+    *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
-+        additional_data_bytes + additional_data_length);
-+
-     return true;
-   }
-   return false;
- }
- 
-+void StoreAck(const base::span<const uint8_t>* ack_data) {
-+  if (ack_data) {
-+    g_ack_data = std::make_unique<std::vector<uint8_t>>(ack_data->begin(),
-+                                                        ack_data->end());
-+  } else {
-+    g_ack_data = nullptr;
-+  }
-+}
-+
-+void SendBackAck() {
-+  // This is the first instance sending the ack back to the second instance.
-+  if (!g_write_ack_callback_called) {
-+    g_write_ack_callback_called = true;
-+    const uint8_t* data_buffer = nullptr;
-+    DWORD data_to_send_size = 0;
-+    if (g_ack_data) {
-+      data_buffer = g_ack_data->data();
-+      DWORD ack_data_size = g_ack_data->size() * sizeof(uint8_t);
-+      data_to_send_size = (ack_data_size < kMaxMessageLength) ? ack_data_size : kMaxMessageLength;
-+    }
-+
-+    ::ConnectNamedPipe(g_write_ack_pipe, NULL);
-+
-+    DWORD bytes_written = 0;
-+    ::WriteFile(g_write_ack_pipe,
-+      (LPCVOID)data_buffer,
-+      data_to_send_size,
-+      &bytes_written,
-+      NULL);
-+    DCHECK(bytes_written == data_to_send_size);
-+
-+    ::FlushFileBuffers(g_write_ack_pipe);
-+    ::DisconnectNamedPipe(g_write_ack_pipe);
-+
-+    if (g_ack_data) {
-+      g_ack_data.reset();
-+    }
-+  }
-+}
-+
- bool ProcessLaunchNotification(
-     const ProcessSingleton::NotificationCallback& notification_callback,
-     UINT message,
-@@ -151,16 +234,35 @@ bool ProcessLaunchNotification(
- 
-   // Handle the WM_COPYDATA message from another process.
-   const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
--
-   base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
-   base::FilePath current_directory;
--  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
-+  std::vector<uint8_t> additional_data;
-+  if (!ParseCommandLine(cds, &parsed_command_line, &current_directory,
-+                        &additional_data)) {
-     *result = TRUE;
-     return true;
-   }
- 
--  *result = notification_callback.Run(parsed_command_line, current_directory) ?
--      TRUE : FALSE;
-+  // notification_callback.Run waits for StoreAck to
-+  // run to completion before moving onwards.
-+  // Therefore, we cannot directly send the SendBackAck
-+  // callback instead, as it would hang the program
-+  // during the ConnectNamedPipe call.
-+  g_write_ack_callback_called = false;
-+  *result = notification_callback.Run(parsed_command_line, current_directory,
-+                                      std::move(additional_data),
-+                                      base::BindRepeating(&StoreAck))
-+                ? TRUE
-+                : FALSE;
-+  if (*result) {
-+    // If *result is TRUE, we return NOTIFY_SUCCESS.
-+    // Only for that case does the second process read
-+    // the acknowledgement. Therefore, only send back
-+    // the acknowledgement if *result is TRUE,
-+    // otherwise the program hangs during the ConnectNamedPipe call.
-+    g_ack_timer.Start(FROM_HERE, base::Seconds(0),
-+                      base::BindOnce(&SendBackAck));
-+  }
-   return true;
- }
- 
-@@ -261,9 +363,13 @@ bool ProcessSingleton::EscapeVirtualization(
- ProcessSingleton::ProcessSingleton(
-     const std::string& program_name,
-     const base::FilePath& user_data_dir,
-+    const base::span<const uint8_t> additional_data,
-     bool is_app_sandboxed,
--    const NotificationCallback& notification_callback)
-+    const NotificationCallback& notification_callback,
-+    const NotificationAckCallback& notification_ack_callback)
-     : notification_callback_(notification_callback),
-+      notification_ack_callback_(notification_ack_callback),
-+      additional_data_(additional_data),
-       program_name_(program_name),
-       is_app_sandboxed_(is_app_sandboxed),
-       is_virtualized_(false),
-@@ -278,6 +384,47 @@ ProcessSingleton::~ProcessSingleton() {
-     ::CloseHandle(lock_file_);
- }
- 
-+void ReadAck(const ProcessSingleton::NotificationAckCallback& ack_callback,
-+             const std::string program_name,
-+             base::FilePath& user_data_dir) {
-+  // We are reading the ack from the first instance.
-+  // First, wait for the pipe.
-+  HWND remote_window = chrome::FindRunningChromeWindow(user_data_dir);
-+  DWORD process_id;
-+  DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
-+  std::string identifier = base::NumberToString(process_id) +
-+      base::NumberToString(thread_id);
-+  std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
-+        program_name);
-+  const LPCWSTR w_pipe_name = pipe_name.c_str();
-+  ::WaitNamedPipe(w_pipe_name, NMPWAIT_USE_DEFAULT_WAIT);
-+
-+  HANDLE read_ack_pipe = ::CreateFile(w_pipe_name,
-+    GENERIC_READ,
-+    FILE_SHARE_READ,
-+    NULL,
-+    OPEN_EXISTING,
-+    FILE_ATTRIBUTE_NORMAL,
-+    NULL);
-+  CHECK(read_ack_pipe != INVALID_HANDLE_VALUE);
-+
-+  DWORD bytes_read;
-+  uint8_t read_ack_buffer[kMaxMessageLength];
-+  ::ReadFile(read_ack_pipe,
-+    (LPVOID)read_ack_buffer,
-+    kMaxMessageLength,
-+    &bytes_read,
-+    NULL);
-+
-+  if (!bytes_read) {
-+    ack_callback.Run(nullptr);
-+  } else {
-+    base::span<const uint8_t> out_span(read_ack_buffer, read_ack_buffer + bytes_read);
-+    ack_callback.Run(&out_span);
-+  }
-+  ::CloseHandle(read_ack_pipe);
-+}
-+
- // Code roughly based on Mozilla.
- ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-   TRACE_EVENT0("startup", "ProcessSingleton::NotifyOtherProcess");
-@@ -290,8 +437,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-     return PROCESS_NONE;
-   }
- 
--  switch (chrome::AttemptToNotifyRunningChrome(remote_window_)) {
-+  switch (chrome::AttemptToNotifyRunningChrome(remote_window_, additional_data_)) {
-     case chrome::NOTIFY_SUCCESS:
-+      ReadAck(notification_ack_callback_, program_name_, user_data_dir_);
-       return PROCESS_NOTIFIED;
-     case chrome::NOTIFY_FAILED:
-       remote_window_ = NULL;
-@@ -429,6 +577,26 @@ bool ProcessSingleton::Create() {
-           << "Lock file can not be created! Error code: " << error;
- 
-       if (lock_file_ != INVALID_HANDLE_VALUE) {
-+        // We are the first instance. Create a pipe to send out ack data.
-+        // Create a per-process pipename using a combination of the
-+        // username, process id, thread id, and program name. Pipe names max
-+        // at 256 characters, can include any character other than a backslash
-+        std::string identifier = base::NumberToString(::GetCurrentProcessId()) +
-+              base::NumberToString(::GetCurrentThreadId());
-+        std::wstring pipe_name = base::UTF8ToWide("\\\\.\\pipe\\" + identifier +
-+              program_name_);
-+        const LPCWSTR w_pipe_name = pipe_name.c_str();
-+        ack_pipe_ = ::CreateNamedPipe(w_pipe_name,
-+          PIPE_ACCESS_OUTBOUND,
-+          PIPE_TYPE_BYTE | PIPE_REJECT_REMOTE_CLIENTS,
-+          PIPE_UNLIMITED_INSTANCES,
-+          kMaxMessageLength,
-+          0,
-+          kPipeTimeout,
-+          NULL);
-+        CHECK(ack_pipe_ != INVALID_HANDLE_VALUE);
-+        g_write_ack_pipe = ack_pipe_;
-+
-         // Set the window's title to the path of our user data directory so
-         // other Chrome instances can decide if they should forward to us.
-         TRACE_EVENT0("startup", "ProcessSingleton::Create:CreateWindow");
-@@ -456,6 +624,7 @@ bool ProcessSingleton::Create() {
- }
- 
- void ProcessSingleton::Cleanup() {
-+  ::CloseHandle(ack_pipe_);
- }
- 
- void ProcessSingleton::OverrideShouldKillRemoteProcessCallbackForTesting(
-diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
-index b64ed1d155a30582e48c9cdffcee9d0f25a53a6a..ce851d09d501ebcc6d6c4065e746e869d5275b2b 100644
---- a/chrome/browser/win/chrome_process_finder.cc
-+++ b/chrome/browser/win/chrome_process_finder.cc
-@@ -36,9 +36,10 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
-   return base::win::MessageWindow::FindWindow(user_data_dir.value());
- }
- 
--NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
-+NotifyChromeResult AttemptToNotifyRunningChrome(
-+    HWND remote_window,
-+    const base::span<const uint8_t> additional_data) {
-   TRACE_EVENT0("startup", "AttemptToNotifyRunningChrome");
--
-   DCHECK(remote_window);
-   DWORD process_id = 0;
-   DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
-@@ -50,7 +51,8 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
-   }
- 
-   // Send the command line to the remote chrome window.
--  // Format is "START\0<<<current directory>>>\0<<<commandline>>>".
-+  // Format is
-+  // "START\0<current-directory>\0<command-line>\0<additional-data-length>\0<additional-data>".
-   std::wstring to_send(L"START\0", 6);  // want the NULL in the string.
-   base::FilePath cur_dir;
-   if (!base::GetCurrentDirectory(&cur_dir)) {
-@@ -64,6 +66,22 @@ NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window) {
-       base::CommandLine::ForCurrentProcess()->GetCommandLineString());
-   to_send.append(L"\0", 1);  // Null separator.
- 
-+  size_t additional_data_size = additional_data.size_bytes();
-+  if (additional_data_size) {
-+    // Send over the size, because the reinterpret cast to wchar_t could
-+    // add padding.
-+    to_send.append(base::UTF8ToWide(base::NumberToString(additional_data_size)));
-+    to_send.append(L"\0", 1);  // Null separator.
-+
-+    size_t padded_size = additional_data_size / sizeof(wchar_t);
-+    if (additional_data_size % sizeof(wchar_t) != 0) {
-+      padded_size++;
-+    }
-+    to_send.append(reinterpret_cast<const wchar_t*>(additional_data.data()),
-+                   padded_size);
-+    to_send.append(L"\0", 1);  // Null separator.
-+  }
-+
-   // Allow the current running browser window to make itself the foreground
-   // window (otherwise it will just flash in the taskbar).
-   ::AllowSetForegroundWindow(process_id);
-diff --git a/chrome/browser/win/chrome_process_finder.h b/chrome/browser/win/chrome_process_finder.h
-index 5516673cee019f6060077091e59498bf9038cd6e..8edea5079b46c2cba67833114eb9c21d85cfc22d 100644
---- a/chrome/browser/win/chrome_process_finder.h
-+++ b/chrome/browser/win/chrome_process_finder.h
-@@ -7,6 +7,7 @@
- 
- #include <windows.h>
- 
-+#include "base/containers/span.h"
- #include "base/time/time.h"
- 
- namespace base {
-@@ -27,7 +28,9 @@ HWND FindRunningChromeWindow(const base::FilePath& user_data_dir);
- // Attempts to send the current command line to an already running instance of
- // Chrome via a WM_COPYDATA message.
- // Returns true if a running Chrome is found and successfully notified.
--NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window);
-+NotifyChromeResult AttemptToNotifyRunningChrome(
-+    HWND remote_window,
-+    const base::span<const uint8_t> additional_data);
- 
- // Changes the notification timeout to |new_timeout|, returns the old timeout.
- base::TimeDelta SetNotificationTimeoutForTesting(base::TimeDelta new_timeout);
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 1cff2713debe4..975cb94a33d57 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -522,24 +522,21 @@ bool NotificationCallbackWrapper(
     const base::RepeatingCallback<
         void(const base::CommandLine& command_line,
              const base::FilePath& current_directory,
-             const std::vector<uint8_t> additional_data,
-             const ProcessSingleton::NotificationAckCallback& ack_callback)>&
-        callback,
+             const std::vector<const uint8_t> additional_data)>& callback,
     const base::CommandLine& cmd,
     const base::FilePath& cwd,
-    const std::vector<uint8_t> additional_data,
-    const ProcessSingleton::NotificationAckCallback& ack_callback) {
+    const std::vector<const uint8_t> additional_data) {
   // Make sure the callback is called after app gets ready.
   if (Browser::Get()->is_ready()) {
-    callback.Run(cmd, cwd, std::move(additional_data), ack_callback);
+    callback.Run(cmd, cwd, std::move(additional_data));
   } else {
     scoped_refptr<base::SingleThreadTaskRunner> task_runner(
         base::ThreadTaskRunnerHandle::Get());
 
     // Make a copy of the span so that the data isn't lost.
-    task_runner->PostTask(
-        FROM_HERE, base::BindOnce(base::IgnoreResult(callback), cmd, cwd,
-                                  std::move(additional_data), ack_callback));
+    task_runner->PostTask(FROM_HERE,
+                          base::BindOnce(base::IgnoreResult(callback), cmd, cwd,
+                                         std::move(additional_data)));
   }
   // ProcessSingleton needs to know whether current process is quiting.
   return !Browser::Get()->is_shutting_down();
@@ -1084,52 +1081,14 @@ std::string App::GetLocaleCountryCode() {
   return region.size() == 2 ? region : std::string();
 }
 
-void App::OnFirstInstanceAck(
-    const base::span<const uint8_t>* first_instance_data) {
-  v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-  v8::HandleScope handle_scope(isolate);
-  base::Value data_to_send;
-  if (first_instance_data) {
-    // Don't send back the local directly, because it might be empty.
-    v8::Local<v8::Value> data_local;
-    data_local = DeserializeV8Value(isolate, *first_instance_data);
-    if (!data_local.IsEmpty()) {
-      gin::ConvertFromV8(isolate, data_local, &data_to_send);
-    }
-  }
-  Emit("first-instance-ack", data_to_send);
-}
-
-// This function handles the user calling
-// the callback parameter sent out by the second-instance event.
-static void AckCallbackWrapper(
-    const ProcessSingleton::NotificationAckCallback& ack_callback,
-    gin::Arguments* args) {
-  blink::CloneableMessage ack_message;
-  args->GetNext(&ack_message);
-  if (!ack_message.encoded_message.empty()) {
-    ack_callback.Run(&ack_message.encoded_message);
-  } else {
-    ack_callback.Run(nullptr);
-  }
-}
-
-void App::OnSecondInstance(
-    const base::CommandLine& cmd,
-    const base::FilePath& cwd,
-    const std::vector<uint8_t> additional_data,
-    const ProcessSingleton::NotificationAckCallback& ack_callback) {
+void App::OnSecondInstance(const base::CommandLine& cmd,
+                           const base::FilePath& cwd,
+                           const std::vector<const uint8_t> additional_data) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Value> data_value =
       DeserializeV8Value(isolate, std::move(additional_data));
-  auto cb = base::BindRepeating(&AckCallbackWrapper, ack_callback);
-  bool prevent_default =
-      Emit("second-instance", cmd.argv(), cwd, data_value, cb);
-  if (!prevent_default) {
-    // Call the callback ourselves, and send back nothing.
-    ack_callback.Run(nullptr);
-  }
+  Emit("second-instance", cmd.argv(), cwd, data_value);
 }
 
 bool App::HasSingleInstanceLock() const {
@@ -1150,9 +1109,6 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) {
   base::CreateDirectoryAndGetError(user_dir, nullptr);
 
   auto cb = base::BindRepeating(&App::OnSecondInstance, base::Unretained(this));
-  auto wrapped_cb = base::BindRepeating(NotificationCallbackWrapper, cb);
-  auto ack_cb =
-      base::BindRepeating(&App::OnFirstInstanceAck, base::Unretained(this));
 
   blink::CloneableMessage additional_data_message;
   args->GetNext(&additional_data_message);
@@ -1161,10 +1117,11 @@ bool App::RequestSingleInstanceLock(gin::Arguments* args) {
       IsSandboxEnabled(base::CommandLine::ForCurrentProcess());
   process_singleton_ = std::make_unique<ProcessSingleton>(
       program_name, user_dir, additional_data_message.encoded_message,
-      app_is_sandboxed, wrapped_cb, ack_cb);
+      app_is_sandboxed, base::BindRepeating(NotificationCallbackWrapper, cb));
 #else
   process_singleton_ = std::make_unique<ProcessSingleton>(
-      user_dir, additional_data_message.encoded_message, wrapped_cb, ack_cb);
+      user_dir, additional_data_message.encoded_message,
+      base::BindRepeating(NotificationCallbackWrapper, cb));
 #endif
 
   switch (process_singleton_->NotifyOtherProcessOrCreate()) {
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index ebf3cf247b67c..d7ff219e0871f 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -193,12 +193,9 @@ class App : public ElectronBrowserClient::Delegate,
   void SetDesktopName(const std::string& desktop_name);
   std::string GetLocale();
   std::string GetLocaleCountryCode();
-  void OnFirstInstanceAck(const base::span<const uint8_t>* first_instance_data);
-  void OnSecondInstance(
-      const base::CommandLine& cmd,
-      const base::FilePath& cwd,
-      const std::vector<uint8_t> additional_data,
-      const ProcessSingleton::NotificationAckCallback& ack_callback);
+  void OnSecondInstance(const base::CommandLine& cmd,
+                        const base::FilePath& cwd,
+                        const std::vector<const uint8_t> additional_data);
   bool HasSingleInstanceLock() const;
   bool RequestSingleInstanceLock(gin::Arguments* args);
   void ReleaseSingleInstanceLock();
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index f1af0bc512159..51c202366a51f 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -208,23 +208,18 @@ describe('app module', () => {
     interface SingleInstanceLockTestArgs {
       args: string[];
       expectedAdditionalData: unknown;
-      expectedAck: unknown;
     }
 
     it('prevents the second launch of app', async function () {
-      this.timeout(60000);
-      const appPath = path.join(fixturesPath, 'api', 'singleton');
+      this.timeout(120000);
+      const appPath = path.join(fixturesPath, 'api', 'singleton-data');
       const first = cp.spawn(process.execPath, [appPath]);
-      const firstExited = emittedOnce(first, 'exit');
       await emittedOnce(first.stdout, 'data');
-
       // Start second app when received output.
       const second = cp.spawn(process.execPath, [appPath]);
-      const secondExited = emittedOnce(second, 'exit');
-
-      const [code2] = await secondExited;
+      const [code2] = await emittedOnce(second, 'exit');
       expect(code2).to.equal(1);
-      const [code1] = await firstExited;
+      const [code1] = await emittedOnce(first, 'exit');
       expect(code1).to.equal(0);
     });
 
@@ -250,11 +245,6 @@ describe('app module', () => {
       const secondInstanceArgs = [process.execPath, appPath, ...testArgs.args, '--some-switch', 'some-arg'];
       const second = cp.spawn(secondInstanceArgs[0], secondInstanceArgs.slice(1));
       const secondExited = emittedOnce(second, 'exit');
-      const secondStdoutLines = second.stdout.pipe(split());
-      let ackData;
-      while ((ackData = await emittedOnce(secondStdoutLines, 'data'))[0].toString().length === 0) {
-        // This isn't valid data.
-      }
 
       const [code2] = await secondExited;
       expect(code2).to.equal(1);
@@ -264,7 +254,6 @@ describe('app module', () => {
       const [args, additionalData] = dataFromSecondInstance[0].toString('ascii').split('||');
       const secondInstanceArgsReceived: string[] = JSON.parse(args.toString('ascii'));
       const secondInstanceDataReceived = JSON.parse(additionalData.toString('ascii'));
-      const dataAckReceived = JSON.parse(ackData[0].toString('ascii'));
 
       // Ensure secondInstanceArgs is a subset of secondInstanceArgsReceived
       for (const arg of secondInstanceArgs) {
@@ -273,113 +262,69 @@ describe('app module', () => {
       }
       expect(secondInstanceDataReceived).to.be.deep.equal(testArgs.expectedAdditionalData,
         `received data ${JSON.stringify(secondInstanceDataReceived)} is not equal to expected data ${JSON.stringify(testArgs.expectedAdditionalData)}.`);
-      expect(dataAckReceived).to.be.deep.equal(testArgs.expectedAck,
-        `received data ${JSON.stringify(dataAckReceived)} is not equal to expected data ${JSON.stringify(testArgs.expectedAck)}.`);
     }
 
-    const expectedAdditionalData = {
-      level: 1,
-      testkey: 'testvalue1',
-      inner: {
-        level: 2,
-        testkey: 'testvalue2'
-      }
-    };
-
-    const expectedAck = {
-      level: 1,
-      testkey: 'acktestvalue1',
-      inner: {
-        level: 2,
-        testkey: 'acktestvalue2'
-      }
-    };
-
-    it('passes arguments to the second-instance event with no additional data', async () => {
+    it('passes arguments to the second-instance event no additional data', async () => {
       await testArgumentPassing({
         args: [],
-        expectedAdditionalData: null,
-        expectedAck: null
+        expectedAdditionalData: null
       });
     });
 
-    it('passes arguments to the second-instance event', async () => {
+    it('sends and receives JSON object data', async () => {
+      const expectedAdditionalData = {
+        level: 1,
+        testkey: 'testvalue1',
+        inner: {
+          level: 2,
+          testkey: 'testvalue2'
+        }
+      };
       await testArgumentPassing({
         args: ['--send-data'],
-        expectedAdditionalData,
-        expectedAck: null
-      });
-    });
-
-    it('gets back an ack after preventing default', async () => {
-      await testArgumentPassing({
-        args: ['--send-ack', '--prevent-default'],
-        expectedAdditionalData: null,
-        expectedAck
-      });
-    });
-
-    it('is able to send back empty ack after preventing default', async () => {
-      await testArgumentPassing({
-        args: ['--prevent-default'],
-        expectedAdditionalData: null,
-        expectedAck: null
-      });
-    });
-
-    it('sends and receives data', async () => {
-      await testArgumentPassing({
-        args: ['--send-ack', '--prevent-default', '--send-data'],
-        expectedAdditionalData,
-        expectedAck
+        expectedAdditionalData
       });
     });
 
     it('sends and receives numerical data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content=1', '--prevent-default', '--send-data', '--data-content=2'],
-        expectedAdditionalData: 2,
-        expectedAck: 1
+        args: ['--send-data', '--data-content=2'],
+        expectedAdditionalData: 2
       });
     });
 
     it('sends and receives string data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content="ack"', '--prevent-default', '--send-data', '--data-content="data"'],
-        expectedAdditionalData: 'data',
-        expectedAck: 'ack'
+        args: ['--send-data', '--data-content="data"'],
+        expectedAdditionalData: 'data'
       });
     });
 
     it('sends and receives boolean data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content=true', '--prevent-default', '--send-data', '--data-content=false'],
-        expectedAdditionalData: false,
-        expectedAck: true
+        args: ['--send-data', '--data-content=false'],
+        expectedAdditionalData: false
       });
     });
 
     it('sends and receives array data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content=[1, 2, 3]', '--prevent-default', '--send-data', '--data-content=[2, 3, 4]'],
-        expectedAdditionalData: [2, 3, 4],
-        expectedAck: [1, 2, 3]
+        args: ['--send-data', '--data-content=[2, 3, 4]'],
+        expectedAdditionalData: [2, 3, 4]
       });
     });
 
     it('sends and receives mixed array data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content=["1", true, 3]', '--prevent-default', '--send-data', '--data-content=["2", false, 4]'],
-        expectedAdditionalData: ['2', false, 4],
-        expectedAck: ['1', true, 3]
+        args: ['--send-data', '--data-content=["2", true, 4]'],
+        expectedAdditionalData: ['2', true, 4]
       });
     });
 
     it('sends and receives null data', async () => {
       await testArgumentPassing({
-        args: ['--send-ack', '--ack-content=null', '--prevent-default', '--send-data', '--data-content=null'],
-        expectedAdditionalData: null,
-        expectedAck: null
+        args: ['--send-data', '--data-content=null'],
+        expectedAdditionalData: null
       });
     });
 
@@ -387,8 +332,7 @@ describe('app module', () => {
       try {
         await testArgumentPassing({
           args: ['--send-ack', '--ack-content="undefined"', '--prevent-default', '--send-data', '--data-content="undefined"'],
-          expectedAdditionalData: undefined,
-          expectedAck: undefined
+          expectedAdditionalData: undefined
         });
         assert(false);
       } catch (e) {
diff --git a/spec/fixtures/api/singleton-data/main.js b/spec/fixtures/api/singleton-data/main.js
index f79ed9ccc9bce..50a623410ea89 100644
--- a/spec/fixtures/api/singleton-data/main.js
+++ b/spec/fixtures/api/singleton-data/main.js
@@ -1,17 +1,11 @@
 const { app } = require('electron');
 
-app.whenReady().then(() => {
-  console.log('started'); // ping parent
-});
-
 // Send data from the second instance to the first instance.
 const sendAdditionalData = app.commandLine.hasSwitch('send-data');
 
-// Prevent the default behaviour of second-instance, which sends back an empty ack.
-const preventDefault = app.commandLine.hasSwitch('prevent-default');
-
-// Send an object back for the ack rather than undefined.
-const sendAck = app.commandLine.hasSwitch('send-ack');
+app.whenReady().then(() => {
+  console.log('started'); // ping parent
+});
 
 let obj = {
   level: 1,
@@ -21,45 +15,20 @@ let obj = {
     testkey: 'testvalue2'
   }
 };
-let ackObj = {
-  level: 1,
-  testkey: 'acktestvalue1',
-  inner: {
-    level: 2,
-    testkey: 'acktestvalue2'
-  }
-};
-
 if (app.commandLine.hasSwitch('data-content')) {
   obj = JSON.parse(app.commandLine.getSwitchValue('data-content'));
   if (obj === 'undefined') {
     obj = undefined;
   }
 }
-if (app.commandLine.hasSwitch('ack-content')) {
-  ackObj = JSON.parse(app.commandLine.getSwitchValue('ack-content'));
-  if (ackObj === 'undefined') {
-    ackObj = undefined;
-  }
-}
-
-app.on('first-instance-ack', (event, additionalData) => {
-  console.log(JSON.stringify(additionalData));
-});
 
 const gotTheLock = sendAdditionalData
   ? app.requestSingleInstanceLock(obj) : app.requestSingleInstanceLock();
 
-app.on('second-instance', (event, args, workingDirectory, data, ackCallback) => {
-  if (preventDefault) {
-    event.preventDefault();
-  }
+app.on('second-instance', (event, args, workingDirectory, data) => {
   setImmediate(() => {
     console.log([JSON.stringify(args), JSON.stringify(data)].join('||'));
-    sendAck ? ackCallback(ackObj) : ackCallback();
-    setImmediate(() => {
-      app.exit(0);
-    });
+    app.exit(0);
   });
 });
 

From 1639ccf98fd64b80e7685e11452ec4fb68f27df4 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 23 May 2022 16:42:37 +0900
Subject: [PATCH 407/811] fix: service worker registration with custom
 protocols (#34290)

Refs https://github.com/electron/electron/issues/32664
---
 patches/chromium/.patches                     |  1 +
 .../custom_protocols_plzserviceworker.patch   | 53 +++++++++++++++++++
 shell/browser/electron_browser_client.cc      |  5 ++
 spec-main/api-protocol-spec.ts                |  5 +-
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 patches/chromium/custom_protocols_plzserviceworker.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index cc794e8aec179..feb74c1e343bf 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -109,3 +109,4 @@ build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
+custom_protocols_plzserviceworker.patch
diff --git a/patches/chromium/custom_protocols_plzserviceworker.patch b/patches/chromium/custom_protocols_plzserviceworker.patch
new file mode 100644
index 0000000000000..5c67bca44ddeb
--- /dev/null
+++ b/patches/chromium/custom_protocols_plzserviceworker.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Fri, 20 May 2022 00:29:34 +0900
+Subject: custom_protocols_plzserviceworker.patch
+
+Allow registering custom protocols to handle service worker main script fetching with PlzServiceWorker.
+
+Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
+
+diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
+index 9aba6deb9e11ec2803f163088d1c321dd256787f..1dc24bb4c83acd2ff618b085059c918261b2a3d4 100644
+--- a/content/browser/service_worker/service_worker_context_wrapper.cc
++++ b/content/browser/service_worker/service_worker_context_wrapper.cc
+@@ -1616,6 +1616,28 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+       loader_factory_bundle_info =
+           context()->loader_factory_bundle_for_update_check()->Clone();
+ 
++  // Give the embedder a chance to register custom schemes that can
++  // handle loading the service worker main script.
++  // Previous registration triggered by
++  // ServiceWorkerContextWrapper::CreateNonNetworkPendingURLLoaderFactoryBundleForUpdateCheck
++  // happens early on browser startup before the JS in the main process
++  // is run by the embedder.
++  auto* factory_bundle = static_cast<blink::PendingURLLoaderFactoryBundle*>(
++          loader_factory_bundle_info.get());
++  ContentBrowserClient::NonNetworkURLLoaderFactoryMap non_network_factories;
++  GetContentClient()
++      ->browser()
++      ->RegisterNonNetworkServiceWorkerUpdateURLLoaderFactories(
++          storage_partition_->browser_context(), &non_network_factories);
++  for (auto& pair : non_network_factories) {
++    const std::string& scheme = pair.first;
++    mojo::PendingRemote<network::mojom::URLLoaderFactory>& factory_remote =
++        pair.second;
++
++    factory_bundle->pending_scheme_specific_factories().emplace(
++        scheme, std::move(factory_remote));
++  }
++
+   if (base::FeatureList::IsEnabled(
+           features::kEnableServiceWorkersForChromeUntrusted) &&
+       scope.scheme_piece() == kChromeUIUntrustedScheme) {
+@@ -1636,9 +1658,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+             browser_context(), scope_origin)) {
+       config->RegisterURLDataSource(browser_context());
+ 
+-      static_cast<blink::PendingURLLoaderFactoryBundle*>(
+-          loader_factory_bundle_info.get())
+-          ->pending_scheme_specific_factories()
++      factory_bundle->pending_scheme_specific_factories()
+           .emplace(kChromeUIUntrustedScheme,
+                    CreateWebUIServiceWorkerLoaderFactory(
+                        browser_context(), kChromeUIUntrustedScheme,
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index b7ac2c5043709..3d3b19384a091 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1328,6 +1328,11 @@ void ElectronBrowserClient::
   DCHECK(browser_context);
   DCHECK(factories);
 
+  auto* protocol_registry =
+      ProtocolRegistry::FromBrowserContext(browser_context);
+  protocol_registry->RegisterURLLoaderFactories(factories,
+                                                false /* allow_file_access */);
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   factories->emplace(
       extensions::kExtensionScheme,
diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
index 4ffaa3e047d68..980c289cb1e7f 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec-main/api-protocol-spec.ts
@@ -764,10 +764,7 @@ describe('protocol module', () => {
       await expect(contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.notjs', {scope: './'})`)).to.be.rejected();
     });
 
-    // TODO(nornagon): I'm not sure why this isn't working, but I'm choosing to
-    // disable this test for now to land the roll. See
-    // https://github.com/electron/electron/issues/32664.
-    it.skip('should be able to register service worker for custom scheme', async () => {
+    it('should be able to register service worker for custom scheme', async () => {
       await contents.loadURL(`${serviceWorkerScheme}://${v4()}.com`);
       await contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.js', {scope: './'})`);
     });

From aa3e852a732c374f64490de2fe7098f63199e149 Mon Sep 17 00:00:00 2001
From: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
Date: Mon, 23 May 2022 07:01:22 -0400
Subject: [PATCH 408/811] docs: add height option and color transparency info
 (#34278)

---
 docs/tutorial/window-customization.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/tutorial/window-customization.md b/docs/tutorial/window-customization.md
index 7a3a98616770b..a724c72d3f021 100644
--- a/docs/tutorial/window-customization.md
+++ b/docs/tutorial/window-customization.md
@@ -115,9 +115,9 @@ const win = new BrowserWindow({
 })
 ```
 
-On Windows, you can also specify the color of the overlay and its symbols by setting
-`titleBarOverlay` to an object with the `color` and `symbolColor` properties. If an option
-is not specified, the color will default to its system color for the window control buttons:
+On Windows, you can also specify additional parameters. The color of the overlay and its symbols can be specified by setting `titleBarOverlay` to an object and using the `color` and `symbolColor` properties respectively. The height of the overlay can also be specified with the `height` property.
+
+If a color option is not specified, the color will default to its system color for the window control buttons. Similarly, if the height option is not specified it will default to the default height:
 
 ```javascript title='main.js'
 // on Windows
@@ -126,7 +126,8 @@ const win = new BrowserWindow({
   titleBarStyle: 'hidden',
   titleBarOverlay: {
     color: '#2f3241',
-    symbolColor: '#74b1be'
+    symbolColor: '#74b1be',
+    height: 60
   }
 })
 ```
@@ -135,6 +136,10 @@ const win = new BrowserWindow({
 > color and dimension values from a renderer using a set of readonly
 > [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars].
 
+### Limitations
+
+* Transparent colors are currently not supported. Progress updates for this feature can be found in PR [#33567](https://github.com/electron/electron/issues/33567).
+
 ## Create transparent windows
 
 By setting the `transparent` option to `true`, you can make a fully transparent window.

From 291eb609160948b1c9e8572cd3b5b4612f128c7c Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 23 May 2022 13:04:08 +0200
Subject: [PATCH 409/811] fix: building node modules with Visual Studio 2017
 (#34217)

---
 ...deprecated_attribute_for_older_msvc_versions.patch | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index 547b2778ac3c0..1bd502768257c 100644
--- a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -6,7 +6,7 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef74c2ab57 100644
+index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..644f921f970d214b4d93b1e4c384e7475740b485 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
@@ -25,7 +25,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef
  #else
  # define V8_DEPRECATED(message)
  #endif
-@@ -465,7 +468,11 @@ path. Add it with -I<path> to the command line
+@@ -465,13 +468,17 @@ path. Add it with -I<path> to the command line
  
  // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
  #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
@@ -38,3 +38,10 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef
  #else
  # define V8_DEPRECATE_SOON(message)
  #endif
+ 
+ 
+-#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ < 6)
++#if !defined(__clang__) && (defined(__GNUC__) && __GNUC__ < 6) || (defined(_MSC_VER) && _MSC_VER < 1920)
+ # define V8_ENUM_DEPRECATED(message)
+ # define V8_ENUM_DEPRECATE_SOON(message)
+ #else

From 89fab6a549ca084c771765d4cd7313e729f4cb25 Mon Sep 17 00:00:00 2001
From: FantasqueX <fantasquex@gmail.com>
Date: Mon, 23 May 2022 20:49:38 +0800
Subject: [PATCH 410/811] docs: remove X-Content-Security-Policy header in
 quick-start.md (#34307)

reference: Note: It is known that having both Content-Security-Policy
 and X-Content-Security-Policy or X-Webkit-CSP causes unexpected
 behaviours on certain versions of browsers. Please avoid using deprecated
 X-* headers. https://content-security-policy.com/
also:
https://github.com/electron/electron-quick-start/commit/1ad18486ed9be39612fdfe7b8fe265e602846ab3
---
 docs/tutorial/quick-start.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/tutorial/quick-start.md b/docs/tutorial/quick-start.md
index cd54e26e9b9b2..f74c570faac73 100644
--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -131,7 +131,6 @@ folder of your project:
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
     <title>Hello World!</title>
   </head>
   <body>
@@ -427,7 +426,6 @@ window.addEventListener('DOMContentLoaded', () => {
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
     <title>Hello World!</title>
   </head>
   <body>

From c3fa6005db8754bafba8e65f6811d73bbc659e54 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 06:02:11 -0700
Subject: [PATCH 411/811] Bump v20.0.0-nightly.20220523

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6192d2481c149..04df7831c1786 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220520
\ No newline at end of file
+20.0.0-nightly.20220523
\ No newline at end of file
diff --git a/package.json b/package.json
index d00836e491354..727202feaccae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220520",
+  "version": "20.0.0-nightly.20220523",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2913518590be8..e1a52014d366f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220520
- PRODUCTVERSION 20,0,0,20220520
+ FILEVERSION 20,0,0,20220523
+ PRODUCTVERSION 20,0,0,20220523
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 887b5a7dc7ec7020310db210685f920a12c6c033 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 23 May 2022 10:33:39 -0400
Subject: [PATCH 412/811] fix: crash on navigator.serial.getPorts() (#34280)

* fix: crash on navigator.serial.getPorts()

* test: fixup BrowserWindow.setTitlebarOverlay test
---
 shell/browser/electron_permission_manager.cc | 22 +++++++++----
 spec-main/api-browser-window-spec.ts         | 31 +++++++++++-------
 spec-main/chromium-spec.ts                   | 33 ++++++++++++++++++--
 3 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index 6970369b80432..a6235561a1aae 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -335,22 +335,32 @@ bool ElectronPermissionManager::CheckDevicePermission(
                    static_cast<blink::PermissionType>(
                        WebContentsPermissionHelper::PermissionType::SERIAL)) {
 #if BUILDFLAG(IS_WIN)
-          if (device->FindStringKey(kDeviceInstanceIdKey) ==
-              granted_device.FindStringKey(kDeviceInstanceIdKey))
+          const auto* instance_id = device->FindStringKey(kDeviceInstanceIdKey);
+          const auto* port_instance_id =
+              granted_device.FindStringKey(kDeviceInstanceIdKey);
+          if (instance_id && port_instance_id &&
+              *instance_id == *port_instance_id)
             return true;
 #else
+          const auto* serial_number =
+              granted_device.FindStringKey(kSerialNumberKey);
+          const auto* port_serial_number =
+              device->FindStringKey(kSerialNumberKey);
           if (device->FindIntKey(kVendorIdKey) !=
                   granted_device.FindIntKey(kVendorIdKey) ||
               device->FindIntKey(kProductIdKey) !=
                   granted_device.FindIntKey(kProductIdKey) ||
-              *device->FindStringKey(kSerialNumberKey) !=
-                  *granted_device.FindStringKey(kSerialNumberKey)) {
+              (serial_number && port_serial_number &&
+               *port_serial_number != *serial_number)) {
             continue;
           }
 
 #if BUILDFLAG(IS_MAC)
-          if (*device->FindStringKey(kUsbDriverKey) !=
-              *granted_device.FindStringKey(kUsbDriverKey)) {
+          const auto* usb_driver_key = device->FindStringKey(kUsbDriverKey);
+          const auto* port_usb_driver_key =
+              granted_device.FindStringKey(kUsbDriverKey);
+          if (usb_driver_key && port_usb_driver_key &&
+              *usb_driver_key != *port_usb_driver_key) {
             continue;
           }
 #endif  // BUILDFLAG(IS_MAC)
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 4d348bb924c47..0de2068f9590c 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2187,8 +2187,10 @@ describe('BrowserWindow module', () => {
       const [, newOverlayRect] = await geometryChange;
       expect(newOverlayRect.width).to.equal(overlayRect.width + 400);
     };
-    afterEach(closeAllWindows);
-    afterEach(() => { ipcMain.removeAllListeners('geometrychange'); });
+    afterEach(async () => {
+      await closeAllWindows();
+      ipcMain.removeAllListeners('geometrychange');
+    });
     it('creates browser window with hidden title bar', () => {
       const w = new BrowserWindow({
         show: false,
@@ -2266,16 +2268,20 @@ describe('BrowserWindow module', () => {
       // Confirm that maximization only affected the height of the buttons and not the title bar
       expect(overlayRectPostMax.height).to.equal(size);
     };
-    afterEach(closeAllWindows);
-    afterEach(() => { ipcMain.removeAllListeners('geometrychange'); });
+    afterEach(async () => {
+      await closeAllWindows();
+      ipcMain.removeAllListeners('geometrychange');
+    });
     it('sets Window Control Overlay with title bar height of 40', async () => {
       await testWindowsOverlayHeight(40);
     });
   });
 
   ifdescribe(process.platform === 'win32')('BrowserWindow.setTitlebarOverlay', () => {
-    afterEach(closeAllWindows);
-    afterEach(() => { ipcMain.removeAllListeners('geometrychange'); });
+    afterEach(async () => {
+      await closeAllWindows();
+      ipcMain.removeAllListeners('geometrychange');
+    });
 
     it('does not crash when an invalid titleBarStyle was initially set', () => {
       const win = new BrowserWindow({
@@ -2299,10 +2305,13 @@ describe('BrowserWindow module', () => {
     });
 
     it('correctly updates the height of the overlay', async () => {
-      const testOverlay = async (w: BrowserWindow, size: Number) => {
+      const testOverlay = async (w: BrowserWindow, size: Number, firstRun: boolean) => {
         const overlayHTML = path.join(__dirname, 'fixtures', 'pages', 'overlay.html');
-        w.loadFile(overlayHTML);
-        await emittedOnce(ipcMain, 'geometrychange');
+        const overlayReady = emittedOnce(ipcMain, 'geometrychange');
+        await w.loadFile(overlayHTML);
+        if (firstRun) {
+          await overlayReady;
+        }
 
         const overlayEnabled = await w.webContents.executeJavaScript('navigator.windowControlsOverlay.visible');
         expect(overlayEnabled).to.be.true('overlayEnabled');
@@ -2339,13 +2348,13 @@ describe('BrowserWindow module', () => {
         }
       });
 
-      await testOverlay(w, INITIAL_SIZE);
+      await testOverlay(w, INITIAL_SIZE, true);
 
       w.setTitleBarOverlay({
         height: INITIAL_SIZE + 10
       });
 
-      await testOverlay(w, INITIAL_SIZE + 10);
+      await testOverlay(w, INITIAL_SIZE + 10, false);
     });
   });
 
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index ca93d5e0954bd..a69e1b4cc433f 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1678,11 +1678,39 @@ describe('navigator.serial', () => {
   });
 
   it('returns a port when select-serial-port event is defined', async () => {
+    let havePorts = false;
     w.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
-      callback(portList[0].portId);
+      if (portList.length > 0) {
+        havePorts = true;
+        callback(portList[0].portId);
+      } else {
+        callback('');
+      }
     });
     const port = await getPorts();
-    expect(port).to.equal('[object SerialPort]');
+    if (havePorts) {
+      expect(port).to.equal('[object SerialPort]');
+    } else {
+      expect(port).to.equal('NotFoundError: No port selected by the user.');
+    }
+  });
+
+  it('navigator.serial.getPorts() returns values', async () => {
+    let havePorts = false;
+
+    w.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
+      if (portList.length > 0) {
+        havePorts = true;
+        callback(portList[0].portId);
+      } else {
+        callback('');
+      }
+    });
+    await getPorts();
+    if (havePorts) {
+      const grantedPorts = await w.webContents.executeJavaScript('navigator.serial.getPorts()');
+      expect(grantedPorts).to.not.be.empty();
+    }
   });
 });
 
@@ -2005,7 +2033,6 @@ describe('navigator.hid', () => {
       if (details.deviceList.length > 0) {
         details.deviceList.find((device) => {
           if (device.name && device.name !== '' && device.serialNumber && device.serialNumber !== '') {
-            console.log('device is: ', device);
             if (checkForExcludedDevice) {
               const compareDevice = {
                 vendorId: device.vendorId,

From 09a80ea48c53b7b16bbd798077e4550ee5ffa8f3 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 23 May 2022 16:39:50 +0200
Subject: [PATCH 413/811] test: use webContents.setWindowOpenHandler() in specs
 (#34310)

---
 spec-main/api-web-contents-spec.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index c2f6151fd2d4f..29ff9e5f60996 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -1563,9 +1563,10 @@ describe('webContents module', () => {
       server.listen(0, '127.0.0.1', () => {
         const url = 'http://127.0.0.1:' + (server.address() as AddressInfo).port + '/';
         w.webContents.once('did-finish-load', () => {
-          w.webContents.once('new-window', (event, newUrl, frameName, disposition, options, features, referrer) => {
-            expect(referrer.url).to.equal(url);
-            expect(referrer.policy).to.equal('strict-origin-when-cross-origin');
+          w.webContents.setWindowOpenHandler(details => {
+            expect(details.referrer.url).to.equal(url);
+            expect(details.referrer.policy).to.equal('strict-origin-when-cross-origin');
+            return { action: 'allow' };
           });
           w.webContents.executeJavaScript('a.click()');
         });
@@ -1591,9 +1592,10 @@ describe('webContents module', () => {
       server.listen(0, '127.0.0.1', () => {
         const url = 'http://127.0.0.1:' + (server.address() as AddressInfo).port + '/';
         w.webContents.once('did-finish-load', () => {
-          w.webContents.once('new-window', (event, newUrl, frameName, disposition, options, features, referrer) => {
-            expect(referrer.url).to.equal(url);
-            expect(referrer.policy).to.equal('no-referrer-when-downgrade');
+          w.webContents.setWindowOpenHandler(details => {
+            expect(details.referrer.url).to.equal(url);
+            expect(details.referrer.policy).to.equal('no-referrer-when-downgrade');
+            return { action: 'allow' };
           });
           w.webContents.executeJavaScript('window.open(location.href + "should_have_referrer")');
         });

From df9383cb3cc8d18ce21acd9bcb520fab92813aaa Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Mon, 23 May 2022 21:08:03 +0530
Subject: [PATCH 414/811] chore: add a TRACE call for `crash_reporter::Start()`
 (#34268)

chore: add a TRACE call for crash_reporter::Start()

Initializing the crashReporter takes around 620 milliseconds on Intel
macOS. I have sent a CL to crashpad to partially fix the performance
issue in
https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3641386.
It would be beneficial to log the performance impact of this function in
the traces in case this slows down in the future.

Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 shell/browser/api/electron_api_crash_reporter.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/api/electron_api_crash_reporter.cc b/shell/browser/api/electron_api_crash_reporter.cc
index 7740441b3a0bc..984c412bb6b71 100644
--- a/shell/browser/api/electron_api_crash_reporter.cc
+++ b/shell/browser/api/electron_api_crash_reporter.cc
@@ -16,6 +16,7 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/trace_event/trace_event.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/upload_list/crash_upload_list.h"
 #include "components/upload_list/text_log_upload_list.h"
@@ -135,6 +136,7 @@ void Start(const std::string& submit_url,
            const std::map<std::string, std::string>& global_extra,
            const std::map<std::string, std::string>& extra,
            bool is_node_process) {
+  TRACE_EVENT0("electron", "crash_reporter::Start");
 #if !defined(MAS_BUILD)
   if (g_crash_reporter_initialized)
     return;

From ba573f558305a6448f67ca1db51730cdd1559f58 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 23 May 2022 15:13:18 -0400
Subject: [PATCH 415/811] feat: add support for HIDDevice.forget() (#34210)

* feat: add support for HIDDevice.forget()

* chore: remove whitespace

* chore: use `SetGetter` to serialize the render_frame_host

Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com>

* fixup chore: use `SetGetter` to serialize the render_frame_host

* fixup after rebase

* fixup for crash on navigator.serial.getPorts()

* fixup for lint

Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com>
---
 docs/api/session.md                           |  13 ++
 filenames.gni                                 |   1 +
 .../browser/api/electron_api_web_contents.cc  | 114 ++++++++++++++++--
 shell/browser/api/electron_api_web_contents.h |  19 ++-
 shell/browser/electron_permission_manager.cc  |  77 +++---------
 shell/browser/electron_permission_manager.h   |   6 +
 shell/browser/hid/electron_hid_delegate.cc    |   7 +-
 shell/browser/hid/hid_chooser_context.cc      |  66 ++++++++++
 shell/browser/hid/hid_chooser_context.h       |  12 ++
 shell/browser/hid/hid_chooser_controller.cc   |  41 +++----
 shell/browser/hid/hid_chooser_controller.h    |   4 +
 .../browser/web_contents_permission_helper.cc |  20 +++
 .../browser/web_contents_permission_helper.h  |  10 ++
 .../hid_device_info_converter.h               |  31 +++++
 spec-main/chromium-spec.ts                    |  52 ++++++--
 15 files changed, 359 insertions(+), 114 deletions(-)
 create mode 100644 shell/common/gin_converters/hid_device_info_converter.h

diff --git a/docs/api/session.md b/docs/api/session.md
index ab2ecdb701de7..8475302e9422b 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -274,6 +274,19 @@ from `select-hid-device` is called.  This event is intended for use when using
 a UI to ask users to pick a device so that the UI can be updated to remove the
 specified device.
 
+#### Event: 'hid-device-revoked'
+
+Returns:
+
+* `event` Event
+* `details` Object
+  * `device` [HIDDevice[]](structures/hid-device.md)
+  * `frame` [WebFrameMain](web-frame-main.md)
+
+Emitted after `HIDDevice.forget()` has been called.  This event can be used
+to help maintain persistent storage of permissions when
+`setDevicePermissionHandler` is used.
+
 #### Event: 'select-serial-port'
 
 Returns:
diff --git a/filenames.gni b/filenames.gni
index f7c6ce5dff438..e2f6aa294f8a9 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -566,6 +566,7 @@ filenames = {
     "shell/common/gin_converters/gfx_converter.h",
     "shell/common/gin_converters/guid_converter.h",
     "shell/common/gin_converters/gurl_converter.h",
+    "shell/common/gin_converters/hid_device_info_converter.h",
     "shell/common/gin_converters/image_converter.cc",
     "shell/common/gin_converters/image_converter.h",
     "shell/common/gin_converters/message_box_converter.cc",
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 639f20eda2717..eda5983d56c8c 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -3445,37 +3445,127 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
 void WebContents::GrantDevicePermission(
     const url::Origin& origin,
     const base::Value* device,
-    blink::PermissionType permissionType,
+    blink::PermissionType permission_type,
     content::RenderFrameHost* render_frame_host) {
-  granted_devices_[render_frame_host->GetFrameTreeNodeId()][permissionType]
+  granted_devices_[render_frame_host->GetFrameTreeNodeId()][permission_type]
                   [origin]
                       .push_back(
                           std::make_unique<base::Value>(device->Clone()));
 }
 
-std::vector<base::Value> WebContents::GetGrantedDevices(
+void WebContents::RevokeDevicePermission(
     const url::Origin& origin,
-    blink::PermissionType permissionType,
+    const base::Value* device,
+    blink::PermissionType permission_type,
+    content::RenderFrameHost* render_frame_host) {
+  const auto& devices_for_frame_host_it =
+      granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
+  if (devices_for_frame_host_it == granted_devices_.end())
+    return;
+
+  const auto& current_devices_it =
+      devices_for_frame_host_it->second.find(permission_type);
+  if (current_devices_it == devices_for_frame_host_it->second.end())
+    return;
+
+  const auto& origin_devices_it = current_devices_it->second.find(origin);
+  if (origin_devices_it == current_devices_it->second.end())
+    return;
+
+  for (auto it = origin_devices_it->second.begin();
+       it != origin_devices_it->second.end();) {
+    if (DoesDeviceMatch(device, it->get(), permission_type)) {
+      it = origin_devices_it->second.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
+bool WebContents::DoesDeviceMatch(const base::Value* device,
+                                  const base::Value* device_to_compare,
+                                  blink::PermissionType permission_type) {
+  if (permission_type ==
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::HID)) {
+    if (device->GetDict().FindInt(kHidVendorIdKey) !=
+            device_to_compare->GetDict().FindInt(kHidVendorIdKey) ||
+        device->GetDict().FindInt(kHidProductIdKey) !=
+            device_to_compare->GetDict().FindInt(kHidProductIdKey)) {
+      return false;
+    }
+
+    const auto* serial_number =
+        device_to_compare->GetDict().FindString(kHidSerialNumberKey);
+    const auto* device_serial_number =
+        device->GetDict().FindString(kHidSerialNumberKey);
+
+    if (serial_number && device_serial_number &&
+        *device_serial_number == *serial_number)
+      return true;
+  } else if (permission_type ==
+             static_cast<blink::PermissionType>(
+                 WebContentsPermissionHelper::PermissionType::SERIAL)) {
+#if BUILDFLAG(IS_WIN)
+    const auto* instance_id =
+        device->GetDict().FindString(kDeviceInstanceIdKey);
+    const auto* port_instance_id =
+        device_to_compare->GetDict().FindString(kDeviceInstanceIdKey);
+    if (instance_id && port_instance_id && *instance_id == *port_instance_id)
+      return true;
+#else
+    const auto* serial_number = device->GetDict().FindString(kSerialNumberKey);
+    const auto* port_serial_number =
+        device_to_compare->GetDict().FindString(kSerialNumberKey);
+    if (device->GetDict().FindInt(kVendorIdKey) !=
+            device_to_compare->GetDict().FindInt(kVendorIdKey) ||
+        device->GetDict().FindInt(kProductIdKey) !=
+            device_to_compare->GetDict().FindInt(kProductIdKey) ||
+        (serial_number && port_serial_number &&
+         *port_serial_number != *serial_number)) {
+      return false;
+    }
+
+#if BUILDFLAG(IS_MAC)
+    const auto* usb_driver_key = device->GetDict().FindString(kUsbDriverKey);
+    const auto* port_usb_driver_key =
+        device_to_compare->GetDict().FindString(kUsbDriverKey);
+    if (usb_driver_key && port_usb_driver_key &&
+        *usb_driver_key != *port_usb_driver_key) {
+      return false;
+    }
+#endif  // BUILDFLAG(IS_MAC)
+    return true;
+#endif  // BUILDFLAG(IS_WIN)
+  }
+  return false;
+}
+
+bool WebContents::CheckDevicePermission(
+    const url::Origin& origin,
+    const base::Value* device,
+    blink::PermissionType permission_type,
     content::RenderFrameHost* render_frame_host) {
   const auto& devices_for_frame_host_it =
       granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
   if (devices_for_frame_host_it == granted_devices_.end())
-    return {};
+    return false;
 
   const auto& current_devices_it =
-      devices_for_frame_host_it->second.find(permissionType);
+      devices_for_frame_host_it->second.find(permission_type);
   if (current_devices_it == devices_for_frame_host_it->second.end())
-    return {};
+    return false;
 
   const auto& origin_devices_it = current_devices_it->second.find(origin);
   if (origin_devices_it == current_devices_it->second.end())
-    return {};
+    return false;
 
-  std::vector<base::Value> results;
-  for (const auto& object : origin_devices_it->second)
-    results.push_back(object->Clone());
+  for (const auto& device_to_compare : origin_devices_it->second) {
+    if (DoesDeviceMatch(device, device_to_compare.get(), permission_type))
+      return true;
+  }
 
-  return results;
+  return false;
 }
 
 void WebContents::UpdatePreferredSize(content::WebContents* web_contents,
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index c4311007d34fe..8925e14db4f5c 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -443,13 +443,20 @@ class WebContents : public ExclusiveAccessContext,
                              blink::PermissionType permissionType,
                              content::RenderFrameHost* render_frame_host);
 
+  // Revokes |origin| access to |device|.
+  // To be used in place of ObjectPermissionContextBase::RevokeObjectPermission.
+  void RevokeDevicePermission(const url::Origin& origin,
+                              const base::Value* device,
+                              blink::PermissionType permission_type,
+                              content::RenderFrameHost* render_frame_host);
+
   // Returns the list of devices that |origin| has been granted permission to
   // access. To be used in place of
   // ObjectPermissionContextBase::GetGrantedObjects.
-  std::vector<base::Value> GetGrantedDevices(
-      const url::Origin& origin,
-      blink::PermissionType permissionType,
-      content::RenderFrameHost* render_frame_host);
+  bool CheckDevicePermission(const url::Origin& origin,
+                             const base::Value* device,
+                             blink::PermissionType permissionType,
+                             content::RenderFrameHost* render_frame_host);
 
   // disable copy
   WebContents(const WebContents&) = delete;
@@ -746,6 +753,10 @@ class WebContents : public ExclusiveAccessContext,
   // Update the html fullscreen flag in both browser and renderer.
   void UpdateHtmlApiFullscreen(bool fullscreen);
 
+  bool DoesDeviceMatch(const base::Value* device,
+                       const base::Value* device_to_compare,
+                       blink::PermissionType permission_type);
+
   v8::Global<v8::Value> session_;
   v8::Global<v8::Value> devtools_web_contents_;
   v8::Global<v8::Value> debugger_;
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index a6235561a1aae..a4b27a0fee7fd 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -21,8 +21,6 @@
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/electron_browser_client.h"
 #include "shell/browser/electron_browser_main_parts.h"
-#include "shell/browser/hid/hid_chooser_context.h"
-#include "shell/browser/serial/serial_chooser_context.h"
 #include "shell/browser/web_contents_permission_helper.h"
 #include "shell/browser/web_contents_preferences.h"
 #include "shell/common/gin_converters/content_converter.h"
@@ -308,66 +306,8 @@ bool ElectronPermissionManager::CheckDevicePermission(
   api::WebContents* api_web_contents = api::WebContents::From(web_contents);
   if (device_permission_handler_.is_null()) {
     if (api_web_contents) {
-      std::vector<base::Value> granted_devices =
-          api_web_contents->GetGrantedDevices(origin, permission,
-                                              render_frame_host);
-
-      for (const auto& granted_device : granted_devices) {
-        if (permission ==
-            static_cast<blink::PermissionType>(
-                WebContentsPermissionHelper::PermissionType::HID)) {
-          if (device->FindIntKey(kHidVendorIdKey) !=
-                  granted_device.FindIntKey(kHidVendorIdKey) ||
-              device->FindIntKey(kHidProductIdKey) !=
-                  granted_device.FindIntKey(kHidProductIdKey)) {
-            continue;
-          }
-
-          const auto* serial_number =
-              granted_device.FindStringKey(kHidSerialNumberKey);
-          const auto* device_serial_number =
-              device->FindStringKey(kHidSerialNumberKey);
-
-          if (serial_number && device_serial_number &&
-              *device_serial_number == *serial_number)
-            return true;
-        } else if (permission ==
-                   static_cast<blink::PermissionType>(
-                       WebContentsPermissionHelper::PermissionType::SERIAL)) {
-#if BUILDFLAG(IS_WIN)
-          const auto* instance_id = device->FindStringKey(kDeviceInstanceIdKey);
-          const auto* port_instance_id =
-              granted_device.FindStringKey(kDeviceInstanceIdKey);
-          if (instance_id && port_instance_id &&
-              *instance_id == *port_instance_id)
-            return true;
-#else
-          const auto* serial_number =
-              granted_device.FindStringKey(kSerialNumberKey);
-          const auto* port_serial_number =
-              device->FindStringKey(kSerialNumberKey);
-          if (device->FindIntKey(kVendorIdKey) !=
-                  granted_device.FindIntKey(kVendorIdKey) ||
-              device->FindIntKey(kProductIdKey) !=
-                  granted_device.FindIntKey(kProductIdKey) ||
-              (serial_number && port_serial_number &&
-               *port_serial_number != *serial_number)) {
-            continue;
-          }
-
-#if BUILDFLAG(IS_MAC)
-          const auto* usb_driver_key = device->FindStringKey(kUsbDriverKey);
-          const auto* port_usb_driver_key =
-              granted_device.FindStringKey(kUsbDriverKey);
-          if (usb_driver_key && port_usb_driver_key &&
-              *usb_driver_key != *port_usb_driver_key) {
-            continue;
-          }
-#endif  // BUILDFLAG(IS_MAC)
-          return true;
-#endif  // BUILDFLAG(IS_WIN)
-        }
-      }
+      return api_web_contents->CheckDevicePermission(origin, device, permission,
+                                                     render_frame_host);
     }
     return false;
   } else {
@@ -398,6 +338,19 @@ void ElectronPermissionManager::GrantDevicePermission(
   }
 }
 
+void ElectronPermissionManager::RevokeDevicePermission(
+    blink::PermissionType permission,
+    const url::Origin& origin,
+    const base::Value* device,
+    content::RenderFrameHost* render_frame_host) const {
+  auto* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host);
+  api::WebContents* api_web_contents = api::WebContents::From(web_contents);
+  if (api_web_contents)
+    api_web_contents->RevokeDevicePermission(origin, device, permission,
+                                             render_frame_host);
+}
+
 blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForFrame(
     blink::PermissionType permission,
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index 74e4ab7c5b34e..10b9b820b0609 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -103,6 +103,12 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
                              const base::Value* object,
                              content::RenderFrameHost* render_frame_host) const;
 
+  void RevokeDevicePermission(
+      blink::PermissionType permission,
+      const url::Origin& origin,
+      const base::Value* object,
+      content::RenderFrameHost* render_frame_host) const;
+
  protected:
   void OnPermissionResponse(int request_id,
                             int permission_id,
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index efad257969a74..75298a5870046 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -80,8 +80,11 @@ bool ElectronHidDelegate::HasDevicePermission(
 void ElectronHidDelegate::RevokeDevicePermission(
     content::RenderFrameHost* render_frame_host,
     const device::mojom::HidDeviceInfo& device) {
-  // TODO(jkleinsc) implement this for
-  // https://chromium-review.googlesource.com/c/chromium/src/+/3297868
+  auto* chooser_context = GetChooserContext(render_frame_host);
+  const auto& origin =
+      render_frame_host->GetMainFrame()->GetLastCommittedOrigin();
+  return chooser_context->RevokeDevicePermission(origin, device,
+                                                 render_frame_host);
 }
 
 device::mojom::HidManager* ElectronHidDelegate::GetHidManager(
diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc
index ca793e6ff22dc..84231d6eb5dbe 100644
--- a/shell/browser/hid/hid_chooser_context.cc
+++ b/shell/browser/hid/hid_chooser_context.cc
@@ -19,7 +19,13 @@
 #include "content/public/browser/device_service.h"
 #include "services/device/public/cpp/hid/hid_blocklist.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
+#include "shell/browser/api/electron_api_session.h"
 #include "shell/browser/web_contents_permission_helper.h"
+#include "shell/common/gin_converters/content_converter.h"
+#include "shell/common/gin_converters/frame_converter.h"
+#include "shell/common/gin_converters/hid_device_info_converter.h"
+#include "shell/common/gin_converters/value_converter.h"
+#include "shell/common/gin_helper/dictionary.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace electron {
@@ -99,6 +105,66 @@ void HidChooserContext::GrantDevicePermission(
   }
 }
 
+void HidChooserContext::RevokeDevicePermission(
+    const url::Origin& origin,
+    const device::mojom::HidDeviceInfo& device,
+    content::RenderFrameHost* render_frame_host) {
+  DCHECK(base::Contains(devices_, device.guid));
+  if (CanStorePersistentEntry(device)) {
+    RevokePersistentDevicePermission(origin, device, render_frame_host);
+  } else {
+    RevokeEphemeralDevicePermission(origin, device);
+  }
+  auto* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host);
+
+  api::Session* session =
+      api::Session::FromBrowserContext(web_contents->GetBrowserContext());
+  if (session) {
+    v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+    v8::HandleScope scope(isolate);
+    gin_helper::Dictionary details =
+        gin_helper::Dictionary::CreateEmpty(isolate);
+    details.Set("device", device.Clone());
+    details.SetGetter("frame", render_frame_host);
+    session->Emit("hid-device-revoked", details);
+  }
+}
+
+void HidChooserContext::RevokePersistentDevicePermission(
+    const url::Origin& origin,
+    const device::mojom::HidDeviceInfo& device,
+    content::RenderFrameHost* render_frame_host) {
+  auto* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host);
+  auto* permission_helper =
+      WebContentsPermissionHelper::FromWebContents(web_contents);
+  permission_helper->RevokeHIDDevicePermission(
+      origin, DeviceInfoToValue(device), render_frame_host);
+  RevokeEphemeralDevicePermission(origin, device);
+}
+
+void HidChooserContext::RevokeEphemeralDevicePermission(
+    const url::Origin& origin,
+    const device::mojom::HidDeviceInfo& device) {
+  auto it = ephemeral_devices_.find(origin);
+  if (it != ephemeral_devices_.end()) {
+    std::set<std::string>& devices = it->second;
+    for (auto guid = devices.begin(); guid != devices.end();) {
+      DCHECK(base::Contains(devices_, *guid));
+
+      if (devices_[*guid]->physical_device_id != device.physical_device_id) {
+        ++guid;
+        continue;
+      }
+
+      guid = devices.erase(guid);
+      if (devices.empty())
+        ephemeral_devices_.erase(it);
+    }
+  }
+}
+
 bool HidChooserContext::HasDevicePermission(
     const url::Origin& origin,
     const device::mojom::HidDeviceInfo& device,
diff --git a/shell/browser/hid/hid_chooser_context.h b/shell/browser/hid/hid_chooser_context.h
index a9c2f7e1def98..544984004e654 100644
--- a/shell/browser/hid/hid_chooser_context.h
+++ b/shell/browser/hid/hid_chooser_context.h
@@ -76,6 +76,9 @@ class HidChooserContext : public KeyedService,
   void GrantDevicePermission(const url::Origin& origin,
                              const device::mojom::HidDeviceInfo& device,
                              content::RenderFrameHost* render_frame_host);
+  void RevokeDevicePermission(const url::Origin& origin,
+                              const device::mojom::HidDeviceInfo& device,
+                              content::RenderFrameHost* render_frame_host);
   bool HasDevicePermission(const url::Origin& origin,
                            const device::mojom::HidDeviceInfo& device,
                            content::RenderFrameHost* render_frame_host);
@@ -111,6 +114,15 @@ class HidChooserContext : public KeyedService,
       std::vector<device::mojom::HidDeviceInfoPtr> devices);
   void OnHidManagerConnectionError();
 
+  // HID-specific interface for revoking device permissions.
+  void RevokePersistentDevicePermission(
+      const url::Origin& origin,
+      const device::mojom::HidDeviceInfo& device,
+      content::RenderFrameHost* render_frame_host);
+  void RevokeEphemeralDevicePermission(
+      const url::Origin& origin,
+      const device::mojom::HidDeviceInfo& device);
+
   ElectronBrowserContext* browser_context_;
 
   bool is_initialized_ = false;
diff --git a/shell/browser/hid/hid_chooser_controller.cc b/shell/browser/hid/hid_chooser_controller.cc
index 039d7074b528d..69f660fa03016 100644
--- a/shell/browser/hid/hid_chooser_controller.cc
+++ b/shell/browser/hid/hid_chooser_controller.cc
@@ -20,6 +20,7 @@
 #include "shell/browser/javascript_environment.h"
 #include "shell/common/gin_converters/callback_converter.h"
 #include "shell/common/gin_converters/content_converter.h"
+#include "shell/common/gin_converters/hid_device_info_converter.h"
 #include "shell/common/gin_converters/value_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
 #include "shell/common/node_includes.h"
@@ -28,18 +29,6 @@
 
 namespace {
 
-std::string PhysicalDeviceIdFromDeviceInfo(
-    const device::mojom::HidDeviceInfo& device) {
-  // A single physical device may expose multiple HID interfaces, each
-  // represented by a HidDeviceInfo object. When a device exposes multiple
-  // HID interfaces, the HidDeviceInfo objects will share a common
-  // |physical_device_id|. Group these devices so that a single chooser item
-  // is shown for each physical device. If a device's physical device ID is
-  // empty, use its GUID instead.
-  return device.physical_device_id.empty() ? device.guid
-                                           : device.physical_device_id;
-}
-
 bool FilterMatch(const blink::mojom::HidDeviceFilterPtr& filter,
                  const device::mojom::HidDeviceInfo& device) {
   if (filter->device_ids) {
@@ -83,21 +72,6 @@ bool FilterMatch(const blink::mojom::HidDeviceFilterPtr& filter,
 
 }  // namespace
 
-namespace gin {
-
-template <>
-struct Converter<device::mojom::HidDeviceInfoPtr> {
-  static v8::Local<v8::Value> ToV8(
-      v8::Isolate* isolate,
-      const device::mojom::HidDeviceInfoPtr& device) {
-    base::Value value = electron::HidChooserContext::DeviceInfoToValue(*device);
-    value.SetStringKey("deviceId", PhysicalDeviceIdFromDeviceInfo(*device));
-    return gin::ConvertToV8(isolate, value);
-  }
-};
-
-}  // namespace gin
-
 namespace electron {
 
 HidChooserController::HidChooserController(
@@ -131,6 +105,19 @@ HidChooserController::~HidChooserController() {
     std::move(callback_).Run(std::vector<device::mojom::HidDeviceInfoPtr>());
 }
 
+// static
+std::string HidChooserController::PhysicalDeviceIdFromDeviceInfo(
+    const device::mojom::HidDeviceInfo& device) {
+  // A single physical device may expose multiple HID interfaces, each
+  // represented by a HidDeviceInfo object. When a device exposes multiple
+  // HID interfaces, the HidDeviceInfo objects will share a common
+  // |physical_device_id|. Group these devices so that a single chooser item
+  // is shown for each physical device. If a device's physical device ID is
+  // empty, use its GUID instead.
+  return device.physical_device_id.empty() ? device.guid
+                                           : device.physical_device_id;
+}
+
 api::Session* HidChooserController::GetSession() {
   if (!web_contents()) {
     return nullptr;
diff --git a/shell/browser/hid/hid_chooser_controller.h b/shell/browser/hid/hid_chooser_controller.h
index dde678ff981fb..63411c9f65b78 100644
--- a/shell/browser/hid/hid_chooser_controller.h
+++ b/shell/browser/hid/hid_chooser_controller.h
@@ -53,6 +53,10 @@ class HidChooserController
   HidChooserController& operator=(HidChooserController&) = delete;
   ~HidChooserController() override;
 
+  // static
+  static std::string PhysicalDeviceIdFromDeviceInfo(
+      const device::mojom::HidDeviceInfo& device);
+
   // HidChooserContext::DeviceObserver:
   void OnDeviceAdded(const device::mojom::HidDeviceInfo& device_info) override;
   void OnDeviceRemoved(
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 55e28d2ed0381..093f6504d3e99 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -107,6 +107,17 @@ void WebContentsPermissionHelper::GrantDevicePermission(
                                             render_frame_host);
 }
 
+void WebContentsPermissionHelper::RevokeDevicePermission(
+    blink::PermissionType permission,
+    const url::Origin& origin,
+    const base::Value* device,
+    content::RenderFrameHost* render_frame_host) const {
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
+  permission_manager->RevokeDevicePermission(permission, origin, device,
+                                             render_frame_host);
+}
+
 void WebContentsPermissionHelper::RequestFullscreenPermission(
     base::OnceCallback<void(bool)> callback) {
   RequestPermission(
@@ -230,6 +241,15 @@ void WebContentsPermissionHelper::GrantHIDDevicePermission(
       render_frame_host);
 }
 
+void WebContentsPermissionHelper::RevokeHIDDevicePermission(
+    const url::Origin& origin,
+    base::Value device,
+    content::RenderFrameHost* render_frame_host) const {
+  return RevokeDevicePermission(
+      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
+      render_frame_host);
+}
+
 WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);
 
 }  // namespace electron
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index a34dd74a4412e..847093d559950 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -68,6 +68,10 @@ class WebContentsPermissionHelper
       const url::Origin& origin,
       base::Value device,
       content::RenderFrameHost* render_frame_host) const;
+  void RevokeHIDDevicePermission(
+      const url::Origin& origin,
+      base::Value device,
+      content::RenderFrameHost* render_frame_host) const;
 
  private:
   explicit WebContentsPermissionHelper(content::WebContents* web_contents);
@@ -91,6 +95,12 @@ class WebContentsPermissionHelper
                              const base::Value* device,
                              content::RenderFrameHost* render_frame_host) const;
 
+  void RevokeDevicePermission(
+      blink::PermissionType permission,
+      const url::Origin& origin,
+      const base::Value* device,
+      content::RenderFrameHost* render_frame_host) const;
+
   // TODO(clavin): refactor to use the WebContents provided by the
   // WebContentsUserData base class instead of storing a duplicate ref
   content::WebContents* web_contents_;
diff --git a/shell/common/gin_converters/hid_device_info_converter.h b/shell/common/gin_converters/hid_device_info_converter.h
new file mode 100644
index 0000000000000..6175b77ab0d3c
--- /dev/null
+++ b/shell/common/gin_converters/hid_device_info_converter.h
@@ -0,0 +1,31 @@
+// Copyright (c) 2022 Microsoft, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_SHELL_COMMON_GIN_CONVERTERS_HID_DEVICE_INFO_CONVERTER_H_
+#define ELECTRON_SHELL_COMMON_GIN_CONVERTERS_HID_DEVICE_INFO_CONVERTER_H_
+
+#include "gin/converter.h"
+#include "services/device/public/mojom/hid.mojom.h"
+#include "shell/browser/hid/hid_chooser_context.h"
+#include "shell/browser/hid/hid_chooser_controller.h"
+
+namespace gin {
+
+template <>
+struct Converter<device::mojom::HidDeviceInfoPtr> {
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate,
+      const device::mojom::HidDeviceInfoPtr& device) {
+    base::Value value = electron::HidChooserContext::DeviceInfoToValue(*device);
+    value.SetStringKey(
+        "deviceId",
+        electron::HidChooserController::PhysicalDeviceIdFromDeviceInfo(
+            *device));
+    return gin::ConvertToV8(isolate, value);
+  }
+};
+
+}  // namespace gin
+
+#endif  // ELECTRON_SHELL_COMMON_GIN_CONVERTERS_HID_DEVICE_INFO_CONVERTER_H_
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index a69e1b4cc433f..3ebadfe1bf2ca 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1918,7 +1918,7 @@ describe('navigator.hid', () => {
     serverUrl = `http://localhost:${(server.address() as any).port}`;
   });
 
-  const getDevices: any = () => {
+  const requestDevices: any = () => {
     return w.webContents.executeJavaScript(`
       navigator.hid.requestDevice({filters: []}).then(device => device.toString()).catch(err => err.toString());
     `, true);
@@ -1936,7 +1936,7 @@ describe('navigator.hid', () => {
 
   it('does not return a device if select-hid-device event is not defined', async () => {
     w.loadFile(path.join(fixturesPath, 'pages', 'blank.html'));
-    const device = await getDevices();
+    const device = await requestDevices();
     expect(device).to.equal('');
   });
 
@@ -1947,7 +1947,7 @@ describe('navigator.hid', () => {
       callback();
     });
     session.defaultSession.setPermissionCheckHandler(() => false);
-    const device = await getDevices();
+    const device = await requestDevices();
     expect(selectFired).to.be.false();
     expect(device).to.equal('');
   });
@@ -1965,7 +1965,7 @@ describe('navigator.hid', () => {
         callback();
       }
     });
-    const device = await getDevices();
+    const device = await requestDevices();
     expect(selectFired).to.be.true();
     if (haveDevices) {
       expect(device).to.contain('[object HIDDevice]');
@@ -2014,7 +2014,7 @@ describe('navigator.hid', () => {
       return true;
     });
     await w.webContents.executeJavaScript('navigator.hid.getDevices();', true);
-    const device = await getDevices();
+    const device = await requestDevices();
     expect(selectFired).to.be.true();
     if (haveDevices) {
       expect(device).to.contain('[object HIDDevice]');
@@ -2024,7 +2024,7 @@ describe('navigator.hid', () => {
     }
   });
 
-  it('returns excludes a device when a exclusionFilter is specified', async () => {
+  it('excludes a device when a exclusionFilter is specified', async () => {
     const exclusionFilters = <any>[];
     let haveDevices = false;
     let checkForExcludedDevice = false;
@@ -2053,13 +2053,51 @@ describe('navigator.hid', () => {
       callback();
     });
 
-    await getDevices();
+    await requestDevices();
     if (haveDevices) {
       // We have devices to exclude, so check if exculsionFilters work
       checkForExcludedDevice = true;
       await w.webContents.executeJavaScript(`
         navigator.hid.requestDevice({filters: [], exclusionFilters: ${JSON.stringify(exclusionFilters)}}).then(device => device.toString()).catch(err => err.toString());
+
       `, true);
     }
   });
+
+  it('supports device.forget()', async () => {
+    let deletedDeviceFromEvent;
+    let haveDevices = false;
+    w.webContents.session.on('select-hid-device', (event, details, callback) => {
+      if (details.deviceList.length > 0) {
+        haveDevices = true;
+        callback(details.deviceList[0].deviceId);
+      } else {
+        callback();
+      }
+    });
+    w.webContents.session.on('hid-device-revoked', (event, details) => {
+      deletedDeviceFromEvent = details.device;
+    });
+    await requestDevices();
+    if (haveDevices) {
+      const grantedDevices = await w.webContents.executeJavaScript('navigator.hid.getDevices()');
+      if (grantedDevices.length > 0) {
+        const deletedDevice = await w.webContents.executeJavaScript(`
+          navigator.hid.getDevices().then(devices => {
+            devices[0].forget();
+            return {
+              vendorId: devices[0].vendorId,
+              productId: devices[0].productId,
+              name: devices[0].productName
+            }
+          })
+        `);
+        const grantedDevices2 = await w.webContents.executeJavaScript('navigator.hid.getDevices()');
+        expect(grantedDevices2.length).to.be.lessThan(grantedDevices.length);
+        if (deletedDevice.name !== '' && deletedDevice.productId && deletedDevice.vendorId) {
+          expect(deletedDeviceFromEvent).to.include(deletedDevice);
+        }
+      }
+    }
+  });
 });

From 9d3fc9c794172ad90f5f2cb0fdde130cc94f5e87 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 24 May 2022 10:23:16 +0200
Subject: [PATCH 416/811] refactor: return options directly in
 makeBrowserWindowOptions() helper (#34309)

---
 lib/browser/guest-window-manager.ts | 34 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/browser/guest-window-manager.ts b/lib/browser/guest-window-manager.ts
index 76da71b15abcf..fb6ae6edf00b0 100644
--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -41,7 +41,7 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
   outlivesOpener: boolean,
 }): BrowserWindow | undefined {
   const { url, frameName, features } = windowOpenArgs;
-  const { options: browserWindowOptions } = makeBrowserWindowOptions({
+  const browserWindowOptions = makeBrowserWindowOptions({
     embedder,
     features,
     overrideOptions: overrideBrowserWindowOptions
@@ -211,23 +211,21 @@ function makeBrowserWindowOptions ({ embedder, features, overrideOptions }: {
   const { options: parsedOptions, webPreferences: parsedWebPreferences } = parseFeatures(features);
 
   return {
-    options: {
-      show: true,
-      width: 800,
-      height: 600,
-      ...parsedOptions,
-      ...overrideOptions,
-      // Note that for normal code path an existing WebContents created by
-      // Chromium will be used, with web preferences parsed in the
-      // |-will-add-new-contents| event.
-      // The |webPreferences| here is only used by the |new-window| event.
-      webPreferences: makeWebPreferences({
-        embedder,
-        insecureParsedWebPreferences: parsedWebPreferences,
-        secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
-      })
-    } as Electron.BrowserViewConstructorOptions
-  };
+    show: true,
+    width: 800,
+    height: 600,
+    ...parsedOptions,
+    ...overrideOptions,
+    // Note that for normal code path an existing WebContents created by
+    // Chromium will be used, with web preferences parsed in the
+    // |-will-add-new-contents| event.
+    // The |webPreferences| here is only used by the |new-window| event.
+    webPreferences: makeWebPreferences({
+      embedder,
+      insecureParsedWebPreferences: parsedWebPreferences,
+      secureOverrideWebPreferences: overrideOptions && overrideOptions.webPreferences
+    })
+  } as Electron.BrowserViewConstructorOptions;
 }
 
 export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {}, insecureParsedWebPreferences: parsedWebPreferences = {} }: {

From 6667de28e31e3a333240743b1926d5b76f22da6d Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 24 May 2022 10:23:56 +0200
Subject: [PATCH 417/811] chore: use webContents.setWindowOpenHandler() in
 default-app (#34308)

---
 default_app/default_app.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/default_app/default_app.ts b/default_app/default_app.ts
index 44bc2ebd9affc..0bac020331730 100644
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -66,9 +66,9 @@ async function createWindow (backgroundColor?: string) {
   mainWindow = new BrowserWindow(options);
   mainWindow.on('ready-to-show', () => mainWindow!.show());
 
-  mainWindow.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(decorateURL(url));
+  mainWindow.webContents.setWindowOpenHandler(details => {
+    shell.openExternal(decorateURL(details.url));
+    return { action: 'deny' };
   });
 
   mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {

From b8abf5e38adaaf5f051ad1690f51c4a4082caa02 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 06:00:37 -0700
Subject: [PATCH 418/811] Bump v20.0.0-nightly.20220524

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 04df7831c1786..a0026224c4b61 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220523
\ No newline at end of file
+20.0.0-nightly.20220524
\ No newline at end of file
diff --git a/package.json b/package.json
index 727202feaccae..ee1370fd439b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220523",
+  "version": "20.0.0-nightly.20220524",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e1a52014d366f..995e3bbae9e71 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220523
- PRODUCTVERSION 20,0,0,20220523
+ FILEVERSION 20,0,0,20220524
+ PRODUCTVERSION 20,0,0,20220524
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6cb2b9eab7e04d5b08ed0a75a78c5c6a28d4f1d0 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 24 May 2022 14:04:49 -0700
Subject: [PATCH 419/811] build: do not checkout chromium for ts docs check
 (#34331)

---
 .circleci/config/base.yml | 52 ++++++++++++++-------------------------
 yarn.lock                 |  7 +++---
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 454a7a59152b9..a579069c96e93 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -473,6 +473,13 @@ step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
         node script/yarn install
       fi
 
+step-install-npm-deps: &step-install-npm-deps
+  run:
+    name: Install node_modules
+    command: |
+      cd src/electron
+      node script/yarn install --frozen-lockfile
+
 # This step handles the differences between the linux "gclient sync"
 # and the expected state on macOS
 step-fix-sync: &step-fix-sync
@@ -987,9 +994,16 @@ step-ts-compile: &step-ts-compile
   run:
     name: Run TS/JS compile on doc only change
     command: |
-      cd src
-      ninja -C out/Default electron:default_app_js -j $NUMBER_OF_NINJA_PROCESSES
-      ninja -C out/Default electron:electron_js2c -j $NUMBER_OF_NINJA_PROCESSES
+      cd src/electron
+      node script/yarn create-typescript-definitions
+      node script/yarn tsc -p tsconfig.default_app.json --noEmit
+      for f in build/webpack/*.js
+      do
+        out="${f:29}"
+        if [ "$out" != "base.js" ]; then
+          node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env.mode=development
+        fi
+      done
 
 # List of all steps.
 steps-electron-gn-check: &steps-electron-gn-check
@@ -1011,37 +1025,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
   steps:
     # Checkout - Copied from steps-checkout
     - *step-checkout-electron
-    - *step-depot-tools-get
-    - *step-depot-tools-add-to-path
-    - *step-restore-brew-cache
-    - *step-install-gnutar-on-mac
-    - *step-install-python2-on-mac
-    - *step-get-more-space-on-mac
-    - *step-setup-goma-for-build
-    - *step-generate-deps-hash
-    - *step-touch-sync-done
-    - maybe-restore-portaled-src-cache
-    - *step-maybe-restore-git-cache
-    - *step-set-git-cache-path
-    # This sync call only runs if .circle-sync-done is an EMPTY file
-    - *step-gclient-sync
-    # These next few steps reset Electron to the correct commit regardless of which cache was restored
-    - run:
-        name: Wipe Electron
-        command: rm -rf src/electron
-    - *step-checkout-electron
-    - *step-run-electron-only-hooks
-    - *step-generate-deps-hash-cleanly
-    - *step-mark-sync-done
-    - *step-minimize-workspace-size-from-checkout
-
-    - *step-depot-tools-add-to-path
-    - *step-setup-env-for-build
-    - *step-wait-for-goma
-    - *step-get-more-space-on-mac
-    - *step-install-npm-deps-on-mac
-    - *step-fix-sync
-    - *step-gn-gen-default
+    - *step-install-npm-deps
 
     #Compile ts/js to verify doc change didn't break anything
     - *step-ts-compile
diff --git a/yarn.lock b/yarn.lock
index ca7df59b03cf9..226aae6f5b92c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5050,10 +5050,9 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+nan@^2.12.1, nan@nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac:
+  version "2.15.0"
+  resolved "https://codeload.github.com/nodejs/nan/tar.gz/16fa32231e2ccd89d2804b3f765319128b20c4ac"
 
 nanomatch@^1.2.9:
   version "1.2.13"

From 7bc4b919dcb978426b2cb7114ced85801ec3f776 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 25 May 2022 06:38:38 +0200
Subject: [PATCH 420/811] fix: esc not working on Windows during fullscreen
 (#34317)

* fix: esc not working on Windows during fullscreen

* chore: fix lint
---
 patches/chromium/.patches                     |  2 +-
 ...exclusive_access_for_electron_needs.patch} | 30 +++++++++++++++----
 .../browser/api/electron_api_web_contents.cc  |  5 ++--
 3 files changed, 28 insertions(+), 9 deletions(-)
 rename patches/chromium/{fix_patch_out_permissions_checks_in_exclusive_access.patch => fix_adapt_exclusive_access_for_electron_needs.patch} (81%)

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index feb74c1e343bf..6dc083326fbdd 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -98,7 +98,7 @@ fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
 feat_add_data_parameter_to_processsingleton.patch
 load_v8_snapshot_in_browser_process.patch
-fix_patch_out_permissions_checks_in_exclusive_access.patch
+fix_adapt_exclusive_access_for_electron_needs.patch
 fix_aspect_ratio_with_max_size.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
 fix_crash_when_saving_edited_pdf_files.patch
diff --git a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
similarity index 81%
rename from patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
rename to patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
index 0d8d675b6f839..ad32e434ee6bd 100644
--- a/patches/chromium/fix_patch_out_permissions_checks_in_exclusive_access.patch
+++ b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
@@ -1,20 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shelley Vohr <shelley.vohr@gmail.com>
 Date: Mon, 25 Oct 2021 21:45:57 +0200
-Subject: fix: patch out permissions checks in exclusive_access
+Subject: fix: adapt exclusive_access for electron needs
 
 This patch is necessary in order to properly enable
 navigator.keyboard.{(un)?lock}() functionality. We don't have a concept
 of PermissionManager nor of a Profile, so this would not affect usage of
 the API.
 
-We might consider potentially using our own permissions handler,
-but it's not strictly necessary for this API to work to spec.
-
-Profile check has been upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3247196
+We also need to ensure that NotifyExclusiveTabAccessLost is called
+on all platforms in FullscreenController::ExitFullscreenModeInternal()
+and not just macOS, since Electron's native window impls report state
+change fairly instantly as well, and so pressing escape won't work on
+Linux or Windows to un-fullscreen in some circumstances without this
+change.
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..9fb77b8d7c3d9cb49dcb3ac1f2495fa52f53932e 100644
+index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e415735e4 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 @@ -16,12 +16,16 @@
@@ -112,6 +114,22 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..9fb77b8d7c3d9cb49dcb3ac1f2495fa5
  
    if (option == BROWSER)
      base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
+@@ -507,12 +517,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
+   RecordExitingUMA();
+   toggled_into_fullscreen_ = false;
+   started_fullscreen_transition_ = true;
+-#if BUILDFLAG(IS_MAC)
+-  // Mac windows report a state change instantly, and so we must also clear
++
++  // Electron native windows report a state change instantly, and so we must also clear
+   // state_prior_to_tab_fullscreen_ to match them else other logic using
+   // state_prior_to_tab_fullscreen_ will be incorrect.
+   NotifyTabExclusiveAccessLost();
+-#endif
++
+   exclusive_access_manager()->context()->ExitFullscreen();
+   extension_caused_fullscreen_ = GURL();
+ 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
 index f0841982cb296079c8b943067564d74bc1b7067c..49f59fc2c12c98faada52e0e7c8c9c6e6251b599 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index eda5983d56c8c..b48a45bb8bcc2 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1308,8 +1308,6 @@ void WebContents::EnterFullscreenModeForTab(
       base::BindRepeating(&WebContents::OnEnterFullscreenModeForTab,
                           base::Unretained(this), requesting_frame, options);
   permission_helper->RequestFullscreenPermission(callback);
-  exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
-      requesting_frame, options.display_id);
 }
 
 void WebContents::OnEnterFullscreenModeForTab(
@@ -1325,6 +1323,9 @@ void WebContents::OnEnterFullscreenModeForTab(
     return;
   }
 
+  exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
+      requesting_frame, options.display_id);
+
   SetHtmlApiFullscreen(true);
 
   if (native_fullscreen_) {

From fd559d8516d856c462f4454c85e737f5d79695b4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 06:01:00 -0700
Subject: [PATCH 421/811] Bump v20.0.0-nightly.20220525

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a0026224c4b61..7f65a9514cc90 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220524
\ No newline at end of file
+20.0.0-nightly.20220525
\ No newline at end of file
diff --git a/package.json b/package.json
index ee1370fd439b1..46e473640c793 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220524",
+  "version": "20.0.0-nightly.20220525",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 995e3bbae9e71..24374579aa433 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220524
- PRODUCTVERSION 20,0,0,20220524
+ FILEVERSION 20,0,0,20220525
+ PRODUCTVERSION 20,0,0,20220525
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a6a2bb65a4129e9f9fe529dd5b36b712e9c19174 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 06:16:08 -0700
Subject: [PATCH 422/811] Revert "Bump v20.0.0-nightly.20220525"

This reverts commit fd559d8516d856c462f4454c85e737f5d79695b4.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7f65a9514cc90..a0026224c4b61 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220525
\ No newline at end of file
+20.0.0-nightly.20220524
\ No newline at end of file
diff --git a/package.json b/package.json
index 46e473640c793..ee1370fd439b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220525",
+  "version": "20.0.0-nightly.20220524",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 24374579aa433..995e3bbae9e71 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220525
- PRODUCTVERSION 20,0,0,20220525
+ FILEVERSION 20,0,0,20220524
+ PRODUCTVERSION 20,0,0,20220524
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4b3a7b77625541960786d741c1d4a24c459ac2ed Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 06:18:50 -0700
Subject: [PATCH 423/811] Bump v20.0.0-nightly.20220525

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a0026224c4b61..7f65a9514cc90 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220524
\ No newline at end of file
+20.0.0-nightly.20220525
\ No newline at end of file
diff --git a/package.json b/package.json
index ee1370fd439b1..46e473640c793 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220524",
+  "version": "20.0.0-nightly.20220525",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 995e3bbae9e71..24374579aa433 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220524
- PRODUCTVERSION 20,0,0,20220524
+ FILEVERSION 20,0,0,20220525
+ PRODUCTVERSION 20,0,0,20220525
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From afca3519fda5e66d6ff7bcf9a9d52453377f8fb9 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 25 May 2022 06:24:48 -0700
Subject: [PATCH 424/811] Revert "Bump v20.0.0-nightly.20220525"

This reverts commit 4b3a7b77625541960786d741c1d4a24c459ac2ed.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7f65a9514cc90..a0026224c4b61 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220525
\ No newline at end of file
+20.0.0-nightly.20220524
\ No newline at end of file
diff --git a/package.json b/package.json
index 46e473640c793..ee1370fd439b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220525",
+  "version": "20.0.0-nightly.20220524",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 24374579aa433..995e3bbae9e71 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220525
- PRODUCTVERSION 20,0,0,20220525
+ FILEVERSION 20,0,0,20220524
+ PRODUCTVERSION 20,0,0,20220524
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4accf67d2b5ca09af0b61f8d17ee119c3f83f0b4 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 25 May 2022 20:52:41 +0200
Subject: [PATCH 425/811] build: trigger mksnapshot/chromedriver releases
 automatically (#34346)

---
 .../workflows/release_dependency_versions.yml | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/release_dependency_versions.yml

diff --git a/.github/workflows/release_dependency_versions.yml b/.github/workflows/release_dependency_versions.yml
new file mode 100644
index 0000000000000..7039b9028629b
--- /dev/null
+++ b/.github/workflows/release_dependency_versions.yml
@@ -0,0 +1,31 @@
+name: Trigger Major Release Dependency Updates
+
+on:
+  release:
+    types: [published]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  check_tag:
+    runs-on: ubuntu-latest
+    id: check_tag
+    - uses: actions/checkout@v3
+    - name: Check Tag
+      run: |
+        if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+\.0\.0$ ]]; then
+          echo ::set-output name=should_release::true
+        fi
+  trigger:
+    runs-on: ubuntu-latest
+    needs: check_tag
+    if: jobs.check_tag.outputs.should_release == 'true'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Trigger New chromedriver Release
+        run: |
+          gh api /repos/:owner/chromedriver/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
+      - name: Trigger New mksnapshot Release
+        run: |
+          gh api /repos/:owner/mksnapshot/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'

From 2ffa31832e40602dea3b8ae9cfaad69bfddf73aa Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 26 May 2022 06:01:46 -0700
Subject: [PATCH 426/811] Bump v21.0.0-nightly.20220526

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index a0026224c4b61..f087fa4c20fc3 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-20.0.0-nightly.20220524
\ No newline at end of file
+21.0.0-nightly.20220526
\ No newline at end of file
diff --git a/package.json b/package.json
index ee1370fd439b1..c522a1d42e6f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "20.0.0-nightly.20220524",
+  "version": "21.0.0-nightly.20220526",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 995e3bbae9e71..a31c6f4c6b86b 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 20,0,0,20220524
- PRODUCTVERSION 20,0,0,20220524
+ FILEVERSION 21,0,0,20220526
+ PRODUCTVERSION 21,0,0,20220526
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "20.0.0"
+            VALUE "FileVersion", "21.0.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "20.0.0"
+            VALUE "ProductVersion", "21.0.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 03d9615f999acab396267131b44d3bf0d7bc5f0b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 27 May 2022 06:02:05 -0700
Subject: [PATCH 427/811] Bump v21.0.0-nightly.20220527

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f087fa4c20fc3..6ee6d87b0d7c1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220526
\ No newline at end of file
+21.0.0-nightly.20220527
\ No newline at end of file
diff --git a/package.json b/package.json
index c522a1d42e6f5..5dbc562fc464a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220526",
+  "version": "21.0.0-nightly.20220527",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index a31c6f4c6b86b..043e140d9fe9a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220526
- PRODUCTVERSION 21,0,0,20220526
+ FILEVERSION 21,0,0,20220527
+ PRODUCTVERSION 21,0,0,20220527
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 34a9268e97592afcb662f5cc6d5c1b1489549387 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 30 May 2022 01:28:33 -0700
Subject: [PATCH 428/811] ci: re-enable CalculateNativeWinOcclusion (#34374)

---
 appveyor.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 540fd50f0df75..25aeea817e440 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -211,10 +211,9 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
-  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
-  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )  
+  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log )
+  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log )
+  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log )  
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"

From fd88908457a986f06e310e80499e4b2775d8ba70 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 30 May 2022 05:13:48 -0700
Subject: [PATCH 429/811] fix: hide content protected windows during screen
 capture with `ScreenCaptureKitMac` (#34362)

fix: hide content protected windows during screen capture
---
 patches/chromium/.patches                     |  1 +
 ...indows_in_the_current_application_in.patch | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 6dc083326fbdd..547c0b5e6240e 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -110,3 +110,4 @@ introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
+feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
diff --git a/patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch b/patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
new file mode 100644
index 0000000000000..c72abdbc38363
--- /dev/null
+++ b/patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Thu, 26 May 2022 15:38:32 -0700
+Subject: feat: filter out non-shareable windows in the current application in
+ ScreenCaptureKitDevice
+
+This patch ensures that windows protected via win.setContentProtection(true) do not appear in full display captures via desktopCapturer.  This patch could be upstreamed but as the check is limited to in-process windows it doesn't make a lot of sense for Chromium itself.  This patch currently has a limitation that it only function for windows created / protected BEFORE the stream is started.  There is theoretical future work we can do via polling / observers to automatically update the SCContentFilter when new windows are made but for now this will solve 99+% of the problem and folks can re-order their logic a bit to get it working for their use cases.
+
+diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
+index 50a779be2e7d3a95496e2791187a6b56266786eb..5876babb99b5e98b151e13e4091305763a417a9e 100644
+--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
++++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
+@@ -100,7 +100,15 @@ void OnShareableContentCreated(
+       case DesktopMediaID::TYPE_SCREEN:
+         for (SCDisplay* display : [content displays]) {
+           if (source_.id == [display displayID]) {
+-            NSArray<SCWindow*>* exclude_windows = nil;
++            NSArray<NSWindow*>* exclude_ns_windows = [[[NSApplication sharedApplication] windows] filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSWindow* win, NSDictionary *bindings) {
++              return [win sharingType] == NSWindowSharingNone;
++            }]];
++            NSArray<SCWindow*>* exclude_windows = [[content windows] filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(SCWindow* win, NSDictionary *bindings) {
++              for (NSWindow* excluded : exclude_ns_windows) {
++                if ((CGWindowID)[excluded windowNumber] == [win windowID]) return true;
++              }
++              return false;
++            }]];
+             filter.reset([[SCContentFilter alloc]
+                  initWithDisplay:display
+                 excludingWindows:exclude_windows]);

From 0d69067dee3f05db568820e480f7db3aa8b724aa Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 06:01:33 -0700
Subject: [PATCH 430/811] Bump v21.0.0-nightly.20220530

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6ee6d87b0d7c1..d26213de57bfa 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220527
\ No newline at end of file
+21.0.0-nightly.20220530
\ No newline at end of file
diff --git a/package.json b/package.json
index 5dbc562fc464a..1abee71072b9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220527",
+  "version": "21.0.0-nightly.20220530",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 043e140d9fe9a..41ec4c7402d4c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220527
- PRODUCTVERSION 21,0,0,20220527
+ FILEVERSION 21,0,0,20220530
+ PRODUCTVERSION 21,0,0,20220530
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 93b39b92b5078071f870b8e97c31e24c1974a49f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 31 May 2022 08:21:25 +0200
Subject: [PATCH 431/811] refactor: printToPDF should be headless (#33654)

---
 BUILD.gn                                      |   2 -
 chromium_src/BUILD.gn                         |   2 +
 docs/api/web-contents.md                      |  53 ++--
 docs/api/webview-tag.md                       |  30 +--
 docs/breaking-changes.md                      |  55 ++++
 lib/browser/api/web-contents.ts               | 236 ++++++++---------
 patches/chromium/printing.patch               | 105 ++------
 .../browser/api/electron_api_web_contents.cc  |  86 +++++-
 shell/browser/api/electron_api_web_contents.h |   6 +-
 .../electron_extensions_api_client.cc         |   2 -
 .../printing/print_preview_message_handler.h  | 108 --------
 .../printing/print_view_manager_electron.cc   | 247 +++++++++++++++++-
 .../printing/print_view_manager_electron.h    |  69 ++++-
 spec-main/api-web-contents-spec.ts            |  19 +-
 spec/ts-smoke/electron/main.ts                |   7 +-
 spec/webview-spec.js                          |  14 +-
 typings/internal-electron.d.ts                |   5 +
 17 files changed, 640 insertions(+), 406 deletions(-)
 delete mode 100644 shell/browser/printing/print_preview_message_handler.h

diff --git a/BUILD.gn b/BUILD.gn
index 107f317be548f..5c5f4d27e01e6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -667,8 +667,6 @@ source_set("electron_lib") {
 
   if (enable_basic_printing) {
     sources += [
-      "shell/browser/printing/print_preview_message_handler.cc",
-      "shell/browser/printing/print_preview_message_handler.h",
       "shell/browser/printing/print_view_manager_electron.cc",
       "shell/browser/printing/print_view_manager_electron.h",
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 41aad0ed3b942..f5a8939902246 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -216,6 +216,8 @@ static_library("chrome") {
       "//chrome/browser/printing/printer_query.h",
       "//chrome/browser/printing/printing_service.cc",
       "//chrome/browser/printing/printing_service.h",
+      "//components/printing/browser/print_to_pdf/pdf_print_utils.cc",
+      "//components/printing/browser/print_to_pdf/pdf_print_utils.h",
     ]
 
     if (enable_oop_printing) {
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index bdfa225332567..d3f5b82a773fd 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1428,7 +1428,7 @@ Returns `Promise<PrinterInfo[]>` - Resolves with a [`PrinterInfo[]`](structures/
   * `header` string (optional) - string to be printed as page header.
   * `footer` string (optional) - string to be printed as page footer.
   * `pageSize` string | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width`.
 * `callback` Function (optional)
   * `success` boolean - Indicates success of the print call.
   * `failureReason` string - Error description called back if the print fails.
@@ -1459,43 +1459,28 @@ win.webContents.print(options, (success, errorType) => {
 #### `contents.printToPDF(options)`
 
 * `options` Object
-  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
-    * `title` string - The title for the PDF header.
-    * `url` string - the url for the PDF footer.
-  * `landscape` boolean (optional) - `true` for landscape, `false` for portrait.
-  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
-    default margin, 1 for no margin, and 2 for minimum margin.
-  * `scaleFactor` number (optional) - The scale factor of the web page. Can range from 0 to 100.
-  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` number - Index of the first page to print (0-based).
-    * `to` number - Index of the last page to print (inclusive) (0-based).
-  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
-  * `printBackground` boolean (optional) - Whether to print CSS backgrounds.
-  * `printSelectionOnly` boolean (optional) - Whether to print selection only.
+  * `landscape` boolean (optional) - Paper orientation.`true` for landscape, `false` for portrait. Defaults to false.
+  * `displayHeaderFooter` boolean (optional) - Whether to display header and footer. Defaults to false.
+  * `printBackground` boolean (optional) - Whether to print background graphics. Defaults to false.
+  * `scale` number(optional)  - Scale of the webpage rendering. Defaults to 1.
+  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A0`, `A1`, `A2`, `A3`,
+  `A4`, `A5`, `A6`, `Legal`, `Letter`, `Tabloid`, `Ledger`, or an Object containing `height` and `width` in inches. Defaults to `Letter`.
+  * `margins` Object (optional)
+    * `top` number (optional) - Top margin in inches. Defaults to 1cm (~0.4 inches).
+    * `bottom` number (optional) - Bottom margin in inches. Defaults to 1cm (~0.4 inches).
+    * `left` number (optional) - Left margin in inches. Defaults to 1cm (~0.4 inches).
+    * `right` number (optional) - Right margin in inches. Defaults to 1cm (~0.4 inches).
+  * `pageRanges` string (optional) - Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
+  * `headerTemplate` string (optional) - HTML template for the print header. Should be valid HTML markup with following classes used to inject printing values into them: `date` (formatted print date), `title` (document title), `url` (document location), `pageNumber` (current page number) and `totalPages` (total pages in the document). For example, `<span class=title></span>` would generate span containing the title.
+  * `footerTemplate` string (optional) - HTML template for the print footer. Should use the same format as the `headerTemplate`.
+  * `preferCSSPageSize` boolean (optional) - Whether or not to prefer page size as defined by css. Defaults to false, in which case the content will be scaled to fit the paper size.
 
 Returns `Promise<Buffer>` - Resolves with the generated PDF data.
 
-Prints window's web page as PDF with Chromium's preview printing custom
-settings.
+Prints the window's web page as PDF.
 
 The `landscape` will be ignored if `@page` CSS at-rule is used in the web page.
 
-By default, an empty `options` will be regarded as:
-
-```javascript
-{
-  marginsType: 0,
-  printBackground: false,
-  printSelectionOnly: false,
-  landscape: false,
-  pageSize: 'A4',
-  scaleFactor: 100
-}
-```
-
-Use `page-break-before: always;` CSS style to force to print to a new page.
-
 An example of `webContents.printToPDF`:
 
 ```javascript
@@ -1504,7 +1489,7 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+const win = new BrowserWindow()
 win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
@@ -1521,6 +1506,8 @@ win.webContents.on('did-finish-load', () => {
 })
 ```
 
+See [Page.printToPdf](https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF) for more information.
+
 #### `contents.addWorkSpace(path)`
 
 * `path` string
diff --git a/docs/api/webview-tag.md b/docs/api/webview-tag.md
index 865b101168ad6..cc86a05d5be4d 100644
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -565,21 +565,21 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
 ### `<webview>.printToPDF(options)`
 
 * `options` Object
-  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
-    * `title` string - The title for the PDF header.
-    * `url` string - the url for the PDF footer.
-  * `landscape` boolean (optional) - `true` for landscape, `false` for portrait.
-  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
-    default margin, 1 for no margin, and 2 for minimum margin.
-    and `width` in microns.
-  * `scaleFactor` number (optional) - The scale factor of the web page. Can range from 0 to 100.
-  * `pageRanges` Record<string, number> (optional) - The page range to print. On macOS, only the first range is honored.
-    * `from` number - Index of the first page to print (0-based).
-    * `to` number - Index of the last page to print (inclusive) (0-based).
-  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
-  * `printBackground` boolean (optional) - Whether to print CSS backgrounds.
-  * `printSelectionOnly` boolean (optional) - Whether to print selection only.
+  * `landscape` boolean (optional) - Paper orientation.`true` for landscape, `false` for portrait. Defaults to false.
+  * `displayHeaderFooter` boolean (optional) - Whether to display header and footer. Defaults to false.
+  * `printBackground` boolean (optional) - Whether to print background graphics. Defaults to false.
+  * `scale` number(optional)  - Scale of the webpage rendering. Defaults to 1.
+  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A0`, `A1`, `A2`, `A3`,
+  `A4`, `A5`, `A6`, `Legal`, `Letter`, `Tabloid`, `Ledger`, or an Object containing `height` and `width` in inches. Defaults to `Letter`.
+  * `margins` Object (optional)
+    * `top` number (optional) - Top margin in inches. Defaults to 1cm (~0.4 inches).
+    * `bottom` number (optional) - Bottom margin in inches. Defaults to 1cm (~0.4 inches).
+    * `left` number (optional) - Left margin in inches. Defaults to 1cm (~0.4 inches).
+    * `right` number (optional) - Right margin in inches. Defaults to 1cm (~0.4 inches).
+  * `pageRanges` string (optional) - Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
+  * `headerTemplate` string (optional) - HTML template for the print header. Should be valid HTML markup with following classes used to inject printing values into them: `date` (formatted print date), `title` (document title), `url` (document location), `pageNumber` (current page number) and `totalPages` (total pages in the document). For example, `<span class=title></span>` would generate span containing the title.
+  * `footerTemplate` string (optional) - HTML template for the print footer. Should use the same format as the `headerTemplate`.
+  * `preferCSSPageSize` boolean (optional) - Whether or not to prefer page size as defined by css. Defaults to false, in which case the content will be scaled to fit the paper size.
 
 Returns `Promise<Uint8Array>` - Resolves with the generated PDF data.
 
diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index cf0e48d0df670..e0dea89dfd9a2 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -14,6 +14,61 @@ This document uses the following convention to categorize breaking changes:
 
 ## Planned Breaking API Changes (20.0)
 
+### API Changed: `webContents.printToPDF()`
+
+`webContents.printToPDF()` has been modified to conform to [`Page.printToPDF`](https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF) in the Chrome DevTools Protocol. This has been changes in order to
+address changes upstream that made our previous implementation untenable and rife with bugs.
+
+**Arguments Changed**
+
+* `pageRanges`
+
+**Arguments Removed**
+
+* `printSelectionOnly`
+* `marginsType`
+* `headerFooter`
+* `scaleFactor`
+
+**Arguments Added**
+
+* `headerTemplate`
+* `footerTemplate`
+* `displayHeaderFooter`
+* `margins`
+* `scale`
+* `preferCSSPageSize`
+
+```js
+// Main process
+const { webContents } = require('electron')
+
+webContents.printToPDF({
+  landscape: true,
+  displayHeaderFooter: true,
+  printBackground: true,
+  scale: 2,
+  pageSize: 'Ledger',
+  margins: {
+    top: 2,
+    bottom: 2,
+    left: 2,
+    right: 2
+  },
+  pageRanges: '1-5, 8, 11-13',
+  headerTemplate: '<h1>Title</h1>',
+  footerTemplate: '<div><span class="pageNumber"></span></div>',
+  preferCSSPageSize: true
+}).then(data => {
+  fs.writeFile(pdfPath, data, (error) => {
+    if (error) throw error
+    console.log(`Wrote PDF successfully to ${pdfPath}`)
+  })
+}).catch(error => {
+  console.log(`Failed to write PDF to ${pdfPath}: `, error)
+})
+```
+
 ### Default Changed: renderers without `nodeIntegration: true` are sandboxed by default
 
 Previously, renderers that specified a preload script defaulted to being
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index b2407ee7e0a37..f54b6369a4447 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -63,6 +63,20 @@ const PDFPageSizes: Record<string, ElectronInternal.MediaSize> = {
   }
 } as const;
 
+const paperFormats: Record<string, ElectronInternal.PageSize> = {
+  letter: { width: 8.5, height: 11 },
+  legal: { width: 8.5, height: 14 },
+  tabloid: { width: 11, height: 17 },
+  ledger: { width: 17, height: 11 },
+  a0: { width: 33.1, height: 46.8 },
+  a1: { width: 23.4, height: 33.1 },
+  a2: { width: 16.54, height: 23.4 },
+  a3: { width: 11.7, height: 16.54 },
+  a4: { width: 8.27, height: 11.7 },
+  a5: { width: 5.83, height: 8.27 },
+  a6: { width: 4.13, height: 5.83 }
+} as const;
+
 // The minimum micron size Chromium accepts is that where:
 // Per printing/units.h:
 //  * kMicronsPerInch - Length of an inch in 0.001mm unit.
@@ -76,42 +90,6 @@ const isValidCustomPageSize = (width: number, height: number) => {
   return [width, height].every(x => x > 352);
 };
 
-// Default printing setting
-const defaultPrintingSetting = {
-  // Customizable.
-  pageRange: [] as {from: number, to: number}[],
-  mediaSize: {} as ElectronInternal.MediaSize,
-  landscape: false,
-  headerFooterEnabled: false,
-  marginsType: 0,
-  scaleFactor: 100,
-  shouldPrintBackgrounds: false,
-  shouldPrintSelectionOnly: false,
-  // Non-customizable.
-  printWithCloudPrint: false,
-  printWithPrivet: false,
-  printWithExtension: false,
-  pagesPerSheet: 1,
-  isFirstRequest: false,
-  previewUIID: 0,
-  // True, if the document source is modifiable. e.g. HTML and not PDF.
-  previewModifiable: true,
-  printToPDF: true,
-  deviceName: 'Save as PDF',
-  generateDraftData: true,
-  dpiHorizontal: 72,
-  dpiVertical: 72,
-  rasterizePDF: false,
-  duplex: 0,
-  copies: 1,
-  // 2 = color - see ColorModel in //printing/print_job_constants.h
-  color: 2,
-  collate: true,
-  printerType: 2,
-  title: undefined as string | undefined,
-  url: undefined as string | undefined
-} as const;
-
 // JavaScript implementations of WebContents.
 const binding = process._linkedBinding('electron_browser_web_contents');
 const printing = process._linkedBinding('electron_browser_printing');
@@ -193,136 +171,136 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId
 let pendingPromise: Promise<any> | undefined;
 WebContents.prototype.printToPDF = async function (options) {
   const printSettings: Record<string, any> = {
-    ...defaultPrintingSetting,
-    requestID: getNextId()
+    requestID: getNextId(),
+    landscape: false,
+    displayHeaderFooter: false,
+    headerTemplate: '',
+    footerTemplate: '',
+    printBackground: false,
+    scale: 1,
+    paperWidth: 8.5,
+    paperHeight: 11,
+    marginTop: 0,
+    marginBottom: 0,
+    marginLeft: 0,
+    marginRight: 0,
+    pageRanges: '',
+    preferCSSPageSize: false
   };
 
   if (options.landscape !== undefined) {
     if (typeof options.landscape !== 'boolean') {
-      const error = new Error('landscape must be a Boolean');
-      return Promise.reject(error);
+      return Promise.reject(new Error('landscape must be a Boolean'));
     }
     printSettings.landscape = options.landscape;
   }
 
-  if (options.scaleFactor !== undefined) {
-    if (typeof options.scaleFactor !== 'number') {
-      const error = new Error('scaleFactor must be a Number');
-      return Promise.reject(error);
+  if (options.displayHeaderFooter !== undefined) {
+    if (typeof options.displayHeaderFooter !== 'boolean') {
+      return Promise.reject(new Error('displayHeaderFooter must be a Boolean'));
     }
-    printSettings.scaleFactor = options.scaleFactor;
+    printSettings.displayHeaderFooter = options.displayHeaderFooter;
   }
 
-  if (options.marginsType !== undefined) {
-    if (typeof options.marginsType !== 'number') {
-      const error = new Error('marginsType must be a Number');
-      return Promise.reject(error);
+  if (options.printBackground !== undefined) {
+    if (typeof options.printBackground !== 'boolean') {
+      return Promise.reject(new Error('printBackground must be a Boolean'));
     }
-    printSettings.marginsType = options.marginsType;
+    printSettings.shouldPrintBackgrounds = options.printBackground;
   }
 
-  if (options.printSelectionOnly !== undefined) {
-    if (typeof options.printSelectionOnly !== 'boolean') {
-      const error = new Error('printSelectionOnly must be a Boolean');
-      return Promise.reject(error);
+  if (options.scale !== undefined) {
+    if (typeof options.scale !== 'number') {
+      return Promise.reject(new Error('scale must be a Number'));
     }
-    printSettings.shouldPrintSelectionOnly = options.printSelectionOnly;
+    printSettings.scaleFactor = options.scale;
   }
 
-  if (options.printBackground !== undefined) {
-    if (typeof options.printBackground !== 'boolean') {
-      const error = new Error('printBackground must be a Boolean');
-      return Promise.reject(error);
+  const { pageSize } = options;
+  if (pageSize !== undefined) {
+    if (typeof pageSize === 'string') {
+      const format = paperFormats[pageSize.toLowerCase()];
+      if (!format) {
+        return Promise.reject(new Error(`Invalid pageSize ${pageSize}`));
+      }
+
+      printSettings.paperWidth = format.width;
+      printSettings.paperHeight = format.height;
+    } else if (typeof options.pageSize === 'object') {
+      if (!pageSize.height || !pageSize.width) {
+        return Promise.reject(new Error('height and width properties are required for pageSize'));
+      }
+
+      printSettings.paperWidth = pageSize.width;
+      printSettings.paperHeight = pageSize.height;
+    } else {
+      return Promise.reject(new Error('pageSize must be a String or Object'));
     }
-    printSettings.shouldPrintBackgrounds = options.printBackground;
   }
 
-  if (options.pageRanges !== undefined) {
-    const pageRanges = options.pageRanges;
-    if (!Object.prototype.hasOwnProperty.call(pageRanges, 'from') || !Object.prototype.hasOwnProperty.call(pageRanges, 'to')) {
-      const error = new Error('pageRanges must be an Object with \'from\' and \'to\' properties');
-      return Promise.reject(error);
+  const { margins } = options;
+  if (margins !== undefined) {
+    if (typeof margins !== 'object') {
+      return Promise.reject(new Error('margins must be an Object'));
     }
 
-    if (typeof pageRanges.from !== 'number') {
-      const error = new Error('pageRanges.from must be a Number');
-      return Promise.reject(error);
+    if (margins.top !== undefined) {
+      if (typeof margins.top !== 'number') {
+        return Promise.reject(new Error('margins.top must be a Number'));
+      }
+      printSettings.marginTop = margins.top;
     }
 
-    if (typeof pageRanges.to !== 'number') {
-      const error = new Error('pageRanges.to must be a Number');
-      return Promise.reject(error);
+    if (margins.bottom !== undefined) {
+      if (typeof margins.bottom !== 'number') {
+        return Promise.reject(new Error('margins.bottom must be a Number'));
+      }
+      printSettings.marginBottom = margins.bottom;
     }
 
-    // Chromium uses 1-based page ranges, so increment each by 1.
-    printSettings.pageRange = [{
-      from: pageRanges.from + 1,
-      to: pageRanges.to + 1
-    }];
-  }
-
-  if (options.headerFooter !== undefined) {
-    const headerFooter = options.headerFooter;
-    printSettings.headerFooterEnabled = true;
-    if (typeof headerFooter === 'object') {
-      if (!headerFooter.url || !headerFooter.title) {
-        const error = new Error('url and title properties are required for headerFooter');
-        return Promise.reject(error);
-      }
-      if (typeof headerFooter.title !== 'string') {
-        const error = new Error('headerFooter.title must be a String');
-        return Promise.reject(error);
+    if (margins.left !== undefined) {
+      if (typeof margins.left !== 'number') {
+        return Promise.reject(new Error('margins.left must be a Number'));
       }
-      printSettings.title = headerFooter.title;
+      printSettings.marginLeft = margins.left;
+    }
 
-      if (typeof headerFooter.url !== 'string') {
-        const error = new Error('headerFooter.url must be a String');
-        return Promise.reject(error);
+    if (margins.right !== undefined) {
+      if (typeof margins.right !== 'number') {
+        return Promise.reject(new Error('margins.right must be a Number'));
       }
-      printSettings.url = headerFooter.url;
-    } else {
-      const error = new Error('headerFooter must be an Object');
-      return Promise.reject(error);
+      printSettings.marginRight = margins.right;
     }
   }
 
-  // Optionally set size for PDF.
-  if (options.pageSize !== undefined) {
-    const pageSize = options.pageSize;
-    if (typeof pageSize === 'object') {
-      if (!pageSize.height || !pageSize.width) {
-        const error = new Error('height and width properties are required for pageSize');
-        return Promise.reject(error);
-      }
+  if (options.pageRanges !== undefined) {
+    if (typeof options.pageRanges !== 'string') {
+      return Promise.reject(new Error('printBackground must be a String'));
+    }
+    printSettings.pageRanges = options.pageRanges;
+  }
 
-      // Dimensions in Microns - 1 meter = 10^6 microns
-      const height = Math.ceil(pageSize.height);
-      const width = Math.ceil(pageSize.width);
-      if (!isValidCustomPageSize(width, height)) {
-        const error = new Error('height and width properties must be minimum 352 microns.');
-        return Promise.reject(error);
-      }
+  if (options.headerTemplate !== undefined) {
+    if (typeof options.headerTemplate !== 'string') {
+      return Promise.reject(new Error('headerTemplate must be a String'));
+    }
+    printSettings.headerTemplate = options.headerTemplate;
+  }
 
-      printSettings.mediaSize = {
-        name: 'CUSTOM',
-        custom_display_name: 'Custom',
-        height_microns: height,
-        width_microns: width
-      };
-    } else if (Object.prototype.hasOwnProperty.call(PDFPageSizes, pageSize)) {
-      printSettings.mediaSize = PDFPageSizes[pageSize];
-    } else {
-      const error = new Error(`Unsupported pageSize: ${pageSize}`);
-      return Promise.reject(error);
+  if (options.footerTemplate !== undefined) {
+    if (typeof options.footerTemplate !== 'string') {
+      return Promise.reject(new Error('footerTemplate must be a String'));
     }
-  } else {
-    printSettings.mediaSize = PDFPageSizes.A4;
+    printSettings.footerTemplate = options.footerTemplate;
+  }
+
+  if (options.preferCSSPageSize !== undefined) {
+    if (typeof options.preferCSSPageSize !== 'boolean') {
+      return Promise.reject(new Error('footerTemplate must be a String'));
+    }
+    printSettings.preferCSSPageSize = options.preferCSSPageSize;
   }
 
-  // Chromium expects this in a 0-100 range number, not as float
-  printSettings.scaleFactor = Math.ceil(printSettings.scaleFactor) % 100;
-  // PrinterType enum from //printing/print_job_constants.h
-  printSettings.printerType = 2;
   if (this._printToPDF) {
     if (pendingPromise) {
       pendingPromise = pendingPromise.then(() => this._printToPDF(printSettings));
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 2b9df64a7bf5e..edeed181bef81 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -113,31 +113,19 @@ index dd27bbf387718d6abda5080e7d2c609cd0eaff17..8837cf2aeaa2f87d51be8d00aa356c8a
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc9c122ae3 100644
+index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df6588392418 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
-@@ -30,10 +30,10 @@
+@@ -30,8 +30,6 @@
  #include "chrome/browser/printing/print_view_manager_common.h"
  #include "chrome/browser/printing/printer_query.h"
  #include "chrome/browser/profiles/profile.h"
 -#include "chrome/browser/ui/simple_message_box.h"
 -#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
  #include "chrome/common/pref_names.h"
-+#if 0
  #include "chrome/grit/generated_resources.h"
-+#endif
  #include "components/prefs/pref_service.h"
- #include "components/printing/browser/print_composite_client.h"
- #include "components/printing/browser/print_manager_utils.h"
-@@ -48,6 +48,7 @@
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/render_process_host.h"
- #include "content/public/browser/web_contents.h"
-+#include "chrome/grit/generated_resources.h"
- #include "mojo/public/cpp/system/buffer.h"
- #include "printing/buildflags/buildflags.h"
- #include "printing/metafile_skia.h"
-@@ -87,6 +88,8 @@ using PrintSettingsCallback =
+@@ -87,6 +85,8 @@ using PrintSettingsCallback =
      base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
@@ -146,7 +134,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -95,6 +98,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -95,6 +95,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -154,7 +142,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  }
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -192,7 +196,9 @@ void UpdatePrintSettingsReplyOnIO(
+@@ -192,7 +193,9 @@ void UpdatePrintSettingsReplyOnIO(
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -165,7 +153,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -245,6 +251,7 @@ void ScriptedPrintReplyOnIO(
+@@ -245,6 +248,7 @@ void ScriptedPrintReplyOnIO(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -173,7 +161,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -254,8 +261,9 @@ void ScriptedPrintReplyOnIO(
+@@ -254,8 +258,9 @@ void ScriptedPrintReplyOnIO(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -184,7 +172,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -293,12 +301,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -293,12 +298,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -199,7 +187,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -306,7 +316,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -306,7 +313,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -211,7 +199,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -332,6 +345,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -332,6 +342,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -221,7 +209,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
    enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -500,7 +516,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -500,7 +513,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -231,7 +219,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -513,16 +530,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -513,16 +527,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -255,7 +243,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -638,11 +658,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -638,11 +655,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -270,7 +258,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -672,18 +695,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -672,18 +692,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -292,7 +280,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -693,6 +718,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -693,6 +715,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -300,7 +288,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -718,14 +744,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -718,14 +741,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -317,7 +305,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
      return;
    }
  #endif
-@@ -763,7 +789,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -763,7 +786,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -325,7 +313,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  #endif
  
    ReleasePrinterQuery();
-@@ -778,6 +803,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -778,6 +800,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -337,7 +325,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -788,10 +818,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -788,10 +815,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -350,7 +338,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -851,6 +883,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -851,6 +880,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -362,7 +350,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -908,7 +945,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -908,7 +942,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -374,7 +362,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    if (!weak_this)
      return false;
  
-@@ -987,6 +1027,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -987,6 +1024,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    UnregisterSystemPrintClient();
  #endif
  
@@ -388,7 +376,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
    if (!print_job_)
      return;
  
-@@ -1036,7 +1083,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1036,7 +1080,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -397,7 +385,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..973666a1315c8cbba0a2cefbe9195fdc
      return true;
  
    if (!cookie) {
-@@ -1144,7 +1191,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1144,7 +1188,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -491,29 +479,6 @@ index 5f4d6e314b21351e3e5912e3a43ef87774343085..8627c8305686654dca7cd9c26433592e
    void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
-diff --git a/components/printing/browser/print_to_pdf/pdf_print_manager.cc b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
-index 82591f8c2abbc1a180ef62f7264a68ca279e9b9c..ad27a15ba3028af1046482192dec789df5dda7b2 100644
---- a/components/printing/browser/print_to_pdf/pdf_print_manager.cc
-+++ b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
-@@ -132,7 +132,8 @@ void PdfPrintManager::PrintToPdf(
-   set_cookie(print_pages_params->params->document_cookie);
-   callback_ = std::move(callback);
- 
--  GetPrintRenderFrame(rfh)->PrintWithParams(std::move(print_pages_params));
-+  // TODO(electron-maintainers): do something with job_settings here?
-+  GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
- }
- 
- void PdfPrintManager::GetDefaultPrintSettings(
-@@ -147,7 +148,7 @@ void PdfPrintManager::ScriptedPrint(
-   auto default_param = printing::mojom::PrintPagesParams::New();
-   default_param->params = printing::mojom::PrintParams::New();
-   DLOG(ERROR) << "Scripted print is not supported";
--  std::move(callback).Run(std::move(default_param));
-+  std::move(callback).Run(std::move(default_param), true/*canceled*/);
- }
- 
- void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
 index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..2cfcd810c9507c434e673064b63e8fbc95172537 100644
 --- a/components/printing/common/print.mojom
@@ -537,7 +502,7 @@ index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..2cfcd810c9507c434e673064b63e8fbc
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index db8913ae41d46d14fd15c6127e126e4b129dc4b8..ddbc3b0d5a00af9de84e1b0aadc44adb6ff84495 100644
+index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1df2f1a86 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -716,26 +681,6 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..ddbc3b0d5a00af9de84e1b0aadc44adb
              *output = std::move(input);
              std::move(quit_closure).Run();
            },
-@@ -2725,18 +2756,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
- }
- 
- bool PrintRenderFrameHelper::CheckForCancel() {
--  const mojom::PrintParams& print_params = *print_pages_params_->params;
--  bool cancel = false;
--
--  if (!GetPrintManagerHost()->CheckForCancel(print_params.preview_ui_id,
--                                             print_params.preview_request_id,
--                                             &cancel)) {
--    cancel = true;
--  }
--
--  if (cancel)
--    notify_browser_of_print_failure_ = false;
--  return cancel;
-+  return false;
- }
- 
- bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
 index 220b28a7e63625fe8b76290f0d2f40dd32cae255..cff9e35fab9df680c3c39467c50ddb033c2e6cba 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index b48a45bb8bcc2..1422083e5d511 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -25,6 +25,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/printing/print_view_manager_base.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/views/eye_dropper/eye_dropper.h"
 #include "chrome/common/pref_names.h"
@@ -165,9 +166,10 @@
 
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "components/printing/browser/print_manager_utils.h"
+#include "components/printing/browser/print_to_pdf/pdf_print_utils.h"
 #include "printing/backend/print_backend.h"  // nogncheck
 #include "printing/mojom/print.mojom.h"      // nogncheck
-#include "shell/browser/printing/print_preview_message_handler.h"
+#include "printing/page_range.h"
 #include "shell/browser/printing/print_view_manager_electron.h"
 
 #if BUILDFLAG(IS_WIN)
@@ -919,10 +921,7 @@ void WebContents::InitWithWebContents(
   web_contents->SetDelegate(this);
 
 #if BUILDFLAG(ENABLE_PRINTING)
-  PrintPreviewMessageHandler::CreateForWebContents(web_contents.get());
   PrintViewManagerElectron::CreateForWebContents(web_contents.get());
-  printing::CreateCompositeClientIfNeeded(web_contents.get(),
-                                          browser_context->GetUserAgent());
 #endif
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
@@ -2807,14 +2806,87 @@ void WebContents::Print(gin::Arguments* args) {
                      std::move(callback), device_name, silent));
 }
 
-v8::Local<v8::Promise> WebContents::PrintToPDF(base::DictionaryValue settings) {
+// Partially duplicated and modified from
+// headless/lib/browser/protocol/page_handler.cc;l=41
+v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
   gin_helper::Promise<v8::Local<v8::Value>> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
-  PrintPreviewMessageHandler::FromWebContents(web_contents())
-      ->PrintToPDF(std::move(settings), std::move(promise));
+
+  // This allows us to track headless printing calls.
+  auto unique_id = settings.GetDict().FindInt(printing::kPreviewRequestID);
+  auto landscape = settings.GetDict().FindBool("landscape");
+  auto display_header_footer =
+      settings.GetDict().FindBool("displayHeaderFooter");
+  auto print_background = settings.GetDict().FindBool("shouldPrintBackgrounds");
+  auto scale = settings.GetDict().FindDouble("scale");
+  auto paper_width = settings.GetDict().FindInt("paperWidth");
+  auto paper_height = settings.GetDict().FindInt("paperHeight");
+  auto margin_top = settings.GetDict().FindIntByDottedPath("margins.top");
+  auto margin_bottom = settings.GetDict().FindIntByDottedPath("margins.bottom");
+  auto margin_left = settings.GetDict().FindIntByDottedPath("margins.left");
+  auto margin_right = settings.GetDict().FindIntByDottedPath("margins.right");
+  auto page_ranges = *settings.GetDict().FindString("pageRanges");
+  auto header_template = *settings.GetDict().FindString("headerTemplate");
+  auto footer_template = *settings.GetDict().FindString("footerTemplate");
+  auto prefer_css_page_size = settings.GetDict().FindBool("preferCSSPageSize");
+
+  absl::variant<printing::mojom::PrintPagesParamsPtr, std::string>
+      print_pages_params = print_to_pdf::GetPrintPagesParams(
+          web_contents()->GetMainFrame()->GetLastCommittedURL(), landscape,
+          display_header_footer, print_background, scale, paper_width,
+          paper_height, margin_top, margin_bottom, margin_left, margin_right,
+          absl::make_optional(header_template),
+          absl::make_optional(footer_template), prefer_css_page_size);
+
+  if (absl::holds_alternative<std::string>(print_pages_params)) {
+    auto error = absl::get<std::string>(print_pages_params);
+    promise.RejectWithErrorMessage("Invalid print parameters: " + error);
+    return handle;
+  }
+
+  auto* manager = PrintViewManagerElectron::FromWebContents(web_contents());
+  if (!manager) {
+    promise.RejectWithErrorMessage("Failed to find print manager");
+    return handle;
+  }
+
+  auto params = std::move(
+      absl::get<printing::mojom::PrintPagesParamsPtr>(print_pages_params));
+  params->params->document_cookie = unique_id.value_or(0);
+
+  manager->PrintToPdf(web_contents()->GetMainFrame(), page_ranges,
+                      std::move(params),
+                      base::BindOnce(&WebContents::OnPDFCreated, GetWeakPtr(),
+                                     std::move(promise)));
+
   return handle;
 }
+
+void WebContents::OnPDFCreated(
+    gin_helper::Promise<v8::Local<v8::Value>> promise,
+    PrintViewManagerElectron::PrintResult print_result,
+    scoped_refptr<base::RefCountedMemory> data) {
+  if (print_result != PrintViewManagerElectron::PrintResult::PRINT_SUCCESS) {
+    promise.RejectWithErrorMessage(
+        "Failed to generate PDF: " +
+        PrintViewManagerElectron::PrintResultToString(print_result));
+    return;
+  }
+
+  v8::Isolate* isolate = promise.isolate();
+  gin_helper::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+  v8::Context::Scope context_scope(
+      v8::Local<v8::Context>::New(isolate, promise.GetContext()));
+
+  v8::Local<v8::Value> buffer =
+      node::Buffer::Copy(isolate, reinterpret_cast<const char*>(data->front()),
+                         data->size())
+          .ToLocalChecked();
+
+  promise.Resolve(buffer);
+}
 #endif
 
 void WebContents::AddWorkSpace(gin::Arguments* args,
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 8925e14db4f5c..c85708f45cd16 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -47,7 +47,6 @@
 #include "ui/gfx/image/image.h"
 
 #if BUILDFLAG(ENABLE_PRINTING)
-#include "shell/browser/printing/print_preview_message_handler.h"
 #include "shell/browser/printing/print_view_manager_electron.h"
 #endif
 
@@ -231,7 +230,10 @@ class WebContents : public ExclusiveAccessContext,
                            std::pair<std::string, std::u16string> info);
   void Print(gin::Arguments* args);
   // Print current page as PDF.
-  v8::Local<v8::Promise> PrintToPDF(base::DictionaryValue settings);
+  v8::Local<v8::Promise> PrintToPDF(const base::Value& settings);
+  void OnPDFCreated(gin_helper::Promise<v8::Local<v8::Value>> promise,
+                    PrintViewManagerElectron::PrintResult print_result,
+                    scoped_refptr<base::RefCountedMemory> data);
 #endif
 
   void SetNextChildWebPreferences(const gin_helper::Dictionary);
diff --git a/shell/browser/extensions/electron_extensions_api_client.cc b/shell/browser/extensions/electron_extensions_api_client.cc
index b8ac568e10722..1a4c24700b9fc 100644
--- a/shell/browser/extensions/electron_extensions_api_client.cc
+++ b/shell/browser/extensions/electron_extensions_api_client.cc
@@ -19,7 +19,6 @@
 
 #if BUILDFLAG(ENABLE_PRINTING)
 #include "components/printing/browser/print_manager_utils.h"
-#include "shell/browser/printing/print_preview_message_handler.h"
 #include "shell/browser/printing/print_view_manager_electron.h"
 #endif
 
@@ -86,7 +85,6 @@ MessagingDelegate* ElectronExtensionsAPIClient::GetMessagingDelegate() {
 void ElectronExtensionsAPIClient::AttachWebContentsHelpers(
     content::WebContents* web_contents) const {
 #if BUILDFLAG(ENABLE_PRINTING)
-  electron::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
   electron::PrintViewManagerElectron::CreateForWebContents(web_contents);
 #endif
 
diff --git a/shell/browser/printing/print_preview_message_handler.h b/shell/browser/printing/print_preview_message_handler.h
deleted file mode 100644
index 57d84767d7759..0000000000000
--- a/shell/browser/printing/print_preview_message_handler.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2018 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ELECTRON_SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
-#define ELECTRON_SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
-
-#include <map>
-
-#include "base/memory/ref_counted_memory.h"
-#include "base/memory/weak_ptr.h"
-#include "components/printing/common/print.mojom.h"
-#include "components/services/print_compositor/public/mojom/print_compositor.mojom.h"
-#include "content/public/browser/web_contents_user_data.h"
-#include "mojo/public/cpp/bindings/associated_receiver.h"
-#include "mojo/public/cpp/bindings/associated_remote.h"
-#include "printing/mojom/print.mojom.h"
-#include "shell/common/gin_helper/promise.h"
-#include "v8/include/v8.h"
-
-namespace content {
-class RenderFrameHost;
-}
-
-namespace electron {
-
-// Manages the print preview handling for a WebContents.
-class PrintPreviewMessageHandler
-    : public printing::mojom::PrintPreviewUI,
-      public content::WebContentsUserData<PrintPreviewMessageHandler> {
- public:
-  ~PrintPreviewMessageHandler() override;
-
-  // disable copy
-  PrintPreviewMessageHandler(const PrintPreviewMessageHandler&) = delete;
-  PrintPreviewMessageHandler& operator=(const PrintPreviewMessageHandler&) =
-      delete;
-
-  void PrintToPDF(base::DictionaryValue options,
-                  gin_helper::Promise<v8::Local<v8::Value>> promise);
-
- private:
-  friend class content::WebContentsUserData<PrintPreviewMessageHandler>;
-
-  explicit PrintPreviewMessageHandler(content::WebContents* web_contents);
-
-  void OnCompositeDocumentToPdfDone(
-      int32_t request_id,
-      printing::mojom::PrintCompositor::Status status,
-      base::ReadOnlySharedMemoryRegion region);
-  void OnPrepareForDocumentToPdfDone(
-      int32_t request_id,
-      printing::mojom::PrintCompositor::Status status);
-  void OnCompositePdfPageDone(int page_number,
-                              int document_cookie,
-                              int32_t request_id,
-                              printing::mojom::PrintCompositor::Status status,
-                              base::ReadOnlySharedMemoryRegion region);
-
-  // printing::mojo::PrintPreviewUI:
-  void SetOptionsFromDocument(
-      const printing::mojom::OptionsFromDocumentParamsPtr params,
-      int32_t request_id) override {}
-  void PrintPreviewFailed(int32_t document_cookie, int32_t request_id) override;
-  void PrintPreviewCancelled(int32_t document_cookie,
-                             int32_t request_id) override;
-  void PrinterSettingsInvalid(int32_t document_cookie,
-                              int32_t request_id) override {}
-  void DidPrepareDocumentForPreview(int32_t document_cookie,
-                                    int32_t request_id) override;
-  void DidPreviewPage(printing::mojom::DidPreviewPageParamsPtr params,
-                      int32_t request_id) override;
-  void MetafileReadyForPrinting(
-      printing::mojom::DidPreviewDocumentParamsPtr params,
-      int32_t request_id) override;
-  void DidGetDefaultPageLayout(
-      printing::mojom::PageSizeMarginsPtr page_layout_in_points,
-      const gfx::Rect& printable_area_in_points,
-      bool has_custom_page_size_style,
-      int32_t request_id) override {}
-  void DidStartPreview(printing::mojom::DidStartPreviewParamsPtr params,
-                       int32_t request_id) override {}
-
-  gin_helper::Promise<v8::Local<v8::Value>> GetPromise(int request_id);
-
-  void ResolvePromise(int request_id,
-                      scoped_refptr<base::RefCountedMemory> data_bytes);
-  void RejectPromise(int request_id);
-
-  using PromiseMap = std::map<int, gin_helper::Promise<v8::Local<v8::Value>>>;
-  PromiseMap promise_map_;
-
-  // TODO(clavin): refactor to use the WebContents provided by the
-  // WebContentsUserData base class instead of storing a duplicate ref
-  content::WebContents* web_contents_ = nullptr;
-
-  mojo::AssociatedRemote<printing::mojom::PrintRenderFrame> print_render_frame_;
-
-  mojo::AssociatedReceiver<printing::mojom::PrintPreviewUI> receiver_{this};
-
-  base::WeakPtrFactory<PrintPreviewMessageHandler> weak_ptr_factory_{this};
-
-  WEB_CONTENTS_USER_DATA_KEY_DECL();
-};
-
-}  // namespace electron
-
-#endif  // ELECTRON_SHELL_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_
diff --git a/shell/browser/printing/print_view_manager_electron.cc b/shell/browser/printing/print_view_manager_electron.cc
index 505073093a7ca..866f439f5aec4 100644
--- a/shell/browser/printing/print_view_manager_electron.cc
+++ b/shell/browser/printing/print_view_manager_electron.cc
@@ -7,13 +7,39 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "content/public/browser/web_contents_user_data.h"
+#include "components/printing/browser/print_to_pdf/pdf_print_utils.h"
+#include "printing/mojom/print.mojom.h"
+#include "printing/page_range.h"
+#include "third_party/abseil-cpp/absl/types/variant.h"
+
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#include "mojo/public/cpp/bindings/message.h"
+#endif
 
 namespace electron {
 
+namespace {
+
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+constexpr char kInvalidUpdatePrintSettingsCall[] =
+    "Invalid UpdatePrintSettings Call";
+constexpr char kInvalidSetupScriptedPrintPreviewCall[] =
+    "Invalid SetupScriptedPrintPreview Call";
+constexpr char kInvalidShowScriptedPrintPreviewCall[] =
+    "Invalid ShowScriptedPrintPreview Call";
+constexpr char kInvalidRequestPrintPreviewCall[] =
+    "Invalid RequestPrintPreview Call";
+#endif
+
+}  // namespace
+
+// This file subclasses printing::PrintViewManagerBase
+// but the implementations are duplicated from
+// components/printing/browser/print_to_pdf/pdf_print_manager.cc.
+
 PrintViewManagerElectron::PrintViewManagerElectron(
     content::WebContents* web_contents)
-    : PrintViewManagerBase(web_contents),
+    : printing::PrintViewManagerBase(web_contents),
       content::WebContentsUserData<PrintViewManagerElectron>(*web_contents) {}
 
 PrintViewManagerElectron::~PrintViewManagerElectron() = default;
@@ -25,26 +51,237 @@ void PrintViewManagerElectron::BindPrintManagerHost(
   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
   if (!web_contents)
     return;
+
   auto* print_manager = PrintViewManagerElectron::FromWebContents(web_contents);
   if (!print_manager)
     return;
+
   print_manager->BindReceiver(std::move(receiver), rfh);
 }
 
+// static
+std::string PrintViewManagerElectron::PrintResultToString(PrintResult result) {
+  switch (result) {
+    case PRINT_SUCCESS:
+      return std::string();  // no error message
+    case PRINTING_FAILED:
+      return "Printing failed";
+    case INVALID_PRINTER_SETTINGS:
+      return "Show invalid printer settings error";
+    case INVALID_MEMORY_HANDLE:
+      return "Invalid memory handle";
+    case METAFILE_MAP_ERROR:
+      return "Map to shared memory error";
+    case METAFILE_INVALID_HEADER:
+      return "Invalid metafile header";
+    case METAFILE_GET_DATA_ERROR:
+      return "Get data from metafile error";
+    case SIMULTANEOUS_PRINT_ACTIVE:
+      return "The previous printing job hasn't finished";
+    case PAGE_RANGE_SYNTAX_ERROR:
+      return "Page range syntax error";
+    case PAGE_RANGE_INVALID_RANGE:
+      return "Page range is invalid (start > end)";
+    case PAGE_COUNT_EXCEEDED:
+      return "Page range exceeds page count";
+    default:
+      NOTREACHED();
+      return "Unknown PrintResult";
+  }
+}
+
+void PrintViewManagerElectron::PrintToPdf(
+    content::RenderFrameHost* rfh,
+    const std::string& page_ranges,
+    printing::mojom::PrintPagesParamsPtr print_pages_params,
+    PrintToPDFCallback callback) {
+  DCHECK(callback);
+
+  if (callback_) {
+    std::move(callback).Run(SIMULTANEOUS_PRINT_ACTIVE,
+                            base::MakeRefCounted<base::RefCountedString>());
+    return;
+  }
+
+  if (!rfh->IsRenderFrameLive()) {
+    std::move(callback).Run(PRINTING_FAILED,
+                            base::MakeRefCounted<base::RefCountedString>());
+    return;
+  }
+
+  absl::variant<printing::PageRanges, print_to_pdf::PageRangeError>
+      parsed_ranges = print_to_pdf::TextPageRangesToPageRanges(page_ranges);
+  if (absl::holds_alternative<print_to_pdf::PageRangeError>(parsed_ranges)) {
+    PrintResult print_result;
+    switch (absl::get<print_to_pdf::PageRangeError>(parsed_ranges)) {
+      case print_to_pdf::PageRangeError::kSyntaxError:
+        print_result = PAGE_RANGE_SYNTAX_ERROR;
+        break;
+      case print_to_pdf::PageRangeError::kInvalidRange:
+        print_result = PAGE_RANGE_INVALID_RANGE;
+        break;
+    }
+    std::move(callback).Run(print_result,
+                            base::MakeRefCounted<base::RefCountedString>());
+    return;
+  }
+
+  printing_rfh_ = rfh;
+  print_pages_params->pages = absl::get<printing::PageRanges>(parsed_ranges);
+  auto cookie = print_pages_params->params->document_cookie;
+  set_cookie(cookie);
+  headless_jobs_.emplace_back(cookie);
+  callback_ = std::move(callback);
+
+  GetPrintRenderFrame(rfh)->PrintWithParams(std::move(print_pages_params));
+}
+
+void PrintViewManagerElectron::GetDefaultPrintSettings(
+    GetDefaultPrintSettingsCallback callback) {
+  if (printing_rfh_) {
+    LOG(ERROR) << "Scripted print is not supported";
+    std::move(callback).Run(printing::mojom::PrintParams::New());
+  } else {
+    PrintViewManagerBase::GetDefaultPrintSettings(std::move(callback));
+  }
+}
+
+void PrintViewManagerElectron::ScriptedPrint(
+    printing::mojom::ScriptedPrintParamsPtr params,
+    ScriptedPrintCallback callback) {
+  auto entry =
+      std::find(headless_jobs_.begin(), headless_jobs_.end(), params->cookie);
+  if (entry == headless_jobs_.end()) {
+    PrintViewManagerBase::ScriptedPrint(std::move(params), std::move(callback));
+    return;
+  }
+
+  auto default_param = printing::mojom::PrintPagesParams::New();
+  default_param->params = printing::mojom::PrintParams::New();
+  LOG(ERROR) << "Scripted print is not supported";
+  std::move(callback).Run(std::move(default_param), /*cancelled*/ false);
+}
+
+void PrintViewManagerElectron::ShowInvalidPrinterSettingsError() {
+  ReleaseJob(INVALID_PRINTER_SETTINGS);
+}
+
+void PrintViewManagerElectron::PrintingFailed(
+    int32_t cookie,
+    printing::mojom::PrintFailureReason reason) {
+  ReleaseJob(reason == printing::mojom::PrintFailureReason::kInvalidPageRange
+                 ? PAGE_COUNT_EXCEEDED
+                 : PRINTING_FAILED);
+}
+
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+void PrintViewManagerElectron::UpdatePrintSettings(
+    int32_t cookie,
+    base::Value::Dict job_settings,
+    UpdatePrintSettingsCallback callback) {
+  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(), cookie);
+  if (entry == headless_jobs_.end()) {
+    PrintViewManagerBase::UpdatePrintSettings(cookie, std::move(job_settings),
+                                              std::move(callback));
+    return;
+  }
+
+  mojo::ReportBadMessage(kInvalidUpdatePrintSettingsCall);
+}
+
 void PrintViewManagerElectron::SetupScriptedPrintPreview(
     SetupScriptedPrintPreviewCallback callback) {
-  std::move(callback).Run();
+  mojo::ReportBadMessage(kInvalidSetupScriptedPrintPreviewCall);
 }
 
 void PrintViewManagerElectron::ShowScriptedPrintPreview(
-    bool source_is_modifiable) {}
+    bool source_is_modifiable) {
+  mojo::ReportBadMessage(kInvalidShowScriptedPrintPreviewCall);
+}
 
 void PrintViewManagerElectron::RequestPrintPreview(
-    printing::mojom::RequestPrintPreviewParamsPtr params) {}
+    printing::mojom::RequestPrintPreviewParamsPtr params) {
+  mojo::ReportBadMessage(kInvalidRequestPrintPreviewCall);
+}
 
 void PrintViewManagerElectron::CheckForCancel(int32_t preview_ui_id,
                                               int32_t request_id,
                                               CheckForCancelCallback callback) {
+  std::move(callback).Run(false);
+}
+#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
+
+void PrintViewManagerElectron::RenderFrameDeleted(
+    content::RenderFrameHost* render_frame_host) {
+  PrintViewManagerBase::RenderFrameDeleted(render_frame_host);
+
+  if (printing_rfh_ != render_frame_host)
+    return;
+
+  if (callback_) {
+    std::move(callback_).Run(PRINTING_FAILED,
+                             base::MakeRefCounted<base::RefCountedString>());
+  }
+
+  Reset();
+}
+
+void PrintViewManagerElectron::DidGetPrintedPagesCount(int32_t cookie,
+                                                       uint32_t number_pages) {
+  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(), cookie);
+  if (entry == headless_jobs_.end()) {
+    PrintViewManagerBase::DidGetPrintedPagesCount(cookie, number_pages);
+  }
+}
+
+void PrintViewManagerElectron::DidPrintDocument(
+    printing::mojom::DidPrintDocumentParamsPtr params,
+    DidPrintDocumentCallback callback) {
+  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(),
+                         params->document_cookie);
+  if (entry == headless_jobs_.end()) {
+    PrintViewManagerBase::DidPrintDocument(std::move(params),
+                                           std::move(callback));
+    return;
+  }
+
+  auto& content = *params->content;
+  if (!content.metafile_data_region.IsValid()) {
+    ReleaseJob(INVALID_MEMORY_HANDLE);
+    std::move(callback).Run(false);
+    return;
+  }
+
+  base::ReadOnlySharedMemoryMapping map = content.metafile_data_region.Map();
+  if (!map.IsValid()) {
+    ReleaseJob(METAFILE_MAP_ERROR);
+    std::move(callback).Run(false);
+    return;
+  }
+
+  data_ = std::string(static_cast<const char*>(map.memory()), map.size());
+  headless_jobs_.erase(entry);
+  std::move(callback).Run(true);
+  ReleaseJob(PRINT_SUCCESS);
+}
+
+void PrintViewManagerElectron::Reset() {
+  printing_rfh_ = nullptr;
+  callback_.Reset();
+  data_.clear();
+}
+
+void PrintViewManagerElectron::ReleaseJob(PrintResult result) {
+  if (callback_) {
+    DCHECK(result == PRINT_SUCCESS || data_.empty());
+    std::move(callback_).Run(result,
+                             base::RefCountedString::TakeString(&data_));
+    if (printing_rfh_ && printing_rfh_->IsRenderFrameLive()) {
+      GetPrintRenderFrame(printing_rfh_)->PrintingDone(result == PRINT_SUCCESS);
+    }
+
+    Reset();
+  }
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManagerElectron);
diff --git a/shell/browser/printing/print_view_manager_electron.h b/shell/browser/printing/print_view_manager_electron.h
index 2127219f953ce..197b3c77adfa4 100644
--- a/shell/browser/printing/print_view_manager_electron.h
+++ b/shell/browser/printing/print_view_manager_electron.h
@@ -5,9 +5,19 @@
 #ifndef ELECTRON_SHELL_BROWSER_PRINTING_PRINT_VIEW_MANAGER_ELECTRON_H_
 #define ELECTRON_SHELL_BROWSER_PRINTING_PRINT_VIEW_MANAGER_ELECTRON_H_
 
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "base/memory/raw_ptr.h"
+#include "base/memory/ref_counted_memory.h"
 #include "build/build_config.h"
 #include "chrome/browser/printing/print_view_manager_base.h"
+#include "components/printing/common/print.mojom.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
+#include "printing/print_settings.h"
 
 namespace electron {
 
@@ -15,9 +25,26 @@ class PrintViewManagerElectron
     : public printing::PrintViewManagerBase,
       public content::WebContentsUserData<PrintViewManagerElectron> {
  public:
+  enum PrintResult {
+    PRINT_SUCCESS,
+    PRINTING_FAILED,
+    INVALID_PRINTER_SETTINGS,
+    INVALID_MEMORY_HANDLE,
+    METAFILE_MAP_ERROR,
+    METAFILE_INVALID_HEADER,
+    METAFILE_GET_DATA_ERROR,
+    SIMULTANEOUS_PRINT_ACTIVE,
+    PAGE_RANGE_SYNTAX_ERROR,
+    PAGE_RANGE_INVALID_RANGE,
+    PAGE_COUNT_EXCEEDED,
+  };
+
+  using PrintToPDFCallback =
+      base::OnceCallback<void(PrintResult,
+                              scoped_refptr<base::RefCountedMemory>)>;
+
   ~PrintViewManagerElectron() override;
 
-  // disable copy
   PrintViewManagerElectron(const PrintViewManagerElectron&) = delete;
   PrintViewManagerElectron& operator=(const PrintViewManagerElectron&) = delete;
 
@@ -26,6 +53,35 @@ class PrintViewManagerElectron
           receiver,
       content::RenderFrameHost* rfh);
 
+  static std::string PrintResultToString(PrintResult result);
+
+  void PrintToPdf(content::RenderFrameHost* rfh,
+                  const std::string& page_ranges,
+                  printing::mojom::PrintPagesParamsPtr print_page_params,
+                  PrintToPDFCallback callback);
+
+ private:
+  explicit PrintViewManagerElectron(content::WebContents* web_contents);
+  friend class content::WebContentsUserData<PrintViewManagerElectron>;
+
+  // WebContentsObserver overrides (via PrintManager):
+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
+
+  // printing::mojom::PrintManagerHost:
+  void DidPrintDocument(printing::mojom::DidPrintDocumentParamsPtr params,
+                        DidPrintDocumentCallback callback) override;
+  void DidGetPrintedPagesCount(int32_t cookie, uint32_t number_pages) override;
+  void GetDefaultPrintSettings(
+      GetDefaultPrintSettingsCallback callback) override;
+  void ScriptedPrint(printing::mojom::ScriptedPrintParamsPtr params,
+                     ScriptedPrintCallback callback) override;
+  void ShowInvalidPrinterSettingsError() override;
+  void PrintingFailed(int32_t cookie,
+                      printing::mojom::PrintFailureReason reason) override;
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+  void UpdatePrintSettings(int32_t cookie,
+                           base::Value::Dict job_settings,
+                           UpdatePrintSettingsCallback callback) override;
   void SetupScriptedPrintPreview(
       SetupScriptedPrintPreviewCallback callback) override;
   void ShowScriptedPrintPreview(bool source_is_modifiable) override;
@@ -34,10 +90,15 @@ class PrintViewManagerElectron
   void CheckForCancel(int32_t preview_ui_id,
                       int32_t request_id,
                       CheckForCancelCallback callback) override;
+#endif
 
- private:
-  friend class content::WebContentsUserData<PrintViewManagerElectron>;
-  explicit PrintViewManagerElectron(content::WebContents* web_contents);
+  void Reset();
+  void ReleaseJob(PrintResult result);
+
+  raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
+  PrintToPDFCallback callback_;
+  std::string data_;
+  std::vector<int32_t> headless_jobs_;
 
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 };
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 29ff9e5f60996..c340d309c83ac 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -1813,14 +1813,16 @@ describe('webContents module', () => {
 
     it('rejects on incorrectly typed parameters', async () => {
       const badTypes = {
-        marginsType: 'terrible',
-        scaleFactor: 'not-a-number',
         landscape: [],
-        pageRanges: { oops: 'im-not-the-right-key' },
-        headerFooter: '123',
-        printSelectionOnly: 1,
+        displayHeaderFooter: '123',
         printBackground: 2,
-        pageSize: 'IAmAPageSize'
+        scale: 'not-a-number',
+        pageSize: 'IAmAPageSize',
+        margins: 'terrible',
+        pageRanges: { oops: 'im-not-the-right-key' },
+        headerTemplate: [1, 2, 3],
+        footerTemplate: [4, 5, 6],
+        preferCSSPageSize: 'no'
       };
 
       // These will hard crash in Chromium unless we type-check
@@ -1869,10 +1871,7 @@ describe('webContents module', () => {
 
       it('respects custom settings', async () => {
         const data = await w.webContents.printToPDF({
-          pageRanges: {
-            from: 0,
-            to: 2
-          },
+          pageRanges: '1-3',
           landscape: true
         });
 
diff --git a/spec/ts-smoke/electron/main.ts b/spec/ts-smoke/electron/main.ts
index 6992f92e8b2f8..5d1b6dd6b66a3 100644
--- a/spec/ts-smoke/electron/main.ts
+++ b/spec/ts-smoke/electron/main.ts
@@ -86,10 +86,11 @@ app.whenReady().then(() => {
   mainWindow.webContents.print()
 
   mainWindow.webContents.printToPDF({
-    marginsType: 1,
-    pageSize: 'A3',
+    margins: {
+      top: 1
+    },
     printBackground: true,
-    printSelectionOnly: true,
+    pageRanges: '1-3',
     landscape: true
   }).then((data: Buffer) => console.log(data))
 
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index f4af0158f2c85..377d96b396660 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -1110,14 +1110,16 @@ describe('<webview> tag', function () {
   ifdescribe(features.isPrintingEnabled())('<webview>.printToPDF()', () => {
     it('rejects on incorrectly typed parameters', async () => {
       const badTypes = {
-        marginsType: 'terrible',
-        scaleFactor: 'not-a-number',
         landscape: [],
-        pageRanges: { oops: 'im-not-the-right-key' },
-        headerFooter: '123',
-        printSelectionOnly: 1,
+        displayHeaderFooter: '123',
         printBackground: 2,
-        pageSize: 'IAmAPageSize'
+        scale: 'not-a-number',
+        pageSize: 'IAmAPageSize',
+        margins: 'terrible',
+        pageRanges: { oops: 'im-not-the-right-key' },
+        headerTemplate: [1, 2, 3],
+        footerTemplate: [4, 5, 6],
+        preferCSSPageSize: 'no'
       };
 
       // These will hard crash in Chromium unless we type-check
diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts
index 49568925fa80b..891966d8e3e44 100644
--- a/typings/internal-electron.d.ts
+++ b/typings/internal-electron.d.ts
@@ -264,6 +264,11 @@ declare namespace ElectronInternal {
     is_default?: 'true',
   }
 
+  type PageSize = {
+    width: number,
+    height: number,
+  }
+
   type ModuleLoader = () => any;
 
   interface ModuleEntry {

From 2cb53c5db1751170816959d6d89db58dc638b155 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 31 May 2022 10:43:42 +0200
Subject: [PATCH 432/811] fix: zombie windows when fullscreening and closing
 (#34378)

---
 shell/browser/native_window_mac.h             | 10 +++++++++
 shell/browser/native_window_mac.mm            | 14 +++++++++++++
 .../ui/cocoa/electron_ns_window_delegate.mm   |  6 ++++++
 spec-main/webview-spec.ts                     | 21 ++++++++++++++-----
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index ae1e845c8a182..9b6fcb14dda59 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -176,6 +176,10 @@ class NativeWindowMac : public NativeWindow,
   // Handle fullscreen transitions.
   void SetFullScreenTransitionState(FullScreenTransitionState state);
   void HandlePendingFullscreenTransitions();
+  bool HandleDeferredClose();
+  void SetHasDeferredWindowClose(bool defer_close) {
+    has_deferred_window_close_ = defer_close;
+  }
 
   enum class VisualEffectState {
     kFollowWindow,
@@ -249,6 +253,12 @@ class NativeWindowMac : public NativeWindow,
   FullScreenTransitionState fullscreen_transition_state_ =
       FullScreenTransitionState::NONE;
 
+  // Trying to close an NSWindow during a fullscreen transition will cause the
+  // window to lock up. Use this to track if CloseWindow was called during a
+  // fullscreen transition, to defer the -[NSWindow close] call until the
+  // transition is complete.
+  bool has_deferred_window_close_ = false;
+
   NSInteger attention_request_id_ = 0;  // identifier from requestUserAttention
 
   // The presentation options before entering kiosk mode.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index c23cb268b66d2..d236ca72aa1a5 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -474,6 +474,11 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     return;
   }
 
+  if (fullscreen_transition_state() != FullScreenTransitionState::NONE) {
+    SetHasDeferredWindowClose(true);
+    return;
+  }
+
   // If a sheet is attached to the window when we call
   // [window_ performClose:nil], the window won't close properly
   // even after the user has ended the sheet.
@@ -678,6 +683,15 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   SetFullScreen(next_transition);
 }
 
+bool NativeWindowMac::HandleDeferredClose() {
+  if (has_deferred_window_close_) {
+    SetHasDeferredWindowClose(false);
+    Close();
+    return true;
+  }
+  return false;
+}
+
 void NativeWindowMac::SetFullScreen(bool fullscreen) {
   // [NSWindow -toggleFullScreen] is an asynchronous operation, which means
   // that it's possible to call it while a fullscreen transition is currently
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index f9b7a1170d1de..9d5633a0f95b8 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -248,6 +248,9 @@ - (void)windowDidEnterFullScreen:(NSNotification*)notification {
 
   shell_->NotifyWindowEnterFullScreen();
 
+  if (shell_->HandleDeferredClose())
+    return;
+
   shell_->HandlePendingFullscreenTransitions();
 }
 
@@ -263,6 +266,9 @@ - (void)windowDidExitFullScreen:(NSNotification*)notification {
   shell_->SetResizable(is_resizable_);
   shell_->NotifyWindowLeaveFullScreen();
 
+  if (shell_->HandleDeferredClose())
+    return;
+
   shell_->HandlePendingFullscreenTransitions();
 }
 
diff --git a/spec-main/webview-spec.ts b/spec-main/webview-spec.ts
index 7c7315eca85b6..ce5a64ef4754f 100644
--- a/spec-main/webview-spec.ts
+++ b/spec-main/webview-spec.ts
@@ -434,15 +434,15 @@ describe('<webview> tag', function () {
       return [w, webview];
     };
 
-    afterEach(closeAllWindows);
     afterEach(async () => {
       // The leaving animation is un-observable but can interfere with future tests
       // Specifically this is async on macOS but can be on other platforms too
       await delay(1000);
+
+      closeAllWindows();
     });
 
-    // TODO(jkleinsc) fix this test on arm64 macOS.  It causes the tests following it to fail/be flaky
-    ifit(process.platform !== 'darwin' || process.arch !== 'arm64')('should make parent frame element fullscreen too', async () => {
+    it('should make parent frame element fullscreen too', async () => {
       const [w, webview] = await loadWebViewWindow();
       expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.false();
 
@@ -450,11 +450,13 @@ describe('<webview> tag', function () {
       await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
       await parentFullscreen;
       expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.true();
+
+      w.close();
+      await emittedOnce(w, 'closed');
     });
 
     // FIXME(zcbenz): Fullscreen events do not work on Linux.
-    // This test is flaky on arm64 macOS.
-    ifit(process.platform !== 'linux' && process.arch !== 'arm64')('exiting fullscreen should unfullscreen window', async () => {
+    ifit(process.platform !== 'linux')('exiting fullscreen should unfullscreen window', async () => {
       const [w, webview] = await loadWebViewWindow();
       const enterFullScreen = emittedOnce(w, 'enter-full-screen');
       await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
@@ -465,6 +467,9 @@ describe('<webview> tag', function () {
       await leaveFullScreen;
       await delay(0);
       expect(w.isFullScreen()).to.be.false();
+
+      w.close();
+      await emittedOnce(w, 'closed');
     });
 
     // Sending ESC via sendInputEvent only works on Windows.
@@ -479,6 +484,9 @@ describe('<webview> tag', function () {
       await leaveFullScreen;
       await delay(0);
       expect(w.isFullScreen()).to.be.false();
+
+      w.close();
+      await emittedOnce(w, 'closed');
     });
 
     it('pressing ESC should emit the leave-html-full-screen event', async () => {
@@ -507,6 +515,9 @@ describe('<webview> tag', function () {
       webContents.sendInputEvent({ type: 'keyDown', keyCode: 'Escape' });
       await leaveFSWindow;
       await leaveFSWebview;
+
+      w.close();
+      await emittedOnce(w, 'closed');
     });
   });
 

From 3849d19e1476764d175587c88c8fbc6ffa9e224a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 06:01:31 -0700
Subject: [PATCH 433/811] Bump v21.0.0-nightly.20220531

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d26213de57bfa..7085745b647a1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220530
\ No newline at end of file
+21.0.0-nightly.20220531
\ No newline at end of file
diff --git a/package.json b/package.json
index 1abee71072b9f..23f3239067292 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220530",
+  "version": "21.0.0-nightly.20220531",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 41ec4c7402d4c..2ab0cf4c6a7f6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220530
- PRODUCTVERSION 21,0,0,20220530
+ FILEVERSION 21,0,0,20220531
+ PRODUCTVERSION 21,0,0,20220531
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 470396d6aceb53817f003e7a0a8cf21eb673bb99 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 08:12:47 +0200
Subject: [PATCH 434/811] chore: bump chromium to 104.0.5073.0 (main) (#34272)

---
 BUILD.gn                                      |  2 +-
 DEPS                                          |  2 +-
 build/args/all.gn                             |  2 +
 docs/api/browser-window.md                    |  2 +-
 electron_paks.gni                             |  2 -
 patches/chromium/accelerator.patch            |  6 +-
 .../add_didinstallconditionalfeatures.patch   | 24 +++---
 ..._scheduler_throttling_per_renderview.patch | 22 ++---
 ...leges_in_unsandboxed_child_processes.patch |  4 +-
 patches/chromium/blink_local_frame.patch      |  4 +-
 patches/chromium/boringssl_build_gn.patch     |  2 +-
 .../build_add_electron_tracing_category.patch |  2 +-
 ..._depend_on_packed_resource_integrity.patch | 18 ++--
 patches/chromium/can_create_window.patch      | 52 +++++------
 ..._v8_initialization_isolate_callbacks.patch |  2 +-
 ...screationoverridden_with_full_params.patch | 36 ++++----
 patches/chromium/chrome_key_systems.patch     | 14 +--
 patches/chromium/command-ismediakey.patch     |  4 +-
 .../crash_allow_setting_more_options.patch    |  8 +-
 patches/chromium/disable-redraw-lock.patch    | 18 ++--
 .../disable_color_correct_rendering.patch     | 46 +++++-----
 .../disable_compositor_recycling.patch        | 14 +--
 patches/chromium/disable_hidden.patch         |  8 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |  2 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |  4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |  6 +-
 ...xpose_setuseragent_on_networkcontext.patch |  2 +-
 .../extend_apply_webpreferences.patch         |  6 +-
 ...d_data_parameter_to_processsingleton.patch | 16 ++--
 ..._raw_response_headers_from_urlloader.patch |  2 +-
 .../fix_aspect_ratio_with_max_size.patch      |  4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |  6 +-
 .../chromium/fix_export_zlib_symbols.patch    |  4 +-
 ...ntcapturercount_in_web_contents_impl.patch |  4 +-
 ..._properly_honor_printing_page_ranges.patch |  2 +-
 patches/chromium/frame_host_manager.patch     |  8 +-
 .../gin_enable_disable_v8_platform.patch      |  6 +-
 .../chromium/gritsettings_resource_ids.patch  |  4 +-
 ...nse_interceptor_to_point_to_electron.patch |  2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |  4 +-
 .../load_v8_snapshot_in_browser_process.patch |  4 +-
 .../mas-cgdisplayusesforcetogray.patch        |  4 +-
 ...as_avoid_usage_of_private_macos_apis.patch | 57 ++++++------
 .../mas_disable_custom_window_frame.patch     |  8 +-
 .../mas_disable_remote_accessibility.patch    | 30 +++----
 .../chromium/mas_disable_remote_layer.patch   | 51 +++++++++--
 patches/chromium/mas_no_private_api.patch     | 14 +--
 ...determine_if_a_font_is_a_system_font.patch |  4 +-
 ...emote_certificate_verification_logic.patch |  4 +-
 .../chromium/notification_provenance.patch    |  8 +-
 patches/chromium/picture-in-picture.patch     |  2 +-
 patches/chromium/printing.patch               | 68 +++++++--------
 patches/chromium/process_singleton.patch      | 20 ++---
 ...r_changes_to_the_webcontentsobserver.patch | 10 +--
 .../render_widget_host_view_base.patch        | 10 +--
 .../render_widget_host_view_mac.patch         | 18 ++--
 patches/chromium/resource_file_conflict.patch |  6 +-
 .../support_mixed_sandbox_with_zygote.patch   | 16 ++--
 patches/chromium/web_contents.patch           |  8 +-
 patches/chromium/webview_cross_drag.patch     |  4 +-
 patches/chromium/webview_fullscreen.patch     |  4 +-
 patches/node/.patches                         |  1 +
 ...json_parse_errors_made_user-friendly.patch | 39 +++++++++
 .../squirrel.mac/build_add_gn_config.patch    |  9 +-
 patches/v8/.patches                           |  2 +
 ...w_disabling_of_v8_sandboxed_pointers.patch | 32 +++++++
 patches/v8/build_gn.patch                     |  8 +-
 ...able_is_execution_terminating_dcheck.patch | 22 +++++
 patches/v8/dcheck.patch                       |  8 +-
 ...export_private_v8_symbols_on_windows.patch |  8 +-
 ...ort_symbols_needed_for_windows_build.patch |  2 +-
 patches/v8/expose_mksnapshot.patch            |  4 +-
 ...ed_attribute_for_older_msvc_versions.patch |  2 +-
 ..._terminating_exception_in_microtasks.patch |  4 +-
 ...workaround_an_undefined_symbol_error.patch |  4 +-
 .../zip_manifests/dist_zip.mac.arm64.manifest |  4 +-
 .../zip_manifests/dist_zip.mac.x64.manifest   |  4 +-
 .../dist_zip.mac_mas.arm64.manifest           |  4 +-
 .../dist_zip.mac_mas.x64.manifest             |  4 +-
 .../api/electron_api_data_pipe_holder.cc      | 13 +++
 .../api/electron_api_global_shortcut.cc       |  2 +-
 .../api/electron_api_web_contents_mac.mm      |  2 +-
 shell/browser/electron_browser_main_parts.cc  |  3 -
 shell/browser/electron_permission_manager.cc  | 30 +++----
 shell/browser/electron_permission_manager.h   | 13 +--
 .../electron_extensions_browser_client.cc     | 10 ++-
 .../electron_extensions_browser_client.h      |  2 +-
 shell/browser/javascript_environment.cc       | 86 ++-----------------
 .../media/media_capture_devices_dispatcher.cc |  6 +-
 .../media/media_capture_devices_dispatcher.h  |  8 +-
 .../media/media_stream_devices_controller.cc  | 47 +++++-----
 shell/browser/native_window_mac.mm            | 15 ++--
 shell/browser/net/asar/asar_url_loader.cc     |  4 +-
 .../net/electron_url_loader_factory.cc        | 18 ++--
 shell/browser/net/node_stream_loader.cc       |  4 +-
 .../net/proxying_url_loader_factory.cc        |  5 --
 .../browser/net/proxying_url_loader_factory.h |  2 -
 shell/browser/net/url_pipe_loader.cc          |  4 +-
 .../osr/osr_render_widget_host_view.cc        | 10 +--
 .../browser/osr/osr_web_contents_view_mac.mm  |  2 +-
 .../printing/print_preview_message_handler.cc |  2 +-
 .../electron_inspectable_web_contents_view.mm |  5 +-
 .../ui/cocoa/electron_ns_window_delegate.mm   |  2 +-
 .../ui/cocoa/event_dispatching_window.mm      |  4 +-
 shell/browser/ui/drag_util_mac.mm             |  7 +-
 shell/browser/ui/file_dialog_mac.mm           | 10 +--
 shell/browser/ui/message_box_mac.mm           | 10 +--
 .../ui/views/client_frame_view_linux.cc       | 19 ++--
 .../ui/views/client_frame_view_linux.h        |  4 +-
 shell/common/api/electron_api_native_image.cc |  9 ++
 spec-main/api-session-spec.ts                 |  3 +-
 spec/fixtures/api/cookie-app/main.js          |  2 +-
 112 files changed, 662 insertions(+), 588 deletions(-)
 create mode 100644 patches/node/json_parse_errors_made_user-friendly.patch
 create mode 100644 patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
 create mode 100644 patches/v8/chore_disable_is_execution_terminating_dcheck.patch

diff --git a/BUILD.gn b/BUILD.gn
index 5c5f4d27e01e6..9b62fb12029d4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,7 +37,7 @@ if (is_mac) {
   import("build/rules.gni")
 
   assert(
-      mac_deployment_target == "10.11.0",
+      mac_deployment_target == "10.13",
       "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
diff --git a/DEPS b/DEPS
index 8d2532547f4fd..bc96d86bcb6cd 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '103.0.5044.0',
+    '104.0.5073.0',
   'node_version':
     'v16.15.0',
   'nan_version':
diff --git a/build/args/all.gn b/build/args/all.gn
index f1de439d833fc..e12aca35a29b1 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -45,3 +45,5 @@ enable_cet_shadow_stack = false
 # V8 in the browser process.
 # Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
 is_cfi = false
+
+v8_enable_sandboxed_pointers = false
diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 4adb22ec0e6ea..2f00cd1f5feb7 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -427,7 +427,7 @@ Possible values are:
   `notification`.
 * On macOS, possible types are `desktop`, `textured`.
   * The `textured` type adds metal gradient appearance
-    (`NSTexturedBackgroundWindowMask`).
+    (`NSWindowStyleMaskTexturedBackground`).
   * The `desktop` type places the window at the desktop background window level
     (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
     focus, keyboard or mouse events, but you can use `globalShortcut` to receive
diff --git a/electron_paks.gni b/electron_paks.gni
index 2c5ae0b0c8c10..107feff5a86d5 100644
--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -19,14 +19,12 @@ template("electron_repack_percent") {
     # All sources should also have deps for completeness.
     sources = [
       "$root_gen_dir/components/components_resources_${percent}_percent.pak",
-      "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
     deps = [
       "//components/resources",
-      "//content/app/resources",
       "//third_party/blink/public:scaled_resources_${percent}_percent",
       "//ui/resources",
     ]
diff --git a/patches/chromium/accelerator.patch b/patches/chromium/accelerator.patch
index 58c927f03d6bb..2582196629449 100644
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= and Ctrl-Plus show up as such
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 783202623cc15168c726180fe232751551c43798..7cf5449a61a31bebbaffd920129daf1866211d7c 100644
+index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a1f702d8b 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -44,7 +44,7 @@ index 783202623cc15168c726180fe232751551c43798..7cf5449a61a31bebbaffd920129daf18
    }
  
  #if BUILDFLAG(IS_MAC)
-@@ -451,7 +461,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -447,7 +457,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
      const std::u16string& shortcut) const {
    std::u16string result = shortcut;
  
@@ -53,7 +53,7 @@ index 783202623cc15168c726180fe232751551c43798..7cf5449a61a31bebbaffd920129daf18
      result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
  
    // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
-@@ -459,7 +469,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -455,7 +465,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
    // more information.
    if (IsCtrlDown())
      result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 52a2c7249d7d4..bd92d7ecb804e 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93356b2862 100644
+index d921125d153742dd09e34418c19195a3d61bef1f..5348c3289a94c86bbbc9bb07be26cc56b4986788 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
-@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
+@@ -136,6 +136,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    virtual void DidHandleOnloadEvents() {}
    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
                                        int32_t world_id) {}
@@ -23,10 +23,10 @@ index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index abcd95ad39d8d66e1a7149e89bc6bfe2a8197d19..1b021461f214287c94fb22b17d980c19e3f07dde 100644
+index 831db39365764d4001b8d602b225f157d3562ca8..4aabe0781d9e4150dddce76a50b993d0b8da8068 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4489,6 +4489,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4502,6 +4502,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index abcd95ad39d8d66e1a7149e89bc6bfe2a8197d19..1b021461f214287c94fb22b17d980c19
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b7dd8a5d3 100644
+index e903ba9ec4f8d32c5d3a6795f0a20f2addf95743..bb9755b981cf96e131e6545f778f73607fabdd02 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -599,6 +599,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -604,6 +604,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 5adee94f81c0e98db976ac1c6c55fb5eab8c2e65..9d3e43f4394ad9a4377b47a001c4baf4027cbe7c 100644
+index 595441198b5253e5f36f97303e952e642998be39..1b17db7b9285cb874e74abdd896888c12b288565 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -584,6 +584,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -598,6 +598,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -79,7 +79,7 @@ index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b09415
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 810726792cba326f66df5a8d0d833eaee4975594..635fb45b0a9d1716bd45d8b6c5dbc5f9fbf0ffa8 100644
+index 6fb24096d3a5415f59cba2a8a5a6f36fe838dcc1..a4089fb3989ecd37d5b01baeb03c2ac1f4f05b53 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
 @@ -298,6 +298,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -92,7 +92,7 @@ index 810726792cba326f66df5a8d0d833eaee4975594..635fb45b0a9d1716bd45d8b6c5dbc5f9
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 772748673a5854349ba2be28abe21b7ff3f8541f..b3ebd622a61187f718ca16ac8cfeb189d35584d2 100644
+index 40042e1fa2622a871d0ed512f1f6fda1cdda56a6..a377548b36712bd4971bae6b4c0afdc5c8fdbdfc 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 772748673a5854349ba2be28abe21b7ff3f8541f..b3ebd622a61187f718ca16ac8cfeb189
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 200f0c57df1f15428b45a228adfee8fd5465ecbf..ec8cad0a94b31561096fdaba1a75fb54c96d3f7e 100644
+index 1f929d9535ca19a2c443e13f2bafce179f5870df..fe7605585501fcc1fd515f1d94fda7e27d5ba632 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,7 +123,7 @@ index 200f0c57df1f15428b45a228adfee8fd5465ecbf..ec8cad0a94b31561096fdaba1a75fb54
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index acd3b33c64f1534555c14047e29c18f31a1e8f92..63a9e0695efb0f357c0c3298175da9bbdc78a41c 100644
+index a9bd5283d3c65728dd3293abe88ffd02d3eee4fc..f5e4a927f2f5114e62d76fec86d6a5d2d2321166 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
 @@ -352,6 +352,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 5d2aae9b16dfa..785bc29c679d7 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index f19a15f85afe2d754833667d8c272c75da3de0b2..18de1a2533b479a6090ed412987f0b5c3922c711 100644
+index 1f6d9be10432416f591a616805494b5d78975df1..e73f70c62ac2e69c918bdf39bd53f74a47066f4e 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -661,6 +661,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -665,6 +665,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,10 +22,10 @@ index f19a15f85afe2d754833667d8c272c75da3de0b2..18de1a2533b479a6090ed412987f0b5c
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 64f6ebe2a86a659da70f32cdbdb961384adca43f..2fc1062eb798a233f0eede6dd945f25d633e5f8f 100644
+index 3ccc771a82992ae70c770fa6d2dde92904aa17db..505091e9006f7d41fa8d02e603afef1d10b35bf4 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -136,6 +136,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+@@ -138,6 +138,7 @@ class CONTENT_EXPORT RenderViewHostImpl
    void EnablePreferredSizeMode() override;
    void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
  
@@ -48,7 +48,7 @@ index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618f9bb6525 100644
+index 99978b33c294ebe37192baccb29f0a34a25aed17..ef6e9ae24979538b8746aca898d1f302827491d8 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
 @@ -151,6 +151,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
@@ -85,10 +85,10 @@ index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 9704d8d8a4ee9e36c1a61c6723ce1039320014b6..cd14dd54e3c7bb56e82cbd6c566c11018b4deb94 100644
+index 229d9f2112e70f3bbff6e6986ab01c67483a1ae9..0529b4399959a2a2b9b0131dd8736a87fb973b0b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3698,6 +3698,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3711,6 +3711,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 9704d8d8a4ee9e36c1a61c6723ce1039320014b6..cd14dd54e3c7bb56e82cbd6c566c1101
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3709,7 +3716,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3722,7 +3729,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 9704d8d8a4ee9e36c1a61c6723ce1039320014b6..cd14dd54e3c7bb56e82cbd6c566c1101
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 51ab4f029e467fa5ea2663af38445d9565e19fe4..18005ca7a272d7731a4b8eeeac92ce163c2a262e 100644
+index 2f8e971ab224b36c6e464eb7524dd3d4c6b76f8c..4a9664d0ce5de431d9638e4145a21091cea78fd1 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -418,6 +418,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 51ab4f029e467fa5ea2663af38445d9565e19fe4..18005ca7a272d7731a4b8eeeac92ce16
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -854,6 +855,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -865,6 +866,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
index 233e57bce4f26..31c19ddc9a29f 100644
--- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
+++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
@@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index 80db4cb5941ee84db1534c070c4daefef76d0faf..cf40ac56a9ce4bd4a28eb511b5f37d148e4be6ac 100644
+index b2b29e715d6e5ea427faf6829e935e91dd87d471..138b5da2e5ae85760faaeeff92168d1070b6f562 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
 @@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
@@ -27,4 +27,4 @@ index 80db4cb5941ee84db1534c070c4daefef76d0faf..cf40ac56a9ce4bd4a28eb511b5f37d14
 +    }
    }
  
-   options->environment = delegate_->GetEnvironment();
+   for (const auto& remapped_fd : file_data_->additional_remapped_fds) {
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index b682f15b7e390..931e0185041f2 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index c136ea03ea961ce419d42c60efc646e4ddfe5693..4e635c3775df0f1b3b3d7551fba8f8d59d1b541b 100644
+index f370d230361c3ab524c0fc74facf8954840aa29f..0e62d29e44a971d49d70e485509d0b59f5cb31c7 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,7 +49,7 @@ index c136ea03ea961ce419d42c60efc646e4ddfe5693..4e635c3775df0f1b3b3d7551fba8f8d5
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 019b87a77fb7306bacdcda20e388cdfb8d3a6be8..f972ae236566248d3179d147e9692322153e326d 100644
+index d5ef00cb9870c2dc767d80595a39af4302c3e3c3..f3a2a9527f97902f357782eb445cf63777c77398 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
diff --git a/patches/chromium/boringssl_build_gn.patch b/patches/chromium/boringssl_build_gn.patch
index 05fde5454844e..ff94bf807a8e2 100644
--- a/patches/chromium/boringssl_build_gn.patch
+++ b/patches/chromium/boringssl_build_gn.patch
@@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
 Build BoringSSL with some extra functions that nodejs needs.
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index f222ae94a5a10ced84e41ef84560af46a910577f..c18d26de9a63befca3c77fe5ecd93975a016797f 100644
+index efcbdf378b61af0a4b0f2cd784160d95439e84e1..fc6bba3fdd71ee40bb38f7d95a2f4dccd82d3e17 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
 @@ -44,6 +44,20 @@ config("no_asm_config") {
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index ff503b7c6cb89..f650856864da7 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 7528d88c5d40571f1dcbd02201128ba2eed0cf08..ae50430c441539eb6152a926d382fb0552f3c358 100644
+index a1a93418b0b0d56f92647aa1087bb4485c354201..191bfe2d3922d2e65f0be10d6436c50efc3b0880 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -80,6 +80,7 @@
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index cfbf7076545a7..93c0696100b5a 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 99ab95668a7d3a31339b576b4a3a6038f39c2795..92f43eac6d654ff8ebe57d291c4f77aa1b029895 100644
+index dc59a88bc930d4d7b8e606434d940cac5b834bd0..6a583029436f033dc2736b9d7407f26637936add 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -173,11 +173,16 @@ if (!is_android && !is_mac) {
+@@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
          "common/crash_keys.h",
        ]
  
@@ -33,10 +33,10 @@ index 99ab95668a7d3a31339b576b4a3a6038f39c2795..92f43eac6d654ff8ebe57d291c4f77aa
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index cb28e691fb863fe7739a7ca536170e6c7a76a315..eacc853e2b9fc3c9e448f419e02d7378da310e9e 100644
+index 79aa50fbb9944052163bfdf958c5add60a0151f8..9fce5f07a79f801253c6bd8658ed7dba902856ad 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4588,7 +4588,7 @@ static_library("browser") {
+@@ -4479,7 +4479,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index cb28e691fb863fe7739a7ca536170e6c7a76a315..eacc853e2b9fc3c9e448f419e02d7378
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 24a27fb4a47678be448d597c7e430ce28d23be11..664e9b0378d5b7c09fa66b7a10c7f938da14aab9 100644
+index 65bee9c9d02c6f95cce6ba60d69e2a1b879a1c2f..e26897337f8c96a493936ab1342eb6b7c2c63ffe 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5841,7 +5841,6 @@ test("unit_tests") {
+@@ -5870,7 +5870,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 24a27fb4a47678be448d597c7e430ce28d23be11..664e9b0378d5b7c09fa66b7a10c7f938
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5864,6 +5863,10 @@ test("unit_tests") {
+@@ -5893,6 +5892,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 24a27fb4a47678be448d597c7e430ce28d23be11..664e9b0378d5b7c09fa66b7a10c7f938
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6757,7 +6760,6 @@ test("unit_tests") {
+@@ -6786,7 +6789,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 24a27fb4a47678be448d597c7e430ce28d23be11..664e9b0378d5b7c09fa66b7a10c7f938
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6856,6 +6858,10 @@ test("unit_tests") {
+@@ -6887,6 +6889,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 7844ee1c891a6..7f3714ced8c89 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index aa0be995df8c2f9fa0d84922d30c7e1cdf9025c8..e588b460aa32b4c984d593ed54e10310b59ace9b 100644
+index c983b5f4c20acba8a7d779a634cd1593ef69b1ae..e612764997277da3411d8040850756eb38996cca 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6840,6 +6840,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6922,6 +6922,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index aa0be995df8c2f9fa0d84922d30c7e1cdf9025c8..e588b460aa32b4c984d593ed54e10310
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6da28755d61f8957b0e6b6d0f1e669c2dbb347fa..a96bb634eb5c5405abb62b88d576e5e3ed354caa 100644
+index b94e87b6f90c986f115a87baf8214baeb8103826..987e437641b7978290aa2633755b67f9099e1d04 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3951,6 +3951,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3912,6 +3912,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 6da28755d61f8957b0e6b6d0f1e669c2dbb347fa..a96bb634eb5c5405abb62b88d576e5e3
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3995,12 +4003,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3956,12 +3964,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,7 +53,7 @@ index 6da28755d61f8957b0e6b6d0f1e669c2dbb347fa..a96bb634eb5c5405abb62b88d576e5e3
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db0135c54290 100644
+index 5aca51ea4154941512e989048295c7de0475c14c..278accd8c6f14a4d91cc2ff4e336e365279c7b9b 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -569,6 +569,10 @@ struct CreateNewWindowParams {
@@ -68,10 +68,10 @@ index a7f36529608011013dab96a803ad3187c940fc81..2bbcea3efede2fda4ff2c5b270e1db01
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 984205b3d1bb4acfde6c5d106118a88f866af341..e33a5c9c6d493cd4ac2664ea10390193e3e53fcc 100644
+index 82d33875526759dda05a1818543c0605382597f4..ec89c920f0e0ad3638749b1468bcd54f74b3cce5 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -581,6 +581,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -594,6 +594,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 984205b3d1bb4acfde6c5d106118a88f866af341..e33a5c9c6d493cd4ac2664ea10390193
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 7e22f3e0b84f3e6b1ef7b1c5176665b38bd53629..f6d98708c436447ee6c93acb5d476719c238ca9c 100644
+index e2c88a7e692406c9774a0e9783df612cbc38d7cd..4e069af9256eb106b50e84d1243c92353daf2015 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -168,6 +168,7 @@ class NetworkService;
+@@ -165,6 +165,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index 7e22f3e0b84f3e6b1ef7b1c5176665b38bd53629..f6d98708c436447ee6c93acb5d476719
  }  // namespace network
  
  namespace sandbox {
-@@ -959,6 +960,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -968,6 +969,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index 7e22f3e0b84f3e6b1ef7b1c5176665b38bd53629..f6d98708c436447ee6c93acb5d476719
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904ce9c6db8 100644
+index daf9b4566396c6d681760329cf4ba6869bbb55e4..321d5cfc36e40f2a649e8ea5910f4082b71b62e1 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -150,28 +150,28 @@ index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 89b07508aef80680a847c106fea0e2fa58ff964b..6630af3583a6bac6135d46644280d6444fe981b8 100644
+index 03b637c4d3a68a2bff5a4e06f421f23f97f40911..6235fd626a377643851dbb98d4d089e5a59366db 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -33,6 +33,7 @@
- #include "third_party/blink/public/platform/impression_conversions.h"
+@@ -32,6 +32,7 @@
+ #include "third_party/blink/public/mojom/page/page.mojom.h"
  #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
  #include "third_party/blink/public/platform/url_conversion.h"
 +#include "third_party/blink/public/platform/web_url_request_util.h"
  #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
  #include "third_party/blink/public/web/web_frame_widget.h"
  #include "third_party/blink/public/web/web_local_frame.h"
-@@ -295,6 +296,10 @@ WebView* RenderViewImpl::CreateView(
-     params->impression = blink::ConvertWebImpressionToImpression(*impression);
-   }
+@@ -302,6 +303,10 @@ WebView* RenderViewImpl::CreateView(
+       /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
+       creator->IsAdSubframe());
  
 +  params->raw_features = features.raw_features.Utf8(
 +      WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
 +  params->body = GetRequestBodyForWebURLRequest(request);
 +
-   params->download_policy.ApplyDownloadFramePolicy(
-       /*is_opener_navigation=*/false, request.HasUserGesture(),
-       // `openee_can_access_opener_origin` only matters for opener navigations,
+   // We preserve this information before sending the message since |params| is
+   // moved on send.
+   bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
 index 2e7c332565ebe33b00ab7fff96a6a8dfc61422a6..0ab061f51d1d0c93f23bfcf5ba051172cea37eb8 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
@@ -199,13 +199,13 @@ index 00e2a8c21d4f0ef00c942498251fa44065da63c0..0fc4b092fa276063e05f990bf920fecd
                         bool opener_suppressed,
                         bool* no_javascript_access) override;
 diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
-index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc0bbfa4a9 100644
+index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e4daf3420 100644
 --- a/third_party/blink/public/web/web_window_features.h
 +++ b/third_party/blink/public/web/web_window_features.h
 @@ -34,6 +34,7 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  
- #include "third_party/blink/public/platform/web_impression.h"
+ #include "third_party/blink/public/common/navigation/impression.h"
 +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
  
  namespace blink {
@@ -213,17 +213,17 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
 @@ -68,6 +69,8 @@ struct WebWindowFeatures {
    // Represents the attribution source declared by Attribution Reporting related
    // window features, if any.
-   absl::optional<WebImpression> impression;
+   absl::optional<Impression> impression;
 +
 +  String raw_features;
  };
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index ea47699384318126fef1a8c4cc3cb881cdc8e624..22d63b9f89913878518294f19afc85550196ca3e 100644
+index a25203186cc2df437fe3f9fe309599d86284aefb..b288472c5a00d76077859f02c0e1abca826aa8be 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2088,6 +2088,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2093,6 +2093,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
index dfbf2c9b770cd..e44f77536c7f9 100644
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
@@ -9,7 +9,7 @@ we're running with contextIsolation enabled, we should be falling back
 to Blink's logic. This will be upstreamed in some form.
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 90d3a635eec331130b738d0839cc9fdfa60ce451..9eb900ff4449f277f8c5ab3ccc29b0aa725be356 100644
+index f417dca0103ddfd8ce6e3b3a4d033ea42133604e..d0ee37d147243858d997be230c12ea3e41e6c873 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -448,8 +448,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 492d73768b2f9..a72ce1e616d02 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -35,7 +35,7 @@ index 5b4d70991e19edcdfee731c56251932bf43e535f..4d996e3821410b2325ef85499f8c307c
  
  #endif  // CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
-index 27452df45433e4aeb7b9008f8e5b91dd4b5f50db..5c6f9936e6d3d2647d7efbc70efda8551c5516c7 100644
+index 370a2eaf18f86e16d4198a4f0001f96abfebad07..72f7032a8fe2011a0bd80d557e661fc487c3b876 100644
 --- a/chrome/browser/media/offscreen_tab.cc
 +++ b/chrome/browser/media/offscreen_tab.cc
 @@ -285,8 +285,7 @@ bool OffscreenTab::IsWebContentsCreationOverridden(
@@ -63,10 +63,10 @@ index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 46e5ec4d834e9478db523a5a078218104c161a57..e584921a6d575740fc0331a8bac05904558efc15 100644
+index 2c877ddbb8c1448a73c0f0e0af27c7fecb1b7848..e1dfc70c951dd004dd8b37607dc8840b804a1e54 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
-@@ -83,10 +83,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
+@@ -84,10 +84,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -94,7 +94,7 @@ index f0333177f885000fb22818ffa30a0c4ad520a161..03e82957f9d7bf009dcbf5fcd43718c9
        content::WebContents* source,
        const content::OpenURLParams& params) override;
 diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
-index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e29191d8f 100644
+index caa6c2dbc6dbf87081da9a2e5c42e9ac2e60c77f..ac0b7dbee8195be8c165444a141629475e97a107 100644
 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 @@ -71,8 +71,7 @@ class ChromeKeyboardContentsDelegate : public content::WebContentsDelegate,
@@ -108,10 +108,10 @@ index 6688ba8ba2fb7d930773144cdbc43f1f6fa2b685..22015c7b9b50e1264551ce226757f90e
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 1837aac53e6e13aebb0eee00249b305e0c7192c9..cf0b500239f635decc718fb9cfceb3f3f5be23c6 100644
+index 706684de51b047abf2a355416a6361b7ed8542c9..5ccbde951b833bd9413a5c3506da5d982fb3b58e 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1798,12 +1798,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1795,12 +1795,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index 1837aac53e6e13aebb0eee00249b305e0c7192c9..cf0b500239f635decc718fb9cfceb3f3
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 631c30c8f153e72cd92de457d8ba6f44574edbe6..a24181efacd35c3d7b9b0bcdc066dd0a0f7bc43a 100644
+index 1f02e2e3d3f510b52089fbc835c6401ed693f1b9..6116970cb65bb7699759fad4351497ab057e25c0 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -828,8 +828,7 @@ class Browser : public TabStripModelObserver,
+@@ -836,8 +836,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -218,10 +218,10 @@ index 2930898b03d7b7ef86d13733cec3cbe84105c166..76625339f42a867c8b68840253e91648
    void SetContentsBounds(content::WebContents* source,
                           const gfx::Rect& bounds) override;
 diff --git a/components/offline_pages/content/background_loader/background_loader_contents.cc b/components/offline_pages/content/background_loader/background_loader_contents.cc
-index 2834e3ee5778185741779a473cf5157788a76cc5..64fcddc952065e574a84edd99e5b1b80febd3d26 100644
+index 9f46f0b26a0ea42d6bd36e7ec7459a1b2d9c789e..874b7c8d779f471214507417e35449c66b70c97d 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
-@@ -81,8 +81,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
+@@ -83,8 +83,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 1b616ba52d9c77c64c7f24a0d204ce36641dce38..0303ae1c4d8681bc1bf56eb9ff1fc13afd678706 100644
+index 6f09c04cc612d2ac58b62d44516eefa1b66d145c..407f734b77d1ed4876f01327df958847d60e9128 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3899,8 +3899,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3860,8 +3860,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index 1b616ba52d9c77c64c7f24a0d204ce36641dce38..0303ae1c4d8681bc1bf56eb9ff1fc13a
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index c01e06b08b1cca7a663e30476a551904ce9c6db8..9f50a8721560f734270308776f2f37ad49a8cb91 100644
+index 321d5cfc36e40f2a649e8ea5910f4082b71b62e1..e78e2aad4f13d7810027b65f321691091611fd2d 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -344,10 +344,10 @@ index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec48
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index d2497be79bb5d7943589bb928e2fbe13f76aa3e3..54adf30432cf178f2d00630420e45cfa95551b54 100644
+index d815a972b079676e900be8e312909832ae81bde8..ae28b864fcc2f10007ce33774d2d787c91d65f41 100644
 --- a/fuchsia/engine/browser/frame_impl.cc
 +++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -404,8 +404,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+@@ -406,8 +406,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -358,10 +358,10 @@ index d2497be79bb5d7943589bb928e2fbe13f76aa3e3..54adf30432cf178f2d00630420e45cfa
    // can catch bad client behavior while not interfering with normal operation.
    constexpr size_t kMaxPendingWebContentsCount = 10;
 diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index f2054bca778784c223beb02de150cfeb31c52907..53bf6bc205e9c631597bfbda46f4a0b5b4bb72ed 100644
+index 50631a4db62448699e7701f7b4e950e8058896ae..13ba38e1cae39ea46e64313c6a9312e504603bbb 100644
 --- a/fuchsia/engine/browser/frame_impl.h
 +++ b/fuchsia/engine/browser/frame_impl.h
-@@ -307,8 +307,7 @@ class FrameImpl : public fuchsia::web::Frame,
+@@ -309,8 +309,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -386,7 +386,7 @@ index 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23eb
          ->options()
          ->block_new_web_contents();
 diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
-index 749200efec166e0c29402a3d5e079f2e94460363..2cbc96e911291fb0b31c3f4a1444ded0be4521f5 100644
+index fb5239100bdc35d2d5cf47765c1bf1b285b20cf5..b4b2609ddbe0a0adfccffb4f4a0a56849579dd2d 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
 @@ -427,8 +427,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index 62e2ef85c1b9f..831959365e6b5 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 587144562fffda66cee9cbd23b16fb4e8607d208..a41bb82f8dcf292cf23aa8781bd5a5c52f11e578 100644
+index f3cf8498493526d125eb42a7c42f7ad85dbc1fc2..35ec5dc4d87ecc61bd0f48be4c5d5867e9f75cce 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
@@ -20,18 +20,18 @@ index 587144562fffda66cee9cbd23b16fb4e8607d208..a41bb82f8dcf292cf23aa8781bd5a5c5
  #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
  #include "components/cdm/renderer/widevine_key_system_properties.h"
  #include "content/public/renderer/render_thread.h"
-@@ -183,12 +185,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -184,12 +186,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
  
- // Returns persistent-license session support.
- EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {
+ // Returns whether persistent-license session can be supported.
+ bool CanSupportPersistentLicense() {
 +#if 0
    // Do not support persistent-license if the process cannot persist data.
    // TODO(crbug.com/457487): Have a better plan on this. See bug for details.
    if (ChromeRenderThreadObserver::is_incognito_process()) {
      DVLOG(2) << __func__ << ": Not supported in incognito process.";
-     return EmeSessionTypeSupport::NOT_SUPPORTED;
+     return false;
    }
 +#endif
  
-   if (!supported_by_the_cdm) {
-     DVLOG(2) << __func__ << ": Not supported by the CDM.";
+ // On ChromeOS, platform verification is similar to CDM host verification.
+ #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) || BUILDFLAG(IS_CHROMEOS)
diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch
index ab63b9153c409..275b2e7299f2c 100644
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -66,7 +66,7 @@ index eb3f3431a3774c3a05afd4c7350f3801e9c8c684..b8970ef9ddb69d6a9fc6d106293e7605
  
    bool is_listening_ = false;
 diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
-index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add746a3a374 100644
+index 2778a18b6c28f3342c6b43d1de71fbbd46c72f06..85af551f87b8b0f9aed7a2a395ecf79f81f5a0a1 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc
 +++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
 @@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
@@ -117,7 +117,7 @@ index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc
  
  }  // namespace ui
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index ada705fb42e88d4bfa05b212c84111be9057a50e..a866b975687dd08ad88031a63f161b3164e82455 100644
+index 0bed8d1e2e2ed4a8cfc9d51ec3d68ac75bd9ff82..6914758849ca485f0f882d0b4a9ded9b02b197a8 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
 @@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index fb4565d06bf81..0a049f6b24aad 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -75,7 +75,7 @@ index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index 32e2038e15adae14aa218a353f074cd6654bdc16..72bec9c08d7ec50257a86b0ee7173864d879d7d9 100644
+index 39fb479eba509f7ba1528cafecd1c6b21f3b0e76..a28b88d078560f05fa295f29dcf8b1865839285c 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
 @@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
@@ -128,10 +128,10 @@ index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a5
          arguments.push_back("--monitor-self");
        }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index d2354b84f3a184ad53571518198055a0a91cbc25..c05529257dda2acf0fa588d49e2b902736d9b02f 100644
+index 80f33dc5e2f2ed330e0726a5735b247ea8e99fd7..b96bf703f6b691886d6e4d5cd6d775945a8995e1 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
-@@ -88,6 +88,7 @@ bool PlatformCrashpadInitialization(
+@@ -90,6 +90,7 @@ bool PlatformCrashpadInitialization(
  
      std::map<std::string, std::string> process_annotations;
      GetPlatformCrashpadAnnotations(&process_annotations);
@@ -139,7 +139,7 @@ index d2354b84f3a184ad53571518198055a0a91cbc25..c05529257dda2acf0fa588d49e2b9027
  
      std::string url = crash_reporter_client->GetUploadUrl();
  
-@@ -126,6 +127,13 @@ bool PlatformCrashpadInitialization(
+@@ -128,6 +129,13 @@ bool PlatformCrashpadInitialization(
  
      std::vector<std::string> arguments(start_arguments);
  
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index a102ba88e4f8d..5944ac0d05cdc 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52a591e1e7 100644
+index 15e33123f633b29db9937b76374ef9c03853defa..c24f24d7f53a8ed1c5614244a938f972706bdc61 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -29,15 +29,17 @@ index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52
  // A scoping class that prevents a window from being able to redraw in response
  // to invalidations that may occur within it for the lifetime of the object.
  //
-@@ -359,6 +363,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
+@@ -358,7 +362,8 @@ class HWNDMessageHandler::ScopedRedrawLock {
+         hwnd_(owner_->hwnd()),
          cancel_unlock_(false),
          should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
-                      ::IsWindow(hwnd_) &&
-+                     !owner_->HasNativeFrame() &&
+-                     ::IsWindow(hwnd_) && !owner_->IsHeadless() &&
++                     ::IsWindow(hwnd_) && !owner_->HasNativeFrame() &&
++                     !owner_->IsHeadless() &&
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -986,6 +991,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -1015,6 +1020,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
@@ -49,10 +51,10 @@ index 2b69f4767e9073ea5f12acddf842c7f1dc82e2c1..a2f053c3e2588451458682aa6e86da52
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index f4efdc7174b90e57fb332f031530545e493a2e0d..9d45f97b930831a703efab2bbdf10afb61140c7f 100644
+index 3779c5028db164c70432d042876692822c7dd75c..98d4b486f978ba6e8c1641c759dc9002cea7c345 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
-@@ -205,6 +205,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
+@@ -206,6 +206,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
    using TouchIDs = std::set<DWORD>;
    enum class DwmFrameState { kOff, kOn };
  
@@ -62,7 +64,7 @@ index f4efdc7174b90e57fb332f031530545e493a2e0d..9d45f97b930831a703efab2bbdf10afb
    HICON GetDefaultWindowIcon() const override;
    HICON GetSmallWindowIcon() const override;
 diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
-index d8e0f1d3131aef80c9fcb6069df7d7f986af6605..5dbb192d0840ca0ded61397c399b774a8cb05cce 100644
+index caff85f683b7a67f14f4e66b588e40b9704c2bc3..210f39f68b839684c4ba0a4c57a76df44ddad7dc 100644
 --- a/ui/views/win/hwnd_message_handler_delegate.h
 +++ b/ui/views/win/hwnd_message_handler_delegate.h
 @@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index f5a01a7b3ca69..6c05f861afee5 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index f3f1d19619717f0f0493ab1ec90f47fd16bdd574..10bdf83528295d50cde496ade386a3546aa7bfc2 100644
+index bae9dd70c7657bf2bf66ab237d35440c14e7f6fb..796c3101103465bac8a7c177185c570dcc757fc1 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1880,6 +1880,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1863,6 +1863,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -34,7 +34,7 @@ index f3f1d19619717f0f0493ab1ec90f47fd16bdd574..10bdf83528295d50cde496ade386a354
    // If we are likely to software composite the resource, we use sRGB because
    // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index f6094a5defe12c34564020b0779626b3e5bff99e..a068a9ba33d3f8c8cdc74ae63ab5e16caa0b90c3 100644
+index 14a2e02d9a6edc3a7002ca43bc82c8ef98eb32b5..10abba0f0610719cc4be0ce792ce64aba43bbe04 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
 @@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -80,7 +80,7 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb06c19c4d6 100644
+index e0a8510a9e1d1475bfe92153db8cf860fbba74b5..5c01d58b3121ecf81d0971179ada834ca37d54a1 100644
 --- a/components/viz/service/display/gl_renderer.cc
 +++ b/components/viz/service/display/gl_renderer.cc
 @@ -87,6 +87,9 @@
@@ -194,9 +194,9 @@ index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb0
 +    DCHECK(dst_color_space.IsValid());
 +  }
    gfx::ColorSpace adjusted_src_color_space = src_color_space;
-   if (adjust_src_white_level && src_color_space.IsHDR()) {
-     // TODO(b/183236148): consider using the destination's HDR static metadata
-@@ -4084,9 +4096,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
+ 
+   ProgramKey program_key = program_key_no_color;
+@@ -4075,9 +4087,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
          cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
    }
  
@@ -209,7 +209,7 @@ index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb0
    *new_bounds = gfx::RectF(updated_dst_rect.origin(),
                             gfx::SizeF((*overlay_texture)->texture.size()));
  
-@@ -4305,8 +4317,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
+@@ -4296,8 +4308,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
  
    PrepareGeometry(SHARED_BINDING);
  
@@ -221,17 +221,17 @@ index 7fb664525ba696626544c8b09597105bff874c05..b987d649ef84451a9d3e5c2f87da3eb0
  
    gfx::Transform render_matrix;
    render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -4512,3 +4525,5 @@ bool GLRenderer::ColorTransformKey::operator<(
+@@ -4503,3 +4516,5 @@ bool GLRenderer::ColorTransformKey::operator<(
  }
  
  }  // namespace viz
 +
 +#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 11e2a00aaffeba9379c0f2c41e6300d3020c7a88..9cfd058861a506bc3d6f72e5ed4a37b60ff4454b 100644
+index e0df775b22507336c249ed10fc0251dbbca088b8..2ba12303c28c39aa2e8f88b4a0e14a60e65b9df8 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -227,6 +227,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -229,6 +229,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
  
  // Command-line switches to propagate to the GPU process.
  static const char* const kSwitchNames[] = {
@@ -240,10 +240,10 @@ index 11e2a00aaffeba9379c0f2c41e6300d3020c7a88..9cfd058861a506bc3d6f72e5ed4a37b6
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 0c8d0735523d388d0e68d2ad0b20a1c2525502ed..089b8e85776874938cfdafad0c3576562a78c1b0 100644
+index 8aa14d7cdb7edc5d53736fb959e3f9992d4fd896..da4830ccc3c3a160754dd9c89fc6292d7333ac67 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -198,6 +198,7 @@
+@@ -199,6 +199,7 @@
  #include "ui/accessibility/accessibility_switches.h"
  #include "ui/base/ui_base_switches.h"
  #include "ui/display/display_switches.h"
@@ -251,7 +251,7 @@ index 0c8d0735523d388d0e68d2ad0b20a1c2525502ed..089b8e85776874938cfdafad0c357656
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3217,6 +3218,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3175,6 +3176,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -260,7 +260,7 @@ index 0c8d0735523d388d0e68d2ad0b20a1c2525502ed..089b8e85776874938cfdafad0c357656
      sandbox::policy::switches::kDisableSeccompFilterSandbox,
      sandbox::policy::switches::kNoSandbox,
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 648f25d99884b99f49e26cd9f280a8a6ae63e1c7..0f87961ecd8c24e3ba82c6bae187a12c9b112bd4 100644
+index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..b4ddafdd126edd16172f00448bbbd56eaf509b1f 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 @@ -4,6 +4,7 @@
@@ -292,7 +292,7 @@ index 648f25d99884b99f49e26cd9f280a8a6ae63e1c7..0f87961ecd8c24e3ba82c6bae187a12c
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba26193952 100644
+index 9a5903820308299a1a480ecaaa1cbca9655f4093..705f1fce4d05694b92b4eb6de1044ae2232bb8ed 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
@@ -303,7 +303,7 @@ index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
  
-@@ -183,6 +184,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
+@@ -185,6 +186,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  
@@ -314,7 +314,7 @@ index 4187a703f62f36ff14d3a95f4b116febd5242c09..8d3b82e802bbd011380df21915427aba
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd0ad98d30 100644
+index e030f01e72d18ef08d04ffbc72a5abb9a7b485c5..25155263bede8a465eb3f3bc2960f173c8f14935 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
 @@ -20,6 +20,7 @@
@@ -332,7 +332,7 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
 +  auto* cmd_line = base::CommandLine::ForCurrentProcess();
 +  if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) {
 +    base::ScopedCFTypeRef<CFDataRef> system_icc(
-+        CGColorSpaceCopyICCProfile(base::mac::GetSystemColorSpace()));
++        CGColorSpaceCopyICCData(base::mac::GetSystemColorSpace()));
 +    IOSurfaceSetValue(io_surface, CFSTR("IOSurfaceColorSpace"), system_icc);
 +    return true;
 +  }
@@ -340,7 +340,7 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
    // Allow but ignore invalid color spaces.
    if (!color_space.IsValid())
      return true;
-@@ -312,6 +321,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
+@@ -311,6 +320,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
      DCHECK_EQ(kIOReturnSuccess, r);
    }
  
@@ -348,14 +348,14 @@ index e36187917ecec5d9e40009d1c394a07e72281919..de9698d577ab48358d06362fc78575fd
 +  if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) {
 +    CGColorSpaceRef color_space = base::mac::GetSystemColorSpace();
 +    base::ScopedCFTypeRef<CFDataRef> color_space_icc(
-+        CGColorSpaceCopyICCProfile(color_space));
++        CGColorSpaceCopyICCData(color_space));
 +    IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc);
 +    return surface;
 +  }
 +
    // Ensure that all IOSurfaces start as sRGB.
-   if (__builtin_available(macos 10.12, *)) {
-     IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+   IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), kCGColorSpaceSRGB);
+ 
 diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
 index 0e8044c6d87008c51fd165c6ef8bdc3687d6cc29..78015868927602b5225f252f0a9182f61b8431dc 100644
 --- a/ui/gfx/switches.cc
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 522db3317eff0..ecc594be91742 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,19 +6,19 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index c37193c2207fb4f20993a35e2ac6fde8f0727a45..8e81312b1424d37c756bbb93cb4020a693c9b380 100644
+index f36e046b2879c3cd24eac04b1cf5f5c62338a11f..06ca0f25bc575fa8508934fe498d599964a7f05d 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -531,7 +531,11 @@
-       browser_compositor_->GetDelegatedFrameHost()->HasSavedFrame();
-   if (has_saved_frame)
-     TRACE_EVENT_BEGIN("cc", "RWHVMac::WasOccluded with saved frame");
+@@ -513,7 +513,11 @@
+     return;
+ 
+   host()->WasHidden();
 -  browser_compositor_->SetRenderWidgetHostIsHidden(true);
 +  // Consider the RWHV occluded only if it is not attached to a window
 +  // (e.g. unattached BrowserView). Otherwise we treat it as visible to
 +  // prevent unnecessary compositor recycling.
 +  const bool unattached = ![GetInProcessNSView() window];
 +  browser_compositor_->SetRenderWidgetHostIsHidden(unattached);
-   if (has_saved_frame)
-     TRACE_EVENT_END("cc");
  }
+ 
+ void RenderWidgetHostViewMac::SetSize(const gfx::Size& size) {
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 5073b1291fd86..7b943409e321a 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 730ac0aaf36da1842c7add66fbaea58baadf2e74..fcc45c987cfce94f5378d4aeee1cfe703178e133 100644
+index 18133ca75853394e616c3a816c1eb74b7da23fd9..273750752cdef18ccd7d54b9b28c524375bb3e8d 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,7 +20,7 @@ index 730ac0aaf36da1842c7add66fbaea58baadf2e74..fcc45c987cfce94f5378d4aeee1cfe70
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 2ae96b816427148f4f0adf39c549d37fe3d02619..0288d36642629d7ec1846cd977f378ff9c0afd40 100644
+index 65297e78ee11fb3e7f662408f65a263f9ae8c550..62d3bef655580b1bad1077de797cdadc04721f8e 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -879,6 +879,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -34,10 +34,10 @@ index 2ae96b816427148f4f0adf39c549d37fe3d02619..0288d36642629d7ec1846cd977f378ff
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index a3eb86299d8d34262347ee093940e61af6eab348..cb99fd2eb69bba9b133664fb68076eeeb9576818 100644
+index dc52cc54d2a6078bef1cf9f09e8063011b4f5191..d9b9f49ea7fe9b0b6dec4ad49c112af4fc832691 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index c5f653eb03980..75b2567794e49 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -49,7 +49,7 @@ index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be2
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 5b179a2d15cfc4997410d9467bf9484f5cae0b9f..98296aa4e8d75e94b141694c592dfa83627861ff 100644
+index 5d01f8802e2144b9bb94d05b154bc5f5fa378b40..a872defd1c92f2ea590e5da1ecf34a6800dd4484 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -30,6 +30,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index ca244bbc8639c..7893453256944 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 1b021461f214287c94fb22b17d980c19e3f07dde..76691715d09a62a1edc0306dcac1d3e7e312fb1d 100644
+index 4aabe0781d9e4150dddce76a50b993d0b8da8068..4961f2db5bf80ad2b926617fe933bca4db5c82b7 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2398,7 +2398,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2400,7 +2400,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index b69182027c9db..6f0014385b6f9 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index ece3dfbee04cf941689e4f21f5176db010fda564..9fd052c00a484cd1acd2031fda79e6307fd01b60 100644
+index 28d01a952a31bc7df63dd70df167421c453a581c..172e250660d30d703c0c104c73f627d13797e2f4 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -19,10 +19,10 @@ index ece3dfbee04cf941689e4f21f5176db010fda564..9fd052c00a484cd1acd2031fda79e630
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index a2f053c3e2588451458682aa6e86da52a591e1e7..9e38d55d7156986e48ed6dcb3522d77358bfdb75 100644
+index c24f24d7f53a8ed1c5614244a938f972706bdc61..ee465b298240a21929abd438d930b9ce8afa6ffe 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -936,8 +936,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -965,8 +965,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index 714a99251bbb5..e2256f4f742e5 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,7 +33,7 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 6a331146e6fbf23e4177176f67fe534141579eb7..7f6974b8fbfe052902e6c0a55d386fb3a8b26558 100644
+index e351c6625fac1037040f639e55e0a2e48abf2538..1bb2e5b1d6d061961933b49bdcbe689efaeaa8f7 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -1407,6 +1407,13 @@ void NetworkContext::SetNetworkConditions(
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index c6d16910db2d2..216c2d3cb749a 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index cd14dd54e3c7bb56e82cbd6c566c11018b4deb94..0b0b3a03a64ae6a321eeb27619f4f0ae5ee388cc 100644
+index 0529b4399959a2a2b9b0131dd8736a87fb973b0b..6870692202c40179870d7f00e20c7ce19bdb85ce 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -159,6 +159,7 @@
+@@ -161,6 +161,7 @@
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
@@ -23,7 +23,7 @@ index cd14dd54e3c7bb56e82cbd6c566c11018b4deb94..0b0b3a03a64ae6a321eeb27619f4f0ae
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1785,6 +1786,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1776,6 +1777,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
index 8a8f913281124..ae14136ebb6ad 100644
--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
@@ -65,10 +65,10 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..55a2a78ce166a65cd11b26e0aa31968f
  #if BUILDFLAG(IS_WIN)
    bool EscapeVirtualization(const base::FilePath& user_data_dir);
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc4e2f5751 100644
+index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508263d4ed3 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -611,6 +611,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -606,6 +606,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -76,7 +76,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
                       SocketReader* reader);
  
   private:
-@@ -665,13 +666,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -660,13 +661,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -95,7 +95,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
      // Send back "ACK" message to prevent the client process from starting up.
      reader->FinishWithACK(kACKToken, std::size(kACKToken) - 1);
    } else {
-@@ -719,7 +723,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -714,7 +718,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
@@ -105,7 +105,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
    const size_t kMinMessageLength = std::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -749,10 +754,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -744,10 +749,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -135,7 +135,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -781,8 +804,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -776,8 +799,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -146,7 +146,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -901,7 +926,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -896,7 +921,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -156,7 +156,7 @@ index 9bb12894da06fc7d281daced754b240afa9bedeb..5762d0778c2f368019b75364e81b66fc
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -911,11 +937,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -906,11 +932,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index d48c35ad8194c..10e839cd9d536 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -103,7 +103,7 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 44ea9794a42eb9d2f0bcff722a05e530dbfff10c..318da554d3326b376898689c80b576979c564c5e 100644
+index 8137159de740809e44bc3a3dc18c842455a6795d..7292a40382fffcc96998b04696f4a2934a2da9ee 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -468,6 +468,7 @@ URLLoader::URLLoader(
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index a562bd5cd3b15..fb9b97974a5f3 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 9e38d55d7156986e48ed6dcb3522d77358bfdb75..01ff95be00b3911749f66a136b2b5a6c02156bd3 100644
+index ee465b298240a21929abd438d930b9ce8afa6ffe..83702d83078b68047f4464613033bc25cee21791 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3596,6 +3596,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3625,6 +3625,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index 832bba5787c3e..022773554260c 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
-index 22f7a86817fe4a2dc39913db349e81d93eef4874..c9509d84e25fd88d6ef13933099d582561fe5660 100644
+index 41e9cb083e2abfc48976f21e4ca45d175671f69f..90cd537d117894cb73af61787d7085fcedeaebbd 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.ts
 +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
-@@ -858,26 +858,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -859,26 +859,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -48,7 +48,7 @@ index 22f7a86817fe4a2dc39913db349e81d93eef4874..c9509d84e25fd88d6ef13933099d5825
    }
  
    /**
-@@ -985,30 +971,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -986,30 +972,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        fileName = fileName + '.pdf';
      }
  
diff --git a/patches/chromium/fix_export_zlib_symbols.patch b/patches/chromium/fix_export_zlib_symbols.patch
index 154bc672224a3..5effa32d57758 100644
--- a/patches/chromium/fix_export_zlib_symbols.patch
+++ b/patches/chromium/fix_export_zlib_symbols.patch
@@ -6,10 +6,10 @@ Subject: fix: export zlib symbols
 This patch sets ZLIB_DLL so that we properly export zlib symbols.
 
 diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
-index 999b1de1b2ba1fff5dd92173300dc22b9aa5a865..2132d8ef92acd39bffe3bebddb80b4317e1f52b8 100644
+index ca58b86f7b5b760b8088eddfb2ab923290771e4d..5c786bccae90cfb6263cae2148a6d00c8e618b3f 100644
 --- a/third_party/zlib/BUILD.gn
 +++ b/third_party/zlib/BUILD.gn
-@@ -313,6 +313,10 @@ component("zlib") {
+@@ -314,6 +314,10 @@ component("zlib") {
    defines = []
    deps = []
  
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 6fa77fb4b861a..4180c938c9330 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,7 +8,7 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index df1633d59070e19592a52f02a76bdd9006d7c6f0..e599e866d2f5e72259e5b34b65510a06b3209784 100644
+index 13253163b54c86b37c7b5654b674c5f920c81272..82c4963605707a0fa56b01b572c0ef9b0d093565 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -1820,7 +1820,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -21,7 +21,7 @@ index df1633d59070e19592a52f02a76bdd9006d7c6f0..e599e866d2f5e72259e5b34b65510a06
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 2f14f906b51ce73a69cd780d70ad6264285138ac..b14695646fe75d213b4affa60a6d775ce2474238 100644
+index d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1..86eefb4d6e2d571965be9f40269b7f4fc633d26e 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index d174f13c97b6c..6d21c86fbadcf 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -100,7 +100,7 @@ index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5b
    } else {
      // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index d0143dc64f818ee662694576ce2aa9488114f1c7..e3cbaa1b9c91805f8a4f81e110c8a85591b5f380 100644
+index 8ff9cf6dec605d5f56f0325fb3a03826b425970c..20d06930e81ad4b2b1ee789599ba84c6ff83682d 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
 @@ -242,6 +242,24 @@ void PrintDialogGtk::UpdateSettings(
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index ab8887f56ccd2..76157c2e242da 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 2b8e23df6545ca438c4af8434120cc40c70e09ec..049350bc63d627e85b239d23b976c3a62381fd57 100644
+index c8f2abaf2991b415b117604d37e8fb8abded00a3..41b09cb5c3a73f72178db9efcf883bd04fe68d6d 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3206,6 +3206,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3217,6 +3217,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 2b8e23df6545ca438c4af8434120cc40c70e09ec..049350bc63d627e85b239d23b976c3a6
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index f6d98708c436447ee6c93acb5d476719c238ca9c..505279149690d469fa979010435373e40a5c8c43 100644
+index 4e069af9256eb106b50e84d1243c92353daf2015..8e8ba0a946c3382045691b788566885fb0e41ce5 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -274,6 +274,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index cf2e47b7c03da..3de96009621ac 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,10 +38,10 @@ index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d06431862745
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 072387786cc70f7d0b7d3d31cebf86af69f98a30..9df4d0aa257e7b4ecacd8c7a4ad392c4a33ff177 100644
+index ec8de596ca5028e9d8c722cda082f0df668359ed..899ebbb1c2ba8d57532a1af43fcd5d44ac3a2de0 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -352,7 +352,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -353,7 +353,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
                                 const std::string js_command_line_flags,
@@ -51,7 +51,7 @@ index 072387786cc70f7d0b7d3d31cebf86af69f98a30..9df4d0aa257e7b4ecacd8c7a4ad392c4
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
-@@ -362,7 +363,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+@@ -363,7 +364,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    // See https://crbug.com/v8/11043
    SetFlags(mode, js_command_line_flags);
  
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 9ac43a88997b6..b9b2c2bd509dd 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 6cda63d5c6a0b7b2b41d01382b73dbdeea3651de..174e6a5265ec4186934a0bd0619ecf02073f4fe1 100644
+index 4ab466ef86340e97707bc5b14e0f0e67997c52a6..03d0b2f126c69df7af42095725a4f89880f0d634 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -962,6 +962,11 @@
+@@ -955,6 +955,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
index af8133b783c0f..392a9b6b9be46 100644
--- a/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
+++ b/patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
@@ -8,7 +8,7 @@ require a largeish patch to get working, so just redirect it to our
 implementation instead.
 
 diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
-index 9d7479bff662ca3c482e4672a9129e1f83100ebd..cfcc14087d9d5d9ab08ff9a5349a096ec75f4b6a 100644
+index 570359f62ce2ae59f2fe24cd56edf7e222b3d0bd..1d1fa2e2222435c88448b2577bbbd9c697196394 100644
 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
 @@ -10,8 +10,8 @@
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 78f43d3d3642d..44ac6e99b22d1 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 36786064cd26faf4968e8ee90fb382e95247e4de..ce9f4b6a0d4f3350f89e9ba4f02a5cbb064524c4 100755
+index 3a4bbeb6233f2735d5354c3faaeaef71c0f892a1..2a6891fb0af06d418fd3dc9ff7595f4b898c55df 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
-@@ -298,6 +298,8 @@ def GetDefaultHostOs():
+@@ -302,6 +302,8 @@ def GetDefaultHostOs():
        'win32': 'win',
    }
    default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index a068b1a12a451..280c955d156f0 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 0a0c6eb9567a96f569c25bad8ea98b4cd165b04a..0ce83c22636fce72e613893df30ca52b142077fd 100644
+index 4ea2ad7697bd4531f9538c16778b76ed7b439d74..bdc2e97e41705abe0f7b259635842c4f2e122b41 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -252,11 +252,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch
index 2793f24611e78..8f74c3cf1c77e 100644
--- a/patches/chromium/mas-cgdisplayusesforcetogray.patch
+++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of CGDisplayUsesForceToGray
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 335e8a576f9a66a20b5720dfd083708bf490587e..0abf4ae5c58bd841c013775f6df0b6065d6d77b1 100644
+index 596084265973b955a02c87babdefd43c7a1fc8e3..747718d5a0f58911e3f5f6e7a04a0a8d22238627 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -156,7 +156,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
+@@ -159,7 +159,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
      display.set_color_depth(Display::kDefaultBitsPerPixel);
      display.set_depth_per_component(Display::kDefaultBitsPerComponent);
    }
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 825fccf47cfa2..39aae9ea0f7b5 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -76,10 +76,19 @@ index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46ca
    if ([ns_val isKindOfClass:[NSFont class]]) {
      return (CTFontRef)(cf_val);
 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd51e99377c 100644
+index e12c36384ddc05554ed362bba2c0a8b418634f0a..1c740410de70ee5a888ee7cf406dfa3bccc28c9b 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
-@@ -26,8 +26,10 @@ extern "C" {
+@@ -19,14 +19,19 @@
+ #include "base/threading/scoped_blocking_call.h"
+ #include "base/threading/thread_restrictions.h"
+ #include "base/trace_event/base_tracing.h"
++#if defined(MAS_BUILD)
++#include <sys/syscall.h>
++#endif
+ 
+ extern "C" {
+ // Changes the current thread's directory to a path or directory file
  // descriptor. libpthread only exposes a syscall wrapper starting in
  // macOS 10.12, but the system call dates back to macOS 10.5. On older OSes,
  // the syscall is issued directly.
@@ -90,37 +99,35 @@ index 184cfa25dbc6cfa2a32be3f8d964ea359254f807..c9bfc4d8ca1408206244305d7634dcd5
  
  int responsibility_spawnattrs_setdisclaim(posix_spawnattr_t attrs, int disclaim)
      API_AVAILABLE(macosx(10.14));
-@@ -96,21 +98,29 @@ class PosixSpawnFileActions {
+@@ -95,13 +100,27 @@ class PosixSpawnFileActions {
  };
  
  int ChangeCurrentThreadDirectory(const char* path) {
-+  #if defined(MAS_BUILD)
++#if defined(MAS_BUILD)
++  #pragma clang diagnostic push
++  #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 +  return syscall(SYS___pthread_chdir, path);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_chdir_np(path);
-   } else {
-     return syscall(SYS___pthread_chdir, path);
-   }
-+  #endif
++  #pragma clang diagnostic pop
++#else
+   return pthread_chdir_np(path);
++#endif
  }
  
  // The recommended way to unset a per-thread cwd is to set a new value to an
  // invalid file descriptor, per libpthread-218.1.3/private/private.h.
  int ResetCurrentThreadDirectory() {
-+  #if defined(MAS_BUILD)
++#if defined(MAS_BUILD)
++  #pragma clang diagnostic push
++  #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 +  return syscall(SYS___pthread_fchdir, -1);
-+  #else
-   if (__builtin_available(macOS 10.12, *)) {
-     return pthread_fchdir_np(-1);
-   } else {
-     return syscall(SYS___pthread_fchdir, -1);
-   }
-+  #endif
++  #pragma clang diagnostic pop
++#else
+   return pthread_fchdir_np(-1);
++#endif
  }
  
  struct GetAppOutputOptions {
-@@ -230,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
+@@ -221,11 +240,13 @@ Process LaunchProcess(const std::vector<std::string>& argv,
      file_actions.Inherit(STDERR_FILENO);
    }
  
@@ -163,7 +170,7 @@ index 0e842caf7b6487d94978c7b68fb5b222e330581f..5eafcd163ee1a05203a5eb76592a449f
  
  }  // namespace
 diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc
-index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e3a9f81d4 100644
+index f071b192208fdfb1b9da932fcbbf64f0712d8f8b..7481ec29aaaa7b9f40af4a1180dd779e60131ea5 100644
 --- a/sandbox/mac/sandbox_logging.cc
 +++ b/sandbox/mac/sandbox_logging.cc
 @@ -32,9 +32,11 @@
@@ -176,11 +183,11 @@ index 702224dce1871c07b07f6882e46d14fe532d6ed2..797cb6646171486797a5e5fbbb1b187e
  }
 +#endif
  
- namespace sandbox {
+ namespace sandbox::logging {
+ 
+@@ -71,9 +73,11 @@ void SendOsLog(Level level, const char* message) {
  
-@@ -104,9 +106,11 @@ void SendAslLog(Level level, const char* message) {
-   asl_set(asl_message.get(), ASL_KEY_MSG, message);
-   asl_send(asl_client.get(), asl_message.get());
+   os_log_with_type(log.get(), os_log_type, "%{public}s", message);
  
 +#if !defined(MAS_BUILD)
    if (level == Level::FATAL) {
diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch
index 7579f306131a4..06cd665d2e11d 100644
--- a/patches/chromium/mas_disable_custom_window_frame.patch
+++ b/patches/chromium/mas_disable_custom_window_frame.patch
@@ -7,7 +7,7 @@ Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS
 build.
 
 diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
-index cf88f696a46ff0ac84bcf466b44d1080438426c1..7672eee30a811001a0149edfa4eed9dc6a4b11f6 100644
+index 4d8f9f89f03653221fc0b509aa0e15ff20e73574..7bd5094db9b1a8e9af4ecc118fed7b78178e1e58 100644
 --- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
 +++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
 @@ -9,6 +9,7 @@
@@ -18,7 +18,7 @@ index cf88f696a46ff0ac84bcf466b44d1080438426c1..7672eee30a811001a0149edfa4eed9dc
  @interface NSWindow (PrivateBrowserNativeWidgetAPI)
  + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
  @end
-@@ -63,10 +64,13 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) {
+@@ -55,10 +56,13 @@ - (BOOL)_shouldCenterTrafficLights {
  
  @end
  
@@ -32,7 +32,7 @@ index cf88f696a46ff0ac84bcf466b44d1080438426c1..7672eee30a811001a0149edfa4eed9dc
  + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
    // - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
    if ([BrowserWindowFrame class])
-@@ -81,6 +85,8 @@ - (BOOL)_usesCustomDrawing {
+@@ -73,6 +77,8 @@ - (BOOL)_usesCustomDrawing {
    return NO;
  }
  
@@ -95,7 +95,7 @@ index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 622b25c637ba14f287cbcdb4781967564d7e9eff..a21fe0aa19069a748b41e7d0781e20031c40fbfc 100644
+index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565aeb8bfb01 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 @@ -16,7 +16,9 @@
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 426b8591f4b1c..1d607671a6b66 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,10 +44,10 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 26a2fa4c0f39ea0254bee322f355d92a55ba3b4e..e42de9720456161c187d41d39487ee3272fa1cf9 100644
+index 4c76aafff03b76d78ab8c84e962cf96f8fefc091..32ac66e9ac5a643f5e4ddea979bf4239d441d23f 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -583,10 +583,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -579,10 +579,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -114,10 +114,10 @@ index 0048862cb89d519b8c1c111f923e6dd960c855d6..c7b9124462b0779ed4d1b27fe167e653
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8f0727a45 100644
+index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c62338a11f 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -255,8 +255,10 @@
+@@ -254,8 +254,10 @@
  void RenderWidgetHostViewMac::MigrateNSViewBridge(
      remote_cocoa::mojom::Application* remote_cocoa_application,
      uint64_t parent_ns_view_id) {
@@ -128,7 +128,7 @@ index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1541,8 +1543,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1521,8 +1523,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8
    return [GetInProcessNSView() window];
  }
  
-@@ -1586,9 +1590,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1566,9 +1570,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2083,12 +2089,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2063,12 +2069,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,10 +167,10 @@ index 3fbe8be5b94817d48622590cb3acd271bf07db31..c37193c2207fb4f20993a35e2ac6fde8
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 2e39255bdb26664e8bc2d0abb26c2359c9b84bd3..1425e9935b599b01fd53f43d0415a77002c92f00 100644
+index 4c996a80ae71aee8c2d259a7eb294fe3257ad9ac..5e897496539a365a5de15073f1dccb16db3987dd 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -329,6 +329,13 @@ component("base") {
+@@ -337,6 +337,13 @@ component("base") {
      sources += [ "resource/resource_bundle_lacros.cc" ]
    }
  
@@ -205,7 +205,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index c93aedbce83c398a55c478df60d5ba6dd5324a0b..dfa1983e5605d14e44efae3c1418b4e53c392333 100644
+index 1ca8dab6cec9f4160f557d034deda9f3b98b9459..e6d3656c0a66d94cdbdb0141e7e44439e84aa8dd 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
 @@ -31,7 +31,9 @@
@@ -218,7 +218,7 @@ index c93aedbce83c398a55c478df60d5ba6dd5324a0b..dfa1983e5605d14e44efae3c1418b4e5
  @class NSView;
  
  namespace remote_cocoa {
-@@ -452,11 +454,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -445,11 +447,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -233,10 +233,10 @@ index c93aedbce83c398a55c478df60d5ba6dd5324a0b..dfa1983e5605d14e44efae3c1418b4e5
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index 1c4c4a774e4d5e199ae50e8df4499a497d3b0674..b2265079021d10e2944b9474fafe32ccca95d3de 100644
+index e0a337647572929882c8dc4fdb6c1bcad54071df..2a18cbed5933419e2f8c830376bfee6ab1db9a9f 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -296,14 +296,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -294,14 +294,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +259,7 @@ index 1c4c4a774e4d5e199ae50e8df4499a497d3b0674..b2265079021d10e2944b9474fafe32cc
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1287,6 +1295,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1257,6 +1265,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +267,7 @@ index 1c4c4a774e4d5e199ae50e8df4499a497d3b0674..b2265079021d10e2944b9474fafe32cc
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1294,14 +1303,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1264,14 +1273,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index d9abef548d026..093c692d94b8f 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -16,7 +16,7 @@ cases where performance improves when disabling remote CoreAnimation (remote
 CoreAnimation is really only about battery usage).
 
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h
-index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b42394474 100644
+index 7fc76ecb3292a892e2aa8c117cd6302f9ce63fa6..efd5da9daf8fbe80264b8b55eafc717317ba48e6 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.h
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h
 @@ -21,7 +21,9 @@
@@ -29,7 +29,17 @@ index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b
  @class CALayer;
  
  namespace ui {
-@@ -116,7 +118,9 @@ class ImageTransportSurfaceOverlayMacBase : public BaseClass,
+@@ -115,7 +117,9 @@ class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
+   base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
+ 
+   bool use_remote_layer_api_;
++#ifndef MAS_BUILD
+   base::scoped_nsobject<CAContext> ca_context_;
++#endif
+   std::unique_ptr<ui::CALayerTreeCoordinator> ca_layer_tree_coordinator_;
+ 
+   gfx::Size pixel_size_;
+@@ -210,7 +214,9 @@ class ImageTransportSurfaceOverlayMacEGL : public gl::GLSurfaceEGL,
    base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
  
    bool use_remote_layer_api_;
@@ -40,27 +50,52 @@ index 1b84c9df5990d0905d068ca822d5173313a74edd..89a90a5c8e0c3ede1b0fe63d45c5768b
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 547a5c4260b28d651d470e06c4c4e6bfa77ef966..01fee4e6b104aad68d52f30c9af3e9072f078e0c 100644
+index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d121828ce85 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-@@ -60,7 +60,7 @@
+@@ -59,6 +59,7 @@
+   ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
+       use_remote_layer_api_, allow_av_sample_buffer_display_layer);
  
++#ifndef MAS_BUILD
+   // Create the CAContext to send this to the GPU process, and the layer for
+   // the context.
+   if (use_remote_layer_api_) {
+@@ -67,6 +68,7 @@
+                                                    options:@{}] retain]);
+     [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
+   }
++#endif
+ }
+ 
+ ImageTransportSurfaceOverlayMac::~ImageTransportSurfaceOverlayMac() {
+@@ -146,7 +148,9 @@
+                          "GLImpl", static_cast<int>(gl::GetGLImplementation()),
+                          "width", pixel_size_.width());
+     if (use_remote_layer_api_) {
++#ifndef MAS_BUILD
+       params.ca_layer_params.ca_context_id = [ca_context_ contextId];
++#endif
+     } else {
+       IOSurfaceRef io_surface =
+           ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
+@@ -408,6 +412,7 @@
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
--
+ 
 +#ifndef MAS_BUILD
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -69,6 +69,7 @@
+@@ -416,6 +421,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
 +#endif
  }
  
- template <typename BaseClass>
-@@ -160,7 +161,9 @@
+ ImageTransportSurfaceOverlayMacEGL::~ImageTransportSurfaceOverlayMacEGL() {
+@@ -496,7 +502,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index b28e29487b800..124bb9afbc651 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -122,7 +122,7 @@ index c15f3a631292b538698625328fb429ee3c9964f5..37e038753ecf1b82ec92c06b2c0729b5
  }
  
 diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
-index d342eb4e9fc94de4365d86c2d1af4b85a8bf63a3..012f9ce97d9ed6b00deb718a88f432e053cb3bd1 100644
+index 69e60d498941c34cfac9e79c7517765bf93849f5..b998ad7cf01c21e93c57e1283cfdcb1e02ac49cf 100644
 --- a/device/bluetooth/bluetooth_adapter_mac.mm
 +++ b/device/bluetooth/bluetooth_adapter_mac.mm
 @@ -42,6 +42,7 @@
@@ -141,8 +141,8 @@ index d342eb4e9fc94de4365d86c2d1af4b85a8bf63a3..012f9ce97d9ed6b00deb718a88f432e0
  
  namespace {
  
-@@ -123,8 +125,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
-       controller_state_function_(
+@@ -114,8 +116,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
+     : controller_state_function_(
            base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
                                base::Unretained(this))),
 +#ifndef MAS_BUILD
@@ -152,7 +152,7 @@ index d342eb4e9fc94de4365d86c2d1af4b85a8bf63a3..012f9ce97d9ed6b00deb718a88f432e0
        classic_discovery_manager_(
            BluetoothDiscoveryManagerMac::CreateClassic(this)),
        low_energy_discovery_manager_(
-@@ -365,8 +369,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
+@@ -356,8 +360,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
  }
  
  bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
@@ -166,7 +166,7 @@ index d342eb4e9fc94de4365d86c2d1af4b85a8bf63a3..012f9ce97d9ed6b00deb718a88f432e0
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index ebe37172d254e8441fe2b8c290bd5a59af38d754..6a131f5c41f3e43a1467efeec2ce63f6903691b7 100644
+index 1b849df0ee4c40a765a14bfaa75720f5570d4846..1f7a4fe36a96d076ddcfd9c9f092f95132d579dc 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -173,6 +173,12 @@ source_set("audio") {
@@ -183,10 +183,10 @@ index ebe37172d254e8441fe2b8c290bd5a59af38d754..6a131f5c41f3e43a1467efeec2ce63f6
        "AudioToolbox.framework",
        "AudioUnit.framework",
 diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
-index b8805f9174818ac086a5d6542c9962050f00aee8..5491b62a2e180b2f6e48e243e2ac78c3b1a16892 100644
+index eb0aff29b2f4fd2b035ef96186fd58d976876b05..8a68a8885ec42715c9b9dab0f04d1b90eb9baa6e 100644
 --- a/media/audio/mac/audio_manager_mac.cc
 +++ b/media/audio/mac/audio_manager_mac.cc
-@@ -887,7 +887,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
+@@ -885,7 +885,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
  
  void AudioManagerMac::InitializeOnAudioThread() {
    DCHECK(GetTaskRunner()->BelongsToCurrentThread());
diff --git a/patches/chromium/mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch b/patches/chromium/mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
index 4a2895266232f..6ba1e0d11fdad 100644
--- a/patches/chromium/mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
+++ b/patches/chromium/mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
@@ -9,7 +9,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
 system priority.
 
 diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
-index 99b4dffbd41dd5d53e4f8e7e0bfbbf3ecc6fcb43..db57e78efa22a26b71426d2960aeb7919ae6cf47 100644
+index 88262d4dd82b3a954ed09492c508ad83dece0256..81fad8ca63479737885f09be7cf05b8eada1f104 100644
 --- a/ui/gfx/platform_font_mac.mm
 +++ b/ui/gfx/platform_font_mac.mm
 @@ -25,9 +25,11 @@
@@ -24,7 +24,7 @@ index 99b4dffbd41dd5d53e4f8e7e0bfbbf3ecc6fcb43..db57e78efa22a26b71426d2960aeb791
  
  namespace {
  
-@@ -232,7 +234,13 @@ NSInteger ToNSFontManagerWeight(Weight weight) {
+@@ -220,7 +222,13 @@ NSInteger ToNSFontManagerWeight(Weight weight) {
    // TODO(avi, etienneb): Figure out this font stuff.
    base::ScopedCFTypeRef<CTFontDescriptorRef> descriptor(
        CTFontCopyFontDescriptor(font));
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 0bfd677514878..af9c65ee153b1 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 12d74d8751802b06198952682bfc99f18e5f8df8..6a331146e6fbf23e4177176f67fe534141579eb7 100644
+index 812cfebfbe4f95cf38ce2fcd115a5a363f51363e..e351c6625fac1037040f639e55e0a2e48abf2538 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -128,6 +128,11 @@
@@ -128,7 +128,7 @@ index 12d74d8751802b06198952682bfc99f18e5f8df8..6a331146e6fbf23e4177176f67fe5341
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2301,6 +2398,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2302,6 +2399,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 5df86e0449e32..4f582c7187ca0 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -7,10 +7,10 @@ Pass RenderFrameHost through to PlatformNotificationService
 so Electron can identify which renderer a notification came from.
 
 diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
-index 362fedd0a0b654db546a73ff84c7e0676097e824..f1f6e2a36a6764ef12827fdab16818061b007959 100644
+index 17b9ed63bd839632a5eed5bcbaa3e990472761ef..09c266f1a99e42d6c417c294d7db1d6621ec0365 100644
 --- a/chrome/browser/notifications/platform_notification_service_impl.cc
 +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
-@@ -195,6 +195,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
+@@ -197,6 +197,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
  
  // TODO(awdf): Rename to DisplayNonPersistentNotification (Similar for Close)
  void PlatformNotificationServiceImpl::DisplayNotification(
@@ -130,10 +130,10 @@ index 69f000e5cd25c6d89c88238873f638923bafdf0e..4f0068a92a0e99e2b34f105954689c7b
        const GURL& document_url,
        mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 36830abdfa49fed9b8294ca33065816faa672e18..36b4e75828436df4274b522bdf75e88e1112aab6 100644
+index b661376d97f515574385dde451ed21fb3f3e4f7b..733931cf9f2b55b63c0611cca673250696f1300d 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2085,7 +2085,8 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2051,7 +2051,8 @@ void RenderProcessHostImpl::CreateNotificationService(
      document_url = rfh->GetLastCommittedURL();
  
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index c7f550e631fc7..57f571ce58cc4 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -138,7 +138,7 @@ index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..9dfdd0288391aac31556c716d24c66d1
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index c1d2614f3ae3e7256db95a2cd3c5253ab6b25bd0..cabe6f261c863c35882deb8f850194e27f78a4f9 100644
+index 0d5857b5f3afa823a7a2aff68f833623ec2e7b1c..fb6217f28c306921a86afc9b854a60b4e38e1584 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index edeed181bef81..a3d13a71f28b9 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -100,10 +100,10 @@ index ee713c5686d4ea8a5d73cebf74e67381b685cff6..375ce3294727b84bf0071681c7bc35c7
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index dd27bbf387718d6abda5080e7d2c609cd0eaff17..8837cf2aeaa2f87d51be8d00aa356c8a2c5e15c7 100644
+index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf06d4852f5 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -345,7 +345,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -362,7 +362,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -113,7 +113,7 @@ index dd27bbf387718d6abda5080e7d2c609cd0eaff17..8837cf2aeaa2f87d51be8d00aa356c8a
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df6588392418 100644
+index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0adb5365a94 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -199,7 +199,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -332,6 +342,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -334,6 +344,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -209,7 +209,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
    enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -500,7 +513,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -502,7 +515,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -219,7 +219,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -513,16 +527,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -517,16 +531,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -243,7 +243,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -638,11 +655,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -642,11 +659,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -258,7 +258,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -672,18 +692,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -676,18 +696,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -280,7 +280,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -693,6 +715,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -697,6 +719,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -288,7 +288,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -718,14 +741,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -722,14 +745,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -305,7 +305,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
      return;
    }
  #endif
-@@ -763,7 +786,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -767,7 +790,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -313,7 +313,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  #endif
  
    ReleasePrinterQuery();
-@@ -778,6 +800,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -782,6 +804,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -325,7 +325,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -788,10 +815,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -792,10 +819,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -338,7 +338,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -851,6 +880,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -855,6 +884,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -350,7 +350,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -908,7 +942,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -912,7 +946,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current |print_job_|.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -362,8 +362,8 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    if (!weak_this)
      return false;
  
-@@ -987,6 +1024,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
-   UnregisterSystemPrintClient();
+@@ -993,6 +1030,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+   }
  #endif
  
 +  if (!callback_.is_null()) {
@@ -376,7 +376,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
    if (!print_job_)
      return;
  
-@@ -1036,7 +1080,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1042,7 +1086,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -385,7 +385,7 @@ index 3701853ada7f0ffe3cc8a798496f9f48541b4f47..203ca9b0c4bf048016023fc3d260df65
      return true;
  
    if (!cookie) {
-@@ -1144,7 +1188,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1150,7 +1194,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -454,7 +454,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-index aa727261738698610fab5abd3618d0d0f0d29792..2793fbc33e66cf9d7e3fc5e10f0d01730f3b935d 100644
+index b2bd74f28f70bc601ec47820030ad965b19cf068..027e4c0b78d44b69504d248755bf7f25ff423361 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 @@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
@@ -467,7 +467,7 @@ index aa727261738698610fab5abd3618d0d0f0d29792..2793fbc33e66cf9d7e3fc5e10f0d0173
  void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params) {
    NOTREACHED();
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-index 5f4d6e314b21351e3e5912e3a43ef87774343085..8627c8305686654dca7cd9c26433592e934d4eb0 100644
+index 42f9f296e6ef65a934167c2d4773e504020378bc..3ac69d39e4eb380f97cb779be1e9ad8706ce8243 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 @@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
@@ -480,7 +480,7 @@ index 5f4d6e314b21351e3e5912e3a43ef87774343085..8627c8305686654dca7cd9c26433592e
    void PrintForSystemDialog() override;
    void SetPrintPreviewUI(
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..2cfcd810c9507c434e673064b63e8fbc95172537 100644
+index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d183ce10c0f 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
 @@ -280,7 +280,7 @@ enum PrintFailureReason {
@@ -502,7 +502,7 @@ index 8e5c441b3d0a2d35fc5c6f9d43b4a4ca167e09ca..2cfcd810c9507c434e673064b63e8fbc
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1df2f1a86 100644
+index 1664ac8233e74cadcf19ebc53e41cef37d13019c..aa341dd9a6f2b6e2ebb6e8048d2d9a3e5c3e89ea 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -513,7 +513,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1277,7 +1278,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1279,7 +1280,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -523,7 +523,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
      if (!weak_this)
        return;
  
-@@ -1308,7 +1310,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1310,7 +1312,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -532,7 +532,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1323,7 +1325,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1325,7 +1327,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -541,7 +541,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1389,7 +1391,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1391,7 +1393,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -551,7 +551,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1438,6 +1441,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
+@@ -1440,6 +1443,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -682,7 +682,7 @@ index db8913ae41d46d14fd15c6127e126e4b129dc4b8..eaddc1bbc59bad9cc885fb8532d4f8c1
              std::move(quit_closure).Run();
            },
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index 220b28a7e63625fe8b76290f0d2f40dd32cae255..cff9e35fab9df680c3c39467c50ddb033c2e6cba 100644
+index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43fa22d81b5 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -255,7 +255,7 @@ class PrintRenderFrameHelper
@@ -723,10 +723,10 @@ index 220b28a7e63625fe8b76290f0d2f40dd32cae255..cff9e35fab9df680c3c39467c50ddb03
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 8a8fcefa9da92a044f5bdf6a2f242048b325d442..6dae33514675d6843736b2c9a767a4b72cb103fa 100644
+index 93db1a80a360702a36f2d3113c9a83105bf7fffe..c3e012ec8d9a1c19434240d27553e486c0729d43 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -117,7 +117,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
+@@ -128,7 +128,6 @@ void PrintingContext::UsePdfSettings() {
  
  mojom::ResultCode PrintingContext::UpdatePrintSettings(
      base::Value::Dict job_settings) {
@@ -735,10 +735,10 @@ index 8a8fcefa9da92a044f5bdf6a2f242048b325d442..6dae33514675d6843736b2c9a767a4b7
      std::unique_ptr<PrintSettings> settings =
          PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 2c8ef23f7cb75a743fa18e3c613f7c719988028c..265005d6d51f861aa7ccd7e0eba7809b3c652dae 100644
+index 58fcf619add5093bd99fd9c561e8686b060a01c6..76db2a2438cef84fcb6dfd4a67d2e171428e4be0 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
-@@ -170,6 +170,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -171,6 +171,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
  
    bool PrintingAborted() const { return abort_printing_; }
  
@@ -748,7 +748,7 @@ index 2c8ef23f7cb75a743fa18e3c613f7c719988028c..265005d6d51f861aa7ccd7e0eba7809b
    int job_id() const { return job_id_; }
  
   protected:
-@@ -180,9 +183,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
+@@ -181,9 +184,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
    static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
                                                       bool skip_system_calls);
  
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index 0d6d8328df700..a44f1930965f3 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -75,7 +75,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240afa9bedeb 100644
+index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d72d847433 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -54,6 +54,7 @@
@@ -96,9 +96,9 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
  #endif
 +#endif
  
- #if defined(TOOLKIT_VIEWS) && \
-     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-@@ -347,6 +350,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+ using content::BrowserThread;
+ 
+@@ -342,6 +345,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -108,7 +108,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -366,6 +372,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -361,6 +367,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -116,7 +116,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -406,6 +413,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -401,6 +408,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -138,7 +138,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -773,6 +795,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -768,6 +790,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -149,7 +149,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -945,6 +971,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -932,6 +958,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -170,7 +170,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1044,14 +1084,32 @@ bool ProcessSingleton::Create() {
+@@ -1031,14 +1071,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -208,7 +208,7 @@ index 22331cd6985b2aa2347fe9d4211f51634e94d0a6..9bb12894da06fc7d281daced754b240a
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1094,10 +1152,13 @@ bool ProcessSingleton::Create() {
+@@ -1081,10 +1139,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 576ccc34bd1d6..288bb9200db53 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index fcc45c987cfce94f5378d4aeee1cfe703178e133..d78ca15f4d589b6789908168c00d9e403e62d6f4 100644
+index 273750752cdef18ccd7d54b9b28c524375bb3e8d..3eec2e5c14186b39a67ca8ad410a3268841e5f4e 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2081,6 +2081,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index fcc45c987cfce94f5378d4aeee1cfe703178e133..d78ca15f4d589b6789908168c00d9e40
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index a96bb634eb5c5405abb62b88d576e5e3ed354caa..1b616ba52d9c77c64c7f24a0d204ce36641dce38 100644
+index 987e437641b7978290aa2633755b67f9099e1d04..6f09c04cc612d2ac58b62d44516eefa1b66d145c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4527,6 +4527,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4491,6 +4491,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,7 +59,7 @@ index a96bb634eb5c5405abb62b88d576e5e3ed354caa..1b616ba52d9c77c64c7f24a0d204ce36
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 6b6fc6881c88b72c164d786c036b2e56ccd43ac8..df1633d59070e19592a52f02a76bdd9006d7c6f0 100644
+index 36888689fe38e7873f09b1bc64a901f0771cbd5b..13253163b54c86b37c7b5654b674c5f920c81272 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -954,6 +954,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index ad382863c801c..579052a1a0d70 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 1bdeb27db614d3ab535e536e7e433d9ee27fd9da..e478228a5729a2a2fa0a816e25a4f1a6fe996bac 100644
+index bdaae69dbeac280dcc83baa217d6c4ab0039ba35..14e7b4386d8d8bf020abf5a1037761eac1068223 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -668,6 +668,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -691,6 +691,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index 1bdeb27db614d3ab535e536e7e433d9ee27fd9da..e478228a5729a2a2fa0a816e25a4f1a6
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 5f2abc1943e2f25aa31c499ed7fd870a49ba5732..d3d6800e0920380bc9efe8dba35e03efe10e6a50 100644
+index 8f76edf316a075bddb2963ff1baf3ba0481b5fa7..2604d55c46e4ef3e512554a645d3db4b5670995c 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
@@ -50,7 +50,7 @@ index 5f2abc1943e2f25aa31c499ed7fd870a49ba5732..d3d6800e0920380bc9efe8dba35e03ef
  class WebCursor;
  class WebContentsAccessibility;
  class DelegatedFrameHost;
-@@ -139,6 +143,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -144,6 +148,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
        const gfx::Rect& keyboard_rect) override {}
    bool IsHTMLFormPopup() const override;
  
@@ -60,7 +60,7 @@ index 5f2abc1943e2f25aa31c499ed7fd870a49ba5732..d3d6800e0920380bc9efe8dba35e03ef
    // This only needs to be overridden by RenderWidgetHostViewBase subclasses
    // that handle content embedded within other RenderWidgetHostViews.
    gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -290,6 +297,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -295,6 +302,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                     const ui::LatencyInfo& latency);
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index 4742a2456d48e..c70ffd75bc488 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4087ce4ff 100644
+index 0282cf6bb6674b10e6a92897ec8c5b2bb9c4a4a0..6ce9f338bb92390b355a7cc124e8fa869a3cb4ac 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -29,7 +29,7 @@ index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4
  // These are not documented, so use only after checking -respondsToSelector:.
  @interface NSApplication (UndocumentedSpeechMethods)
  - (void)speakString:(NSString*)string;
-@@ -611,6 +620,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+@@ -602,6 +611,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -39,7 +39,7 @@ index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -687,6 +699,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -678,6 +690,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -50,18 +50,18 @@ index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -1006,6 +1022,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
-                               eventType == NSKeyDown &&
-                               !(modifierFlags & NSCommandKeyMask);
+@@ -997,6 +1013,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+                               eventType == NSEventTypeKeyDown &&
+                               !(modifierFlags & NSEventModifierFlagCommand);
  
 +  if ([theEvent.window respondsToSelector:@selector(disableAutoHideCursor)] &&
 +      [theEvent.window disableAutoHideCursor])
 +    shouldAutohideCursor = NO;
 +
    // We only handle key down events and just simply forward other events.
-   if (eventType != NSKeyDown) {
+   if (eventType != NSEventTypeKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1769,9 +1789,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1761,9 +1781,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index aa0802116eaffaac58800a1b9e08367c489adacd..9eb0014c0aff821814ed83eb83059ba4
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1780,7 +1802,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1772,7 +1794,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index ad3734548752a..64adbef1380b8 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 5c564fe889ca6621ff33d31d8d2fff93563093eb..99ab95668a7d3a31339b576b4a3a6038f39c2795 100644
+index b1c9b0c7e7d6d8694f123d057e415676cab607c7..dc59a88bc930d4d7b8e606434d940cac5b834bd0 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1534,7 +1534,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1538,7 +1538,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 5c564fe889ca6621ff33d31d8d2fff93563093eb..99ab95668a7d3a31339b576b4a3a6038
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1563,6 +1563,12 @@ if (!is_android) {
+@@ -1567,6 +1567,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index c60a1ac2733bb..c0ca856c45100 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 36b4e75828436df4274b522bdf75e88e1112aab6..0c8d0735523d388d0e68d2ad0b20a1c2525502ed 100644
+index 733931cf9f2b55b63c0611cca673250696f1300d..8aa14d7cdb7edc5d53736fb959e3f9992d4fd896 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1791,9 +1791,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1750,9 +1750,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
@@ -39,13 +39,13 @@ index 36b4e75828436df4274b522bdf75e88e1112aab6..0c8d0735523d388d0e68d2ad0b20a1c2
          std::make_unique<RendererSandboxedProcessLauncherDelegate>();
 +#endif
  #endif
-     // Spawn the child process asynchronously to avoid blocking the UI thread.
-     // As long as there's no renderer prefix, we can use the zygote process
+ 
+     auto file_data = std::make_unique<ChildProcessLauncherFileData>();
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
-index e8d6ef94664bb37996871c0cc0db7c815783b786..0d56fa0aebee80883019a100900119972bf02edd 100644
+index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2dd6f7f0d8 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
-@@ -25,6 +25,9 @@ namespace content {
+@@ -31,6 +31,9 @@ namespace content {
  
  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
  ZygoteHandle RendererSandboxedProcessLauncherDelegate::GetZygote() {
@@ -55,7 +55,7 @@ index e8d6ef94664bb37996871c0cc0db7c815783b786..0d56fa0aebee80883019a10090011997
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
    base::CommandLine::StringType renderer_prefix =
-@@ -52,6 +55,9 @@ RendererSandboxedProcessLauncherDelegateWin::
+@@ -58,6 +61,9 @@ RendererSandboxedProcessLauncherDelegateWin::
                                                  bool is_jit_disabled)
      : renderer_code_integrity_enabled_(
            GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
@@ -66,7 +66,7 @@ index e8d6ef94664bb37996871c0cc0db7c815783b786..0d56fa0aebee80883019a10090011997
      dynamic_code_can_be_disabled_ = true;
      return;
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
-index 463df70c55df932427c761a67dbc89d7657f9703..d6d8094e31129eb7ca1f0bf36523d48204281795 100644
+index 576a2c0782bf49cb57c973434b5d1f2ec9fdcbc5..24d1854c261372353c9bf69a6cb0cf2d24e9ebef 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index a01f4031ad26c..9239a84e8dd6a 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 0303ae1c4d8681bc1bf56eb9ff1fc13afd678706..7a38e596eededae649e8380ab99c6ce7f472aa77 100644
+index 407f734b77d1ed4876f01327df958847d60e9128..ddfa7cf439244a6d58ab73dea014b341912f503f 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3065,6 +3065,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3026,6 +3026,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 0303ae1c4d8681bc1bf56eb9ff1fc13afd678706..7a38e596eededae649e8380ab99c6ce7
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3075,6 +3082,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3036,6 +3043,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,7 +35,7 @@ index 0303ae1c4d8681bc1bf56eb9ff1fc13afd678706..7a38e596eededae649e8380ab99c6ce7
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index c062c66f596f513e46da04fc9ea5f5969e7ee632..2f14f906b51ce73a69cd780d70ad6264285138ac 100644
+index e82a5b71eb8a6ee2df8478ccd3432b4afbb096aa..d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 064c5466aee67..913a437ac1e98 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index c842bf34f1510071875220c7d81d60300d459b82..18f26143d5b8f6d1aeb4b21ffecd4cdf50081159 100644
+index bb9b9d0ce53ce427075fd92ab1da119c08f6e591..6792e64b2f0f4a5080beb57804f861d8297524d2 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -900,10 +900,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // for the outermost view. Inner `WebContents` will have a
    // `WebContentsViewChildFrame` so when dragging between an inner
    // `WebContents` and its embedder the view IDs will be the same.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index f6c4cbc526fed..1653f6c8f33ce 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index e588b460aa32b4c984d593ed54e10310b59ace9b..2dd0997bc183685cbb0b6f34b4a254af0a09bdd5 100644
+index e612764997277da3411d8040850756eb38996cca..f0341511d7d00f03a52bdead457f1f9d60ac5486 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6223,6 +6223,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6284,6 +6284,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/node/.patches b/patches/node/.patches
index 52db7b54f608f..2c31d38101c8a 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -42,3 +42,4 @@ fix_preserve_proper_method_names_as-is_in_error_stack.patch
 macos_avoid_posix_spawnp_cwd_bug_3597.patch
 src_update_importmoduledynamically.patch
 fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+json_parse_errors_made_user-friendly.patch
diff --git a/patches/node/json_parse_errors_made_user-friendly.patch b/patches/node/json_parse_errors_made_user-friendly.patch
new file mode 100644
index 0000000000000..5fe3fdf8ff49b
--- /dev/null
+++ b/patches/node/json_parse_errors_made_user-friendly.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <jkleinsc@electronjs.org>
+Date: Thu, 26 May 2022 17:08:33 -0400
+Subject: JSON.parse errors made user-friendly
+
+Update tests for  https://chromium-review.googlesource.com/c/v8/v8/+/3513684
+
+diff --git a/test/es-module/test-esm-data-urls.js b/test/es-module/test-esm-data-urls.js
+index 9d0deb70a1568c93ccdecbef59327ecb2a17ae5e..2ab8f2bdcf7cca1437df33668c4177a76b4dc3ca 100644
+--- a/test/es-module/test-esm-data-urls.js
++++ b/test/es-module/test-esm-data-urls.js
+@@ -75,7 +75,7 @@ function createBase64URL(mime, body) {
+       import('data:application/json;foo="test,",0',
+         { assert: { type: 'json' } }), {
+       name: 'SyntaxError',
+-      message: /Unexpected end of JSON input/
++      message: 'data:application/json;foo="test,",0: Unterminated string in JSON at position 3'
+     });
+   }
+   {
+diff --git a/test/es-module/test-esm-invalid-pjson.js b/test/es-module/test-esm-invalid-pjson.js
+index cdbebb17b4bb34421a2f98c384650d495908885c..12247f15dbaddc0e06f1e6aff09faf7a035cf43a 100644
+--- a/test/es-module/test-esm-invalid-pjson.js
++++ b/test/es-module/test-esm-invalid-pjson.js
+@@ -17,11 +17,13 @@ child.stderr.on('data', (data) => {
+ child.on('close', mustCall((code, signal) => {
+   strictEqual(code, 1);
+   strictEqual(signal, null);
++  console.log('STDERR is: ', stderr);
++  console.log('DONE STDERR');
+   ok(
+     stderr.includes(
+       `[ERR_INVALID_PACKAGE_CONFIG]: Invalid package config ${invalidJson} ` +
+       `while importing "invalid-pjson" from ${entry}. ` +
+-      `Unexpected token } in JSON at position ${12 + checkoutEOL.length * 2}`
++      `Expected ':' after property name in JSON at position ${12 + checkoutEOL.length * 2}`
+     ),
+     stderr);
+ }));
diff --git a/patches/squirrel.mac/build_add_gn_config.patch b/patches/squirrel.mac/build_add_gn_config.patch
index 4f6e3a0db339a..d2c9ef6b4d975 100644
--- a/patches/squirrel.mac/build_add_gn_config.patch
+++ b/patches/squirrel.mac/build_add_gn_config.patch
@@ -23,10 +23,10 @@ index 89c499e451ecb48655cfd42b01ffa1da56998c2e..98f80aad43a87ed75ca1660ad6a178db
 +vendor
 diff --git a/BUILD.gn b/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..d43e6d6be5c8e2b3a5f715721e61589be493718d
+index 0000000000000000000000000000000000000000..68beb3d10580cdb747a78407c7f5bbb205825c4b
 --- /dev/null
 +++ b/BUILD.gn
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,242 @@
 +assert(is_mac)
 +
 +import("//build/config/mac/rules.gni")
@@ -148,7 +148,10 @@ index 0000000000000000000000000000000000000000..d43e6d6be5c8e2b3a5f715721e61589b
 +    "$dtrace_header_dir",
 +  ]
 +
-+  cflags_objc = [ "-fobjc-arc" ]
++  cflags_objc = [
++    "-fobjc-arc",
++    "-Wno-deprecated-declarations",
++  ]
 +
 +  ldflags = [ "-Wl,-install_name,@rpath/$output_name.framework/$output_name" ]
 +}
diff --git a/patches/v8/.patches b/patches/v8/.patches
index 4e14f3e14ced3..aa4ed2c39d565 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -8,3 +8,5 @@ fix_build_deprecated_attribute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+allow_disabling_of_v8_sandboxed_pointers.patch
+chore_disable_is_execution_terminating_dcheck.patch
diff --git a/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch b/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
new file mode 100644
index 0000000000000..2c98e2ad7c6d2
--- /dev/null
+++ b/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <jkleinsc@electronjs.org>
+Date: Thu, 26 May 2022 10:45:49 -0400
+Subject: allow disabling of v8 sandboxed pointers
+
+V8 sandboxed pointers are incompatible with Node due to changes like
+https://chromium-review.googlesource.com/c/v8/v8/+/3114136, so for
+now we need a way to disable v8 sandboxed pointers.
+
+diff --git a/BUILD.gn b/BUILD.gn
+index 114cfd757b60c14cfb7a6bc9f9f69765363c9c6c..5e8a6bb2c26c3e5701e628cbf4bfcf9b2eb6b82f 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -501,18 +501,6 @@ if (v8_enable_sandbox == "") {
+       v8_enable_external_code_space
+ }
+ 
+-# Enable sandboxed pointers on desktop when the sandbox is enabled.
+-if (v8_enable_sandbox) {
+-  # When sanitizers are enabled, PartitionAlloc forwards allocations to malloc
+-  # instead of allocating from its Pools and so isn't compatible with the
+-  # sandbox. As such, disable the sandbox there. See https://crbug.com/1323174
+-  if (!is_asan && !is_hwasan && !is_lsan && !is_tsan && !is_msan) {
+-    v8_enable_sandboxed_pointers =
+-        target_os != "fuchsia" && target_os != "android" &&
+-        target_os != "chromeos"
+-  }
+-}
+-
+ # Enable all available sandbox features if sandbox future is enabled.
+ if (v8_enable_sandbox_future) {
+   v8_enable_sandboxed_pointers = true
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 8ee43c0a6de39..aec7148bcd45c 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 44b4f154b416eb9b145d2abe89f3e92d507cea77..8e8e20fcbda71ec98e949d3e5c582b30dfe67e06 100644
+index 744ae6a11ffff47872da4141b3f0e4af5130fff9..31dfdf8a3facd470c3f92c58a5a12566af96521a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -608,7 +608,7 @@ config("internal_config") {
+@@ -620,7 +620,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index 44b4f154b416eb9b145d2abe89f3e92d507cea77..8e8e20fcbda71ec98e949d3e5c582b30
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5876,7 +5876,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5905,7 +5905,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 44b4f154b416eb9b145d2abe89f3e92d507cea77..8e8e20fcbda71ec98e949d3e5c582b30
  
      deps = [
        ":v8_libbase",
-@@ -5914,6 +5914,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5943,6 +5943,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/chore_disable_is_execution_terminating_dcheck.patch b/patches/v8/chore_disable_is_execution_terminating_dcheck.patch
new file mode 100644
index 0000000000000..dc3e18c332412
--- /dev/null
+++ b/patches/v8/chore_disable_is_execution_terminating_dcheck.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Tue, 31 May 2022 19:58:01 +0200
+Subject: chore: disable is_execution_terminating DCHECK
+
+This causes a slew of crashes in Node.js.
+
+Upstream issue opened at https://github.com/nodejs/node-v8/issues/227.
+
+diff --git a/src/api/api-macros.h b/src/api/api-macros.h
+index 149dd0555a69be576fd1eb97aa79b8aedafcac04..233e6d2ac511c4a7fa45d47bb7448beead52faf1 100644
+--- a/src/api/api-macros.h
++++ b/src/api/api-macros.h
+@@ -97,8 +97,6 @@
+ 
+ // Lightweight version for APIs that don't require an active context.
+ #define DCHECK_NO_SCRIPT_NO_EXCEPTION(i_isolate)             \
+-  /* Embedders should never enter V8 after terminating it */ \
+-  DCHECK(!i_isolate->is_execution_terminating());            \
+   DCHECK_NO_SCRIPT_NO_EXCEPTION_MAYBE_TEARDOWN(i_isolate)
+ 
+ #define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate) \
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 0e23dc675bcc3..156ab2298be93 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 6d478369375952e5af9bef922dba900067a79774..4c8bfb25e9fb2f9f9afcc57a61aff003f9db8e77 100644
+index 03bb3f062c5510292c2c983508d284f8cfde5b41..6d0622863ae436dfae6413126884e0f941a3f0b6 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9123,7 +9123,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9168,7 +9168,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index 6d478369375952e5af9bef922dba900067a79774..4c8bfb25e9fb2f9f9afcc57a61aff003
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index a1d4680b02e9d22a3804f88b4249b10986044ade..74369f2e9fc3ecc4cc41a989ecc04cd554417b0b 100644
+index a2a22674d1d50926fefac037f837d0e33d9b5220..214c0ac8d83fc74d40eb00d4d2641f329500e33c 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6230,9 +6230,9 @@ void Heap::TearDown() {
+@@ -6208,9 +6208,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index ef5e00434e88e..70f4cab7eb7fe 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index bf50ab9cf353f67cba37266a8d3ae298afb5a87c..cc2f9cca18e9229ef949183dd876db91e3021318 100644
+index 29ce9b289eb33526abd6a430428b82e9dc8c7027..114cfd757b60c14cfb7a6bc9f9f69765363c9c6c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -608,6 +608,10 @@ config("internal_config") {
+@@ -620,6 +620,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -27,10 +27,10 @@ index bf50ab9cf353f67cba37266a8d3ae298afb5a87c..cc2f9cca18e9229ef949183dd876db91
      defines += [ "BUILDING_V8_SHARED" ]
    }
 diff --git a/src/base/macros.h b/src/base/macros.h
-index 61644ffe0582787578dc3848f87cc8c2a0e88bb7..cd3e11e4ff77a388d2325a015e1a71641a4924a0 100644
+index 3a94093a14b0b3eabfff7063dd87049da56d62bc..641fb6a8d3dd80a23143e7f25bebe03e50681112 100644
 --- a/src/base/macros.h
 +++ b/src/base/macros.h
-@@ -387,13 +387,17 @@ bool is_inbounds(float_t v) {
+@@ -389,13 +389,17 @@ bool is_inbounds(float_t v) {
  #ifdef V8_OS_WIN
  
  // Setup for Windows shared library export.
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index a38ff09275019..c9836854ec41a 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -19,7 +19,7 @@ index 316f870e31f33c990793fdfe7ecb69bb120bb024..5db324b2bf0169657fc6e9dc3b15fa3c
    explicit inline Relocatable(Isolate* isolate);
    inline virtual ~Relocatable();
 diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
-index ec304170542f8a6053c60cbebb22c536cb56ac6c..be8f33d5e8bc2ff388f199dacebd408ccd32dda5 100644
+index 60a6343bb0698902074741c860f3af0f398a85a5..5699fd042e8e3fa19d155de5162a18e24b87f90c 100644
 --- a/src/objects/ordered-hash-table.h
 +++ b/src/objects/ordered-hash-table.h
 @@ -64,7 +64,7 @@ namespace internal {
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 2a2002ed82572..f69f6226168e5 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 8e8e20fcbda71ec98e949d3e5c582b30dfe67e06..bf50ab9cf353f67cba37266a8d3ae298afb5a87c 100644
+index 31dfdf8a3facd470c3f92c58a5a12566af96521a..29ce9b289eb33526abd6a430428b82e9dc8c7027 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5888,7 +5888,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5917,7 +5917,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index 1bd502768257c..b3c635d8135de 100644
--- a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -6,7 +6,7 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..644f921f970d214b4d93b1e4c384e7475740b485 100644
+index 0e5bb1558d096d152fd9388f081c5c9d150a3c7a..6aa16106c088c0a7e590c62eb3d06e0418cb5ebc 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index ee43f87b0374f..04f2010a887b9 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,7 +18,7 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index d1f275afcc7f8c6adcb4c8abf9aea04b6492f38f..2b82b08a6f7cf1b7023bbdb897bfdab6bd48da5e 100644
+index 400d8cb85ea3b45448e79903b05936998b1941b3..2405b99a5badd2ee266459d17d2ec352b4ef71c5 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
 @@ -6170,12 +6170,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
@@ -35,7 +35,7 @@ index d1f275afcc7f8c6adcb4c8abf9aea04b6492f38f..2b82b08a6f7cf1b7023bbdb897bfdab6
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index 123795af961c81278b947c9e8f012158d61c49df..7ac8af40f442025735498651931ab97904af6ecb 100644
+index d49403e9326b85ae4e52e7bc3e232834038fbe09..64f554332b1241aa22f1e292ebf9d0bc667a647a 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
 @@ -2522,7 +2522,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index 5ced839d89dbf..ee905e4f0f881 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index 1edc2bd6cb05ec1000c0cc651ad10ee40a71e1ec..87b7ed6862c8bfa25b63ac0dbd9e97028bbeb17d 100644
+index 2511a0752037939562e861a8f492f6c9496453c6..8762c4dfa25dd17d7f36962410aeb9846593073e 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
 @@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@@ -39,7 +39,7 @@ index 1edc2bd6cb05ec1000c0cc651ad10ee40a71e1ec..87b7ed6862c8bfa25b63ac0dbd9e9702
                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
 diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
-index f9e991a57b3294b0ed786b8a0b3f540d9ab5cd49..3352d8d5f3f1e4971498aafd45b9dbac447a1b4b 100644
+index f12e1ef130451afa1cb334a4ba07bdb2588ccc24..703e4bba9381c57849882e7cb2cdeb751064dd2a 100644
 --- a/src/codegen/arm64/assembler-arm64.h
 +++ b/src/codegen/arm64/assembler-arm64.h
 @@ -2119,11 +2119,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
diff --git a/script/zip_manifests/dist_zip.mac.arm64.manifest b/script/zip_manifests/dist_zip.mac.arm64.manifest
index d09ff34e0e259..26e7b9b957c3c 100644
--- a/script/zip_manifests/dist_zip.mac.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac.arm64.manifest
@@ -19,9 +19,7 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
diff --git a/script/zip_manifests/dist_zip.mac.x64.manifest b/script/zip_manifests/dist_zip.mac.x64.manifest
index a72fbeb79ea64..3e42bf0f614ec 100644
--- a/script/zip_manifests/dist_zip.mac.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac.x64.manifest
@@ -19,9 +19,7 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
index ba4303603e46d..eb63a730528bb 100644
--- a/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.arm64.manifest
@@ -16,9 +16,7 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
diff --git a/script/zip_manifests/dist_zip.mac_mas.x64.manifest b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
index a62f594edae6f..29c698600badb 100644
--- a/script/zip_manifests/dist_zip.mac_mas.x64.manifest
+++ b/script/zip_manifests/dist_zip.mac_mas.x64.manifest
@@ -16,9 +16,7 @@ Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Librari
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/vk_swiftshader_icd.json
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Info.plist
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib
-Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects.nib
+Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/af.lproj/locale.pak
 Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/am.lproj/
diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
index ebe585b88bd46..1c74cee891155 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -108,21 +108,34 @@ class DataPipeReader {
     // Note that the lifetime of the native buffer belongs to us, and we will
     // free memory when JS buffer gets garbage collected.
     v8::HandleScope handle_scope(promise_.isolate());
+#if defined(V8_SANDBOX)
+    v8::Local<v8::Value> buffer =
+        node::Buffer::Copy(promise_.isolate(), &buffer_.front(), buffer_.size())
+            .ToLocalChecked();
+    promise_.Resolve(buffer);
+#else
     v8::Local<v8::Value> buffer =
         node::Buffer::New(promise_.isolate(), &buffer_.front(), buffer_.size(),
                           &DataPipeReader::FreeBuffer, this)
             .ToLocalChecked();
     promise_.Resolve(buffer);
+#endif
 
     // Destroy data pipe.
     handle_watcher_.Cancel();
+#if defined(V8_SANDBOX)
+    delete this;
+#else
     data_pipe_.reset();
     data_pipe_getter_.reset();
+#endif
   }
 
+#if !defined(V8_SANDBOX)
   static void FreeBuffer(char* data, void* self) {
     delete static_cast<DataPipeReader*>(self);
   }
+#endif
 
   gin_helper::Promise<v8::Local<v8::Value>> promise_;
 
diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc
index e3daf615a6172..28a2b8413479e 100644
--- a/shell/browser/api/electron_api_global_shortcut.cc
+++ b/shell/browser/api/electron_api_global_shortcut.cc
@@ -9,7 +9,7 @@
 #include "base/containers/contains.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/extensions/command.h"
+#include "extensions/common/command.h"
 #include "gin/dictionary.h"
 #include "gin/object_template_builder.h"
 #include "shell/browser/api/electron_api_system_preferences.h"
diff --git a/shell/browser/api/electron_api_web_contents_mac.mm b/shell/browser/api/electron_api_web_contents_mac.mm
index b31c1f79b130f..8aa071e9b4335 100644
--- a/shell/browser/api/electron_api_web_contents_mac.mm
+++ b/shell/browser/api/electron_api_web_contents_mac.mm
@@ -54,7 +54,7 @@ - (void)redispatchKeyEvent:(NSEvent*)event;
     return false;
 
   // Send the event to the menu before sending it to the window
-  if (event.os_event.type == NSKeyDown &&
+  if (event.os_event.type == NSEventTypeKeyDown &&
       [[NSApp mainMenu] performKeyEquivalent:event.os_event])
     return true;
 
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 2cbd8065807fd..151fc8d17a758 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -277,9 +277,6 @@ int ElectronBrowserMainParts::PreCreateThreads() {
 #if defined(USE_AURA)
   screen_ = views::CreateDesktopScreen();
   display::Screen::SetScreenInstance(screen_.get());
-#if BUILDFLAG(IS_LINUX)
-  views::LinuxUI::instance()->UpdateDeviceScaleFactor();
-#endif
 #endif
 
   if (!views::LayoutProvider::Get())
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index a4b27a0fee7fd..f41683704d651 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -150,7 +150,7 @@ void ElectronPermissionManager::RequestPermissionWithDetails(
     StatusCallback response_callback) {
   RequestPermissionsWithDetails(
       std::vector<blink::PermissionType>(1, permission), render_frame_host,
-      requesting_origin, user_gesture, details,
+      user_gesture, details,
       base::BindOnce(PermissionRequestResponseCallbackWrapper,
                      std::move(response_callback)));
 }
@@ -161,15 +161,13 @@ void ElectronPermissionManager::RequestPermissions(
     const GURL& requesting_origin,
     bool user_gesture,
     StatusesCallback response_callback) {
-  RequestPermissionsWithDetails(permissions, render_frame_host,
-                                requesting_origin, user_gesture, nullptr,
-                                std::move(response_callback));
+  RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
+                                nullptr, std::move(response_callback));
 }
 
 void ElectronPermissionManager::RequestPermissionsWithDetails(
     const std::vector<blink::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
     bool user_gesture,
     const base::DictionaryValue* details,
     StatusesCallback response_callback) {
@@ -236,6 +234,16 @@ void ElectronPermissionManager::ResetPermission(
     const GURL& requesting_origin,
     const GURL& embedding_origin) {}
 
+void ElectronPermissionManager::RequestPermissionsFromCurrentDocument(
+    const std::vector<blink::PermissionType>& permissions,
+    content::RenderFrameHost* render_frame_host,
+    bool user_gesture,
+    base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)>
+        callback) {
+  RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
+                                nullptr, std::move(callback));
+}
+
 blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
     blink::PermissionType permission,
     const GURL& requesting_origin,
@@ -351,18 +359,6 @@ void ElectronPermissionManager::RevokeDevicePermission(
                                              render_frame_host);
 }
 
-blink::mojom::PermissionStatus
-ElectronPermissionManager::GetPermissionStatusForFrame(
-    blink::PermissionType permission,
-    content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin) {
-  base::DictionaryValue details;
-  bool granted = CheckPermissionWithDetails(permission, render_frame_host,
-                                            requesting_origin, &details);
-  return granted ? blink::mojom::PermissionStatus::GRANTED
-                 : blink::mojom::PermissionStatus::DENIED;
-}
-
 blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
     blink::PermissionType permission,
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index 10b9b820b0609..e2cd6655b8819 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -76,14 +76,10 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
   void RequestPermissionsWithDetails(
       const std::vector<blink::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
       bool user_gesture,
       const base::DictionaryValue* details,
       StatusesCallback callback);
-  blink::mojom::PermissionStatus GetPermissionStatusForFrame(
-      blink::PermissionType permission,
-      content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin) override;
+
   blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
       blink::PermissionType permission,
       content::RenderFrameHost* render_frame_host) override;
@@ -122,6 +118,13 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       blink::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
+  void RequestPermissionsFromCurrentDocument(
+      const std::vector<blink::PermissionType>& permissions,
+      content::RenderFrameHost* render_frame_host,
+      bool user_gesture,
+      base::OnceCallback<
+          void(const std::vector<blink::mojom::PermissionStatus>&)> callback)
+      override;
   blink::mojom::PermissionStatus GetPermissionStatusForWorker(
       blink::PermissionType permission,
       content::RenderProcessHost* render_process_host,
diff --git a/shell/browser/extensions/electron_extensions_browser_client.cc b/shell/browser/extensions/electron_extensions_browser_client.cc
index 30a0935db736b..f286f25a9a5f6 100644
--- a/shell/browser/extensions/electron_extensions_browser_client.cc
+++ b/shell/browser/extensions/electron_extensions_browser_client.cc
@@ -4,6 +4,7 @@
 
 #include "shell/browser/extensions/electron_extensions_browser_client.h"
 
+#include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ -297,7 +298,7 @@ ElectronExtensionsBrowserClient::GetComponentExtensionResourceManager() {
 void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
     extensions::events::HistogramValue histogram_value,
     const std::string& event_name,
-    std::unique_ptr<base::ListValue> args,
+    base::Value::List args,
     bool dispatch_to_off_the_record_profiles) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     content::GetUIThreadTaskRunner({})->PostTask(
@@ -309,8 +310,11 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
     return;
   }
 
-  auto event = std::make_unique<extensions::Event>(
-      histogram_value, event_name, std::move(*args).TakeListDeprecated());
+  std::vector<base::Value> event_args(args.size());
+  std::transform(args.begin(), args.end(), event_args.begin(),
+                 [](const base::Value& arg) { return arg.Clone(); });
+  auto event = std::make_unique<extensions::Event>(histogram_value, event_name,
+                                                   std::move(event_args));
   auto& context_map = ElectronBrowserContext::browser_context_map();
   for (auto const& entry : context_map) {
     if (entry.second) {
diff --git a/shell/browser/extensions/electron_extensions_browser_client.h b/shell/browser/extensions/electron_extensions_browser_client.h
index aaee2bd9845ef..7681112a75d7a 100644
--- a/shell/browser/extensions/electron_extensions_browser_client.h
+++ b/shell/browser/extensions/electron_extensions_browser_client.h
@@ -109,7 +109,7 @@ class ElectronExtensionsBrowserClient
   void BroadcastEventToRenderers(
       extensions::events::HistogramValue histogram_value,
       const std::string& event_name,
-      std::unique_ptr<base::ListValue> args,
+      base::Value::List args,
       bool dispatch_to_off_the_record_profiles) override;
   extensions::ExtensionCache* GetExtensionCache() override;
   bool IsBackgroundUpdateAllowed() override;
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 8b9c46c8d509a..02fe3d272567f 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -73,81 +73,6 @@ struct base::trace_event::TraceValue::Helper<
 
 namespace electron {
 
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
- public:
-  enum InitializationPolicy { kZeroInitialize, kDontInitialize };
-
-  ArrayBufferAllocator() {
-    // Ref.
-    // https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/renderer/platform/wtf/allocator/partitions.cc;l=94;drc=062c315a858a87f834e16a144c2c8e9591af2beb
-    allocator_->init({base::PartitionOptions::AlignedAlloc::kDisallowed,
-                      base::PartitionOptions::ThreadCache::kDisabled,
-                      base::PartitionOptions::Quarantine::kAllowed,
-                      base::PartitionOptions::Cookie::kAllowed,
-                      base::PartitionOptions::BackupRefPtr::kDisabled,
-                      base::PartitionOptions::UseConfigurablePool::kNo});
-  }
-
-  // Allocate() methods return null to signal allocation failure to V8, which
-  // should respond by throwing a RangeError, per
-  // http://www.ecma-international.org/ecma-262/6.0/#sec-createbytedatablock.
-  void* Allocate(size_t size) override {
-    void* result = AllocateMemoryOrNull(size, kZeroInitialize);
-    return result;
-  }
-
-  void* AllocateUninitialized(size_t size) override {
-    void* result = AllocateMemoryOrNull(size, kDontInitialize);
-    return result;
-  }
-
-  void Free(void* data, size_t size) override {
-    allocator_->root()->Free(data);
-  }
-
- private:
-  static void* AllocateMemoryOrNull(size_t size, InitializationPolicy policy) {
-    return AllocateMemoryWithFlags(size, policy,
-                                   partition_alloc::AllocFlags::kReturnNull);
-  }
-
-  static void* AllocateMemoryWithFlags(size_t size,
-                                       InitializationPolicy policy,
-                                       int flags) {
-    // The array buffer contents are sometimes expected to be 16-byte aligned in
-    // order to get the best optimization of SSE, especially in case of audio
-    // and video buffers.  Hence, align the given size up to 16-byte boundary.
-    // Technically speaking, 16-byte aligned size doesn't mean 16-byte aligned
-    // address, but this heuristics works with the current implementation of
-    // PartitionAlloc (and PartitionAlloc doesn't support a better way for now).
-    if (base::kAlignment <
-        16) {  // base::kAlignment is a compile-time constant.
-      size_t aligned_size = base::bits::AlignUp(size, 16);
-      if (size == 0) {
-        aligned_size = 16;
-      }
-      if (aligned_size >= size) {  // Only when no overflow
-        size = aligned_size;
-      }
-    }
-
-    if (policy == kZeroInitialize) {
-      flags |= partition_alloc::AllocFlags::kZeroFill;
-    }
-    void* data = allocator_->root()->AllocWithFlags(flags, size, "Electron");
-    if (base::kAlignment < 16) {
-      char* ptr = reinterpret_cast<char*>(data);
-      DCHECK_EQ(base::bits::AlignUp(ptr, 16), ptr)
-          << "Pointer " << ptr << " not 16B aligned for size " << size;
-    }
-    return data;
-  }
-
-  static base::NoDestructor<base::PartitionAllocator> allocator_;
-};
-
-base::NoDestructor<base::PartitionAllocator> ArrayBufferAllocator::allocator_{};
-
 JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
     : isolate_(Initialize(event_loop)),
       isolate_holder_(base::ThreadTaskRunnerHandle::Get(),
@@ -341,11 +266,12 @@ v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
       tracing_controller, gin::V8Platform::PageAllocator());
 
   v8::V8::InitializePlatform(platform_);
-  gin::IsolateHolder::Initialize(
-      gin::IsolateHolder::kNonStrictMode, new ArrayBufferAllocator(),
-      nullptr /* external_reference_table */, js_flags,
-      nullptr /* fatal_error_callback */, nullptr /* oom_error_callback */,
-      false /* create_v8_platform */);
+  gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
+                                 gin::ArrayBufferAllocator::SharedInstance(),
+                                 nullptr /* external_reference_table */,
+                                 js_flags, nullptr /* fatal_error_callback */,
+                                 nullptr /* oom_error_callback */,
+                                 false /* create_v8_platform */);
 
   v8::Isolate* isolate = v8::Isolate::Allocate();
   platform_->RegisterIsolate(isolate, event_loop);
diff --git a/shell/browser/media/media_capture_devices_dispatcher.cc b/shell/browser/media/media_capture_devices_dispatcher.cc
index 84a2ad677551c..33ad8ebe0d6b1 100644
--- a/shell/browser/media/media_capture_devices_dispatcher.cc
+++ b/shell/browser/media/media_capture_devices_dispatcher.cc
@@ -60,20 +60,20 @@ MediaCaptureDevicesDispatcher::GetVideoCaptureDevices() {
 void MediaCaptureDevicesDispatcher::GetDefaultDevices(
     bool audio,
     bool video,
-    blink::MediaStreamDevices* devices) {
+    blink::mojom::StreamDevices& devices) {  // NOLINT(runtime/references)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(audio || video);
 
   if (audio) {
     const blink::MediaStreamDevice* device = GetFirstAvailableAudioDevice();
     if (device)
-      devices->push_back(*device);
+      devices.audio_device = *device;
   }
 
   if (video) {
     const blink::MediaStreamDevice* device = GetFirstAvailableVideoDevice();
     if (device)
-      devices->push_back(*device);
+      devices.video_device = *device;
   }
 }
 
diff --git a/shell/browser/media/media_capture_devices_dispatcher.h b/shell/browser/media/media_capture_devices_dispatcher.h
index d7b0957e09f40..6b9dd746c633e 100644
--- a/shell/browser/media/media_capture_devices_dispatcher.h
+++ b/shell/browser/media/media_capture_devices_dispatcher.h
@@ -11,6 +11,7 @@
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/media_stream_request.h"
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
+#include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h"
 
 namespace electron {
 
@@ -29,9 +30,10 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
   // If the return list is empty, it means there is no available device on the
   // OS.
   // Called on the UI thread.
-  void GetDefaultDevices(bool audio,
-                         bool video,
-                         blink::MediaStreamDevices* devices);
+  void GetDefaultDevices(
+      bool audio,
+      bool video,
+      blink::mojom::StreamDevices& devices);  // NOLINT(runtime/references)
 
   // Helpers for picking particular requested devices, identified by raw id.
   // If the device requested is not available it will return NULL.
diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc
index 38a4e03153b80..c74f0c9ccfb61 100644
--- a/shell/browser/media/media_stream_devices_controller.cc
+++ b/shell/browser/media/media_stream_devices_controller.cc
@@ -45,7 +45,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
 MediaStreamDevicesController::~MediaStreamDevicesController() {
   if (!callback_.is_null()) {
     std::move(callback_).Run(
-        blink::MediaStreamDevices(),
+        blink::mojom::StreamDevices(),
         blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN,
         std::unique_ptr<content::MediaStreamUI>());
   }
@@ -77,7 +77,7 @@ bool MediaStreamDevicesController::TakeAction() {
 
 void MediaStreamDevicesController::Accept() {
   // Get the default devices for the request.
-  blink::MediaStreamDevices devices;
+  blink::mojom::StreamDevices stream_devices;
   if (microphone_requested_ || webcam_requested_) {
     switch (request_.request_type) {
       case blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY: {
@@ -94,6 +94,8 @@ void MediaStreamDevicesController::Accept() {
             device = MediaCaptureDevicesDispatcher::GetInstance()
                          ->GetFirstAvailableAudioDevice();
           }
+          if (device)
+            stream_devices.audio_device = *device;
         } else if (request_.video_type ==
                    blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
           // Pepper API opens only one device at a time.
@@ -105,9 +107,9 @@ void MediaStreamDevicesController::Accept() {
             device = MediaCaptureDevicesDispatcher::GetInstance()
                          ->GetFirstAvailableVideoDevice();
           }
+          if (device)
+            stream_devices.video_device = *device;
         }
-        if (device)
-          devices.push_back(*device);
         break;
       }
       case blink::MEDIA_GENERATE_STREAM: {
@@ -120,7 +122,7 @@ void MediaStreamDevicesController::Accept() {
               MediaCaptureDevicesDispatcher::GetInstance()
                   ->GetRequestedAudioDevice(request_.requested_audio_device_id);
           if (audio_device) {
-            devices.push_back(*audio_device);
+            stream_devices.audio_device = *audio_device;
             needs_audio_device = false;
           }
         }
@@ -129,7 +131,7 @@ void MediaStreamDevicesController::Accept() {
               MediaCaptureDevicesDispatcher::GetInstance()
                   ->GetRequestedVideoDevice(request_.requested_video_device_id);
           if (video_device) {
-            devices.push_back(*video_device);
+            stream_devices.video_device = *video_device;
             needs_video_device = false;
           }
         }
@@ -138,14 +140,14 @@ void MediaStreamDevicesController::Accept() {
         // specified by id, get the default devices.
         if (needs_audio_device || needs_video_device) {
           MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
-              needs_audio_device, needs_video_device, &devices);
+              needs_audio_device, needs_video_device, stream_devices);
         }
         break;
       }
       case blink::MEDIA_DEVICE_ACCESS: {
         // Get the default devices for the request.
         MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
-            microphone_requested_, webcam_requested_, &devices);
+            microphone_requested_, webcam_requested_, stream_devices);
         break;
       }
       case blink::MEDIA_DEVICE_UPDATE: {
@@ -154,40 +156,41 @@ void MediaStreamDevicesController::Accept() {
       }
       case blink::MEDIA_GET_OPEN_DEVICE: {
         // Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do
-        // not need to get permissions for MediaStreamDevice as those are
-        // controlled by the original context.
+        // not need to get permissions for blink::mojom::StreamDevices as those
+        // are controlled by the original context.
         NOTREACHED();
         break;
       }
     }
   }
 
-  std::move(callback_).Run(devices, blink::mojom::MediaStreamRequestResult::OK,
+  std::move(callback_).Run(stream_devices,
+                           blink::mojom::MediaStreamRequestResult::OK,
                            std::unique_ptr<content::MediaStreamUI>());
 }
 
 void MediaStreamDevicesController::Deny(
     blink::mojom::MediaStreamRequestResult result) {
-  std::move(callback_).Run(blink::MediaStreamDevices(), result,
+  std::move(callback_).Run(blink::mojom::StreamDevices(), result,
                            std::unique_ptr<content::MediaStreamUI>());
 }
 
 void MediaStreamDevicesController::HandleUserMediaRequest() {
-  blink::MediaStreamDevices devices;
+  blink::mojom::StreamDevices devices;
 
   if (request_.audio_type ==
       blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
-    devices.emplace_back(blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE,
-                         "", "");
+    devices.audio_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE, "", "");
   }
   if (request_.video_type ==
       blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
-    devices.emplace_back(blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE,
-                         "", "");
+    devices.video_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE, "", "");
   }
   if (request_.audio_type ==
       blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE) {
-    devices.emplace_back(
+    devices.audio_device = blink::MediaStreamDevice(
         blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE, "loopback",
         "System Audio");
   }
@@ -204,15 +207,17 @@ void MediaStreamDevicesController::HandleUserMediaRequest() {
           content::DesktopMediaID::Parse(request_.requested_video_device_id);
     }
 
-    devices.emplace_back(
+    devices.video_device = blink::MediaStreamDevice(
         blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE,
         screen_id.ToString(), "Screen");
   }
 
+  bool empty =
+      !devices.audio_device.has_value() && !devices.video_device.has_value();
   std::move(callback_).Run(
       devices,
-      devices.empty() ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
-                      : blink::mojom::MediaStreamRequestResult::OK,
+      empty ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
+            : blink::mojom::MediaStreamRequestResult::OK,
       std::unique_ptr<content::MediaStreamUI>());
 }
 
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index d236ca72aa1a5..1563a7b2cf09c 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -302,13 +302,13 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     styleMask = 0;
 
   if (minimizable)
-    styleMask |= NSMiniaturizableWindowMask;
+    styleMask |= NSWindowStyleMaskMiniaturizable;
   if (closable)
     styleMask |= NSWindowStyleMaskClosable;
   if (resizable)
-    styleMask |= NSResizableWindowMask;
+    styleMask |= NSWindowStyleMaskResizable;
   if (!useStandardWindow || transparent() || !has_frame())
-    styleMask |= NSTexturedBackgroundWindowMask;
+    styleMask |= NSWindowStyleMaskTexturedBackground;
 
   // Create views::Widget and assign window_ with it.
   // TODO(zcbenz): Get rid of the window_ in future.
@@ -841,11 +841,11 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::SetMinimizable(bool minimizable) {
-  SetStyleMask(minimizable, NSMiniaturizableWindowMask);
+  SetStyleMask(minimizable, NSWindowStyleMaskMiniaturizable);
 }
 
 bool NativeWindowMac::IsMinimizable() {
-  return [window_ styleMask] & NSMiniaturizableWindowMask;
+  return [window_ styleMask] & NSWindowStyleMaskMiniaturizable;
 }
 
 void NativeWindowMac::SetMaximizable(bool maximizable) {
@@ -901,9 +901,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     level = NSPopUpMenuWindowLevel;
   } else if (level_name == "screen-saver") {
     level = NSScreenSaverWindowLevel;
-  } else if (level_name == "dock") {
-    // Deprecated by macOS, but kept for backwards compatibility
-    level = NSDockWindowLevel;
   }
 
   SetWindowLevel(level + relative_level);
@@ -927,8 +924,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     level_name = "pop-up-menu";
   } else if (level == NSScreenSaverWindowLevel) {
     level_name = "screen-saver";
-  } else if (level == NSDockWindowLevel) {
-    level_name = "dock";
   }
 
   return level_name;
diff --git a/shell/browser/net/asar/asar_url_loader.cc b/shell/browser/net/asar/asar_url_loader.cc
index 684aadc0897fc..eadfc5af789a7 100644
--- a/shell/browser/net/asar/asar_url_loader.cc
+++ b/shell/browser/net/asar/asar_url_loader.cc
@@ -269,9 +269,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
       head->headers->AddHeader(net::HttpRequestHeaders::kContentType,
                                head->mime_type.c_str());
     }
-    client_->OnReceiveResponse(std::move(head),
-                               mojo::ScopedDataPipeConsumerHandle());
-    client_->OnStartLoadingResponseBody(std::move(consumer_handle));
+    client_->OnReceiveResponse(std::move(head), std::move(consumer_handle));
 
     if (total_bytes_to_send == 0) {
       // There's definitely no more data, so we're already done.
diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc
index eb7b97952fcd0..02a93aae14bcb 100644
--- a/shell/browser/net/electron_url_loader_factory.cc
+++ b/shell/browser/net/electron_url_loader_factory.cc
@@ -554,13 +554,6 @@ void ElectronURLLoaderFactory::StartLoadingStream(
   } else if (stream->IsNullOrUndefined()) {
     mojo::Remote<network::mojom::URLLoaderClient> client_remote(
         std::move(client));
-    // "data" was explicitly passed as null or undefined, assume the user wants
-    // to send an empty body.
-    //
-    // Note that We must submit a empty body otherwise NetworkService would
-    // crash.
-    client_remote->OnReceiveResponse(std::move(head),
-                                     mojo::ScopedDataPipeConsumerHandle());
     mojo::ScopedDataPipeProducerHandle producer;
     mojo::ScopedDataPipeConsumerHandle consumer;
     if (mojo::CreateDataPipe(nullptr, producer, consumer) != MOJO_RESULT_OK) {
@@ -568,8 +561,13 @@ void ElectronURLLoaderFactory::StartLoadingStream(
           network::URLLoaderCompletionStatus(net::ERR_INSUFFICIENT_RESOURCES));
       return;
     }
+    // "data" was explicitly passed as null or undefined, assume the user wants
+    // to send an empty body.
+    //
+    // Note that We must submit a empty body otherwise NetworkService would
+    // crash.
+    client_remote->OnReceiveResponse(std::move(head), std::move(consumer));
     producer.reset();  // The data pipe is empty.
-    client_remote->OnStartLoadingResponseBody(std::move(consumer));
     client_remote->OnComplete(network::URLLoaderCompletionStatus(net::OK));
     return;
   } else if (!stream->IsObject()) {
@@ -605,8 +603,6 @@ void ElectronURLLoaderFactory::SendContents(
 
   // Add header to ignore CORS.
   head->headers->AddHeader("Access-Control-Allow-Origin", "*");
-  client_remote->OnReceiveResponse(std::move(head),
-                                   mojo::ScopedDataPipeConsumerHandle());
 
   // Code below follows the pattern of data_url_loader_factory.cc.
   mojo::ScopedDataPipeProducerHandle producer;
@@ -617,7 +613,7 @@ void ElectronURLLoaderFactory::SendContents(
     return;
   }
 
-  client_remote->OnStartLoadingResponseBody(std::move(consumer));
+  client_remote->OnReceiveResponse(std::move(head), std::move(consumer));
 
   auto write_data = std::make_unique<WriteData>();
   write_data->client = std::move(client_remote);
diff --git a/shell/browser/net/node_stream_loader.cc b/shell/browser/net/node_stream_loader.cc
index 74ec0e0f295f7..2cd93a2d63d1d 100644
--- a/shell/browser/net/node_stream_loader.cc
+++ b/shell/browser/net/node_stream_loader.cc
@@ -58,9 +58,7 @@ void NodeStreamLoader::Start(network::mojom::URLResponseHeadPtr head) {
   }
 
   producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
-  client_->OnReceiveResponse(std::move(head),
-                             mojo::ScopedDataPipeConsumerHandle());
-  client_->OnStartLoadingResponseBody(std::move(consumer));
+  client_->OnReceiveResponse(std::move(head), std::move(consumer));
 
   auto weak = weak_factory_.GetWeakPtr();
   On("end",
diff --git a/shell/browser/net/proxying_url_loader_factory.cc b/shell/browser/net/proxying_url_loader_factory.cc
index 3cb8a384fdad4..49b728631a059 100644
--- a/shell/browser/net/proxying_url_loader_factory.cc
+++ b/shell/browser/net/proxying_url_loader_factory.cc
@@ -300,11 +300,6 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnTransferSizeUpdated(
   target_client_->OnTransferSizeUpdated(transfer_size_diff);
 }
 
-void ProxyingURLLoaderFactory::InProgressRequest::OnStartLoadingResponseBody(
-    mojo::ScopedDataPipeConsumerHandle body) {
-  target_client_->OnStartLoadingResponseBody(std::move(body));
-}
-
 void ProxyingURLLoaderFactory::InProgressRequest::OnComplete(
     const network::URLLoaderCompletionStatus& status) {
   if (status.error_code != net::OK) {
diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h
index f4456a0ee0f67..edee0a3ee31a1 100644
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -97,8 +97,6 @@ class ProxyingURLLoaderFactory
                           OnUploadProgressCallback callback) override;
     void OnReceiveCachedMetadata(mojo_base::BigBuffer data) override;
     void OnTransferSizeUpdated(int32_t transfer_size_diff) override;
-    void OnStartLoadingResponseBody(
-        mojo::ScopedDataPipeConsumerHandle body) override;
     void OnComplete(const network::URLLoaderCompletionStatus& status) override;
 
     void OnLoaderCreated(
diff --git a/shell/browser/net/url_pipe_loader.cc b/shell/browser/net/url_pipe_loader.cc
index b55dc3963dcfb..63895e6e3d03d 100644
--- a/shell/browser/net/url_pipe_loader.cc
+++ b/shell/browser/net/url_pipe_loader.cc
@@ -70,9 +70,7 @@ void URLPipeLoader::OnResponseStarted(
 
   producer_ = std::make_unique<mojo::DataPipeProducer>(std::move(producer));
 
-  client_->OnReceiveResponse(response_head.Clone(),
-                             mojo::ScopedDataPipeConsumerHandle());
-  client_->OnStartLoadingResponseBody(std::move(consumer));
+  client_->OnReceiveResponse(response_head.Clone(), std::move(consumer));
 }
 
 void URLPipeLoader::OnWrite(base::OnceClosure resume, MojoResult result) {
diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc
index 82ff89a30dbf5..fbf72675bb5a8 100644
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -82,19 +82,19 @@ ui::MouseEvent UiMouseEventFromWebMouseEvent(blink::WebMouseEvent event) {
   int button_flags = 0;
   switch (event.button) {
     case blink::WebMouseEvent::Button::kBack:
-      button_flags |= ui::EventFlags::EF_BACK_MOUSE_BUTTON;
+      button_flags |= ui::EF_BACK_MOUSE_BUTTON;
       break;
     case blink::WebMouseEvent::Button::kForward:
-      button_flags |= ui::EventFlags::EF_FORWARD_MOUSE_BUTTON;
+      button_flags |= ui::EF_FORWARD_MOUSE_BUTTON;
       break;
     case blink::WebMouseEvent::Button::kLeft:
-      button_flags |= ui::EventFlags::EF_LEFT_MOUSE_BUTTON;
+      button_flags |= ui::EF_LEFT_MOUSE_BUTTON;
       break;
     case blink::WebMouseEvent::Button::kMiddle:
-      button_flags |= ui::EventFlags::EF_MIDDLE_MOUSE_BUTTON;
+      button_flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
       break;
     case blink::WebMouseEvent::Button::kRight:
-      button_flags |= ui::EventFlags::EF_RIGHT_MOUSE_BUTTON;
+      button_flags |= ui::EF_RIGHT_MOUSE_BUTTON;
       break;
     default:
       button_flags = 0;
diff --git a/shell/browser/osr/osr_web_contents_view_mac.mm b/shell/browser/osr/osr_web_contents_view_mac.mm
index 691b1d52e427b..919bec712feb3 100644
--- a/shell/browser/osr/osr_web_contents_view_mac.mm
+++ b/shell/browser/osr/osr_web_contents_view_mac.mm
@@ -15,7 +15,7 @@ - (void)drawRect:(NSRect)dirtyRect {
   NSString* str = @"No content under offscreen mode";
   NSMutableParagraphStyle* paragraphStyle =
       [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] autorelease];
-  [paragraphStyle setAlignment:NSCenterTextAlignment];
+  [paragraphStyle setAlignment:NSTextAlignmentCenter];
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:paragraphStyle
                                   forKey:NSParagraphStyleAttributeName];
diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc
index d1ba8734d368b..57a169a5f39bb 100644
--- a/shell/browser/printing/print_preview_message_handler.cc
+++ b/shell/browser/printing/print_preview_message_handler.cc
@@ -226,7 +226,7 @@ void PrintPreviewMessageHandler::PrintToPDF(
     print_render_frame_->SetPrintPreviewUI(
         receiver_.BindNewEndpointAndPassRemote());
   }
-  print_render_frame_->PrintPreview(options.Clone());
+  print_render_frame_->PrintPreview(options.GetDict().Clone());
 }
 
 gin_helper::Promise<v8::Local<v8::Value>>
diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
index 3f86dca5158e5..d223c823ca297 100644
--- a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
+++ b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
@@ -176,8 +176,9 @@ - (void)setIsDocked:(BOOL)docked activate:(BOOL)activate {
   auto devToolsView = devToolsWebContents->GetNativeView().GetNativeNSView();
   if (!docked) {
     auto styleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
-                     NSMiniaturizableWindowMask | NSWindowStyleMaskResizable |
-                     NSTexturedBackgroundWindowMask |
+                     NSWindowStyleMaskMiniaturizable |
+                     NSWindowStyleMaskResizable |
+                     NSWindowStyleMaskTexturedBackground |
                      NSWindowStyleMaskUnifiedTitleAndToolbar;
     devtools_window_.reset([[EventDispatchingWindow alloc]
         initWithContentRect:NSMakeRect(0, 0, 800, 600)
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 9d5633a0f95b8..2467be47424f4 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -70,7 +70,7 @@ - (NSRect)windowWillUseStandardFrame:(NSWindow*)window
   }
 
   // If the shift key is down, maximize.
-  if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask)
+  if ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagShift)
     return frame;
 
   // Get preferred width from observers. Usually the page width.
diff --git a/shell/browser/ui/cocoa/event_dispatching_window.mm b/shell/browser/ui/cocoa/event_dispatching_window.mm
index b98e547730473..16273b6c4a3a0 100644
--- a/shell/browser/ui/cocoa/event_dispatching_window.mm
+++ b/shell/browser/ui/cocoa/event_dispatching_window.mm
@@ -20,8 +20,8 @@ - (BOOL)performKeyEquivalent:(NSEvent*)event {
 
 - (void)redispatchKeyEvent:(NSEvent*)event {
   NSEventType eventType = [event type];
-  if (eventType != NSKeyDown && eventType != NSKeyUp &&
-      eventType != NSFlagsChanged) {
+  if (eventType != NSEventTypeKeyDown && eventType != NSEventTypeKeyUp &&
+      eventType != NSEventTypeFlagsChanged) {
     return;
   }
 
diff --git a/shell/browser/ui/drag_util_mac.mm b/shell/browser/ui/drag_util_mac.mm
index 811a0c8d103b1..85dc09d64dc67 100644
--- a/shell/browser/ui/drag_util_mac.mm
+++ b/shell/browser/ui/drag_util_mac.mm
@@ -30,7 +30,8 @@ void AddFilesToPasteboard(NSPasteboard* pasteboard,
 void DragFileItems(const std::vector<base::FilePath>& files,
                    const gfx::Image& icon,
                    gfx::NativeView view) {
-  NSPasteboard* pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+  NSPasteboard* pasteboard =
+      [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
   AddFilesToPasteboard(pasteboard, files);
 
   // Synthesize a drag event, since we don't have access to the actual event
@@ -38,9 +39,9 @@ void DragFileItems(const std::vector<base::FilePath>& files,
   NSWindow* window = [view.GetNativeNSView() window];
   NSPoint position = [window mouseLocationOutsideOfEventStream];
   NSTimeInterval eventTime = [[NSApp currentEvent] timestamp];
-  NSEvent* dragEvent = [NSEvent mouseEventWithType:NSLeftMouseDragged
+  NSEvent* dragEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
                                           location:position
-                                     modifierFlags:NSLeftMouseDraggedMask
+                                     modifierFlags:NSEventMaskLeftMouseDragged
                                          timestamp:eventTime
                                       windowNumber:[window windowNumber]
                                            context:nil
diff --git a/shell/browser/ui/file_dialog_mac.mm b/shell/browser/ui/file_dialog_mac.mm
index 00c88c9bfe84a..fa7cfa424ef07 100644
--- a/shell/browser/ui/file_dialog_mac.mm
+++ b/shell/browser/ui/file_dialog_mac.mm
@@ -232,7 +232,7 @@ void SetupSaveDialogForProperties(NSSavePanel* dialog, int properties) {
 
 // Run modal dialog with parent window and return user's choice.
 int RunModalDialog(NSSavePanel* dialog, const DialogSettings& settings) {
-  __block int chosen = NSFileHandlingPanelCancelButton;
+  __block int chosen = NSModalResponseCancel;
   if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
       settings.force_detached) {
     chosen = [dialog runModal];
@@ -324,7 +324,7 @@ bool ShowOpenDialogSync(const DialogSettings& settings,
   SetupOpenDialogForProperties(dialog, settings.properties);
 
   int chosen = RunModalDialog(dialog, settings);
-  if (chosen == NSFileHandlingPanelCancelButton)
+  if (chosen == NSModalResponseCancel)
     return false;
 
   ReadDialogPaths(dialog, paths);
@@ -337,7 +337,7 @@ void OpenDialogCompletion(int chosen,
                           gin_helper::Promise<gin_helper::Dictionary> promise) {
   v8::HandleScope scope(promise.isolate());
   gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(promise.isolate());
-  if (chosen == NSFileHandlingPanelCancelButton) {
+  if (chosen == NSModalResponseCancel) {
     dict.Set("canceled", true);
     dict.Set("filePaths", std::vector<base::FilePath>());
 #if defined(MAS_BUILD)
@@ -402,7 +402,7 @@ bool ShowSaveDialogSync(const DialogSettings& settings, base::FilePath* path) {
   SetupSaveDialogForProperties(dialog, settings.properties);
 
   int chosen = RunModalDialog(dialog, settings);
-  if (chosen == NSFileHandlingPanelCancelButton || ![[dialog URL] isFileURL])
+  if (chosen == NSModalResponseCancel || ![[dialog URL] isFileURL])
     return false;
 
   *path = base::FilePath(base::SysNSStringToUTF8([[dialog URL] path]));
@@ -415,7 +415,7 @@ void SaveDialogCompletion(int chosen,
                           gin_helper::Promise<gin_helper::Dictionary> promise) {
   v8::HandleScope scope(promise.isolate());
   gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(promise.isolate());
-  if (chosen == NSFileHandlingPanelCancelButton) {
+  if (chosen == NSModalResponseCancel) {
     dict.Set("canceled", true);
     dict.Set("filePath", base::FilePath());
 #if defined(MAS_BUILD)
diff --git a/shell/browser/ui/message_box_mac.mm b/shell/browser/ui/message_box_mac.mm
index 7af541819db5d..9ab03a0472eae 100644
--- a/shell/browser/ui/message_box_mac.mm
+++ b/shell/browser/ui/message_box_mac.mm
@@ -45,14 +45,14 @@
 
   switch (settings.type) {
     case MessageBoxType::kInformation:
-      alert.alertStyle = NSInformationalAlertStyle;
+      alert.alertStyle = NSAlertStyleInformational;
       break;
     case MessageBoxType::kWarning:
     case MessageBoxType::kError:
-      // NSWarningAlertStyle shows the app icon while NSCriticalAlertStyle
+      // NSWarningAlertStyle shows the app icon while NSAlertStyleCritical
       // shows a warning icon with an app icon badge. Since there is no
-      // error variant, lets just use NSCriticalAlertStyle.
-      alert.alertStyle = NSCriticalAlertStyle;
+      // error variant, lets just use NSAlertStyleCritical.
+      alert.alertStyle = NSAlertStyleCritical;
       break;
     default:
       break;
@@ -198,7 +198,7 @@ void ShowErrorBox(const std::u16string& title, const std::u16string& content) {
   NSAlert* alert = [[NSAlert alloc] init];
   [alert setMessageText:base::SysUTF16ToNSString(title)];
   [alert setInformativeText:base::SysUTF16ToNSString(content)];
-  [alert setAlertStyle:NSCriticalAlertStyle];
+  [alert setAlertStyle:NSAlertStyleCritical];
   [alert runModal];
   [alert release];
 }
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
index a5e8067968583..2a085d04d6af5 100644
--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -31,6 +31,7 @@
 #include "ui/views/style/typography.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/frame_buttons.h"
+#include "ui/views/window/window_button_order_provider.h"
 
 namespace electron {
 
@@ -83,11 +84,16 @@ ClientFrameViewLinux::ClientFrameViewLinux()
   AddChildView(title_);
 
   native_theme_observer_.Observe(theme_);
-  window_button_order_observer_.Observe(views::LinuxUI::instance());
+
+  if (views::LinuxUI* ui = views::LinuxUI::instance()) {
+    ui->AddWindowButtonOrderObserver(this);
+    OnWindowButtonOrderingChange();
+  }
 }
 
 ClientFrameViewLinux::~ClientFrameViewLinux() {
-  views::LinuxUI::instance()->RemoveWindowButtonOrderObserver(this);
+  if (views::LinuxUI* ui = views::LinuxUI::instance())
+    ui->RemoveWindowButtonOrderObserver(this);
   theme_->RemoveObserver(this);
 }
 
@@ -159,11 +165,10 @@ void ClientFrameViewLinux::OnNativeThemeUpdated(
   UpdateThemeValues();
 }
 
-void ClientFrameViewLinux::OnWindowButtonOrderingChange(
-    const std::vector<views::FrameButton>& leading_buttons,
-    const std::vector<views::FrameButton>& trailing_buttons) {
-  leading_frame_buttons_ = leading_buttons;
-  trailing_frame_buttons_ = trailing_buttons;
+void ClientFrameViewLinux::OnWindowButtonOrderingChange() {
+  auto* provider = views::WindowButtonOrderProvider::GetInstance();
+  leading_frame_buttons_ = provider->leading_buttons();
+  trailing_frame_buttons_ = provider->trailing_buttons();
 
   InvalidateLayout();
 }
diff --git a/shell/browser/ui/views/client_frame_view_linux.h b/shell/browser/ui/views/client_frame_view_linux.h
index 404c0e6b7db91..360b11b3ed163 100644
--- a/shell/browser/ui/views/client_frame_view_linux.h
+++ b/shell/browser/ui/views/client_frame_view_linux.h
@@ -45,9 +45,7 @@ class ClientFrameViewLinux : public FramelessView,
   void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
 
   // views::WindowButtonOrderObserver:
-  void OnWindowButtonOrderingChange(
-      const std::vector<views::FrameButton>& leading_buttons,
-      const std::vector<views::FrameButton>& trailing_buttons) override;
+  void OnWindowButtonOrderingChange() override;
 
   // Overriden from FramelessView:
   int ResizingBorderHitTest(const gfx::Point& point) override;
diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index 0dbda357a755c..7fffb3c08a0a1 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -271,9 +271,11 @@ std::string NativeImage::ToDataURL(gin::Arguments* args) {
       image_.AsImageSkia().GetRepresentation(scale_factor).GetBitmap());
 }
 
+#if !defined(V8_SANDBOX)
 void SkUnref(char* data, void* hint) {
   reinterpret_cast<SkRefCnt*>(hint)->unref();
 }
+#endif
 
 v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
   float scale_factor = GetScaleFactorFromOptions(args);
@@ -283,11 +285,18 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
   SkPixelRef* ref = bitmap.pixelRef();
   if (!ref)
     return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
+#if defined(V8_SANDBOX)
+  return node::Buffer::Copy(args->isolate(),
+                            reinterpret_cast<char*>(ref->pixels()),
+                            bitmap.computeByteSize())
+      .ToLocalChecked();
+#else
   ref->ref();
   return node::Buffer::New(args->isolate(),
                            reinterpret_cast<char*>(ref->pixels()),
                            bitmap.computeByteSize(), &SkUnref, ref)
       .ToLocalChecked();
+#endif
 }
 
 v8::Local<v8::Value> NativeImage::GetNativeHandle(
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index 53a637bf86f60..15c3cf8206031 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -216,7 +216,8 @@ describe('session module', () => {
       });
     });
 
-    it('should survive an app restart for persistent partition', async () => {
+    it('should survive an app restart for persistent partition', async function () {
+      this.timeout(60000);
       const appPath = path.join(fixtures, 'api', 'cookie-app');
 
       const runAppWithPhase = (phase: string) => {
diff --git a/spec/fixtures/api/cookie-app/main.js b/spec/fixtures/api/cookie-app/main.js
index dc10bb8c5dcb4..db762f632257e 100644
--- a/spec/fixtures/api/cookie-app/main.js
+++ b/spec/fixtures/api/cookie-app/main.js
@@ -10,7 +10,7 @@ app.whenReady().then(async function () {
     url,
     name,
     value,
-    expirationDate: Date.now() + 60000,
+    expirationDate: Math.floor((Date.now() + 60000) / 1000),
     sameSite: 'strict'
   });
 

From df91dd6d2b9ec3fafdf3dbe83ecbd5c663984b45 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 06:02:01 -0700
Subject: [PATCH 435/811] Bump v21.0.0-nightly.20220601

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7085745b647a1..f732489a7a489 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220531
\ No newline at end of file
+21.0.0-nightly.20220601
\ No newline at end of file
diff --git a/package.json b/package.json
index 23f3239067292..ea8b5047517ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220531",
+  "version": "21.0.0-nightly.20220601",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2ab0cf4c6a7f6..11975cee4f07e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220531
- PRODUCTVERSION 21,0,0,20220531
+ FILEVERSION 21,0,0,20220601
+ PRODUCTVERSION 21,0,0,20220601
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From cda8f3c15cac770142025cc3818ab8f069468aa1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 08:28:12 -0700
Subject: [PATCH 436/811] Revert "Bump v21.0.0-nightly.20220601"

This reverts commit df91dd6d2b9ec3fafdf3dbe83ecbd5c663984b45.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f732489a7a489..7085745b647a1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220601
\ No newline at end of file
+21.0.0-nightly.20220531
\ No newline at end of file
diff --git a/package.json b/package.json
index ea8b5047517ee..23f3239067292 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220601",
+  "version": "21.0.0-nightly.20220531",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 11975cee4f07e..2ab0cf4c6a7f6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220601
- PRODUCTVERSION 21,0,0,20220601
+ FILEVERSION 21,0,0,20220531
+ PRODUCTVERSION 21,0,0,20220531
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a38e5d20ff0ffa9cd2875e95755b1ce4be0ebb83 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Wed, 1 Jun 2022 12:59:26 -0400
Subject: [PATCH 437/811] ci: cache python install to better deal with download
 errors. (#34360)

* ci: cache python install to better deal with download errors.

* chore: use our CDN to download python2

* build: DRY up the python install steps

Co-authored-by: Samuel Attard <sattard@salesforce.com>
---
 .circleci/config/base.yml | 40 +++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index a579069c96e93..c37b1ecd67a0a 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -527,15 +527,6 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
         ln -fs /usr/local/bin/gtar /usr/local/bin/tar
       fi
 
-step-install-python2-on-mac: &step-install-python2-on-mac
-  run:
-    name: Install python2 on macos
-    command: |
-      if [ "`uname`" == "Darwin" ]; then
-        curl -O https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg
-        sudo installer -pkg python-2.7.18-macosx10.9.pkg -target /
-      fi
-
 step-gn-gen-default: &step-gn-gen-default
   run:
     name: Default GN gen
@@ -1011,7 +1002,7 @@ steps-electron-gn-check: &steps-electron-gn-check
     - *step-checkout-electron
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
-    - *step-install-python2-on-mac
+    - install-python2-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
     - *step-generate-deps-hash
@@ -1130,6 +1121,31 @@ steps-test-node: &steps-test-node
 
 # Command Aliases
 commands:
+  install-python2-mac:
+    steps:
+      - restore_cache:
+          keys:
+            - v2.7.18-python-cache-{{ arch }}
+          name: Restore python cache
+      - run:
+          name: Install python2 on macos
+          command: |
+            if [ "`uname`" == "Darwin" ]; then
+              if [ ! -f "python-downloads/python-2.7.18-macosx10.9.pkg" ]; then
+                mkdir python-downloads
+                echo 'Downloading Python 2.7.18'
+                curl -O https://dev-cdn.electronjs.org/python/python-2.7.18-macosx10.9.pkg
+                mv python-2.7.18-macosx10.9.pkg python-downloads
+              else
+                echo 'Using Python install from cache'
+              fi
+              sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target /        
+            fi
+      - save_cache:
+          paths:
+            - python-downloads
+          key: v2.7.18-python-cache-{{ arch }}
+          name: Persisting python cache
   maybe-restore-portaled-src-cache:
     parameters:
       halt-if-successful:
@@ -1296,7 +1312,7 @@ commands:
             - run: rm -rf src/electron
       - *step-restore-brew-cache
       - *step-install-gnutar-on-mac
-      - *step-install-python2-on-mac
+      - install-python2-mac
       - *step-save-brew-cache
       - when:
           condition: << parameters.build >>
@@ -1488,7 +1504,7 @@ commands:
             - *step-depot-tools-get
       - *step-depot-tools-add-to-path
       - *step-restore-brew-cache
-      - *step-install-python2-on-mac
+      - install-python2-mac
       - *step-get-more-space-on-mac
       - when:
           condition: << parameters.checkout >>

From 561be723736c6e677ebd20bbf582f797f09b8d92 Mon Sep 17 00:00:00 2001
From: Naoki Maeda <33103552+Maeda-Naoki@users.noreply.github.com>
Date: Thu, 2 Jun 2022 02:00:48 +0900
Subject: [PATCH 438/811] chore: update husky to v8.0.1 (#34343)

* chore: update husky v8.0.1

* chore: remove unnecessary .husky/.gitignore

ref : https://github.com/typicode/husky/releases/tag/v7.0.0

* chore: add ^ prefix for husky version

* chore: update yarn.lock

Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
---
 .husky/.gitignore | 1 -
 package.json      | 2 +-
 yarn.lock         | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 .husky/.gitignore

diff --git a/.husky/.gitignore b/.husky/.gitignore
deleted file mode 100644
index 31354ec138999..0000000000000
--- a/.husky/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_
diff --git a/package.json b/package.json
index 23f3239067292..8bc6babe6fe0f 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "folder-hash": "^2.1.1",
     "fs-extra": "^9.0.1",
     "got": "^6.3.0",
-    "husky": "^6.0.0",
+    "husky": "^8.0.1",
     "klaw": "^3.0.0",
     "lint": "^1.1.2",
     "lint-staged": "^10.2.11",
diff --git a/yarn.lock b/yarn.lock
index 226aae6f5b92c..2cf78d42fb160 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3598,10 +3598,10 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
-  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
+husky@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
+  integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"

From 5057cbf418c8d1c32ff228c80b5222873970b010 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 10:32:32 -0700
Subject: [PATCH 439/811] Bump v21.0.0-nightly.20220601

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7085745b647a1..f732489a7a489 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220531
\ No newline at end of file
+21.0.0-nightly.20220601
\ No newline at end of file
diff --git a/package.json b/package.json
index 8bc6babe6fe0f..c49e9fdbc588d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220531",
+  "version": "21.0.0-nightly.20220601",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2ab0cf4c6a7f6..11975cee4f07e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220531
- PRODUCTVERSION 21,0,0,20220531
+ FILEVERSION 21,0,0,20220601
+ PRODUCTVERSION 21,0,0,20220601
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f306fbc01056256864d49be4ddff882245662cdf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 14:31:30 -0700
Subject: [PATCH 440/811] Revert "Bump v21.0.0-nightly.20220601"

This reverts commit 5057cbf418c8d1c32ff228c80b5222873970b010.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f732489a7a489..7085745b647a1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220601
\ No newline at end of file
+21.0.0-nightly.20220531
\ No newline at end of file
diff --git a/package.json b/package.json
index c49e9fdbc588d..8bc6babe6fe0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220601",
+  "version": "21.0.0-nightly.20220531",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 11975cee4f07e..2ab0cf4c6a7f6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220601
- PRODUCTVERSION 21,0,0,20220601
+ FILEVERSION 21,0,0,20220531
+ PRODUCTVERSION 21,0,0,20220531
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1cd07c565a87ced6a923ade76eda380367e5ce1f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Wed, 1 Jun 2022 16:03:04 -0700
Subject: [PATCH 441/811] fix: crash in WebFrameMain mojo connection when
 RenderFrameHost is nullptr (#34411)

* fix: crash when RenderFrameHost is nullptr

* chore: lint fix

Co-authored-by: samuelmaddock <samuel.maddock@gmail.com>
---
 shell/browser/api/electron_api_web_frame_main.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index f8bc7c9efcd11..065150fbf3e82 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -193,8 +193,13 @@ void WebFrameMain::MaybeSetupMojoConnection() {
     renderer_api_.set_disconnect_handler(base::BindOnce(
         &WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr()));
   }
+
+  // Render frame should exist when this method is called.
+  DCHECK(render_frame_);
+
   // Wait for RenderFrame to be created in renderer before accessing remote.
-  if (pending_receiver_ && render_frame_->IsRenderFrameCreated()) {
+  if (pending_receiver_ && render_frame_ &&
+      render_frame_->IsRenderFrameCreated()) {
     render_frame_->GetRemoteInterfaces()->GetInterface(
         std::move(pending_receiver_));
   }

From eb9888d1d29406a999aed128fde93b601c4b31f0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 06:01:23 -0700
Subject: [PATCH 442/811] Bump v21.0.0-nightly.20220602

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7085745b647a1..f8900231e1a68 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220531
\ No newline at end of file
+21.0.0-nightly.20220602
\ No newline at end of file
diff --git a/package.json b/package.json
index 8bc6babe6fe0f..6c210f8629165 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220531",
+  "version": "21.0.0-nightly.20220602",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2ab0cf4c6a7f6..561d42ca8fa58 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220531
- PRODUCTVERSION 21,0,0,20220531
+ FILEVERSION 21,0,0,20220602
+ PRODUCTVERSION 21,0,0,20220602
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 000c3d981ce3b5c03e478f8c92a1506625ed06ed Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 2 Jun 2022 09:01:33 -0700
Subject: [PATCH 443/811] build: disable 32-bit Windows symbol generation
 (#34412)

---
 appveyor.yml                       |  9 ++++++---
 script/release/release.js          |  5 +++--
 script/release/uploaders/upload.py | 14 ++++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 25aeea817e440..216999f6cf713 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -180,16 +180,19 @@ build_script:
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
+  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
+      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        if ($env:TARGET_ARCH -ne 'ia32') {
+          python electron\script\zip-symbols.py
+          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
diff --git a/script/release/release.js b/script/release/release.js
index c3c8d6363b120..e89d7ba920245 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -128,8 +128,9 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    `electron-${version}-win32-ia32-pdb.zip`,
-    `electron-${version}-win32-ia32-symbols.zip`,
+    // TODO(vertedinde) Symbol generation on 32-bit Windows is temporarily disabled due to CI failures
+    // `electron-${version}-win32-ia32-pdb.zip`,
+    // `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
     `electron-${version}-win32-x64-symbols.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index a73955786e47c..69c4bbfa5720d 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,9 +76,10 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
-    upload_electron(release, symbols_zip, args)
+    if (get_target_arch() != 'ia32' or PLATFORM != 'win32'):
+      symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
+      upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
       api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@@ -95,9 +96,10 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
     upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
-    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
-    upload_electron(release, pdb_zip, args)
+    if get_target_arch() != 'ia32':
+      pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+      shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+      upload_electron(release, pdb_zip, args)
   elif PLATFORM == 'linux':
     debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)

From 539a53786c591f0f2009ebcdb5b045ad6e13bd80 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 2 Jun 2022 20:43:40 +0200
Subject: [PATCH 444/811] chore: remove redundant @available checks (#34407)

* chore: require macOS 10.13 for Chromium

* chore: fix lint
---
 .../electron_api_system_preferences_mac.mm    | 96 +++++++++----------
 .../mac/electron_application_delegate.mm      | 34 -------
 shell/browser/mac/in_app_purchase_product.mm  |  8 +-
 shell/browser/native_window_mac.mm            | 59 ++++--------
 .../ui/cocoa/electron_menu_controller.mm      |  6 +-
 shell/browser/ui/cocoa/electron_ns_window.mm  |  2 +-
 .../ui/cocoa/electron_ns_window_delegate.mm   |  3 +-
 shell/browser/ui/cocoa/electron_touch_bar.h   | 51 ++++------
 shell/browser/ui/cocoa/electron_touch_bar.mm  | 83 +++++++---------
 9 files changed, 123 insertions(+), 219 deletions(-)

diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm
index 70006a88dd157..dda1e63c9ee7f 100644
--- a/shell/browser/api/electron_api_system_preferences_mac.mm
+++ b/shell/browser/api/electron_api_system_preferences_mac.mm
@@ -423,17 +423,14 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 bool SystemPreferences::CanPromptTouchID() {
-  if (@available(macOS 10.12.2, *)) {
-    base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
-    if (![context
-            canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
-                        error:nil])
-      return false;
-    if (@available(macOS 10.13.2, *))
-      return [context biometryType] == LABiometryTypeTouchID;
-    return true;
-  }
-  return false;
+  base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
+  if (![context
+          canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
+                      error:nil])
+    return false;
+  if (@available(macOS 10.13.2, *))
+    return [context biometryType] == LABiometryTypeTouchID;
+  return true;
 }
 
 v8::Local<v8::Promise> SystemPreferences::PromptTouchID(
@@ -442,46 +439,40 @@ AVMediaType ParseMediaType(const std::string& media_type) {
   gin_helper::Promise<void> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  if (@available(macOS 10.12.2, *)) {
-    base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
-    base::ScopedCFTypeRef<SecAccessControlRef> access_control =
-        base::ScopedCFTypeRef<SecAccessControlRef>(
-            SecAccessControlCreateWithFlags(
-                kCFAllocatorDefault,
-                kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
-                kSecAccessControlPrivateKeyUsage |
-                    kSecAccessControlUserPresence,
-                nullptr));
-
-    scoped_refptr<base::SequencedTaskRunner> runner =
-        base::SequencedTaskRunnerHandle::Get();
-
-    __block gin_helper::Promise<void> p = std::move(promise);
-    [context
-        evaluateAccessControl:access_control
-                    operation:LAAccessControlOperationUseKeySign
-              localizedReason:[NSString stringWithUTF8String:reason.c_str()]
-                        reply:^(BOOL success, NSError* error) {
-                          if (!success) {
-                            std::string err_msg = std::string(
-                                [error.localizedDescription UTF8String]);
-                            runner->PostTask(
-                                FROM_HERE,
-                                base::BindOnce(
-                                    gin_helper::Promise<void>::RejectPromise,
-                                    std::move(p), std::move(err_msg)));
-                          } else {
-                            runner->PostTask(
-                                FROM_HERE,
-                                base::BindOnce(
-                                    gin_helper::Promise<void>::ResolvePromise,
-                                    std::move(p)));
-                          }
-                        }];
-  } else {
-    promise.RejectWithErrorMessage(
-        "This API is not available on macOS versions older than 10.12.2");
-  }
+  base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
+  base::ScopedCFTypeRef<SecAccessControlRef> access_control =
+      base::ScopedCFTypeRef<SecAccessControlRef>(
+          SecAccessControlCreateWithFlags(
+              kCFAllocatorDefault, kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
+              kSecAccessControlPrivateKeyUsage | kSecAccessControlUserPresence,
+              nullptr));
+
+  scoped_refptr<base::SequencedTaskRunner> runner =
+      base::SequencedTaskRunnerHandle::Get();
+
+  __block gin_helper::Promise<void> p = std::move(promise);
+  [context
+      evaluateAccessControl:access_control
+                  operation:LAAccessControlOperationUseKeySign
+            localizedReason:[NSString stringWithUTF8String:reason.c_str()]
+                      reply:^(BOOL success, NSError* error) {
+                        if (!success) {
+                          std::string err_msg = std::string(
+                              [error.localizedDescription UTF8String]);
+                          runner->PostTask(
+                              FROM_HERE,
+                              base::BindOnce(
+                                  gin_helper::Promise<void>::RejectPromise,
+                                  std::move(p), std::move(err_msg)));
+                        } else {
+                          runner->PostTask(
+                              FROM_HERE,
+                              base::BindOnce(
+                                  gin_helper::Promise<void>::ResolvePromise,
+                                  std::move(p)));
+                        }
+                      }];
+
   return handle;
 }
 
@@ -529,8 +520,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
   } else if (color == "quaternary-label") {
     sysColor = [NSColor quaternaryLabelColor];
   } else if (color == "scrubber-textured-background") {
-    if (@available(macOS 10.12.2, *))
-      sysColor = [NSColor scrubberTexturedBackgroundColor];
+    sysColor = [NSColor scrubberTexturedBackgroundColor];
   } else if (color == "secondary-label") {
     sysColor = [NSColor secondaryLabelColor];
   } else if (color == "selected-content-background") {
diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm
index 138400d625a87..ea7cbde4f3bca 100644
--- a/shell/browser/mac/electron_application_delegate.mm
+++ b/shell/browser/mac/electron_application_delegate.mm
@@ -19,30 +19,6 @@
 
 #import <UserNotifications/UserNotifications.h>
 
-#if BUILDFLAG(USE_ALLOCATOR_SHIM)
-// On macOS 10.12, the IME system attempts to allocate a 2^64 size buffer,
-// which would typically cause an OOM crash. To avoid this, the problematic
-// method is swizzled out and the make-OOM-fatal bit is disabled for the
-// duration of the original call. https://crbug.com/654695
-static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
-@interface OOMDisabledIMKInputSession : NSObject
-@end
-@implementation OOMDisabledIMKInputSession
-- (void)_coreAttributesFromRange:(NSRange)range
-                 whichAttributes:(long long)attributes  // NOLINT(runtime/int)
-               completionHandler:(void (^)(void))block {
-  // The allocator flag is per-process, so other threads may temporarily
-  // not have fatal OOM occur while this method executes, but it is better
-  // than crashing when using IME.
-  base::allocator::SetCallNewHandlerOnMallocFailure(false);
-  g_swizzle_imk_input_session->InvokeOriginal<
-      void, NSRange, long long, void (^)(void)>(  // NOLINT(runtime/int)
-      self, _cmd, range, attributes, block);
-  base::allocator::SetCallNewHandlerOnMallocFailure(true);
-}
-@end
-#endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
-
 static NSDictionary* UNNotificationResponseToNSDictionary(
     UNNotificationResponse* response) API_AVAILABLE(macosx(10.14)) {
   // [response isKindOfClass:[UNNotificationResponse class]]
@@ -109,16 +85,6 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notify {
 
   electron::Browser::Get()->DidFinishLaunching(
       electron::NSDictionaryToDictionaryValue(notification_info));
-
-#if BUILDFLAG(USE_ALLOCATOR_SHIM)
-  // Disable fatal OOM to hack around an OS bug https://crbug.com/654695.
-  if (base::mac::IsOS10_12()) {
-    g_swizzle_imk_input_session = new base::mac::ScopedObjCClassSwizzler(
-        NSClassFromString(@"IMKInputSession"),
-        [OOMDisabledIMKInputSession class],
-        @selector(_coreAttributesFromRange:whichAttributes:completionHandler:));
-  }
-#endif
 }
 
 - (void)applicationDidBecomeActive:(NSNotification*)notification {
diff --git a/shell/browser/mac/in_app_purchase_product.mm b/shell/browser/mac/in_app_purchase_product.mm
index 6165946261a35..da9a20fe53177 100644
--- a/shell/browser/mac/in_app_purchase_product.mm
+++ b/shell/browser/mac/in_app_purchase_product.mm
@@ -220,11 +220,9 @@ - (NSString*)formatPrice:(NSDecimalNumber*)price
                    withLocal:product.priceLocale] UTF8String];
 
       // Currency Information
-      if (@available(macOS 10.12, *)) {
-        if (product.priceLocale.currencyCode != nil) {
-          productStruct.currencyCode =
-              [product.priceLocale.currencyCode UTF8String];
-        }
+      if (product.priceLocale.currencyCode != nil) {
+        productStruct.currencyCode =
+            [product.priceLocale.currencyCode UTF8String];
       }
     }
   }
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 1563a7b2cf09c..e2723fba7da6c 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -392,13 +392,9 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   // Create a tab only if tabbing identifier is specified and window has
   // a native title bar.
   if (tabbingIdentifier.empty() || transparent() || !has_frame()) {
-    if (@available(macOS 10.12, *)) {
-      [window_ setTabbingMode:NSWindowTabbingModeDisallowed];
-    }
+    [window_ setTabbingMode:NSWindowTabbingModeDisallowed];
   } else {
-    if (@available(macOS 10.12, *)) {
-      [window_ setTabbingIdentifier:base::SysUTF8ToNSString(tabbingIdentifier)];
-    }
+    [window_ setTabbingIdentifier:base::SysUTF8ToNSString(tabbingIdentifier)];
   }
 
   // Resize to content bounds.
@@ -1564,68 +1560,51 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
 void NativeWindowMac::SetTouchBar(
     std::vector<gin_helper::PersistentDictionary> items) {
-  if (@available(macOS 10.12.2, *)) {
-    touch_bar_.reset([[ElectronTouchBar alloc]
-        initWithDelegate:window_delegate_.get()
-                  window:this
-                settings:std::move(items)]);
-    [window_ setTouchBar:nil];
-  }
+  touch_bar_.reset([[ElectronTouchBar alloc]
+      initWithDelegate:window_delegate_.get()
+                window:this
+              settings:std::move(items)]);
+  [window_ setTouchBar:nil];
 }
 
 void NativeWindowMac::RefreshTouchBarItem(const std::string& item_id) {
-  if (@available(macOS 10.12.2, *)) {
-    if (touch_bar_ && [window_ touchBar])
-      [touch_bar_ refreshTouchBarItem:[window_ touchBar] id:item_id];
-  }
+  if (touch_bar_ && [window_ touchBar])
+    [touch_bar_ refreshTouchBarItem:[window_ touchBar] id:item_id];
 }
 
 void NativeWindowMac::SetEscapeTouchBarItem(
     gin_helper::PersistentDictionary item) {
-  if (@available(macOS 10.12.2, *)) {
-    if (touch_bar_ && [window_ touchBar])
-      [touch_bar_ setEscapeTouchBarItem:std::move(item)
-                            forTouchBar:[window_ touchBar]];
-  }
+  if (touch_bar_ && [window_ touchBar])
+    [touch_bar_ setEscapeTouchBarItem:std::move(item)
+                          forTouchBar:[window_ touchBar]];
 }
 
 void NativeWindowMac::SelectPreviousTab() {
-  if (@available(macOS 10.12, *)) {
-    [window_ selectPreviousTab:nil];
-  }
+  [window_ selectPreviousTab:nil];
 }
 
 void NativeWindowMac::SelectNextTab() {
-  if (@available(macOS 10.12, *)) {
-    [window_ selectNextTab:nil];
-  }
+  [window_ selectNextTab:nil];
 }
 
 void NativeWindowMac::MergeAllWindows() {
-  if (@available(macOS 10.12, *)) {
-    [window_ mergeAllWindows:nil];
-  }
+  [window_ mergeAllWindows:nil];
 }
 
 void NativeWindowMac::MoveTabToNewWindow() {
-  if (@available(macOS 10.12, *)) {
-    [window_ moveTabToNewWindow:nil];
-  }
+  [window_ moveTabToNewWindow:nil];
 }
 
 void NativeWindowMac::ToggleTabBar() {
-  if (@available(macOS 10.12, *)) {
-    [window_ toggleTabBar:nil];
-  }
+  [window_ toggleTabBar:nil];
 }
 
 bool NativeWindowMac::AddTabbedWindow(NativeWindow* window) {
   if (window_ == window->GetNativeWindow().GetNativeNSWindow()) {
     return false;
   } else {
-    if (@available(macOS 10.12, *))
-      [window_ addTabbedWindow:window->GetNativeWindow().GetNativeNSWindow()
-                       ordered:NSWindowAbove];
+    [window_ addTabbedWindow:window->GetNativeWindow().GetNativeNSWindow()
+                     ordered:NSWindowAbove];
   }
   return true;
 }
diff --git a/shell/browser/ui/cocoa/electron_menu_controller.mm b/shell/browser/ui/cocoa/electron_menu_controller.mm
index 8725c8001162c..9caeadd9fb407 100644
--- a/shell/browser/ui/cocoa/electron_menu_controller.mm
+++ b/shell/browser/ui/cocoa/electron_menu_controller.mm
@@ -422,10 +422,8 @@ - (NSMenuItem*)menuItemForService:(NSSharingService*)service
       [item setKeyEquivalentModifierMask:modifier_mask];
     }
 
-    if (@available(macOS 10.13, *)) {
-      [(id)item
-          setAllowsKeyEquivalentWhenHidden:(model->WorksWhenHiddenAt(index))];
-    }
+    [(id)item
+        setAllowsKeyEquivalentWhenHidden:(model->WorksWhenHiddenAt(index))];
 
     // Set menu item's role.
     [item setTarget:self];
diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm
index f4cc2bc5bcbf1..171bd26004bf5 100644
--- a/shell/browser/ui/cocoa/electron_ns_window.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window.mm
@@ -56,7 +56,7 @@ - (NSRect)originalContentRectForFrameRect:(NSRect)frameRect {
   return [super contentRectForFrameRect:frameRect];
 }
 
-- (NSTouchBar*)makeTouchBar API_AVAILABLE(macosx(10.12.2)) {
+- (NSTouchBar*)makeTouchBar {
   if (shell_->touch_bar())
     return [shell_->touch_bar() makeTouchBar];
   else
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 2467be47424f4..740ed06b5fd6d 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -329,8 +329,7 @@ - (IBAction)newWindowForTab:(id)sender {
 #pragma mark - NSTouchBarDelegate
 
 - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
-      makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
-    API_AVAILABLE(macosx(10.12.2)) {
+      makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
   if (touchBar && shell_->touch_bar())
     return [shell_->touch_bar() makeItemForIdentifier:identifier];
   else
diff --git a/shell/browser/ui/cocoa/electron_touch_bar.h b/shell/browser/ui/cocoa/electron_touch_bar.h
index 9b299d27e9933..ff645042021ae 100644
--- a/shell/browser/ui/cocoa/electron_touch_bar.h
+++ b/shell/browser/ui/cocoa/electron_touch_bar.h
@@ -29,19 +29,16 @@
                 window:(electron::NativeWindow*)window
               settings:(std::vector<gin_helper::PersistentDictionary>)settings;
 
-- (NSTouchBar*)makeTouchBar API_AVAILABLE(macosx(10.12.2));
-- (NSTouchBar*)touchBarFromItemIdentifiers:(NSMutableArray*)items
-    API_AVAILABLE(macosx(10.12.2));
+- (NSTouchBar*)makeTouchBar;
+- (NSTouchBar*)touchBarFromItemIdentifiers:(NSMutableArray*)items;
 - (NSMutableArray*)identifiersFromSettings:
     (const std::vector<gin_helper::PersistentDictionary>&)settings;
 - (void)refreshTouchBarItem:(NSTouchBar*)touchBar
-                         id:(const std::string&)item_id
-    API_AVAILABLE(macosx(10.12.2));
+                         id:(const std::string&)item_id;
 - (void)addNonDefaultTouchBarItems:
     (const std::vector<gin_helper::PersistentDictionary>&)items;
 - (void)setEscapeTouchBarItem:(gin_helper::PersistentDictionary)item
-                  forTouchBar:(NSTouchBar*)touchBar
-    API_AVAILABLE(macosx(10.12.2));
+                  forTouchBar:(NSTouchBar*)touchBar;
 
 - (NSString*)idFromIdentifier:(NSString*)identifier
                    withPrefix:(NSString*)prefix;
@@ -52,47 +49,35 @@
 
 // Selector actions
 - (void)buttonAction:(id)sender;
-- (void)colorPickerAction:(id)sender API_AVAILABLE(macosx(10.12.2));
-- (void)sliderAction:(id)sender API_AVAILABLE(macosx(10.12.2));
+- (void)colorPickerAction:(id)sender;
+- (void)sliderAction:(id)sender;
 
 // Helpers to create touch bar items
-- (NSTouchBarItem*)makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
-    API_AVAILABLE(macosx(10.12.2));
+- (NSTouchBarItem*)makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier;
 - (NSTouchBarItem*)makeButtonForID:(NSString*)id
-                    withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                    withIdentifier:(NSString*)identifier;
 - (NSTouchBarItem*)makeLabelForID:(NSString*)id
-                   withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                   withIdentifier:(NSString*)identifier;
 - (NSTouchBarItem*)makeColorPickerForID:(NSString*)id
-                         withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                         withIdentifier:(NSString*)identifier;
 - (NSTouchBarItem*)makeSliderForID:(NSString*)id
-                    withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                    withIdentifier:(NSString*)identifier;
 - (NSTouchBarItem*)makePopoverForID:(NSString*)id
-                     withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                     withIdentifier:(NSString*)identifier;
 - (NSTouchBarItem*)makeGroupForID:(NSString*)id
-                   withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2));
+                   withIdentifier:(NSString*)identifier;
 
 // Helpers to update touch bar items
 - (void)updateButton:(NSCustomTouchBarItem*)item
-        withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2));
+        withSettings:(const gin_helper::PersistentDictionary&)settings;
 - (void)updateLabel:(NSCustomTouchBarItem*)item
-       withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2));
+       withSettings:(const gin_helper::PersistentDictionary&)settings;
 - (void)updateColorPicker:(NSColorPickerTouchBarItem*)item
-             withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2));
+             withSettings:(const gin_helper::PersistentDictionary&)settings;
 - (void)updateSlider:(NSSliderTouchBarItem*)item
-        withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2));
+        withSettings:(const gin_helper::PersistentDictionary&)settings;
 - (void)updatePopover:(NSPopoverTouchBarItem*)item
-         withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2));
+         withSettings:(const gin_helper::PersistentDictionary&)settings;
 
 @end
 
diff --git a/shell/browser/ui/cocoa/electron_touch_bar.mm b/shell/browser/ui/cocoa/electron_touch_bar.mm
index af690bd79d851..3272ebc652ed1 100644
--- a/shell/browser/ui/cocoa/electron_touch_bar.mm
+++ b/shell/browser/ui/cocoa/electron_touch_bar.mm
@@ -67,38 +67,36 @@ - (NSMutableArray*)identifiersFromSettings:
 
   bool has_other_items_proxy = false;
 
-  if (@available(macOS 10.12.2, *)) {
-    for (const auto& item : dicts) {
-      std::string type;
-      std::string item_id;
-      if (item.Get("type", &type) && item.Get("id", &item_id)) {
-        NSTouchBarItemIdentifier identifier = nil;
-        if (type == "spacer") {
-          std::string size;
-          item.Get("size", &size);
-          if (size == "large") {
-            identifier = NSTouchBarItemIdentifierFixedSpaceLarge;
-          } else if (size == "flexible") {
-            identifier = NSTouchBarItemIdentifierFlexibleSpace;
-          } else {
-            identifier = NSTouchBarItemIdentifierFixedSpaceSmall;
-          }
-        } else if (type == "other_items_proxy") {
-          identifier = NSTouchBarItemIdentifierOtherItemsProxy;
-          has_other_items_proxy = true;
+  for (const auto& item : dicts) {
+    std::string type;
+    std::string item_id;
+    if (item.Get("type", &type) && item.Get("id", &item_id)) {
+      NSTouchBarItemIdentifier identifier = nil;
+      if (type == "spacer") {
+        std::string size;
+        item.Get("size", &size);
+        if (size == "large") {
+          identifier = NSTouchBarItemIdentifierFixedSpaceLarge;
+        } else if (size == "flexible") {
+          identifier = NSTouchBarItemIdentifierFlexibleSpace;
         } else {
-          identifier = [self identifierFromID:item_id type:type];
+          identifier = NSTouchBarItemIdentifierFixedSpaceSmall;
         }
+      } else if (type == "other_items_proxy") {
+        identifier = NSTouchBarItemIdentifierOtherItemsProxy;
+        has_other_items_proxy = true;
+      } else {
+        identifier = [self identifierFromID:item_id type:type];
+      }
 
-        if (identifier) {
-          settings_[item_id] = item;
-          [identifiers addObject:identifier];
-        }
+      if (identifier) {
+        settings_[item_id] = item;
+        [identifiers addObject:identifier];
       }
     }
-    if (!has_other_items_proxy)
-      [identifiers addObject:NSTouchBarItemIdentifierOtherItemsProxy];
   }
+  if (!has_other_items_proxy)
+    [identifiers addObject:NSTouchBarItemIdentifierOtherItemsProxy];
 
   return identifiers;
 }
@@ -140,8 +138,7 @@ - (NSTouchBarItem*)makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
 - (void)refreshTouchBarItem:(NSTouchBar*)touchBar
                          id:(NSTouchBarItemIdentifier)identifier
                    withType:(const std::string&)item_type
-               withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2)) {
+               withSettings:(const gin_helper::PersistentDictionary&)settings {
   NSTouchBarItem* item = [touchBar itemForIdentifier:identifier];
   if (!item)
     return;
@@ -289,8 +286,7 @@ - (void)segmentedControlAction:(id)sender {
 }
 
 - (void)scrubber:(NSScrubber*)scrubber
-    didSelectItemAtIndex:(NSInteger)selectedIndex
-    API_AVAILABLE(macosx(10.12.2)) {
+    didSelectItemAtIndex:(NSInteger)selectedIndex {
   base::DictionaryValue details;
   details.SetInteger("selectedIndex", selectedIndex);
   details.SetString("type", "select");
@@ -299,8 +295,7 @@ - (void)scrubber:(NSScrubber*)scrubber
 }
 
 - (void)scrubber:(NSScrubber*)scrubber
-    didHighlightItemAtIndex:(NSInteger)highlightedIndex
-    API_AVAILABLE(macosx(10.12.2)) {
+    didHighlightItemAtIndex:(NSInteger)highlightedIndex {
   base::DictionaryValue details;
   details.SetInteger("highlightedIndex", highlightedIndex);
   details.SetString("type", "highlight");
@@ -592,8 +587,7 @@ - (NSTouchBarItem*)makeGroupForID:(NSString*)id
 }
 
 - (void)updateGroup:(NSGroupTouchBarItem*)item
-       withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2)) {
+       withSettings:(const gin_helper::PersistentDictionary&)settings {
   v8::Isolate* isolate = electron::JavascriptEnvironment::GetIsolate();
   v8::HandleScope handle_scope(isolate);
 
@@ -609,8 +603,7 @@ - (void)updateGroup:(NSGroupTouchBarItem*)item
 }
 
 - (NSTouchBarItem*)makeSegmentedControlForID:(NSString*)id
-                              withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2)) {
+                              withIdentifier:(NSString*)identifier {
   std::string s_id([id UTF8String]);
   if (![self hasItemWithID:s_id])
     return nil;
@@ -635,8 +628,8 @@ - (NSTouchBarItem*)makeSegmentedControlForID:(NSString*)id
 }
 
 - (void)updateSegmentedControl:(NSCustomTouchBarItem*)item
-                  withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2)) {
+                  withSettings:
+                      (const gin_helper::PersistentDictionary&)settings {
   NSSegmentedControl* control = item.view;
 
   std::string segmentStyle;
@@ -697,8 +690,7 @@ - (void)updateSegmentedControl:(NSCustomTouchBarItem*)item
 }
 
 - (NSTouchBarItem*)makeScrubberForID:(NSString*)id
-                      withIdentifier:(NSString*)identifier
-    API_AVAILABLE(macosx(10.12.2)) {
+                      withIdentifier:(NSString*)identifier {
   std::string s_id([id UTF8String]);
   if (![self hasItemWithID:s_id])
     return nil;
@@ -729,8 +721,7 @@ - (NSTouchBarItem*)makeScrubberForID:(NSString*)id
 }
 
 - (void)updateScrubber:(NSCustomTouchBarItem*)item
-          withSettings:(const gin_helper::PersistentDictionary&)settings
-    API_AVAILABLE(macosx(10.12.2)) {
+          withSettings:(const gin_helper::PersistentDictionary&)settings {
   NSScrubber* scrubber = item.view;
 
   bool showsArrowButtons = false;
@@ -780,8 +771,7 @@ - (void)updateScrubber:(NSCustomTouchBarItem*)item
   [scrubber reloadData];
 }
 
-- (NSInteger)numberOfItemsForScrubber:(NSScrubber*)scrubber
-    API_AVAILABLE(macosx(10.12.2)) {
+- (NSInteger)numberOfItemsForScrubber:(NSScrubber*)scrubber {
   std::string s_id([[scrubber identifier] UTF8String]);
   if (![self hasItemWithID:s_id])
     return 0;
@@ -796,8 +786,7 @@ - (NSInteger)numberOfItemsForScrubber:(NSScrubber*)scrubber
 }
 
 - (NSScrubberItemView*)scrubber:(NSScrubber*)scrubber
-             viewForItemAtIndex:(NSInteger)index
-    API_AVAILABLE(macosx(10.12.2)) {
+             viewForItemAtIndex:(NSInteger)index {
   std::string s_id([[scrubber identifier] UTF8String]);
   if (![self hasItemWithID:s_id])
     return nil;
@@ -839,7 +828,7 @@ - (NSScrubberItemView*)scrubber:(NSScrubber*)scrubber
 
 - (NSSize)scrubber:(NSScrubber*)scrubber
                 layout:(NSScrubberFlowLayout*)layout
-    sizeForItemAtIndex:(NSInteger)itemIndex API_AVAILABLE(macosx(10.12.2)) {
+    sizeForItemAtIndex:(NSInteger)itemIndex {
   NSInteger width = 50;
   NSInteger height = 30;
   NSInteger margin = 15;

From 0671f229ac8991ccac5373bb28ab37a46ef5d2c3 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 2 Jun 2022 14:12:10 -0700
Subject: [PATCH 445/811] chore: increase timeout for electron-build step
 (#34427)

---
 .circleci/config/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index c37b1ecd67a0a..88fd0051fa115 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -549,7 +549,7 @@ step-gn-check: &step-gn-check
 step-electron-build: &step-electron-build
   run:
     name: Electron build
-    no_output_timeout: 30m
+    no_output_timeout: 60m
     command: |
       # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
       # to realize is not correct / should be rebuilt.  We delete it here so it is

From 3ad70d0f0b9bd50665ae05b5de677f6d2cdab038 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:12:58 -0700
Subject: [PATCH 446/811] Revert "Bump v21.0.0-nightly.20220602"

This reverts commit eb9888d1d29406a999aed128fde93b601c4b31f0.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f8900231e1a68..7085745b647a1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220602
\ No newline at end of file
+21.0.0-nightly.20220531
\ No newline at end of file
diff --git a/package.json b/package.json
index 6c210f8629165..8bc6babe6fe0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220602",
+  "version": "21.0.0-nightly.20220531",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 561d42ca8fa58..2ab0cf4c6a7f6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220602
- PRODUCTVERSION 21,0,0,20220602
+ FILEVERSION 21,0,0,20220531
+ PRODUCTVERSION 21,0,0,20220531
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d13c879a15d22248c09e2fad2db28d3f6c749d6e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:15:14 -0700
Subject: [PATCH 447/811] Bump v21.0.0-nightly.20220602

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7085745b647a1..f8900231e1a68 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220531
\ No newline at end of file
+21.0.0-nightly.20220602
\ No newline at end of file
diff --git a/package.json b/package.json
index 8bc6babe6fe0f..6c210f8629165 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220531",
+  "version": "21.0.0-nightly.20220602",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2ab0cf4c6a7f6..561d42ca8fa58 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220531
- PRODUCTVERSION 21,0,0,20220531
+ FILEVERSION 21,0,0,20220602
+ PRODUCTVERSION 21,0,0,20220602
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From eb26f99f6efcc10048e80f58f60f9453e2171aee Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 2 Jun 2022 23:27:37 +0200
Subject: [PATCH 448/811] test: re-enable shared worker webview test (#34338)

---
 spec/chromium-spec.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index afcc2b668a756..d0379b13d629c 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -281,15 +281,14 @@ describe('chromium feature', () => {
         expect(event.data).to.equal('undefined undefined undefined undefined');
       });
 
-      // FIXME: disabled during chromium update due to crash in content::WorkerScriptFetchInitiator::CreateScriptLoaderOnIO
-      xit('has node integration with nodeIntegrationInWorker', async () => {
+      it('has node integration with nodeIntegrationInWorker', async () => {
         const webview = new WebView();
         webview.addEventListener('console-message', (e) => {
           console.log(e);
         });
         const eventPromise = waitForEvent(webview, 'ipc-message');
         webview.src = `file://${fixtures}/pages/shared_worker.html`;
-        webview.setAttribute('webpreferences', 'nodeIntegration, nodeIntegrationInWorker');
+        webview.setAttribute('webpreferences', 'nodeIntegration, nodeIntegrationInWorker, contextIsolation=no');
         document.body.appendChild(webview);
         const event = await eventPromise;
         webview.remove();

From b00c026a54da906d89f4476d122218b01b6baee9 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Thu, 2 Jun 2022 20:23:01 -0400
Subject: [PATCH 449/811] fix: render process crash handling (#34428)

* fix: crash when renderer process is reused

Could occur when a renderer crashes and the same-origin URL is loaded again
which leads to reusing the renderer process.

* test: renderer process crash recovery

* fix: handle case which leads to render frame DCHECK

* fix: lint
---
 .../api/electron_api_web_frame_main.cc        |  9 ++++++-
 shell/browser/electron_browser_client.cc      |  3 +++
 spec-main/api-web-frame-main-spec.ts          | 27 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index 065150fbf3e82..5bea00749976d 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -188,13 +188,20 @@ const mojo::Remote<mojom::ElectronRenderer>& WebFrameMain::GetRendererApi() {
 }
 
 void WebFrameMain::MaybeSetupMojoConnection() {
+  if (render_frame_disposed_) {
+    // RFH may not be set yet if called between when a new RFH is created and
+    // before it's been swapped with an old RFH.
+    LOG(INFO) << "Attempt to setup WebFrameMain connection while render frame "
+                 "is disposed";
+    return;
+  }
+
   if (!renderer_api_) {
     pending_receiver_ = renderer_api_.BindNewPipeAndPassReceiver();
     renderer_api_.set_disconnect_handler(base::BindOnce(
         &WebFrameMain::OnRendererConnectionError, weak_factory_.GetWeakPtr()));
   }
 
-  // Render frame should exist when this method is called.
   DCHECK(render_frame_);
 
   // Wait for RenderFrame to be created in renderer before accessing remote.
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 3d3b19384a091..813f70799813a 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -451,6 +451,9 @@ void ElectronBrowserClient::RenderProcessWillLaunch(
       new extensions::MessagingAPIMessageFilter(process_id, browser_context));
 #endif
 
+  // Remove in case the host is reused after a crash, otherwise noop.
+  host->RemoveObserver(this);
+
   // ensure the ProcessPreferences is removed later
   host->AddObserver(this);
 }
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index 7f947f7f54922..bf3106a6efb70 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -224,6 +224,33 @@ describe('webFrameMain module', () => {
       expect(w.webContents.mainFrame).to.equal(mainFrame);
       expect(mainFrame.url).to.equal(crossOriginUrl);
     });
+
+    it('recovers from renderer crash on same-origin', async () => {
+      const server = await createServer();
+      // Keep reference to mainFrame alive throughout crash and recovery.
+      const { mainFrame } = w.webContents;
+      await w.webContents.loadURL(server.url);
+      w.webContents.forcefullyCrashRenderer();
+      await w.webContents.loadURL(server.url);
+      // Log just to keep mainFrame in scope.
+      console.log('mainFrame.url', mainFrame.url);
+    });
+
+    // Fixed by #34411
+    it('recovers from renderer crash on cross-origin', async () => {
+      const server = await createServer();
+      // 'localhost' is treated as a separate origin.
+      const crossOriginUrl = server.url.replace('127.0.0.1', 'localhost');
+      // Keep reference to mainFrame alive throughout crash and recovery.
+      const { mainFrame } = w.webContents;
+      await w.webContents.loadURL(server.url);
+      w.webContents.forcefullyCrashRenderer();
+      // A short wait seems to be required to reproduce the crash.
+      await new Promise(resolve => setTimeout(resolve, 100));
+      await w.webContents.loadURL(crossOriginUrl);
+      // Log just to keep mainFrame in scope.
+      console.log('mainFrame.url', mainFrame.url);
+    });
   });
 
   describe('webFrameMain.fromId', () => {

From 6038e42c23c238e65a8c7abdf4dbd9e953084d2f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 3 Jun 2022 09:47:19 +0200
Subject: [PATCH 450/811] fix: fullscreen windows aren't resizable on macOS
 (#34379)

---
 shell/browser/native_window_mac.h             |  1 +
 shell/browser/native_window_mac.mm            | 20 ++++++++++++-------
 .../ui/cocoa/electron_ns_window_delegate.mm   |  6 ++++--
 spec-main/api-browser-window-spec.ts          | 20 +++++++++++++++++--
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index 9b6fcb14dda59..9b02cb44327b2 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -167,6 +167,7 @@ class NativeWindowMac : public NativeWindow,
   void UpdateVibrancyRadii(bool fullscreen);
 
   // Set the attribute of NSWindow while work around a bug of zoom button.
+  bool HasStyleMask(NSUInteger flag) const;
   void SetStyleMask(bool on, NSUInteger flag);
   void SetCollectionBehavior(bool on, NSUInteger flag);
   void SetWindowLevel(int level);
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index e2723fba7da6c..e3cbfefd9c4dd 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -642,7 +642,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 bool NativeWindowMac::IsMaximized() {
-  if (([window_ styleMask] & NSWindowStyleMaskResizable) != 0)
+  if (HasStyleMask(NSWindowStyleMaskResizable) != 0)
     return [window_ isZoomed];
 
   NSRect rectScreen = GetAspectRatio() > 0.0
@@ -725,7 +725,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 bool NativeWindowMac::IsFullscreen() const {
-  return [window_ styleMask] & NSWindowStyleMaskFullScreen;
+  return HasStyleMask(NSWindowStyleMaskFullScreen);
 }
 
 void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
@@ -825,7 +825,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 bool NativeWindowMac::IsResizable() {
-  return [window_ styleMask] & NSWindowStyleMaskResizable;
+  bool in_fs_transition =
+      fullscreen_transition_state() != FullScreenTransitionState::NONE;
+  bool has_rs_mask = HasStyleMask(NSWindowStyleMaskResizable);
+  return has_rs_mask && !IsFullscreen() && !in_fs_transition;
 }
 
 void NativeWindowMac::SetMovable(bool movable) {
@@ -841,7 +844,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 bool NativeWindowMac::IsMinimizable() {
-  return [window_ styleMask] & NSWindowStyleMaskMiniaturizable;
+  return HasStyleMask(NSWindowStyleMaskMiniaturizable);
 }
 
 void NativeWindowMac::SetMaximizable(bool maximizable) {
@@ -871,7 +874,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 bool NativeWindowMac::IsClosable() {
-  return [window_ styleMask] & NSWindowStyleMaskClosable;
+  return HasStyleMask(NSWindowStyleMaskClosable);
 }
 
 void NativeWindowMac::SetAlwaysOnTop(ui::ZOrderLevel z_order,
@@ -1379,8 +1382,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   NSVisualEffectView* vibrantView = [window_ vibrantView];
 
   if (vibrantView != nil && !vibrancy_type_.empty()) {
-    const bool no_rounded_corner =
-        !([window_ styleMask] & NSWindowStyleMaskTitled);
+    const bool no_rounded_corner = !HasStyleMask(NSWindowStyleMaskTitled);
     if (!has_frame() && !is_modal() && !no_rounded_corner) {
       CGFloat radius;
       if (fullscreen) {
@@ -1731,6 +1733,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   AddContentViewLayers();
 }
 
+bool NativeWindowMac::HasStyleMask(NSUInteger flag) const {
+  return [window_ styleMask] & flag;
+}
+
 void NativeWindowMac::SetStyleMask(bool on, NSUInteger flag) {
   // Changing the styleMask of a frameless windows causes it to change size so
   // we explicitly disable resizing while setting it.
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 740ed06b5fd6d..7bd9fdf7d0d42 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -234,12 +234,14 @@ - (void)windowDidEndLiveResize:(NSNotification*)notification {
 }
 
 - (void)windowWillEnterFullScreen:(NSNotification*)notification {
+  // Store resizable mask so it can be restored after exiting fullscreen.
+  is_resizable_ = shell_->HasStyleMask(NSWindowStyleMaskResizable);
+
   shell_->SetFullScreenTransitionState(FullScreenTransitionState::ENTERING);
 
   shell_->NotifyWindowWillEnterFullScreen();
 
-  // Setting resizable to true before entering fullscreen.
-  is_resizable_ = shell_->IsResizable();
+  // Set resizable to true before entering fullscreen.
   shell_->SetResizable(true);
 }
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 0de2068f9590c..c140ae15ae28c 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4650,12 +4650,13 @@ describe('BrowserWindow module', () => {
     });
 
     ifdescribe(process.platform === 'darwin')('fullscreen state with resizable set', () => {
-      it('resizable flag should be set to true and restored', async () => {
+      it('resizable flag should be set to false and restored', async () => {
         const w = new BrowserWindow({ resizable: false });
+
         const enterFullScreen = emittedOnce(w, 'enter-full-screen');
         w.setFullScreen(true);
         await enterFullScreen;
-        expect(w.resizable).to.be.true('resizable');
+        expect(w.resizable).to.be.false('resizable');
 
         await delay();
         const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
@@ -4663,6 +4664,21 @@ describe('BrowserWindow module', () => {
         await leaveFullScreen;
         expect(w.resizable).to.be.false('resizable');
       });
+
+      it('default resizable flag should be restored after entering/exiting fullscreen', async () => {
+        const w = new BrowserWindow();
+
+        const enterFullScreen = emittedOnce(w, 'enter-full-screen');
+        w.setFullScreen(true);
+        await enterFullScreen;
+        expect(w.resizable).to.be.false('resizable');
+
+        await delay();
+        const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
+        w.setFullScreen(false);
+        await leaveFullScreen;
+        expect(w.resizable).to.be.true('resizable');
+      });
     });
 
     ifdescribe(process.platform === 'darwin')('fullscreen state', () => {

From 05b03b01dc8f9cc6bc37991d3832b08fc8ab730c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 06:00:36 -0700
Subject: [PATCH 451/811] Bump v21.0.0-nightly.20220603

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f8900231e1a68..026cc07d0972e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220602
\ No newline at end of file
+21.0.0-nightly.20220603
\ No newline at end of file
diff --git a/package.json b/package.json
index 6c210f8629165..7b0f928432752 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220602",
+  "version": "21.0.0-nightly.20220603",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 561d42ca8fa58..28ae96f4ea844 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220602
- PRODUCTVERSION 21,0,0,20220602
+ FILEVERSION 21,0,0,20220603
+ PRODUCTVERSION 21,0,0,20220603
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f39c1a35e5cac86c13ee65fbfdbefb32eeef4f5b Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 16:13:27 +0200
Subject: [PATCH 452/811] chore: bump node to v16.15.1 (main) (#34424)

---
 DEPS                                                            | 2 +-
 patches/node/build_add_gn_build_files.patch                     | 2 +-
 .../fix_add_default_values_for_variables_in_common_gypi.patch   | 2 +-
 ...ix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index bc96d86bcb6cd..b426c6b27f2dd 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '104.0.5073.0',
   'node_version':
-    'v16.15.0',
+    'v16.15.1',
   'nan_version':
     '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index 788c5dc5bcf6d..69142b12e0d62 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -1799,7 +1799,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
 +  args = rebase_path(inputs + outputs, root_build_dir)
 +}
 diff --git a/src/node_version.h b/src/node_version.h
-index 29c9be6366d63be7b340b35cea141e4d7e7f71cc..587735f2ddc0e5d93edd8644d121c6fb31fc4378 100644
+index 39f6406dd2b52e16a2be5c00c554da30a806ead9..36117c5b36c65f0a8a9bb9c421bc74b82f2b1f3a 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@
diff --git a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
index aba4b338e5f86..93e000bb61628 100644
--- a/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
+++ b/patches/node/fix_add_default_values_for_variables_in_common_gypi.patch
@@ -7,7 +7,7 @@ common.gypi is a file that's included in the node header bundle, despite
 the fact that we do not build node with gyp.
 
 diff --git a/common.gypi b/common.gypi
-index bdc2c105abeddc4c8e434ead05ebc0d7d82cfae8..3fd1d4ddddc109dfd87f4ba6115948f1c31b1261 100644
+index 3cfed562577978c41a256fc779f6a3a172e65b3d..96d512630e9727467aa523c2dfc1a4cf9275465b 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -84,6 +84,23 @@
diff --git a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
index 5716a2d57dc79..1943720ef81c6 100644
--- a/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
+++ b/patches/node/fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
@@ -6,7 +6,7 @@ Subject: fix: add v8_enable_reverse_jsargs defines in common.gypi
 This can be removed once node upgrades V8 and inevitably has to do this exact same thing.  Also hi node people if you are looking at this.
 
 diff --git a/common.gypi b/common.gypi
-index 3fd1d4ddddc109dfd87f4ba6115948f1c31b1261..fd4e0b38eb6ecf81b23186ec663499d1e685fdf8 100644
+index 96d512630e9727467aa523c2dfc1a4cf9275465b..bdfe81d11cc50f492c93fe48f6946765b6fb5238 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -82,6 +82,8 @@

From 4f99e3e46cc09696d58b8e0aae89f2d647a79713 Mon Sep 17 00:00:00 2001
From: Will Anderson <will@itsananderson.com>
Date: Sun, 5 Jun 2022 22:49:14 -0700
Subject: [PATCH 453/811] docs: fix `did-frame-navigate` example in
 webFrameMain docs (#34419)

docs: fix did-frame-navigate example in webFrameMain docs
---
 docs/api/web-frame-main.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/web-frame-main.md b/docs/api/web-frame-main.md
index 0190f4dbc0ac5..e97041668e15b 100644
--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -16,7 +16,7 @@ win.loadURL('https://twitter.com')
 
 win.webContents.on(
   'did-frame-navigate',
-  (event, url, isMainFrame, frameProcessId, frameRoutingId) => {
+  (event, url, httpResponseCode, httpStatusText, isMainFrame, frameProcessId, frameRoutingId) => {
     const frame = webFrameMain.fromId(frameProcessId, frameRoutingId)
     if (frame) {
       const code = 'document.body.innerHTML = document.body.innerHTML.replaceAll("heck", "h*ck")'

From 92b0f3e80874f18631fa489687e4c3fe65fac9a7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 6 Jun 2022 00:51:10 -0500
Subject: [PATCH 454/811] build: add --unique option to release notes script
 (#34296)

Useful when looking for changes unique to a single branch
---
 script/release/notes/index.js | 11 ++++++-----
 script/release/notes/notes.js | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/script/release/notes/index.js b/script/release/notes/index.js
index 79d512218343f..d40ed7086f864 100755
--- a/script/release/notes/index.js
+++ b/script/release/notes/index.js
@@ -147,7 +147,7 @@ const getPreviousPoint = async (point) => {
   }
 };
 
-async function getReleaseNotes (range, newVersion) {
+async function getReleaseNotes (range, newVersion, unique) {
   const rangeList = range.split('..') || ['HEAD'];
   const to = rangeList.pop();
   const from = rangeList.pop() || (await getPreviousPoint(to));
@@ -158,7 +158,7 @@ async function getReleaseNotes (range, newVersion) {
 
   const notes = await notesGenerator.get(from, to, newVersion);
   const ret = {
-    text: notesGenerator.render(notes)
+    text: notesGenerator.render(notes, unique)
   };
 
   if (notes.unknown.length) {
@@ -170,7 +170,7 @@ async function getReleaseNotes (range, newVersion) {
 
 async function main () {
   const opts = minimist(process.argv.slice(2), {
-    boolean: ['help'],
+    boolean: ['help', 'unique'],
     string: ['version']
   });
   opts.range = opts._.shift();
@@ -179,13 +179,14 @@ async function main () {
     console.log(`
 easy usage: ${name} version
 
-full usage: ${name} [begin..]end [--version version]
+full usage: ${name} [begin..]end [--version version] [--unique]
 
  * 'begin' and 'end' are two git references -- tags, branches, etc --
    from which the release notes are generated.
  * if omitted, 'begin' defaults to the previous tag in end's branch.
  * if omitted, 'version' defaults to 'end'. Specifying a version is
    useful if you're making notes on a new version that isn't tagged yet.
+ * '--unique' omits changes that also landed in other branches.
 
 For example, these invocations are equivalent:
   ${process.argv[1]} v4.0.1
@@ -194,7 +195,7 @@ For example, these invocations are equivalent:
     return 0;
   }
 
-  const notes = await getReleaseNotes(opts.range, opts.version);
+  const notes = await getReleaseNotes(opts.range, opts.version, opts.unique);
   console.log(notes.text);
   if (notes.warning) {
     throw new Error(notes.warning);
diff --git a/script/release/notes/notes.js b/script/release/notes/notes.js
index 08579c100991c..20f72b071b77e 100644
--- a/script/release/notes/notes.js
+++ b/script/release/notes/notes.js
@@ -596,10 +596,14 @@ function renderDescription (commit) {
 const renderNote = (commit, excludeBranch) =>
   `* ${renderDescription(commit)} ${renderLink(commit)} ${renderTrops(commit, excludeBranch)}\n`;
 
-const renderNotes = (notes) => {
+const renderNotes = (notes, unique = false) => {
   const rendered = [`# Release Notes for ${notes.name}\n\n`];
 
-  const renderSection = (title, commits) => {
+  const renderSection = (title, commits, unique) => {
+    if (unique) {
+      // omit changes that also landed in other branches
+      commits = commits.filter((commit) => renderTrops(commit, notes.toBranch).length === 0);
+    }
     if (commits.length > 0) {
       rendered.push(
         `## ${title}\n\n`,
@@ -608,17 +612,17 @@ const renderNotes = (notes) => {
     }
   };
 
-  renderSection('Breaking Changes', notes.breaking);
-  renderSection('Features', notes.feat);
-  renderSection('Fixes', notes.fix);
-  renderSection('Other Changes', notes.other);
+  renderSection('Breaking Changes', notes.breaking, unique);
+  renderSection('Features', notes.feat, unique);
+  renderSection('Fixes', notes.fix, unique);
+  renderSection('Other Changes', notes.other, unique);
 
   if (notes.docs.length) {
     const docs = notes.docs.map(commit => renderLink(commit)).sort();
     rendered.push('## Documentation\n\n', ` * Documentation changes: ${docs.join(', ')}\n`, '\n');
   }
 
-  renderSection('Unknown', notes.unknown);
+  renderSection('Unknown', notes.unknown, unique);
 
   return rendered.join('');
 };

From e56f626b945f11b120f36019d621f32a55307c7a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 06:02:02 -0700
Subject: [PATCH 455/811] Bump v21.0.0-nightly.20220606

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 026cc07d0972e..9d04f0a9c0699 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220603
\ No newline at end of file
+21.0.0-nightly.20220606
\ No newline at end of file
diff --git a/package.json b/package.json
index 7b0f928432752..e251b80a32457 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220603",
+  "version": "21.0.0-nightly.20220606",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 28ae96f4ea844..df4cea0efdeb2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220603
- PRODUCTVERSION 21,0,0,20220603
+ FILEVERSION 21,0,0,20220606
+ PRODUCTVERSION 21,0,0,20220606
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 882fa36940fc5846a4c72b1c73a4ccc3ac146437 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Mon, 6 Jun 2022 17:39:58 -0400
Subject: [PATCH 456/811] test: fix for flaky renderer crash test (#34452)

---
 spec-main/api-web-frame-main-spec.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index bf3106a6efb70..8890e1402f52c 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -230,7 +230,9 @@ describe('webFrameMain module', () => {
       // Keep reference to mainFrame alive throughout crash and recovery.
       const { mainFrame } = w.webContents;
       await w.webContents.loadURL(server.url);
+      const crashEvent = emittedOnce(w.webContents, 'render-process-gone');
       w.webContents.forcefullyCrashRenderer();
+      await crashEvent;
       await w.webContents.loadURL(server.url);
       // Log just to keep mainFrame in scope.
       console.log('mainFrame.url', mainFrame.url);
@@ -244,7 +246,9 @@ describe('webFrameMain module', () => {
       // Keep reference to mainFrame alive throughout crash and recovery.
       const { mainFrame } = w.webContents;
       await w.webContents.loadURL(server.url);
+      const crashEvent = emittedOnce(w.webContents, 'render-process-gone');
       w.webContents.forcefullyCrashRenderer();
+      await crashEvent;
       // A short wait seems to be required to reproduce the crash.
       await new Promise(resolve => setTimeout(resolve, 100));
       await w.webContents.loadURL(crossOriginUrl);

From 30d15715a9ce6a360c73d2e8eb9970ca17d0ad36 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 7 Jun 2022 00:49:52 -0700
Subject: [PATCH 457/811] build: switch to --use-color flag for clang-tidy
 (#34457)

chore: switch to --use-color flag for clang-tidy
---
 script/run-clang-tidy.ts | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/script/run-clang-tidy.ts b/script/run-clang-tidy.ts
index d3611e743f3c7..f399b2c0845ee 100644
--- a/script/run-clang-tidy.ts
+++ b/script/run-clang-tidy.ts
@@ -1,4 +1,3 @@
-import chalk from 'chalk';
 import * as childProcess from 'child_process';
 import * as fs from 'fs';
 import * as klaw from 'klaw';
@@ -143,7 +142,7 @@ async function runClangTidy (
   jobs: number = 1
 ): Promise<boolean> {
   const cmd = path.resolve(LLVM_BIN, 'clang-tidy');
-  const args = [`-p=${outDir}`];
+  const args = [`-p=${outDir}`, '--use-color'];
 
   if (checks) args.push(`--checks=${checks}`);
 
@@ -202,38 +201,7 @@ async function runClangTidy (
     while (filenames) {
       results.push(
         await spawnAsync(cmd, [...args, ...filenames], {}).then((result) => {
-          // We lost color, so recolorize because it's much more legible
-          // There's a --use-color flag for clang-tidy but it has no effect
-          // on Windows at the moment, so just recolor for everyone
-          let state = null;
-
-          for (const line of result.stdout.split('\n')) {
-            if (line.includes(' warning: ')) {
-              console.log(
-                line
-                  .split(' warning: ')
-                  .map((part) => chalk.whiteBright(part))
-                  .join(chalk.magentaBright(' warning: '))
-              );
-              state = 'code-line';
-            } else if (line.includes(' note: ')) {
-              const lineParts = line.split(' note: ');
-              lineParts[0] = chalk.whiteBright(lineParts[0]);
-              console.log(lineParts.join(chalk.grey(' note: ')));
-              state = 'code-line';
-            } else if (line.startsWith('error:')) {
-              console.log(
-                chalk.redBright('error: ') + line.split(' ').slice(1).join(' ')
-              );
-            } else if (state === 'code-line') {
-              console.log(line);
-              state = 'post-code-line';
-            } else if (state === 'post-code-line') {
-              console.log(chalk.greenBright(line));
-            } else {
-              console.log(line);
-            }
-          }
+          console.log(result.stdout);
 
           if (result.status !== 0) {
             console.error(result.stderr);

From 4ec2de659fa797a3a906c3a050cc0b3ccd491553 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 7 Jun 2022 12:09:08 +0200
Subject: [PATCH 458/811] chore: fix nan spec runner on macOS (#34447)

---
 script/nan-spec-runner.js | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
index f7934c76a629a..f022f3da25fa7 100644
--- a/script/nan-spec-runner.js
+++ b/script/nan-spec-runner.js
@@ -18,7 +18,8 @@ const args = require('minimist')(process.argv.slice(2), {
 });
 
 async function main () {
-  const nodeDir = path.resolve(BASE, `out/${utils.getOutDir({ shouldLog: true })}/gen/node_headers`);
+  const outDir = utils.getOutDir({ shouldLog: true });
+  const nodeDir = path.resolve(BASE, 'out', outDir, 'gen', 'node_headers');
   const env = Object.assign({}, process.env, {
     npm_config_nodedir: nodeDir,
     npm_config_msvs_version: '2019',
@@ -31,6 +32,25 @@ async function main () {
   const cxx = path.resolve(clangDir, 'clang++');
   const ld = path.resolve(clangDir, 'lld');
 
+  const platformFlags = [];
+  if (process.platform === 'darwin') {
+    const sdkPath = path.resolve(BASE, 'out', outDir, 'sdk', 'xcode_links');
+    const sdks = (await fs.promises.readdir(sdkPath)).filter(fileName => fileName.endsWith('.sdk'));
+    const sdkToUse = sdks[0];
+    if (!sdkToUse) {
+      console.error('Could not find an SDK to use for the NAN tests');
+      process.exit(1);
+    }
+
+    if (sdks.length) {
+      console.warn(`Multiple SDKs found in the xcode_links directory - using ${sdkToUse}`);
+    }
+
+    platformFlags.push(
+      `-isysroot ${path.resolve(sdkPath, sdkToUse)}`
+    );
+  }
+
   // TODO(ckerr) this is cribbed from read obj/electron/electron_app.ninja.
   // Maybe it would be better to have this script literally open up that
   // file and pull cflags_cc from it instead of using bespoke code here?
@@ -41,15 +61,17 @@ async function main () {
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++', 'trunk', 'include')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++abi', 'trunk', 'include')}"`,
-    '-fPIC'
+    '-fPIC',
+    ...platformFlags
   ].join(' ');
 
   const ldflags = [
     '-stdlib=libc++',
     '-fuse-ld=lld',
-    `-L"${path.resolve(BASE, 'out', `${utils.getOutDir({ shouldLog: true })}`, 'obj', 'buildtools', 'third_party', 'libc++abi')}"`,
-    `-L"${path.resolve(BASE, 'out', `${utils.getOutDir({ shouldLog: true })}`, 'obj', 'buildtools', 'third_party', 'libc++')}"`,
-    '-lc++abi'
+    `-L"${path.resolve(BASE, 'out', outDir, 'obj', 'buildtools', 'third_party', 'libc++abi')}"`,
+    `-L"${path.resolve(BASE, 'out', outDir, 'obj', 'buildtools', 'third_party', 'libc++')}"`,
+    '-lc++abi',
+    ...platformFlags
   ].join(' ');
 
   if (process.platform !== 'win32') {
@@ -66,6 +88,7 @@ async function main () {
     cwd: NAN_DIR,
     stdio: 'inherit'
   });
+
   if (buildStatus !== 0) {
     console.error('Failed to build nan test modules');
     return process.exit(buildStatus);

From 5f0f51748685e3d1e3145e742bec08f7090050d4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 06:01:42 -0700
Subject: [PATCH 459/811] Bump v21.0.0-nightly.20220607

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9d04f0a9c0699..6629a5431ddbb 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220606
\ No newline at end of file
+21.0.0-nightly.20220607
\ No newline at end of file
diff --git a/package.json b/package.json
index e251b80a32457..b8f9b0d444ff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220606",
+  "version": "21.0.0-nightly.20220607",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index df4cea0efdeb2..6139ac73fc46c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220606
- PRODUCTVERSION 21,0,0,20220606
+ FILEVERSION 21,0,0,20220607
+ PRODUCTVERSION 21,0,0,20220607
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c75093632857fb558b2ca9afd7df7ecfa03e069b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:09:18 -0700
Subject: [PATCH 460/811] Revert "Bump v21.0.0-nightly.20220607"

This reverts commit 5f0f51748685e3d1e3145e742bec08f7090050d4.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6629a5431ddbb..9d04f0a9c0699 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220607
\ No newline at end of file
+21.0.0-nightly.20220606
\ No newline at end of file
diff --git a/package.json b/package.json
index b8f9b0d444ff7..e251b80a32457 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220607",
+  "version": "21.0.0-nightly.20220606",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6139ac73fc46c..df4cea0efdeb2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220607
- PRODUCTVERSION 21,0,0,20220607
+ FILEVERSION 21,0,0,20220606
+ PRODUCTVERSION 21,0,0,20220606
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a203123473f1811f77ec8d50f611a54eb2b9d9bb Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:11:11 -0700
Subject: [PATCH 461/811] Bump v21.0.0-nightly.20220607

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9d04f0a9c0699..6629a5431ddbb 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220606
\ No newline at end of file
+21.0.0-nightly.20220607
\ No newline at end of file
diff --git a/package.json b/package.json
index e251b80a32457..b8f9b0d444ff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220606",
+  "version": "21.0.0-nightly.20220607",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index df4cea0efdeb2..6139ac73fc46c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220606
- PRODUCTVERSION 21,0,0,20220606
+ FILEVERSION 21,0,0,20220607
+ PRODUCTVERSION 21,0,0,20220607
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8e97f3badf17eb3f3379f29aea9d4acf47b3bd50 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:12:33 -0700
Subject: [PATCH 462/811] Revert "Bump v21.0.0-nightly.20220607"

This reverts commit a203123473f1811f77ec8d50f611a54eb2b9d9bb.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6629a5431ddbb..9d04f0a9c0699 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220607
\ No newline at end of file
+21.0.0-nightly.20220606
\ No newline at end of file
diff --git a/package.json b/package.json
index b8f9b0d444ff7..e251b80a32457 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220607",
+  "version": "21.0.0-nightly.20220606",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6139ac73fc46c..df4cea0efdeb2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220607
- PRODUCTVERSION 21,0,0,20220607
+ FILEVERSION 21,0,0,20220606
+ PRODUCTVERSION 21,0,0,20220606
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f44ecb7f031bbe22289be1007093cff5057cb6cf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:30:55 -0700
Subject: [PATCH 463/811] Bump v21.0.0-nightly.20220607

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9d04f0a9c0699..6629a5431ddbb 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220606
\ No newline at end of file
+21.0.0-nightly.20220607
\ No newline at end of file
diff --git a/package.json b/package.json
index e251b80a32457..b8f9b0d444ff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220606",
+  "version": "21.0.0-nightly.20220607",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index df4cea0efdeb2..6139ac73fc46c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220606
- PRODUCTVERSION 21,0,0,20220606
+ FILEVERSION 21,0,0,20220607
+ PRODUCTVERSION 21,0,0,20220607
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 16db5a112e3cde7d9ee8ea817f52bf2b9af7568f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 7 Jun 2022 18:59:50 +0200
Subject: [PATCH 464/811] fix: html fullscreen transitions stacking (#32905)

* fix: html fullscreen transitions stacking

* spec: move webview test to spec-main
---
 .../browser/api/electron_api_web_contents.cc  | 10 ++-
 shell/browser/native_window.cc                |  9 +++
 shell/browser/native_window.h                 | 16 +++++
 shell/browser/native_window_mac.h             | 13 ----
 shell/browser/native_window_mac.mm            | 14 ----
 .../ui/cocoa/electron_ns_window_delegate.mm   |  8 +--
 spec-main/api-browser-window-spec.ts          | 67 ++++++++++++++++++-
 spec-main/chromium-spec.ts                    | 33 ++++++++-
 .../fixtures/webview/fullscreen/frame.html    |  1 +
 spec-main/webview-spec.ts                     | 58 ++++++++++++++--
 spec/fixtures/pages/fullscreen.html           |  2 +-
 spec/webview-spec.js                          | 14 ----
 12 files changed, 184 insertions(+), 61 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 1422083e5d511..f719bcbd7cbf4 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -3673,7 +3673,12 @@ void WebContents::EnumerateDirectory(
 
 bool WebContents::IsFullscreenForTabOrPending(
     const content::WebContents* source) {
-  return html_fullscreen_;
+  bool transition_fs = owner_window()
+                           ? owner_window()->fullscreen_transition_state() !=
+                                 NativeWindow::FullScreenTransitionState::NONE
+                           : false;
+
+  return html_fullscreen_ || transition_fs;
 }
 
 bool WebContents::TakeFocus(content::WebContents* source, bool reverse) {
@@ -3995,9 +4000,8 @@ void WebContents::SetHtmlApiFullscreen(bool enter_fullscreen) {
           ? !web_preferences->ShouldDisableHtmlFullscreenWindowResize()
           : true;
 
-  if (html_fullscreenable) {
+  if (html_fullscreenable)
     owner_window_->SetFullScreen(enter_fullscreen);
-  }
 
   UpdateHtmlApiFullscreen(enter_fullscreen);
   native_fullscreen_ = false;
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 989d816c17c8a..414cb2ec4e01a 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -718,6 +718,15 @@ std::string NativeWindow::GetAccessibleTitle() {
   return base::UTF16ToUTF8(accessible_title_);
 }
 
+void NativeWindow::HandlePendingFullscreenTransitions() {
+  if (pending_transitions_.empty())
+    return;
+
+  bool next_transition = pending_transitions_.front();
+  pending_transitions_.pop();
+  SetFullScreen(next_transition);
+}
+
 // static
 int32_t NativeWindow::next_id_ = 0;
 
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index febc36213fd04..3170c1911c074 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -7,6 +7,7 @@
 
 #include <list>
 #include <memory>
+#include <queue>
 #include <string>
 #include <vector>
 
@@ -317,6 +318,17 @@ class NativeWindow : public base::SupportsUserData,
     observers_.RemoveObserver(obs);
   }
 
+  enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
+
+  // Handle fullscreen transitions.
+  void HandlePendingFullscreenTransitions();
+  void set_fullscreen_transition_state(FullScreenTransitionState state) {
+    fullscreen_transition_state_ = state;
+  }
+  FullScreenTransitionState fullscreen_transition_state() const {
+    return fullscreen_transition_state_;
+  }
+
   views::Widget* widget() const { return widget_.get(); }
   views::View* content_view() const { return content_view_; }
 
@@ -375,6 +387,10 @@ class NativeWindow : public base::SupportsUserData,
   // The "titleBarStyle" option.
   TitleBarStyle title_bar_style_ = TitleBarStyle::kNormal;
 
+  std::queue<bool> pending_transitions_;
+  FullScreenTransitionState fullscreen_transition_state_ =
+      FullScreenTransitionState::NONE;
+
  private:
   std::unique_ptr<views::Widget> widget_;
 
diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index 9b02cb44327b2..2ed12d23d903f 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -8,7 +8,6 @@
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
-#include <queue>
 #include <string>
 #include <vector>
 
@@ -172,11 +171,6 @@ class NativeWindowMac : public NativeWindow,
   void SetCollectionBehavior(bool on, NSUInteger flag);
   void SetWindowLevel(int level);
 
-  enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
-
-  // Handle fullscreen transitions.
-  void SetFullScreenTransitionState(FullScreenTransitionState state);
-  void HandlePendingFullscreenTransitions();
   bool HandleDeferredClose();
   void SetHasDeferredWindowClose(bool defer_close) {
     has_deferred_window_close_ = defer_close;
@@ -247,13 +241,6 @@ class NativeWindowMac : public NativeWindow,
   bool zoom_to_page_width_ = false;
   absl::optional<gfx::Point> traffic_light_position_;
 
-  std::queue<bool> pending_transitions_;
-  FullScreenTransitionState fullscreen_transition_state() const {
-    return fullscreen_transition_state_;
-  }
-  FullScreenTransitionState fullscreen_transition_state_ =
-      FullScreenTransitionState::NONE;
-
   // Trying to close an NSWindow during a fullscreen transition will cause the
   // window to lock up. Use this to track if CloseWindow was called during a
   // fullscreen transition, to defer the -[NSWindow close] call until the
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index e3cbfefd9c4dd..9cd1ab4b2d5e6 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -582,11 +582,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   return [window_ isVisible] && !occluded && !IsMinimized();
 }
 
-void NativeWindowMac::SetFullScreenTransitionState(
-    FullScreenTransitionState state) {
-  fullscreen_transition_state_ = state;
-}
-
 bool NativeWindowMac::IsEnabled() {
   return [window_ attachedSheet] == nil;
 }
@@ -670,15 +665,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   return [window_ isMiniaturized];
 }
 
-void NativeWindowMac::HandlePendingFullscreenTransitions() {
-  if (pending_transitions_.empty())
-    return;
-
-  bool next_transition = pending_transitions_.front();
-  pending_transitions_.pop();
-  SetFullScreen(next_transition);
-}
-
 bool NativeWindowMac::HandleDeferredClose() {
   if (has_deferred_window_close_) {
     SetHasDeferredWindowClose(false);
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 7bd9fdf7d0d42..960dbbaa53e28 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -237,7 +237,7 @@ - (void)windowWillEnterFullScreen:(NSNotification*)notification {
   // Store resizable mask so it can be restored after exiting fullscreen.
   is_resizable_ = shell_->HasStyleMask(NSWindowStyleMaskResizable);
 
-  shell_->SetFullScreenTransitionState(FullScreenTransitionState::ENTERING);
+  shell_->set_fullscreen_transition_state(FullScreenTransitionState::ENTERING);
 
   shell_->NotifyWindowWillEnterFullScreen();
 
@@ -246,7 +246,7 @@ - (void)windowWillEnterFullScreen:(NSNotification*)notification {
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
-  shell_->SetFullScreenTransitionState(FullScreenTransitionState::NONE);
+  shell_->set_fullscreen_transition_state(FullScreenTransitionState::NONE);
 
   shell_->NotifyWindowEnterFullScreen();
 
@@ -257,13 +257,13 @@ - (void)windowDidEnterFullScreen:(NSNotification*)notification {
 }
 
 - (void)windowWillExitFullScreen:(NSNotification*)notification {
-  shell_->SetFullScreenTransitionState(FullScreenTransitionState::EXITING);
+  shell_->set_fullscreen_transition_state(FullScreenTransitionState::EXITING);
 
   shell_->NotifyWindowWillLeaveFullScreen();
 }
 
 - (void)windowDidExitFullScreen:(NSNotification*)notification {
-  shell_->SetFullScreenTransitionState(FullScreenTransitionState::NONE);
+  shell_->set_fullscreen_transition_state(FullScreenTransitionState::NONE);
 
   shell_->SetResizable(is_resizable_);
   shell_->NotifyWindowLeaveFullScreen();
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index c140ae15ae28c..f35cdbec8339f 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4731,19 +4731,80 @@ describe('BrowserWindow module', () => {
         expect(w.isFullScreen()).to.be.false('is fullscreen');
       });
 
+      it('handles several HTML fullscreen transitions', async () => {
+        const w = new BrowserWindow();
+        await w.loadFile(path.join(fixtures, 'pages', 'a.html'));
+
+        expect(w.isFullScreen()).to.be.false('is fullscreen');
+
+        const enterFullScreen = emittedOnce(w, 'enter-full-screen');
+        const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
+
+        await w.webContents.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
+        await enterFullScreen;
+        await w.webContents.executeJavaScript('document.exitFullscreen()', true);
+        await leaveFullScreen;
+
+        expect(w.isFullScreen()).to.be.false('is fullscreen');
+
+        await delay();
+
+        await w.webContents.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
+        await enterFullScreen;
+        await w.webContents.executeJavaScript('document.exitFullscreen()', true);
+        await leaveFullScreen;
+
+        expect(w.isFullScreen()).to.be.false('is fullscreen');
+      });
+
       it('handles several transitions in close proximity', async () => {
         const w = new BrowserWindow();
 
         expect(w.isFullScreen()).to.be.false('is fullscreen');
 
+        const enterFS = emittedNTimes(w, 'enter-full-screen', 2);
+        const leaveFS = emittedNTimes(w, 'leave-full-screen', 2);
+
         w.setFullScreen(true);
         w.setFullScreen(false);
         w.setFullScreen(true);
+        w.setFullScreen(false);
 
-        const enterFullScreen = emittedNTimes(w, 'enter-full-screen', 2);
-        await enterFullScreen;
+        await Promise.all([enterFS, leaveFS]);
 
-        expect(w.isFullScreen()).to.be.true('not fullscreen');
+        expect(w.isFullScreen()).to.be.false('not fullscreen');
+      });
+
+      it('handles several chromium-initiated transitions in close proximity', async () => {
+        const w = new BrowserWindow();
+        await w.loadFile(path.join(fixtures, 'pages', 'a.html'));
+
+        expect(w.isFullScreen()).to.be.false('is fullscreen');
+
+        let enterCount = 0;
+        let exitCount = 0;
+
+        const done = new Promise<void>(resolve => {
+          const checkDone = () => {
+            if (enterCount === 2 && exitCount === 2) resolve();
+          };
+
+          w.webContents.on('enter-html-full-screen', () => {
+            enterCount++;
+            checkDone();
+          });
+
+          w.webContents.on('leave-html-full-screen', () => {
+            exitCount++;
+            checkDone();
+          });
+        });
+
+        await w.webContents.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
+        await w.webContents.executeJavaScript('document.exitFullscreen()');
+        await w.webContents.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
+        await w.webContents.executeJavaScript('document.exitFullscreen()');
+        await done;
       });
 
       it('does not crash when exiting simpleFullScreen (properties)', async () => {
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 3ebadfe1bf2ca..d6bc5cd897a85 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -10,7 +10,7 @@ import * as url from 'url';
 import * as ChildProcess from 'child_process';
 import { EventEmitter } from 'events';
 import { promisify } from 'util';
-import { ifit, ifdescribe, delay, defer } from './spec-helpers';
+import { ifit, ifdescribe, defer, delay } from './spec-helpers';
 import { AddressInfo } from 'net';
 import { PipeTransport } from './pipe-transport';
 
@@ -1590,7 +1590,7 @@ describe('iframe using HTML fullscreen API while window is OS-fullscreened', ()
     server.close();
   });
 
-  it('can fullscreen from out-of-process iframes (OOPIFs)', async () => {
+  ifit(process.platform !== 'darwin')('can fullscreen from out-of-process iframes (non-macOS)', async () => {
     const fullscreenChange = emittedOnce(ipcMain, 'fullscreenChange');
     const html =
       '<iframe style="width: 0" frameborder=0 src="http://localhost:8989" allowfullscreen></iframe>';
@@ -1614,8 +1614,37 @@ describe('iframe using HTML fullscreen API while window is OS-fullscreened', ()
     expect(width).to.equal(0);
   });
 
+  ifit(process.platform === 'darwin')('can fullscreen from out-of-process iframes (macOS)', async () => {
+    await emittedOnce(w, 'enter-full-screen');
+    const fullscreenChange = emittedOnce(ipcMain, 'fullscreenChange');
+    const html =
+      '<iframe style="width: 0" frameborder=0 src="http://localhost:8989" allowfullscreen></iframe>';
+    w.loadURL(`data:text/html,${html}`);
+    await fullscreenChange;
+
+    const fullscreenWidth = await w.webContents.executeJavaScript(
+      "document.querySelector('iframe').offsetWidth"
+    );
+    expect(fullscreenWidth > 0).to.be.true();
+
+    await w.webContents.executeJavaScript(
+      "document.querySelector('iframe').contentWindow.postMessage('exitFullscreen', '*')"
+    );
+    await emittedOnce(w.webContents, 'leave-html-full-screen');
+
+    const width = await w.webContents.executeJavaScript(
+      "document.querySelector('iframe').offsetWidth"
+    );
+    expect(width).to.equal(0);
+
+    w.setFullScreen(false);
+    await emittedOnce(w, 'leave-full-screen');
+  });
+
   // TODO(jkleinsc) fix this flaky test on WOA
   ifit(process.platform !== 'win32' || process.arch !== 'arm64')('can fullscreen from in-process iframes', async () => {
+    if (process.platform === 'darwin') await emittedOnce(w, 'enter-full-screen');
+
     const fullscreenChange = emittedOnce(ipcMain, 'fullscreenChange');
     w.loadFile(path.join(fixturesPath, 'pages', 'fullscreen-ipif.html'));
     await fullscreenChange;
diff --git a/spec-main/fixtures/webview/fullscreen/frame.html b/spec-main/fixtures/webview/fullscreen/frame.html
index c92571eef4a8b..d7307f0b83bc4 100644
--- a/spec-main/fixtures/webview/fullscreen/frame.html
+++ b/spec-main/fixtures/webview/fullscreen/frame.html
@@ -2,6 +2,7 @@
   <div id="div">
     WebView
   </div>
+  <video></video>
   <script type="text/javascript" charset="utf-8">
     const {ipcRenderer} = require('electron')
     ipcRenderer.send('webview-ready')
diff --git a/spec-main/webview-spec.ts b/spec-main/webview-spec.ts
index ce5a64ef4754f..3e01f7d92fef0 100644
--- a/spec-main/webview-spec.ts
+++ b/spec-main/webview-spec.ts
@@ -426,11 +426,16 @@ describe('<webview> tag', function () {
           contextIsolation: false
         }
       });
+
       const attachPromise = emittedOnce(w.webContents, 'did-attach-webview');
+      const loadPromise = emittedOnce(w.webContents, 'did-finish-load');
       const readyPromise = emittedOnce(ipcMain, 'webview-ready');
+
       w.loadFile(path.join(__dirname, 'fixtures', 'webview', 'fullscreen', 'main.html'));
+
       const [, webview] = await attachPromise;
-      await readyPromise;
+      await Promise.all([readyPromise, loadPromise]);
+
       return [w, webview];
     };
 
@@ -442,17 +447,38 @@ describe('<webview> tag', function () {
       closeAllWindows();
     });
 
-    it('should make parent frame element fullscreen too', async () => {
+    ifit(process.platform !== 'darwin')('should make parent frame element fullscreen too (non-macOS)', async () => {
       const [w, webview] = await loadWebViewWindow();
       expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.false();
 
       const parentFullscreen = emittedOnce(ipcMain, 'fullscreenchange');
       await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
       await parentFullscreen;
+
+      expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.true();
+
+      const close = emittedOnce(w, 'closed');
+      w.close();
+      await close;
+    });
+
+    ifit(process.platform === 'darwin')('should make parent frame element fullscreen too (macOS)', async () => {
+      const [w, webview] = await loadWebViewWindow();
+      expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.false();
+
+      const parentFullscreen = emittedOnce(ipcMain, 'fullscreenchange');
+      const enterHTMLFS = emittedOnce(w.webContents, 'enter-html-full-screen');
+      const leaveHTMLFS = emittedOnce(w.webContents, 'leave-html-full-screen');
+
+      await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
       expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.true();
 
+      await webview.executeJavaScript('document.exitFullscreen()');
+      await Promise.all([enterHTMLFS, leaveHTMLFS, parentFullscreen]);
+
+      const close = emittedOnce(w, 'closed');
       w.close();
-      await emittedOnce(w, 'closed');
+      await close;
     });
 
     // FIXME(zcbenz): Fullscreen events do not work on Linux.
@@ -468,8 +494,9 @@ describe('<webview> tag', function () {
       await delay(0);
       expect(w.isFullScreen()).to.be.false();
 
+      const close = emittedOnce(w, 'closed');
       w.close();
-      await emittedOnce(w, 'closed');
+      await close;
     });
 
     // Sending ESC via sendInputEvent only works on Windows.
@@ -485,8 +512,9 @@ describe('<webview> tag', function () {
       await delay(0);
       expect(w.isFullScreen()).to.be.false();
 
+      const close = emittedOnce(w, 'closed');
       w.close();
-      await emittedOnce(w, 'closed');
+      await close;
     });
 
     it('pressing ESC should emit the leave-html-full-screen event', async () => {
@@ -513,11 +541,27 @@ describe('<webview> tag', function () {
       const leaveFSWindow = emittedOnce(w, 'leave-html-full-screen');
       const leaveFSWebview = emittedOnce(webContents, 'leave-html-full-screen');
       webContents.sendInputEvent({ type: 'keyDown', keyCode: 'Escape' });
-      await leaveFSWindow;
       await leaveFSWebview;
+      await leaveFSWindow;
+
+      const close = emittedOnce(w, 'closed');
+      w.close();
+      await close;
+    });
+
+    it('should support user gesture', async () => {
+      const [w, webview] = await loadWebViewWindow();
+
+      const waitForEnterHtmlFullScreen = emittedOnce(webview, 'enter-html-full-screen');
+
+      const jsScript = "document.querySelector('video').webkitRequestFullscreen()";
+      webview.executeJavaScript(jsScript, true);
+
+      await waitForEnterHtmlFullScreen;
 
+      const close = emittedOnce(w, 'closed');
       w.close();
-      await emittedOnce(w, 'closed');
+      await close;
     });
   });
 
diff --git a/spec/fixtures/pages/fullscreen.html b/spec/fixtures/pages/fullscreen.html
index 4e5648e0194d2..ee8e403f43220 100644
--- a/spec/fixtures/pages/fullscreen.html
+++ b/spec/fixtures/pages/fullscreen.html
@@ -1 +1 @@
-<video></video>
+<video></video>
\ No newline at end of file
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 377d96b396660..d47adedf2dcd6 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -910,20 +910,6 @@ describe('<webview> tag', function () {
   });
 
   describe('executeJavaScript', () => {
-    it('should support user gesture', async () => {
-      await loadWebView(webview, {
-        src: `file://${fixtures}/pages/fullscreen.html`
-      });
-
-      // Event handler has to be added before js execution.
-      const waitForEnterHtmlFullScreen = waitForEvent(webview, 'enter-html-full-screen');
-
-      const jsScript = "document.querySelector('video').webkitRequestFullscreen()";
-      webview.executeJavaScript(jsScript, true);
-
-      return waitForEnterHtmlFullScreen;
-    });
-
     it('can return the result of the executed script', async () => {
       await loadWebView(webview, {
         src: 'about:blank'

From 289128b96cd60d8a29a08df3d301c20e64ca89b8 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 8 Jun 2022 01:29:39 -0700
Subject: [PATCH 465/811] chore: use --root instead of --project_root for
 cpplint (#34456)

--root has been improved upstream in depot_tools to better handle Windows:
https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3648533
---
 script/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lint.js b/script/lint.js
index 6cfb8143cd081..e2735cee1a1c7 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -44,7 +44,7 @@ function spawnAndCheckExitCode (cmd, args, opts) {
 }
 
 function cpplint (args) {
-  args.unshift(`--project_root=${SOURCE_ROOT}`);
+  args.unshift(`--root=${SOURCE_ROOT}`);
   const result = childProcess.spawnSync(IS_WINDOWS ? 'cpplint.bat' : 'cpplint.py', args, { encoding: 'utf8', shell: true });
   // cpplint.py writes EVERYTHING to stderr, including status messages
   if (result.stderr) {

From 6d50717eed6535fe8937cb20770dd00dc44a5a8a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 06:00:42 -0700
Subject: [PATCH 466/811] Bump v21.0.0-nightly.20220608

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6629a5431ddbb..c9d035057e06a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220607
\ No newline at end of file
+21.0.0-nightly.20220608
\ No newline at end of file
diff --git a/package.json b/package.json
index b8f9b0d444ff7..93615daed2937 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220607",
+  "version": "21.0.0-nightly.20220608",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6139ac73fc46c..c692a2fc2166f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220607
- PRODUCTVERSION 21,0,0,20220607
+ FILEVERSION 21,0,0,20220608
+ PRODUCTVERSION 21,0,0,20220608
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 2fd0194e94658ed9af12a38f79222e15785287fa Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 8 Jun 2022 21:26:41 +0200
Subject: [PATCH 467/811] build: update clang-format script (#34286)

---
 package.json               |  5 ++-
 script/lint.js             |  8 ++--
 script/run-clang-format.py | 77 +++++++++++++++++++++++++-------------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 93615daed2937..f13dc734ad1c1 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
   "scripts": {
     "asar": "asar",
     "generate-version-json": "node script/generate-version-json.js",
-    "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
+    "lint": "node ./script/lint.js && npm run lint:docs",
     "lint:js": "node ./script/lint.js --js",
     "lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
     "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
@@ -94,6 +94,7 @@
     "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
     "pre-flight": "pre-flight",
     "gn-check": "node ./script/gn-check.js",
+    "gn-format": "python3 script/run-gn-format.py",
     "precommit": "lint-staged",
     "preinstall": "node -e 'process.exit(0)'",
     "prepack": "check-for-leaks",
@@ -124,7 +125,7 @@
     ],
     "*.{gn,gni}": [
       "npm run gn-check",
-      "python3 script/run-gn-format.py"
+      "npm run gn-format"
     ],
     "*.py": [
       "node script/lint.js --py --fix --only --"
diff --git a/script/lint.js b/script/lint.js
index e2735cee1a1c7..2047f02253d72 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -70,9 +70,9 @@ const LINTERS = [{
   test: filename => filename.endsWith('.cc') || (filename.endsWith('.h') && !isObjCHeader(filename)),
   run: (opts, filenames) => {
     if (opts.fix) {
-      spawnAndCheckExitCode('python', ['script/run-clang-format.py', '--fix', ...filenames]);
+      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', '--fix', ...filenames]);
     } else {
-      spawnAndCheckExitCode('python', ['script/run-clang-format.py', ...filenames]);
+      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', ...filenames]);
     }
     cpplint(filenames);
   }
@@ -82,9 +82,9 @@ const LINTERS = [{
   test: filename => filename.endsWith('.mm') || (filename.endsWith('.h') && isObjCHeader(filename)),
   run: (opts, filenames) => {
     if (opts.fix) {
-      spawnAndCheckExitCode('python', ['script/run-clang-format.py', '--fix', ...filenames]);
+      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', '--fix', ...filenames]);
     } else {
-      spawnAndCheckExitCode('python', ['script/run-clang-format.py', ...filenames]);
+      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', ...filenames]);
     }
     const filter = [
       '-readability/braces',
diff --git a/script/run-clang-format.py b/script/run-clang-format.py
index 33548391c23e1..345b504617697 100644
--- a/script/run-clang-format.py
+++ b/script/run-clang-format.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """A wrapper script around clang-format, suitable for linting multiple files
 and to use for continuous integration.
+
 This is an alternative API for the clang-format command line.
 It runs over multiple files and directories in parallel.
 A diff output is produced and a sensible exit code is returned.
@@ -11,6 +12,7 @@
 import argparse
 import codecs
 import difflib
+import errno
 import fnmatch
 import io
 import multiprocessing
@@ -26,13 +28,28 @@
 from lib.util import get_buildtools_executable
 
 DEFAULT_EXTENSIONS = 'c,h,C,H,cpp,hpp,cc,hh,c++,h++,cxx,hxx,mm'
-
+DEFAULT_CLANG_FORMAT_IGNORE = '.clang-format-ignore'
 
 class ExitStatus:
     SUCCESS = 0
     DIFF = 1
     TROUBLE = 2
 
+def excludes_from_file(ignore_file):
+    excludes = []
+    try:
+        with io.open(ignore_file, 'r', encoding='utf-8') as f:
+            for line in f:
+                if line.startswith('#'):
+                    continue
+                pattern = line.rstrip()
+                if not pattern:
+                    continue
+                excludes.append(pattern)
+    except EnvironmentError as e:
+        if e.errno != errno.ENOENT:
+            raise
+    return excludes
 
 def list_files(files, recursive=False, extensions=None, exclude=None):
     if extensions is None:
@@ -77,15 +94,13 @@ def make_diff(diff_file, original, reformatted):
 
 class DiffError(Exception):
     def __init__(self, message, errs=None):
-        # pylint: disable=R1725
-        super(DiffError, self).__init__(message)
+        super().__init__(message)
         self.errs = errs or []
 
 
 class UnexpectedError(Exception):
     def __init__(self, message, exc=None):
-        # pylint: disable=R1725
-        super(UnexpectedError, self).__init__(message)
+        super().__init__(message)
         self.formatted_traceback = traceback.format_exc()
         self.exc = exc
 
@@ -112,6 +127,11 @@ def run_clang_format_diff(args, file_name):
     invocation = [args.clang_format_executable, file_name]
     if args.fix:
         invocation.append('-i')
+    if args.style:
+        invocation.extend(['--style', args.style])
+    if args.dry_run:
+        print(" ".join(invocation))
+        return [], []
     try:
         proc = subprocess.Popen(
             ' '.join(invocation),
@@ -121,19 +141,13 @@ def run_clang_format_diff(args, file_name):
             shell=True)
     except OSError as exc:
         # pylint: disable=W0707
-        raise DiffError(str(exc))
-    proc_stdout = proc.stdout
-    proc_stderr = proc.stderr
-    if sys.version_info[0] == 3:
-        proc_stdout = proc_stdout.detach()
-        proc_stderr = proc_stderr.detach()
-    # make the pipes compatible with Python 3,
-    # reading lines should output unicode
-    encoding = 'utf-8'
-    proc_stdout = codecs.getreader(encoding)(proc_stdout)
-    proc_stderr = codecs.getreader(encoding)(proc_stderr)
-    outs = list(proc_stdout.readlines())
-    errs = list(proc_stderr.readlines())
+        raise DiffError(
+            "Command '{}' failed to start: {}".format(
+                subprocess.list2cmdline(invocation), exc
+            )
+        )
+    outs = list(proc.stdout.readlines())
+    errs = list(proc.stderr.readlines())
     proc.wait()
     if proc.returncode:
         raise DiffError("clang-format exited with status {}: '{}'".format(
@@ -212,6 +226,11 @@ def main():
         '--recursive',
         action='store_true',
         help='run recursively over directories')
+    parser.add_argument(
+        '-d',
+        '--dry-run',
+        action='store_true',
+        help='just print the list of files')
     parser.add_argument('files', metavar='file', nargs='+')
     parser.add_argument(
         '-q',
@@ -242,6 +261,10 @@ def main():
         default=[],
         help='exclude paths matching the given glob-like pattern(s)'
         ' from recursive search')
+    parser.add_argument(
+        '--style',
+        help='formatting style to apply '
+        '(LLVM/Google/Chromium/Mozilla/WebKit)')
 
     args = parser.parse_args()
 
@@ -269,13 +292,14 @@ def main():
 
     parse_files = []
     if args.changed:
-        popen = subprocess.Popen(
-            'git diff --name-only --cached',
+        stdout = subprocess.Popen(
+            "git diff --name-only --cached",
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            shell=True
-        )
-        for line in popen.stdout:
+            shell=True,
+            universal_newlines=True
+        ).communicate()[0].split("\n")
+        for line in stdout:
             file_name = line.rstrip()
             # don't check deleted files
             if os.path.isfile(file_name):
@@ -284,14 +308,17 @@ def main():
     else:
         parse_files = args.files
 
+    excludes = excludes_from_file(DEFAULT_CLANG_FORMAT_IGNORE)
+    excludes.extend(args.exclude)
+
     files = list_files(
         parse_files,
         recursive=args.recursive,
-        exclude=args.exclude,
+        exclude=excludes,
         extensions=args.extensions.split(','))
 
     if not files:
-        return 0
+        return ExitStatus.SUCCESS
 
     njobs = args.j
     if njobs == 0:

From 37d93b04824d4f0151b36edb867209b53272457f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 9 Jun 2022 10:48:50 +0200
Subject: [PATCH 468/811] fix: update normal bounds prior to minimizing
 (#34473)

---
 shell/browser/native_window_mac.h             |   2 +
 shell/browser/native_window_mac.mm            |  15 +-
 .../ui/cocoa/electron_ns_window_delegate.mm   |   1 +
 spec-main/api-browser-window-spec.ts          | 173 ++++++++++++++++++
 4 files changed, 186 insertions(+), 5 deletions(-)

diff --git a/shell/browser/native_window_mac.h b/shell/browser/native_window_mac.h
index 2ed12d23d903f..ef5ab1b10e12b 100644
--- a/shell/browser/native_window_mac.h
+++ b/shell/browser/native_window_mac.h
@@ -165,6 +165,8 @@ class NativeWindowMac : public NativeWindow,
 
   void UpdateVibrancyRadii(bool fullscreen);
 
+  void UpdateWindowOriginalFrame();
+
   // Set the attribute of NSWindow while work around a bug of zoom button.
   bool HasStyleMask(NSUInteger flag) const;
   void SetStyleMask(bool on, NSUInteger flag);
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 9cd1ab4b2d5e6..e806c9eb539a0 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -447,7 +447,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   SetContentView(new views::View());
   AddContentViewLayers();
 
-  original_frame_ = [window_ frame];
+  UpdateWindowOriginalFrame();
   original_level_ = [window_ level];
 }
 
@@ -609,7 +609,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
   // Take note of the current window size
   if (IsNormal())
-    original_frame_ = [window_ frame];
+    UpdateWindowOriginalFrame();
   [window_ zoom:nil];
 
   if (!is_visible) {
@@ -653,7 +653,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
   // Take note of the current window size
   if (IsNormal())
-    original_frame_ = [window_ frame];
+    UpdateWindowOriginalFrame();
   [window_ miniaturize:nil];
 }
 
@@ -697,7 +697,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
   // Take note of the current window size
   if (IsNormal())
-    original_frame_ = [window_ frame];
+    UpdateWindowOriginalFrame();
 
   // This needs to be set here because it can be the case that
   // SetFullScreen is called by a user before windowWillEnterFullScreen
@@ -733,6 +733,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
   [window_ setFrame:cocoa_bounds display:YES animate:animate];
   user_set_bounds_maximized_ = IsMaximized() ? true : false;
+  UpdateWindowOriginalFrame();
 }
 
 gfx::Rect NativeWindowMac::GetBounds() {
@@ -1005,7 +1006,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
     // Take note of the current window size and level
     if (IsNormal()) {
-      original_frame_ = [window_ frame];
+      UpdateWindowOriginalFrame();
       original_level_ = [window_ level];
     }
 
@@ -1402,6 +1403,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   }
 }
 
+void NativeWindowMac::UpdateWindowOriginalFrame() {
+  original_frame_ = [window_ frame];
+}
+
 void NativeWindowMac::SetVibrancy(const std::string& type) {
   NSVisualEffectView* vibrantView = [window_ vibrantView];
 
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 960dbbaa53e28..362f464f91c82 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -203,6 +203,7 @@ - (void)windowWillMiniaturize:(NSNotification*)notification {
   // windowDidDeminiaturize
   level_ = [window level];
   shell_->SetWindowLevel(NSNormalWindowLevel);
+  shell_->UpdateWindowOriginalFrame();
 }
 
 - (void)windowDidMiniaturize:(NSNotification*)notification {
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index f35cdbec8339f..e6cd0971be06e 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1228,6 +1228,7 @@ describe('BrowserWindow module', () => {
           await resize;
           expectBoundsEqual(w.getNormalBounds(), w.getBounds());
         });
+
         it('checks normal bounds after move', async () => {
           const pos = [10, 10];
           const move = emittedOnce(w, 'move');
@@ -1246,6 +1247,51 @@ describe('BrowserWindow module', () => {
           await maximize;
           expectBoundsEqual(w.getNormalBounds(), bounds);
         });
+
+        it('updates normal bounds after resize and maximize', async () => {
+          const size = [300, 400];
+          const resize = emittedOnce(w, 'resize');
+          w.setSize(size[0], size[1]);
+          await resize;
+          const original = w.getBounds();
+
+          const maximize = emittedOnce(w, 'maximize');
+          w.maximize();
+          await maximize;
+
+          const normal = w.getNormalBounds();
+          const bounds = w.getBounds();
+
+          expect(normal).to.deep.equal(original);
+          expect(normal).to.not.deep.equal(bounds);
+
+          const close = emittedOnce(w, 'close');
+          w.close();
+          await close;
+        });
+
+        it('updates normal bounds after move and maximize', async () => {
+          const pos = [10, 10];
+          const move = emittedOnce(w, 'move');
+          w.setPosition(pos[0], pos[1]);
+          await move;
+          const original = w.getBounds();
+
+          const maximize = emittedOnce(w, 'maximize');
+          w.maximize();
+          await maximize;
+
+          const normal = w.getNormalBounds();
+          const bounds = w.getBounds();
+
+          expect(normal).to.deep.equal(original);
+          expect(normal).to.not.deep.equal(bounds);
+
+          const close = emittedOnce(w, 'close');
+          w.close();
+          await close;
+        });
+
         it('checks normal bounds when unmaximized', async () => {
           const bounds = w.getBounds();
           w.once('maximize', () => {
@@ -1257,6 +1303,7 @@ describe('BrowserWindow module', () => {
           await unmaximize;
           expectBoundsEqual(w.getNormalBounds(), bounds);
         });
+
         it('does not change size for a frameless window with min size', async () => {
           w.destroy();
           w = new BrowserWindow({
@@ -1277,6 +1324,7 @@ describe('BrowserWindow module', () => {
           await unmaximize;
           expectBoundsEqual(w.getNormalBounds(), bounds);
         });
+
         it('correctly checks transparent window maximization state', async () => {
           w.destroy();
           w = new BrowserWindow({
@@ -1296,6 +1344,7 @@ describe('BrowserWindow module', () => {
           await unmaximize;
           expect(w.isMaximized()).to.equal(false);
         });
+
         it('returns the correct value for windows with an aspect ratio', async () => {
           w.destroy();
           w = new BrowserWindow({
@@ -1325,6 +1374,41 @@ describe('BrowserWindow module', () => {
           await minimize;
           expectBoundsEqual(w.getNormalBounds(), bounds);
         });
+
+        it('updates normal bounds after move and minimize', async () => {
+          const pos = [10, 10];
+          const move = emittedOnce(w, 'move');
+          w.setPosition(pos[0], pos[1]);
+          await move;
+          const original = w.getBounds();
+
+          const minimize = emittedOnce(w, 'minimize');
+          w.minimize();
+          await minimize;
+
+          const normal = w.getNormalBounds();
+
+          expect(original).to.deep.equal(normal);
+          expectBoundsEqual(normal, w.getBounds());
+        });
+
+        it('updates normal bounds after resize and minimize', async () => {
+          const size = [300, 400];
+          const resize = emittedOnce(w, 'resize');
+          w.setSize(size[0], size[1]);
+          await resize;
+          const original = w.getBounds();
+
+          const minimize = emittedOnce(w, 'minimize');
+          w.minimize();
+          await minimize;
+
+          const normal = w.getNormalBounds();
+
+          expect(original).to.deep.equal(normal);
+          expectBoundsEqual(normal, w.getBounds());
+        });
+
         it('checks normal bounds when restored', async () => {
           const bounds = w.getBounds();
           w.once('minimize', () => {
@@ -1336,6 +1420,7 @@ describe('BrowserWindow module', () => {
           await restore;
           expectBoundsEqual(w.getNormalBounds(), bounds);
         });
+
         it('does not change size for a frameless window with min size', async () => {
           w.destroy();
           w = new BrowserWindow({
@@ -1381,6 +1466,50 @@ describe('BrowserWindow module', () => {
             expectBoundsEqual(w.getNormalBounds(), bounds);
           });
 
+          it('updates normal bounds after resize and fullscreen', async () => {
+            const size = [300, 400];
+            const resize = emittedOnce(w, 'resize');
+            w.setSize(size[0], size[1]);
+            await resize;
+            const original = w.getBounds();
+
+            const fsc = emittedOnce(w, 'enter-full-screen');
+            w.fullScreen = true;
+            await fsc;
+
+            const normal = w.getNormalBounds();
+            const bounds = w.getBounds();
+
+            expect(normal).to.deep.equal(original);
+            expect(normal).to.not.deep.equal(bounds);
+
+            const close = emittedOnce(w, 'close');
+            w.close();
+            await close;
+          });
+
+          it('updates normal bounds after move and fullscreen', async () => {
+            const pos = [10, 10];
+            const move = emittedOnce(w, 'move');
+            w.setPosition(pos[0], pos[1]);
+            await move;
+            const original = w.getBounds();
+
+            const fsc = emittedOnce(w, 'enter-full-screen');
+            w.fullScreen = true;
+            await fsc;
+
+            const normal = w.getNormalBounds();
+            const bounds = w.getBounds();
+
+            expect(normal).to.deep.equal(original);
+            expect(normal).to.not.deep.equal(bounds);
+
+            const close = emittedOnce(w, 'close');
+            w.close();
+            await close;
+          });
+
           it('checks normal bounds when unfullscreen\'ed', async () => {
             const bounds = w.getBounds();
             w.once('enter-full-screen', () => {
@@ -1418,6 +1547,50 @@ describe('BrowserWindow module', () => {
             expectBoundsEqual(w.getNormalBounds(), bounds);
           });
 
+          it('updates normal bounds after resize and fullscreen', async () => {
+            const size = [300, 400];
+            const resize = emittedOnce(w, 'resize');
+            w.setSize(size[0], size[1]);
+            await resize;
+            const original = w.getBounds();
+
+            const fsc = emittedOnce(w, 'enter-full-screen');
+            w.setFullScreen(true);
+            await fsc;
+
+            const normal = w.getNormalBounds();
+            const bounds = w.getBounds();
+
+            expect(normal).to.deep.equal(original);
+            expect(normal).to.not.deep.equal(bounds);
+
+            const close = emittedOnce(w, 'close');
+            w.close();
+            await close;
+          });
+
+          it('updates normal bounds after move and fullscreen', async () => {
+            const pos = [10, 10];
+            const move = emittedOnce(w, 'move');
+            w.setPosition(pos[0], pos[1]);
+            await move;
+            const original = w.getBounds();
+
+            const fsc = emittedOnce(w, 'enter-full-screen');
+            w.setFullScreen(true);
+            await fsc;
+
+            const normal = w.getNormalBounds();
+            const bounds = w.getBounds();
+
+            expect(normal).to.deep.equal(original);
+            expect(normal).to.not.deep.equal(bounds);
+
+            const close = emittedOnce(w, 'close');
+            w.close();
+            await close;
+          });
+
           it('checks normal bounds when unfullscreen\'ed', async () => {
             const bounds = w.getBounds();
             w.show();

From 1302ebf50ee150ca9064de01cd56ceb0882586e2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 06:01:17 -0700
Subject: [PATCH 469/811] Bump v21.0.0-nightly.20220609

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c9d035057e06a..dd80fa8636979 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220608
\ No newline at end of file
+21.0.0-nightly.20220609
\ No newline at end of file
diff --git a/package.json b/package.json
index f13dc734ad1c1..0abdfef8cea9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220608",
+  "version": "21.0.0-nightly.20220609",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index c692a2fc2166f..78cd1e4925962 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220608
- PRODUCTVERSION 21,0,0,20220608
+ FILEVERSION 21,0,0,20220609
+ PRODUCTVERSION 21,0,0,20220609
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 52c0a4fafc3148716cbd03bc8d18aa7379f69ac2 Mon Sep 17 00:00:00 2001
From: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
Date: Thu, 9 Jun 2022 15:17:27 -0400
Subject: [PATCH 470/811] docs: add macOS height option info (#34451)

---
 docs/tutorial/window-customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/window-customization.md b/docs/tutorial/window-customization.md
index a724c72d3f021..49721f35efb67 100644
--- a/docs/tutorial/window-customization.md
+++ b/docs/tutorial/window-customization.md
@@ -115,7 +115,7 @@ const win = new BrowserWindow({
 })
 ```
 
-On Windows, you can also specify additional parameters. The color of the overlay and its symbols can be specified by setting `titleBarOverlay` to an object and using the `color` and `symbolColor` properties respectively. The height of the overlay can also be specified with the `height` property.
+On either platform `titleBarOverlay` can also be an object. On both macOS and Windows, the height of the overlay can be specified with the `height` property. On Windows, the color of the overlay and its symbols can be specified using the `color` and `symbolColor` properties respectively.
 
 If a color option is not specified, the color will default to its system color for the window control buttons. Similarly, if the height option is not specified it will default to the default height:
 

From 57b863c2130c80caf47c4c226ae113bf465a3d9d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 10 Jun 2022 06:02:06 -0700
Subject: [PATCH 471/811] Bump v21.0.0-nightly.20220610

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dd80fa8636979..aa64f188b8481 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220609
\ No newline at end of file
+21.0.0-nightly.20220610
\ No newline at end of file
diff --git a/package.json b/package.json
index 0abdfef8cea9d..efd438b62edf9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220609",
+  "version": "21.0.0-nightly.20220610",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 78cd1e4925962..f0c21e16eb3e6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220609
- PRODUCTVERSION 21,0,0,20220609
+ FILEVERSION 21,0,0,20220610
+ PRODUCTVERSION 21,0,0,20220610
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From bd81ae08acf2a2ebb9f6ca7c17590b472ddae789 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Fri, 10 Jun 2022 14:15:52 -0400
Subject: [PATCH 472/811] fix: don't require glibc 2.29+ on linux arm64 builds
 (#34491)

* build: use sid sysroot for linux arm64
---
 script/sysroots.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/sysroots.json b/script/sysroots.json
index 2f2437ade3e0a..b1b851fd518a8 100644
--- a/script/sysroots.json
+++ b/script/sysroots.json
@@ -10,9 +10,9 @@
         "Tarball": "debian_bullseye_arm_sysroot.tar.xz"
     },
     "bullseye_arm64": {
-        "Sha1Sum": "de38cc85d51a820c3307e1937f3c2d3cedcce988",
+        "Sha1Sum": "5a56c1ef714154ea5003bcafb16f21b0f8dde023",
         "SysrootDir": "debian_bullseye_arm64-sysroot",
-        "Tarball": "debian_bullseye_arm64_sysroot.tar.xz"
+        "Tarball": "debian_sid_arm64_sysroot.tar.xz"
     },
     "bullseye_armel": {
         "Sha1Sum": "db15aab39af3cfbc55a8ff0386943db1b78a1eab",

From e5543a2dd22a79d7ae3fc1ff88c96a46c80e4158 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 13 Jun 2022 08:57:03 +0200
Subject: [PATCH 473/811] fix: all files selection logic on linux (#34496)

---
 shell/browser/ui/file_dialog_gtk.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shell/browser/ui/file_dialog_gtk.cc b/shell/browser/ui/file_dialog_gtk.cc
index 74df37b57d5f1..99f0e1524c36f 100644
--- a/shell/browser/ui/file_dialog_gtk.cc
+++ b/shell/browser/ui/file_dialog_gtk.cc
@@ -32,8 +32,11 @@ static const int kPreviewWidth = 256;
 static const int kPreviewHeight = 512;
 
 std::string MakeCaseInsensitivePattern(const std::string& extension) {
-  std::string pattern("*.");
+  // If the extension is the "all files" extension, no change needed.
+  if (extension == "*")
+    return extension;
 
+  std::string pattern("*.");
   for (std::size_t i = 0, n = extension.size(); i < n; i++) {
     char ch = extension[i];
     if (!base::IsAsciiAlpha(ch)) {

From 7ca3f55b1070594589244a81095884dcc152af37 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 13 Jun 2022 08:58:27 +0200
Subject: [PATCH 474/811] refactor: move duplicate code to
 RendererClientBase::ShouldLoadPreload helper (#34477)

---
 shell/renderer/electron_renderer_client.cc    | 19 +--------------
 .../electron_sandboxed_renderer_client.cc     | 22 +-----------------
 shell/renderer/renderer_client_base.cc        | 23 +++++++++++++++++++
 shell/renderer/renderer_client_base.h         |  3 +++
 4 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index 1c819d13c445b..24c5bc9f7613c 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -24,15 +24,6 @@
 
 namespace electron {
 
-namespace {
-
-bool IsDevToolsExtension(content::RenderFrame* render_frame) {
-  return static_cast<GURL>(render_frame->GetWebFrame()->GetDocument().Url())
-      .SchemeIs("chrome-extension");
-}
-
-}  // namespace
-
 ElectronRendererClient::ElectronRendererClient()
     : node_bindings_(
           NodeBindings::Create(NodeBindings::BrowserEnvironment::kRenderer)),
@@ -77,15 +68,7 @@ void ElectronRendererClient::DidCreateScriptContext(
 
   // Only load Node.js if we are a main frame or a devtools extension
   // unless Node.js support has been explicitly enabled for subframes.
-  auto prefs = render_frame->GetBlinkPreferences();
-  bool is_main_frame = render_frame->IsMainFrame();
-  bool is_devtools = IsDevToolsExtension(render_frame);
-  bool allow_node_in_subframes = prefs.node_integration_in_sub_frames;
-
-  bool should_load_node =
-      (is_main_frame || is_devtools || allow_node_in_subframes) &&
-      !IsWebViewFrame(renderer_context, render_frame);
-  if (!should_load_node)
+  if (!ShouldLoadPreload(renderer_context, render_frame))
     return;
 
   injected_frames_.insert(render_frame);
diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc
index c1f1ae7a61c28..a73404ac026a6 100644
--- a/shell/renderer/electron_sandboxed_renderer_client.cc
+++ b/shell/renderer/electron_sandboxed_renderer_client.cc
@@ -36,16 +36,6 @@ namespace {
 const char kLifecycleKey[] = "lifecycle";
 const char kModuleCacheKey[] = "native-module-cache";
 
-bool IsDevTools(content::RenderFrame* render_frame) {
-  return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-      "devtools");
-}
-
-bool IsDevToolsExtension(content::RenderFrame* render_frame) {
-  return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
-      "chrome-extension");
-}
-
 v8::Local<v8::Object> GetModuleCache(v8::Isolate* isolate) {
   auto context = isolate->GetCurrentContext();
   gin_helper::Dictionary global(isolate, context->Global());
@@ -207,17 +197,7 @@ void ElectronSandboxedRendererClient::DidCreateScriptContext(
   // Only allow preload for the main frame or
   // For devtools we still want to run the preload_bundle script
   // Or when nodeSupport is explicitly enabled in sub frames
-  bool is_main_frame = render_frame->IsMainFrame();
-  bool is_devtools =
-      IsDevTools(render_frame) || IsDevToolsExtension(render_frame);
-
-  bool allow_node_in_sub_frames =
-      render_frame->GetBlinkPreferences().node_integration_in_sub_frames;
-
-  bool should_load_preload =
-      (is_main_frame || is_devtools || allow_node_in_sub_frames) &&
-      !IsWebViewFrame(context, render_frame);
-  if (!should_load_preload)
+  if (!ShouldLoadPreload(context, render_frame))
     return;
 
   injected_frames_.insert(render_frame);
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index ed5fba4a45cf7..c1e177049230d 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -134,6 +134,16 @@ class ChromePdfInternalPluginDelegate final
 // static
 RendererClientBase* g_renderer_client_base = nullptr;
 
+bool IsDevTools(content::RenderFrame* render_frame) {
+  return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
+      "devtools");
+}
+
+bool IsDevToolsExtension(content::RenderFrame* render_frame) {
+  return render_frame->GetWebFrame()->GetDocument().Url().ProtocolIs(
+      "chrome-extension");
+}
+
 }  // namespace
 
 RendererClientBase::RendererClientBase() {
@@ -196,6 +206,19 @@ void RendererClientBase::BindProcess(v8::Isolate* isolate,
   process->SetReadOnly("contextId", context_id);
 }
 
+bool RendererClientBase::ShouldLoadPreload(
+    v8::Handle<v8::Context> context,
+    content::RenderFrame* render_frame) const {
+  auto prefs = render_frame->GetBlinkPreferences();
+  bool is_main_frame = render_frame->IsMainFrame();
+  bool is_devtools =
+      IsDevTools(render_frame) || IsDevToolsExtension(render_frame);
+  bool allow_node_in_sub_frames = prefs.node_integration_in_sub_frames;
+
+  return (is_main_frame || is_devtools || allow_node_in_sub_frames) &&
+         !IsWebViewFrame(context, render_frame);
+}
+
 void RendererClientBase::RenderThreadStarted() {
   auto* command_line = base::CommandLine::ForCurrentProcess();
 
diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h
index 821e7e2d6d2d3..474a5e1a44e69 100644
--- a/shell/renderer/renderer_client_base.h
+++ b/shell/renderer/renderer_client_base.h
@@ -93,6 +93,9 @@ class RendererClientBase : public content::ContentRendererClient
                    gin_helper::Dictionary* process,
                    content::RenderFrame* render_frame);
 
+  bool ShouldLoadPreload(v8::Handle<v8::Context> context,
+                         content::RenderFrame* render_frame) const;
+
   // content::ContentRendererClient:
   void RenderThreadStarted() override;
   void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;

From 2a9b3cc9cdabb5055dc367c490a8a62f839d1c59 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 13 Jun 2022 09:01:34 +0200
Subject: [PATCH 475/811] chore: remove unused proxy-window-open.snapshot.txt
 (#34501)

chore: remove unused spec-main/fixtures/snapshots/proxy-window-open.snapshot.txt
---
 .../snapshots/proxy-window-open.snapshot.txt  | 166 ------------------
 1 file changed, 166 deletions(-)
 delete mode 100644 spec-main/fixtures/snapshots/proxy-window-open.snapshot.txt

diff --git a/spec-main/fixtures/snapshots/proxy-window-open.snapshot.txt b/spec-main/fixtures/snapshots/proxy-window-open.snapshot.txt
deleted file mode 100644
index b7ed882540099..0000000000000
--- a/spec-main/fixtures/snapshots/proxy-window-open.snapshot.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-[
-  [
-    "top=5,left=10,resizable=no",
-    {
-      "sender": "[WebContents]",
-      "frameId": 1,
-      "processId": "placeholder-process-id"
-    },
-    "about:blank",
-    "frame-name",
-    "new-window",
-    {
-      "show": true,
-      "width": 800,
-      "height": 600,
-      "top": 5,
-      "left": 10,
-      "resizable": false,
-      "x": 10,
-      "y": 5,
-      "webPreferences": {
-        "contextIsolation": true,
-        "nodeIntegration": false,
-        "webviewTag": false,
-        "nodeIntegrationInSubFrames": false
-      },
-      "webContents": "[WebContents]"
-    },
-    [],
-    {
-      "url": "",
-      "policy": "strict-origin-when-cross-origin"
-    },
-    null
-  ],
-  [
-    "zoomFactor=2,resizable=0,x=0,y=10",
-    {
-      "sender": "[WebContents]",
-      "frameId": 1,
-      "processId": "placeholder-process-id"
-    },
-    "about:blank",
-    "frame-name",
-    "new-window",
-    {
-      "show": true,
-      "width": 800,
-      "height": 600,
-      "resizable": false,
-      "x": 0,
-      "y": 10,
-      "webPreferences": {
-        "zoomFactor": "2",
-        "contextIsolation": true,
-        "nodeIntegration": false,
-        "webviewTag": false,
-        "nodeIntegrationInSubFrames": false
-      },
-      "webContents": "[WebContents]"
-    },
-    [],
-    {
-      "url": "",
-      "policy": "strict-origin-when-cross-origin"
-    },
-    null
-  ],
-  [
-    "backgroundColor=gray,webPreferences=0,x=100,y=100",
-    {
-      "sender": "[WebContents]",
-      "frameId": 1,
-      "processId": "placeholder-process-id"
-    },
-    "about:blank",
-    "frame-name",
-    "new-window",
-    {
-      "show": true,
-      "width": 800,
-      "height": 600,
-      "backgroundColor": "gray",
-      "webPreferences": {
-        "contextIsolation": true,
-        "nodeIntegration": false,
-        "webviewTag": false,
-        "nodeIntegrationInSubFrames": false
-      },
-      "x": 100,
-      "y": 100,
-      "webContents": "[WebContents]"
-    },
-    [],
-    {
-      "url": "",
-      "policy": "strict-origin-when-cross-origin"
-    },
-    null
-  ],
-  [
-    "x=50,y=20,title=sup",
-    {
-      "sender": "[WebContents]",
-      "frameId": 1,
-      "processId": "placeholder-process-id"
-    },
-    "about:blank",
-    "frame-name",
-    "new-window",
-    {
-      "show": true,
-      "width": 800,
-      "height": 600,
-      "x": 50,
-      "y": 20,
-      "title": "sup",
-      "webPreferences": {
-        "contextIsolation": true,
-        "nodeIntegration": false,
-        "webviewTag": false,
-        "nodeIntegrationInSubFrames": false
-      },
-      "webContents": "[WebContents]"
-    },
-    [],
-    {
-      "url": "",
-      "policy": "strict-origin-when-cross-origin"
-    },
-    null
-  ],
-  [
-    "show=false,top=1,left=1",
-    {
-      "sender": "[WebContents]",
-      "frameId": 1,
-      "processId": "placeholder-process-id"
-    },
-    "about:blank",
-    "frame-name",
-    "new-window",
-    {
-      "show": false,
-      "width": 800,
-      "height": 600,
-      "top": 1,
-      "left": 1,
-      "x": 1,
-      "y": 1,
-      "webPreferences": {
-        "contextIsolation": true,
-        "nodeIntegration": false,
-        "webviewTag": false,
-        "nodeIntegrationInSubFrames": false
-      },
-      "webContents": "[WebContents]"
-    },
-    [],
-    {
-      "url": "",
-      "policy": "strict-origin-when-cross-origin"
-    },
-    null
-  ]
-]

From 77dcf4a5e086de675240a99489c1b2c3fb07aeb6 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 06:01:32 -0700
Subject: [PATCH 476/811] Bump v21.0.0-nightly.20220613

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index aa64f188b8481..cc12351f8271a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220610
\ No newline at end of file
+21.0.0-nightly.20220613
\ No newline at end of file
diff --git a/package.json b/package.json
index efd438b62edf9..b6a7436afad27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220610",
+  "version": "21.0.0-nightly.20220613",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f0c21e16eb3e6..f78cb163c09a5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220610
- PRODUCTVERSION 21,0,0,20220610
+ FILEVERSION 21,0,0,20220613
+ PRODUCTVERSION 21,0,0,20220613
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d565243f983ac15a35a56381ee51fbbe36bd745f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 08:37:46 -0700
Subject: [PATCH 477/811] Revert "Bump v21.0.0-nightly.20220613"

This reverts commit 77dcf4a5e086de675240a99489c1b2c3fb07aeb6.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index cc12351f8271a..aa64f188b8481 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220613
\ No newline at end of file
+21.0.0-nightly.20220610
\ No newline at end of file
diff --git a/package.json b/package.json
index b6a7436afad27..efd438b62edf9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220613",
+  "version": "21.0.0-nightly.20220610",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f78cb163c09a5..f0c21e16eb3e6 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220613
- PRODUCTVERSION 21,0,0,20220613
+ FILEVERSION 21,0,0,20220610
+ PRODUCTVERSION 21,0,0,20220610
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8157a01a42a4e0fdda1358757aaf48756014a506 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 08:39:00 -0700
Subject: [PATCH 478/811] Bump v21.0.0-nightly.20220613

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index aa64f188b8481..cc12351f8271a 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220610
\ No newline at end of file
+21.0.0-nightly.20220613
\ No newline at end of file
diff --git a/package.json b/package.json
index efd438b62edf9..b6a7436afad27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220610",
+  "version": "21.0.0-nightly.20220613",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f0c21e16eb3e6..f78cb163c09a5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220610
- PRODUCTVERSION 21,0,0,20220610
+ FILEVERSION 21,0,0,20220613
+ PRODUCTVERSION 21,0,0,20220613
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 954fd725009093660599a03a6926d57717f5a8c4 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 13 Jun 2022 09:35:42 -0700
Subject: [PATCH 479/811] fix: make navigator.userAgentData non-empty (#34481)

---
 BUILD.gn                                      |  1 +
 .../browser/api/electron_api_web_contents.cc  | 26 +++++---
 shell/browser/electron_browser_client.cc      |  5 ++
 shell/browser/electron_browser_client.h       |  1 +
 shell/browser/electron_browser_context.cc     |  7 ++-
 shell/browser/electron_browser_context.h      |  3 +-
 spec-main/chromium-spec.ts                    | 62 +++++++++++++++++++
 7 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 9b62fb12029d4..fe9b7f3655740 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -371,6 +371,7 @@ source_set("electron_lib") {
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
     "//components/certificate_transparency",
+    "//components/embedder_support:browser_util",
     "//components/language/core/browser",
     "//components/net_log",
     "//components/network_hints/browser",
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index f719bcbd7cbf4..017897b29b7d1 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/views/eye_dropper/eye_dropper.h"
 #include "chrome/common/pref_names.h"
+#include "components/embedder_support/user_agent_utils.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/security_state/content/content_utils.h"
@@ -661,9 +662,10 @@ WebContents::WebContents(v8::Isolate* isolate,
   auto session = Session::CreateFrom(isolate, GetBrowserContext());
   session_.Reset(isolate, session.ToV8());
 
-  web_contents->SetUserAgentOverride(blink::UserAgentOverride::UserAgentOnly(
-                                         GetBrowserContext()->GetUserAgent()),
-                                     false);
+  absl::optional<std::string> user_agent_override =
+      GetBrowserContext()->GetUserAgentOverride();
+  if (user_agent_override)
+    SetUserAgent(*user_agent_override);
   web_contents->SetUserData(kElectronApiWebContentsKey,
                             std::make_unique<UserDataLink>(GetWeakPtr()));
   InitZoomController(web_contents, gin::Dictionary::CreateEmpty(isolate));
@@ -869,9 +871,10 @@ void WebContents::InitWithSessionAndOptions(
 
   AutofillDriverFactory::CreateForWebContents(web_contents());
 
-  web_contents()->SetUserAgentOverride(blink::UserAgentOverride::UserAgentOnly(
-                                           GetBrowserContext()->GetUserAgent()),
-                                       false);
+  absl::optional<std::string> user_agent_override =
+      GetBrowserContext()->GetUserAgentOverride();
+  if (user_agent_override)
+    SetUserAgent(*user_agent_override);
 
   if (IsGuest()) {
     NativeWindow* owner_window = nullptr;
@@ -2149,8 +2152,7 @@ void WebContents::LoadURL(const GURL& url,
 
   std::string user_agent;
   if (options.Get("userAgent", &user_agent))
-    web_contents()->SetUserAgentOverride(
-        blink::UserAgentOverride::UserAgentOnly(user_agent), false);
+    SetUserAgent(user_agent);
 
   std::string extra_headers;
   if (options.Get("extraHeaders", &extra_headers))
@@ -2365,8 +2367,12 @@ void WebContents::ForcefullyCrashRenderer() {
 }
 
 void WebContents::SetUserAgent(const std::string& user_agent) {
-  web_contents()->SetUserAgentOverride(
-      blink::UserAgentOverride::UserAgentOnly(user_agent), false);
+  blink::UserAgentOverride ua_override;
+  ua_override.ua_string_override = user_agent;
+  if (!user_agent.empty())
+    ua_override.ua_metadata_override = embedder_support::GetUserAgentMetadata();
+
+  web_contents()->SetUserAgentOverride(ua_override, false);
 }
 
 std::string WebContents::GetUserAgent() {
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 813f70799813a..fe5a2da4a87a7 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -30,6 +30,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version.h"
+#include "components/embedder_support/user_agent_utils.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/network_hints/common/network_hints.mojom.h"
 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h"  // nogncheck
@@ -1159,6 +1160,10 @@ void ElectronBrowserClient::SetUserAgent(const std::string& user_agent) {
   user_agent_override_ = user_agent;
 }
 
+blink::UserAgentMetadata ElectronBrowserClient::GetUserAgentMetadata() {
+  return embedder_support::GetUserAgentMetadata();
+}
+
 void ElectronBrowserClient::RegisterNonNetworkNavigationURLLoaderFactories(
     int frame_tree_node_id,
     ukm::SourceIdObj ukm_source_id,
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index b4b2ee87bee12..ed2447b4312e2 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -93,6 +93,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
 
   std::string GetUserAgent() override;
   void SetUserAgent(const std::string& user_agent);
+  blink::UserAgentMetadata GetUserAgentMetadata() override;
 
   content::SerialDelegate* GetSerialDelegate() override;
 
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index a23f6a9c7fa09..66643c4731e99 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -107,8 +107,6 @@ ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
       protocol_registry_(base::WrapUnique(new ProtocolRegistry)),
       in_memory_(in_memory),
       ssl_config_(network::mojom::SSLConfig::New()) {
-  user_agent_ = ElectronBrowserClient::Get()->GetUserAgent();
-
   // Read options.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   use_cache_ = !command_line->HasSwitch(switches::kDisableHttpCache);
@@ -305,6 +303,11 @@ ElectronBrowserContext::GetSpecialStoragePolicy() {
 }
 
 std::string ElectronBrowserContext::GetUserAgent() const {
+  return user_agent_.value_or(ElectronBrowserClient::Get()->GetUserAgent());
+}
+
+absl::optional<std::string> ElectronBrowserContext::GetUserAgentOverride()
+    const {
   return user_agent_;
 }
 
diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h
index 3a646aad02ce4..c585859ce038f 100644
--- a/shell/browser/electron_browser_context.h
+++ b/shell/browser/electron_browser_context.h
@@ -85,6 +85,7 @@ class ElectronBrowserContext : public content::BrowserContext {
 
   void SetUserAgent(const std::string& user_agent);
   std::string GetUserAgent() const;
+  absl::optional<std::string> GetUserAgentOverride() const;
   bool CanUseHttpCache() const;
   int GetMaxCacheSize() const;
   ResolveProxyHelper* GetResolveProxyHelper();
@@ -170,7 +171,7 @@ class ElectronBrowserContext : public content::BrowserContext {
   std::unique_ptr<predictors::PreconnectManager> preconnect_manager_;
   std::unique_ptr<ProtocolRegistry> protocol_registry_;
 
-  std::string user_agent_;
+  absl::optional<std::string> user_agent_;
   base::FilePath path_;
   bool in_memory_ = false;
   bool use_cache_ = true;
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index d6bc5cd897a85..f47c1b9b2a63d 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1508,6 +1508,68 @@ describe('chromium features', () => {
       expect(focus).to.be.false();
     });
   });
+
+  describe('navigator.userAgentData', () => {
+    // These tests are done on an http server because navigator.userAgentData
+    // requires a secure context.
+    let server: http.Server;
+    let serverUrl: string;
+    before(async () => {
+      server = http.createServer((req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end('');
+      });
+      await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
+      serverUrl = `http://localhost:${(server.address() as any).port}`;
+    });
+    after(() => {
+      server.close();
+    });
+
+    describe('is not empty', () => {
+      it('by default', async () => {
+        const w = new BrowserWindow({ show: false });
+        await w.loadURL(serverUrl);
+        const platform = await w.webContents.executeJavaScript('navigator.userAgentData.platform');
+        expect(platform).not.to.be.empty();
+      });
+
+      it('when there is a session-wide UA override', async () => {
+        const ses = session.fromPartition(`${Math.random()}`);
+        ses.setUserAgent('foobar');
+        const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
+        await w.loadURL(serverUrl);
+        const platform = await w.webContents.executeJavaScript('navigator.userAgentData.platform');
+        expect(platform).not.to.be.empty();
+      });
+
+      it('when there is a WebContents-specific UA override', async () => {
+        const w = new BrowserWindow({ show: false });
+        w.webContents.setUserAgent('foo');
+        await w.loadURL(serverUrl);
+        const platform = await w.webContents.executeJavaScript('navigator.userAgentData.platform');
+        expect(platform).not.to.be.empty();
+      });
+
+      it('when there is a WebContents-specific UA override at load time', async () => {
+        const w = new BrowserWindow({ show: false });
+        await w.loadURL(serverUrl, {
+          userAgent: 'foo'
+        });
+        const platform = await w.webContents.executeJavaScript('navigator.userAgentData.platform');
+        expect(platform).not.to.be.empty();
+      });
+    });
+
+    describe('brand list', () => {
+      it('contains chromium', async () => {
+        const w = new BrowserWindow({ show: false });
+        await w.loadURL(serverUrl);
+        const brands = await w.webContents.executeJavaScript('navigator.userAgentData.brands');
+        expect(brands.map((b: any) => b.brand)).to.include('Chromium');
+      });
+    });
+  });
 });
 
 describe('font fallback', () => {

From 16cd22ff6a4dcccc3b8cc3f959b83b0d3f1ac68f Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 13 Jun 2022 19:07:47 +0200
Subject: [PATCH 480/811] test: use webContents.setWindowOpenHandler() in specs
 (#34514)

* test: use webContents.setWindowOpenHandler() in specs

* test: use browser-window-created instead of new-window for visibility spec
---
 spec-main/api-browser-window-spec.ts |  3 ---
 spec-main/chromium-spec.ts           | 14 +++++++++-----
 spec-main/webview-spec.ts            |  9 ++++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index e6cd0971be06e..e68f47434582b 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3265,9 +3265,6 @@ describe('BrowserWindow module', () => {
           action: 'allow',
           overrideBrowserWindowOptions: { show: false, webPreferences: { contextIsolation: false, webviewTag: true, nodeIntegrationInSubFrames: true } }
         }));
-        w.webContents.once('new-window', (event, url, frameName, disposition, options) => {
-          options.show = false;
-        });
 
         const webviewLoaded = emittedOnce(ipcMain, 'webview-loaded');
         w.loadFile(path.join(fixtures, 'api', 'new-window-webview.html'));
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index f47c1b9b2a63d..c1d29bbf8e176 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -788,10 +788,10 @@ describe('chromium features', () => {
 
         defer(() => { w.close(); });
 
-        const newWindow = emittedOnce(w.webContents, 'new-window');
+        const promise = emittedOnce(app, 'browser-window-created');
         w.loadFile(path.join(fixturesPath, 'pages', 'window-open.html'));
-        const [,,,, options] = await newWindow;
-        expect(options.show).to.equal(true);
+        const [, newWindow] = await promise;
+        expect(newWindow.isVisible()).to.equal(true);
       });
     }
 
@@ -900,8 +900,12 @@ describe('chromium features', () => {
       const w = new BrowserWindow({ show: false });
       w.loadURL('about:blank');
       w.webContents.executeJavaScript('{ b = window.open(\'\', \'__proto__\'); null }');
-      const [, , frameName] = await emittedOnce(w.webContents, 'new-window');
-
+      const frameName = await new Promise((resolve) => {
+        w.webContents.setWindowOpenHandler(details => {
+          setImmediate(() => resolve(details.frameName));
+          return { action: 'allow' };
+        });
+      });
       expect(frameName).to.equal('__proto__');
     });
   });
diff --git a/spec-main/webview-spec.ts b/spec-main/webview-spec.ts
index 3e01f7d92fef0..98cb2167e5300 100644
--- a/spec-main/webview-spec.ts
+++ b/spec-main/webview-spec.ts
@@ -32,9 +32,12 @@ describe('<webview> tag', function () {
   afterEach(closeAllWindows);
 
   function hideChildWindows (e: any, wc: WebContents) {
-    wc.on('new-window', (event, url, frameName, disposition, options) => {
-      options.show = false;
-    });
+    wc.setWindowOpenHandler(() => ({
+      action: 'allow',
+      overrideBrowserWindowOptions: {
+        show: false
+      }
+    }));
   }
 
   before(() => {

From 9707812d685c5d06a584c84078890870984c0171 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 06:02:37 -0700
Subject: [PATCH 481/811] Bump v21.0.0-nightly.20220614

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index cc12351f8271a..7842881cc8edf 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220613
\ No newline at end of file
+21.0.0-nightly.20220614
\ No newline at end of file
diff --git a/package.json b/package.json
index b6a7436afad27..2245cd156127f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220613",
+  "version": "21.0.0-nightly.20220614",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f78cb163c09a5..a565e9d66de13 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220613
- PRODUCTVERSION 21,0,0,20220613
+ FILEVERSION 21,0,0,20220614
+ PRODUCTVERSION 21,0,0,20220614
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8de5cdb426eaf380e2ab242b53427a0d9a509de7 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 14 Jun 2022 18:15:45 +0200
Subject: [PATCH 482/811] test: add missing page-title-updated event spec for
 webview (#34529)

---
 spec/webview-spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index d47adedf2dcd6..6b548b56541bf 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -554,6 +554,18 @@ describe('<webview> tag', function () {
     });
   });
 
+  describe('page-title-updated event', () => {
+    it('emits when title is set', async () => {
+      loadWebView(webview, {
+        src: `file://${fixtures}/pages/a.html`
+      });
+      const { title, explicitSet } = await waitForEvent(webview, 'page-title-updated');
+
+      expect(title).to.equal('test');
+      expect(explicitSet).to.be.true();
+    });
+  });
+
   describe('page-title-set event', () => {
     it('emits when title is set', async () => {
       loadWebView(webview, {

From bed38e0985d6dd0f48b43627c158821b926e61ed Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 14 Jun 2022 18:22:23 +0200
Subject: [PATCH 483/811] fix: crash when `setWindowOpenHandler` callback
 throws (#34523)

* fix: crash when setWindowOpenHandler throws

* refactor: throw as process uncaughtException event
---
 lib/browser/api/web-contents.ts        | 21 ++++++++-
 spec-main/guest-window-manager-spec.ts | 64 +++++++++++++++++++++++---
 2 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index f54b6369a4447..f493d49801a8f 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -482,6 +482,7 @@ WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event,
   if (!this._windowOpenHandler) {
     return defaultResponse;
   }
+
   const response = this._windowOpenHandler(details);
 
   if (typeof response !== 'object') {
@@ -644,7 +645,15 @@ WebContents.prototype._init = function () {
         postBody,
         disposition
       };
-      const result = this._callWindowOpenHandler(event, details);
+
+      let result;
+      try {
+        result = this._callWindowOpenHandler(event, details);
+      } catch (err) {
+        event.preventDefault();
+        throw err;
+      }
+
       const options = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {
         openGuestWindow({
@@ -675,7 +684,15 @@ WebContents.prototype._init = function () {
         referrer,
         postBody
       };
-      const result = this._callWindowOpenHandler(event, details);
+
+      let result;
+      try {
+        result = this._callWindowOpenHandler(event, details);
+      } catch (err) {
+        event.preventDefault();
+        throw err;
+      }
+
       windowOpenOutlivesOpenerOption = result.outlivesOpener;
       windowOpenOverriddenOptions = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {
diff --git a/spec-main/guest-window-manager-spec.ts b/spec-main/guest-window-manager-spec.ts
index 7d802709c66f1..974e8fce452c2 100644
--- a/spec-main/guest-window-manager-spec.ts
+++ b/spec-main/guest-window-manager-spec.ts
@@ -79,6 +79,58 @@ describe('webContents.setWindowOpenHandler', () => {
 
   afterEach(closeAllWindows);
 
+  it('does not fire window creation events if the handler callback throws an error', (done) => {
+    const error = new Error('oh no');
+    const listeners = process.listeners('uncaughtException');
+    process.removeAllListeners('uncaughtException');
+    process.on('uncaughtException', (thrown) => {
+      try {
+        expect(thrown).to.equal(error);
+        done();
+      } catch (e) {
+        done(e);
+      } finally {
+        process.removeAllListeners('uncaughtException');
+        listeners.forEach((listener) => process.on('uncaughtException', listener));
+      }
+    });
+
+    browserWindow.webContents.on('new-window', () => {
+      assert.fail('new-window should not be called with an overridden window.open');
+    });
+
+    browserWindow.webContents.on('did-create-window', () => {
+      assert.fail('did-create-window should not be called with an overridden window.open');
+    });
+
+    browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");
+
+    browserWindow.webContents.setWindowOpenHandler(() => {
+      throw error;
+    });
+  });
+
+  it('does not fire window creation events if the handler callback returns a bad result', async () => {
+    const bad = new Promise((resolve) => {
+      browserWindow.webContents.setWindowOpenHandler(() => {
+        setTimeout(resolve);
+        return [1, 2, 3] as any;
+      });
+    });
+
+    browserWindow.webContents.on('new-window', () => {
+      assert.fail('new-window should not be called with an overridden window.open');
+    });
+
+    browserWindow.webContents.on('did-create-window', () => {
+      assert.fail('did-create-window should not be called with an overridden window.open');
+    });
+
+    browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");
+
+    await bad;
+  });
+
   it('does not fire window creation events if an override returns action: deny', async () => {
     const denied = new Promise((resolve) => {
       browserWindow.webContents.setWindowOpenHandler(() => {
@@ -87,11 +139,11 @@ describe('webContents.setWindowOpenHandler', () => {
       });
     });
     browserWindow.webContents.on('new-window', () => {
-      assert.fail('new-window should not to be called with an overridden window.open');
+      assert.fail('new-window should not be called with an overridden window.open');
     });
 
     browserWindow.webContents.on('did-create-window', () => {
-      assert.fail('did-create-window should not to be called with an overridden window.open');
+      assert.fail('did-create-window should not be called with an overridden window.open');
     });
 
     browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");
@@ -107,11 +159,11 @@ describe('webContents.setWindowOpenHandler', () => {
       });
     });
     browserWindow.webContents.on('new-window', () => {
-      assert.fail('new-window should not to be called with an overridden window.open');
+      assert.fail('new-window should not be called with an overridden window.open');
     });
 
     browserWindow.webContents.on('did-create-window', () => {
-      assert.fail('did-create-window should not to be called with an overridden window.open');
+      assert.fail('did-create-window should not be called with an overridden window.open');
     });
 
     await browserWindow.webContents.loadURL('data:text/html,<a target="_blank" href="http://example.com" style="display: block; width: 100%; height: 100%; position: fixed; left: 0; top: 0;">link</a>');
@@ -129,11 +181,11 @@ describe('webContents.setWindowOpenHandler', () => {
       });
     });
     browserWindow.webContents.on('new-window', () => {
-      assert.fail('new-window should not to be called with an overridden window.open');
+      assert.fail('new-window should not be called with an overridden window.open');
     });
 
     browserWindow.webContents.on('did-create-window', () => {
-      assert.fail('did-create-window should not to be called with an overridden window.open');
+      assert.fail('did-create-window should not be called with an overridden window.open');
     });
 
     await browserWindow.webContents.loadURL('data:text/html,<a href="http://example.com" style="display: block; width: 100%; height: 100%; position: fixed; left: 0; top: 0;">link</a>');

From 21ef8501e7c71cd8d56828e21d310d07f9d86510 Mon Sep 17 00:00:00 2001
From: isailaandrei <isailaandrei.i@gmail.com>
Date: Tue, 14 Jun 2022 17:24:52 +0100
Subject: [PATCH 484/811] feat: add panel support for BrowserWindow (#34388)

* feat: add NSPanel support for BrowserWindow

* change header guard to satisfy linter

* change panel wording in browser-window

* Revert "change panel wording in browser-window"

This reverts commit 6f3f80f94a7040e1d612a2a65952753bbafd437d.

* change wording in browser-window

* Update shell/browser/ui/cocoa/electron_native_widget_mac.mm

Co-authored-by: Cheng Zhao <github@zcbenz.com>

* Update shell/browser/ui/cocoa/electron_native_widget_mac.h

Co-authored-by: Cheng Zhao <github@zcbenz.com>

* Changed ScopedDisableResize class to allow for nesting

Co-authored-by: andreiisaila <andreiisaila@microsoft.com>
Co-authored-by: Cheng Zhao <github@zcbenz.com>
---
 docs/api/browser-window.md                    |  6 ++-
 filenames.gni                                 |  2 +
 shell/browser/native_window_mac.mm            |  8 +++-
 .../ui/cocoa/electron_native_widget_mac.h     |  4 ++
 .../ui/cocoa/electron_native_widget_mac.mm    | 14 ++++++-
 shell/browser/ui/cocoa/electron_ns_panel.h    | 17 ++++++++
 shell/browser/ui/cocoa/electron_ns_panel.mm   | 39 +++++++++++++++++++
 shell/browser/ui/cocoa/electron_ns_window.h   |  9 +++--
 shell/browser/ui/cocoa/electron_ns_window.mm  |  2 +-
 9 files changed, 92 insertions(+), 9 deletions(-)
 create mode 100644 shell/browser/ui/cocoa/electron_ns_panel.h
 create mode 100644 shell/browser/ui/cocoa/electron_ns_panel.mm

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index 2f00cd1f5feb7..d2a4ef468b5e5 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -425,13 +425,17 @@ Possible values are:
 
 * On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
   `notification`.
-* On macOS, possible types are `desktop`, `textured`.
+* On macOS, possible types are `desktop`, `textured`, `panel`.
   * The `textured` type adds metal gradient appearance
     (`NSWindowStyleMaskTexturedBackground`).
   * The `desktop` type places the window at the desktop background window level
     (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
     focus, keyboard or mouse events, but you can use `globalShortcut` to receive
     input sparingly.
+  * The `panel` type enables the window to float on top of full-screened apps
+    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
+    reserved for NSPanel, at runtime. Also, the window will appear on all
+    spaces (desktops).
 * On Windows, possible type is `toolbar`.
 
 ### Instance Events
diff --git a/filenames.gni b/filenames.gni
index e2f6aa294f8a9..3d892ae81cf65 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -165,6 +165,8 @@ filenames = {
     "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
     "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
     "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
+    "shell/browser/ui/cocoa/electron_ns_panel.h",
+    "shell/browser/ui/cocoa/electron_ns_panel.mm",
     "shell/browser/ui/cocoa/electron_ns_window.h",
     "shell/browser/ui/cocoa/electron_ns_window.mm",
     "shell/browser/ui/cocoa/electron_preview_item.h",
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index e806c9eb539a0..c706a56a01f58 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -317,7 +317,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   params.bounds = bounds;
   params.delegate = this;
   params.type = views::Widget::InitParams::TYPE_WINDOW;
-  params.native_widget = new ElectronNativeWidgetMac(this, styleMask, widget());
+  params.native_widget =
+      new ElectronNativeWidgetMac(this, windowType, styleMask, widget());
   widget()->Init(std::move(params));
   SetCanResize(resizable);
   window_ = static_cast<ElectronNSWindow*>(
@@ -355,6 +356,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
                                     NSWindowCollectionBehaviorIgnoresCycle)];
   }
 
+  if (windowType == "panel") {
+    [window_ setLevel:NSFloatingWindowLevel];
+  }
+
   bool focusable;
   if (options.Get(options::kFocusable, &focusable) && !focusable)
     [window_ setDisableKeyOrMainWindow:YES];
@@ -807,6 +812,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::SetResizable(bool resizable) {
+  ScopedDisableResize disable_resize;
   SetStyleMask(resizable, NSWindowStyleMaskResizable);
   SetCanResize(resizable);
 }
diff --git a/shell/browser/ui/cocoa/electron_native_widget_mac.h b/shell/browser/ui/cocoa/electron_native_widget_mac.h
index 7fdfd0433a01a..2e378ce0fa7e3 100644
--- a/shell/browser/ui/cocoa/electron_native_widget_mac.h
+++ b/shell/browser/ui/cocoa/electron_native_widget_mac.h
@@ -5,6 +5,8 @@
 #ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NATIVE_WIDGET_MAC_H_
 #define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NATIVE_WIDGET_MAC_H_
 
+#include <string>
+
 #include "ui/views/widget/native_widget_mac.h"
 
 namespace electron {
@@ -14,6 +16,7 @@ class NativeWindowMac;
 class ElectronNativeWidgetMac : public views::NativeWidgetMac {
  public:
   ElectronNativeWidgetMac(NativeWindowMac* shell,
+                          const std::string& window_type,
                           NSUInteger style_mask,
                           views::internal::NativeWidgetDelegate* delegate);
   ~ElectronNativeWidgetMac() override;
@@ -29,6 +32,7 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {
 
  private:
   NativeWindowMac* shell_;
+  std::string window_type_;
   NSUInteger style_mask_;
 };
 
diff --git a/shell/browser/ui/cocoa/electron_native_widget_mac.mm b/shell/browser/ui/cocoa/electron_native_widget_mac.mm
index 4247a45229f93..12a9469b92ba6 100644
--- a/shell/browser/ui/cocoa/electron_native_widget_mac.mm
+++ b/shell/browser/ui/cocoa/electron_native_widget_mac.mm
@@ -4,24 +4,34 @@
 
 #include "shell/browser/ui/cocoa/electron_native_widget_mac.h"
 
+#include <string>
+
+#include "shell/browser/ui/cocoa/electron_ns_panel.h"
 #include "shell/browser/ui/cocoa/electron_ns_window.h"
 
 namespace electron {
 
 ElectronNativeWidgetMac::ElectronNativeWidgetMac(
     NativeWindowMac* shell,
+    const std::string& window_type,
     NSUInteger style_mask,
     views::internal::NativeWidgetDelegate* delegate)
     : views::NativeWidgetMac(delegate),
       shell_(shell),
+      window_type_(window_type),
       style_mask_(style_mask) {}
 
 ElectronNativeWidgetMac::~ElectronNativeWidgetMac() = default;
 
 NativeWidgetMacNSWindow* ElectronNativeWidgetMac::CreateNSWindow(
     const remote_cocoa::mojom::CreateWindowParams* params) {
-  return [[[ElectronNSWindow alloc] initWithShell:shell_
-                                        styleMask:style_mask_] autorelease];
+  if (window_type_ == "panel") {
+    return [[[ElectronNSPanel alloc] initWithShell:shell_
+                                         styleMask:style_mask_] autorelease];
+  } else {
+    return [[[ElectronNSWindow alloc] initWithShell:shell_
+                                          styleMask:style_mask_] autorelease];
+  }
 }
 
 }  // namespace electron
diff --git a/shell/browser/ui/cocoa/electron_ns_panel.h b/shell/browser/ui/cocoa/electron_ns_panel.h
new file mode 100644
index 0000000000000..755271acec135
--- /dev/null
+++ b/shell/browser/ui/cocoa/electron_ns_panel.h
@@ -0,0 +1,17 @@
+// Copyright (c) 2022 Microsoft, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_
+#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_
+
+#include "shell/browser/ui/cocoa/electron_ns_window.h"
+
+@interface ElectronNSPanel : ElectronNSWindow
+@property NSWindowStyleMask styleMask;
+@property NSWindowStyleMask originalStyleMask;
+- (id)initWithShell:(electron::NativeWindowMac*)shell
+          styleMask:(NSUInteger)styleMask;
+@end
+
+#endif  // ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_PANEL_H_
diff --git a/shell/browser/ui/cocoa/electron_ns_panel.mm b/shell/browser/ui/cocoa/electron_ns_panel.mm
new file mode 100644
index 0000000000000..581c142ede5ef
--- /dev/null
+++ b/shell/browser/ui/cocoa/electron_ns_panel.mm
@@ -0,0 +1,39 @@
+// Copyright (c) 2022 Microsoft, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/ui/cocoa/electron_ns_panel.h"
+
+@implementation ElectronNSPanel
+
+@synthesize originalStyleMask;
+
+- (id)initWithShell:(electron::NativeWindowMac*)shell
+          styleMask:(NSUInteger)styleMask {
+  if (self = [super initWithShell:shell styleMask:styleMask]) {
+    originalStyleMask = styleMask;
+  }
+  return self;
+}
+
+@dynamic styleMask;
+// The Nonactivating mask is reserverd for NSPanel,
+// but we can use this workaround to add it at runtime
+- (NSWindowStyleMask)styleMask {
+  return originalStyleMask | NSWindowStyleMaskNonactivatingPanel;
+}
+
+- (void)setStyleMask:(NSWindowStyleMask)styleMask {
+  originalStyleMask = styleMask;
+  // Notify change of style mask.
+  [super setStyleMask:styleMask];
+}
+
+- (void)setCollectionBehavior:(NSWindowCollectionBehavior)collectionBehavior {
+  NSWindowCollectionBehavior panelBehavior =
+      (NSWindowCollectionBehaviorCanJoinAllSpaces |
+       NSWindowCollectionBehaviorFullScreenAuxiliary);
+  [super setCollectionBehavior:collectionBehavior | panelBehavior];
+}
+
+@end
diff --git a/shell/browser/ui/cocoa/electron_ns_window.h b/shell/browser/ui/cocoa/electron_ns_window.h
index 50ad1ca8a96d2..f5d7b80b0399b 100644
--- a/shell/browser/ui/cocoa/electron_ns_window.h
+++ b/shell/browser/ui/cocoa/electron_ns_window.h
@@ -16,13 +16,14 @@ class NativeWindowMac;
 // Prevents window from resizing during the scope.
 class ScopedDisableResize {
  public:
-  ScopedDisableResize() { disable_resize_ = true; }
-  ~ScopedDisableResize() { disable_resize_ = false; }
+  ScopedDisableResize() { disable_resize_++; }
+  ~ScopedDisableResize() { disable_resize_--; }
 
-  static bool IsResizeDisabled() { return disable_resize_; }
+  // True if there are 1+ nested ScopedDisableResize objects in the scope
+  static bool IsResizeDisabled() { return disable_resize_ > 0; }
 
  private:
-  static bool disable_resize_;
+  static int disable_resize_;
 };
 
 }  // namespace electron
diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm
index 171bd26004bf5..0ad17da24e967 100644
--- a/shell/browser/ui/cocoa/electron_ns_window.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window.mm
@@ -13,7 +13,7 @@
 
 namespace electron {
 
-bool ScopedDisableResize::disable_resize_ = false;
+int ScopedDisableResize::disable_resize_ = 0;
 
 }  // namespace electron
 

From 4c7c0b41c2027db27cf563e9eabb95cc8adf96bb Mon Sep 17 00:00:00 2001
From: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
Date: Tue, 14 Jun 2022 12:27:28 -0400
Subject: [PATCH 485/811] feat: add immersive dark mode on windows (#33624)

* feat: add immersive dark mode

* fix syntax and add header

* add me

* Update fuses.json5

* fix: redraw title bar on dark mode change

* chore: SetWindowTheme doesn't seem to be needed

* chore: separate out Win 10 dark mode implementation

* final touches

* final touches

* chore: limit Win 10 to >= 20H1 and drop fuse

* fix types

* fix lint

Co-authored-by: Micha Hanselmann <micha.hanselmann@gmail.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
---
 BUILD.gn                                      |   8 -
 buildflags/BUILD.gn                           |   1 -
 buildflags/buildflags.gni                     |   3 -
 filenames.gni                                 |   2 +
 .../electron_desktop_window_tree_host_win.cc  |  23 +--
 .../electron_desktop_window_tree_host_win.h   |   7 +-
 shell/browser/win/dark_mode.cc                | 176 +++---------------
 shell/browser/win/dark_mode.h                 |   5 +-
 shell/common/api/features.cc                  |   5 -
 typings/internal-ambient.d.ts                 |   1 -
 10 files changed, 52 insertions(+), 179 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index fe9b7f3655740..2d16cd815a071 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -725,14 +725,6 @@ source_set("electron_lib") {
 
   sources += get_target_outputs(":electron_fuses")
 
-  if (is_win && enable_win_dark_mode_window_ui) {
-    sources += [
-      "shell/browser/win/dark_mode.cc",
-      "shell/browser/win/dark_mode.h",
-    ]
-    libs += [ "uxtheme.lib" ]
-  }
-
   if (allow_runtime_configurable_key_storage) {
     defines += [ "ALLOW_RUNTIME_CONFIGURABLE_KEY_STORAGE" ]
   }
diff --git a/buildflags/BUILD.gn b/buildflags/BUILD.gn
index 9cbb8227f5f52..a37d752dba360 100644
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -19,7 +19,6 @@ buildflag_header("buildflags") {
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
     "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
-    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }
diff --git a/buildflags/buildflags.gni b/buildflags/buildflags.gni
index 5adc739ef7bb1..6a6a7d59fefe3 100644
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -31,7 +31,4 @@ declare_args() {
 
   # Enable Spellchecker support
   enable_builtin_spellchecker = true
-
-  # Undocumented Windows dark mode API
-  enable_win_dark_mode_window_ui = false
 }
diff --git a/filenames.gni b/filenames.gni
index 3d892ae81cf65..3ce306928a96f 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -105,6 +105,8 @@ filenames = {
     "shell/browser/ui/win/notify_icon.h",
     "shell/browser/ui/win/taskbar_host.cc",
     "shell/browser/ui/win/taskbar_host.h",
+    "shell/browser/win/dark_mode.cc",
+    "shell/browser/win/dark_mode.h",
     "shell/browser/win/scoped_hstring.cc",
     "shell/browser/win/scoped_hstring.h",
     "shell/common/api/electron_api_native_image_win.cc",
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 696798d9111aa..d978ce64f59a6 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -7,13 +7,10 @@
 #include "base/win/windows_version.h"
 #include "electron/buildflags/buildflags.h"
 #include "shell/browser/ui/views/win_frame_view.h"
+#include "shell/browser/win/dark_mode.h"
 #include "ui/base/win/hwnd_metrics.h"
 #include "ui/base/win/shell.h"
 
-#if BUILDFLAG(ENABLE_WIN_DARK_MODE_WINDOW_UI)
-#include "shell/browser/win/dark_mode.h"
-#endif
-
 namespace electron {
 
 ElectronDesktopWindowTreeHostWin::ElectronDesktopWindowTreeHostWin(
@@ -29,14 +26,13 @@ bool ElectronDesktopWindowTreeHostWin::PreHandleMSG(UINT message,
                                                     WPARAM w_param,
                                                     LPARAM l_param,
                                                     LRESULT* result) {
-#if BUILDFLAG(ENABLE_WIN_DARK_MODE_WINDOW_UI)
-  if (message == WM_NCCREATE) {
-    HWND const hwnd = GetAcceleratedWidget();
-    auto const theme_source =
-        ui::NativeTheme::GetInstanceForNativeUi()->theme_source();
-    win::SetDarkModeForWindow(hwnd, theme_source);
+  const bool dark_mode_supported = win::IsDarkModeSupported();
+  if (dark_mode_supported && message == WM_NCCREATE) {
+    win::SetDarkModeForWindow(GetAcceleratedWidget());
+    ui::NativeTheme::GetInstanceForNativeUi()->AddObserver(this);
+  } else if (dark_mode_supported && message == WM_DESTROY) {
+    ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this);
   }
-#endif
 
   return native_window_view_->PreHandleMSG(message, w_param, l_param, result);
 }
@@ -99,4 +95,9 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
   return false;
 }
 
+void ElectronDesktopWindowTreeHostWin::OnNativeThemeUpdated(
+    ui::NativeTheme* observed_theme) {
+  win::SetDarkModeForWindow(GetAcceleratedWidget());
+}
+
 }  // namespace electron
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
index 3fd831aae1ed0..1b53f6f8e5313 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
@@ -12,8 +12,8 @@
 
 namespace electron {
 
-class ElectronDesktopWindowTreeHostWin
-    : public views::DesktopWindowTreeHostWin {
+class ElectronDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin,
+                                         public ::ui::NativeThemeObserver {
  public:
   ElectronDesktopWindowTreeHostWin(
       NativeWindowViews* native_window_view,
@@ -37,6 +37,9 @@ class ElectronDesktopWindowTreeHostWin
   bool GetClientAreaInsets(gfx::Insets* insets,
                            HMONITOR monitor) const override;
 
+  // ui::NativeThemeObserver:
+  void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
+
  private:
   NativeWindowViews* native_window_view_;  // weak ref
 };
diff --git a/shell/browser/win/dark_mode.cc b/shell/browser/win/dark_mode.cc
index c85bf18786c20..200ba8c1f13a5 100644
--- a/shell/browser/win/dark_mode.cc
+++ b/shell/browser/win/dark_mode.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Microsoft Inc. All rights reserved.
+// Copyright (c) 2022 Microsoft Inc. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
@@ -6,173 +6,57 @@
 
 #include <dwmapi.h>  // DwmSetWindowAttribute()
 
-#include "base/files/file_path.h"
-#include "base/scoped_native_library.h"
-#include "base/win/pe_image.h"
-#include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 
+// This flag works since Win10 20H1 but is not documented until Windows 11
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+
 // This namespace contains code originally from
-// https://github.com/ysc3839/win32-darkmode/
-// governed by the MIT license and (c) Richard Yu
+// https://github.com/microsoft/terminal
+// governed by the MIT license and (c) Microsoft Corporation.
 namespace {
 
-// 1903 18362
-enum PreferredAppMode { Default, AllowDark, ForceDark, ForceLight, Max };
-
-bool g_darkModeSupported = false;
-bool g_darkModeEnabled = false;
-DWORD g_buildNumber = 0;
-
-enum WINDOWCOMPOSITIONATTRIB {
-  WCA_USEDARKMODECOLORS = 26  // build 18875+
-};
-struct WINDOWCOMPOSITIONATTRIBDATA {
-  WINDOWCOMPOSITIONATTRIB Attrib;
-  PVOID pvData;
-  SIZE_T cbData;
-};
-
-using fnSetWindowCompositionAttribute =
-    BOOL(WINAPI*)(HWND hWnd, WINDOWCOMPOSITIONATTRIBDATA*);
-fnSetWindowCompositionAttribute _SetWindowCompositionAttribute = nullptr;
-
-bool IsHighContrast() {
-  HIGHCONTRASTW highContrast = {sizeof(highContrast)};
-  if (SystemParametersInfoW(SPI_GETHIGHCONTRAST, sizeof(highContrast),
-                            &highContrast, FALSE))
-    return highContrast.dwFlags & HCF_HIGHCONTRASTON;
-  return false;
-}
+// https://docs.microsoft.com/en-us/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+HRESULT TrySetWindowTheme(HWND hWnd, bool dark) {
+  const BOOL isDarkMode = dark;
+  HRESULT result = DwmSetWindowAttribute(hWnd, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                         &isDarkMode, sizeof(isDarkMode));
 
-void RefreshTitleBarThemeColor(HWND hWnd, bool dark) {
-  LONG ldark = dark;
-  if (g_buildNumber >= 20161) {
-    // DWMA_USE_IMMERSIVE_DARK_MODE = 20
-    DwmSetWindowAttribute(hWnd, 20, &ldark, sizeof dark);
-    return;
-  }
-  if (g_buildNumber >= 18363) {
-    auto data = WINDOWCOMPOSITIONATTRIBDATA{WCA_USEDARKMODECOLORS, &ldark,
-                                            sizeof ldark};
-    _SetWindowCompositionAttribute(hWnd, &data);
-    return;
-  }
-  DwmSetWindowAttribute(hWnd, 0x13, &ldark, sizeof ldark);
-}
+  if (FAILED(result))
+    return result;
 
-void InitDarkMode() {
-  // confirm that we're running on a version of Windows
-  // where the Dark Mode API is known
   auto* os_info = base::win::OSInfo::GetInstance();
-  g_buildNumber = os_info->version_number().build;
   auto const version = os_info->version();
-  if ((version < base::win::Version::WIN10_RS5) ||
-      (version > base::win::Version::WIN10_20H1)) {
-    return;
-  }
-
-  // load "SetWindowCompositionAttribute", used in RefreshTitleBarThemeColor()
-  _SetWindowCompositionAttribute =
-      reinterpret_cast<decltype(_SetWindowCompositionAttribute)>(
-          base::win::GetUser32FunctionPointer("SetWindowCompositionAttribute"));
-  if (_SetWindowCompositionAttribute == nullptr) {
-    return;
-  }
-
-  // load the dark mode functions from uxtheme.dll
-  // * RefreshImmersiveColorPolicyState()
-  // * ShouldAppsUseDarkMode()
-  // * AllowDarkModeForApp()
-  // * SetPreferredAppMode()
-  // * AllowDarkModeForApp() (build < 18362)
-  // * SetPreferredAppMode() (build >= 18362)
-
-  base::NativeLibrary uxtheme =
-      base::PinSystemLibrary(FILE_PATH_LITERAL("uxtheme.dll"));
-  if (!uxtheme) {
-    return;
-  }
-  auto ux_pei = base::win::PEImage(uxtheme);
-  auto get_ux_proc_from_ordinal = [&ux_pei](int ordinal, auto* setme) {
-    FARPROC proc = ux_pei.GetProcAddress(reinterpret_cast<LPCSTR>(ordinal));
-    *setme = reinterpret_cast<decltype(*setme)>(proc);
-  };
-
-  // ordinal 104
-  using fnRefreshImmersiveColorPolicyState = VOID(WINAPI*)();
-  fnRefreshImmersiveColorPolicyState _RefreshImmersiveColorPolicyState = {};
-  get_ux_proc_from_ordinal(104, &_RefreshImmersiveColorPolicyState);
-
-  // ordinal 132
-  using fnShouldAppsUseDarkMode = BOOL(WINAPI*)();
-  fnShouldAppsUseDarkMode _ShouldAppsUseDarkMode = {};
-  get_ux_proc_from_ordinal(132, &_ShouldAppsUseDarkMode);
-
-  // ordinal 135, in 1809
-  using fnAllowDarkModeForApp = BOOL(WINAPI*)(BOOL allow);
-  fnAllowDarkModeForApp _AllowDarkModeForApp = {};
-
-  // ordinal 135, in 1903
-  typedef PreferredAppMode(WINAPI *
-                           fnSetPreferredAppMode)(PreferredAppMode appMode);
-  fnSetPreferredAppMode _SetPreferredAppMode = {};
-
-  if (g_buildNumber < 18362) {
-    get_ux_proc_from_ordinal(135, &_AllowDarkModeForApp);
-  } else {
-    get_ux_proc_from_ordinal(135, &_SetPreferredAppMode);
-  }
 
-  // dark mode is supported iff we found the functions
-  g_darkModeSupported = _RefreshImmersiveColorPolicyState &&
-                        _ShouldAppsUseDarkMode &&
-                        (_AllowDarkModeForApp || _SetPreferredAppMode);
-  if (!g_darkModeSupported) {
-    return;
+  // Toggle the nonclient area active state to force a redraw (Win10 workaround)
+  if (version < base::win::Version::WIN11) {
+    HWND activeWindow = GetActiveWindow();
+    SendMessage(hWnd, WM_NCACTIVATE, hWnd != activeWindow, 0);
+    SendMessage(hWnd, WM_NCACTIVATE, hWnd == activeWindow, 0);
   }
 
-  // initial setup: allow dark mode to be used
-  if (_AllowDarkModeForApp) {
-    _AllowDarkModeForApp(true);
-  } else if (_SetPreferredAppMode) {
-    _SetPreferredAppMode(AllowDark);
-  }
-  _RefreshImmersiveColorPolicyState();
-
-  // check to see if dark mode is currently enabled
-  g_darkModeEnabled = _ShouldAppsUseDarkMode() && !IsHighContrast();
+  return S_OK;
 }
 
 }  // namespace
 
 namespace electron {
 
-void EnsureInitialized() {
-  static bool initialized = false;
-  if (!initialized) {
-    initialized = true;
-    ::InitDarkMode();
-  }
-}
+namespace win {
 
-bool IsDarkPreferred(ui::NativeTheme::ThemeSource theme_source) {
-  switch (theme_source) {
-    case ui::NativeTheme::ThemeSource::kForcedLight:
-      return false;
-    case ui::NativeTheme::ThemeSource::kForcedDark:
-      return g_darkModeSupported;
-    case ui::NativeTheme::ThemeSource::kSystem:
-      return g_darkModeEnabled;
-  }
+bool IsDarkModeSupported() {
+  auto* os_info = base::win::OSInfo::GetInstance();
+  auto const version = os_info->version();
+
+  return version >= base::win::Version::WIN10_20H1;
 }
 
-namespace win {
+void SetDarkModeForWindow(HWND hWnd) {
+  ui::NativeTheme* theme = ui::NativeTheme::GetInstanceForNativeUi();
+  bool dark =
+      theme->ShouldUseDarkColors() && !theme->UserHasContrastPreference();
 
-void SetDarkModeForWindow(HWND hWnd,
-                          ui::NativeTheme::ThemeSource theme_source) {
-  EnsureInitialized();
-  RefreshTitleBarThemeColor(hWnd, IsDarkPreferred(theme_source));
+  TrySetWindowTheme(hWnd, dark);
 }
 
 }  // namespace win
diff --git a/shell/browser/win/dark_mode.h b/shell/browser/win/dark_mode.h
index c6d14f9bfa7e7..12f6adb1dade9 100644
--- a/shell/browser/win/dark_mode.h
+++ b/shell/browser/win/dark_mode.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Microsoft Inc. All rights reserved.
+// Copyright (c) 2022 Microsoft Inc. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
@@ -19,7 +19,8 @@ namespace electron {
 
 namespace win {
 
-void SetDarkModeForWindow(HWND hWnd, ui::NativeTheme::ThemeSource theme_source);
+bool IsDarkModeSupported();
+void SetDarkModeForWindow(HWND hWnd);
 
 }  // namespace win
 
diff --git a/shell/common/api/features.cc b/shell/common/api/features.cc
index 92208cfba036d..48d733f16a031 100644
--- a/shell/common/api/features.cc
+++ b/shell/common/api/features.cc
@@ -54,10 +54,6 @@ bool IsPictureInPictureEnabled() {
   return BUILDFLAG(ENABLE_PICTURE_IN_PICTURE);
 }
 
-bool IsWinDarkModeWindowUiEnabled() {
-  return BUILDFLAG(ENABLE_WIN_DARK_MODE_WINDOW_UI);
-}
-
 bool IsComponentBuild() {
 #if defined(COMPONENT_BUILD)
   return true;
@@ -84,7 +80,6 @@ void Initialize(v8::Local<v8::Object> exports,
   dict.SetMethod("isPictureInPictureEnabled", &IsPictureInPictureEnabled);
   dict.SetMethod("isComponentBuild", &IsComponentBuild);
   dict.SetMethod("isExtensionsEnabled", &IsExtensionsEnabled);
-  dict.SetMethod("isWinDarkModeWindowUiEnabled", &IsWinDarkModeWindowUiEnabled);
 }
 
 }  // namespace
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 0eb2f3d493a61..2ac177b263154 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -27,7 +27,6 @@ declare namespace NodeJS {
     isPictureInPictureEnabled(): boolean;
     isExtensionsEnabled(): boolean;
     isComponentBuild(): boolean;
-    isWinDarkModeWindowUiEnabled(): boolean;
   }
 
   interface IpcRendererBinding {

From 4ec95edf06d751e43d23a865751ec890f9f8cb69 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 15 Jun 2022 06:01:24 -0700
Subject: [PATCH 486/811] Bump v21.0.0-nightly.20220615

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7842881cc8edf..c3798e48f03c7 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220614
\ No newline at end of file
+21.0.0-nightly.20220615
\ No newline at end of file
diff --git a/package.json b/package.json
index 2245cd156127f..d29993e424054 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220614",
+  "version": "21.0.0-nightly.20220615",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index a565e9d66de13..ef3a93a1ba5a4 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220614
- PRODUCTVERSION 21,0,0,20220614
+ FILEVERSION 21,0,0,20220615
+ PRODUCTVERSION 21,0,0,20220615
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From bad8d5e08af159371b0dc2875eb6c2281bff59a5 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 15 Jun 2022 13:22:28 -0700
Subject: [PATCH 487/811] fix: make preload calculation identical between
 sandbox & non-sandboxed (#34531)

---
 lib/browser/rpc-server.ts                     |  4 ++
 lib/common/ipc-messages.ts                    |  1 +
 lib/renderer/init.ts                          | 12 ++---
 ..._windows_to_have_different_web_prefs.patch | 44 +++++--------------
 shell/browser/electron_browser_client.cc      |  5 ---
 shell/browser/web_contents_preferences.cc     |  4 --
 shell/renderer/api/electron_api_web_frame.cc  |  6 +--
 spec-main/api-browser-window-spec.ts          | 10 ++++-
 typings/internal-ambient.d.ts                 |  2 -
 9 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/lib/browser/rpc-server.ts b/lib/browser/rpc-server.ts
index d8a80802060b7..48e6ca16b5955 100644
--- a/lib/browser/rpc-server.ts
+++ b/lib/browser/rpc-server.ts
@@ -68,6 +68,10 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD, async function (event
   };
 });
 
+ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD, function (event) {
+  return { preloadPaths: event.sender._getPreloadPaths() };
+});
+
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadPath: string, error: Error) {
   event.sender.emit('preload-error', event, preloadPath, error);
 });
diff --git a/lib/common/ipc-messages.ts b/lib/common/ipc-messages.ts
index b920c79c48c59..c6a881c3c0a23 100644
--- a/lib/common/ipc-messages.ts
+++ b/lib/common/ipc-messages.ts
@@ -3,6 +3,7 @@ export const enum IPC_MESSAGES {
   BROWSER_GET_LAST_WEB_PREFERENCES = 'BROWSER_GET_LAST_WEB_PREFERENCES',
   BROWSER_PRELOAD_ERROR = 'BROWSER_PRELOAD_ERROR',
   BROWSER_SANDBOX_LOAD = 'BROWSER_SANDBOX_LOAD',
+  BROWSER_NONSANDBOX_LOAD = 'BROWSER_NONSANDBOX_LOAD',
   BROWSER_WINDOW_CLOSE = 'BROWSER_WINDOW_CLOSE',
   BROWSER_GET_PROCESS_MEMORY_INFO = 'BROWSER_GET_PROCESS_MEMORY_INFO',
 
diff --git a/lib/renderer/init.ts b/lib/renderer/init.ts
index 9807348568976..7047c4ffea927 100644
--- a/lib/renderer/init.ts
+++ b/lib/renderer/init.ts
@@ -2,6 +2,7 @@ import * as path from 'path';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
+import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
 
 const Module = require('module');
 
@@ -38,6 +39,7 @@ require('../common/reset-search-paths');
 require('@electron/internal/common/init');
 
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
+const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
 
 process.getProcessMemoryInfo = () => {
   return ipcRendererInternal.invoke<Electron.ProcessMemoryInfo>(IPC_MESSAGES.BROWSER_GET_PROCESS_MEMORY_INFO);
@@ -48,15 +50,8 @@ const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_co
 const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
 
 const nodeIntegration = mainFrame.getWebPreference('nodeIntegration');
-const preloadScript = mainFrame.getWebPreference('preload');
-const preloadScripts = mainFrame.getWebPreference('preloadScripts');
 const appPath = hasSwitch('app-path') ? getSwitchValue('app-path') : null;
 
-// The webContents preload script is loaded after the session preload scripts.
-if (preloadScript) {
-  preloadScripts.push(preloadScript);
-}
-
 // Common renderer initialization
 require('@electron/internal/renderer/common-init');
 
@@ -127,8 +122,9 @@ if (nodeIntegration) {
   }
 }
 
+const { preloadPaths } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
 // Load the preload scripts.
-for (const preloadScript of preloadScripts) {
+for (const preloadScript of preloadPaths) {
   try {
     Module._load(preloadScript);
   } catch (error) {
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index a5496a4828377..2065bea3be2d5 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..c6dc3cebfb32489a5e50b850ed02a066bf3f258e 100644
+index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..26b820b3ce387e01900cec4227ff290113a833c3 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -142,6 +142,20 @@ WebPreferences::WebPreferences()
+@@ -142,6 +142,19 @@ WebPreferences::WebPreferences()
        fake_no_alloc_direct_call_for_testing_enabled(false),
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
@@ -20,7 +20,6 @@ index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..c6dc3cebfb32489a5e50b850ed02a066
 +      is_webview(false),
 +      hidden_page(false),
 +      offscreen(false),
-+      preload(base::FilePath::StringType()),
 +      node_integration(false),
 +      node_integration_in_worker(false),
 +      node_integration_in_sub_frames(false),
@@ -33,21 +32,10 @@ index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..c6dc3cebfb32489a5e50b850ed02a066
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 187fd8d9818693262256d5cbddd5e02659ba903d..f166517f4e70ced310253539fb6197f6b3af559c 100644
+index 187fd8d9818693262256d5cbddd5e02659ba903d..28e5178361e03d1ac851fa74214931b2332dd9c2 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -23,6 +23,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
-       !data.ReadCursiveFontFamilyMap(&out->cursive_font_family_map) ||
-       !data.ReadFantasyFontFamilyMap(&out->fantasy_font_family_map) ||
-       !data.ReadMathFontFamilyMap(&out->math_font_family_map) ||
-+      // Begin Electron-specific WebPreferences.
-+      !data.ReadPreloads(&out->preloads) ||
-+      !data.ReadPreload(&out->preload) ||
-+      // End Electron-specific WebPreferences.
-       !data.ReadLazyFrameLoadingDistanceThresholdsPx(
-           &out->lazy_frame_loading_distance_thresholds_px) ||
-       !data.ReadLazyImageLoadingDistanceThresholdsPx(
-@@ -148,6 +152,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
        data.fake_no_alloc_direct_call_for_testing_enabled();
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
@@ -68,7 +56,7 @@ index 187fd8d9818693262256d5cbddd5e02659ba903d..f166517f4e70ced310253539fb6197f6
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 59947bfd3c042e5f7d3993967fece9b519f93472..368ec7fb398409cd6386269934eaffcce356793f 100644
+index 59947bfd3c042e5f7d3993967fece9b519f93472..cb2a53f6147767394585ed371744d8a140aace71 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -79,17 +67,15 @@ index 59947bfd3c042e5f7d3993967fece9b519f93472..368ec7fb398409cd6386269934eaffcc
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -154,6 +155,22 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -154,6 +155,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    blink::mojom::V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
 +  // Begin Electron-specific WebPreferences.
-+  std::vector<base::FilePath> preloads;
 +  bool context_isolation;
 +  bool is_webview;
 +  bool hidden_page;
 +  bool offscreen;
-+  base::FilePath preload;
 +  bool node_integration;
 +  bool node_integration_in_worker;
 +  bool node_integration_in_sub_frames;
@@ -103,7 +89,7 @@ index 59947bfd3c042e5f7d3993967fece9b519f93472..368ec7fb398409cd6386269934eaffcc
    // only controls whether or not the "document.cookie" field is properly
    // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index bd425a5869477de9095c6a41c683609d065b08c0..3a5d7450aa40e8a7614e83f316d3d0fb59583381 100644
+index bd425a5869477de9095c6a41c683609d065b08c0..c7ba3ff52c9de01028c9e2be214e20cd91cbf309 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -114,15 +100,11 @@ index bd425a5869477de9095c6a41c683609d065b08c0..3a5d7450aa40e8a7614e83f316d3d0fb
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -428,6 +429,60 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -428,6 +429,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.record_whole_document;
    }
  
 +  // Begin Electron-specific WebPreferences.
-+  static const std::vector<base::FilePath>& preloads(const blink::web_pref::WebPreferences& r) {
-+    return r.preloads;
-+  }
-+
 +  static bool context_isolation(const blink::web_pref::WebPreferences& r) {
 +    return r.context_isolation;
 +  }
@@ -139,10 +121,6 @@ index bd425a5869477de9095c6a41c683609d065b08c0..3a5d7450aa40e8a7614e83f316d3d0fb
 +    return r.offscreen;
 +  }
 +
-+  static const base::FilePath& preload(const blink::web_pref::WebPreferences& r) {
-+    return r.preload;
-+  }
-+
 +  static bool node_integration(const blink::web_pref::WebPreferences& r) {
 +    return r.node_integration;
 +  }
@@ -176,7 +154,7 @@ index bd425a5869477de9095c6a41c683609d065b08c0..3a5d7450aa40e8a7614e83f316d3d0fb
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 738ac646e075f7a37ba2a263c7799a755e63d3fb..80d6ae17d34ef5c7fd14e21c4e1ee3ed4ef9c5fe 100644
+index 738ac646e075f7a37ba2a263c7799a755e63d3fb..40ab2a4b9a1f9de5f201502adebc166a48fccd35 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -187,17 +165,15 @@ index 738ac646e075f7a37ba2a263c7799a755e63d3fb..80d6ae17d34ef5c7fd14e21c4e1ee3ed
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -206,6 +207,22 @@ struct WebPreferences {
+@@ -206,6 +207,20 @@ struct WebPreferences {
    V8CacheOptions v8_cache_options;
    bool record_whole_document;
  
 +  // Begin Electron-specific WebPreferences.
-+  array<mojo_base.mojom.FilePath> preloads;
 +  bool context_isolation;
 +  bool is_webview;
 +  bool hidden_page;
 +  bool offscreen;
-+  mojo_base.mojom.FilePath preload;
 +  bool node_integration;
 +  bool node_integration_in_worker;
 +  bool node_integration_in_sub_frames;
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index fe5a2da4a87a7..91c597f205309 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -497,11 +497,6 @@ void ElectronBrowserClient::OverrideWebkitPrefs(
           ? blink::mojom::PreferredColorScheme::kDark
           : blink::mojom::PreferredColorScheme::kLight;
 
-  auto preloads =
-      SessionPreferences::GetValidPreloads(web_contents->GetBrowserContext());
-  if (!preloads.empty())
-    prefs->preloads = preloads;
-
   SetFontDefaults(prefs);
 
   // Custom preferences of guest page.
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index 44030d1e6bfd0..a635b991fc6d7 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -486,10 +486,6 @@ void WebContentsPreferences::OverrideWebkitPrefs(
 
   prefs->offscreen = offscreen_;
 
-  // The preload script.
-  if (preload_path_)
-    prefs->preload = *preload_path_;
-
   prefs->node_integration = node_integration_;
   prefs->node_integration_in_worker = node_integration_in_worker_;
   prefs->node_integration_in_sub_frames = node_integration_in_sub_frames_;
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index f48d2f4c73fea..ea40c368cee65 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -496,9 +496,7 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
 
     const auto& prefs = render_frame->GetBlinkPreferences();
 
-    if (pref_name == options::kPreloadScripts) {
-      return gin::ConvertToV8(isolate, prefs.preloads);
-    } else if (pref_name == "isWebView") {
+    if (pref_name == "isWebView") {
       // FIXME(zcbenz): For child windows opened with window.open('') from
       // webview, the WebPreferences is inherited from webview and the value
       // of |is_webview| is wrong.
@@ -513,8 +511,6 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
       return gin::ConvertToV8(isolate, prefs.hidden_page);
     } else if (pref_name == options::kOffscreen) {
       return gin::ConvertToV8(isolate, prefs.offscreen);
-    } else if (pref_name == options::kPreloadScript) {
-      return gin::ConvertToV8(isolate, prefs.preload.value());
     } else if (pref_name == options::kNodeIntegration) {
       return gin::ConvertToV8(isolate, prefs.node_integration);
     } else if (pref_name == options::kNodeIntegrationInWorker) {
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index e68f47434582b..3edd3becbe933 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -3263,7 +3263,15 @@ describe('BrowserWindow module', () => {
         });
         w.webContents.setWindowOpenHandler(() => ({
           action: 'allow',
-          overrideBrowserWindowOptions: { show: false, webPreferences: { contextIsolation: false, webviewTag: true, nodeIntegrationInSubFrames: true } }
+          overrideBrowserWindowOptions: {
+            show: false,
+            webPreferences: {
+              contextIsolation: false,
+              webviewTag: true,
+              nodeIntegrationInSubFrames: true,
+              preload
+            }
+          }
         }));
 
         const webviewLoaded = emittedOnce(ipcMain, 'webview-loaded');
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 2ac177b263154..c63b10acc6b1e 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -107,8 +107,6 @@ declare namespace NodeJS {
     isWebView: boolean;
     hiddenPage: boolean;
     nodeIntegration: boolean;
-    preload: string
-    preloadScripts: string[];
     webviewTag: boolean;
   }
 

From f418a49857979a72cb199244aee335ffd9b82f47 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Thu, 16 Jun 2022 03:17:42 +0200
Subject: [PATCH 488/811] chore: warn when using the deprecated new-window
 event (#34528)

---
 lib/browser/guest-window-manager.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/browser/guest-window-manager.ts b/lib/browser/guest-window-manager.ts
index fb6ae6edf00b0..7aa91a15c9134 100644
--- a/lib/browser/guest-window-manager.ts
+++ b/lib/browser/guest-window-manager.ts
@@ -5,7 +5,7 @@
  * out-of-process (cross-origin) are created here. "Embedder" roughly means
  * "parent."
  */
-import { BrowserWindow } from 'electron/main';
+import { BrowserWindow, deprecate } from 'electron/main';
 import type { BrowserWindowConstructorOptions, Referrer, WebContents, LoadURLOptions } from 'electron/main';
 import { parseFeatures } from '@electron/internal/browser/parse-features-string';
 
@@ -155,6 +155,10 @@ function emitDeprecatedNewWindowEvent ({ event, embedder, guest, windowOpenArgs,
     ...parseContentTypeFormat(postData)
   } : null;
 
+  if (embedder.listenerCount('new-window') > 0) {
+    deprecate.log('The new-window event is deprecated and will be removed. Please use contents.setWindowOpenHandler() instead.');
+  }
+
   embedder.emit(
     'new-window',
     event,

From ea4278754c0d818d88aa0ee4be62f5a61fd07297 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 16 Jun 2022 03:46:11 -0400
Subject: [PATCH 489/811] chore: fix spelling errors in multiple files (#34574)

* chore: fix spelling in .circleci

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in BUILD.gn

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in appveyor.yml

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in build

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in docs

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in lib

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in script

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in shell

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in spec

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* chore: fix spelling in spec-main

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 .circleci/config/base.yml                              |  2 +-
 BUILD.gn                                               |  2 +-
 appveyor.yml                                           |  6 +++---
 build/mac/make_locale_dirs.py                          |  2 +-
 build/node.gni                                         |  2 +-
 build/npm.gni                                          |  2 +-
 build/rules.gni                                        |  2 +-
 docs/api/app.md                                        |  2 +-
 docs/api/session.md                                    |  2 +-
 docs/development/README.md                             |  2 +-
 docs/development/debugging.md                          |  4 ++--
 docs/tutorial/devices.md                               |  4 ++--
 docs/tutorial/electron-versioning.md                   |  2 +-
 lib/browser/api/web-contents.ts                        |  2 +-
 script/lint.js                                         |  2 +-
 script/release/ci-release-build.js                     |  4 ++--
 script/release/notes/index.js                          |  2 +-
 script/release/notes/notes.js                          |  2 +-
 script/release/uploaders/upload.py                     |  8 ++++----
 script/run-clang-tidy.ts                               |  2 +-
 script/spec-runner.js                                  |  4 ++--
 shell/browser/api/electron_api_system_preferences.h    |  2 +-
 .../browser/api/electron_api_system_preferences_win.cc | 10 +++++-----
 shell/browser/api/electron_api_web_contents.cc         |  2 +-
 shell/browser/api/electron_api_web_contents_mac.mm     |  2 +-
 shell/browser/api/event.h                              |  2 +-
 shell/browser/browser_observer.h                       |  2 +-
 shell/browser/lib/bluetooth_chooser.cc                 |  2 +-
 shell/browser/native_window_views.cc                   |  2 +-
 shell/browser/ui/autofill_popup.cc                     |  6 +++---
 shell/browser/ui/cocoa/electron_ns_panel.mm            |  2 +-
 shell/browser/ui/inspectable_web_contents.h            |  2 +-
 shell/browser/ui/views/client_frame_view_linux.h       |  4 ++--
 shell/browser/ui/views/electron_views_delegate_win.cc  |  2 +-
 .../ui/win/electron_desktop_window_tree_host_win.cc    |  2 +-
 shell/browser/web_contents_preferences.cc              |  2 +-
 shell/browser/web_contents_preferences.h               |  2 +-
 shell/common/extensions/api/cryptotoken_private.idl    |  2 +-
 shell/common/extensions/api/i18n.json                  |  2 +-
 shell/common/gin_helper/event_emitter.h                |  2 +-
 shell/common/gin_helper/function_template.h            |  2 +-
 shell/common/key_weak_map.h                            |  2 +-
 shell/renderer/electron_render_frame_observer.cc       |  2 +-
 spec-main/api-app-spec.ts                              |  6 +++---
 spec-main/api-browser-window-spec.ts                   |  2 +-
 spec-main/api-net-log-spec.ts                          |  2 +-
 spec-main/api-session-spec.ts                          |  2 +-
 spec-main/api-web-contents-spec.ts                     |  4 ++--
 spec-main/chromium-spec.ts                             |  2 +-
 spec-main/release-notes-spec.ts                        |  6 +++---
 spec-main/version-bump-spec.ts                         |  6 +++---
 spec/asar-spec.js                                      |  2 +-
 spec/chromium-spec.js                                  |  6 +++---
 spec/node-spec.js                                      |  2 +-
 spec/static/index.html                                 |  2 +-
 spec/static/main.js                                    |  2 +-
 spec/ts-smoke/electron/main.ts                         | 10 +++++-----
 spec/webview-spec.js                                   |  4 ++--
 58 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 88fd0051fa115..d74742fc20a59 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -639,7 +639,7 @@ step-electron-publish: &step-electron-publish
         echo 'Uploading Electron release distribution to Azure'
         script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
       else
-        echo 'Uploading Electron release distribution to Github releases'
+        echo 'Uploading Electron release distribution to GitHub releases'
         script/release/uploaders/upload.py --verbose
       fi
 
diff --git a/BUILD.gn b/BUILD.gn
index 2d16cd815a071..e8b11ac5ba3c6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -132,7 +132,7 @@ config("electron_lib_config") {
   include_dirs = [ "." ]
 }
 
-# We geneate the definitions twice here, once in //electron/electron.d.ts
+# We generate the definitions twice here, once in //electron/electron.d.ts
 # and once in $target_gen_dir
 # The one in $target_gen_dir is used for the actual TSC build later one
 # and the one in //electron/electron.d.ts is used by your IDE (vscode)
diff --git a/appveyor.yml b/appveyor.yml
index 216999f6cf713..0d12169703792 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@
 #  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
 #      e.g. 'target_cpu="x86"' to build for a 32bit platform.
 #      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
-#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordningly
+#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordingly
 #      if you pass a custom value for 'target_cpu'.
 #  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
 #  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
@@ -12,7 +12,7 @@
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
 #  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
-#      Otherwise the release will be uploaded to the Github Releases.
+#      Otherwise the release will be uploaded to the GitHub Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
 # The publishing scripts expect access tokens to be defined as env vars,
@@ -215,7 +215,7 @@ test_script:
       }
   - cd electron
   - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log )
-  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log )
+  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeparately --enable-logging=file --log-file=%cd%\electron.log )
   - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log )  
   - cd ..
   - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
diff --git a/build/mac/make_locale_dirs.py b/build/mac/make_locale_dirs.py
index 21b220f7d913b..47f3a9f1f661f 100644
--- a/build/mac/make_locale_dirs.py
+++ b/build/mac/make_locale_dirs.py
@@ -4,7 +4,7 @@
 # Cocoa .app bundle. The presence of these empty directories is sufficient to
 # convince Cocoa that the application supports the named localization, even if
 # an InfoPlist.strings file is not provided. Chrome uses these empty locale
-# directoires for its helper executable bundles, which do not otherwise
+# directories for its helper executable bundles, which do not otherwise
 # require any direct Cocoa locale support.
 
 import os
diff --git a/build/node.gni b/build/node.gni
index a65f718e634ed..6d7882d34620e 100644
--- a/build/node.gni
+++ b/build/node.gni
@@ -1,6 +1,6 @@
 template("node_action") {
   assert(defined(invoker.script), "Need script path to run")
-  assert(defined(invoker.args), "Need script argumets")
+  assert(defined(invoker.args), "Need script arguments")
 
   action(target_name) {
     forward_variables_from(invoker,
diff --git a/build/npm.gni b/build/npm.gni
index c2a0d1725af75..7790dcece157f 100644
--- a/build/npm.gni
+++ b/build/npm.gni
@@ -1,7 +1,7 @@
 template("npm_action") {
   assert(defined(invoker.script),
          "Need script name to run (must be defined in package.json)")
-  assert(defined(invoker.args), "Need script argumets")
+  assert(defined(invoker.args), "Need script arguments")
 
   action("npm_pre_flight_" + target_name) {
     inputs = [
diff --git a/build/rules.gni b/build/rules.gni
index c6c383829b1d0..557f0b8193c20 100644
--- a/build/rules.gni
+++ b/build/rules.gni
@@ -51,7 +51,7 @@ template("compile_ib_files") {
 # Template to compile and package Mac XIB files as bundle data.
 # Arguments
 #     sources:
-#         list of string, sources to comiple
+#         list of string, sources to compile
 #     output_path:
 #         (optional) string, the path to use for the outputs list in the
 #         bundle_data step. If unspecified, defaults to bundle_resources_dir.
diff --git a/docs/api/app.md b/docs/api/app.md
index 94b8c954fc443..0bfc137a214ee 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -1381,7 +1381,7 @@ method returns false. If we fail to perform the copy, then this method will
 throw an error. The message in the error should be informative and tell
 you exactly what went wrong.
 
-By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
+By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the preexisting running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
 
 For example:
 
diff --git a/docs/api/session.md b/docs/api/session.md
index 8475302e9422b..70a1a29f4d55a 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -713,7 +713,7 @@ To clear the handler, call `setDevicePermissionHandler(null)`.
 This handler can be used to provide default permissioning to devices without first calling for permission
 to devices (eg via `navigator.hid.requestDevice`).  If this handler is not defined, the default device
 permissions as granted through device selection (eg via `navigator.hid.requestDevice`) will be used.
-Additionally, the default behavior of Electron is to store granted device permision through the lifetime
+Additionally, the default behavior of Electron is to store granted device permission through the lifetime
 of the corresponding WebContents.  If longer term storage is needed, a developer can store granted device
 permissions (eg when handling the `select-hid-device` event) and then read from that storage with `setDevicePermissionHandler`.
 
diff --git a/docs/development/README.md b/docs/development/README.md
index 6ddbbcdbae800..fcf147f1cac0f 100644
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -64,7 +64,7 @@ If you want to add a new API module to Electron, you'll want to look in [creatin
 
 Electron has a fully-fledged governance system that oversees activity in Electron and whose working groups are responsible for areas like APIs, releases, and upgrades to Electron's dependencies including Chromium and Node.js. Depending on how frequently and to what end you want to contribute, you may want to consider joining a working group.
 
-Details about each group and their reponsibilities can be found in the [governance repo](https://github.com/electron/governance).
+Details about each group and their responsibilities can be found in the [governance repo](https://github.com/electron/governance).
 
 ## Patches in Electron
 
diff --git a/docs/development/debugging.md b/docs/development/debugging.md
index 775a31199b95e..7fc7c0bc13eaf 100644
--- a/docs/development/debugging.md
+++ b/docs/development/debugging.md
@@ -9,7 +9,7 @@ Some of the more common approaches are outlined below.
 
 Chromium contains logging macros which can aid debugging by printing information to console in C++ and Objective-C++.
 
-You might use this to print out variable values, function names, and line numbers, amonst other things.
+You might use this to print out variable values, function names, and line numbers, amongst other things.
 
 Some examples:
 
@@ -25,7 +25,7 @@ See [logging.h](https://chromium.googlesource.com/chromium/src/base/+/refs/heads
 
 ## Printing Stacktraces
 
-Chromium contains a helper to print stack traces to console without interrrupting the program.
+Chromium contains a helper to print stack traces to console without interrupting the program.
 
 ```cpp
 #include "base/debug/stack_trace.h"
diff --git a/docs/tutorial/devices.md b/docs/tutorial/devices.md
index 7ce513caf9a5f..cba807891f07b 100644
--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -43,7 +43,7 @@ the WebHID API:
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.hid.requestDevice`.  Additionally,
-  the default behavior of Electron is to store granted device permision through
+  the default behavior of Electron is to store granted device permission through
   the lifetime of the corresponding WebContents.  If longer term storage is
   needed, a developer can store granted device permissions (eg when handling
   the `select-hid-device` event) and then read from that storage with
@@ -92,7 +92,7 @@ There are several additional APIs for working with the Web Serial API:
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.serial.requestPort`.  Additionally,
-  the default behavior of Electron is to store granted device permision through
+  the default behavior of Electron is to store granted device permission through
   the lifetime of the corresponding WebContents.  If longer term storage is
   needed, a developer can store granted device permissions (eg when handling
   the `select-serial-port` event) and then read from that storage with
diff --git a/docs/tutorial/electron-versioning.md b/docs/tutorial/electron-versioning.md
index 7e473bffd3940..0948a557df83e 100644
--- a/docs/tutorial/electron-versioning.md
+++ b/docs/tutorial/electron-versioning.md
@@ -18,7 +18,7 @@ npm install --save-dev electron@latest
 
 There are several major changes from our 1.x strategy outlined below. Each change is intended to satisfy the needs and priorities of developers/maintainers and app developers.
 
-1. Strict use of the the [SemVer](#semver) spec
+1. Strict use of the [SemVer](#semver) spec
 2. Introduction of semver-compliant `-beta` tags
 3. Introduction of [conventional commit messages](https://conventionalcommits.org/)
 4. Well-defined stabilization branches
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index f493d49801a8f..120d85ce72fdf 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -10,7 +10,7 @@ import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-util
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-// session is not used here, the purpose is to make sure session is initalized
+// session is not used here, the purpose is to make sure session is initialized
 // before the webContents module.
 // eslint-disable-next-line
 session
diff --git a/script/lint.js b/script/lint.js
index 2047f02253d72..42b1abf1f09ed 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -172,7 +172,7 @@ const LINTERS = [{
   run: (opts, filenames) => {
     const patchesDir = path.resolve(__dirname, '../patches');
     const patchesConfig = path.resolve(patchesDir, 'config.json');
-    // If the config does not exist, that's a proiblem
+    // If the config does not exist, that's a problem
     if (!fs.existsSync(patchesConfig)) {
       process.exit(1);
     }
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index 31ac6a3b74962..b584a998188db 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -115,7 +115,7 @@ async function getCircleCIWorkflowId (pipelineId) {
           workflowId = workflows.items.find(item => item.name.includes('publish')).id;
           break;
         }
-        console.log('Unxpected number of workflows, response was:', workflows);
+        console.log('Unexpected number of workflows, response was:', workflows);
         workflowId = -1;
         break;
       }
@@ -139,7 +139,7 @@ async function getCircleCIJobNumber (workflowId) {
       continue;
     }
     if (jobInfo.items.length !== 1) {
-      console.log('Unxpected number of jobs, response was:', jobInfo);
+      console.log('Unexpected number of jobs, response was:', jobInfo);
       jobNumber = -1;
       break;
     }
diff --git a/script/release/notes/index.js b/script/release/notes/index.js
index d40ed7086f864..a3ff8d267b0c7 100755
--- a/script/release/notes/index.js
+++ b/script/release/notes/index.js
@@ -133,7 +133,7 @@ const getPreviousPoint = async (point) => {
     console.log('error', error);
   }
 
-  // Otherwise, use the newest stable release that preceeds this branch.
+  // Otherwise, use the newest stable release that precedes this branch.
   // To reach that you may have to walk past >1 branch, e.g. to get past
   // 2-1-x which never had a stable release.
   let branch = currentBranch;
diff --git a/script/release/notes/notes.js b/script/release/notes/notes.js
index 20f72b071b77e..7bc3d525d7eb1 100644
--- a/script/release/notes/notes.js
+++ b/script/release/notes/notes.js
@@ -410,7 +410,7 @@ const getNotes = async (fromRef, toRef, newVersion) => {
   // remove any old commits
   pool.commits = pool.commits.filter(commit => !pool.processedHashes.has(commit.hash));
 
-  // if a commmit _and_ revert occurred in the unprocessed set, skip them both
+  // if a commit _and_ revert occurred in the unprocessed set, skip them both
   for (const commit of pool.commits) {
     const revertHash = commit.revertHash;
     if (!revertHash) {
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index 69c4bbfa5720d..caaa726d55d8a 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -92,9 +92,9 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
 
-    dsym_snaphot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
-    upload_electron(release, dsym_snaphot_zip, args)    
+    dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
+    upload_electron(release, dsym_snapshot_zip, args)    
   elif PLATFORM == 'win32':
     if get_target_arch() != 'ia32':
       pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
@@ -359,7 +359,7 @@ def upload_electron(release, file_path, args):
 
 
 def upload_io_to_github(release, filename, filepath, version):
-  print('Uploading %s to Github' % \
+  print('Uploading %s to GitHub' % \
       (filename))
   script_path = os.path.join(
     ELECTRON_DIR, 'script', 'release', 'uploaders', 'upload-to-github.ts')
diff --git a/script/run-clang-tidy.ts b/script/run-clang-tidy.ts
index f399b2c0845ee..93d1a13f72497 100644
--- a/script/run-clang-tidy.ts
+++ b/script/run-clang-tidy.ts
@@ -272,7 +272,7 @@ function parseCommandLine () {
   if (opts.help) showUsage();
 
   if (!opts['out-dir']) {
-    console.log('--out-dir is a required argunment');
+    console.log('--out-dir is a required argument');
     process.exit(0);
   }
 
diff --git a/script/spec-runner.js b/script/spec-runner.js
index ce16865f1089d..eb4160c8ce8b8 100755
--- a/script/spec-runner.js
+++ b/script/spec-runner.js
@@ -13,7 +13,7 @@ const fail = '✗'.red;
 
 const args = require('minimist')(process.argv, {
   string: ['runners', 'target'],
-  boolean: ['buildNativeTests', 'runTestFilesSeperately'],
+  boolean: ['buildNativeTests', 'runTestFilesSeparately'],
   unknown: arg => unknownFlags.push(arg)
 });
 
@@ -155,7 +155,7 @@ const specFilter = (file) => {
 };
 
 async function runTests (specDir, testName) {
-  if (args.runTestFilesSeperately) {
+  if (args.runTestFilesSeparately) {
     const getFiles = require('../spec/static/get-files');
     const testFiles = await getFiles(path.resolve(__dirname, `../${specDir}`), { filter: specFilter });
     const baseElectronDir = path.resolve(__dirname, '..');
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index d35dd5b947bea..a254e553244a6 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -160,7 +160,7 @@ class SystemPreferences
 
   std::string current_color_;
 
-  bool invertered_color_scheme_ = false;
+  bool inverted_color_scheme_ = false;
 
   bool high_contrast_color_scheme_ = false;
 
diff --git a/shell/browser/api/electron_api_system_preferences_win.cc b/shell/browser/api/electron_api_system_preferences_win.cc
index 00e9a2728bd48..ce47c81227ec5 100644
--- a/shell/browser/api/electron_api_system_preferences_win.cc
+++ b/shell/browser/api/electron_api_system_preferences_win.cc
@@ -185,7 +185,7 @@ std::string SystemPreferences::GetMediaAccessStatus(
 }
 
 void SystemPreferences::InitializeWindow() {
-  invertered_color_scheme_ = IsInvertedColorScheme();
+  inverted_color_scheme_ = IsInvertedColorScheme();
   high_contrast_color_scheme_ = IsHighContrastColorScheme();
 
   // Wait until app is ready before creating sys color listener
@@ -243,10 +243,10 @@ LRESULT CALLBACK SystemPreferences::WndProc(HWND hwnd,
 }
 
 void SystemPreferences::OnSysColorChange() {
-  bool new_invertered_color_scheme = IsInvertedColorScheme();
-  if (new_invertered_color_scheme != invertered_color_scheme_) {
-    invertered_color_scheme_ = new_invertered_color_scheme;
-    Emit("inverted-color-scheme-changed", new_invertered_color_scheme);
+  bool new_inverted_color_scheme = IsInvertedColorScheme();
+  if (new_inverted_color_scheme != inverted_color_scheme_) {
+    inverted_color_scheme_ = new_inverted_color_scheme;
+    Emit("inverted-color-scheme-changed", new_inverted_color_scheme);
   }
 
   bool new_high_contrast_color_scheme = IsHighContrastColorScheme();
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 017897b29b7d1..eec3e6bb9643d 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -991,7 +991,7 @@ void WebContents::DeleteThisIfAlive() {
 }
 
 void WebContents::Destroy() {
-  // The content::WebContents should be destroyed asyncronously when possible
+  // The content::WebContents should be destroyed asynchronously when possible
   // as user may choose to destroy WebContents during an event of it.
   if (Browser::Get()->is_shutting_down() || IsGuest()) {
     DeleteThisIfAlive();
diff --git a/shell/browser/api/electron_api_web_contents_mac.mm b/shell/browser/api/electron_api_web_contents_mac.mm
index 8aa071e9b4335..f9f1af380b974 100644
--- a/shell/browser/api/electron_api_web_contents_mac.mm
+++ b/shell/browser/api/electron_api_web_contents_mac.mm
@@ -64,7 +64,7 @@ - (void)redispatchKeyEvent:(NSEvent*)event;
     [event.os_event.window redispatchKeyEvent:event.os_event];
     // FIXME(nornagon): this isn't the right return value; we should implement
     // devtools windows as Widgets in order to take advantage of the
-    // pre-existing redispatch code in bridged_native_widget.
+    // preexisting redispatch code in bridged_native_widget.
     return false;
   } else if (event.os_event.window &&
              [event.os_event.window
diff --git a/shell/browser/api/event.h b/shell/browser/api/event.h
index a9e4dec39e9d8..763d684c72158 100644
--- a/shell/browser/api/event.h
+++ b/shell/browser/api/event.h
@@ -43,7 +43,7 @@ class Event : public gin::Wrappable<Event> {
   const char* GetTypeName() override;
 
  private:
-  // Replyer for the synchronous messages.
+  // Replier for the synchronous messages.
   InvokeCallback callback_;
 };
 
diff --git a/shell/browser/browser_observer.h b/shell/browser/browser_observer.h
index 5b82aa50fac5b..03d252d3c70f2 100644
--- a/shell/browser/browser_observer.h
+++ b/shell/browser/browser_observer.h
@@ -49,7 +49,7 @@ class BrowserObserver : public base::CheckedObserver {
   virtual void OnWillFinishLaunching() {}
   virtual void OnFinishLaunching(const base::DictionaryValue& launch_info) {}
 
-  // The browser's accessibility suppport has changed.
+  // The browser's accessibility support has changed.
   virtual void OnAccessibilitySupportChanged() {}
 
   // The app message loop is ready
diff --git a/shell/browser/lib/bluetooth_chooser.cc b/shell/browser/lib/bluetooth_chooser.cc
index 3dec4d19be391..7c9942d7ba584 100644
--- a/shell/browser/lib/bluetooth_chooser.cc
+++ b/shell/browser/lib/bluetooth_chooser.cc
@@ -131,7 +131,7 @@ void BluetoothChooser::AddOrUpdateDevice(const std::string& device_id,
         "select-bluetooth-device", GetDeviceList(),
         base::BindOnce(&OnDeviceChosen, event_handler_));
 
-    // If emit not implimented select first device that matches the filters
+    // If emit not implemented select first device that matches the filters
     //  provided.
     if (!prevent_default) {
       event_handler_.Run(content::BluetoothChooserEvent::SELECTED, device_id);
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 03501b7b73f52..1f4f316048bac 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -1517,7 +1517,7 @@ void NativeWindowViews::OnWidgetActivationChanged(views::Widget* changed_widget,
     NativeWindow::NotifyWindowBlur();
   }
 
-  // Hide menu bar when window is blured.
+  // Hide menu bar when window is blurred.
   if (!active && IsMenuBarAutoHide() && IsMenuBarVisible())
     SetMenuBarVisibility(false);
 
diff --git a/shell/browser/ui/autofill_popup.cc b/shell/browser/ui/autofill_popup.cc
index dc40be4b03be1..93975bf676eaa 100644
--- a/shell/browser/ui/autofill_popup.cc
+++ b/shell/browser/ui/autofill_popup.cc
@@ -62,7 +62,7 @@ void CalculatePopupXAndWidthHorizontallyCentered(
 
   // Calculate how much the pop-up needs to grow into the non-preferred
   // direction.
-  int amount_to_grow_in_unpreffered_direction =
+  int amount_to_grow_in_unpreferred_direction =
       std::max(0, popup_width - space_to_grow_in_preferred_direction);
 
   bubble_bounds->set_width(popup_width);
@@ -70,10 +70,10 @@ void CalculatePopupXAndWidthHorizontallyCentered(
     // Note, in RTL the |pop_up_width| must be subtracted to achieve
     // right-alignment of the pop-up with the element.
     bubble_bounds->set_x(preferred_starting_point - popup_width +
-                         amount_to_grow_in_unpreffered_direction);
+                         amount_to_grow_in_unpreferred_direction);
   } else {
     bubble_bounds->set_x(preferred_starting_point -
-                         amount_to_grow_in_unpreffered_direction);
+                         amount_to_grow_in_unpreferred_direction);
   }
 }
 
diff --git a/shell/browser/ui/cocoa/electron_ns_panel.mm b/shell/browser/ui/cocoa/electron_ns_panel.mm
index 581c142ede5ef..f046943772c85 100644
--- a/shell/browser/ui/cocoa/electron_ns_panel.mm
+++ b/shell/browser/ui/cocoa/electron_ns_panel.mm
@@ -17,7 +17,7 @@ - (id)initWithShell:(electron::NativeWindowMac*)shell
 }
 
 @dynamic styleMask;
-// The Nonactivating mask is reserverd for NSPanel,
+// The Nonactivating mask is reserved for NSPanel,
 // but we can use this workaround to add it at runtime
 - (NSWindowStyleMask)styleMask {
   return originalStyleMask | NSWindowStyleMaskNonactivatingPanel;
diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
index bfc6cbae896d5..905d7cb372512 100644
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -85,7 +85,7 @@ class InspectableWebContents
   void UpdateDevToolsZoomLevel(double level);
 
  private:
-  // DevToolsEmbedderMessageDispacher::Delegate
+  // DevToolsEmbedderMessageDispatcher::Delegate
   void ActivateWindow() override;
   void CloseWindow() override;
   void LoadCompleted() override;
diff --git a/shell/browser/ui/views/client_frame_view_linux.h b/shell/browser/ui/views/client_frame_view_linux.h
index 360b11b3ed163..b9bf50d8f7aa7 100644
--- a/shell/browser/ui/views/client_frame_view_linux.h
+++ b/shell/browser/ui/views/client_frame_view_linux.h
@@ -47,10 +47,10 @@ class ClientFrameViewLinux : public FramelessView,
   // views::WindowButtonOrderObserver:
   void OnWindowButtonOrderingChange() override;
 
-  // Overriden from FramelessView:
+  // Overridden from FramelessView:
   int ResizingBorderHitTest(const gfx::Point& point) override;
 
-  // Overriden from views::NonClientFrameView:
+  // Overridden from views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
diff --git a/shell/browser/ui/views/electron_views_delegate_win.cc b/shell/browser/ui/views/electron_views_delegate_win.cc
index e9453422ca8f4..10cb4ca82050a 100644
--- a/shell/browser/ui/views/electron_views_delegate_win.cc
+++ b/shell/browser/ui/views/electron_views_delegate_win.cc
@@ -51,7 +51,7 @@ bool MonitorHasAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
   // There is a potential race condition here:
   // 1. A maximized chrome window is fullscreened.
   // 2. It is switched back to maximized.
-  // 3. In the process the window gets a WM_NCCACLSIZE message which calls us to
+  // 3. In the process the window gets a WM_NCCALCSIZE message which calls us to
   //    get the autohide state.
   // 4. The worker thread is invoked. It calls the API to get the autohide
   //    state. On Windows versions  earlier than Windows 7, taskbars could
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index d978ce64f59a6..7288007747759 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -76,7 +76,7 @@ bool ElectronDesktopWindowTreeHostWin::GetDwmFrameInsetsInPixels(
 bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
     gfx::Insets* insets,
     HMONITOR monitor) const {
-  // Windows by deafult extends the maximized window slightly larger than
+  // Windows by default extends the maximized window slightly larger than
   // current workspace, for frameless window since the standard frame has been
   // removed, the client area would then be drew outside current workspace.
   //
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index a635b991fc6d7..734f3e48c3361 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -388,7 +388,7 @@ void WebContentsPreferences::AppendCommandLineSwitches(
 
   // We are appending args to a webContents so let's save the current state
   // of our preferences object so that during the lifetime of the WebContents
-  // we can fetch the options used to initally configure the WebContents
+  // we can fetch the options used to initially configure the WebContents
   // last_preference_ = preference_.Clone();
   SaveLastPreferences();
 }
diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h
index 544bc54a80e46..091778899c0ac 100644
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -44,7 +44,7 @@ class WebContentsPreferences
 
   void SetFromDictionary(const gin_helper::Dictionary& new_web_preferences);
 
-  // Append command paramters according to preferences.
+  // Append command parameters according to preferences.
   void AppendCommandLineSwitches(base::CommandLine* command_line,
                                  bool is_subframe);
 
diff --git a/shell/common/extensions/api/cryptotoken_private.idl b/shell/common/extensions/api/cryptotoken_private.idl
index bd761504f24ed..3bb5745d87a5c 100644
--- a/shell/common/extensions/api/cryptotoken_private.idl
+++ b/shell/common/extensions/api/cryptotoken_private.idl
@@ -19,7 +19,7 @@ namespace cryptotokenPrivate {
     DOMString appId;
     // The origin of the caller.
     DOMString origin;
-    // Identifies the tab in which the registration is occuring so that any
+    // Identifies the tab in which the registration is occurring so that any
     // permissions prompt is correctly located.
     long tabId;
   };
diff --git a/shell/common/extensions/api/i18n.json b/shell/common/extensions/api/i18n.json
index d819d3117ba4e..01bc8b1759d87 100644
--- a/shell/common/extensions/api/i18n.json
+++ b/shell/common/extensions/api/i18n.json
@@ -93,7 +93,7 @@
               {
                 "type": "object",
                 "name": "result",
-                "description": "LanguageDetectionResult object that holds detected langugae reliability and array of DetectedLanguage",
+                "description": "LanguageDetectionResult object that holds detected language reliability and array of DetectedLanguage",
                 "properties": {
                   "isReliable": { "type": "boolean", "description": "CLD detected language reliability" },
                   "languages":
diff --git a/shell/common/gin_helper/event_emitter.h b/shell/common/gin_helper/event_emitter.h
index 58b8d07a43f86..c600e896af947 100644
--- a/shell/common/gin_helper/event_emitter.h
+++ b/shell/common/gin_helper/event_emitter.h
@@ -40,7 +40,7 @@ class EventEmitter : public gin_helper::Wrappable<T> {
   using Base = gin_helper::Wrappable<T>;
   using ValueArray = std::vector<v8::Local<v8::Value>>;
 
-  // Make the convinient methods visible:
+  // Make the convenient methods visible:
   // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members
   v8::Isolate* isolate() const { return Base::isolate(); }
   v8::Local<v8::Object> GetWrapper() const { return Base::GetWrapper(); }
diff --git a/shell/common/gin_helper/function_template.h b/shell/common/gin_helper/function_template.h
index b5d8293213066..c6d6410f9456d 100644
--- a/shell/common/gin_helper/function_template.h
+++ b/shell/common/gin_helper/function_template.h
@@ -313,7 +313,7 @@ struct CallbackTraits<base::RepeatingCallback<T>> {
 
 // Specialization for member function pointers. We need to handle this case
 // specially because the first parameter for callbacks to MFP should typically
-// come from the the JavaScript "this" object the function was called on, not
+// come from the JavaScript "this" object the function was called on, not
 // from the first normal parameter.
 template <typename T>
 struct CallbackTraits<
diff --git a/shell/common/key_weak_map.h b/shell/common/key_weak_map.h
index 09111d48dcd02..038349b8e9661 100644
--- a/shell/common/key_weak_map.h
+++ b/shell/common/key_weak_map.h
@@ -50,7 +50,7 @@ class KeyWeakMap {
       return v8::Local<v8::Object>::New(isolate, iter->second.second);
   }
 
-  // Whethere there is an object with |key| in this WeakMap.
+  // Whether there is an object with |key| in this WeakMap.
   bool Has(const K& key) const { return map_.find(key) != map_.end(); }
 
   // Returns all objects.
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index 2c22d1fceb62b..f3ef770262484 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -84,7 +84,7 @@ void ElectronRenderFrameObserver::DidInstallConditionalFeatures(
   // When a child window is created with window.open, its WebPreferences will
   // be copied from its parent, and Chromium will initialize JS context in it
   // immediately.
-  // Normally the WebPreferences is overriden in browser before navigation,
+  // Normally the WebPreferences is overridden in browser before navigation,
   // but this behavior bypasses the browser side navigation and the child
   // window will get wrong WebPreferences in the initialization.
   // This will end up initializing Node.js in the child window with wrong
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 51c202366a51f..347dae24d2b79 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -127,7 +127,7 @@ describe('app module', () => {
   });
 
   describe('app.isPackaged', () => {
-    it('should be false durings tests', () => {
+    it('should be false during tests', () => {
       expect(app.isPackaged).to.equal(false);
     });
   });
@@ -496,7 +496,7 @@ describe('app module', () => {
       expect(window.id).to.equal(w.id);
     });
 
-    it('should emit browser-window-blur event when window is blured', async () => {
+    it('should emit browser-window-blur event when window is blurred', async () => {
       const emitted = emittedOnce(app, 'browser-window-blur');
       w = new BrowserWindow({ show: false });
       w.emit('blur');
@@ -987,7 +987,7 @@ describe('app module', () => {
       it('gets the folder for recent files', () => {
         const recent = app.getPath('recent');
 
-        // We expect that one of our test machines have overriden this
+        // We expect that one of our test machines have overridden this
         // to be something crazy, it'll always include the word "Recent"
         // unless people have been registry-hacking like crazy
         expect(recent).to.include('Recent');
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 3edd3becbe933..039bc17b31e0d 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2679,7 +2679,7 @@ describe('BrowserWindow module', () => {
         for (const isolatedGlobal of isolated.globals) {
           notIsolatedGlobals.delete(isolatedGlobal);
         }
-        expect([...notIsolatedGlobals]).to.deep.equal([], 'non-isoalted renderer should have no additional globals');
+        expect([...notIsolatedGlobals]).to.deep.equal([], 'non-isolated renderer should have no additional globals');
       });
 
       it('loads the script before other scripts in window', async () => {
diff --git a/spec-main/api-net-log-spec.ts b/spec-main/api-net-log-spec.ts
index 4cae12478a73b..f7fed76843ae8 100644
--- a/spec-main/api-net-log-spec.ts
+++ b/spec-main/api-net-log-spec.ts
@@ -134,7 +134,7 @@ describe('netLog module', () => {
     expect(fs.existsSync(dumpFile)).to.be.true('dump file exists');
   });
 
-  ifit(process.platform !== 'linux')('should begin and end logging automtically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', async () => {
+  ifit(process.platform !== 'linux')('should begin and end logging automatically when --log-net-log is passed, and behave correctly when .startLogging() and .stopLogging() is called', async () => {
     const appProcess = ChildProcess.spawn(process.execPath,
       [appPath], {
         env: {
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index 15c3cf8206031..3631a532cab67 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -1013,7 +1013,7 @@ describe('session module', () => {
       const w = new BrowserWindow({
         show: false,
         webPreferences: {
-          partition: 'very-temp-permision-handler',
+          partition: 'very-temp-permission-handler',
           nodeIntegration: true,
           contextIsolation: false
         }
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index c340d309c83ac..55626f4189ed2 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -247,7 +247,7 @@ describe('webContents module', () => {
         const result = await w.webContents.executeJavaScript(code);
         expect(result).to.equal(expected);
       });
-      it('resolves the returned promise with the result if the code returns an asyncronous promise', async () => {
+      it('resolves the returned promise with the result if the code returns an asynchronous promise', async () => {
         const result = await w.webContents.executeJavaScript(asyncCode);
         expect(result).to.equal(expected);
       });
@@ -883,7 +883,7 @@ describe('webContents module', () => {
 
   describe('getOSProcessId()', () => {
     afterEach(closeAllWindows);
-    it('returns a valid procress id', async () => {
+    it('returns a valid process id', async () => {
       const w = new BrowserWindow({ show: false });
       expect(w.webContents.getOSProcessId()).to.equal(0);
 
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index c1d29bbf8e176..06fa2e5154158 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -2150,7 +2150,7 @@ describe('navigator.hid', () => {
 
     await requestDevices();
     if (haveDevices) {
-      // We have devices to exclude, so check if exculsionFilters work
+      // We have devices to exclude, so check if exclusionFilters work
       checkForExcludedDevice = true;
       await w.webContents.executeJavaScript(`
         navigator.hid.requestDevice({filters: [], exclusionFilters: ${JSON.stringify(exclusionFilters)}}).then(device => device.toString()).catch(err => err.toString());
diff --git a/spec-main/release-notes-spec.ts b/spec-main/release-notes-spec.ts
index a2fd06b93f70a..aa47575f4b007 100644
--- a/spec-main/release-notes-spec.ts
+++ b/spec-main/release-notes-spec.ts
@@ -52,7 +52,7 @@ class GitFake {
       const b: string = args[2]!;
       stdout = this.mergeBase(a, b);
     } else if (args.length === 3 && args[0] === 'log' && args[1] === '--format=%H') {
-      // exepcted form: `git log --format=%H branchName
+      // expected form: `git log --format=%H branchName
       const branch: string = args[2]!;
       stdout = this.branches[branch].map((commit: Commit) => commit.sha1).join('\n');
     } else if (args.length > 1 && args[0] === 'log' && args.includes('--format=%H,%s')) {
@@ -107,10 +107,10 @@ describe('release notes', () => {
   const oldTropFix = new Commit('8751f485c5a6c8c78990bfd55a4350700f81f8cd', 'fix: workaround for hang when preventDefault-ing nativeWindowOpen (#22749)');
 
   // a PR that has unusual note formatting
-  const sublist = new Commit('61dc1c88fd34a3e8fff80c80ed79d0455970e610', 'fix: client area inset calculation when maximized for framless windows (#25052) (#25216)');
+  const sublist = new Commit('61dc1c88fd34a3e8fff80c80ed79d0455970e610', 'fix: client area inset calculation when maximized for frameless windows (#25052) (#25216)');
 
   before(() => {
-    // location of relase-notes' octokit reply cache
+    // location of release-notes' octokit reply cache
     const fixtureDir = path.resolve(__dirname, 'fixtures', 'release-notes');
     process.env.NOTES_CACHE_PATH = path.resolve(fixtureDir, 'cache');
   });
diff --git a/spec-main/version-bump-spec.ts b/spec-main/version-bump-spec.ts
index ef37d871b77d4..7a8ef9113ce01 100644
--- a/spec-main/version-bump-spec.ts
+++ b/spec-main/version-bump-spec.ts
@@ -60,7 +60,7 @@ class GitFake {
 
 describe('version-bumper', () => {
   describe('makeVersion', () => {
-    it('makes a version with a period delimeter', () => {
+    it('makes a version with a period delimiter', () => {
       const components = {
         major: 2,
         minor: 0,
@@ -71,7 +71,7 @@ describe('version-bumper', () => {
       expect(version).to.equal('2.0.0');
     });
 
-    it('makes a version with a period delimeter and a partial pre', () => {
+    it('makes a version with a period delimiter and a partial pre', () => {
       const components = {
         major: 2,
         minor: 0,
@@ -83,7 +83,7 @@ describe('version-bumper', () => {
       expect(version).to.equal('2.0.0.12345678');
     });
 
-    it('makes a version with a period delimeter and a full pre', () => {
+    it('makes a version with a period delimiter and a full pre', () => {
       const components = {
         major: 2,
         minor: 0,
diff --git a/spec/asar-spec.js b/spec/asar-spec.js
index 4468bf85e2997..d95dcb4711c88 100644
--- a/spec/asar-spec.js
+++ b/spec/asar-spec.js
@@ -1677,7 +1677,7 @@ describe('asar package', function () {
   describe('graceful-fs module', function () {
     const gfs = require('graceful-fs');
 
-    it('recognize asar archvies', function () {
+    it('recognize asar archives', function () {
       const p = path.join(asarDir, 'a.asar', 'link1');
       expect(gfs.readFileSync(p).toString().trim()).to.equal('file1');
     });
diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index d0379b13d629c..6e92dc6c7e0e7 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -358,7 +358,7 @@ describe('chromium feature', () => {
       });
     });
 
-    it('requesting persitent quota works', async () => {
+    it('requesting persistent quota works', async () => {
       const grantedBytes = await new Promise(resolve => {
         navigator.webkitPersistentStorage.requestQuota(1024 * 1024, resolve);
       });
@@ -459,7 +459,7 @@ describe('chromium feature', () => {
 
   describe('window.history', () => {
     describe('window.history.go(offset)', () => {
-      it('throws an exception when the argumnet cannot be converted to a string', () => {
+      it('throws an exception when the argument cannot be converted to a string', () => {
         expect(() => {
           window.history.go({ toString: null });
         }).to.throw('Cannot convert object to primitive value');
@@ -482,7 +482,7 @@ describe('chromium feature', () => {
       const sentence = `long sentence which will take at least a few seconds to
           utter so that it's possible to pause and resume before the end`;
       const utter = new SpeechSynthesisUtterance(sentence);
-      // Create a dummy utterence so that speech synthesis state
+      // Create a dummy utterance so that speech synthesis state
       // is initialized for later calls.
       speechSynthesis.speak(new SpeechSynthesisUtterance());
       speechSynthesis.cancel();
diff --git a/spec/node-spec.js b/spec/node-spec.js
index 05af8764c08c6..2d3fdd53afb26 100644
--- a/spec/node-spec.js
+++ b/spec/node-spec.js
@@ -45,7 +45,7 @@ describe('node feature', () => {
         expect(msg).to.equal('message');
       });
 
-      it('works in forked process when options.env is specifed', async () => {
+      it('works in forked process when options.env is specified', async () => {
         const child = ChildProcess.fork(path.join(fixtures, 'module', 'fork_ping.js'), [], {
           path: process.env.PATH
         });
diff --git a/spec/static/index.html b/spec/static/index.html
index 7c316a69f130a..f69432535ac6a 100644
--- a/spec/static/index.html
+++ b/spec/static/index.html
@@ -24,7 +24,7 @@
   // DO NOT MOVE, REMOVE OR EDIT THIS LINE
   require('chai').use(require('chai-as-promised'))
 
-  // Rediret all output to browser.
+  // Redirect all output to browser.
   const fakeConsole = {}
   for (const k in console) {
     if (console.hasOwnProperty(k) && k !== 'assert') {
diff --git a/spec/static/main.js b/spec/static/main.js
index 075d699ede5cc..262024a881094 100644
--- a/spec/static/main.js
+++ b/spec/static/main.js
@@ -136,7 +136,7 @@ app.whenReady().then(async function () {
     const chosen = dialog.showMessageBox(window, {
       type: 'warning',
       buttons: ['Close', 'Keep Waiting'],
-      message: 'Window is not responsing',
+      message: 'Window is not responding',
       detail: 'The window is not responding. Would you like to force close it or just keep waiting?'
     });
     if (chosen === 0) window.destroy();
diff --git a/spec/ts-smoke/electron/main.ts b/spec/ts-smoke/electron/main.ts
index 5d1b6dd6b66a3..6cd4db3b71efd 100644
--- a/spec/ts-smoke/electron/main.ts
+++ b/spec/ts-smoke/electron/main.ts
@@ -60,9 +60,9 @@ app.whenReady().then(() => {
 
   // and load the index.html of the app.
   mainWindow.loadURL(`file://${__dirname}/index.html`)
-  mainWindow.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greateRefferer' })
-  mainWindow.webContents.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greateRefferer' })
-  mainWindow.webContents.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greateRefferer', postData: [{ type: 'rawData', bytes: Buffer.from([123]) }] })
+  mainWindow.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greatReferrer' })
+  mainWindow.webContents.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greatReferrer' })
+  mainWindow.webContents.loadURL('file://foo/bar', { userAgent: 'cool-agent', httpReferrer: 'greatReferrer', postData: [{ type: 'rawData', bytes: Buffer.from([123]) }] })
 
   mainWindow.webContents.openDevTools()
   mainWindow.webContents.toggleDevTools()
@@ -513,7 +513,7 @@ dialog.showOpenDialog(win3, {
 const ret = globalShortcut.register('ctrl+x', () => {
   console.log('ctrl+x is pressed')
 })
-if (!ret) { console.log('registerion fails') }
+if (!ret) { console.log('registration fails') }
 
 // Check whether a shortcut is registered.
 console.log(globalShortcut.isRegistered('ctrl+x'))
@@ -940,7 +940,7 @@ app.whenReady().then(() => {
 
   appIcon.displayBalloon({
     title: 'Hello World!',
-    content: 'This the the balloon content.',
+    content: 'This is the balloon content.',
     iconType: 'error',
     icon: 'path/to/icon',
     respectQuietTime: true,
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 6b548b56541bf..c703c57c8cec6 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -233,7 +233,7 @@ describe('<webview> tag', function () {
 
       const types = JSON.parse(message);
       expect(types).to.include({
-        require: 'function', // arguments passed to it should be availale
+        require: 'function', // arguments passed to it should be available
         electron: 'undefined', // objects from the scope it is called from should not be available
         window: 'object', // the window object should be available
         localVar: 'undefined' // but local variables should not be exposed to the window
@@ -634,7 +634,7 @@ describe('<webview> tag', function () {
   });
 
   describe('will-navigate event', () => {
-    it('emits when a url that leads to oustide of the page is clicked', async () => {
+    it('emits when a url that leads to outside of the page is clicked', async () => {
       loadWebView(webview, {
         src: `file://${fixtures}/pages/webview-will-navigate.html`
       });

From d2e539c7d4fb16615164222fd9568ed81d7aacc1 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 16 Jun 2022 06:00:48 -0700
Subject: [PATCH 490/811] Bump v21.0.0-nightly.20220616

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c3798e48f03c7..b2c0abed6c8b9 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220615
\ No newline at end of file
+21.0.0-nightly.20220616
\ No newline at end of file
diff --git a/package.json b/package.json
index d29993e424054..67432c4ffae9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220615",
+  "version": "21.0.0-nightly.20220616",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ef3a93a1ba5a4..a3eb58ad5e11e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220615
- PRODUCTVERSION 21,0,0,20220615
+ FILEVERSION 21,0,0,20220616
+ PRODUCTVERSION 21,0,0,20220616
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 20538c4f34a471677d40ef304e76ae46a3a3c3f1 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 17 Jun 2022 12:01:38 +0200
Subject: [PATCH 491/811] fix: draggable regions updating on bounds change
 (#34582)

---
 shell/browser/native_browser_view_views.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/shell/browser/native_browser_view_views.cc b/shell/browser/native_browser_view_views.cc
index 0120f2ac48acd..10452b09717f8 100644
--- a/shell/browser/native_browser_view_views.cc
+++ b/shell/browser/native_browser_view_views.cc
@@ -27,6 +27,9 @@ void NativeBrowserViewViews::SetAutoResizeFlags(uint8_t flags) {
 
 void NativeBrowserViewViews::UpdateDraggableRegions(
     const std::vector<mojom::DraggableRegionPtr>& regions) {
+  if (&draggable_regions_ != &regions)
+    draggable_regions_ = mojo::Clone(regions);
+
   // We need to snap the regions to the bounds of the current BrowserView.
   // For example, if an attached BrowserView is draggable but its bounds are
   // { x: 200,  y: 100, width: 300, height: 300 }
@@ -35,12 +38,10 @@ void NativeBrowserViewViews::UpdateDraggableRegions(
   // assumed that the regions begin in the top left corner as they
   // would for the main client window.
   auto const offset = GetBounds().OffsetFromOrigin();
-  auto snapped_regions = mojo::Clone(regions);
-  for (auto& snapped_region : snapped_regions) {
+  for (auto& snapped_region : draggable_regions_) {
     snapped_region->bounds.Offset(offset);
   }
-
-  draggable_region_ = DraggableRegionsToSkRegion(snapped_regions);
+  draggable_region_ = DraggableRegionsToSkRegion(draggable_regions_);
 }
 
 void NativeBrowserViewViews::SetAutoResizeProportions(
@@ -128,6 +129,9 @@ void NativeBrowserViewViews::SetBounds(const gfx::Rect& bounds) {
   auto* view = iwc_view->GetView();
   view->SetBoundsRect(bounds);
   ResetAutoResizeProportions();
+
+  // Ensure draggable regions are properly updated to reflect new bounds.
+  UpdateDraggableRegions(draggable_regions_);
 }
 
 gfx::Rect NativeBrowserViewViews::GetBounds() {

From 6f8bfdeb7a52706fa9af51ade587955a8ae63795 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 17 Jun 2022 06:02:13 -0700
Subject: [PATCH 492/811] Bump v21.0.0-nightly.20220617

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b2c0abed6c8b9..13c51fb952269 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220616
\ No newline at end of file
+21.0.0-nightly.20220617
\ No newline at end of file
diff --git a/package.json b/package.json
index 67432c4ffae9e..2c68245e31749 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220616",
+  "version": "21.0.0-nightly.20220617",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index a3eb58ad5e11e..78e71313568b9 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220616
- PRODUCTVERSION 21,0,0,20220616
+ FILEVERSION 21,0,0,20220617
+ PRODUCTVERSION 21,0,0,20220617
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b3ec0a801a3c3ad0b789854df830bd3573d8174a Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 20 Jun 2022 02:40:03 +0200
Subject: [PATCH 493/811] chore: cleanup undocumented keys from
 webFrame.getWebPreference() (#34588)

---
 shell/renderer/api/electron_api_web_frame.cc | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index ea40c368cee65..6a7a0c2387cd2 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -509,22 +509,8 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     } else if (pref_name == options::kHiddenPage) {
       // NOTE: hiddenPage is internal-only.
       return gin::ConvertToV8(isolate, prefs.hidden_page);
-    } else if (pref_name == options::kOffscreen) {
-      return gin::ConvertToV8(isolate, prefs.offscreen);
     } else if (pref_name == options::kNodeIntegration) {
       return gin::ConvertToV8(isolate, prefs.node_integration);
-    } else if (pref_name == options::kNodeIntegrationInWorker) {
-      return gin::ConvertToV8(isolate, prefs.node_integration_in_worker);
-    } else if (pref_name == options::kNodeIntegrationInSubFrames) {
-      return gin::ConvertToV8(isolate, true);
-#if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
-    } else if (pref_name == options::kSpellcheck) {
-      return gin::ConvertToV8(isolate, prefs.enable_spellcheck);
-#endif
-    } else if (pref_name == options::kPlugins) {
-      return gin::ConvertToV8(isolate, prefs.enable_plugins);
-    } else if (pref_name == options::kEnableWebSQL) {
-      return gin::ConvertToV8(isolate, prefs.enable_websql);
     } else if (pref_name == options::kWebviewTag) {
       return gin::ConvertToV8(isolate, prefs.webview_tag);
     }

From 999a225edb6454d4940264ee51d99cd65fa1c2e2 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Sun, 19 Jun 2022 17:42:30 -0700
Subject: [PATCH 494/811] refactor: use stubs for gdk-pixbuf dependency
 (#34077)

* refactor: use stubs for gdk-pixbuf dependency

* Adjust build file

* Add includes

* Merge gdk_pixbuf stubs into gtk stubs

* Split pixbuf sigs into own file again

* Add initialization check

* Apply PR feedback
---
 BUILD.gn                                      |  5 ++-
 .../chromium/make_gtk_getlibgtk_public.patch  | 36 ++++++++++++++-----
 shell/browser/electron_browser_main_parts.cc  |  4 +++
 shell/browser/ui/electron_gdk_pixbuf.sigs     |  3 ++
 shell/browser/ui/electron_gtk.fragment        |  3 +-
 shell/browser/ui/electron_gtk.sigs            |  2 +-
 shell/browser/ui/gtk_util.cc                  |  1 +
 shell/browser/ui/message_box_gtk.cc           |  1 +
 8 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 shell/browser/ui/electron_gdk_pixbuf.sigs

diff --git a/BUILD.gn b/BUILD.gn
index e8b11ac5ba3c6..b33a93c72a054 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -87,7 +87,10 @@ if (is_linux) {
   # implementation. In future, this file can be extended to contain
   # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
-    sigs = [ "shell/browser/ui/electron_gtk.sigs" ]
+    sigs = [
+      "shell/browser/ui/electron_gdk_pixbuf.sigs",
+      "shell/browser/ui/electron_gtk.sigs",
+    ]
     extra_header = "shell/browser/ui/electron_gtk.fragment"
     output_name = "electron_gtk_stubs"
     public_deps = [ "//ui/gtk:gtk_config" ]
diff --git a/patches/chromium/make_gtk_getlibgtk_public.patch b/patches/chromium/make_gtk_getlibgtk_public.patch
index dd4dec37023ec..730a2877e5aa2 100644
--- a/patches/chromium/make_gtk_getlibgtk_public.patch
+++ b/patches/chromium/make_gtk_getlibgtk_public.patch
@@ -1,16 +1,28 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 7 Apr 2022 20:30:16 +0900
-Subject: Make gtk::GetLibGtk public
+Subject: Make gtk::GetLibGtk and gtk::GetLibGdkPixbuf public
 
-Allows embedders to get a handle to the gtk library
-already loaded in the process.
+Allows embedders to get a handle to the gtk and
+gdk_pixbuf libraries already loaded in the process.
 
 diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
-index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..40b706ed7cde206e98274025148604760b7477f9 100644
+index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..65b097cfab72b92f301968715eb218ef0e468567 100644
 --- a/ui/gtk/gtk_compat.cc
 +++ b/ui/gtk/gtk_compat.cc
-@@ -86,12 +86,6 @@ void* GetLibGtk4(bool check = true) {
+@@ -66,11 +66,6 @@ void* GetLibGio() {
+   return libgio;
+ }
+ 
+-void* GetLibGdkPixbuf() {
+-  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
+-  return libgdk_pixbuf;
+-}
+-
+ void* GetLibGdk3() {
+   static void* libgdk3 = DlOpen("libgdk-3.so.0");
+   return libgdk3;
+@@ -86,12 +81,6 @@ void* GetLibGtk4(bool check = true) {
    return libgtk4;
  }
  
@@ -23,10 +35,15 @@ index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..40b706ed7cde206e9827402514860476
  bool LoadGtk3() {
    if (!GetLibGtk3(false))
      return false;
-@@ -134,6 +128,12 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
+@@ -134,6 +123,17 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
  
  }  // namespace
  
++void* GetLibGdkPixbuf() {
++  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
++  return libgdk_pixbuf;
++}
++
 +void* GetLibGtk() {
 +  if (GtkCheckVersion(4))
 +    return GetLibGtk4();
@@ -37,13 +54,16 @@ index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..40b706ed7cde206e9827402514860476
    static bool loaded = LoadGtkImpl();
    return loaded;
 diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
-index 57e55b9e749b43d327deff449a530e1f435a8e8b..2245974f91be4a691d82f54b55e12e44ae2000c5 100644
+index 57e55b9e749b43d327deff449a530e1f435a8e8b..37720be9e393d192b3b7db13a007431a9ce77ddc 100644
 --- a/ui/gtk/gtk_compat.h
 +++ b/ui/gtk/gtk_compat.h
-@@ -34,6 +34,9 @@ using SkColor = uint32_t;
+@@ -34,6 +34,12 @@ using SkColor = uint32_t;
  
  namespace gtk {
  
++// Get handle to the currently loaded gdk_pixbuf library in the process.
++void* GetLibGdkPixbuf();
++
 +// Get handle to the currently loaded gtk library in the process.
 +void* GetLibGtk();
 +
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 151fc8d17a758..dd5f187ce9ed5 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -371,6 +371,10 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
     electron::UninitializeElectron_gtk();
   }
 
+  electron::InitializeElectron_gdk_pixbuf(gtk::GetLibGdkPixbuf());
+  CHECK(electron::IsElectron_gdk_pixbufInitialized())
+      << "Failed to initialize libgdk_pixbuf-2.0.so.0";
+
   // Chromium does not respect GTK dark theme setting, but they may change
   // in future and this code might be no longer needed. Check the Chromium
   // issue to keep updated:
diff --git a/shell/browser/ui/electron_gdk_pixbuf.sigs b/shell/browser/ui/electron_gdk_pixbuf.sigs
new file mode 100644
index 0000000000000..c19eb4679265f
--- /dev/null
+++ b/shell/browser/ui/electron_gdk_pixbuf.sigs
@@ -0,0 +1,3 @@
+GdkPixbuf* gdk_pixbuf_new(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height)
+GdkPixbuf* gdk_pixbuf_scale_simple(const GdkPixbuf* src, int dest_width, int dest_height, GdkInterpType interp_type)
+guchar* gdk_pixbuf_get_pixels(const GdkPixbuf* pixbuf)
diff --git a/shell/browser/ui/electron_gtk.fragment b/shell/browser/ui/electron_gtk.fragment
index 74a31b23585ac..677c382087029 100644
--- a/shell/browser/ui/electron_gtk.fragment
+++ b/shell/browser/ui/electron_gtk.fragment
@@ -1 +1,2 @@
-#include <gtk/gtk.h>
\ No newline at end of file
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
diff --git a/shell/browser/ui/electron_gtk.sigs b/shell/browser/ui/electron_gtk.sigs
index 451fc74a953d6..41f3890096e09 100644
--- a/shell/browser/ui/electron_gtk.sigs
+++ b/shell/browser/ui/electron_gtk.sigs
@@ -4,4 +4,4 @@ void gtk_native_dialog_show(GtkNativeDialog* self);
 void gtk_native_dialog_hide(GtkNativeDialog* self);
 gint gtk_native_dialog_run(GtkNativeDialog* self);
 void gtk_native_dialog_destroy(GtkNativeDialog* self);
-GType gtk_native_dialog_get_type(void);
\ No newline at end of file
+GType gtk_native_dialog_get_type(void);
diff --git a/shell/browser/ui/gtk_util.cc b/shell/browser/ui/gtk_util.cc
index 3d279485cf505..7fc6154bf99f3 100644
--- a/shell/browser/ui/gtk_util.cc
+++ b/shell/browser/ui/gtk_util.cc
@@ -12,6 +12,7 @@
 
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
+#include "electron/electron_gtk_stubs.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
diff --git a/shell/browser/ui/message_box_gtk.cc b/shell/browser/ui/message_box_gtk.cc
index 3efc453fc97bd..6266dad29ef51 100644
--- a/shell/browser/ui/message_box_gtk.cc
+++ b/shell/browser/ui/message_box_gtk.cc
@@ -11,6 +11,7 @@
 #include "base/no_destructor.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "electron/electron_gtk_stubs.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_window_observer.h"
 #include "shell/browser/native_window_views.h"

From bf4efb693b571addc1b3ce8ed78288abdc9967a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jun 2022 09:57:25 +0900
Subject: [PATCH 495/811] build(deps): bump jpeg-js from 0.4.3 to 0.4.4 in
 /spec-main (#34607)

Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 spec-main/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec-main/yarn.lock b/spec-main/yarn.lock
index 28e15239334c4..070872b80729e 100644
--- a/spec-main/yarn.lock
+++ b/spec-main/yarn.lock
@@ -520,9 +520,9 @@ isstream@~0.1.2:
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 jpeg-js@^0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.3.tgz#6158e09f1983ad773813704be80680550eff977b"
-  integrity sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
+  integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
 
 jsbn@~0.1.0:
   version "0.1.1"

From ec98e95b8ac48a313cd8acb1c723829e40b108df Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Mon, 20 Jun 2022 10:01:29 +0530
Subject: [PATCH 496/811] fix: performance problem in `crashReporter.start()`
 on macOS (#34609)

fix: performance problem in crashReporter.start() on macOS

This change reduces the duration of crashReporter.start() on Intel macOS
from 622 milliseconds to 257 milliseconds!

Backports https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3641386

  posix: Replace DoubleForkAndExec() with ForkAndSpawn()

  The DoubleForkAndExec() function was taking over 622 milliseconds to run
  on macOS 11 (BigSur) on Intel i5-1038NG7. I did some debugging by adding
  some custom traces and found that the fork() syscall is the bottleneck
  here, i.e., the first fork() takes around 359 milliseconds and the
  nested fork() takes around 263 milliseconds. Replacing the nested fork()
  and exec() with posix_spawn() reduces the time consumption to 257
  milliseconds!

  See https://github.com/libuv/libuv/pull/3064 to know why fork() is so
  slow on macOS and why posix_spawn() is a better replacement.

  Another point to note is that even base::LaunchProcess() from Chromium
  calls posix_spawnp() on macOS -
  https://source.chromium.org/chromium/chromium/src/+/8f8d82dea0fa8f11f57c74dbb65126f8daba58f7:base/process/launch_mac.cc;l=295-296

  Change-Id: I25c6ee9629a1ae5d0c32b361b56a1ce0b4b0fd26
  Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3641386
  Reviewed-by: Mark Mentovai <mark@chromium.org>
  Commit-Queue: Mark Mentovai <mark@chromium.org>

Fixes: https://github.com/electron/electron/issues/34321
Signed-off-by: Darshan Sen <raisinten@gmail.com>
---
 patches/chromium/.patches                     |   1 +
 ..._doubleforkandexec_with_forkandspawn.patch | 641 ++++++++++++++++++
 2 files changed, 642 insertions(+)
 create mode 100644 patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 547c0b5e6240e..fca913719ee48 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -111,3 +111,4 @@ make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
+posix_replace_doubleforkandexec_with_forkandspawn.patch
diff --git a/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch b/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
new file mode 100644
index 0000000000000..5cb0508a1a082
--- /dev/null
+++ b/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
@@ -0,0 +1,641 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Darshan Sen <raisinten@gmail.com>
+Date: Fri, 17 Jun 2022 13:19:32 +0530
+Subject: posix: Replace DoubleForkAndExec() with ForkAndSpawn()
+
+The DoubleForkAndExec() function was taking over 622 milliseconds to run
+on macOS 11 (BigSur) on Intel i5-1038NG7. I did some debugging by adding
+some custom traces and found that the fork() syscall is the bottleneck
+here, i.e., the first fork() takes around 359 milliseconds and the
+nested fork() takes around 263 milliseconds. Replacing the nested fork()
+and exec() with posix_spawn() reduces the time consumption to 257
+milliseconds!
+
+See https://github.com/libuv/libuv/pull/3064 to know why fork() is so
+slow on macOS and why posix_spawn() is a better replacement.
+
+Another point to note is that even base::LaunchProcess() from Chromium
+calls posix_spawnp() on macOS -
+https://source.chromium.org/chromium/chromium/src/+/8f8d82dea0fa8f11f57c74dbb65126f8daba58f7:base/process/launch_mac.cc;l=295-296
+
+Change-Id: I25c6ee9629a1ae5d0c32b361b56a1ce0b4b0fd26
+Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3641386
+Reviewed-by: Mark Mentovai <mark@chromium.org>
+Commit-Queue: Mark Mentovai <mark@chromium.org>
+
+diff --git a/third_party/crashpad/crashpad/AUTHORS b/third_party/crashpad/crashpad/AUTHORS
+index 8dcac3238870920d374b86033d05d77ebde351e9..02103924332eddbd158c04f8a395bb4a247e8bd9 100644
+--- a/third_party/crashpad/crashpad/AUTHORS
++++ b/third_party/crashpad/crashpad/AUTHORS
+@@ -12,3 +12,4 @@ Opera Software ASA
+ Vewd Software AS
+ LG Electronics, Inc.
+ MIPS Technologies, Inc.
++Darshan Sen <raisinten@gmail.com>
+diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
+index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38dfd4cd9d70 100644
+--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
++++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
+@@ -45,7 +45,7 @@
+ #include "util/linux/socket.h"
+ #include "util/misc/address_sanitizer.h"
+ #include "util/misc/from_pointer_cast.h"
+-#include "util/posix/double_fork_and_exec.h"
++#include "util/posix/fork_and_spawn.h"
+ #include "util/posix/scoped_mmap.h"
+ #include "util/posix/signals.h"
+ 
+@@ -454,7 +454,7 @@ bool CrashpadClient::StartHandler(
+ 
+   argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
+   argv.push_back("--shared-client-connection");
+-  if (!DoubleForkAndExec(argv, nullptr, handler_sock.get(), false, nullptr)) {
++  if (!ForkAndSpawn(argv, nullptr, handler_sock.get(), false, nullptr)) {
+     return false;
+   }
+ 
+@@ -609,7 +609,7 @@ bool CrashpadClient::StartJavaHandlerForClient(
+     int socket) {
+   std::vector<std::string> argv = BuildAppProcessArgs(
+       class_name, database, metrics_dir, url, annotations, arguments, socket);
+-  return DoubleForkAndExec(argv, env, socket, false, nullptr);
++  return ForkAndSpawn(argv, env, socket, false, nullptr);
+ }
+ 
+ bool CrashpadClient::StartHandlerWithLinkerAtCrash(
+@@ -658,7 +658,7 @@ bool CrashpadClient::StartHandlerWithLinkerForClient(
+                                   annotations,
+                                   arguments,
+                                   socket);
+-  return DoubleForkAndExec(argv, env, socket, false, nullptr);
++  return ForkAndSpawn(argv, env, socket, false, nullptr);
+ }
+ 
+ #endif
+@@ -692,7 +692,7 @@ bool CrashpadClient::StartHandlerForClient(
+ 
+   argv.push_back(FormatArgumentInt("initial-client-fd", socket));
+ 
+-  return DoubleForkAndExec(argv, nullptr, socket, true, nullptr);
++  return ForkAndSpawn(argv, nullptr, socket, true, nullptr);
+ }
+ 
+ // static
+diff --git a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
+index 39e35678ecdd036f8c8ae27c973c27102b77da96..84385f2569f2bd00ca8aed0aa332fb450b2de1d3 100644
+--- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
++++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
+@@ -36,7 +36,7 @@
+ #include "util/mach/notify_server.h"
+ #include "util/misc/clock.h"
+ #include "util/misc/implicit_cast.h"
+-#include "util/posix/double_fork_and_exec.h"
++#include "util/posix/fork_and_spawn.h"
+ 
+ namespace crashpad {
+ 
+@@ -343,7 +343,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
+     // this parent process, which was probably using the exception server now
+     // being restarted. The handler can’t monitor itself for its own crashes via
+     // this interface.
+-    if (!DoubleForkAndExec(
++    if (!ForkAndSpawn(
+             argv,
+             nullptr,
+             server_write_fd.get(),
+diff --git a/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc b/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
+index 9e58d94aa499fdb7271a78ea21a1dcc1b12e3a52..3caa3b987b35be575558a312026cf6f19485c418 100644
+--- a/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
++++ b/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
+@@ -29,7 +29,7 @@
+ #include "util/linux/ptrace_client.h"
+ #include "util/misc/metrics.h"
+ #include "util/misc/uuid.h"
+-#include "util/posix/double_fork_and_exec.h"
++#include "util/posix/fork_and_spawn.h"
+ 
+ namespace crashpad {
+ 
+@@ -266,12 +266,11 @@ bool CrosCrashReportExceptionHandler::HandleExceptionWithConnection(
+     argv.push_back("--always_allow_feedback");
+   }
+ 
+-  if (!DoubleForkAndExec(argv,
+-                         nullptr /* envp */,
+-                         file_writer.fd() /* preserve_fd */,
+-                         false /* use_path */,
+-                         nullptr /* child_function */)) {
+-    LOG(ERROR) << "DoubleForkAndExec failed";
++  if (!ForkAndSpawn(argv,
++                    nullptr /* envp */,
++                    file_writer.fd() /* preserve_fd */,
++                    false /* use_path */,
++                    nullptr /* child_function */)) {
+     Metrics::ExceptionCaptureResult(
+         Metrics::CaptureResult::kFinishedWritingCrashReportFailed);
+     return false;
+diff --git a/third_party/crashpad/crashpad/util/BUILD.gn b/third_party/crashpad/crashpad/util/BUILD.gn
+index 30f03b13f3a018e6a96b0689452a344992675c23..64fa2e9e89b700d8a265a9737cb6a30a210cdffe 100644
+--- a/third_party/crashpad/crashpad/util/BUILD.gn
++++ b/third_party/crashpad/crashpad/util/BUILD.gn
+@@ -296,10 +296,10 @@ crashpad_static_library("util") {
+       sources += [
+         "posix/close_multiple.cc",
+         "posix/close_multiple.h",
+-        "posix/double_fork_and_exec.cc",
+-        "posix/double_fork_and_exec.h",
+         "posix/drop_privileges.cc",
+         "posix/drop_privileges.h",
++        "posix/fork_and_spawn.cc",
++        "posix/fork_and_spawn.h",
+         "posix/process_info.h",
+ 
+         # These map signals to and from strings. While Fuchsia defines some of
+diff --git a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc b/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc
+deleted file mode 100644
+index 1960430954d3f6459dce688493db5c42047567b0..0000000000000000000000000000000000000000
+--- a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc
++++ /dev/null
+@@ -1,166 +0,0 @@
+-// Copyright 2017 The Crashpad Authors. All rights reserved.
+-//
+-// Licensed under the Apache License, Version 2.0 (the "License");
+-// you may not use this file except in compliance with the License.
+-// You may obtain a copy of the License at
+-//
+-//     http://www.apache.org/licenses/LICENSE-2.0
+-//
+-// Unless required by applicable law or agreed to in writing, software
+-// distributed under the License is distributed on an "AS IS" BASIS,
+-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-// See the License for the specific language governing permissions and
+-// limitations under the License.
+-
+-#include "util/posix/double_fork_and_exec.h"
+-
+-#include <stdlib.h>
+-#include <string.h>
+-#include <sys/wait.h>
+-#include <unistd.h>
+-
+-#include "base/check_op.h"
+-#include "base/logging.h"
+-#include "base/posix/eintr_wrapper.h"
+-#include "base/strings/stringprintf.h"
+-#include "util/posix/close_multiple.h"
+-
+-namespace crashpad {
+-
+-bool DoubleForkAndExec(const std::vector<std::string>& argv,
+-                       const std::vector<std::string>* envp,
+-                       int preserve_fd,
+-                       bool use_path,
+-                       void (*child_function)()) {
+-  DCHECK(!envp || !use_path);
+-
+-  // argv_c contains const char* pointers and is terminated by nullptr. This is
+-  // suitable for passing to execv(). Although argv_c is not used in the parent
+-  // process, it must be built in the parent process because it’s unsafe to do
+-  // so in the child or grandchild process.
+-  std::vector<const char*> argv_c;
+-  argv_c.reserve(argv.size() + 1);
+-  for (const std::string& argument : argv) {
+-    argv_c.push_back(argument.c_str());
+-  }
+-  argv_c.push_back(nullptr);
+-
+-  std::vector<const char*> envp_c;
+-  if (envp) {
+-    envp_c.reserve(envp->size() + 1);
+-    for (const std::string& variable : *envp) {
+-      envp_c.push_back(variable.c_str());
+-    }
+-    envp_c.push_back(nullptr);
+-  }
+-
+-  // Double-fork(). The three processes involved are parent, child, and
+-  // grandchild. The grandchild will call execv(). The child exits immediately
+-  // after spawning the grandchild, so the grandchild becomes an orphan and its
+-  // parent process ID becomes 1. This relieves the parent and child of the
+-  // responsibility to reap the grandchild with waitpid() or similar. The
+-  // grandchild is expected to outlive the parent process, so the parent
+-  // shouldn’t be concerned with reaping it. This approach means that accidental
+-  // early termination of the handler process will not result in a zombie
+-  // process.
+-  pid_t pid = fork();
+-  if (pid < 0) {
+-    PLOG(ERROR) << "fork";
+-    return false;
+-  }
+-
+-  if (pid == 0) {
+-    // Child process.
+-
+-    if (child_function) {
+-      child_function();
+-    }
+-
+-    // Call setsid(), creating a new process group and a new session, both led
+-    // by this process. The new process group has no controlling terminal. This
+-    // disconnects it from signals generated by the parent process’ terminal.
+-    //
+-    // setsid() is done in the child instead of the grandchild so that the
+-    // grandchild will not be a session leader. If it were a session leader, an
+-    // accidental open() of a terminal device without O_NOCTTY would make that
+-    // terminal the controlling terminal.
+-    //
+-    // It’s not desirable for the grandchild to have a controlling terminal. The
+-    // grandchild manages its own lifetime, such as by monitoring clients on its
+-    // own and exiting when it loses all clients and when it deems it
+-    // appropraite to do so. It may serve clients in different process groups or
+-    // sessions than its original client, and receiving signals intended for its
+-    // original client’s process group could be harmful in that case.
+-    PCHECK(setsid() != -1) << "setsid";
+-
+-    pid = fork();
+-    if (pid < 0) {
+-      PLOG(FATAL) << "fork";
+-    }
+-
+-    if (pid > 0) {
+-      // Child process.
+-
+-      // _exit() instead of exit(), because fork() was called.
+-      _exit(EXIT_SUCCESS);
+-    }
+-
+-    // Grandchild process.
+-
+-    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
+-
+-    // &argv_c[0] is a pointer to a pointer to const char data, but because of
+-    // how C (not C++) works, execvp() wants a pointer to a const pointer to
+-    // char data. It modifies neither the data nor the pointers, so the
+-    // const_cast is safe.
+-    char* const* argv_for_execv = const_cast<char* const*>(&argv_c[0]);
+-
+-    if (envp) {
+-      // This cast is safe for the same reason that the argv_for_execv cast is.
+-      char* const* envp_for_execv = const_cast<char* const*>(&envp_c[0]);
+-      execve(argv_for_execv[0], argv_for_execv, envp_for_execv);
+-      PLOG(FATAL) << "execve " << argv_for_execv[0];
+-    }
+-
+-    if (use_path) {
+-      execvp(argv_for_execv[0], argv_for_execv);
+-      PLOG(FATAL) << "execvp " << argv_for_execv[0];
+-    }
+-
+-    execv(argv_for_execv[0], argv_for_execv);
+-    PLOG(FATAL) << "execv " << argv_for_execv[0];
+-  }
+-
+-  // waitpid() for the child, so that it does not become a zombie process. The
+-  // child normally exits quickly.
+-  //
+-  // Failures from this point on may result in the accumulation of a zombie, but
+-  // should not be considered fatal. Log only warnings, but don’t treat these
+-  // failures as a failure of the function overall.
+-  int status;
+-  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
+-  if (wait_pid == -1) {
+-    PLOG(WARNING) << "waitpid";
+-    return true;
+-  }
+-  DCHECK_EQ(wait_pid, pid);
+-
+-  if (WIFSIGNALED(status)) {
+-    int sig = WTERMSIG(status);
+-    LOG(WARNING) << base::StringPrintf(
+-        "intermediate process terminated by signal %d (%s)%s",
+-        sig,
+-        strsignal(sig),
+-        WCOREDUMP(status) ? " (core dumped)" : "");
+-  } else if (!WIFEXITED(status)) {
+-    LOG(WARNING) << base::StringPrintf(
+-        "intermediate process: unknown termination 0x%x", status);
+-  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
+-    LOG(WARNING) << "intermediate process exited with code "
+-                 << WEXITSTATUS(status);
+-  }
+-
+-  return true;
+-}
+-
+-}  // namespace crashpad
+diff --git a/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc
+new file mode 100644
+index 0000000000000000000000000000000000000000..c6a95bbfdcba45995b0034789c8bdb4423a25642
+--- /dev/null
++++ b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc
+@@ -0,0 +1,235 @@
++// Copyright 2017 The Crashpad Authors. All rights reserved.
++//
++// Licensed under the Apache License, Version 2.0 (the "License");
++// you may not use this file except in compliance with the License.
++// You may obtain a copy of the License at
++//
++//     http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// See the License for the specific language governing permissions and
++// limitations under the License.
++
++#include "util/posix/fork_and_spawn.h"
++
++#include <errno.h>
++#include <spawn.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/wait.h>
++#include <unistd.h>
++
++#include "base/check.h"
++#include "base/check_op.h"
++#include "base/logging.h"
++#include "base/posix/eintr_wrapper.h"
++#include "base/strings/stringprintf.h"
++#include "build/build_config.h"
++#include "util/posix/close_multiple.h"
++
++extern char** environ;
++
++namespace crashpad {
++
++namespace {
++
++#if BUILDFLAG(IS_APPLE)
++
++class PosixSpawnAttr {
++ public:
++  PosixSpawnAttr() {
++    PCHECK((errno = posix_spawnattr_init(&attr_)) == 0)
++        << "posix_spawnattr_init";
++  }
++
++  PosixSpawnAttr(const PosixSpawnAttr&) = delete;
++  PosixSpawnAttr& operator=(const PosixSpawnAttr&) = delete;
++
++  ~PosixSpawnAttr() {
++    PCHECK((errno = posix_spawnattr_destroy(&attr_)) == 0)
++        << "posix_spawnattr_destroy";
++  }
++
++  void SetFlags(short flags) {
++    PCHECK((errno = posix_spawnattr_setflags(&attr_, flags)) == 0)
++        << "posix_spawnattr_setflags";
++  }
++
++  const posix_spawnattr_t* Get() const { return &attr_; }
++
++ private:
++  posix_spawnattr_t attr_;
++};
++
++class PosixSpawnFileActions {
++ public:
++  PosixSpawnFileActions() {
++    PCHECK((errno = posix_spawn_file_actions_init(&file_actions_)) == 0)
++        << "posix_spawn_file_actions_init";
++  }
++
++  PosixSpawnFileActions(const PosixSpawnFileActions&) = delete;
++  PosixSpawnFileActions& operator=(const PosixSpawnFileActions&) = delete;
++
++  ~PosixSpawnFileActions() {
++    PCHECK((errno = posix_spawn_file_actions_destroy(&file_actions_)) == 0)
++        << "posix_spawn_file_actions_destroy";
++  }
++
++  void AddInheritedFileDescriptor(int fd) {
++    PCHECK((errno = posix_spawn_file_actions_addinherit_np(&file_actions_,
++                                                           fd)) == 0)
++        << "posix_spawn_file_actions_addinherit_np";
++  }
++
++  const posix_spawn_file_actions_t* Get() const { return &file_actions_; }
++
++ private:
++  posix_spawn_file_actions_t file_actions_;
++};
++
++#endif
++
++}  // namespace
++
++bool ForkAndSpawn(const std::vector<std::string>& argv,
++                  const std::vector<std::string>* envp,
++                  int preserve_fd,
++                  bool use_path,
++                  void (*child_function)()) {
++  // argv_c contains const char* pointers and is terminated by nullptr. This is
++  // suitable for passing to posix_spawn() or posix_spawnp(). Although argv_c is
++  // not used in the parent process, it must be built in the parent process
++  // because it’s unsafe to do so in the child.
++  std::vector<const char*> argv_c;
++  argv_c.reserve(argv.size() + 1);
++  for (const std::string& argument : argv) {
++    argv_c.push_back(argument.c_str());
++  }
++  argv_c.push_back(nullptr);
++
++  std::vector<const char*> envp_c;
++  if (envp) {
++    envp_c.reserve(envp->size() + 1);
++    for (const std::string& variable : *envp) {
++      envp_c.push_back(variable.c_str());
++    }
++    envp_c.push_back(nullptr);
++  }
++
++  // The three processes involved are parent, child, and grandchild. The child
++  // exits immediately after spawning the grandchild, so the grandchild becomes
++  // an orphan and its parent process ID becomes 1. This relieves the parent and
++  // child of the responsibility to reap the grandchild with waitpid() or
++  // similar. The grandchild is expected to outlive the parent process, so the
++  // parent shouldn’t be concerned with reaping it. This approach means that
++  // accidental early termination of the handler process will not result in a
++  // zombie process.
++  pid_t pid = fork();
++  if (pid < 0) {
++    PLOG(ERROR) << "fork";
++    return false;
++  }
++
++  if (pid == 0) {
++    // Child process.
++
++    if (child_function) {
++      child_function();
++    }
++
++    // Call setsid(), creating a new process group and a new session, both led
++    // by this process. The new process group has no controlling terminal. This
++    // disconnects it from signals generated by the parent process’ terminal.
++    //
++    // setsid() is done in the child instead of the grandchild so that the
++    // grandchild will not be a session leader. If it were a session leader, an
++    // accidental open() of a terminal device without O_NOCTTY would make that
++    // terminal the controlling terminal.
++    //
++    // It’s not desirable for the grandchild to have a controlling terminal. The
++    // grandchild manages its own lifetime, such as by monitoring clients on its
++    // own and exiting when it loses all clients and when it deems it
++    // appropraite to do so. It may serve clients in different process groups or
++    // sessions than its original client, and receiving signals intended for its
++    // original client’s process group could be harmful in that case.
++    PCHECK(setsid() != -1) << "setsid";
++
++    // &argv_c[0] is a pointer to a pointer to const char data, but because of
++    // how C (not C++) works, posix_spawn() and posix_spawnp() want a pointer to
++    // a const pointer to char data. They modifies neither the data nor the
++    // pointers, so the const_cast is safe.
++    char* const* argv_for_spawn = const_cast<char* const*>(argv_c.data());
++
++    // This cast is safe for the same reason that the argv_for_spawn cast is.
++    char* const* envp_for_spawn =
++        envp ? const_cast<char* const*>(envp_c.data()) : environ;
++
++#if BUILDFLAG(IS_APPLE)
++    PosixSpawnAttr attr;
++    attr.SetFlags(POSIX_SPAWN_CLOEXEC_DEFAULT);
++
++    PosixSpawnFileActions file_actions;
++    for (int fd = 0; fd <= STDERR_FILENO; ++fd) {
++      file_actions.AddInheritedFileDescriptor(fd);
++    }
++    file_actions.AddInheritedFileDescriptor(preserve_fd);
++
++    const posix_spawnattr_t* attr_p = attr.Get();
++    const posix_spawn_file_actions_t* file_actions_p = file_actions.Get();
++#else
++    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
++
++    const posix_spawnattr_t* attr_p = nullptr;
++    const posix_spawn_file_actions_t* file_actions_p = nullptr;
++#endif
++
++    auto posix_spawn_fp = use_path ? posix_spawnp : posix_spawn;
++    if ((errno = posix_spawn_fp(&pid,
++                                argv_for_spawn[0],
++                                file_actions_p,
++                                attr_p,
++                                argv_for_spawn,
++                                envp_for_spawn)) != 0) {
++      PLOG(FATAL) << (use_path ? "posix_spawnp" : "posix_spawn");
++    }
++
++    // _exit() instead of exit(), because fork() was called.
++    _exit(EXIT_SUCCESS);
++  }
++
++  // waitpid() for the child, so that it does not become a zombie process. The
++  // child normally exits quickly.
++  //
++  // Failures from this point on may result in the accumulation of a zombie, but
++  // should not be considered fatal. Log only warnings, but don’t treat these
++  // failures as a failure of the function overall.
++  int status;
++  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
++  if (wait_pid == -1) {
++    PLOG(WARNING) << "waitpid";
++    return true;
++  }
++  DCHECK_EQ(wait_pid, pid);
++
++  if (WIFSIGNALED(status)) {
++    int sig = WTERMSIG(status);
++    LOG(WARNING) << base::StringPrintf(
++        "intermediate process terminated by signal %d (%s)%s",
++        sig,
++        strsignal(sig),
++        WCOREDUMP(status) ? " (core dumped)" : "");
++  } else if (!WIFEXITED(status)) {
++    LOG(WARNING) << base::StringPrintf(
++        "intermediate process: unknown termination 0x%x", status);
++  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
++    LOG(WARNING) << "intermediate process exited with code "
++                 << WEXITSTATUS(status);
++  }
++
++  return true;
++}
++
++}  // namespace crashpad
+diff --git a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
+similarity index 76%
+rename from third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h
+rename to third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
+index 02fc0f28f196b447132a2dcfaebdaaa5a916a38a..fc55aa3a37652e4ba18c66db90124abd9cad2e51 100644
+--- a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h
++++ b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
+@@ -12,8 +12,8 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
+-#ifndef CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
+-#define CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
++#ifndef CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_
++#define CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_
+ 
+ #include <string>
+ #include <vector>
+@@ -23,7 +23,7 @@ namespace crashpad {
+ //! \brief Executes a (grand-)child process.
+ //!
+ //! The grandchild process will be started through the
+-//! double-`fork()`-and-`execv()` pattern. This allows the grandchild to fully
++//! `fork()`-and-`posix_spawn()` pattern. This allows the grandchild to fully
+ //! disassociate from the parent. The grandchild will not be a member of the
+ //! parent’s process group or session and will not have a controlling terminal,
+ //! providing isolation from signals not intended for it. The grandchild’s
+@@ -37,7 +37,7 @@ namespace crashpad {
+ //! \param[in] argv The argument vector to start the grandchild process with.
+ //!     `argv[0]` is used as the path to the executable.
+ //! \param[in] envp A vector of environment variables of the form `var=value` to
+-//!     be passed to `execve()`. If this value is `nullptr`, the current
++//!     be passed to `posix_spawn()`. If this value is `nullptr`, the current
+ //!     environment is used.
+ //! \param[in] preserve_fd A file descriptor to be inherited by the grandchild
+ //!     process. This file descriptor is inherited in addition to the three file
+@@ -45,16 +45,13 @@ namespace crashpad {
+ //!     if no additional file descriptors are to be inherited.
+ //! \param[in] use_path Whether to consult the `PATH` environment variable when
+ //!     requested to start an executable at a non-absolute path. If `false`,
+-//!     `execv()`, which does not consult `PATH`, will be used. If `true`,
+-//!     `execvp()`, which does consult `PATH`, will be used.
++//!     `posix_spawn()`, which does not consult `PATH`, will be used. If `true`,
++//!     `posix_spawnp()`, which does consult `PATH`, will be used.
+ //! \param[in] child_function If not `nullptr`, this function will be called in
+-//!     the intermediate child process, prior to the second `fork()`. Take note
++//!     the intermediate child process, prior to the `posix_spawn()`. Take note
+ //!     that this function will run in the context of a forked process, and must
+ //!     be safe for that purpose.
+ //!
+-//! Setting both \a envp to a value other than `nullptr` and \a use_path to
+-//! `true` is not currently supported.
+-//!
+ //! \return `true` on success, and `false` on failure with a message logged.
+ //!     Only failures that occur in the parent process that indicate a definite
+ //!     failure to start the the grandchild are reported in the return value.
+@@ -63,12 +60,12 @@ namespace crashpad {
+ //!     terminating. The caller assumes the responsibility for detecting such
+ //!     failures, for example, by observing a failure to perform a successful
+ //!     handshake with the grandchild process.
+-bool DoubleForkAndExec(const std::vector<std::string>& argv,
+-                       const std::vector<std::string>* envp,
+-                       int preserve_fd,
+-                       bool use_path,
+-                       void (*child_function)());
++bool ForkAndSpawn(const std::vector<std::string>& argv,
++                  const std::vector<std::string>* envp,
++                  int preserve_fd,
++                  bool use_path,
++                  void (*child_function)());
+ 
+ }  // namespace crashpad
+ 
+-#endif  // CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
++#endif  // CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_

From e2f42e5d994a27f461e503b72934e3e4111ce29f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 20 Jun 2022 06:31:53 +0200
Subject: [PATCH 497/811] chore: fix BrowserView painting when origin updated
 (#34581)

chore: fix View painting when origin updated
---
 shell/browser/native_browser_view_views.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shell/browser/native_browser_view_views.cc b/shell/browser/native_browser_view_views.cc
index 10452b09717f8..651a9ba449f0a 100644
--- a/shell/browser/native_browser_view_views.cc
+++ b/shell/browser/native_browser_view_views.cc
@@ -130,6 +130,9 @@ void NativeBrowserViewViews::SetBounds(const gfx::Rect& bounds) {
   view->SetBoundsRect(bounds);
   ResetAutoResizeProportions();
 
+  view->InvalidateLayout();
+  view->SchedulePaint();
+
   // Ensure draggable regions are properly updated to reflect new bounds.
   UpdateDraggableRegions(draggable_regions_);
 }

From 6e9466f96b48fce7ca98cf308a9c6700ee90733a Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 20 Jun 2022 12:40:10 +0200
Subject: [PATCH 498/811] fix: overzealous media key listening on Windows
 (#34594)

---
 ...media_key_usage_with_globalshortcuts.patch | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
index f9edde8861faa..8892da56d9f9c 100644
--- a/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
+++ b/patches/chromium/fix_media_key_usage_with_globalshortcuts.patch
@@ -59,10 +59,10 @@ index ad366d0fd4c3a637d75a102ab56984f0d01bfc04..d63eb133fd4bab1ea309bb8c742acf88
    // true if register successfully, or false if 1) the specificied |accelerator|
    // has been registered by another caller or other native applications, or
 diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
-index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f15d80a7e 100644
+index b954f8dde00d4f5257223c464e9145a6bef48900..ee9da826014d3aae9675daac6cdbc0f447a14efd 100644
 --- a/content/browser/media/media_keys_listener_manager_impl.cc
 +++ b/content/browser/media/media_keys_listener_manager_impl.cc
-@@ -56,7 +56,12 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
+@@ -56,7 +56,11 @@ bool MediaKeysListenerManagerImpl::StartWatchingMediaKey(
                                 CanActiveMediaSessionControllerReceiveEvents();
  
    // Tell the underlying MediaKeysListener to listen for the key.
@@ -71,12 +71,11 @@ index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f
 +#if BUILDFLAG(IS_MAC)
 +      !media_key_handling_enabled_ &&
 +#endif  // BUILDFLAG(IS_MAC)
-+      should_start_watching &&
-+      media_keys_listener_ &&
++      should_start_watching && media_keys_listener_ &&
        !media_keys_listener_->StartWatchingMediaKey(key_code)) {
      return false;
    }
-@@ -239,18 +244,18 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+@@ -239,6 +243,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
  #endif
  
    if (system_media_controls_) {
@@ -84,19 +83,22 @@ index b954f8dde00d4f5257223c464e9145a6bef48900..b58999f295586a61bcc2648488a8b28f
      system_media_controls_->AddObserver(this);
      system_media_controls_notifier_ =
          std::make_unique<SystemMediaControlsNotifier>(
-             system_media_controls_.get());
--  } else {
--    // If we can't access system media controls, then directly listen for media
--    // key keypresses instead.
--    media_keys_listener_ = ui::MediaKeysListener::Create(
--        this, ui::MediaKeysListener::Scope::kGlobal);
--    DCHECK(media_keys_listener_);
+@@ -251,6 +256,19 @@ void MediaKeysListenerManagerImpl::StartListeningForMediaKeysIfNecessary() {
+     DCHECK(media_keys_listener_);
    }
  
-+  // Directly listen for media key keypresses when using GlobalShortcuts.
-+  media_keys_listener_ = ui::MediaKeysListener::Create(
-+    this, ui::MediaKeysListener::Scope::kGlobal);
-+  DCHECK(media_keys_listener_);
++#if BUILDFLAG(IS_MAC)
++  // Chromium's implementation of SystemMediaControls falls
++  // down into MPRemoteCommandCenter, which makes it such that an app will not
++  // will not receive remote control events until it begins playing audio.
++  // If there's not already a MediaKeysListener instance, create one so
++  // that globalShortcuts work correctly.
++  if (!media_keys_listener_) {
++    media_keys_listener_ = ui::MediaKeysListener::Create(
++        this, ui::MediaKeysListener::Scope::kGlobal);
++    DCHECK(media_keys_listener_);
++  }
++#endif
 +
    EnsureAuxiliaryServices();
  }

From d341610d64eb1220a3e923475c29dce1b4835ae7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 20 Jun 2022 06:01:30 -0700
Subject: [PATCH 499/811] Bump v21.0.0-nightly.20220620

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 13c51fb952269..3b2695f885fd1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220617
\ No newline at end of file
+21.0.0-nightly.20220620
\ No newline at end of file
diff --git a/package.json b/package.json
index 2c68245e31749..0443b3e1a3d4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220617",
+  "version": "21.0.0-nightly.20220620",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 78e71313568b9..8b7f4dc363fe7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220617
- PRODUCTVERSION 21,0,0,20220617
+ FILEVERSION 21,0,0,20220620
+ PRODUCTVERSION 21,0,0,20220620
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8e45f43f1835d317742577f0ec23c5786d8ce4fd Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 20 Jun 2022 15:17:53 +0200
Subject: [PATCH 500/811] refactor: remove deprecated drag-and-drop code
 (#34615)

---
 shell/browser/ui/drag_util_mac.mm | 87 ++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 31 deletions(-)

diff --git a/shell/browser/ui/drag_util_mac.mm b/shell/browser/ui/drag_util_mac.mm
index 85dc09d64dc67..4c4649c6cb434 100644
--- a/shell/browser/ui/drag_util_mac.mm
+++ b/shell/browser/ui/drag_util_mac.mm
@@ -10,53 +10,78 @@
 #include "base/strings/sys_string_conversions.h"
 #include "shell/browser/ui/drag_util.h"
 
-namespace electron {
+// Contents largely copied from
+// chrome/browser/download/drag_download_item_mac.mm.
+
+@interface DragDownloadItemSource : NSObject <NSDraggingSource>
+@end
+
+@implementation DragDownloadItemSource
+
+- (NSDragOperation)draggingSession:(NSDraggingSession*)session
+    sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
+  return NSDragOperationEvery;
+}
+
+@end
 
 namespace {
 
-// Write information about the file being dragged to the pasteboard.
-void AddFilesToPasteboard(NSPasteboard* pasteboard,
-                          const std::vector<base::FilePath>& files) {
-  NSMutableArray* fileList = [NSMutableArray array];
-  for (const base::FilePath& file : files)
-    [fileList addObject:base::SysUTF8ToNSString(file.value())];
-  [pasteboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType]
-                     owner:nil];
-  [pasteboard setPropertyList:fileList forType:NSFilenamesPboardType];
+id<NSDraggingSource> GetDraggingSource() {
+  static id<NSDraggingSource> source = [[DragDownloadItemSource alloc] init];
+  return source;
 }
 
 }  // namespace
 
+namespace electron {
+
 void DragFileItems(const std::vector<base::FilePath>& files,
                    const gfx::Image& icon,
                    gfx::NativeView view) {
-  NSPasteboard* pasteboard =
-      [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
-  AddFilesToPasteboard(pasteboard, files);
+  auto* native_view = view.GetNativeNSView();
+  NSPoint current_position =
+      [[native_view window] mouseLocationOutsideOfEventStream];
+  current_position =
+      [native_view backingAlignedRect:NSMakeRect(current_position.x,
+                                                 current_position.y, 0, 0)
+                              options:NSAlignAllEdgesOutward]
+          .origin;
+
+  NSMutableArray* file_items = [NSMutableArray array];
+  for (auto const& file : files) {
+    NSURL* file_url =
+        [NSURL fileURLWithPath:base::SysUTF8ToNSString(file.value())];
+    NSDraggingItem* file_item = [[[NSDraggingItem alloc]
+        initWithPasteboardWriter:file_url] autorelease];
+    NSImage* file_image = icon.ToNSImage();
+    NSSize image_size = file_image.size;
+    NSRect image_rect = NSMakeRect(current_position.x - image_size.width / 2,
+                                   current_position.y - image_size.height / 2,
+                                   image_size.width, image_size.height);
+    [file_item setDraggingFrame:image_rect contents:file_image];
+    [file_items addObject:file_item];
+  }
 
   // Synthesize a drag event, since we don't have access to the actual event
   // that initiated a drag (possibly consumed by the Web UI, for example).
-  NSWindow* window = [view.GetNativeNSView() window];
-  NSPoint position = [window mouseLocationOutsideOfEventStream];
+  NSPoint position = [[native_view window] mouseLocationOutsideOfEventStream];
   NSTimeInterval eventTime = [[NSApp currentEvent] timestamp];
-  NSEvent* dragEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
-                                          location:position
-                                     modifierFlags:NSEventMaskLeftMouseDragged
-                                         timestamp:eventTime
-                                      windowNumber:[window windowNumber]
-                                           context:nil
-                                       eventNumber:0
-                                        clickCount:1
-                                          pressure:1.0];
+  NSEvent* dragEvent =
+      [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
+                         location:position
+                    modifierFlags:NSEventMaskLeftMouseDragged
+                        timestamp:eventTime
+                     windowNumber:[[native_view window] windowNumber]
+                          context:nil
+                      eventNumber:0
+                       clickCount:1
+                         pressure:1.0];
 
   // Run the drag operation.
-  [window dragImage:icon.ToNSImage()
-                 at:position
-             offset:NSZeroSize
-              event:dragEvent
-         pasteboard:pasteboard
-             source:view.GetNativeNSView()
-          slideBack:YES];
+  [native_view beginDraggingSessionWithItems:file_items
+                                       event:dragEvent
+                                      source:GetDraggingSource()];
 }
 
 }  // namespace electron

From 3cd52231341ca9a19704da356122c48a4dc33551 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 20 Jun 2022 21:54:52 +0200
Subject: [PATCH 501/811] build: mark existing Node.js flakes as dontcare
 (#34644)

---
 script/node-spec-runner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/node-spec-runner.js b/script/node-spec-runner.js
index 16c51af15db82..3454843c86540 100644
--- a/script/node-spec-runner.js
+++ b/script/node-spec-runner.js
@@ -28,6 +28,7 @@ const defaultOptions = [
   '--mode=debug',
   'default',
   `--skip-tests=${DISABLED_TESTS.join(',')}`,
+  '--flaky-tests=dontcare',
   '--shell',
   utils.getAbsoluteElectronExec(),
   '-J'

From 2bbbc66eb83b42041d768ea64f5ada9ed1ffd301 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 20 Jun 2022 18:35:16 -0700
Subject: [PATCH 502/811] build: build & release libcxx objects on darwin
 (#34586)

* build: build & release libcxx objects on darwin

* Fix merge error

Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
---
 .circleci/config/base.yml          | 2 +-
 script/release/release.js          | 2 ++
 script/release/uploaders/upload.py | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index d74742fc20a59..3716c7545b99e 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -794,8 +794,8 @@ step-maybe-generate-libcxx: &step-maybe-generate-libcxx
       if [ "`uname`" == "Linux" ]; then
         ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
         ninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
       fi
+      ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
 
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:
diff --git a/script/release/release.js b/script/release/release.js
index e89d7ba920245..298e7622b720e 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -146,6 +146,8 @@ function assetsForVersion (version, validatingRelease) {
     `libcxx-objects-${version}-linux-arm64.zip`,
     `libcxx-objects-${version}-linux-armv7l.zip`,
     `libcxx-objects-${version}-linux-x64.zip`,
+    `libcxx-objects-${version}-darwin-x64.zip`,
+    `libcxx-objects-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-darwin-x64.zip`,
     `ffmpeg-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-linux-arm64.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index caaa726d55d8a..b9f74511323c2 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -94,7 +94,13 @@ def main():
 
     dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
-    upload_electron(release, dsym_snapshot_zip, args)    
+    upload_electron(release, dsym_snapshot_zip, args)
+
+    libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
+    libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
+    shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),
+        libcxx_objects_zip)
+    upload_electron(release, libcxx_objects_zip, args)
   elif PLATFORM == 'win32':
     if get_target_arch() != 'ia32':
       pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
@@ -105,7 +111,6 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
     upload_electron(release, debug_zip, args)
 
-    # Upload libcxx_objects.zip for linux only
     libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
     libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
     shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),

From 0f528c1e43e9e1aa0c95788dc71145b8699a062f Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 21 Jun 2022 03:39:41 +0200
Subject: [PATCH 503/811] chore: let result: ReturnType<typeof
 this._callWindowOpenHandler>; (#34628)

---
 lib/browser/api/web-contents.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 120d85ce72fdf..594c2fc28e653 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -646,7 +646,7 @@ WebContents.prototype._init = function () {
         disposition
       };
 
-      let result;
+      let result: ReturnType<typeof this._callWindowOpenHandler>;
       try {
         result = this._callWindowOpenHandler(event, details);
       } catch (err) {
@@ -685,7 +685,7 @@ WebContents.prototype._init = function () {
         postBody
       };
 
-      let result;
+      let result: ReturnType<typeof this._callWindowOpenHandler>;
       try {
         result = this._callWindowOpenHandler(event, details);
       } catch (err) {

From f3f327823e577c5869b78c806f99644e9dabfb29 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Tue, 21 Jun 2022 09:34:56 +0200
Subject: [PATCH 504/811] chore: move main process only accessible API bindings
 away from common (#34634)

---
 lib/browser/api/native-theme.ts                |  2 +-
 lib/browser/api/notification.ts                |  2 +-
 lib/browser/api/screen.ts                      |  2 +-
 shell/browser/api/electron_api_native_theme.cc |  2 +-
 shell/browser/api/electron_api_notification.cc |  2 +-
 shell/browser/api/electron_api_screen.cc       |  2 +-
 shell/common/node_bindings.cc                  |  6 +++---
 typings/internal-ambient.d.ts                  | 12 ++++++------
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/browser/api/native-theme.ts b/lib/browser/api/native-theme.ts
index 08fd92b209dc5..593fc9d815a3f 100644
--- a/lib/browser/api/native-theme.ts
+++ b/lib/browser/api/native-theme.ts
@@ -1,3 +1,3 @@
-const { nativeTheme } = process._linkedBinding('electron_common_native_theme');
+const { nativeTheme } = process._linkedBinding('electron_browser_native_theme');
 
 module.exports = nativeTheme;
diff --git a/lib/browser/api/notification.ts b/lib/browser/api/notification.ts
index 63141d438bbcc..6739267afe047 100644
--- a/lib/browser/api/notification.ts
+++ b/lib/browser/api/notification.ts
@@ -1,7 +1,7 @@
 const {
   Notification: ElectronNotification,
   isSupported
-} = process._linkedBinding('electron_common_notification');
+} = process._linkedBinding('electron_browser_notification');
 
 ElectronNotification.isSupported = isSupported;
 
diff --git a/lib/browser/api/screen.ts b/lib/browser/api/screen.ts
index 0c01e88c42b9b..c18e93d20d392 100644
--- a/lib/browser/api/screen.ts
+++ b/lib/browser/api/screen.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 
-const { createScreen } = process._linkedBinding('electron_common_screen');
+const { createScreen } = process._linkedBinding('electron_browser_screen');
 
 let _screen: Electron.Screen;
 
diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc
index 6c60eaead4147..4577ee28a77c9 100644
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -174,4 +174,4 @@ bool Converter<ui::NativeTheme::ThemeSource>::FromV8(
 
 }  // namespace gin
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_theme, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_native_theme, Initialize)
diff --git a/shell/browser/api/electron_api_notification.cc b/shell/browser/api/electron_api_notification.cc
index 5216b7407df30..cdf77d0c41269 100644
--- a/shell/browser/api/electron_api_notification.cc
+++ b/shell/browser/api/electron_api_notification.cc
@@ -304,4 +304,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_notification, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_notification, Initialize)
diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc
index 35a4951687286..990657662b0b7 100644
--- a/shell/browser/api/electron_api_screen.cc
+++ b/shell/browser/api/electron_api_screen.cc
@@ -185,4 +185,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_screen, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_screen, Initialize)
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 4b2157f3c5f05..b0c6558e20556 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -55,13 +55,16 @@
   V(electron_browser_in_app_purchase)    \
   V(electron_browser_menu)               \
   V(electron_browser_message_port)       \
+  V(electron_browser_native_theme)       \
   V(electron_browser_net)                \
+  V(electron_browser_notification)       \
   V(electron_browser_power_monitor)      \
   V(electron_browser_power_save_blocker) \
   V(electron_browser_protocol)           \
   V(electron_browser_printing)           \
   V(electron_browser_safe_storage)       \
   V(electron_browser_session)            \
+  V(electron_browser_screen)             \
   V(electron_browser_system_preferences) \
   V(electron_browser_base_window)        \
   V(electron_browser_tray)               \
@@ -77,9 +80,6 @@
   V(electron_common_environment)         \
   V(electron_common_features)            \
   V(electron_common_native_image)        \
-  V(electron_common_native_theme)        \
-  V(electron_common_notification)        \
-  V(electron_common_screen)              \
   V(electron_common_shell)               \
   V(electron_common_v8_util)             \
   V(electron_renderer_context_bridge)    \
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index c63b10acc6b1e..207c4162789ab 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -178,12 +178,6 @@ declare namespace NodeJS {
     _linkedBinding(name: 'electron_common_environment'): EnvironmentBinding;
     _linkedBinding(name: 'electron_common_features'): FeaturesBinding;
     _linkedBinding(name: 'electron_common_native_image'): { nativeImage: typeof Electron.NativeImage };
-    _linkedBinding(name: 'electron_common_native_theme'): { nativeTheme: Electron.NativeTheme };
-    _linkedBinding(name: 'electron_common_notification'): {
-      isSupported(): boolean;
-      Notification: typeof Electron.Notification;
-    }
-    _linkedBinding(name: 'electron_common_screen'): { createScreen(): Electron.Screen };
     _linkedBinding(name: 'electron_common_shell'): Electron.Shell;
     _linkedBinding(name: 'electron_common_v8_util'): V8UtilBinding;
     _linkedBinding(name: 'electron_browser_app'): { app: Electron.App, App: Function };
@@ -215,6 +209,7 @@ declare namespace NodeJS {
     _linkedBinding(name: 'electron_browser_message_port'): {
       createPair(): { port1: Electron.MessagePortMain, port2: Electron.MessagePortMain };
     };
+    _linkedBinding(name: 'electron_browser_native_theme'): { nativeTheme: Electron.NativeTheme };
     _linkedBinding(name: 'electron_browser_net'): {
       isOnline(): boolean;
       isValidHeaderName: (headerName: string) => boolean;
@@ -224,10 +219,15 @@ declare namespace NodeJS {
       net: any;
       createURLLoader(options: CreateURLLoaderOptions): URLLoader;
     };
+    _linkedBinding(name: 'electron_browser_notification'): {
+      isSupported(): boolean;
+      Notification: typeof Electron.Notification;
+    }
     _linkedBinding(name: 'electron_browser_power_monitor'): PowerMonitorBinding;
     _linkedBinding(name: 'electron_browser_power_save_blocker'): { powerSaveBlocker: Electron.PowerSaveBlocker };
     _linkedBinding(name: 'electron_browser_safe_storage'): { safeStorage: Electron.SafeStorage };
     _linkedBinding(name: 'electron_browser_session'): typeof Electron.Session;
+    _linkedBinding(name: 'electron_browser_screen'): { createScreen(): Electron.Screen };
     _linkedBinding(name: 'electron_browser_system_preferences'): { systemPreferences: Electron.SystemPreferences };
     _linkedBinding(name: 'electron_browser_tray'): { Tray: Electron.Tray };
     _linkedBinding(name: 'electron_browser_view'): { View: Electron.View };

From 530a022b0548eb50acde87b5d18b5cff8eb7bbca Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 21 Jun 2022 09:35:53 +0200
Subject: [PATCH 505/811] fix: window button visibility fullscreen interaction
 (#34530)

---
 shell/browser/native_window_mac.mm   | 11 +++++----
 spec-main/api-browser-window-spec.ts | 36 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index c706a56a01f58..3e5ee77010281 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -1517,12 +1517,15 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
 void NativeWindowMac::SetWindowButtonVisibility(bool visible) {
   window_button_visibility_ = visible;
-  // The visibility of window buttons are managed by |buttons_proxy_| if the
-  // style is customButtonsOnHover.
-  if (title_bar_style_ == TitleBarStyle::kCustomButtonsOnHover)
+  if (buttons_proxy_) {
+    if (visible)
+      [buttons_proxy_ redraw];
     [buttons_proxy_ setVisible:visible];
-  else
+  }
+
+  if (title_bar_style_ != TitleBarStyle::kCustomButtonsOnHover)
     InternalSetWindowButtonVisibility(visible);
+
   NotifyLayoutWindowControlsOverlay();
 }
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 039bc17b31e0d..f2682e70482a6 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1996,6 +1996,42 @@ describe('BrowserWindow module', () => {
       w.setWindowButtonVisibility(false);
       expect(w._getWindowButtonVisibility()).to.equal(false);
     });
+
+    it('correctly updates when entering/exiting fullscreen for hidden style', async () => {
+      const w = new BrowserWindow({ show: false, frame: false, titleBarStyle: 'hidden' });
+      expect(w._getWindowButtonVisibility()).to.equal(true);
+      w.setWindowButtonVisibility(false);
+      expect(w._getWindowButtonVisibility()).to.equal(false);
+
+      const enterFS = emittedOnce(w, 'enter-full-screen');
+      w.setFullScreen(true);
+      await enterFS;
+
+      const leaveFS = emittedOnce(w, 'leave-full-screen');
+      w.setFullScreen(false);
+      await leaveFS;
+
+      w.setWindowButtonVisibility(true);
+      expect(w._getWindowButtonVisibility()).to.equal(true);
+    });
+
+    it('correctly updates when entering/exiting fullscreen for hiddenInset style', async () => {
+      const w = new BrowserWindow({ show: false, frame: false, titleBarStyle: 'hiddenInset' });
+      expect(w._getWindowButtonVisibility()).to.equal(true);
+      w.setWindowButtonVisibility(false);
+      expect(w._getWindowButtonVisibility()).to.equal(false);
+
+      const enterFS = emittedOnce(w, 'enter-full-screen');
+      w.setFullScreen(true);
+      await enterFS;
+
+      const leaveFS = emittedOnce(w, 'leave-full-screen');
+      w.setFullScreen(false);
+      await leaveFS;
+
+      w.setWindowButtonVisibility(true);
+      expect(w._getWindowButtonVisibility()).to.equal(true);
+    });
   });
 
   ifdescribe(process.platform === 'darwin')('BrowserWindow.setVibrancy(type)', () => {

From 116c32a030ed630342c4ac5455d042c5f305d6cd Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 21 Jun 2022 06:00:53 -0700
Subject: [PATCH 506/811] Bump v21.0.0-nightly.20220621

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3b2695f885fd1..753d7f773d16e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220620
\ No newline at end of file
+21.0.0-nightly.20220621
\ No newline at end of file
diff --git a/package.json b/package.json
index 0443b3e1a3d4a..7ebc2a8524b6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220620",
+  "version": "21.0.0-nightly.20220621",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 8b7f4dc363fe7..bb0aef7158c1c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220620
- PRODUCTVERSION 21,0,0,20220620
+ FILEVERSION 21,0,0,20220621
+ PRODUCTVERSION 21,0,0,20220621
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 528cbe8131974565bb993d4c121bc6c6b6a39237 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:27:51 -0700
Subject: [PATCH 507/811] Revert "Bump v21.0.0-nightly.20220621"

This reverts commit 116c32a030ed630342c4ac5455d042c5f305d6cd.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 753d7f773d16e..3b2695f885fd1 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220621
\ No newline at end of file
+21.0.0-nightly.20220620
\ No newline at end of file
diff --git a/package.json b/package.json
index 7ebc2a8524b6e..0443b3e1a3d4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220621",
+  "version": "21.0.0-nightly.20220620",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index bb0aef7158c1c..8b7f4dc363fe7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220621
- PRODUCTVERSION 21,0,0,20220621
+ FILEVERSION 21,0,0,20220620
+ PRODUCTVERSION 21,0,0,20220620
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 34fc53e5e67c0ee9b03eb0f1a6fecebf1aea326a Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 21 Jun 2022 09:06:50 -0700
Subject: [PATCH 508/811] chore: Revert "build: build & release libcxx objects
 on darwin (#34586)" (#34680)

Revert "build: build & release libcxx objects on darwin (#34586)"

This reverts commit 2bbbc66eb83b42041d768ea64f5ada9ed1ffd301.
---
 .circleci/config/base.yml          | 2 +-
 script/release/release.js          | 2 --
 script/release/uploaders/upload.py | 9 ++-------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 3716c7545b99e..d74742fc20a59 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -794,8 +794,8 @@ step-maybe-generate-libcxx: &step-maybe-generate-libcxx
       if [ "`uname`" == "Linux" ]; then
         ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
         ninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
+        ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
       fi
-      ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
 
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
   run:
diff --git a/script/release/release.js b/script/release/release.js
index 298e7622b720e..e89d7ba920245 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -146,8 +146,6 @@ function assetsForVersion (version, validatingRelease) {
     `libcxx-objects-${version}-linux-arm64.zip`,
     `libcxx-objects-${version}-linux-armv7l.zip`,
     `libcxx-objects-${version}-linux-x64.zip`,
-    `libcxx-objects-${version}-darwin-x64.zip`,
-    `libcxx-objects-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-darwin-x64.zip`,
     `ffmpeg-${version}-darwin-arm64.zip`,
     `ffmpeg-${version}-linux-arm64.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index b9f74511323c2..caaa726d55d8a 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -94,13 +94,7 @@ def main():
 
     dsym_snapshot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
-    upload_electron(release, dsym_snapshot_zip, args)
-
-    libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
-    libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
-    shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),
-        libcxx_objects_zip)
-    upload_electron(release, libcxx_objects_zip, args)
+    upload_electron(release, dsym_snapshot_zip, args)    
   elif PLATFORM == 'win32':
     if get_target_arch() != 'ia32':
       pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
@@ -111,6 +105,7 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)
     upload_electron(release, debug_zip, args)
 
+    # Upload libcxx_objects.zip for linux only
     libcxx_objects = get_zip_name('libcxx-objects', ELECTRON_VERSION)
     libcxx_objects_zip = os.path.join(OUT_DIR, libcxx_objects)
     shutil.copy2(os.path.join(OUT_DIR, 'libcxx_objects.zip'),

From 140c8d0d0aa77d8efc6dc9dc8ba8018cd2b53134 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 21 Jun 2022 09:07:50 -0700
Subject: [PATCH 509/811] Bump v21.0.0-nightly.20220621

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3b2695f885fd1..753d7f773d16e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220620
\ No newline at end of file
+21.0.0-nightly.20220621
\ No newline at end of file
diff --git a/package.json b/package.json
index 0443b3e1a3d4a..7ebc2a8524b6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220620",
+  "version": "21.0.0-nightly.20220621",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 8b7f4dc363fe7..bb0aef7158c1c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220620
- PRODUCTVERSION 21,0,0,20220620
+ FILEVERSION 21,0,0,20220621
+ PRODUCTVERSION 21,0,0,20220621
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ad7aab8338c6f7a18d848afd42c284512df9c81d Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 01:11:27 -0700
Subject: [PATCH 510/811] chore: modernize base::Value usage in WebRequest
 (#34667)

---
 shell/browser/api/electron_api_web_request.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc
index fb1b8ebcdafa8..a538901a1c91d 100644
--- a/shell/browser/api/electron_api_web_request.cc
+++ b/shell/browser/api/electron_api_web_request.cc
@@ -115,13 +115,12 @@ bool MatchesFilterCondition(extensions::WebRequestInfo* info,
 // to pass the original keys.
 v8::Local<v8::Value> HttpResponseHeadersToV8(
     net::HttpResponseHeaders* headers) {
-  base::DictionaryValue response_headers;
+  base::Value::Dict response_headers;
   if (headers) {
     size_t iter = 0;
     std::string key;
     std::string value;
     while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
-      base::Value* values = response_headers.FindListKey(key);
       // Note that Web servers not developed with nodejs allow non-utf8
       // characters in content-disposition's filename field. Use Chromium's
       // HttpContentDisposition class to decode the correct encoding instead of
@@ -138,12 +137,14 @@ v8::Local<v8::Value> HttpResponseHeadersToV8(
         std::string filename = "\"" + header.filename() + "\"";
         value = decodedFilename + "; filename=" + filename;
       }
+      base::Value::List* values = response_headers.FindList(key);
       if (!values)
-        values = response_headers.SetKey(key, base::ListValue());
-      values->Append(value);
+        values = &response_headers.Set(key, base::Value::List())->GetList();
+      values->Append(base::Value(value));
     }
   }
-  return gin::ConvertToV8(v8::Isolate::GetCurrent(), response_headers);
+  return gin::ConvertToV8(v8::Isolate::GetCurrent(),
+                          base::Value(std::move(response_headers)));
 }
 
 // Overloaded by multiple types to fill the |details| object.

From 73c85410c56f0a4024fd0fd1ee6aa5360c30621a Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 01:14:35 -0700
Subject: [PATCH 511/811] chore: modernize ListValue code in session (#34656)

* chore: modernize ListValue code in session

* also in browser_context
---
 shell/browser/api/electron_api_session.cc | 4 ++--
 shell/browser/electron_browser_context.cc | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index d86e62dc7c8ad..22bf54c8f14c6 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -1024,7 +1024,7 @@ base::Value Session::GetSpellCheckerLanguages() {
 void Session::SetSpellCheckerLanguages(
     gin_helper::ErrorThrower thrower,
     const std::vector<std::string>& languages) {
-  base::ListValue language_codes;
+  base::Value::List language_codes;
   for (const std::string& lang : languages) {
     std::string code = spellcheck::GetCorrespondingSpellCheckLanguage(lang);
     if (code.empty()) {
@@ -1035,7 +1035,7 @@ void Session::SetSpellCheckerLanguages(
     language_codes.Append(code);
   }
   browser_context_->prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries,
-                                 language_codes);
+                                 base::Value(std::move(language_codes)));
   // Enable spellcheck if > 0 languages, disable if no languages set
   browser_context_->prefs()->SetBoolean(spellcheck::prefs::kSpellCheckEnable,
                                         !languages.empty());
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index 66643c4731e99..2b7aa145f796a 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -220,9 +220,10 @@ void ElectronBrowserContext::InitPrefs() {
     std::string default_code = spellcheck::GetCorrespondingSpellCheckLanguage(
         base::i18n::GetConfiguredLocale());
     if (!default_code.empty()) {
-      base::ListValue language_codes;
+      base::Value::List language_codes;
       language_codes.Append(default_code);
-      prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, language_codes);
+      prefs()->Set(spellcheck::prefs::kSpellCheckDictionaries,
+                   base::Value(std::move(language_codes)));
     }
   }
 #endif

From bf52318c76ac110e9a916ca553394c2c15a6381c Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 01:14:57 -0700
Subject: [PATCH 512/811] fix: modernize ListValue in net converters (#34657)

---
 shell/common/gin_converters/net_converter.cc | 48 ++++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/shell/common/gin_converters/net_converter.cc b/shell/common/gin_converters/net_converter.cc
index d2b93166b3647..8b467d5509c23 100644
--- a/shell/common/gin_converters/net_converter.cc
+++ b/shell/common/gin_converters/net_converter.cc
@@ -153,20 +153,20 @@ v8::Local<v8::Value> Converter<net::CertPrincipal>::ToV8(
 v8::Local<v8::Value> Converter<net::HttpResponseHeaders*>::ToV8(
     v8::Isolate* isolate,
     net::HttpResponseHeaders* headers) {
-  base::DictionaryValue response_headers;
+  base::Value::Dict response_headers;
   if (headers) {
     size_t iter = 0;
     std::string key;
     std::string value;
     while (headers->EnumerateHeaderLines(&iter, &key, &value)) {
       key = base::ToLowerASCII(key);
-      base::Value* values = response_headers.FindListKey(key);
+      base::Value::List* values = response_headers.FindList(key);
       if (!values)
-        values = response_headers.SetKey(key, base::ListValue());
+        values = &response_headers.Set(key, base::Value::List())->GetList();
       values->Append(value);
     }
   }
-  return ConvertToV8(isolate, response_headers);
+  return ConvertToV8(isolate, base::Value(std::move(response_headers)));
 }
 
 bool Converter<net::HttpResponseHeaders*>::FromV8(
@@ -313,33 +313,31 @@ bool Converter<scoped_refptr<network::ResourceRequestBody>>::FromV8(
     v8::Isolate* isolate,
     v8::Local<v8::Value> val,
     scoped_refptr<network::ResourceRequestBody>* out) {
-  auto list = std::make_unique<base::ListValue>();
-  if (!ConvertFromV8(isolate, val, list.get()))
+  base::Value list_value;
+  if (!ConvertFromV8(isolate, val, &list_value) || !list_value.is_list())
     return false;
+  base::Value::List& list = list_value.GetList();
   *out = base::MakeRefCounted<network::ResourceRequestBody>();
-  for (size_t i = 0; i < list->GetListDeprecated().size(); ++i) {
-    base::DictionaryValue* dict = nullptr;
-    std::string type;
-    if (!list->GetDictionary(i, &dict))
+  for (size_t i = 0; i < list.size(); ++i) {
+    base::Value& dict_value = list[i];
+    if (!dict_value.is_dict())
       return false;
-    dict->GetString("type", &type);
-    if (type == "rawData") {
-      const base::Value::BlobStorage* bytes = dict->FindBlobKey("bytes");
+    base::Value::Dict& dict = dict_value.GetDict();
+    std::string* type = dict.FindString("type");
+    if (!type)
+      return false;
+    if (*type == "rawData") {
+      const base::Value::BlobStorage* bytes = dict.FindBlob("bytes");
       (*out)->AppendBytes(reinterpret_cast<const char*>(bytes->data()),
                           base::checked_cast<int>(bytes->size()));
-    } else if (type == "file") {
-      const std::string* file = dict->FindStringKey("filePath");
-      if (file == nullptr) {
+    } else if (*type == "file") {
+      const std::string* file = dict.FindString("filePath");
+      if (!file)
         return false;
-      }
-      int offset = 0, length = -1;
-      double modification_time = 0.0;
-      absl::optional<double> maybe_modification_time =
-          dict->FindDoubleKey("modificationTime");
-      if (maybe_modification_time.has_value())
-        modification_time = maybe_modification_time.value();
-      dict->GetInteger("offset", &offset);
-      dict->GetInteger("file", &length);
+      double modification_time =
+          dict.FindDouble("modificationTime").value_or(0.0);
+      int offset = dict.FindInt("offset").value_or(0);
+      int length = dict.FindInt("length").value_or(-1);
       (*out)->AppendFileRange(base::FilePath::FromUTF8Unsafe(*file),
                               static_cast<uint64_t>(offset),
                               static_cast<uint64_t>(length),

From a5869fe9974f5a4713f3da9c023269e5eddcb325 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 22 Jun 2022 10:15:27 +0200
Subject: [PATCH 513/811] refactor: use std::size(args) instead of hardcoded
 values (#34651)

---
 shell/common/api/electron_api_v8_util.cc              | 7 +++++--
 shell/common/v8_value_converter.cc                    | 3 ++-
 shell/renderer/api/electron_api_spell_check_client.cc | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/shell/common/api/electron_api_v8_util.cc b/shell/common/api/electron_api_v8_util.cc
index 8c55a47919b79..07396528851a0 100644
--- a/shell/common/api/electron_api_v8_util.cc
+++ b/shell/common/api/electron_api_v8_util.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#include <iterator>
 #include <utility>
 
 #include "base/hash/hash.h"
@@ -106,9 +107,11 @@ void RequestGarbageCollectionForTesting(v8::Isolate* isolate) {
 // This causes a fatal error by creating a circular extension dependency.
 void TriggerFatalErrorForTesting(v8::Isolate* isolate) {
   static const char* aDeps[] = {"B"};
-  v8::RegisterExtension(std::make_unique<v8::Extension>("A", "", 1, aDeps));
+  v8::RegisterExtension(
+      std::make_unique<v8::Extension>("A", "", std::size(aDeps), aDeps));
   static const char* bDeps[] = {"A"};
-  v8::RegisterExtension(std::make_unique<v8::Extension>("B", "", 1, bDeps));
+  v8::RegisterExtension(
+      std::make_unique<v8::Extension>("B", "", std::size(aDeps), bDeps));
   v8::ExtensionConfiguration config(1, bDeps);
   v8::Context::New(isolate, &config);
 }
diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc
index a46c4fb1a4b35..9dc372414bc31 100644
--- a/shell/common/v8_value_converter.cc
+++ b/shell/common/v8_value_converter.cc
@@ -4,6 +4,7 @@
 
 #include "shell/common/v8_value_converter.h"
 
+#include <iterator>
 #include <map>
 #include <memory>
 #include <string>
@@ -285,7 +286,7 @@ v8::Local<v8::Value> V8ValueConverter::ToArrayBuffer(
 
   v8::Local<v8::Value> args[] = {array_buffer};
   auto func = from_value.As<v8::Function>();
-  auto result = func->Call(context, v8::Null(isolate), 1, args);
+  auto result = func->Call(context, v8::Null(isolate), std::size(args), args);
   if (!result.IsEmpty()) {
     return result.ToLocalChecked();
   }
diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc
index 48d9e38e0d152..21374c965b3f3 100644
--- a/shell/renderer/api/electron_api_spell_check_client.cc
+++ b/shell/renderer/api/electron_api_spell_check_client.cc
@@ -4,6 +4,7 @@
 
 #include "shell/renderer/api/electron_api_spell_check_client.h"
 
+#include <iterator>
 #include <memory>
 #include <set>
 #include <unordered_set>
@@ -229,7 +230,8 @@ void SpellCheckClient::SpellCheckWords(const SpellCheckScope& scope,
   v8::Local<v8::Value> args[] = {gin::ConvertToV8(isolate_, words),
                                  templ->GetFunction(context).ToLocalChecked()};
   // Call javascript with the words and the callback function
-  scope.spell_check_->Call(context, scope.provider_, 2, args).IsEmpty();
+  scope.spell_check_->Call(context, scope.provider_, std::size(args), args)
+      .IsEmpty();
 }
 
 // Returns whether or not the given string is a contraction.

From e410109a3d12e5b305f87e6e13967f2e3f88f3f5 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 22 Jun 2022 04:17:48 -0400
Subject: [PATCH 514/811] docs: expand tutorial (#34604)

* docs: base tutorial update

* more docs

* zzz

* remove unused images
---
 .markdownlint.json                            |   4 +-
 docs/README.md                                |   3 -
 docs/fiddles/tutorial-first-app/index.html    |  21 +
 docs/fiddles/tutorial-first-app/main.js       |  26 +
 docs/fiddles/tutorial-preload/index.html      |  21 +
 docs/fiddles/tutorial-preload/main.js         |  30 ++
 docs/fiddles/tutorial-preload/preload.js      |   7 +
 docs/fiddles/tutorial-preload/renderer.js     |   2 +
 docs/images/gatekeeper.png                    | Bin 194637 -> 60322 bytes
 docs/images/preload-example.png               | Bin 0 -> 71705 bytes
 docs/tutorial/application-distribution.md     | 101 ++--
 docs/tutorial/code-signing.md                 | 202 ++++++--
 docs/tutorial/distribution-overview.md        |  54 ++
 docs/tutorial/examples.md                     |  56 ++
 docs/tutorial/introduction.md                 |  74 +--
 docs/tutorial/process-model.md                |  61 ++-
 docs/tutorial/tutorial-1-prerequisites.md     | 143 ++++++
 docs/tutorial/tutorial-2-first-app.md         | 480 ++++++++++++++++++
 docs/tutorial/tutorial-3-preload.md           | 271 ++++++++++
 docs/tutorial/tutorial-4-adding-features.md   |  77 +++
 docs/tutorial/tutorial-5-packaging.md         | 225 ++++++++
 .../tutorial-6-publishing-updating.md         | 251 +++++++++
 docs/tutorial/updates.md                      | 104 ++--
 23 files changed, 2010 insertions(+), 203 deletions(-)
 create mode 100644 docs/fiddles/tutorial-first-app/index.html
 create mode 100644 docs/fiddles/tutorial-first-app/main.js
 create mode 100644 docs/fiddles/tutorial-preload/index.html
 create mode 100644 docs/fiddles/tutorial-preload/main.js
 create mode 100644 docs/fiddles/tutorial-preload/preload.js
 create mode 100644 docs/fiddles/tutorial-preload/renderer.js
 create mode 100644 docs/images/preload-example.png
 create mode 100644 docs/tutorial/distribution-overview.md
 create mode 100644 docs/tutorial/examples.md
 create mode 100644 docs/tutorial/tutorial-1-prerequisites.md
 create mode 100644 docs/tutorial/tutorial-2-first-app.md
 create mode 100644 docs/tutorial/tutorial-3-preload.md
 create mode 100644 docs/tutorial/tutorial-4-adding-features.md
 create mode 100644 docs/tutorial/tutorial-5-packaging.md
 create mode 100644 docs/tutorial/tutorial-6-publishing-updating.md

diff --git a/.markdownlint.json b/.markdownlint.json
index a1628ba622a37..495df656c2cd3 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -23,7 +23,5 @@
     "br_spaces": 0
   },
   "single-h1": false,
-  "no-inline-html": {
-    "allowed_elements": ["br"]
-  }
+  "no-inline-html": false
 }
diff --git a/docs/README.md b/docs/README.md
index 5e5f763ccdf7d..e346d985d755d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -69,9 +69,6 @@ an issue:
   * [Windows Store](tutorial/windows-store-guide.md)
   * [Snapcraft](tutorial/snapcraft.md)
 * [Updates](tutorial/updates.md)
-  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
-  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
-  * [Applying Updates](tutorial/updates.md#applying-updates)
 * [Getting Support](tutorial/support.md)
 
 ## Detailed Tutorials
diff --git a/docs/fiddles/tutorial-first-app/index.html b/docs/fiddles/tutorial-first-app/index.html
new file mode 100644
index 0000000000000..3d677b7c97b5b
--- /dev/null
+++ b/docs/fiddles/tutorial-first-app/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <meta
+      http-equiv="X-Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <h1>Hello from Electron renderer!</h1>
+    <p>👋</p>
+    <p id="info"></p>
+  </body>
+  <script src="./renderer.js"></script>
+</html>
diff --git a/docs/fiddles/tutorial-first-app/main.js b/docs/fiddles/tutorial-first-app/main.js
new file mode 100644
index 0000000000000..10d57a0696f0f
--- /dev/null
+++ b/docs/fiddles/tutorial-first-app/main.js
@@ -0,0 +1,26 @@
+const { app, BrowserWindow } = require('electron');
+
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+  });
+
+  win.loadFile('index.html');
+};
+
+app.whenReady().then(() => {
+  createWindow();
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createWindow();
+    }
+  });
+});
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
diff --git a/docs/fiddles/tutorial-preload/index.html b/docs/fiddles/tutorial-preload/index.html
new file mode 100644
index 0000000000000..3d677b7c97b5b
--- /dev/null
+++ b/docs/fiddles/tutorial-preload/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <meta
+      http-equiv="X-Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <h1>Hello from Electron renderer!</h1>
+    <p>👋</p>
+    <p id="info"></p>
+  </body>
+  <script src="./renderer.js"></script>
+</html>
diff --git a/docs/fiddles/tutorial-preload/main.js b/docs/fiddles/tutorial-preload/main.js
new file mode 100644
index 0000000000000..6b7184900e6dd
--- /dev/null
+++ b/docs/fiddles/tutorial-preload/main.js
@@ -0,0 +1,30 @@
+const { app, BrowserWindow } = require('electron');
+const path = require('path');
+
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js'),
+    },
+  });
+
+  win.loadFile('index.html');
+};
+
+app.whenReady().then(() => {
+  createWindow();
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createWindow();
+    }
+  });
+});
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
diff --git a/docs/fiddles/tutorial-preload/preload.js b/docs/fiddles/tutorial-preload/preload.js
new file mode 100644
index 0000000000000..e0dbdce1b8b2f
--- /dev/null
+++ b/docs/fiddles/tutorial-preload/preload.js
@@ -0,0 +1,7 @@
+const { contextBridge } = require('electron');
+
+contextBridge.exposeInMainWorld('versions', {
+  node: () => process.versions.node,
+  chrome: () => process.versions.chrome,
+  electron: () => process.versions.electron,
+});
diff --git a/docs/fiddles/tutorial-preload/renderer.js b/docs/fiddles/tutorial-preload/renderer.js
new file mode 100644
index 0000000000000..7585229a91781
--- /dev/null
+++ b/docs/fiddles/tutorial-preload/renderer.js
@@ -0,0 +1,2 @@
+const information = document.getElementById('info');
+information.innerText = `This app is using Chrome (v${versions.chrome()}), Node.js (v${versions.node()}), and Electron (v${versions.electron()})`;
diff --git a/docs/images/gatekeeper.png b/docs/images/gatekeeper.png
index ed4b15ec7e8d2ee10a75165ec3f67955bd6a41ea..22567135b7da1385eb3c50e0939998771c5cca75 100644
GIT binary patch
delta 57480
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

literal 194637
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
ZeD23>7(|t?S%v(ZICkb};Ssl}{|CUx^tAv0

diff --git a/docs/images/preload-example.png b/docs/images/preload-example.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f330b32de9ca8620842d99a6e46b1b3d1f0182d
GIT binary patch
literal 71705
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
L_!9o2-JkytYZjG~

literal 0
HcmV?d00001

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index fb5dc918dad91..1b17541f2b3f5 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -1,26 +1,26 @@
-# Application Distribution
+---
+title: 'Application Packaging'
+description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
+slug: application-distribution
+hide_title: false
+---
 
-## Overview
-
-To distribute your app with Electron, you need to package and rebrand it.
-To do this, you can either use specialized tooling or manual approaches.
+To distribute your app with Electron, you need to package and rebrand it. To do this, you
+can either use specialized tooling or manual approaches.
 
 ## With tooling
 
-You can use the following tools to distribute your application:
-
-* [electron-forge](https://github.com/electron-userland/electron-forge)
-* [electron-builder](https://github.com/electron-userland/electron-builder)
-* [electron-packager](https://github.com/electron/electron-packager)
+There are a couple tools out there that exist to package and distribute your Electron app.
+We recommend using [Electron Forge](https://www.electronforge.io). You can check out
+its documentation directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
+part of the Electron tutorial.
 
-These tools will take care of all the steps you need to take to end up with a
-distributable Electron application, such as bundling your application,
-rebranding the executable, and setting the right icons.
+## Manual packaging
 
-You can check the example of how to package your app with `electron-forge` in
-the [Quick Start guide](quick-start.md#package-and-distribute-your-application).
+If you prefer the manual approach, there are 2 ways to distribute your application:
 
-## Manual distribution
+- With prebuilt binaries
+- With an app source code archive
 
 ### With prebuilt binaries
 
@@ -29,21 +29,19 @@ binaries](https://github.com/electron/electron/releases). Next, the folder
 containing your app should be named `app` and placed in Electron's resources
 directory as shown in the following examples.
 
-> *NOTE:* the location of Electron's prebuilt binaries is indicated
+:::note
+The location of Electron's prebuilt binaries is indicated
 with `electron/` in the examples below.
+:::
 
-*On macOS:*
-
-```plaintext
+```plain title='macOS'
 electron/Electron.app/Contents/Resources/app/
 ├── package.json
 ├── main.js
 └── index.html
 ```
 
-*On Windows and Linux:*
-
-```plaintext
+```plain title='Windows and Linux'
 electron/resources/app
 ├── package.json
 ├── main.js
@@ -54,7 +52,7 @@ Then execute `Electron.app` on macOS, `electron` on Linux, or `electron.exe`
 on Windows, and Electron will start as your app. The `electron` directory
 will then be your distribution to deliver to users.
 
-### With an app source code archive
+### With an app source code archive (asar)
 
 Instead of shipping your app by copying all of its source files, you can
 package your app into an [asar] archive to improve the performance of reading
@@ -65,16 +63,12 @@ To use an `asar` archive to replace the `app` folder, you need to rename the
 archive to `app.asar`, and put it under Electron's resources directory like
 below, and Electron will then try to read the archive and start from it.
 
-*On macOS:*
-
-```plaintext
+```plain title='macOS'
 electron/Electron.app/Contents/Resources/
 └── app.asar
 ```
 
-*On Windows and Linux:*
-
-```plaintext
+```plain title='Windows'
 electron/resources/
 └── app.asar
 ```
@@ -87,47 +81,44 @@ You can find more details on how to use `asar` in the
 After bundling your app into Electron, you will want to rebrand Electron
 before distributing it to users.
 
-#### macOS
-
-You can rename `Electron.app` to any name you want, and you also have to rename
-the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
-following files:
+- **Windows:** You can rename `electron.exe` to any name you like, and edit
+  its icon and other information with tools like [rcedit](https://github.com/electron/rcedit).
+- **Linux:** You can rename the `electron` executable to any name you like.
+- **macOS:** You can rename `Electron.app` to any name you want, and you also have to rename
+  the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
+  following files:
 
-* `Electron.app/Contents/Info.plist`
-* `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
+  - `Electron.app/Contents/Info.plist`
+  - `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
 
-You can also rename the helper app to avoid showing `Electron Helper` in the
-Activity Monitor, but make sure you have renamed the helper app's executable
-file's name.
+  You can also rename the helper app to avoid showing `Electron Helper` in the
+  Activity Monitor, but make sure you have renamed the helper app's executable
+  file's name.
 
-The structure of a renamed app would be like:
+  The structure of a renamed app would be like:
 
-```plaintext
+```plain
 MyApp.app/Contents
 ├── Info.plist
 ├── MacOS/
-│   └── MyApp
+│   └── MyApp
 └── Frameworks/
     └── MyApp Helper.app
         ├── Info.plist
         └── MacOS/
-            └── MyApp Helper
+            └── MyApp Helper
 ```
 
-#### Windows
+:::note
 
-You can rename `electron.exe` to any name you like, and edit its icon and other
-information with tools like [rcedit](https://github.com/electron/rcedit).
-
-#### Linux
-
-You can rename the `electron` executable to any name you like.
-
-### Rebranding by rebuilding Electron from source
-
-It is also possible to rebrand Electron by changing the product name and
+it is also possible to rebrand Electron by changing the product name and
 building it from source. To do this you need to set the build argument
 corresponding to the product name (`electron_product_name = "YourProductName"`)
 in the `args.gn` file and rebuild.
 
+Keep in mind this is not recommended as setting up the environment to compile
+from source is not trivial and takes significant time.
+
+:::
+
 [asar]: https://github.com/electron/asar
diff --git a/docs/tutorial/code-signing.md b/docs/tutorial/code-signing.md
index d591fe617c89b..a035b480cd57e 100644
--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -1,14 +1,20 @@
-# Code Signing
+---
+title: 'Code Signing'
+description: 'Code signing is a security technology that you use to certify that an app was created by you.'
+slug: code-signing
+hide_title: false
+---
 
 Code signing is a security technology that you use to certify that an app was
-created by you.
+created by you. You should sign your application so it does not trigger any
+operating system security checks.
 
-On macOS the system can detect any change to the app, whether the change is
+On macOS, the system can detect any change to the app, whether the change is
 introduced accidentally or by malicious code.
 
 On Windows, the system assigns a trust level to your code signing certificate
 which if you don't have, or if your trust level is low, will cause security
-dialogs to appear when users start using your application.  Trust level builds
+dialogs to appear when users start using your application. Trust level builds
 over time so it's better to start code signing as early as possible.
 
 While it is possible to distribute unsigned apps, it is not recommended. Both
@@ -16,20 +22,19 @@ Windows and macOS will, by default, prevent either the download or the execution
 of unsigned applications. Starting with macOS Catalina (version 10.15), users
 have to go through multiple manual steps to open unsigned applications.
 
-![macOS Catalina Gatekeeper warning: The app cannot be opened because the
-developer cannot be verified](../images/gatekeeper.png)
+![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
 
 As you can see, users get two options: Move the app straight to the trash or
 cancel running it. You don't want your users to see that dialog.
 
 If you are building an Electron app that you intend to package and distribute,
-it should be code-signed.
+it should be code signed.
 
-# Signing & notarizing macOS builds
+## Signing & notarizing macOS builds
 
-Properly preparing macOS applications for release requires two steps: First, the
-app needs to be code-signed. Then, the app needs to be uploaded to Apple for a
-process called "notarization", where automated systems will further verify that
+Properly preparing macOS applications for release requires two steps. First, the
+app needs to be code signed. Then, the app needs to be uploaded to Apple for a
+process called **notarization**, where automated systems will further verify that
 your app isn't doing anything to endanger its users.
 
 To start the process, ensure that you fulfill the requirements for signing and
@@ -42,18 +47,18 @@ notarizing your app:
 Electron's ecosystem favors configuration and freedom, so there are multiple
 ways to get your application signed and notarized.
 
-## `electron-forge`
+### Using Electron Forge
 
 If you're using Electron's favorite build tool, getting your application signed
 and notarized requires a few additions to your configuration. [Forge](https://electronforge.io) is a
 collection of the official Electron tools, using [`electron-packager`],
 [`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-Let's take a look at an example configuration with all required fields. Not all
-of them are required: the tools will be clever enough to automatically find a
-suitable `identity`, for instance, but we recommend that you are explicit.
+Let's take a look at an example `package.json` configuration with all required fields. Not all of them are
+required: the tools will be clever enough to automatically find a suitable `identity`, for instance,
+but we recommend that you are explicit.
 
-```json
+```json title="package.json" {7}
 {
   "name": "my-app",
   "version": "0.0.1",
@@ -69,7 +74,7 @@ suitable `identity`, for instance, but we recommend that you are explicit.
         },
         "osxNotarize": {
           "appleId": "felix@felix.fun",
-          "appleIdPassword": "my-apple-id-password",
+          "appleIdPassword": "my-apple-id-password"
         }
       }
     }
@@ -77,11 +82,11 @@ suitable `identity`, for instance, but we recommend that you are explicit.
 }
 ```
 
-The `plist` file referenced here needs the following macOS-specific entitlements
+The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml
+```xml title="entitlements.plist"
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -104,7 +109,7 @@ file](https://github.com/electron/fiddle/blob/master/forge.config.js).
 If you plan to access the microphone or camera within your app using Electron's APIs, you'll also
 need to add the following entitlements:
 
-```xml
+```xml title="entitlements.plist"
 <key>com.apple.security.device.audio-input</key>
 <true/>
 <key>com.apple.security.device.camera</key>
@@ -113,28 +118,26 @@ need to add the following entitlements:
 
 If these are not present in your app's entitlements when you invoke, for example:
 
-```js
+```js title="main.js"
 const { systemPreferences } = require('electron')
-
 const microphone = systemPreferences.askForMediaAccess('microphone')
 ```
 
 Your app may crash. See the Resource Access section in [Hardened Runtime](https://developer.apple.com/documentation/security/hardened_runtime) for more information and entitlements you may need.
 
-## `electron-builder`
+### Using Electron Builder
 
 Electron Builder comes with a custom solution for signing your application. You
 can find [its documentation here](https://www.electron.build/code-signing).
 
-## `electron-packager`
+### Using Electron Packager
 
 If you're not using an integrated build pipeline like Forge or Builder, you
 are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
 [`electron-notarize`].
 
 If you're using Packager's API, you can pass [in configuration that both signs
-and notarizes your
-application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
+and notarizes your application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
 
 ```js
 const packager = require('electron-packager')
@@ -155,11 +158,11 @@ packager({
 })
 ```
 
-The `plist` file referenced here needs the following macOS-specific entitlements
+The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml
+```xml title="entitlements.plist"
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -175,11 +178,11 @@ without meaning any harm:
 Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
 as well. However, it should not be used anymore if it can be avoided.
 
-## Mac App Store
+### Signing Mac App Store applications
 
 See the [Mac App Store Guide].
 
-# Signing Windows builds
+## Signing Windows builds
 
 Before signing Windows builds, you must do the following:
 
@@ -190,31 +193,140 @@ Before signing Windows builds, you must do the following:
 You can get a code signing certificate from a lot of resellers. Prices vary, so
 it may be worth your time to shop around. Popular resellers include:
 
-* [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
-* [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
-* Amongst others, please shop around to find one that suits your needs, Google
-  is your friend 😄
+- [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
+- [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+- Amongst others, please shop around to find one that suits your needs! 😄
+
+:::caution Keep your certificate password private
+Your certificate password should be a **secret**. Do not share it publicly or
+commit it to your source code.
+:::
+
+### Using Electron Forge
+
+Once you have a code signing certificate file (`.pfx`), you can sign
+[Squirrel.Windows][maker-squirrel] and [MSI][maker-msi] installers in Electron Forge
+with the `certificateFile` and `certificatePassword` fields in their respective
+configuration objects.
 
-There are a number of tools for signing your packaged app:
+For example, if you keep your Forge config in your `package.json` file and are
+creating a Squirrel.Windows installer:
+
+```json {9-15} title='package.json'
+{
+  "name": "my-app",
+  "version": "0.0.1",
+  //...
+  "config": {
+    "forge": {
+      "packagerConfig": {},
+      "makers": [
+        {
+          "name": "@electron-forge/maker-squirrel",
+          "config": {
+            "certificateFile": "./cert.pfx",
+            "certificatePassword": "this-is-a-secret"
+          }
+        }
+      ]
+    }
+  }
+  //...
+}
+```
 
-* [`electron-winstaller`] will generate an installer for windows and sign it for
-  you
-* [`electron-forge`] can sign installers it generates through the
-  Squirrel.Windows or MSI targets.
-* [`electron-builder`] can sign some of its windows targets
+### Using electron-winstaller (Squirrel.Windows)
+
+[`electron-winstaller`] is a package that can generate Squirrel.Windows installers for your
+Electron app. This is the tool used under the hood by Electron Forge's
+[Squirrel.Windows Maker][maker-squirrel]. If you're not using Electron Forge and want to use
+`electron-winstaller` directly, use the `certificateFile` and `certificatePassword` configuration
+options when creating your installer.
+
+```js {10-11}
+const electronInstaller = require('electron-winstaller')
+// NB: Use this syntax within an async function, Node does not have support for
+//     top-level await as of Node 12.
+try {
+  await electronInstaller.createWindowsInstaller({
+    appDirectory: '/tmp/build/my-app-64',
+    outputDirectory: '/tmp/build/installer64',
+    authors: 'My App Inc.',
+    exe: 'myapp.exe',
+    certificateFile: './cert.pfx',
+    certificatePassword: 'this-is-a-secret',
+  })
+  console.log('It worked!')
+} catch (e) {
+  console.log(`No dice: ${e.message}`)
+}
+```
+
+For full configuration options, check out the [`electron-winstaller`] repository!
+
+### Using electron-wix-msi (WiX MSI)
+
+[`electron-wix-msi`] is a package that can generate MSI installers for your
+Electron app. This is the tool used under the hood by Electron Forge's [MSI Maker][maker-msi].
+
+If you're not using Electron Forge and want to use `electron-wix-msi` directly, use the
+`certificateFile` and `certificatePassword` configuration options
+or pass in parameters directly to [SignTool.exe] with the `signWithParams` option.
+
+```js {12-13}
+import { MSICreator } from 'electron-wix-msi'
+
+// Step 1: Instantiate the MSICreator
+const msiCreator = new MSICreator({
+  appDirectory: '/path/to/built/app',
+  description: 'My amazing Kitten simulator',
+  exe: 'kittens',
+  name: 'Kittens',
+  manufacturer: 'Kitten Technologies',
+  version: '1.1.2',
+  outputDirectory: '/path/to/output/folder',
+  certificateFile: './cert.pfx',
+  certificatePassword: 'this-is-a-secret',
+})
+
+// Step 2: Create a .wxs template file
+const supportBinaries = await msiCreator.create()
+
+// 🆕 Step 2a: optionally sign support binaries if you
+// sign you binaries as part of of your packaging script
+supportBinaries.forEach(async (binary) => {
+  // Binaries are the new stub executable and optionally
+  // the Squirrel auto updater.
+  await signFile(binary)
+})
+
+// Step 3: Compile the template to a .msi file
+await msiCreator.compile()
+```
+
+For full configuration options, check out the [`electron-wix-msi`] repository!
+
+### Using Electron Builder
+
+Electron Builder comes with a custom solution for signing your application. You
+can find [its documentation here](https://www.electron.build/code-signing).
 
-## Windows Store
+### Signing Windows Store applications
 
 See the [Windows Store Guide].
 
-[Apple Developer Program]: https://developer.apple.com/programs/
+[apple developer program]: https://developer.apple.com/programs/
 [`electron-builder`]: https://github.com/electron-userland/electron-builder
 [`electron-forge`]: https://github.com/electron-userland/electron-forge
 [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
 [`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
-[Xcode]: https://developer.apple.com/xcode
+[`electron-wix-msi`]: https://github.com/felixrieseberg/electron-wix-msi
+[xcode]: https://developer.apple.com/xcode
 [signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[Mac App Store Guide]: mac-app-store-submission-guide.md
-[Windows Store Guide]: windows-store-guide.md
+[mac app store guide]: ./mac-app-store-submission-guide.md
+[windows store guide]: ./windows-store-guide.md
+[maker-squirrel]: https://www.electronforge.io/config/makers/squirrel.windows
+[maker-msi]: https://www.electronforge.io/config/makers/wix-msi
+[signtool.exe]: https://docs.microsoft.com/en-us/dotnet/framework/tools/signtool-exe
diff --git a/docs/tutorial/distribution-overview.md b/docs/tutorial/distribution-overview.md
new file mode 100644
index 0000000000000..b7e9bd991b4fd
--- /dev/null
+++ b/docs/tutorial/distribution-overview.md
@@ -0,0 +1,54 @@
+---
+title: 'Distribution Overview'
+description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
+slug: distribution-overview
+hide_title: false
+---
+
+Once your app is ready for production, there are a couple steps you need to take before
+you can deliver it to your users.
+
+## Packaging
+
+To distribute your app with Electron, you need to package all your resources and assets
+into an executable and rebrand it. To do this, you can either use specialized tooling
+or do it manually. See the [Application Packaging][application-packaging] tutorial
+for more information.
+
+## Code signing
+
+Code signing is a security technology that you use to certify that an app was
+created by you. You should sign your application so it does not trigger the
+security checks of your user's operating system.
+
+To get started with each operating system's code signing process, please read the
+[Code Signing][code-signing] docs.
+
+## Publishing
+
+Once your app is packaged and signed, you can freely distribute your app directly
+to users by uploading your installers online.
+
+To reach more users, you can also choose to upload your app to each operating system's
+digital distribution platform (i.e. app store). These require another build step aside
+from your direct download app. For more information, check out each individual app store guide:
+
+- [Mac App Store][mac-app]
+- [Windows Store][windows-store]
+- [Snapcraft (Linux)][snapcraft]
+
+## Updating
+
+Electron's auto-updater allows you to deliver application updates to users
+without forcing them to manually download new versions of your application.
+Check out the [Updating Applications][updates] guide for details on implementing automatic updates
+with Electron.
+
+<!-- Link labels -->
+
+[application-packaging]: ./application-distribution.md
+[code-signing]: ./code-signing.md
+[mac-app]: ./mac-app-store-submission-guide.md
+[windows-store]: ./windows-store-guide.md
+[snapcraft]: ./snapcraft.md
+[updates]: ./updates.md
diff --git a/docs/tutorial/examples.md b/docs/tutorial/examples.md
new file mode 100644
index 0000000000000..a2bea3c12f300
--- /dev/null
+++ b/docs/tutorial/examples.md
@@ -0,0 +1,56 @@
+---
+title: 'Examples Overview'
+description: 'A set of examples for common Electron features'
+slug: examples
+hide_title: false
+---
+
+# Examples Overview
+
+In this section, we have collected a set of guides for common features
+that you may want to implement in your Electron application. Each guide
+contains a practical example in a minimal, self-contained example app.
+The easiest way to run these examples is by downloading [Electron Fiddle][fiddle].
+
+Once Fiddle is installed, you can press on the "Open in Fiddle" button that you
+will find below code samples like the following one:
+
+```fiddle docs/fiddles/quick-start
+window.addEventListener('DOMContentLoaded', () => {
+  const replaceText = (selector, text) => {
+    const element = document.getElementById(selector)
+    if (element) element.innerText = text
+  }
+
+  for (const type of ['chrome', 'node', 'electron']) {
+    replaceText(`${type}-version`, process.versions[type])
+  }
+})
+```
+
+If there is still something that you do not know how to do, please take a look at the [API][app]
+as there is a chance it might be documented just there (and also open an issue requesting the
+guide!).
+
+<!-- guide-table-start -->
+
+| Guide                 | Description                                                                                                         |
+| :-------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| [Message ports]       | This guide provides some examples of how you might use MessagePorts in your app to communicate different processes. |
+| [Device access]       | Learn how to access the device hardware (Bluetooth, USB, Serial).                                                   |
+| [Keyboard shortcuts]  | Configure local and global keyboard shortcuts for your Electron application.                                        |
+| [Multithreading]      | With Web Workers, it is possible to run JavaScript in OS-level threads                                              |
+| [Offscreen rendering] | Offscreen rendering lets you obtain the content of a BrowserWindow in a bitmap, so it can be rendered anywhere.     |
+| [Spellchecker]        | Learn how to use the built-in spellchecker, set languages, etc.                                                     |
+| [Web embeds]          | Discover the different ways to embed third-party web content in your application.                                   |
+
+<!-- guide-table-end -->
+
+## How to...?
+
+You can find the full list of "How to?" in the sidebar. If there is
+something that you would like to do that is not documented, please join
+our [Discord server][] and let us know!
+
+[discord server]: https://discord.com/invite/electron
+[fiddle]: https://www.electronjs.org/fiddle
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index fe26df6498f8f..8091434c01b0f 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -1,10 +1,11 @@
-# Introduction
+---
+title: 'Introduction'
+description: 'Welcome to the Electron documentation! If this is your first time developing an Electron app, read through this Getting Started section to get familiar with the basics. Otherwise, feel free to explore our guides and API documentation!'
+slug: /latest/
+hide_title: false
+---
 
-Welcome to the Electron documentation! If this is your first time developing
-an Electron app, read through this Getting Started section to get familiar with the
-basics. Otherwise, feel free to explore our guides and API documentation!
-
-## What is Electron?
+# What is Electron?
 
 Electron is a framework for building desktop applications using JavaScript,
 HTML, and CSS. By embedding [Chromium][chromium] and [Node.js][node] into its
@@ -12,20 +13,12 @@ binary, Electron allows you to maintain one JavaScript codebase and create
 cross-platform apps that work on Windows, macOS, and Linux — no native development
 experience required.
 
-## Prerequisites
-
-These docs operate under the assumption that the reader is familiar with both
-Node.js and general web development. If you need to get more comfortable with
-either of these areas, we recommend the following resources:
-
-* [Getting started with the Web (MDN)][mdn-guide]
-* [Introduction to Node.js][node-guide]
+## Getting started
 
-Moreover, you'll have a better time understanding how Electron works if you get
-acquainted with Chromium's process model. You can get a brief overview of
-Chrome architecture with the [Chrome comic][comic], which was released alongside
-Chrome's launch back in 2008. Although it's been over a decade since then, the
-core principles introduced in the comic remain helpful to understand Electron.
+We recommend you to start with the [tutorial], which guides you through the
+process of developing an Electron app and distributing it to users.
+The [examples] and [API documentation] are also good places to browse around
+and discover new things.
 
 ## Running examples with Electron Fiddle
 
@@ -39,21 +32,44 @@ a code block. If you have Fiddle installed, this button will open a
 `fiddle.electronjs.org` link that will automatically load the example into Fiddle,
 no copy-pasting required.
 
+```fiddle docs/fiddles/quick-start
+```
+
+## What is in the docs?
+
+All the official documentation is available from the sidebar. These
+are the different categories and what you can expect on each one:
+
+- **Tutorial**: An end-to-end guide on how to create and publish your first Electron
+  application.
+- **Processes in Electron**: In-depth reference on Electron processes and how to work with them.
+- **Best Practices**: Important checklists to keep in mind when developing an Electron app.
+- **How-To Examples**: Quick references to add features to your Electron app.
+- **Development**: Miscellaneous development guides.
+- **Distribution**: Learn how to distribute your app to end users.
+- **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
+  to create quality Electron applications.
+- **Resources**: Useful links to better understand how the Electron project works
+  and is organized.
+- **Contributing to Electron**: Compiling Electron and making contributions can be daunting.
+  We try to make it easier in this section.
+
 ## Getting help
 
 Are you getting stuck anywhere? Here are a few links to places to look:
 
-* If you need help with developing your app, our [community Discord server][discord]
-is a great place to get advice from other Electron app developers.
-* If you suspect you're running into a bug with the `electron` package, please check
-the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
-problem. If not, feel free to fill out our bug report template and submit a new issue.
+- If you need help with developing your app, our [community Discord server][discord]
+  is a great place to get advice from other Electron app developers.
+- If you suspect you're running into a bug with the `electron` package, please check
+  the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
+  problem. If not, feel free to fill out our bug report template and submit a new issue.
+
+<!-- Links -->
 
+[api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
-[node]: https://nodejs.org/
-[mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/Getting_started_with_the_web
-[node-guide]: https://nodejs.dev/learn
-[comic]: https://www.google.com/googlebooks/chrome/
+[discord]: https://discord.com/invite/APGC3k5yaH
+[examples]: examples.md
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues
-[discord]: https://discord.gg/electronjs
+[node]: https://nodejs.org/
diff --git a/docs/tutorial/process-model.md b/docs/tutorial/process-model.md
index bfbb941486f55..2cb37099b513b 100644
--- a/docs/tutorial/process-model.md
+++ b/docs/tutorial/process-model.md
@@ -1,10 +1,17 @@
+---
+title: 'Process Model'
+description: 'Electron inherits its multi-process architecture from Chromium, which makes the framework architecturally very similar to a modern web browser. This guide will expand on the concepts applied in the tutorial.'
+slug: process-model
+hide_title: false
+---
+
 # Process Model
 
 Electron inherits its multi-process architecture from Chromium, which makes the framework
-architecturally very similar to a modern web browser. In this guide, we'll expound on
-the conceptual knowledge of Electron that we applied in the minimal [quick start app][].
+architecturally very similar to a modern web browser. This guide will expand on the
+concepts applied in the [Tutorial][tutorial].
 
-[quick start app]: ./quick-start.md
+[tutorial]: ./tutorial-1-prerequisites.md
 
 ## Why not a single process?
 
@@ -27,10 +34,10 @@ visualizes this model:
 ![Chrome's multi-process architecture](../images/chrome-processes.png)
 
 Electron applications are structured very similarly. As an app developer, you control
-two types of processes: main and renderer. These are analogous to Chrome's own browser
-and renderer processes outlined above.
+two types of processes: [main](#the-main-process) and [renderer](#the-renderer-process).
+These are analogous to Chrome's own browser and renderer processes outlined above.
 
-[Chrome Comic]: https://www.google.com/googlebooks/chrome/
+[chrome comic]: https://www.google.com/googlebooks/chrome/
 
 ## The main process
 
@@ -40,7 +47,7 @@ to `require` modules and use all of Node.js APIs.
 
 ### Window management
 
-The primary purpose of the main process is to create and manage application windows with the
+The main process' primary purpose is to create and manage application windows with the
 [`BrowserWindow`][browser-window] module.
 
 Each instance of the `BrowserWindow` class creates an application window that loads
@@ -68,7 +75,7 @@ When a `BrowserWindow` instance is destroyed, its corresponding renderer process
 terminated as well.
 
 [browser-window]: ../api/browser-window.md
-[web-embed]: ./web-embeds.md
+[web-embed]: ../tutorial/web-embeds.md
 [web-contents]: ../api/web-contents.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 
@@ -90,7 +97,7 @@ app.on('window-all-closed', () => {
 ```
 
 [app]: ../api/app.md
-[quick-start-lifecycle]: ./quick-start.md#manage-your-windows-lifecycle
+[quick-start-lifecycle]: ../tutorial/quick-start.md#manage-your-windows-lifecycle
 
 ### Native APIs
 
@@ -105,7 +112,7 @@ For a full list of Electron's main process modules, check out our API documentat
 
 Each Electron app spawns a separate renderer process for each open `BrowserWindow`
 (and each web embed). As its name implies, a renderer is responsible for
-*rendering* web content. For all intents and purposes, code ran in renderer processes
+_rendering_ web content. For all intents and purposes, code ran in renderer processes
 should behave according to web standards (insofar as Chromium does, at least).
 
 Therefore, all user interfaces and app functionality within a single browser
@@ -115,18 +122,22 @@ web.
 Although explaining every web spec is out of scope for this guide, the bare minimum
 to understand is:
 
-* An HTML file is your entry point for the renderer process.
-* UI styling is added through Cascading Style Sheets (CSS).
-* Executable JavaScript code can be added through `<script>` elements.
+- An HTML file is your entry point for the renderer process.
+- UI styling is added through Cascading Style Sheets (CSS).
+- Executable JavaScript code can be added through `<script>` elements.
 
 Moreover, this also means that the renderer has no direct access to `require`
 or other Node.js APIs. In order to directly include NPM modules in the renderer,
 you must use the same bundler toolchains (for example, `webpack` or `parcel`) that you
 use on the web.
 
-> Note: Renderer processes can be spawned with a full Node.js environment for ease of
-> development. Historically, this used to be the default, but this feature was disabled
-> for security reasons.
+:::warning
+
+Renderer processes can be spawned with a full Node.js environment for ease of
+development. Historically, this used to be the default, but this feature was disabled
+for security reasons.
+
+:::
 
 At this point, you might be wondering how your renderer process user interfaces
 can interact with Node.js and Electron's native desktop functionality if these
@@ -135,8 +146,9 @@ way to import Electron's content scripts.
 
 ## Preload scripts
 
-<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally 
+<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally
 change the statements here. -->
+
 Preload scripts contain code that executes in a renderer process before its web content
 begins loading. These scripts run within the renderer context, but are granted more
 privileges by having access to Node.js APIs.
@@ -149,8 +161,8 @@ const { BrowserWindow } = require('electron')
 //...
 const win = new BrowserWindow({
   webPreferences: {
-    preload: 'path/to/preload.js'
-  }
+    preload: 'path/to/preload.js',
+  },
 })
 //...
 ```
@@ -165,7 +177,7 @@ the [`contextIsolation`][context-isolation] default.
 
 ```js title='preload.js'
 window.myAPI = {
-  desktop: true
+  desktop: true,
 }
 ```
 
@@ -184,7 +196,7 @@ securely:
 const { contextBridge } = require('electron')
 
 contextBridge.exposeInMainWorld('myAPI', {
-  desktop: true
+  desktop: true,
 })
 ```
 
@@ -195,14 +207,15 @@ console.log(window.myAPI)
 
 This feature is incredibly useful for two main purposes:
 
-* By exposing [`ipcRenderer`][ipcRenderer] helpers to the renderer, you can use
+- By exposing [`ipcRenderer`][ipcrenderer] helpers to the renderer, you can use
   inter-process communication (IPC) to trigger main process tasks from the
   renderer (and vice-versa).
-* If you're developing an Electron wrapper for an existing web app hosted on a remote
+- If you're developing an Electron wrapper for an existing web app hosted on a remote
   URL, you can add custom properties onto the renderer's `window` global that can
   be used for desktop-only logic on the web client's side.
 
 [window-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Window
 [context-isolation]: ./context-isolation.md
 [context-bridge]: ../api/context-bridge.md
-[ipcRenderer]: ../api/ipc-renderer.md
+[ipcrenderer]: ../api/ipc-renderer.md
+[tutorial]: ./tutorial-1-prerequisites.md
diff --git a/docs/tutorial/tutorial-1-prerequisites.md b/docs/tutorial/tutorial-1-prerequisites.md
new file mode 100644
index 0000000000000..4c73758ab4023
--- /dev/null
+++ b/docs/tutorial/tutorial-1-prerequisites.md
@@ -0,0 +1,143 @@
+---
+title: 'Prerequisites'
+description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
+slug: tutorial-prerequisites
+hide_title: false
+---
+
+:::info Follow along the tutorial
+
+This is **part 1** of the Electron tutorial.
+
+1. **[Prerequisites][prerequisites]**
+1. [Building your First App][building your first app]
+1. [Using Preload Scripts][preload]
+1. [Adding Features][features]
+1. [Packaging Your Application][packaging]
+1. [Publishing and Updating][updates]
+
+:::
+
+Electron is a framework for building desktop applications using JavaScript,
+HTML, and CSS. By embedding [Chromium][chromium] and [Node.js][node] into a
+single binary file, Electron allows you to create cross-platform apps that
+work on Windows, macOS, and Linux with a single JavaScript codebase.
+
+This tutorial will guide you through the process of developing a desktop
+application with Electron and distributing it to end users.
+
+## Assumptions
+
+Electron is a native wrapper layer for web apps and is run in a Node.js environment.
+Therefore, this tutorial assumes you are generally familiar with Node and
+front-end web development basics. If you need to do some background reading before
+continuing, we recommend the following resources:
+
+- [Getting started with the Web (MDN Web Docs)][mdn-guide]
+- [Introduction to Node.js][node-guide]
+
+## Required tools
+
+### Code editor
+
+You will need a text editor to write your code. We recommend using [Visual Studio Code],
+although you can choose whichever one you prefer.
+
+### Command line
+
+Throughout the tutorial, we will ask you to use various command-line interfaces (CLIs). You can
+type these commands into your system's default terminal:
+
+- Windows: Command Prompt or PowerShell
+- macOS: Terminal
+- Linux: varies depending on distribution (e.g. GNOME Terminal, Konsole)
+
+Most code editors also come with an integrated terminal, which you can also use.
+
+### Git and GitHub
+
+Git is a commonly-used version control system for source code, and GitHub is a collaborative
+development platform built on top of it. Although neither is strictly necessary to building
+an Electron application, we will use GitHub releases to set up automatic updates later
+on in the tutorial. Therefore, we'll require you to:
+
+- [Create a GitHub account](https://github.com/join)
+- [Install Git](https://github.com/git-guides/install-git)
+
+If you're unfamiliar with how Git works, we recommend reading GitHub's [Git guides]. You can also
+use the [GitHub Desktop] app if you prefer using a visual interface over the command line.
+
+We recommend that you create a local Git repository and publish it to GitHub before starting
+the tutorial, and commit your code after every step.
+
+:::info Installing Git via GitHub Desktop
+
+GitHub Desktop will install the latest version of Git on your system if you don't already have
+it installed.
+
+:::
+
+### Node.js and npm
+
+To begin developing an Electron app, you need to install the [Node.js][node-download]
+runtime and its bundled npm package manager onto your system. We recommend that you
+use the latest long-term support (LTS) version.
+
+:::tip
+
+Please install Node.js using pre-built installers for your platform.
+You may encounter incompatibility issues with different development tools otherwise.
+If you are using macOS, we recommend using a package manager like [Homebrew] or
+[nvm] to avoid any directory permission issues.
+
+:::
+
+To check that Node.js was installed correctly, you can use the `-v` flag when
+running the `node` and `npm` commands. These should print out the installed
+versions.
+
+```sh
+$ node -v
+v16.14.2
+$ npm -v
+8.7.0
+```
+
+:::caution
+
+Although you need Node.js installed locally to scaffold an Electron project,
+Electron **does not use your system's Node.js installation to run its code**. Instead, it
+comes bundled with its own Node.js runtime. This means that your end users do not
+need to install Node.js themselves as a prerequisite to running your app.
+
+To check which version of Node.js is running in your app, you can access the global
+[`process.versions`] variable in the main process or preload script. You can also reference
+the list of versions in the [electron/releases] repository.
+
+:::
+
+<!-- Links -->
+
+[chromium]: https://www.chromium.org/
+[electron/releases]: https://github.com/electron/releases/blob/master/readme.md#releases
+[homebrew]: https://brew.sh/
+[mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/
+[node]: https://nodejs.org/
+[node-guide]: https://nodejs.dev/learn
+[node-download]: https://nodejs.org/en/download/
+[nvm]: https://github.com/nvm-sh/nvm
+[process-model]: ./process-model.md
+[`process.versions`]: https://nodejs.org/api/process.html#processversions
+[github]: https://github.com/
+[git guides]: https://github.com/git-guides/
+[github desktop]: https://desktop.github.com/
+[visual studio code]: https://code.visualstudio.com/
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/tutorial-2-first-app.md b/docs/tutorial/tutorial-2-first-app.md
new file mode 100644
index 0000000000000..714d069827493
--- /dev/null
+++ b/docs/tutorial/tutorial-2-first-app.md
@@ -0,0 +1,480 @@
+---
+title: 'Building your First App'
+description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
+slug: tutorial-first-app
+hide_title: false
+---
+
+:::info Follow along the tutorial
+
+This is **part 2** of the Electron tutorial.
+
+1. [Prerequisites][prerequisites]
+1. **[Building your First App][building your first app]**
+1. [Using Preload Scripts][preload]
+1. [Adding Features][features]
+1. [Packaging Your Application][packaging]
+1. [Publishing and Updating][updates]
+
+:::
+
+## Learning goals
+
+In this part of the tutorial, you will learn how to set up your Electron project
+and write a minimal starter application. By the end of this section,
+you should be able to run a working Electron app in development mode from
+your terminal.
+
+## Setting up your project
+
+:::caution Avoid WSL
+
+If you are on a Windows machine, please do not use [Windows Subsystem for Linux][wsl] (WSL)
+when following this tutorial as you will run into issues when trying to execute the
+application.
+
+<!--https://www.electronforge.io/guides/developing-with-wsl-->
+
+:::
+
+### Initializing your npm project
+
+Electron apps are scaffolded using npm, with the package.json file
+as an entry point. Start by creating a folder and initializing an npm package
+within it with `npm init`.
+
+```sh npm2yarn
+mkdir my-electron-app && cd my-electron-app
+npm init
+```
+
+This command will prompt you to configure some fields in your package.json.
+There are a few rules to follow for the purposes of this tutorial:
+
+- _entry point_ should be `main.js` (you will be creating that file soon).
+- _author_, _license_, and _description_ can be any value, but will be necessary for
+  [packaging][packaging] later on.
+
+Then, install Electron into your app's **devDependencies**, which is the list of external
+development-only package dependencies not required in production.
+
+:::info Why is Electron a devDependency?
+
+This may seem counter-intuitive since your production code is running Electron APIs.
+However, packaged apps will come bundled with the Electron binary, eliminating the need to specify
+it as a production dependency.
+
+:::
+
+```sh npm2yarn
+npm install electron --save-dev
+```
+
+Your package.json file should look something like this after initializing your package
+and installing Electron. You should also now have a `node_modules` folder containing
+the Electron executable, as well as a `package-lock.json` lockfile that specifies
+the exact dependency versions to install.
+
+```json title='package.json'
+{
+  "name": "my-electron-app",
+  "version": "1.0.0",
+  "description": "Hello World!",
+  "main": "main.js",
+  "author": "Jane Doe",
+  "license": "MIT",
+  "devDependencies": {
+    "electron": "19.0.0"
+  }
+}
+```
+
+:::info Advanced Electron installation steps
+
+If installing Electron directly fails, please refer to our [Advanced Installation][installation]
+documentation for instructions on download mirrors, proxies, and troubleshooting steps.
+
+:::
+
+### Adding a .gitignore
+
+The [`.gitignore`][gitignore] file specifies which files and directories to avoid tracking
+with Git. You should place a copy of [GitHub's Node.js gitignore template][gitignore-template]
+into your project's root folder to avoid committing your project's `node_modules` folder.
+
+## Running an Electron app
+
+:::tip Further reading
+
+Read [Electron's process model][process-model] documentation to better
+understand how Electron's multiple processes work together.
+
+:::
+
+The [`main`][package-json-main] script you defined in package.json is the entry point of any
+Electron application. This script controls the **main process**, which runs in a Node.js
+environment and is responsible for controlling your app's lifecycle, displaying native
+interfaces, performing privileged operations, and managing renderer processes
+(more on that later).
+
+Before creating your first Electron app, you will first use a trivial script to ensure your
+main process entry point is configured correctly. Create a `main.js` file in the root folder
+of your project with a single line of code:
+
+```js title='main.js'
+console.log(`Hello from Electron 👋`)
+```
+
+Because Electron's main process is a Node.js runtime, you can execute arbitrary Node.js code
+with the `electron` command (you can even use it as a [REPL]). To execute this script,
+add `electron .` to the `start` command in the [`scripts`][package-scripts]
+field of your package.json. This command will tell the Electron executable to look for the main
+script in the current directory and run it in dev mode.
+
+```json {8-10} title='package.json'
+{
+  "name": "my-electron-app",
+  "version": "1.0.0",
+  "description": "Hello World!",
+  "main": "main.js",
+  "author": "Jane Doe",
+  "license": "MIT",
+  "scripts": {
+    "start": "electron ."
+  },
+  "devDependencies": {
+    "electron": "^19.0.0"
+  }
+}
+```
+
+```sh npm2yarn
+npm run start
+```
+
+Your terminal should print out `Hello from Electron 👋`. Congratulations,
+you have executed your first line of code in Electron! Next, you will learn
+how to create user interfaces with HTML and load that into a native window.
+
+## Loading a web page into a BrowserWindow
+
+In Electron, each window displays a web page that can be loaded either from a local HTML
+file or a remote web address. For this example, you will be loading in a local file. Start
+by creating a barebones web page in an `index.html` file in the root folder of your project:
+
+```html title='index.html'
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <meta
+      http-equiv="X-Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <h1>Hello from Electron renderer!</h1>
+    <p>👋</p>
+  </body>
+</html>
+```
+
+Now that you have a web page, you can load it into an Electron [BrowserWindow][browser-window].
+Replace the contents your `main.js` file with the following code. We will explain each
+highlighted block separately.
+
+```js {1,3-10,12-14} title='main.js' showLineNumbers
+const { app, BrowserWindow } = require('electron')
+
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+  })
+
+  win.loadFile('index.html')
+}
+
+app.whenReady().then(() => {
+  createWindow()
+})
+```
+
+### Importing modules
+
+```js title='main.js (Line 1)'
+const { app, BrowserWindow } = require('electron')
+```
+
+In the first line, we are importing two Electron modules
+with CommonJS module syntax:
+
+- [app][app], which controls your application's event lifecycle.
+- [BrowserWindow][browser-window], which creates and manages app windows.
+
+:::info Capitalization conventions
+
+You might have noticed the capitalization difference between the **a**pp
+and **B**rowser**W**indow modules. Electron follows typical JavaScript conventions here,
+where PascalCase modules are instantiable class constructors (e.g. BrowserWindow, Tray,
+Notification) whereas camelCase modules are not instantiable (e.g. app, ipcRenderer, webContents).
+
+:::
+
+:::warning ES Modules in Electron
+
+[ECMAScript modules](https://nodejs.org/api/esm.html) (i.e. using `import` to load a module)
+are currently not directly supported in Electron. You can find more information about the
+state of ESM in Electron in [electron/electron#21457](https://github.com/electron/electron/issues/21457).
+
+:::
+
+### Writing a reusable function to instantiate windows
+
+The `createWindow()` function loads your web page into a new BrowserWindow instance:
+
+```js title='main.js (Lines 3-10)'
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+  })
+
+  win.loadFile('index.html')
+}
+```
+
+### Calling your function when the app is ready
+
+```js title='main.js (Lines 12-14)'
+app.whenReady().then(() => {
+  createWindow()
+})
+```
+
+Many of Electron's core modules are Node.js [event emitters] that adhere to Node's asynchronous
+event-driven architecture. The app module is one of these emitters.
+
+In Electron, BrowserWindows can only be created after the app module's [`ready`][app-ready] event
+is fired. You can wait for this event by using the [`app.whenReady()`][app-when-ready] API and
+calling `createWindow()` once its promise is fulfilled.
+
+:::info
+
+You typically listen to Node.js events by using an emitter's `.on` function.
+
+```diff
++ app.on('ready').then(() => {
+- app.whenReady().then(() => {
+  createWindow()
+})
+```
+
+However, Electron exposes `app.whenReady()` as a helper specifically for the `ready` event to
+avoid subtle pitfalls with directly listening to that event in particular.
+See [electron/electron#21972](https://github.com/electron/electron/pull/21972) for details.
+
+:::
+
+At this point, running your Electron application's `start` command should successfully
+open a window that displays your web page!
+
+Each web page your app displays in a window will run in a separate process called a
+**renderer** process (or simply _renderer_ for short). Renderer processes have access
+to the same JavaScript APIs and tooling you use for typical front-end web
+development, such as using [webpack] to bundle and minify your code or [React][react]
+to build your user interfaces.
+
+## Managing your app's window lifecycle
+
+Application windows behave differently on each operating system. Rather than
+enforce these conventions by default, Electron gives you the choice to implement
+them in your app code if you wish to follow them. You can implement basic window
+conventions by listening for events emitted by the app and BrowserWindow modules.
+
+:::tip Process-specific control flow
+
+Checking against Node's [`process.platform`][node-platform] variable can help you
+to run code conditionally on certain platforms. Note that there are only three
+possible platforms that Electron can run in: `win32` (Windows), `linux` (Linux),
+and `darwin` (macOS).
+
+:::
+
+### Quit the app when all windows are closed (Windows & Linux)
+
+On Windows and Linux, closing all windows will generally quit an application entirely.
+To implement this pattern in your Electron app, listen for the app module's
+[`window-all-closed`][window-all-closed] event, and call [`app.quit()`][app-quit]
+to exit your app if the user is not on macOS.
+
+```js
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') app.quit()
+})
+```
+
+### Open a window if none are open (macOS)
+
+In contrast, macOS apps generally continue running even without any windows open.
+Activating the app when no windows are available should open a new one.
+
+To implement this feature, listen for the app module's [`activate`][activate]
+event, and call your existing `createWindow()` method if no BrowserWindows are open.
+
+Because windows cannot be created before the `ready` event, you should only listen for
+`activate` events after your app is initialized. Do this by only listening for activate
+events inside your existing `whenReady()` callback.
+
+```js
+app.whenReady().then(() => {
+  createWindow()
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+  })
+})
+```
+
+## Final starter code
+
+```fiddle docs/fiddles/tutorial-first-app
+
+```
+
+## Optional: Debugging from VS Code
+
+If you want to debug your application using VS Code, you have need attach VS Code to
+both the main and renderer processes. Here is a sample configuration for you to
+run. Create a launch.json configuration in a new `.vscode` folder in your project:
+
+```json title='.vscode/launch.json'
+{
+  "version": "0.2.0",
+  "compounds": [
+    {
+      "name": "Main + renderer",
+      "configurations": ["Main", "Renderer"],
+      "stopAll": true
+    }
+  ],
+  "configurations": [
+    {
+      "name": "Renderer",
+      "port": 9222,
+      "request": "attach",
+      "type": "pwa-chrome",
+      "webRoot": "${workspaceFolder}"
+    },
+    {
+      "name": "Main",
+      "type": "pwa-node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
+      },
+      "args": [".", "--remote-debugging-port=9222"],
+      "outputCapture": "std",
+      "console": "integratedTerminal"
+    }
+  ]
+}
+```
+
+The "Main + renderer" option will appear when you select "Run and Debug"
+from the sidebar, allowing you to set breakpoints and inspect all the variables among
+other things in both the main and renderer processes.
+
+What we have done in the `launch.json` file is to create 3 configurations:
+
+- `Main` is used to start the main process and also expose port 9222 for remote debugging
+  (`--remote-debugging-port=9222`). This is the port that we will use to attach the debugger
+  for the `Renderer`. Because the main process is a Node.js process, the type is set to
+  `pwa-node` (`pwa-` is the prefix that tells VS Code to use the latest JavaScript debugger).
+- `Renderer` is used to debug the renderer process. Because the main process is the one
+  that creates the process, we have to "attach" to it (`"request": "attach"`) instead of
+  creating a new one.
+  The renderer process is a web one, so the debugger we have to use is `pwa-chrome`.
+- `Main + renderer` is a [compound task] that executes the previous ones simultaneously.
+
+:::caution
+
+Because we are attaching to a process in `Renderer`, it is possible that the first lines of
+your code will be skipped as the debugger will not have had enough time to connect before they are
+being executed.
+You can work around this by refreshing the page or setting a timeout before executing the code
+in development mode.
+
+:::
+
+:::info Further reading
+
+If you want to dig deeper in the debugging area, the following guides provide more information:
+
+- [Application Debugging]
+- [DevTools Extensions][devtools extension]
+
+:::
+
+## Summary
+
+Electron applications are set up using npm packages. The Electron executable should be installed
+in your project's `devDependencies` and can be run in development mode using a script in your
+package.json file.
+
+The executable runs the JavaScript entry point found in the `main` property of your package.json.
+This file controls Electron's **main process**, which runs an instance of Node.js and is
+responsible for your app's lifecycle, displaying native interfaces, performing privileged operations,
+and managing renderer processes.
+
+**Renderer processes** (or renderers for short) are responsible for display graphical content. You can
+load a web page into a renderer by pointing it to either a web address or a local HTML file.
+Renderers behave very similarly to regular web pages and have access to the same web APIs.
+
+In the next section of the tutorial, we will be learning how to augment the renderer process with
+privileged APIs and how to communicate between processes.
+
+<!-- Links -->
+
+[activate]: ../api/app.md#event-activate-macos
+[advanced-installation]: installation.md
+[app]: ../api/app.md
+[app-quit]: ../api/app.md#appquit
+[app-ready]: ../api/app.md#event-ready
+[app-when-ready]: ../api/app.md#appwhenready
+[application debugging]: ./application-debugging.md
+[browser-window]: ../api/browser-window.md
+[commonjs]: https://nodejs.org/docs/../api/modules.html#modules_modules_commonjs_modules
+[compound task]: https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks
+[devtools extension]: ./devtools-extension.md
+[event emitters]: https://nodejs.org/api/events.html#events
+[gitignore]: https://git-scm.com/docs/gitignore
+[gitignore-template]: https://github.com/github/gitignore/blob/main/Node.gitignore
+[installation]: ./installation.md
+[node-platform]: https://nodejs.org/api/process.html#process_process_platform
+[package-json-main]: https://docs.npmjs.com/cli/v7/configuring-npm/package-json#main
+[package-scripts]: https://docs.npmjs.com/cli/v7/using-npm/scripts
+[process-model]: process-model.md
+[react]: https://reactjs.org
+[repl]: ./repl.md
+[sandbox]: ./sandbox.md
+[webpack]: https://webpack.js.org
+[window-all-closed]: ../api/app.md#event-window-all-closed
+[wsl]: https://docs.microsoft.com/en-us/windows/wsl/about#what-is-wsl-2
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/tutorial-3-preload.md b/docs/tutorial/tutorial-3-preload.md
new file mode 100644
index 0000000000000..6f84cfe421909
--- /dev/null
+++ b/docs/tutorial/tutorial-3-preload.md
@@ -0,0 +1,271 @@
+---
+title: 'Using Preload Scripts'
+description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
+slug: tutorial-preload
+hide_title: false
+---
+
+:::info Follow along the tutorial
+
+This is **part 3** of the Electron tutorial.
+
+1. [Prerequisites][prerequisites]
+1. [Building your First App][building your first app]
+1. **[Using Preload Scripts][preload]**
+1. [Adding Features][features]
+1. [Packaging Your Application][packaging]
+1. [Publishing and Updating][updates]
+
+:::
+
+## Learning goals
+
+In this part of the tutorial, you will learn what a preload script is and how to use one
+to securely expose privileged APIs into the renderer process. You will also learn how to
+communicate between main and renderer processes with Electron's inter-process
+communication (IPC) modules.
+
+## What is a preload script?
+
+Electron's main process is a Node.js environment that has full operating system access.
+On top of [Electron modules][modules], you can also access [Node.js built-ins][node-api],
+as well as any packages installed via npm. On the other hand, renderer processes run web
+pages and do not run Node.js by default for security reasons.
+
+To bridge Electron's different process types together, we will need to use a special script
+called a **preload**.
+
+## Augmenting the renderer with a preload script
+
+A BrowserWindow's preload script runs in a context that has access to both the HTML DOM
+and a Node.js environment. Preload scripts are injected before a web page loads in the renderer,
+similar to a Chrome extension's [content scripts][content-script]. To add features to your renderer
+that require privileged access, you can define [global] objects through the
+[contextBridge][contextbridge] API.
+
+To demonstrate this concept, you will create a preload script that exposes your app's
+versions of Chrome, Node, and Electron into the renderer.
+
+Add a new `preload.js` script that exposes selected properties of Electron's `process.versions`
+object to the renderer process in a `versions` global variable.
+
+```js title="preload.js"
+const { contextBridge } = require('electron')
+
+contextBridge.exposeInMainWorld('versions', {
+  node: () => process.versions.node,
+  chrome: () => process.versions.chrome,
+  electron: () => process.versions.electron,
+  // we can also expose variables, not just functions
+})
+```
+
+To attach this script to your renderer process, pass its path to the
+`webPreferences.preload` option in the BrowserWindow constructor:
+
+```js {8-10} title="main.js"
+const { app, BrowserWindow } = require('electron')
+const path = require('path')
+
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js'),
+    },
+  })
+
+  win.loadFile('index.html')
+}
+
+app.whenReady().then(() => {
+  createWindow()
+})
+```
+
+:::info
+
+There are two Node.js concepts that are used here:
+
+- The [`__dirname`][dirname] string points to the path of the currently executing script
+  (in this case, your project's root folder).
+- The [`path.join`][path-join] API joins multiple path segments together, creating a
+  combined path string that works across all platforms.
+
+:::
+
+At this point, the renderer has access to the `versions` global, so let's display that
+information in the window. This variable can be accessed via `window.versions` or simply
+`versions`. Create a `renderer.js` script that uses the [`document.getElementById`]
+DOM API to replace the displayed text for the HTML element with `info` as its `id` property.
+
+```js title="renderer.js"
+const information = document.getElementById('info')
+information.innerText = `This app is using Chrome (v${versions.chrome()}), Node.js (v${versions.node()}), and Electron (v${versions.electron()})`
+```
+
+Then, modify your `index.html` by adding a new element with `info` as its `id` property,
+and attach your `renderer.js` script:
+
+```html {18,20} title="index.html"
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <meta
+      http-equiv="X-Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'"
+    />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <h1>Hello from Electron renderer!</h1>
+    <p>👋</p>
+    <p id="info"></p>
+  </body>
+  <script src="./renderer.js"></script>
+</html>
+```
+
+After following the above steps, your app should look something like this:
+
+![Electron app showing This app is using Chrome (v102.0.5005.63), Node.js (v16.14.2), and Electron (v19.0.3)](../images/preload-example.png)
+
+And the code should look like this:
+
+```fiddle docs/fiddles/tutorial-preload
+
+```
+
+## Communicating between processes
+
+As we have mentioned above, Electron's main and renderer process have distinct responsibilities
+and are not interchangeable. This means it is not possible to access the Node.js APIs directly
+from the renderer process, nor the HTML Document Object Model (DOM) from the main process.
+
+The solution for this problem is to use Electron's `ipcMain` and `ipcRenderer` modules for
+inter-process communication (IPC). To send a message from your web page to the main process,
+you can set up a main process handler with `ipcMain.handle` and
+then expose a function that calls `ipcRenderer.invoke` to trigger the handler in your preload script.
+
+To illustrate, we will add a global function to the renderer called `ping()`
+that will return a string from the main process.
+
+First, set up the `invoke` call in your preload script:
+
+```js {1,7} title="preload.js"
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('versions', {
+  node: () => process.versions.node,
+  chrome: () => process.versions.chrome,
+  electron: () => process.versions.electron,
+  ping: () => ipcRenderer.invoke('ping'),
+  // we can also expose variables, not just functions
+})
+```
+
+:::caution IPC security
+
+Notice how we wrap the `ipcRenderer.invoke('ping')` call in a helper function rather
+than expose the `ipcRenderer` module directly via context bridge. You **never** want to
+directly expose the entire `ipcRenderer` module via preload. This would give your renderer
+the ability to send arbitrary IPC messages to the main process, which becomes a powerful
+attack vector for malicious code.
+
+:::
+
+Then, set up your `handle` listener in the main process. We do this _before_
+loading the HTML file so that the handler is guaranteed to be ready before
+you send out the `invoke` call from the renderer.
+
+```js {1,11} title="main.js"
+const { ipcMain } = require('electron')
+
+const createWindow = () => {
+  const win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js'),
+    },
+  })
+  ipcMain.handle('ping', () => 'pong')
+  win.loadFile('index.html')
+}
+```
+
+Once you have the sender and receiver set up, you can now send messages from the renderer
+to the main process through the `'ping'` channel you just defined.
+
+```js title='renderer.js'
+const func = async () => {
+  const response = await window.versions.ping()
+  console.log(response) // prints out 'pong'
+}
+
+func()
+```
+
+:::info
+
+For more in-depth explanations on using the `ipcRenderer` and `ipcMain` modules,
+check out the full [Inter-Process Communication][ipc] guide.
+
+:::
+
+## Summary
+
+A preload script contains code that runs before your web page is loaded into the browser
+window. It has access to both DOM APIs and Node.js environment, and is often used to
+expose privileged APIs to the renderer via the `contextBridge` API.
+
+Because the main and renderer processes have very different responsibilities, Electron
+apps often use the preload script to set up inter-process communication (IPC) interfaces
+to pass arbitrary messages between the two kinds of processes.
+
+In the next part of the tutorial, we will be showing you resources on adding more
+functionality to your app, then teaching you distributing your app to users.
+
+<!-- Links -->
+
+[advanced-installation]: ./installation.md
+[application debugging]: ./application-debugging.md
+[app]: ../api/app.md
+[app-ready]: ../api/app.md#event-ready
+[app-when-ready]: ../api/app.md#appwhenready
+[browser-window]: ../api/browser-window.md
+[commonjs]: https://nodejs.org/docs/latest/api/modules.html#modules_modules_commonjs_modules
+[compound task]: https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks
+[content-script]: https://developer.chrome.com/docs/extensions/mv3/content_scripts/
+[contextbridge]: ../api/context-bridge.md
+[context-isolation]: ./context-isolation.md
+[`document.getelementbyid`]: https://developer.mozilla.org/en-US/docs/Web/API/Document/getElementById
+[devtools-extension]: ./devtools-extension.md
+[dirname]: https://nodejs.org/api/modules.html#modules_dirname
+[global]: https://developer.mozilla.org/en-US/docs/Glossary/Global_object
+[ipc]: ./ipc.md
+[mdn-csp]: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
+[modules]: ../api/app.md
+[node-api]: https://nodejs.org/dist/latest/docs/api/
+[package-json-main]: https://docs.npmjs.com/cli/v7/configuring-npm/package-json#main
+[package-scripts]: https://docs.npmjs.com/cli/v7/using-npm/scripts
+[path-join]: https://nodejs.org/api/path.html#path_path_join_paths
+[process-model]: ./process-model.md
+[react]: https://reactjs.org
+[sandbox]: ./sandbox.md
+[webpack]: https://webpack.js.org
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/tutorial-4-adding-features.md b/docs/tutorial/tutorial-4-adding-features.md
new file mode 100644
index 0000000000000..b7c776c1dbd67
--- /dev/null
+++ b/docs/tutorial/tutorial-4-adding-features.md
@@ -0,0 +1,77 @@
+---
+title: 'Adding Features'
+description: 'In this step of the tutorial, we will share some resources you should read to add features to your application'
+slug: tutorial-adding-features
+hide_title: false
+---
+
+:::info Follow along the tutorial
+
+This is **part 4** of the Electron tutorial.
+
+1. [Prerequisites][prerequisites]
+1. [Building your First App][building your first app]
+1. [Using Preload Scripts][preload]
+1. **[Adding Features][features]**
+1. [Packaging Your Application][packaging]
+1. [Publishing and Updating][updates]
+
+:::
+
+## Adding application complexity
+
+If you have been following along, you should have a functional Electron application
+with a static user interface. From this starting point, you can generally progress
+in developing your app in two broad directions:
+
+1. Adding complexity to your renderer process' web app code
+1. Deeper integrations with the operating system and Node.js
+
+It is important to understand the distinction between these two broad concepts. For the
+first point, Electron-specific resources are not necessary. Building a pretty to-do
+list in Electron is just pointing your Electron BrowserWindow to a pretty
+to-do list web app. Ultimately, you are building your renderer's UI using the same tools
+(HTML, CSS, JavaScript) that you would on the web. Therefore, Electron's docs will
+not go in-depth on how to use standard web tools.
+
+On the other hand, Electron also provides a rich set of tools that allow
+you to integrate with the desktop environment, from creating tray icons to adding
+global shortcuts to displaying native menus. It also gives you all the power of a
+Node.js environment in the main process. This set of capabilities separates
+Electron applications from running a website in a browser tab, and are the
+focus of Electron's documentation.
+
+## How-to examples
+
+Electron's documentation has many tutorials to help you with more advanced topics
+and deeper operating system integrations. To get started, check out the
+[How-To Examples][how-to] doc.
+
+:::note Let us know if something is missing!
+
+If you can't find what you are looking for, please let us know on [GitHub] or in
+our [Discord server][discord]!
+
+:::
+
+## What's next?
+
+For the rest of the tutorial, we will be shifting away from application code
+and giving you a look at how you can get your app from your developer machine
+into end users' hands.
+
+<!-- Link labels -->
+
+[discord]: https://discord.com/invite/APGC3k5yaH
+[github]: https://github.com/electron/electronjs.org-new/issues/new
+[how to]: ./examples.md
+[node-platform]: https://nodejs.org/api/process.html#process_process_platform
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/tutorial-5-packaging.md b/docs/tutorial/tutorial-5-packaging.md
new file mode 100644
index 0000000000000..3ab4f15b50d84
--- /dev/null
+++ b/docs/tutorial/tutorial-5-packaging.md
@@ -0,0 +1,225 @@
+---
+title: 'Packaging Your Application'
+description: 'To distribute your app with Electron, you need to package it and create installers.'
+slug: tutorial-packaging
+hide_title: false
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+:::info Follow along the tutorial
+
+This is **part 5** of the Electron tutorial.
+
+1. [Prerequisites][prerequisites]
+1. [Building your First App][building your first app]
+1. [Using Preload Scripts][preload]
+1. [Adding Features][features]
+1. **[Packaging Your Application][packaging]**
+1. [Publishing and Updating][updates]
+
+:::
+
+## Learning goals
+
+In this part of the tutorial, we'll be going over the basics of packaging and distributing
+your app with [Electron Forge].
+
+## Using Electron Forge
+
+Electron does not have any tooling for packaging and distribution bundled into its core
+modules. Once you have a working Electron app in dev mode, you need to use
+additional tooling to create a packaged app you can distribute to your users (also known
+as a **distributable**). Distributables can be either installers (e.g. MSI on Windows) or
+portable executable files (e.g. `.app` on macOS).
+
+Electron Forge is an all-in-one tool that handles the packaging and distribution of Electron
+apps. Under the hood, it combines a lot of existing Electron tools (e.g. [`electron-packager`],
+[`@electron/osx-sign`], [`electron-winstaller`], etc.) into a single interface so you do not
+have to worry about wiring them all together.
+
+### Importing your project into Forge
+
+You can install Electron Forge's CLI in your project's `devDependencies` and import your
+existing project with a handy conversion script.
+
+```sh npm2yarn
+npm install --save-dev @electron-forge/cli
+npx electron-forge import
+```
+
+Once the conversion script is done, Forge should have added a few scripts
+to your `package.json` file.
+
+```json title='package.json'
+  //...
+  "scripts": {
+    "start": "electron-forge start",
+    "package": "electron-forge package",
+    "make": "electron-forge make"
+  },
+  //...
+```
+
+:::info CLI documentation
+
+For more information on `make` and other Forge APIs, check out
+the [Electron Forge CLI documentation].
+
+:::
+
+You should also notice that your package.json now has a few more packages installed
+under your `devDependencies`, and contains an added `config.forge` field with an array
+of makers configured. **Makers** are Forge plugins that create distributables from
+your source code. You should see multiple makers in the pre-populated configuration,
+one for each target platform.
+
+### Creating a distributable
+
+To create a distributable, use your project's new `make` script, which runs the
+`electron-forge make` command.
+
+```sh npm2yarn
+npm run make
+```
+
+This `make` command contains two steps:
+
+1. It will first run `electron-forge package` under the hood, which bundles your app
+   code together with the Electron binary. The packaged code is generated into a folder.
+1. It will then use this packaged app folder to create a separate distributable for each
+   configured maker.
+
+After the script runs, you should see an `out` folder containing both the distributable
+and a folder containing the packaged application code.
+
+```plain title='macOS output example'
+out/
+├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
+├── ...
+└── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
+```
+
+The distributable in the `out/make` folder should be ready to launch! You have now
+created your first bundled Electron application.
+
+:::tip Distributable formats
+
+Electron Forge can be configured to create distributables in different OS-specific formats
+(e.g. DMG, deb, MSI, etc.). See Forge's [Makers] documentation for all configuration options.
+
+:::
+
+:::note Packaging without Electron Forge
+
+If you want to manually package your code, or if you're just interested understanding the
+mechanics behind packaging an Electron app, check out the full [Application Packaging]
+documentation.
+
+:::
+
+## Important: signing your code
+
+In order to distribute desktop applications to end users, we _highly recommended_ for you
+to **code sign** your Electron app. Code signing is an important part of shipping
+desktop applications, and is mandatory for the auto-update step in the final part
+of the tutorial.
+
+Code signing is a security technology that you use to certify that a desktop app was
+created by a known source. Windows and macOS have their own OS-specific code signing
+systems that will make it difficult for users to download or launch unsigned applications.
+
+If you already have code signing certificates for Windows and macOS, you can set your
+credentials in your Forge configuration. Otherwise, please refer to the full
+[Code Signing] documentation to learn how to purchase a certificate and for more information
+on the desktop app code signing process.
+
+On macOS, code signing is done at the app packaging level. On Windows, distributable installers
+are signed instead.
+
+<Tabs>
+  <TabItem value="macos" label="macOS" default>
+
+```json title='package.json' {6-18}
+{
+  //...
+  "config": {
+    "forge": {
+      //...
+      "packagerConfig": {
+        "osxSign": {
+          "identity": "Developer ID Application: Felix Rieseberg (LT94ZKYDCJ)",
+          "hardened-runtime": true,
+          "entitlements": "entitlements.plist",
+          "entitlements-inherit": "entitlements.plist",
+          "signature-flags": "library"
+        },
+        "osxNotarize": {
+          "appleId": "felix@felix.fun",
+          "appleIdPassword": "this-is-a-secret"
+        }
+      }
+      //...
+    }
+  }
+  //...
+}
+```
+
+  </TabItem>
+  <TabItem value="windows" label="Windows">
+
+```json title='package.json'  {6-14}
+{
+  //...
+  "config": {
+    "forge": {
+      //...
+      "makers": [
+        {
+          "name": "@electron-forge/maker-squirrel",
+          "config": {
+            "certificateFile": "./cert.pfx",
+            "certificatePassword": "this-is-a-secret"
+          }
+        }
+      ]
+      //...
+    }
+  }
+  //...
+}
+```
+
+  </TabItem>
+</Tabs>
+
+## Summary
+
+Electron applications need to be packaged to be distributed to users. In this tutorial,
+you imported your app into Electron Forge and configured it to package your app and
+generate installers.
+
+In order for your application to be trusted by the user's system, you need to digitally
+certify that the distributable is authentic and untampered by code signing it. Your app
+can be signed through Forge once you configure it to use your code signing certificate
+information.
+
+[`@electron/osx-sign`]: https://github.com/electron/osx-sign
+[application packaging]: ./application-distribution.md
+[code signing]: ./code-signing.md
+[`electron-packager`]: https://github.com/electron/electron-packager
+[`electron-winstaller`]: https://github.com/electron/windows-installer
+[electron forge]: https://www.electronforge.io
+[electron forge cli documentation]: https://www.electronforge.io/cli#commands
+[makers]: https://www.electronforge.io/config/makers
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/tutorial-6-publishing-updating.md b/docs/tutorial/tutorial-6-publishing-updating.md
new file mode 100644
index 0000000000000..65b89766d88f2
--- /dev/null
+++ b/docs/tutorial/tutorial-6-publishing-updating.md
@@ -0,0 +1,251 @@
+---
+title: 'Publishing and Updating'
+description: "There are several ways to update an Electron application. The easiest and officially supported one is taking advantage of the built-in Squirrel framework and Electron's autoUpdater module."
+slug: tutorial-publishing-updating
+hide_title: false
+---
+
+:::info Follow along the tutorial
+
+This is **part 6** of the Electron tutorial.
+
+1. [Prerequisites][prerequisites]
+1. [Building your First App][building your first app]
+1. [Using Preload Scripts][preload]
+1. [Adding Features][features]
+1. [Packaging Your Application][packaging]
+1. **[Publishing and Updating][updates]**
+
+:::
+
+## Learning goals
+
+If you've been following along, this is the last step of the tutorial! In this part,
+you will publish your app to GitHub releases and integrate automatic updates
+into your app code.
+
+## Using update.electronjs.org
+
+The Electron maintainers provide a free auto-updating service for open-source apps
+at https://update.electronjs.org. Its requirements are:
+
+- Your app runs on macOS or Windows
+- Your app has a public GitHub repository
+- Builds are published to [GitHub releases]
+- Builds are [code signed][code-signed]
+
+At this point, we'll assume that you have already pushed all your
+code to a public GitHub repository.
+
+:::info Alternative update services
+
+If you're using an alternate repository host (e.g. GitLab or Bitbucket) or if
+you need to keep your code repository private, please refer to our
+[step-by-step guide][update-server] on hosting your own Electron update server.
+
+:::
+
+## Publishing a GitHub release
+
+Electron Forge has [Publisher] plugins that can automate the distribution
+of your packaged application to various sources. In this tutorial, we will
+be using the GitHub Publisher, which will allow us to publish
+our code to GitHub releases.
+
+### Generating a personal access token
+
+Forge cannot publish to any repository on GitHub without permission. You
+need to pass in an authenticated token that gives Forge access to
+your GitHub releases. The easiest way to do this is to
+[create a new personal access token (PAT)][new-pat]
+with the `public_repo` scope, which gives write access to your public repositories.
+**Make sure to keep this token a secret.**
+
+### Setting up the GitHub Publisher
+
+#### Installing the module
+
+Forge's [GitHub Publisher] is a plugin that
+needs to be installed in your project's `devDependencies`:
+
+```sh npm2yarn
+npm install --save-dev @electron-forge/publisher-github
+```
+
+#### Configuring the publisher in Forge
+
+Once you have it installed, you need to set it up in your Forge
+configuration. A full list of options is documented in the Forge's
+[`PublisherGitHubConfig`] API docs.
+
+```json title='package.json' {6-16}
+{
+  //...
+  "config": {
+    "forge": {
+      "publishers": [
+        {
+          "name": "@electron-forge/publisher-github",
+          "config": {
+            "repository": {
+              "owner": "github-user-name",
+              "name": "github-repo-name"
+            },
+            "prerelease": false,
+            "draft": true
+          }
+        }
+      ]
+    }
+  }
+  //...
+}
+```
+
+:::tip Drafting releases before publishing
+
+Notice that you have configured Forge to publish your release as a draft.
+This will allow you to see the release with its generated artifacts
+without actually publishing it to your end users. You can manually
+publish your releases via GitHub after writing release notes and
+double-checking that your distributables work.
+
+:::
+
+#### Setting up your authentication token
+
+You also need to make the Publisher aware of your authentication token.
+By default, it will use the value stored in the `GITHUB_TOKEN` environment
+variable.
+
+### Running the publish command
+
+Add Forge's [publish command] to your npm scripts.
+
+```json {6} title='package.json'
+  //...
+  "scripts": {
+    "start": "electron-forge start",
+    "package": "electron-forge package",
+    "make": "electron-forge make",
+    "publish": "electron-forge publish"
+  },
+  //...
+```
+
+This command will run your configured makers and publish the output distributables to a new
+GitHub release.
+
+```sh npm2yarn
+npm run publish
+```
+
+By default, this will only publish a single distributable for your host operating system and
+architecture. You can publish for different architectures by passing in the `--arch` flag to your
+Forge commands.
+
+The name of this release will correspond to the `version` field in your project's package.json file.
+
+:::tip Tagging releases
+
+Optionally, you can also [tag your releases in Git][git-tag] so that your
+release is associated with a labeled point in your code history. npm comes
+with a handy [`npm version`](https://docs.npmjs.com/cli/v8/commands/npm-version)
+command that can handle the version bumping and tagging for you.
+
+:::
+
+#### Bonus: Publishing in GitHub Actions
+
+Publishing locally can be painful, especially because you can only create distributables
+for your host operating system (i.e. you can't publish a Window `.exe` file from macOS).
+
+A solution for this would be to publish your app via automation workflows
+such as [GitHub Actions], which can run tasks in the
+cloud on Ubuntu, macOS, and Windows. This is the exact approach taken by [Electron Fiddle].
+You can refer to Fiddle's [Build and Release pipeline][fiddle-build]
+and [Forge configuration][fiddle-forge-config]
+for more details.
+
+## Instrumenting your updater code
+
+Now that we have a functional release system via GitHub releases, we now need to tell our
+Electron app to download an update whenever a new release is out. Electron apps do this
+via the [autoUpdater] module, which reads from an update server feed to check if a new version
+is available for download.
+
+The update.electronjs.org service provides an updater-compatible feed. For example, Electron
+Fiddle v0.28.0 will check the endpoint at https://update.electronjs.org/electron/fiddle/darwin/v0.28.0
+to see if a newer GitHub release is available.
+
+After your release is published to GitHub, the update.electronjs.org service should work
+for your application. The only step left is to configure the feed with the autoUpdater module.
+
+To make this process easier, the Electron team maintains the [`update-electron-app`] module,
+which sets up the autoUpdater boilerplate for update.electronjs.org in one function
+call — no configuration required. This module will search for the update.electronjs.org
+feed that matches your project's package.json `"repository"` field.
+
+First, install the module as a runtime dependency.
+
+```sh npm2yarn
+npm install update-electron-app
+```
+
+Then, import the module and call it immediately in the main process.
+
+```js title='main.js'
+require('update-electron-app')()
+```
+
+And that is all it takes! Once your application is packaged, it will update itself for each new
+GitHub release that you publish.
+
+## Summary
+
+In this tutorial, we configured Electron Forge's GitHub Publisher to upload your app's
+distributables to GitHub releases. Since distributables cannot always be generated
+between platforms, we recommend setting up your building and publishing flow
+in a Continuous Integration pipeline if you do not have access to machines.
+
+Electron applications can self-update by pointing the autoUpdater module to an update server feed.
+update.electronjs.org is a free update server provided by Electron for open-source applications
+published on GitHub releases. Configuring your Electron app to use this service is as easy as
+installing and importing the `update-electron-app` module.
+
+If your application is not eligible for update.electronjs.org, you should instead deploy your
+own update server and configure the autoUpdater module yourself.
+
+:::info 🌟 You're done!
+
+From here, you have officially completed our tutorial to Electron. Feel free to explore the
+rest of our docs and happy developing! If you have questions, please stop by our community
+[Discord server].
+
+:::
+
+[autoupdater]: ../api/auto-updater.md
+[code-signed]: ./code-signing.md
+[discord server]: https://discord.com/invite/APGC3k5yaH
+[electron fiddle]: https://electronjs.org/fiddle
+[fiddle-build]: https://github.com/electron/fiddle/blob/master/.github/workflows/build.yaml
+[fiddle-forge-config]: https://github.com/electron/fiddle/blob/master/forge.config.js
+[github actions]: https://github.com/features/actions
+[github publisher]: https://www.electronforge.io/config/publishers/github
+[github releases]: https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository
+[git tag]: https://git-scm.com/book/en/v2/Git-Basics-Tagging
+[new-pat]: https://github.com/settings/tokens/new
+[publish command]: https://www.electronforge.io/cli#publish
+[publisher]: https://www.electronforge.io/config/publishers
+[`publishergithubconfig`]: https://js.electronforge.io/publisher/github/interfaces/publishergithubconfig
+[`update-electron-app`]: https://github.com/electron/update-electron-app
+[update-server]: ./updates.md
+
+<!-- Tutorial links -->
+
+[prerequisites]: tutorial-1-prerequisites.md
+[building your first app]: tutorial-2-first-app.md
+[preload]: tutorial-3-preload.md
+[features]: tutorial-4-adding-features.md
+[packaging]: tutorial-5-packaging.md
+[updates]: tutorial-6-publishing-updating.md
diff --git a/docs/tutorial/updates.md b/docs/tutorial/updates.md
index 83174b3e4b747..530d9658d496d 100644
--- a/docs/tutorial/updates.md
+++ b/docs/tutorial/updates.md
@@ -1,11 +1,16 @@
-# Updating Applications
-
-There are several ways to update an Electron application. The easiest and
-officially supported one is taking advantage of the built-in
+---
+title: 'Updating Applications'
+description: "There are several ways to update an Electron application. The easiest and officially supported one is taking advantage of the built-in Squirrel framework and Electron's autoUpdater module."
+slug: updates
+hide_title: false
+---
+
+There are several ways to provide automatic updates to your Electron application.
+The easiest and officially supported one is taking advantage of the built-in
 [Squirrel](https://github.com/Squirrel) framework and
 Electron's [autoUpdater](../api/auto-updater.md) module.
 
-## Using `update.electronjs.org`
+## Using update.electronjs.org
 
 The Electron team maintains [update.electronjs.org], a free and open-source
 webservice that Electron apps can use to self-update. The service is designed
@@ -13,72 +18,77 @@ for Electron apps that meet the following criteria:
 
 - App runs on macOS or Windows
 - App has a public GitHub repository
-- Builds are published to GitHub Releases
-- Builds are code-signed
+- Builds are published to [GitHub Releases][gh-releases]
+- Builds are [code-signed](./code-signing.md)
 
 The easiest way to use this service is by installing [update-electron-app],
 a Node.js module preconfigured for use with update.electronjs.org.
 
-Install the module:
+Install the module using your Node.js package manager of choice:
 
-```sh
+```sh npm2yarn
 npm install update-electron-app
 ```
 
-Invoke the updater from your app's main process file:
+Then, invoke the updater from your app's main process file:
 
-```js
+```js title="main.js"
 require('update-electron-app')()
 ```
 
 By default, this module will check for updates at app startup, then every ten
-minutes. When an update is found, it will automatically be downloaded in the background. When the download completes, a dialog is displayed allowing the user
-to restart the app.
+minutes. When an update is found, it will automatically be downloaded in the background.
+When the download completes, a dialog is displayed allowing the user to restart the app.
 
 If you need to customize your configuration, you can
-[pass options to `update-electron-app`][update-electron-app]
+[pass options to update-electron-app][update-electron-app]
 or
 [use the update service directly][update.electronjs.org].
 
-## Deploying an Update Server
+## Using other update services
 
 If you're developing a private Electron application, or if you're not
 publishing releases to GitHub Releases, it may be necessary to run your own
 update server.
 
+### Step 1: Deploying an update server
+
 Depending on your needs, you can choose from one of these:
 
 - [Hazel][hazel] – Update server for private or open-source apps which can be
-deployed for free on [Vercel][vercel]. It pulls from [GitHub Releases][gh-releases]
-and leverages the power of GitHub's CDN.
+  deployed for free on [Vercel][vercel]. It pulls from [GitHub Releases][gh-releases]
+  and leverages the power of GitHub's CDN.
 - [Nuts][nuts] – Also uses [GitHub Releases][gh-releases], but caches app
-updates on disk and supports private repositories.
+  updates on disk and supports private repositories.
 - [electron-release-server][electron-release-server] – Provides a dashboard for
-handling releases and does not require releases to originate on GitHub.
+  handling releases and does not require releases to originate on GitHub.
 - [Nucleus][nucleus] – A complete update server for Electron apps maintained by
-Atlassian. Supports multiple applications and channels; uses a static file store
-to minify server cost.
+  Atlassian. Supports multiple applications and channels; uses a static file store
+  to minify server cost.
+
+Once you've deployed your update server, you can instrument your app code to receive and
+apply the updates with Electron's [autoUpdater] module.
 
-## Implementing Updates in Your App
+### Step 2: Receiving updates in your app
 
-Once you've deployed your update server, continue with importing the required
-modules in your code. The following code might vary for different server
-software, but it works like described when using
-[Hazel][hazel].
+First, import the required modules in your main process code. The following code might
+vary for different server software, but it works like described when using [Hazel][hazel].
 
-**Important:** Please ensure that the code below will only be executed in
-your packaged app, and not in development. You can use
-[electron-is-dev](https://github.com/sindresorhus/electron-is-dev) to check for
-the environment.
+:::warning Check your execution environment!
 
-```javascript
+Please ensure that the code below will only be executed in your packaged app, and not in development.
+You can use the [app.isPackaged](../api/app.md#appispackaged-readonly) API to check the environment.
+
+:::
+
+```javascript title='main.js'
 const { app, autoUpdater, dialog } = require('electron')
 ```
 
-Next, construct the URL of the update server and tell
+Next, construct the URL of the update server feed and tell
 [autoUpdater](../api/auto-updater.md) about it:
 
-```javascript
+```javascript title='main.js'
 const server = 'https://your-deployment-url.com'
 const url = `${server}/update/${process.platform}/${app.getVersion()}`
 
@@ -87,32 +97,32 @@ autoUpdater.setFeedURL({ url })
 
 As the final step, check for updates. The example below will check every minute:
 
-```javascript
+```javascript title='main.js'
 setInterval(() => {
   autoUpdater.checkForUpdates()
 }, 60000)
 ```
 
-Once your application is [packaged](../tutorial/application-distribution.md),
+Once your application is [packaged](./application-distribution.md),
 it will receive an update for each new
 [GitHub Release](https://help.github.com/articles/creating-releases/) that you
 publish.
 
-## Applying Updates
+### Step 3: Notifying users when updates are available
 
 Now that you've configured the basic update mechanism for your application, you
 need to ensure that the user will get notified when there's an update. This
-can be achieved using the autoUpdater API
-[events](../api/auto-updater.md#events):
+can be achieved using the [autoUpdater API events](../api/auto-updater.md#events):
 
-```javascript
+```javascript title="main.js"
 autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
   const dialogOpts = {
     type: 'info',
     buttons: ['Restart', 'Later'],
     title: 'Application Update',
     message: process.platform === 'win32' ? releaseNotes : releaseName,
-    detail: 'A new version has been downloaded. Restart the application to apply the updates.'
+    detail:
+      'A new version has been downloaded. Restart the application to apply the updates.',
   }
 
   dialog.showMessageBox(dialogOpts).then((returnValue) => {
@@ -125,16 +135,22 @@ Also make sure that errors are
 [being handled](../api/auto-updater.md#event-error). Here's an example
 for logging them to `stderr`:
 
-```javascript
-autoUpdater.on('error', message => {
+```javascript title="main.js"
+autoUpdater.on('error', (message) => {
   console.error('There was a problem updating the application')
   console.error(message)
 })
 ```
 
-## Handling Updates Manually
+:::info Handling updates manually
+
+Because the requests made by autoUpdate aren't under your direct control, you may find situations
+that are difficult to handle (such as if the update server is behind authentication). The `url`
+field supports the `file://` protocol, which means that with some effort, you can sidestep the
+server-communication aspect of the process by loading your update from a local directory.
+[Here's an example of how this could work](https://github.com/electron/electron/issues/5020#issuecomment-477636990).
 
-Because the requests made by Auto Update aren't under your direct control, you may find situations that are difficult to handle (such as if the update server is behind authentication). The `url` field does support files, which means that with some effort, you can sidestep the server-communication aspect of the process. [Here's an example of how this could work](https://github.com/electron/electron/issues/5020#issuecomment-477636990).
+:::
 
 [vercel]: https://vercel.com
 [hazel]: https://github.com/vercel/hazel

From 218797eb61375a18b6126dfc9f511759585da84d Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jv@jviotti.com>
Date: Wed, 22 Jun 2022 04:18:12 -0400
Subject: [PATCH 515/811] fix: allow macOS debug builds to be built (#34536)

Extending the `testing` GN profile with the arguments documented to
allow breakpoint debugging
(https://www.electronjs.org/docs/latest/development/debugging#breakpoint-debugging)
doesn't quite work on macOS:

```sh
is_debug = true
symbol_level = 2
forbid_non_component_debug_builds = false
```

The build eventually fails on both Intel and Apple Silicon with the
following (summarized) error:

```sh
[S:41062 R:1 (41062:41247) (C/s:0.1 O/s:13.6)] SOLINK 'obj/electron/electron_framework_shared_library/Electron Framework' 'obj/electron/electron_framework_shared_library/Electron Framework.TOC'
FAILED: obj/electron/electron_framework_shared_library/Electron Framework obj/electron/electron_framework_shared_library/Electron Framework.TOC
...
Undefined symbols for architecture x86_64:
  "platform_util::GetViewForWindow(gfx::NativeWindow)", referenced from:
      BoundsOverlapWithAnyOpenPrompt(gfx::Rect const&, content::WebContents*) in libchrome.a(autofill_popup_view_utils.o)
  "platform_util::GetParent(gfx::NativeView)", referenced from:
      BoundsOverlapWithAnyOpenPrompt(gfx::Rect const&, content::WebContents*) in libchrome.a(autofill_popup_view_utils.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
...
```

This symbol is defined on a file that is not declared as a dependency of
`libchrome` on the GN definitions. Why the problem is not reproducible
on plain testing or release builds remains a mystery to me. I'm guessing
some non-debug path somewhere in the GN definitions does eventually
require that file.

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
---
 chromium_src/BUILD.gn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index f5a8939902246..ffd4dacca88e2 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -92,6 +92,7 @@ static_library("chrome") {
       "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
       "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
       "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
+      "//chrome/browser/platform_util_mac.mm",
       "//chrome/browser/process_singleton_mac.mm",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",

From f172136752d2ad246733555339a1a7f97c87012b Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 22 Jun 2022 10:18:42 +0200
Subject: [PATCH 516/811] chore: remove undocumented page-title-set webview
 event (#34533)

---
 lib/renderer/web-view/guest-view-internal.ts |  8 --------
 spec/webview-spec.js                         | 12 ------------
 2 files changed, 20 deletions(-)

diff --git a/lib/renderer/web-view/guest-view-internal.ts b/lib/renderer/web-view/guest-view-internal.ts
index d8b9b61c135f6..97b1ae6fea396 100644
--- a/lib/renderer/web-view/guest-view-internal.ts
+++ b/lib/renderer/web-view/guest-view-internal.ts
@@ -9,10 +9,6 @@ export interface GuestViewDelegate {
   reset(): void;
 }
 
-const DEPRECATED_EVENTS: Record<string, string> = {
-  'page-title-updated': 'page-title-set'
-} as const;
-
 export function registerEvents (viewInstanceId: number, delegate: GuestViewDelegate) {
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`, function () {
     delegate.reset();
@@ -20,10 +16,6 @@ export function registerEvents (viewInstanceId: number, delegate: GuestViewDeleg
   });
 
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`, function (event, eventName, props) {
-    if (DEPRECATED_EVENTS[eventName] != null) {
-      delegate.dispatchEvent(DEPRECATED_EVENTS[eventName], props);
-    }
-
     delegate.dispatchEvent(eventName, props);
   });
 }
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index c703c57c8cec6..ff0f9c7964d68 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -566,18 +566,6 @@ describe('<webview> tag', function () {
     });
   });
 
-  describe('page-title-set event', () => {
-    it('emits when title is set', async () => {
-      loadWebView(webview, {
-        src: `file://${fixtures}/pages/a.html`
-      });
-      const { title, explicitSet } = await waitForEvent(webview, 'page-title-set');
-
-      expect(title).to.equal('test');
-      expect(explicitSet).to.be.true();
-    });
-  });
-
   describe('page-favicon-updated event', () => {
     it('emits when favicon urls are received', async () => {
       loadWebView(webview, {

From 5fee5b0e223aa73ddb118646431b6f4330135208 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 22 Jun 2022 03:23:11 -0700
Subject: [PATCH 517/811] chore: chunk filenames when linting C++ files
 (#34237)

* chore: chunk filenames when linting C++ files

* chore: refactor code for better readability

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

* chore: further tweak

* chore: limit all platforms to 4095 characters on command line

* chore: use python3

* Revert "chore: use python3"

Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
---
 script/lib/utils.js      | 29 +++++++++++++++++++++++++++++
 script/lint.js           | 11 ++++++-----
 script/run-clang-tidy.ts | 29 ++---------------------------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/script/lib/utils.js b/script/lib/utils.js
index 55f678b43ed1c..44c81dc86aca0 100644
--- a/script/lib/utils.js
+++ b/script/lib/utils.js
@@ -1,5 +1,6 @@
 const { GitProcess } = require('dugite');
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 
 const ELECTRON_DIR = path.resolve(__dirname, '..', '..');
@@ -95,7 +96,35 @@ async function getCurrentBranch (gitDir) {
   return branch.trim();
 }
 
+function chunkFilenames (filenames, offset = 0) {
+  // Windows has a max command line length of 2047 characters, so we can't
+  // provide too many filenames without going over that. To work around that,
+  // chunk up a list of filenames such that it won't go over that limit when
+  // used as args. Other platforms may have higher limits, but 4095 might be
+  // the limit on Linux systems according to `termios(3)`, so cap it there.
+  const MAX_FILENAME_ARGS_LENGTH =
+    (os.platform() === 'win32' ? 2047 : 4095) - offset;
+
+  return filenames.reduce(
+    (chunkedFilenames, filename) => {
+      const currChunk = chunkedFilenames[chunkedFilenames.length - 1];
+      const currChunkLength = currChunk.reduce(
+        (totalLength, _filename) => totalLength + _filename.length + 1,
+        0
+      );
+      if (currChunkLength + filename.length + 1 > MAX_FILENAME_ARGS_LENGTH) {
+        chunkedFilenames.push([filename]);
+      } else {
+        currChunk.push(filename);
+      }
+      return chunkedFilenames;
+    },
+    [[]]
+  );
+}
+
 module.exports = {
+  chunkFilenames,
   getCurrentBranch,
   getElectronExec,
   getOutDir,
diff --git a/script/lint.js b/script/lint.js
index 42b1abf1f09ed..839215ee35e84 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -9,6 +9,8 @@ const klaw = require('klaw');
 const minimist = require('minimist');
 const path = require('path');
 
+const { chunkFilenames } = require('./lib/utils');
+
 const ELECTRON_ROOT = path.normalize(path.dirname(__dirname));
 const SOURCE_ROOT = path.resolve(ELECTRON_ROOT, '..');
 const DEPOT_TOOLS = path.resolve(SOURCE_ROOT, 'third_party', 'depot_tools');
@@ -69,12 +71,11 @@ const LINTERS = [{
   roots: ['shell'],
   test: filename => filename.endsWith('.cc') || (filename.endsWith('.h') && !isObjCHeader(filename)),
   run: (opts, filenames) => {
-    if (opts.fix) {
-      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', '--fix', ...filenames]);
-    } else {
-      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', '-r', ...filenames]);
+    const clangFormatFlags = opts.fix ? ['--fix'] : [];
+    for (const chunk of chunkFilenames(filenames)) {
+      spawnAndCheckExitCode('python3', ['script/run-clang-format.py', ...clangFormatFlags, ...chunk]);
+      cpplint(chunk);
     }
-    cpplint(filenames);
   }
 }, {
   key: 'objc',
diff --git a/script/run-clang-tidy.ts b/script/run-clang-tidy.ts
index 93d1a13f72497..86dba04f2e849 100644
--- a/script/run-clang-tidy.ts
+++ b/script/run-clang-tidy.ts
@@ -9,6 +9,8 @@ import * as streamJson from 'stream-json';
 import { ignore as streamJsonIgnore } from 'stream-json/filters/Ignore';
 import { streamArray as streamJsonStreamArray } from 'stream-json/streamers/StreamArray';
 
+import { chunkFilenames } from './lib/utils';
+
 const SOURCE_ROOT = path.normalize(path.dirname(__dirname));
 const LLVM_BIN = path.resolve(
   SOURCE_ROOT,
@@ -108,33 +110,6 @@ function getDepotToolsEnv (): NodeJS.ProcessEnv {
   return depotToolsEnv;
 }
 
-function chunkFilenames (filenames: string[], offset: number = 0): string[][] {
-  // Windows has a max command line length of 2047 characters, so we can't
-  // provide too many filenames without going over that. To work around that,
-  // chunk up a list of filenames such that it won't go over that limit when
-  // used as args. Use a much higher limit on other platforms which will
-  // effectively be a no-op.
-  const MAX_FILENAME_ARGS_LENGTH =
-    PLATFORM === 'win32' ? 2047 - offset : 100 * 1024;
-
-  return filenames.reduce(
-    (chunkedFilenames: string[][], filename) => {
-      const currChunk = chunkedFilenames[chunkedFilenames.length - 1];
-      const currChunkLength = currChunk.reduce(
-        (totalLength, _filename) => totalLength + _filename.length + 1,
-        0
-      );
-      if (currChunkLength + filename.length + 1 > MAX_FILENAME_ARGS_LENGTH) {
-        chunkedFilenames.push([filename]);
-      } else {
-        currChunk.push(filename);
-      }
-      return chunkedFilenames;
-    },
-    [[]]
-  );
-}
-
 async function runClangTidy (
   outDir: string,
   filenames: string[],

From e3243ad11384b938042a54adcce3a4a767495e44 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 22 Jun 2022 06:00:53 -0700
Subject: [PATCH 518/811] Bump v21.0.0-nightly.20220622

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 753d7f773d16e..3c1431facc4d2 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220621
\ No newline at end of file
+21.0.0-nightly.20220622
\ No newline at end of file
diff --git a/package.json b/package.json
index 7ebc2a8524b6e..6cb997f0a915f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220621",
+  "version": "21.0.0-nightly.20220622",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index bb0aef7158c1c..1dfd4579ddd21 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220621
- PRODUCTVERSION 21,0,0,20220621
+ FILEVERSION 21,0,0,20220622
+ PRODUCTVERSION 21,0,0,20220622
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 58952962395523621573da31673de72173a433bd Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 10:37:32 -0700
Subject: [PATCH 519/811] test: disable flaky transparent window test (#34660)

---
 spec-main/api-browser-window-spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index f2682e70482a6..a7b3cc87dd9a3 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2063,7 +2063,8 @@ describe('BrowserWindow module', () => {
       }).to.not.throw();
     });
 
-    it('Allows setting a transparent window via CSS', async () => {
+    // TODO(nornagon): disabled due to flakiness.
+    it.skip('Allows setting a transparent window via CSS', async () => {
       const appPath = path.join(__dirname, 'fixtures', 'apps', 'background-color-transparent');
 
       appProcess = childProcess.spawn(process.execPath, [appPath], {

From cd19a741b1a1cbd0ab7560314f1a77bed922bddb Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 10:37:58 -0700
Subject: [PATCH 520/811] chore: modernize base::Value usage in
 shell/renderer/printing (#34682)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .../printing/print_render_frame_helper_delegate.cc        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/shell/renderer/printing/print_render_frame_helper_delegate.cc b/shell/renderer/printing/print_render_frame_helper_delegate.cc
index ab952cd6e009d..c104cb145d5fd 100644
--- a/shell/renderer/printing/print_render_frame_helper_delegate.cc
+++ b/shell/renderer/printing/print_render_frame_helper_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "shell/renderer/printing/print_render_frame_helper_delegate.h"
 
+#include <utility>
+
 #include "content/public/renderer/render_frame.h"
 #include "extensions/buildflags/buildflags.h"
 #include "third_party/blink/public/web/web_element.h"
@@ -49,9 +51,9 @@ bool PrintRenderFrameHelperDelegate::OverridePrint(
     // instructs the PDF plugin to print. This is to make window.print() on a
     // PDF plugin document correctly print the PDF. See
     // https://crbug.com/448720.
-    base::DictionaryValue message;
-    message.SetString("type", "print");
-    post_message_support->PostMessageFromValue(message);
+    base::Value::Dict message;
+    message.Set("type", "print");
+    post_message_support->PostMessageFromValue(base::Value(std::move(message)));
     return true;
   }
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)

From 11924bdbb271a1db97d4fe4666935bca435ceb0d Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 22 Jun 2022 23:28:41 -0700
Subject: [PATCH 521/811] chore: modernize ListValue usage in dict_util.mm and
 related files (#34661)

* chore: modernize ListValue usage in dict_util.mm and related files

* use base::Value::{Dict,List} instead of raw base::Value

* fix compile

* fix build

* fix build again
---
 shell/browser/api/electron_api_app.cc         | 19 ++++----
 shell/browser/api/electron_api_app.h          | 18 ++++---
 .../api/electron_api_system_preferences.h     |  4 +-
 .../electron_api_system_preferences_mac.mm    | 48 ++++++++++---------
 .../electron_api_system_preferences_win.cc    |  3 +-
 shell/browser/browser.cc                      |  4 +-
 shell/browser/browser.h                       | 10 ++--
 shell/browser/browser_mac.mm                  | 23 +++++----
 shell/browser/browser_observer.h              | 18 ++++---
 shell/browser/electron_browser_main_parts.cc  |  2 +-
 shell/browser/mac/dict_util.h                 | 13 ++---
 shell/browser/mac/dict_util.mm                | 37 +++++++-------
 shell/browser/mac/electron_application.mm     |  8 ++--
 .../mac/electron_application_delegate.mm      |  6 +--
 14 files changed, 106 insertions(+), 107 deletions(-)
 mode change 100755 => 100644 shell/browser/browser.h

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 975cb94a33d57..77281437ef32b 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -706,13 +706,13 @@ void App::OnWillFinishLaunching() {
   Emit("will-finish-launching");
 }
 
-void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
+void App::OnFinishLaunching(base::Value::Dict launch_info) {
 #if BUILDFLAG(IS_LINUX)
   // Set the application name for audio streams shown in external
   // applications. Only affects pulseaudio currently.
   media::AudioManager::SetGlobalAppName(Browser::Get()->GetName());
 #endif
-  Emit("ready", launch_info);
+  Emit("ready", base::Value(std::move(launch_info)));
 }
 
 void App::OnPreMainMessageLoopRun() {
@@ -756,22 +756,23 @@ void App::OnDidFailToContinueUserActivity(const std::string& type,
 
 void App::OnContinueUserActivity(bool* prevent_default,
                                  const std::string& type,
-                                 const base::DictionaryValue& user_info,
-                                 const base::DictionaryValue& details) {
-  if (Emit("continue-activity", type, user_info, details)) {
+                                 base::Value::Dict user_info,
+                                 base::Value::Dict details) {
+  if (Emit("continue-activity", type, base::Value(std::move(user_info)),
+           base::Value(std::move(details)))) {
     *prevent_default = true;
   }
 }
 
 void App::OnUserActivityWasContinued(const std::string& type,
-                                     const base::DictionaryValue& user_info) {
-  Emit("activity-was-continued", type, user_info);
+                                     base::Value::Dict user_info) {
+  Emit("activity-was-continued", type, base::Value(std::move(user_info)));
 }
 
 void App::OnUpdateUserActivityState(bool* prevent_default,
                                     const std::string& type,
-                                    const base::DictionaryValue& user_info) {
-  if (Emit("update-activity-state", type, user_info)) {
+                                    base::Value::Dict user_info) {
+  if (Emit("update-activity-state", type, base::Value(std::move(user_info)))) {
     *prevent_default = true;
   }
 }
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index d7ff219e0871f..c253088deb64d 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -96,7 +96,7 @@ class App : public ElectronBrowserClient::Delegate,
   void OnOpenURL(const std::string& url) override;
   void OnActivate(bool has_visible_windows) override;
   void OnWillFinishLaunching() override;
-  void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
+  void OnFinishLaunching(base::Value::Dict launch_info) override;
   void OnAccessibilitySupportChanged() override;
   void OnPreMainMessageLoopRun() override;
   void OnPreCreateThreads() override;
@@ -107,15 +107,13 @@ class App : public ElectronBrowserClient::Delegate,
                                        const std::string& error) override;
   void OnContinueUserActivity(bool* prevent_default,
                               const std::string& type,
-                              const base::DictionaryValue& user_info,
-                              const base::DictionaryValue& details) override;
-  void OnUserActivityWasContinued(
-      const std::string& type,
-      const base::DictionaryValue& user_info) override;
-  void OnUpdateUserActivityState(
-      bool* prevent_default,
-      const std::string& type,
-      const base::DictionaryValue& user_info) override;
+                              base::Value::Dict user_info,
+                              base::Value::Dict details) override;
+  void OnUserActivityWasContinued(const std::string& type,
+                                  base::Value::Dict user_info) override;
+  void OnUpdateUserActivityState(bool* prevent_default,
+                                 const std::string& type,
+                                 base::Value::Dict user_info) override;
   void OnNewWindowForTab() override;
   void OnDidBecomeActive() override;
 #endif
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index a254e553244a6..24096cd05cad2 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -67,11 +67,11 @@ class SystemPreferences
   void OnSysColorChange() override;
 
   // BrowserObserver:
-  void OnFinishLaunching(const base::DictionaryValue& launch_info) override;
+  void OnFinishLaunching(base::Value::Dict launch_info) override;
 
 #elif BUILDFLAG(IS_MAC)
   using NotificationCallback = base::RepeatingCallback<
-      void(const std::string&, base::DictionaryValue, const std::string&)>;
+      void(const std::string&, base::Value, const std::string&)>;
 
   void PostNotification(const std::string& name,
                         base::DictionaryValue user_info,
diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm
index dda1e63c9ee7f..371bf33af94ae 100644
--- a/shell/browser/api/electron_api_system_preferences_mac.mm
+++ b/shell/browser/api/electron_api_system_preferences_mac.mm
@@ -147,10 +147,11 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 
   NSDistributedNotificationCenter* center =
       [NSDistributedNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)
-            deliverImmediately:immediate];
+  [center
+      postNotificationName:base::SysUTF8ToNSString(name)
+                    object:nil
+                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())
+        deliverImmediately:immediate];
 }
 
 int SystemPreferences::SubscribeNotification(
@@ -169,9 +170,10 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 void SystemPreferences::PostLocalNotification(const std::string& name,
                                               base::DictionaryValue user_info) {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  [center
+      postNotificationName:base::SysUTF8ToNSString(name)
+                    object:nil
+                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
 }
 
 int SystemPreferences::SubscribeLocalNotification(
@@ -191,9 +193,10 @@ AVMediaType ParseMediaType(const std::string& media_type) {
     base::DictionaryValue user_info) {
   NSNotificationCenter* center =
       [[NSWorkspace sharedWorkspace] notificationCenter];
-  [center postNotificationName:base::SysUTF8ToNSString(name)
-                        object:nil
-                      userInfo:DictionaryValueToNSDictionary(user_info)];
+  [center
+      postNotificationName:base::SysUTF8ToNSString(name)
+                    object:nil
+                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
 }
 
 int SystemPreferences::SubscribeWorkspaceNotification(
@@ -240,7 +243,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
                 if (notification.userInfo) {
                   copied_callback.Run(
                       base::SysNSStringToUTF8(notification.name),
-                      NSDictionaryToDictionaryValue(notification.userInfo),
+                      base::Value(NSDictionaryToValue(notification.userInfo)),
                       object);
                 } else {
                   copied_callback.Run(
@@ -282,11 +285,12 @@ AVMediaType ParseMediaType(const std::string& media_type) {
     return gin::ConvertToV8(isolate,
                             net::GURLWithNSURL([defaults URLForKey:key]));
   } else if (type == "array") {
-    return gin::ConvertToV8(isolate,
-                            NSArrayToListValue([defaults arrayForKey:key]));
+    return gin::ConvertToV8(
+        isolate, base::Value(NSArrayToValue([defaults arrayForKey:key])));
   } else if (type == "dictionary") {
-    return gin::ConvertToV8(isolate, NSDictionaryToDictionaryValue(
-                                         [defaults dictionaryForKey:key]));
+    return gin::ConvertToV8(
+        isolate,
+        base::Value(NSDictionaryToValue([defaults dictionaryForKey:key])));
   } else {
     return v8::Undefined(isolate);
   }
@@ -299,7 +303,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
     args->ThrowError();
   } else {
     @try {
-      NSDictionary* dict = DictionaryValueToNSDictionary(value);
+      NSDictionary* dict = DictionaryValueToNSDictionary(value.GetDict());
       for (id key in dict) {
         id value = [dict objectForKey:key];
         if ([value isKindOfClass:[NSNull class]] || value == nil) {
@@ -359,17 +363,17 @@ AVMediaType ParseMediaType(const std::string& media_type) {
       }
     }
   } else if (type == "array") {
-    base::ListValue value;
-    if (args->GetNext(&value)) {
-      if (NSArray* array = ListValueToNSArray(value)) {
+    base::Value value;
+    if (args->GetNext(&value) && value.is_list()) {
+      if (NSArray* array = ListValueToNSArray(value.GetList())) {
         [defaults setObject:array forKey:key];
         return;
       }
     }
   } else if (type == "dictionary") {
-    base::DictionaryValue value;
-    if (args->GetNext(&value)) {
-      if (NSDictionary* dict = DictionaryValueToNSDictionary(value)) {
+    base::Value value;
+    if (args->GetNext(&value) && value.is_dict()) {
+      if (NSDictionary* dict = DictionaryValueToNSDictionary(value.GetDict())) {
         [defaults setObject:dict forKey:key];
         return;
       }
diff --git a/shell/browser/api/electron_api_system_preferences_win.cc b/shell/browser/api/electron_api_system_preferences_win.cc
index ce47c81227ec5..c2d77e941e4fd 100644
--- a/shell/browser/api/electron_api_system_preferences_win.cc
+++ b/shell/browser/api/electron_api_system_preferences_win.cc
@@ -258,8 +258,7 @@ void SystemPreferences::OnSysColorChange() {
   Emit("color-changed");
 }
 
-void SystemPreferences::OnFinishLaunching(
-    const base::DictionaryValue& launch_info) {
+void SystemPreferences::OnFinishLaunching(base::Value::Dict launch_info) {
   color_change_listener_ =
       std::make_unique<gfx::ScopedSysColorChangeListener>(this);
 }
diff --git a/shell/browser/browser.cc b/shell/browser/browser.cc
index e94b1d65c229c..959b2cc3ec447 100644
--- a/shell/browser/browser.cc
+++ b/shell/browser/browser.cc
@@ -184,7 +184,7 @@ void Browser::WillFinishLaunching() {
     observer.OnWillFinishLaunching();
 }
 
-void Browser::DidFinishLaunching(base::DictionaryValue launch_info) {
+void Browser::DidFinishLaunching(base::Value::Dict launch_info) {
   // Make sure the userData directory is created.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   base::FilePath user_data;
@@ -196,7 +196,7 @@ void Browser::DidFinishLaunching(base::DictionaryValue launch_info) {
     ready_promise_->Resolve();
   }
   for (BrowserObserver& observer : observers_)
-    observer.OnFinishLaunching(launch_info);
+    observer.OnFinishLaunching(launch_info.Clone());
 }
 
 v8::Local<v8::Value> Browser::WhenReady(v8::Isolate* isolate) {
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
old mode 100755
new mode 100644
index c56cc3ce84cd0..aaae1b774f3fd
--- a/shell/browser/browser.h
+++ b/shell/browser/browser.h
@@ -191,16 +191,16 @@ class Browser : public WindowListObserver {
 
   // Resumes an activity via hand-off.
   bool ContinueUserActivity(const std::string& type,
-                            base::DictionaryValue user_info,
-                            base::DictionaryValue details);
+                            base::Value::Dict user_info,
+                            base::Value::Dict details);
 
   // Indicates that an activity was continued on another device.
   void UserActivityWasContinued(const std::string& type,
-                                base::DictionaryValue user_info);
+                                base::Value::Dict user_info);
 
   // Gives an opportunity to update the Handoff payload.
   bool UpdateUserActivityState(const std::string& type,
-                               base::DictionaryValue user_info);
+                               base::Value::Dict user_info);
 
   // Bounce the dock icon.
   enum class BounceType{
@@ -288,7 +288,7 @@ class Browser : public WindowListObserver {
 
   // Tell the application the loading has been done.
   void WillFinishLaunching();
-  void DidFinishLaunching(base::DictionaryValue launch_info);
+  void DidFinishLaunching(base::Value::Dict launch_info);
 
   void OnAccessibilitySupportChanged();
 
diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index 9821e0b0a3803..f155160f55fbe 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -242,7 +242,7 @@
 
   [[AtomApplication sharedApplication]
       setCurrentActivity:base::SysUTF8ToNSString(type)
-            withUserInfo:DictionaryValueToNSDictionary(user_info)
+            withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())
           withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
 }
 
@@ -264,7 +264,7 @@
                                     base::DictionaryValue user_info) {
   [[AtomApplication sharedApplication]
       updateCurrentActivity:base::SysUTF8ToNSString(type)
-               withUserInfo:DictionaryValueToNSDictionary(user_info)];
+               withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
 }
 
 bool Browser::WillContinueUserActivity(const std::string& type) {
@@ -281,25 +281,27 @@
 }
 
 bool Browser::ContinueUserActivity(const std::string& type,
-                                   base::DictionaryValue user_info,
-                                   base::DictionaryValue details) {
+                                   base::Value::Dict user_info,
+                                   base::Value::Dict details) {
   bool prevent_default = false;
   for (BrowserObserver& observer : observers_)
-    observer.OnContinueUserActivity(&prevent_default, type, user_info, details);
+    observer.OnContinueUserActivity(&prevent_default, type, user_info.Clone(),
+                                    details.Clone());
   return prevent_default;
 }
 
 void Browser::UserActivityWasContinued(const std::string& type,
-                                       base::DictionaryValue user_info) {
+                                       base::Value::Dict user_info) {
   for (BrowserObserver& observer : observers_)
-    observer.OnUserActivityWasContinued(type, user_info);
+    observer.OnUserActivityWasContinued(type, user_info.Clone());
 }
 
 bool Browser::UpdateUserActivityState(const std::string& type,
-                                      base::DictionaryValue user_info) {
+                                      base::Value::Dict user_info) {
   bool prevent_default = false;
   for (BrowserObserver& observer : observers_)
-    observer.OnUpdateUserActivityState(&prevent_default, type, user_info);
+    observer.OnUpdateUserActivityState(&prevent_default, type,
+                                       user_info.Clone());
   return prevent_default;
 }
 
@@ -486,7 +488,8 @@ void RemoveFromLoginItems() {
 }
 
 void Browser::ShowAboutPanel() {
-  NSDictionary* options = DictionaryValueToNSDictionary(about_panel_options_);
+  NSDictionary* options =
+      DictionaryValueToNSDictionary(about_panel_options_.GetDict());
 
   // Credits must be a NSAttributedString instead of NSString
   NSString* credits = (NSString*)options[@"Credits"];
diff --git a/shell/browser/browser_observer.h b/shell/browser/browser_observer.h
index 03d252d3c70f2..16576a1e586a8 100644
--- a/shell/browser/browser_observer.h
+++ b/shell/browser/browser_observer.h
@@ -47,7 +47,7 @@ class BrowserObserver : public base::CheckedObserver {
 
   // The browser has finished loading.
   virtual void OnWillFinishLaunching() {}
-  virtual void OnFinishLaunching(const base::DictionaryValue& launch_info) {}
+  virtual void OnFinishLaunching(base::Value::Dict launch_info) {}
 
   // The browser's accessibility support has changed.
   virtual void OnAccessibilitySupportChanged() {}
@@ -70,17 +70,15 @@ class BrowserObserver : public base::CheckedObserver {
   // The browser wants to resume a user activity via handoff. (macOS only)
   virtual void OnContinueUserActivity(bool* prevent_default,
                                       const std::string& type,
-                                      const base::DictionaryValue& user_info,
-                                      const base::DictionaryValue& details) {}
+                                      base::Value::Dict user_info,
+                                      base::Value::Dict details) {}
   // The browser wants to notify that an user activity was resumed. (macOS only)
-  virtual void OnUserActivityWasContinued(
-      const std::string& type,
-      const base::DictionaryValue& user_info) {}
+  virtual void OnUserActivityWasContinued(const std::string& type,
+                                          base::Value::Dict user_info) {}
   // The browser wants to update an user activity payload. (macOS only)
-  virtual void OnUpdateUserActivityState(
-      bool* prevent_default,
-      const std::string& type,
-      const base::DictionaryValue& user_info) {}
+  virtual void OnUpdateUserActivityState(bool* prevent_default,
+                                         const std::string& type,
+                                         base::Value::Dict user_info) {}
   // User clicked the native macOS new tab button. (macOS only)
   virtual void OnNewWindowForTab() {}
 
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index dd5f187ce9ed5..b4747f06824a6 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -453,7 +453,7 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
 #if !BUILDFLAG(IS_MAC)
   // The corresponding call in macOS is in ElectronApplicationDelegate.
   Browser::Get()->WillFinishLaunching();
-  Browser::Get()->DidFinishLaunching(base::DictionaryValue());
+  Browser::Get()->DidFinishLaunching(base::Value::Dict());
 #endif
 
   // Notify observers that main thread message loop was initialized.
diff --git a/shell/browser/mac/dict_util.h b/shell/browser/mac/dict_util.h
index 13b3bed0d9762..88ce5e58fe80b 100644
--- a/shell/browser/mac/dict_util.h
+++ b/shell/browser/mac/dict_util.h
@@ -7,17 +7,14 @@
 
 #import <Foundation/Foundation.h>
 
-namespace base {
-class ListValue;
-class DictionaryValue;
-}  // namespace base
+#include "base/values.h"
 
 namespace electron {
 
-NSArray* ListValueToNSArray(const base::ListValue& value);
-base::ListValue NSArrayToListValue(NSArray* arr);
-NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value);
-base::DictionaryValue NSDictionaryToDictionaryValue(NSDictionary* dict);
+NSArray* ListValueToNSArray(const base::Value::List& value);
+base::Value::List NSArrayToValue(NSArray* arr);
+NSDictionary* DictionaryValueToNSDictionary(const base::Value::Dict& value);
+base::Value::Dict NSDictionaryToValue(NSDictionary* dict);
 
 }  // namespace electron
 
diff --git a/shell/browser/mac/dict_util.mm b/shell/browser/mac/dict_util.mm
index d48ecb13daf4a..1d31185bc5a2a 100644
--- a/shell/browser/mac/dict_util.mm
+++ b/shell/browser/mac/dict_util.mm
@@ -12,9 +12,9 @@
 
 namespace electron {
 
-NSArray* ListValueToNSArray(const base::ListValue& value) {
+NSArray* ListValueToNSArray(const base::Value::List& value) {
   std::string json;
-  if (!base::JSONWriter::Write(value, &json))
+  if (!base::JSONWriter::Write(base::Value(value.Clone()), &json))
     return nil;
   NSData* jsonData = [NSData dataWithBytes:json.c_str() length:json.length()];
   id obj = [NSJSONSerialization JSONObjectWithData:jsonData
@@ -25,8 +25,8 @@
   return obj;
 }
 
-base::ListValue NSArrayToListValue(NSArray* arr) {
-  base::ListValue result;
+base::Value::List NSArrayToValue(NSArray* arr) {
+  base::Value::List result;
   if (!arr)
     return result;
 
@@ -44,9 +44,9 @@
       else
         result.Append([value intValue]);
     } else if ([value isKindOfClass:[NSArray class]]) {
-      result.Append(NSArrayToListValue(value));
+      result.Append(NSArrayToValue(value));
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      result.Append(NSDictionaryToDictionaryValue(value));
+      result.Append(NSDictionaryToValue(value));
     } else {
       result.Append(base::SysNSStringToUTF8([value description]));
     }
@@ -55,10 +55,9 @@
   return result;
 }
 
-NSDictionary* DictionaryValueToNSDictionary(
-    const base::DictionaryValue& value) {
+NSDictionary* DictionaryValueToNSDictionary(const base::Value::Dict& value) {
   std::string json;
-  if (!base::JSONWriter::Write(value, &json))
+  if (!base::JSONWriter::Write(base::Value(value.Clone()), &json))
     return nil;
   NSData* jsonData = [NSData dataWithBytes:json.c_str() length:json.length()];
   id obj = [NSJSONSerialization JSONObjectWithData:jsonData
@@ -69,8 +68,8 @@
   return obj;
 }
 
-base::DictionaryValue NSDictionaryToDictionaryValue(NSDictionary* dict) {
-  base::DictionaryValue result;
+base::Value::Dict NSDictionaryToValue(NSDictionary* dict) {
+  base::Value::Dict result;
   if (!dict)
     return result;
 
@@ -80,24 +79,24 @@
 
     id value = [dict objectForKey:key];
     if ([value isKindOfClass:[NSString class]]) {
-      result.SetKey(str_key, base::Value(base::SysNSStringToUTF8(value)));
+      result.Set(str_key, base::Value(base::SysNSStringToUTF8(value)));
     } else if ([value isKindOfClass:[NSNumber class]]) {
       const char* objc_type = [value objCType];
       if (strcmp(objc_type, @encode(BOOL)) == 0 ||
           strcmp(objc_type, @encode(char)) == 0)
-        result.SetKey(str_key, base::Value([value boolValue]));
+        result.Set(str_key, base::Value([value boolValue]));
       else if (strcmp(objc_type, @encode(double)) == 0 ||
                strcmp(objc_type, @encode(float)) == 0)
-        result.SetKey(str_key, base::Value([value doubleValue]));
+        result.Set(str_key, base::Value([value doubleValue]));
       else
-        result.SetKey(str_key, base::Value([value intValue]));
+        result.Set(str_key, base::Value([value intValue]));
     } else if ([value isKindOfClass:[NSArray class]]) {
-      result.SetKey(str_key, NSArrayToListValue(value));
+      result.Set(str_key, NSArrayToValue(value));
     } else if ([value isKindOfClass:[NSDictionary class]]) {
-      result.SetKey(str_key, NSDictionaryToDictionaryValue(value));
+      result.Set(str_key, NSDictionaryToValue(value));
     } else {
-      result.SetKey(str_key,
-                    base::Value(base::SysNSStringToUTF8([value description])));
+      result.Set(str_key,
+                 base::Value(base::SysNSStringToUTF8([value description])));
     }
   }
 
diff --git a/shell/browser/mac/electron_application.mm b/shell/browser/mac/electron_application.mm
index 468887cb5c4be..d6ff91475e75e 100644
--- a/shell/browser/mac/electron_application.mm
+++ b/shell/browser/mac/electron_application.mm
@@ -120,8 +120,8 @@ - (void)userActivityWillSave:(NSUserActivity*)userActivity {
   dispatch_sync_main(^{
     std::string activity_type(
         base::SysNSStringToUTF8(userActivity.activityType));
-    base::DictionaryValue user_info =
-        electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
+    base::Value::Dict user_info =
+        electron::NSDictionaryToValue(userActivity.userInfo);
 
     electron::Browser* browser = electron::Browser::Get();
     shouldWait =
@@ -149,8 +149,8 @@ - (void)userActivityWasContinued:(NSUserActivity*)userActivity {
   dispatch_async(dispatch_get_main_queue(), ^{
     std::string activity_type(
         base::SysNSStringToUTF8(userActivity.activityType));
-    base::DictionaryValue user_info =
-        electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
+    base::Value::Dict user_info =
+        electron::NSDictionaryToValue(userActivity.userInfo);
 
     electron::Browser* browser = electron::Browser::Get();
     browser->UserActivityWasContinued(activity_type, std::move(user_info));
diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm
index ea7cbde4f3bca..d065eb75e4213 100644
--- a/shell/browser/mac/electron_application_delegate.mm
+++ b/shell/browser/mac/electron_application_delegate.mm
@@ -84,7 +84,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notify {
   }
 
   electron::Browser::Get()->DidFinishLaunching(
-      electron::NSDictionaryToDictionaryValue(notification_info));
+      electron::NSDictionaryToValue(notification_info));
 }
 
 - (void)applicationDidBecomeActive:(NSNotification*)notification {
@@ -128,8 +128,8 @@ - (BOOL)application:(NSApplication*)sender
   electron::Browser* browser = electron::Browser::Get();
   return browser->ContinueUserActivity(
              activity_type,
-             electron::NSDictionaryToDictionaryValue(userActivity.userInfo),
-             electron::NSDictionaryToDictionaryValue(details))
+             electron::NSDictionaryToValue(userActivity.userInfo),
+             electron::NSDictionaryToValue(details))
              ? YES
              : NO;
 }

From 106aa0e9228250015eef99eaa9063bafa9fc187b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 06:00:50 -0700
Subject: [PATCH 522/811] Bump v21.0.0-nightly.20220623

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3c1431facc4d2..3d2a3d64ff0c7 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220622
\ No newline at end of file
+21.0.0-nightly.20220623
\ No newline at end of file
diff --git a/package.json b/package.json
index 6cb997f0a915f..22754254adfd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220622",
+  "version": "21.0.0-nightly.20220623",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1dfd4579ddd21..f6686ef18cde5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220622
- PRODUCTVERSION 21,0,0,20220622
+ FILEVERSION 21,0,0,20220623
+ PRODUCTVERSION 21,0,0,20220623
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3b881e4a132742b30e2f7a61203c1bfec5b81364 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 23 Jun 2022 19:08:32 +0200
Subject: [PATCH 523/811] fix: WCO respects maximizable/closable/minimizable
 (#34677)

---
 shell/browser/native_window_views.cc          | 15 +++++++++++++
 .../ui/views/win_caption_button_container.cc  | 21 ++++++++++++++++++-
 .../ui/views/win_caption_button_container.h   | 10 ++++-----
 shell/browser/ui/views/win_frame_view.h       |  4 ++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 1f4f316048bac..f33a3705cf031 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -876,6 +876,11 @@ bool NativeWindowViews::IsMovable() {
 void NativeWindowViews::SetMinimizable(bool minimizable) {
 #if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
+  if (titlebar_overlay_enabled()) {
+    auto* frame_view =
+        static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
+    frame_view->caption_button_container()->UpdateButtons();
+  }
 #endif
   minimizable_ = minimizable;
 }
@@ -891,6 +896,11 @@ bool NativeWindowViews::IsMinimizable() {
 void NativeWindowViews::SetMaximizable(bool maximizable) {
 #if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
+  if (titlebar_overlay_enabled()) {
+    auto* frame_view =
+        static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
+    frame_view->caption_button_container()->UpdateButtons();
+  }
 #endif
   maximizable_ = maximizable;
 }
@@ -926,6 +936,11 @@ void NativeWindowViews::SetClosable(bool closable) {
   } else {
     EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
   }
+  if (titlebar_overlay_enabled()) {
+    auto* frame_view =
+        static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
+    frame_view->caption_button_container()->UpdateButtons();
+  }
 #endif
 }
 
diff --git a/shell/browser/ui/views/win_caption_button_container.cc b/shell/browser/ui/views/win_caption_button_container.cc
index 9995c9741279c..62ce6d9e5b880 100644
--- a/shell/browser/ui/views/win_caption_button_container.cc
+++ b/shell/browser/ui/views/win_caption_button_container.cc
@@ -148,11 +148,30 @@ void WinCaptionButtonContainer::UpdateButtons() {
   restore_button_->SetVisible(is_maximized);
   maximize_button_->SetVisible(!is_maximized);
 
+  const bool minimizable = frame_view_->window()->IsMinimizable();
+  minimize_button_->SetEnabled(minimizable);
+
   // In touch mode, windows cannot be taken out of fullscreen or tiled mode, so
   // the maximize/restore button should be disabled.
   const bool is_touch = ui::TouchUiController::Get()->touch_ui();
   restore_button_->SetEnabled(!is_touch);
-  maximize_button_->SetEnabled(!is_touch);
+
+  // The maximize button should only be enabled if the window is
+  // maximizable *and* touch mode is disabled.
+  const bool maximizable = frame_view_->window()->IsMaximizable();
+  maximize_button_->SetEnabled(!is_touch && maximizable);
+
+  const bool closable = frame_view_->window()->IsClosable();
+  close_button_->SetEnabled(closable);
+
+  // If all three of closable, maximizable, and minimizable are disabled,
+  // Windows natively only shows the disabled closable button. Copy that
+  // behavior here.
+  if (!maximizable && !closable && !minimizable) {
+    minimize_button_->SetVisible(false);
+    maximize_button_->SetVisible(false);
+  }
+
   InvalidateLayout();
 }
 }  // namespace electron
diff --git a/shell/browser/ui/views/win_caption_button_container.h b/shell/browser/ui/views/win_caption_button_container.h
index 9a40ae1be3415..d9a8fa7ca6f54 100644
--- a/shell/browser/ui/views/win_caption_button_container.h
+++ b/shell/browser/ui/views/win_caption_button_container.h
@@ -41,6 +41,11 @@ class WinCaptionButtonContainer : public views::View,
   gfx::Size GetButtonSize() const;
   void SetButtonSize(gfx::Size size);
 
+  // Sets caption button visibility and enabled state based on window state.
+  // Only one of maximize or restore button should ever be visible at the same
+  // time, and both are disabled in tablet UI mode.
+  void UpdateButtons();
+
  private:
   // views::View:
   void AddedToWidget() override;
@@ -52,11 +57,6 @@ class WinCaptionButtonContainer : public views::View,
 
   void ResetWindowControls();
 
-  // Sets caption button visibility and enabled state based on window state.
-  // Only one of maximize or restore button should ever be visible at the same
-  // time, and both are disabled in tablet UI mode.
-  void UpdateButtons();
-
   WinFrameView* const frame_view_;
   WinCaptionButton* const minimize_button_;
   WinCaptionButton* const maximize_button_;
diff --git a/shell/browser/ui/views/win_frame_view.h b/shell/browser/ui/views/win_frame_view.h
index 460474e03bb66..3dddee8af6cac 100644
--- a/shell/browser/ui/views/win_frame_view.h
+++ b/shell/browser/ui/views/win_frame_view.h
@@ -13,6 +13,7 @@
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/views/frameless_view.h"
 #include "shell/browser/ui/views/win_caption_button.h"
+#include "shell/browser/ui/views/win_caption_button_container.h"
 
 namespace electron {
 
@@ -43,6 +44,9 @@ class WinFrameView : public FramelessView {
 
   NativeWindowViews* window() const { return window_; }
   views::Widget* frame() const { return frame_; }
+  WinCaptionButtonContainer* caption_button_container() {
+    return caption_button_container_;
+  }
 
   bool IsMaximized() const;
 

From c5b87e49192c1812fcb227313534dfcdfea3765d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 24 Jun 2022 06:01:02 -0700
Subject: [PATCH 524/811] Bump v21.0.0-nightly.20220624

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3d2a3d64ff0c7..775a50c55fc9f 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220623
\ No newline at end of file
+21.0.0-nightly.20220624
\ No newline at end of file
diff --git a/package.json b/package.json
index 22754254adfd2..af4d0bde7e759 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220623",
+  "version": "21.0.0-nightly.20220624",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index f6686ef18cde5..804ffa694d243 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220623
- PRODUCTVERSION 21,0,0,20220623
+ FILEVERSION 21,0,0,20220624
+ PRODUCTVERSION 21,0,0,20220624
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From ba4893c248b3f19c55dcc57e2acc31aabce04ad1 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 27 Jun 2022 10:28:35 +0200
Subject: [PATCH 525/811] refactor: load webFrame via process._linkedBinding in
 security-warnings.ts (#34735)

---
 lib/renderer/security-warnings.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/renderer/security-warnings.ts b/lib/renderer/security-warnings.ts
index 30cb0cc63b6d6..0aadfb632d19f 100644
--- a/lib/renderer/security-warnings.ts
+++ b/lib/renderer/security-warnings.ts
@@ -1,7 +1,8 @@
-import { webFrame } from 'electron';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
+const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');
+
 let shouldLog: boolean | null = null;
 
 const { platform, execPath, env } = process;

From e2c58d164dc44515a067b156302a391e6c13e8a6 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 27 Jun 2022 01:29:18 -0700
Subject: [PATCH 526/811] chore: replace Object.assign with object spread
 syntax (#34739)

---
 script/gn-check.js                   |  7 ++++---
 script/lint.js                       | 11 ++++++-----
 script/nan-spec-runner.js            |  5 +++--
 script/release/publish-to-npm.js     |  2 +-
 script/spec-runner.js                |  5 +++--
 spec-main/api-browser-window-spec.ts |  2 +-
 spec-main/node-spec.ts               | 14 ++++++++------
 spec/api-shell-spec.js               |  2 +-
 8 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/script/gn-check.js b/script/gn-check.js
index 497e6ec5f3cd8..12dca3651e723 100644
--- a/script/gn-check.js
+++ b/script/gn-check.js
@@ -18,10 +18,11 @@ if (!OUT_DIR) {
   throw new Error('No viable out dir: one of Debug, Testing, or Release must exist.');
 }
 
-const env = Object.assign({
+const env = {
   CHROMIUM_BUILDTOOLS_PATH: path.resolve(SOURCE_ROOT, '..', 'buildtools'),
-  DEPOT_TOOLS_WIN_TOOLCHAIN: '0'
-}, process.env);
+  DEPOT_TOOLS_WIN_TOOLCHAIN: '0',
+  ...process.env
+};
 // Users may not have depot_tools in PATH.
 env.PATH = `${env.PATH}${path.delimiter}${DEPOT_TOOLS}`;
 
diff --git a/script/lint.js b/script/lint.js
index 839215ee35e84..8ee4f9b756133 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -27,7 +27,7 @@ const IGNORELIST = new Set([
 const IS_WINDOWS = process.platform === 'win32';
 
 function spawnAndCheckExitCode (cmd, args, opts) {
-  opts = Object.assign({ stdio: 'inherit' }, opts);
+  opts = { stdio: 'inherit', ...opts };
   const { error, status, signal } = childProcess.spawnSync(cmd, args, opts);
   if (error) {
     // the subsprocess failed or timed out
@@ -103,7 +103,7 @@ const LINTERS = [{
   run: (opts, filenames) => {
     const rcfile = path.join(DEPOT_TOOLS, 'pylintrc');
     const args = ['--rcfile=' + rcfile, ...filenames];
-    const env = Object.assign({ PYTHONPATH: path.join(ELECTRON_ROOT, 'script') }, process.env);
+    const env = { PYTHONPATH: path.join(ELECTRON_ROOT, 'script'), ...process.env };
     spawnAndCheckExitCode('pylint-2.7', args, { env });
   }
 }, {
@@ -143,10 +143,11 @@ const LINTERS = [{
   test: filename => filename.endsWith('.gn') || filename.endsWith('.gni'),
   run: (opts, filenames) => {
     const allOk = filenames.map(filename => {
-      const env = Object.assign({
+      const env = {
         CHROMIUM_BUILDTOOLS_PATH: path.resolve(ELECTRON_ROOT, '..', 'buildtools'),
-        DEPOT_TOOLS_WIN_TOOLCHAIN: '0'
-      }, process.env);
+        DEPOT_TOOLS_WIN_TOOLCHAIN: '0',
+        ...process.env
+      };
       // Users may not have depot_tools in PATH.
       env.PATH = `${env.PATH}${path.delimiter}${DEPOT_TOOLS}`;
       const args = ['format', filename];
diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
index f022f3da25fa7..c03f3f36ca984 100644
--- a/script/nan-spec-runner.js
+++ b/script/nan-spec-runner.js
@@ -20,12 +20,13 @@ const args = require('minimist')(process.argv.slice(2), {
 async function main () {
   const outDir = utils.getOutDir({ shouldLog: true });
   const nodeDir = path.resolve(BASE, 'out', outDir, 'gen', 'node_headers');
-  const env = Object.assign({}, process.env, {
+  const env = {
+    ...process.env,
     npm_config_nodedir: nodeDir,
     npm_config_msvs_version: '2019',
     npm_config_arch: process.env.NPM_CONFIG_ARCH,
     npm_config_yes: 'true'
-  });
+  };
 
   const clangDir = path.resolve(BASE, 'third_party', 'llvm-build', 'Release+Asserts', 'bin');
   const cc = path.resolve(clangDir, 'clang');
diff --git a/script/release/publish-to-npm.js b/script/release/publish-to-npm.js
index 55799665a57ad..081274d83edac 100644
--- a/script/release/publish-to-npm.js
+++ b/script/release/publish-to-npm.js
@@ -167,7 +167,7 @@ new Promise((resolve, reject) => {
     const tarballPath = path.join(tempDir, `${rootPackageJson.name}-${rootPackageJson.version}.tgz`);
     return new Promise((resolve, reject) => {
       const result = childProcess.spawnSync('npm', ['install', tarballPath, '--force', '--silent'], {
-        env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
+        env: { ...process.env, electron_config_cache: tempDir },
         cwd: tempDir,
         stdio: 'inherit'
       });
diff --git a/script/spec-runner.js b/script/spec-runner.js
index eb4160c8ce8b8..590966f064b8b 100755
--- a/script/spec-runner.js
+++ b/script/spec-runner.js
@@ -235,12 +235,13 @@ async function installSpecModules (dir) {
   const CXXFLAGS = ['-std=c++17', process.env.CXXFLAGS].filter(x => !!x).join(' ');
 
   const nodeDir = path.resolve(BASE, `out/${utils.getOutDir({ shouldLog: true })}/gen/node_headers`);
-  const env = Object.assign({}, process.env, {
+  const env = {
+    ...process.env,
     CXXFLAGS,
     npm_config_nodedir: nodeDir,
     npm_config_msvs_version: '2019',
     npm_config_yes: 'true'
-  });
+  };
   if (fs.existsSync(path.resolve(dir, 'node_modules'))) {
     await fs.remove(path.resolve(dir, 'node_modules'));
   }
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index a7b3cc87dd9a3..67539005316a1 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1040,7 +1040,7 @@ describe('BrowserWindow module', () => {
         const boundsUpdate = { width: 200 };
         w.setBounds(boundsUpdate as any);
 
-        const expectedBounds = Object.assign(fullBounds, boundsUpdate);
+        const expectedBounds = { ...fullBounds, ...boundsUpdate };
         expectBoundsEqual(w.getBounds(), expectedBounds);
       });
 
diff --git a/spec-main/node-spec.ts b/spec-main/node-spec.ts
index af6c11360f202..40eb0276029ed 100644
--- a/spec-main/node-spec.ts
+++ b/spec-main/node-spec.ts
@@ -78,7 +78,7 @@ describe('node feature', () => {
         child.kill();
       });
 
-      const env = Object.assign({}, process.env, { NODE_OPTIONS: '--v8-options' });
+      const env = { ...process.env, NODE_OPTIONS: '--v8-options' };
       child = childProcess.spawn(process.execPath, { env });
       exitPromise = emittedOnce(child, 'exit');
 
@@ -113,7 +113,7 @@ describe('node feature', () => {
         child.kill();
       });
 
-      const env = Object.assign({}, process.env, { NODE_OPTIONS: '--use-openssl-ca' });
+      const env = { ...process.env, NODE_OPTIONS: '--use-openssl-ca' };
       child = childProcess.spawn(process.execPath, ['--enable-logging'], { env });
 
       let output = '';
@@ -136,9 +136,10 @@ describe('node feature', () => {
 
     it('does allow --require in non-packaged apps', async () => {
       const appPath = path.join(fixtures, 'module', 'noop.js');
-      const env = Object.assign({}, process.env, {
+      const env = {
+        ...process.env,
         NODE_OPTIONS: `--require=${path.join(fixtures, 'module', 'fail.js')}`
-      });
+      };
       // App should exit with code 1.
       const child = childProcess.spawn(process.execPath, [appPath], { env });
       const [code] = await emittedOnce(child, 'exit');
@@ -147,10 +148,11 @@ describe('node feature', () => {
 
     it('does not allow --require in packaged apps', async () => {
       const appPath = path.join(fixtures, 'module', 'noop.js');
-      const env = Object.assign({}, process.env, {
+      const env = {
+        ...process.env,
         ELECTRON_FORCE_IS_PACKAGED: 'true',
         NODE_OPTIONS: `--require=${path.join(fixtures, 'module', 'fail.js')}`
-      });
+      };
       // App should exit with code 0.
       const child = childProcess.spawn(process.execPath, [appPath], { env });
       const [code] = await emittedOnce(child, 'exit');
diff --git a/spec/api-shell-spec.js b/spec/api-shell-spec.js
index 284dd62864d82..6eacf51363992 100644
--- a/spec/api-shell-spec.js
+++ b/spec/api-shell-spec.js
@@ -63,7 +63,7 @@ describe('shell module', () => {
       expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
       const change = { target: 'D:\\' };
       expect(shell.writeShortcutLink(tmpShortcut, 'update', change)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(Object.assign(shortcutOptions, change));
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal({ ...shortcutOptions, ...change });
     });
 
     it('replaces the shortcut', () => {

From 8238cca87b8fc77c5b3a1316315360004224387e Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 27 Jun 2022 01:29:55 -0700
Subject: [PATCH 527/811] test: use maximize event instead of resize event
 (#34740)

---
 spec-main/api-browser-window-spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 67539005316a1..aac15ffe468cd 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1354,7 +1354,7 @@ describe('BrowserWindow module', () => {
 
           w.setAspectRatio(16 / 11);
 
-          const maximize = emittedOnce(w, 'resize');
+          const maximize = emittedOnce(w, 'maximize');
           w.show();
           w.maximize();
           await maximize;

From 39840502be074969013adf08270c7c2fef149428 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 27 Jun 2022 05:14:01 -0700
Subject: [PATCH 528/811] docs: replace broken Windows taskbar images (#34729)

---
 docs/images/windows-taskbar-icon-overlay.png   | Bin 0 -> 13746 bytes
 docs/images/windows-taskbar-jumplist.png       | Bin 0 -> 176913 bytes
 .../windows-taskbar-thumbnail-toolbar.png      | Bin 0 -> 145030 bytes
 docs/tutorial/windows-taskbar.md               |   9 ++++-----
 4 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 docs/images/windows-taskbar-icon-overlay.png
 create mode 100644 docs/images/windows-taskbar-jumplist.png
 create mode 100644 docs/images/windows-taskbar-thumbnail-toolbar.png

diff --git a/docs/images/windows-taskbar-icon-overlay.png b/docs/images/windows-taskbar-icon-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb9a86d530bb103337e7cfa18eab1b89b780dad4
GIT binary patch
literal 13746
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

literal 0
HcmV?d00001

diff --git a/docs/images/windows-taskbar-jumplist.png b/docs/images/windows-taskbar-jumplist.png
new file mode 100644
index 0000000000000000000000000000000000000000..7660abcbb1051f94862ddb0b93e03db92cd4bf59
GIT binary patch
literal 176913
zcmV*SKwZCyP)<h;3K|Lk000e1NJLTq00C(L00C170ssI2bogr000001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D|D{PpK~#8Nl>G&i
zTvgWp58rZk>8@(;j<i)(OWfUwyAhX;yAXE|fe?3Mgy4i=fgpnoHVor4&od0e3>qLL
zB<XZl{lEL{Tc<05=eOQBYp=8RIrr49>Q3)ZefK`+-mB=+9)M|syL16Et^a<#XP3^m
zUFY9o@N6`?HkrKlE3REi{+aB1zY9+K$uZ-mbw=DZHSV2K>#VwMnt97M{g!Q7+&ZJi
zI_tV^`fcl!nu0Yq?|G`G_fv`fPgV~&U(@$oqR*4H!(UJIc%nAC<(8?-XV$L&w08WP
zrR^UqEkCw2|E;mfTZSfYn9DC2V=oya&lyXfF%>;-DtyG$;FO`>!-o80#_WBT+}%pf
z1NDY|F!!zNgP)C$d^OSQLL%qT&HNR$t`2`UxBHu>%^$4If2VKuzM;`O`pUO;<!@?Z
zujoo&)R$b;6+WwL_>{iEd0qWSwFPH&d8c%_Cv@3I^;w5>nFsZuJxb<oZRSIUw1<@J
z{f+PYuF?I8$_Eo^3u^sUx6{Vm&KmVo_JDs_n?9#2KCWqSP+xzKzF?;zccU?9tuA}L
zlCwj}KVXQS*H^x4ZvJ~qyT7@5{x^Hv_2}Y6llAfDTW@zdRNLu9qT%MB!}q?e*vHwd
zL$%J~8h1a%Jy>y$(F7KovUVHt&*_U_GB$eK-RX~+qyJN}>{f@}iEc;ZJs+;_dHPoW
zi;1?6)r9w4adtSR*oPRMy%g6##n#`Y@1}UWYm7q`Qy-1BqhfEbIQy9!u5(mA>2C31
zpvQ;)F7J9fTn=}AC9~6oaN9@Hnja1{+3T*{<u1S95#8#HY_S)ucNDI**I#WdSZ>W<
zYROw-$ys2|o^Q^aYsr{p4$m}&rWw*F!t}v$y1>19|Gfs^NWFK2!81(f9t_hv2k4xA
zb@qGo_MSRhcdfOX*49a5ZLhVo(^}eU&8>9C=2~MDn8p~@8loCQiN;W@(bw1L3p9p&
zn4-^DbcKqxNT<!$8$x<*no--(s5DmWm7e@91s(pJGwAP`V?N3l^<lX0r@_u2c{{!t
z=<r&4`%B>tFQvD8A+6oZp7xhq?O*Y=yXbBEoUio-U+ZVQt)BL_e9GJM2~Ug1JuRMe
zH-F64?7X|_d3UpOuBMN;8=r-_8l84GI_;`_*jaJRU2()!e#ljEz*)ZE72EBMKIkgF
z-&wlDRkF=pyxCQ>!CAQ8(O`|E-fBnwN_)<7NA_ZS<{WG06l=zKb8vv->ZVxRDz=u2
zt+Cctp|h326ni6$qp`-(6sC2w&^lUb?X7i=Hd-f{&ec}uYOiy564qJo>7w^^(|LQs
z^uFFYUvIs?uOTo1rVkF*2ZtKdMjFyb8N=gE;mM}VX_o9+#@zYl{Dszf_t_e(wiRx0
z6m4^s>~u#S#82U_IP7k8($nNoche_*EiVSzyqw<tRbRV5`P#njZ*xN5V5Z{3pHNSO
zeW2AbTI(LBxJPI_qcy&J74K-pKS~LXgz5a_^nvlZApYy8z;x-;^r7kc^qGdxY-4zi
zF+5MvrmO5=e1IKFU_01h@@zABwkp1@ig&BdyHoGjVJdqif5H{#^lQc$H|^7E-BaSu
zs#^1m+jp_UHnlc??aiJ~-R|{7qTds@20mKd?~z2W$7+VXmgxO#qS5YZOSjL=o&U$u
z;V;(KpPE~IU~cw~vGE)F%GXR~FPow-7)vi0OP(|qJ!)uh#!&A#z+uQcV#t2TnDd~L
zv#Z&R&*uE*+K>y0VXr27Tu5XeyqUf9mZQyIOl|(6wED!{^aEYv_jHxN5#YG2i@qem
zp>6QEzWzB04sF&EP(zooUmM<M4&JY1>;gVCfd_(ZUaVYqtMUFs@w#|mW;{4K9=^A_
zV8joBj_>J8PU;H}=;}YHE!d&S+oa1`W5`~k&Dx}7KBzB#!cca}(BxxNt3O&h|F3`W
zH}$7im#;`P-cZwW`|W-Y-zYtpC|pymZLm!11TTi@or6ub{)&5`;-6>C++)Z&r!Rb3
zU-6Qu)q82Z|5G^ght^vXT@EFBoT%x3;^#h(C+@kJC_Z$(VEI23=Xk|-kK*X5we`{&
z2iUaz6i*wiv5&^mRj~maLyQGmZRJneTD+3h<J~})w|(tj%Ifw)X6L6eTAvLzJ>so+
z$WyV?Rld~`+w3UaXfIx8Z@9)@f2EDUv5cu<%*3C?Y^H`Oy~>z2nW>@kjn?``=)J@A
z?xCsF&^r1696DPMP(x?w3?pP%+G@<LG$x{k#?VM>sL<%k2^oe$Mc+_>gV>?f<->>_
z+CrUD0(NMPIf|u7F}A~>X}HZh_4~bFZ^S3r!~WtQ_=)?T%g!#BydB>MI07AC3U++n
z-~KsY+vj24HWxi@o&hzyt)7K>T0R3_2xL6rYW6sg;cD_I%-MvIaR$_IR-STIo^n>4
zaFri*l^=GN9dyR_Iie52T#=oihO>C9qj(dL;cU1T)WC1aQLxyazu1<u(4IZtnla6m
zInI<eNaO9H*xLwdG*#?P6k8>bA)IEvq=srl4FZSO-CpluYIM>0x(aIa0yqr*K88R)
zP{SA;XbcQCrVlrzk1~btHHRlyGN+icrdxC7+VbX`>n*m{Uq=6fMH?L@+npu5T(Ldw
z*nW4T6Ziq~^SYZo?Q8X7pxx#4POk+!UJkW+(iz>Q1jj3$UIuShqqmpVGgxtt)_6ve
z`9^5{Benj~TK^bOLx5wVK5Y`HVMv>rq{b{5sA0;OZ_HTuYwSqdrt@vHy0+`RJC(o=
zCAdxR-r}-uQanc-T|aV7`$0eRrY*@13t%z*mSuV!JM2~Qf_1lgJXzf{g&jQ}xjp2S
z#DEtPEf3W?dVOK+_*Zk=KUrG+-qP%SQ`5HvJ6<)Gy=aPFgy=9J6bsKmbQlYc>+_H3
za}VmX9yH|KuVmkU&$^q_U;lB?GquAnC%QjN?8sbv!_o3j#@2t<wD_H=(QmblgyJZB
zO%uJOEqOs#d_h}C;Lz27Ojqv_fJ2*mQk!#JlX+O1aRA`ZgdVc_w=3bDWZoTZrvIm6
zYa+HMkv;FKZ)#22gm~8I>YM@pHIzLA#i6Ztzmm62$=jsluGMC*)Mu^MWNbFpKVgc#
zXefWj)Z$Z1yT5pP{U>|OwbBKNMr#v|H`lg%C^7KFcj>zl!Kq&<)&W{aPsKM>vG%i@
z2P$c!j9F`qS&x|VUob|Vx3swA>iS9jQ8$~dtnIQV(d`J>aT}sz;IoM~=Mq`FuUcE5
z*4X;H4c!$_Z-b><KpCW1hG=a~45khmM_a|!#oS<(Epoxp<ikMM_dUIy^|yZ|-1+&;
z&QF9|od`5J?5o`8E`PvPw%s1x<S5->Em~`7xY}BOg(ZKPId`!sXOSsuE`!6EKHW&v
zm}&@4GWaJ-aOgb4weBIHhSoJm=jhMi0L8R+6&zY~2N<ZKm|9A35H<8MjW((n>cc<{
zMOP24R$Gq^(nGH;GAgBdZ9~OapaeSvT5PG;_flZwhnb`P79RN5V6WeMyL{;G^uDw6
zTlTK6dOE$~>iCkg<3(48i>`Jrcv?T_YxShR)uT)ecZ;Vz&7XERdy1^-<E|!;5j7g0
zb2J7r$UqIUij%Ig<1lC05og&UM|3Z!VUIpwi|lfiZj<0(w%Y5huoc{A&6{P-nT^mj
zXH0<v(D?f(?hcBx1+<3XMTIap%>+tXYwXQ`2@bte1&7|<0g40cKo|>fbO$x=0*5I$
z#E>?`6dGX)k2YtFF=tM+Wlyu^&avk&0LW|&mOBbpJ4-f_IEw6Ym+keI<A3>>2Z(HX
z-q+%pK&zKR9bON%f6dqKRcq5{wfQ3y-vGU1sMR*YVjWIjV^B=#y*1vUTHjDzV2I8?
zOy?hN^o=!pC!4*~BslQ*0Cos!;Ll?YgTs`$2sz7cN?Sz20y6}5GC?SL@$b-jx50Ft
zty=dMgqGR4CvU_*m08yuQxd@m34p^i>#Av5t!a9-aYi*9b5+7J?HcrX_s0^wRjciD
zzPjh5H-|i*82oag&8Z(;L;ly&_0P68e?p33Y5uOU>19*nS1qwuOtA}w$TRwq$Bjjg
z7z<At8yqzh95m$bQwnytGj_StHY>Ti`yKnH>NoKrPbP+4u5SNaqQSmfIn%CMTK-vS
z^#^UU5A9`dX&SwukG`UhT+$c6pf9=r#bK!bxW3+_hJr`*xoWDS%|4{d+NaBSNE6<r
z3++;}H<{d<O@TGKW@i!bZ5~WSH(xc+N(3e*a>m^#9`Wz=wwHDFk7*0`YIAq!b2jNS
zH|esLX>t}RIjfMZ7)xK$mA$QR@>^Z2Pwk!mkv`y?!l}0#Ek(j|yUDhnx}Qk2KM>Db
ze?wPsz-G8tXBnk<?$NlrYCKbv(EWz&L&p4b#s(Knu{Uk)J`4@{pXj{n&F-&hdo0oK
zV7$X4H~XIZx$_H&@<Z|Pvaht334o5q(OzR~qnNuYrh61)C&k(V*@0pmq|I7qE<0yw
z@uI)$+i6|j#-B@8rx$WMKbzkARG{fTU!z_A^6lQzt?uHj&Z2erE){a)K3m=*YwiMk
zkD0S(8#87a!qBBvhV;pX-~>b3cw{JK-eEcqYmI?gcR!u8Hw+Ne*}H0OUG&yYI!i~Q
zhN-Q_*aoIEG$AuqiVQ_)4MTwfKp4V$ZLv;is?k;``aH#yu9)%^W5lc!>GipaHCu5s
zv6d{$?(s%e|9@r-`7U$NU(<Vk>g)Etuk$<p&cE?@dOgtL)j<1K{OzCT^u*uh*<^b1
z1f?e}pK`Z&($)M4&QQn%HJpvlI~qOWtR$@gq2aDLMp`3wh)l>0C$vWC1FF_2+Tt!=
z?J8X3tWOz=4H-(_Qv8a{*>kMnxz<pXDSfmd*jsV6QygFfsL@1gYXpL`k=C#`ucL;e
zrOw$(Bq{BLb<nyx>Rp|Yq^RcYE~o*y(M#{`WAODi`Ue;TLk+<ZMtrrTkAdmJlMI<t
z4B0bHxpPf<3r+d=S?jN|He72h+2Sm^-&e9fP<-4UIq9xE<7j>wUoe5@PeE>Y+d*}{
zhhG=|033yj6kmU&$y!f;t!E%if#UEC0W~z<;acw~d^hNPV|0PBLUBwW#X)&Wl_6~!
z<OU4LFofqB1vLzrON?3f!R};7a3>kFBd{aMj;$&?Jliz3orc&2&$OScRSDOm1k{IV
z*0m%%ZYJ4rwP@?jZs!yCoR5PY_nfbR^*DE<|8t3<uOvD=axFCeOLLb$SX%wT((Gd-
zEQY497#m$O$6hi<pEZ^~Whj2!P<U3~;DoW>5r9LVw?`@1ZVha<rES!d9v%63^^`Yi
z20cdXXm=seaDR2?q;D)O{-Ct{MBC&&YxGS``D;j3bfquqil0NaqDQJy?@@hzU5!JN
zbx=#G${uaT1KRYRnzS8C+IowBqvBazJn?U38xk!ZNaQTOf*&L>K9Mo%$AUqB*B77B
z6&%py-LK8r2(6(Fuh3>LQ8K`e&8FgWhR9`o<!=qmKQOiXv#-~`b4UFYos(#?D$!(P
zP0QWYT~8*W+Y|NY{Y!CI*{r=aw(g3%ui_bP4y@2+?J?vYH`ROGTyn|U<UL=HKi8l5
zO|zAWcDoZ@PTcBxBGL17qTfrmdOVVF9jvjpIjop^;Y(gIcL6xGrk;wan_}sp*qSTW
zzUHijj>sW<<7d1b-%RiRE-8+VujY2XnBMA~zv*F5qX)d@_-Yb)dxH&*2CEnxmb^ul
zocWgQIRJ+#bA|v1zELOZ(<UHK0X1|Gv5*@sRcmORtTpZdI5dv#0EbEqOFNAj;ApKe
zwN#8P1T`wOhBB?ORM8g+xdC<*DEd;gI%7z0NYm@H_4;B(6M-sG%o&QM5h5h7-MI#R
z-_0NNY37hW1P6cW>;8eK%RAoAzwvc?)7SAefWzPJC12YYlXVRwDbIixT+{$B+%2hP
zYB-w;YBV`3<OYGmQE`&AM)^?)4N$`wI{+iO5!nrJIEr_G8YKQ3((lIxp^?85d7L$8
zu>k9IQ+Tp1G|u23qPTh}jyAxYVlNj~!PL;%o5CbGG)`g%zyYnn?9jP70vs@=MzX*`
z;4t{_(L-+d`U-FiHlz(Rrj0a)Mw`RqOc@i5SyRn9Gt7DOtObi~YLc?vS+dy?-RX)w
z;3?nZtvuvyauQm@+2Vqu^`$_&H_|%19%%n!pzUMsM!S`?>56-})-^zaL+52`5IB&k
zFgW!7vHHMxqJ{tm<OUTu1UL+#*$fV74H$#Nl)X%?mDYhn7{HNa$5zP>jc1GE+^Tr?
z`TP9EH0_3QdcrZK7WvCv?66M%sbu@ju8$^qJz5KV2&;ka==&@cDLS3MUT@BinvNfs
zTKvw|>?3p2-xwNSGF2j5c>&-smOMd~j)tcU^^fWE59o3q(&s#&<ZS^vjKTHJcF&A@
zvS#WV31&x|XA*@6ZU@JFZfW|7((EHm<y)4L%SzcLUFq`xhqmD}B2^)9sEQ-!umlGb
z2Z1Afn<ltf<6UP8E?06MY_jx5`OZZ7wnSRhHDqLI<7%=-eC=ufno_V|le1luy+N0?
zLZ7i1rU@@n!mEu94x8{^F^HWH^sRnp@A&t$0bkXdc%y7_qH=Aba?9=ZM-%N&By!g$
z{O!*wmcDv>YsJ}8@r+XZ>ujOj_&kP!Gp51|w(>V!ZGV?F^xqI2Z8s-6?oaeP{9~)L
zz;2@7#T(H>ar?#}6?0#`v%O;Os5RcBHT2RNyJ$@96;nIK)IrHyY>(`-Ry^)+_nWkC
z1ddS0m$Ev&6l`(U-{iQr(LQHvn=87>U9!PdxX#gFEy?fvrRLm)00&dU6rO4fO(A5Y
zP0-@Y2T2N1gX9KMV*J^G8kC+m?$IDUv3J+lx+qp;D4j%xBB{|tYivx_4P&WV5Ea!8
zVuxN7HO$$HDN|?2Hfb6fm55#gRZ^&!a+S1J{^pzWd;T`R-&fg#{~I3sXU{#qadv+V
zT7#*9p9s_lw0+*+<~e_>WGS@O(*OrkgX*Bo&M`7vO&>`jgM<bn!%_aQqg<pXQ3#C#
z&d6Rz=^jwSS+Wb%a29WOG~DE9xXxaGwI~~}<UG!rJ>Ql!%bGdG9J<#O9H#YjQ|yp<
zO%)q*lNd~EFVotH9Rv<ro!rnkTWVdc7#wO%R4t3D)G!FS!DUgR1|=!|sJa15A8JS+
zN!5+a@s_MfmYga}?rdA$d|SQ6_6EzL8Ier6B0G_!xXSjsEBCvb9dNWbYHxYQ)%v2Z
z?OVZi9|t?Ui{F*6`5{g2Y{fl5arZVj`&k@JjX?|!{O96ZLDV=#6Ey@lC`ApX<SC-S
z!DUefhdFDpF>5KPVai@%&RLmcM+!Jn*s;Bi9iB~k_a?=+#c12E%YMXO^@B3=wiE1_
zQDd48yP3+4$j)l8qvyFAiI47QZ{G7%?a0>?-JZM=TX|Dy|CXuc2i7LPwKVySvC&JW
z@{6X(bH<X#OvUF7g{O@Tjw4%v;s7}G**g)mmf$8OusUz}Z$~_xsCqLo;9O$pYt^lv
zP81!y?H%!VOOp?jChuy?-mn&5QX((tOP<peJ<Z_I)jOlldsv@yj8;{$_iHovYQwt;
z9HH&nv@IHFnZSCZYn|eqo74Nvij|4VhY~r<Z}=x7BfA+M^Hav4e<+0~01jjX+RWv;
z@FGLT98JbtO~x{P{%%Y06S|Vi`ic*g#vhs5{mI+&UpXVbFP>3dxhheyF<!Z|rt_&p
zqrKO&mfuv|lN_e58fQnv)kPCnsDzK1!+S^y)ql)X`jWlb`+;76Z!qaflU21HA4s%0
zni#&ny7l?m?k^>JovF4Rsr9yaRAXwYv9!>cI%y3(bb17B3&q@0G559xX6hqHEfr6C
z+x#ZI%SYZ0ucvo-KBv=j=>SLLBfiRg_;zweHaUydI15+ek580E7qbXAXU#NcRN))d
zm^P6zlps{=y;Lv*HM~RUI||fr^%WV)Jyg^X)Zk?l#nMhqQivMOKn<;_Tw{zXhKR=4
z0LIk~0gigYz>a`USKp{KhLPwn6)4u2r(|@v`!l)yf15q@pJ{_XclG(bv*&xBE^qle
zyzB4qGFiJ9d~Kf(w7nQ;^Q^!1Q~s7ua*`qzP=wqNODAlC8mEaGjUFbeIOd>ID73~Q
zNey>IWGE#&fee_dXp6drLUoO0wt^*~hB2F{YRQ~x4vjSjhZsEg@w<u&Xk*1zt~km-
z4V}GGXK$>tHUTw$3647!Q<C6N%c99VMJ}f3#A1peZHOU#xG^-!7#?fPoM_6LYRR2x
z&6{P<Uu>_p6lw^c(_Km{DW39uq%|r}x|*JKw0O+c=2=(AOUUWcI=q?I=C!m|_(IyO
z_$Df@eg;oZqpO?A)5qZMkN;B%4*G7OvM5zXh1^I5$23v!5^{r<R3tc-GB`jDm?dY8
zBC4d48asqBJGO%zI^Q;(e~Zq$8D?;8Qv4fjwvCE)hpz7@=9xb`rq&pz*BYnYHcq=?
zn0^C}85(5j6+~dCM{f6c<hEc3eSd-@J)gJ@-O>Bvt!CR3N~bps&EIo0dEZ+3nz`b6
zQ|uX2=~L#CM@>a%Obs69Y{igE^-*1Ti!Qvz<X@+xua3?8*RTtT$*&~_Kb9DB`BuxP
z6UB#WoP+*gYxJJd=q+vR6>H&(O5~!p@Cj|h^Sb)y01mB?8~Ut+y37N*%m<OD=tB4F
z(zk2VH-Q>TV2#GN(&SvFWG-*C;JZc}6VV+tfjK{?O-y9odoBOoZ|tovDY?6}8LRY}
z%d{DbwBh;s^jS)1zAk5rrSOcg<V9`dZEfX;+UB3wI{iJp-<S2q{S;YHTd^ilwz0b9
zz697&y8Vi0)Fs8#$F9M5^-#TU3Vy>%#u-cQZf(8u`l1WQvdiv{pJqUG%>TL7)<oyM
ziT0<e2kuMU^Z4y<FWxLUmT;~A!ljIWV9^*l8H`=^Mx+VN6iZC8wABXYxbu%_DxS8t
zdOfYn$A~v5)vV6XhFYEURUGn_Kj@C`AaPr`*3obU{{Bex<}DOS%1mPhbof+L`Xpoe
z1Y>ZlAuvYgACA8&4O7G2Pvc6~H5^0@WGJ8pAw#U8C?Y)()M%nHRA`K4QftuS>#vzv
zTWC~@47x(an5$T_mCPRDHiz=NeU#t#+uT8)r49Pn(fdt%_qW`g-wn2ZGt}m?zy0&U
zcA&-uf07!$mXE<yWC&^`*IduQlB*{`#tFIX>MT2m?`JM*(E4TR{jL(KYXBK8T0?;l
zBWgGbme}(bIr10Sa_8Zf18SH;<BjRV_1-=@XBWlNN-;OrSSw+ox*-Z2)@C|OOPz&l
zqEy--6Ua!V2G>Lx983+Zucywhf+I-{N>U7AP~%=>)_7Ca6jSzeQ|??#{z9+}pU{nD
zvv@0Mjp#o7T<%6Ey-m(~n>_AmcG1)NO@I3jp*7OlzZhzB)>*z&7apUy1{z$04fg&<
zM?V8{WM6N^&oxn!8(Qxubv-4Z<|&{CmB#C+afjS6WiA0Y1T~fuII>p*9G1NGV8_lR
zI~W|yj_oQt0FF9#Y*BpcOwKh%>n0`tly}Pa_G!1wQveQT$8|WSsv2|E_f7UEI-act
zJ9?gr_oC#5)>(QyUOnWMME{p++U-l|dc0+7^`5QqySDPn7Ko1MQ|96)01k7*lg4_-
zj0Fdcd3yj3WA-*(XoEhm+z?!&<ZNiQ`TF4J5))sI4?3S1bopkBrxL{nZ#(+`-d^z=
zP5Ep3$V=7+7nI^>v<=Vc>OZ0_IHk)!rp-B|&pM#b+^fsjt<Tt@3vbt@Z_%c2)CAXP
z{VNsUGR3n*=U!rIe!6^Rb@T1<hO4UGQ-Ai4iRX^GS}^zzN`w8H%r%DaB3=4CP5J^Q
zZN4TrN6B1mMz&J;w6^$FUD-SOrXQJG|IyR!UztO{E1q_<Vp+UmU3K}En_W)CTkoqa
zT>GWcaJtskTW=Vm^UOE+H|Wz3DcKL3^7iT)K52}-XledVp!eSkCV$s>Rdw43<6REN
zyBxpP`FMQfQ#C!#e{Vfp>uq(^YG|og+UxZ_w7QNuBjiRC#oAg4j<Yq`V=KOBYVks_
z%Wnhi-%e|HDW~hj^p?kbjduIWAMloLau;uKHe7=w8GnL^4J!g8XO<~*nkqM#8o|*<
z{|JL`xZXDunwGL+Hv*=Y*4aZ)qbraB)6tfVwpvSTNFEYFrlul8A!;OdZ4^Rfs2ewa
z%?wJm(VU~eJk4E|%X50XoY(JPdHt{D^!+NW=kMHIFS)wB?CtP&u-&_9ZJ!UdeI(HC
zX@A?N{H>pad0U?MwLA~~<!OEn=5F=~4Bxu$#;0MfMyH(k60QU?jyo$LG!D7S4?4?{
ztnGEi9&$z>a7P|+mF{$vY<CxLaTRSu?nW!G^;bFzmJu~_7uxgY+jC|*vZq@!pfyID
zLc<W)8fRz4)>^SN#V=fEZKkm{W@HF!uC=z*S=+#V2@b7WtiQTD=*9Mp6uCjGu!0(W
zbisZC97FYKBWUABXtW_?f-!TlDVvfMP~KYaK1YMq&Z4!>;%)B8{jS(Up7O(<#wVSP
z@q<6%Y5ugo^^4&SzX`W}FTK@oGFm?$tURD(Rw>?ocx!{Zo5|JJXdi5J4%51aD87M8
zupd!FR5$7tVuQ4O!vL*ur`$+_W1(12k>F6}h9zg6HFv!=Z=+;~1P9sw!470D>lFV=
zgLAE7-{l+d7k$-FBt5{6>DMJYY%{JlKa}Wj=2rK!)x?f-2^bu(W6;ZqA+IGm97&k_
z|JKy%9b4sFwz5l>*t4e6$C0fNI4D~=Y|Pzj%z4n5wcU`hNt?FD;9aWmt}r(~&~{ht
zz~>X=FVze_7ax52X7eZF#Rsabz2CP)UQuE%>q{<J>OHL#KBa4LMpN&UCjW#k_pmnm
zfG!Jp%7gmwE~bVyxSqkG^(_ZD6we~XIkR-i=S8dH&3DA}=H7HoyyYKvBY(uz^bQx5
zjE%<d5=&@~F>Q{Lwm|VO(xffb7wk0^p4S&%(nj9WRlIF#`M$lwpVII7I&bt((K)ph
zE8}JBZZ^Nay2pul)9u$XX8*-x?4US@DM&8d%XGm#+VEkqyz+>?=vhmn%g&A;XAJ*$
z>4NJmx5hi{i+4U+)8lY$yC>qqo~dbZ@TzCse>L_IiXFK?ccdyhV{3fXE5?qBcY>w<
zE@Si&bJG`tU0zG;^m?%E%ekFj2)91zqsr)3R}|l?t6dFOL5FjaVi7ezqo4+D_evWN
zt)UN$Vru9;kQ<-|$qls>DyX5cc4TU3%x$#hRtyfxPyh~NsY1w*azk$1fK#`LgN*lp
zS#lIp#E?HJ-0{)u-hap+{8iS#&x3t_@9z4xxAU9c4zH%Szns?Qm0+6}fDB*TM}2Lc
z^tOJ&+wyUM!_(qXck^>D@IoMisR3k=smM6)Dm&&XKjJJq?2H}&H5}31_UJALt+^sM
z+2$0~05SkmN4-@9j{GH#yhRWi_UzgAtQnw&B{T^zH3xb@Ca7CBY@{_{$W6E=N^-*n
za3D!(!FK14FQNvUf%a~2b%U2+X)(p%zegAB3vlRz14WWTHBl2XqwoY{)-;fvYNGjz
z9Sv4G3)g{k?$RBu=w467ArCFSo^dxvrgp*G_L9H7_)l;1LROonGMgT?<}6hl!xT5f
zMGvi~m(J50|CRV}1vo@abg1GRB5I<eX)%S@Q-WgqMjC$PX#yNGO|*T3k`xo<1}Tmu
z1ddE9i!wFLxsV%cZFw7P`J3zoTmPTz2y9JZ$3}yDhu*zGNnft_thO7sDY55`Gk<bS
zzGa+tE0rDgnLo8UnrMIeCfL#Ak=mY*5IabEJYL=Zg_>b+B)XkWct-x-*zz})@;9xq
zm(9^<j3tj5iykpGJOR;R$Uk7neF&n%kg>%OhCo=YcP~_&OY{3*Xt}d`(2MbLFI5kD
zG(P0DTg@Ji7wx}g?)8qT^hKrgd0pW%mi#A_hEHnip9DCxc}F2Sl*~O)9F(Vob_#H8
z&;-^A#c`kFS*&<)=DGIbwN01QMz++()?Le-bj>ri+Bfb>?%*p*y@!;H)rR04OZs%3
ze})p6uLPD_ayJ?pp42sbT37srHujFb$=lYpzx8(dYfj%Q4JO_yUr^g<b#2AQ8*TU1
zb~#)dUHg^N`N@#dLJ3S(GUi#+R_emQ*+E;*L1V#7=GY6)mTv`m{juJ}ZyT+sY5PEJ
zheI_Tj@{^WptjS+8{MDyxxoWJd%HfRxY{b_QpMC;XKb!FH$|pka*uZA?z9#@YG`!9
z-sR;`*Gp;bUdZnBQby}@-pU6(Wt$zP>utsB93(fEQj(H0-<&<ylsVlHo}v#=G^UR?
zq>a-BM(ap!4AbMU$~{Qu9-wjEqd0qM?A;Z6SB<T+#@<n5ZAY1r0Eb3w*{G8nWQC+P
z^bN&!FBKMwuAWX;B&?xMS6`<u5S9;9JUucS@5t-&W_I7dXAJwBf8e|B9<O>jzGm<8
zio3&Wfwpg?w-Iuq?HPC5XYH*nds;mXbGIaFFgTn|&ypd8?$jEN@?$V(>?ni75#48x
zJY+9@z+QU4tpwoM;wakeEZl%-#5cL4KGL`4^qa|<Z_Sxw%bID;s4^2ZK+=&K*AU=9
zu{EPzUbb?LEe1>GDU_<vVv5-GC9JX5*@!o82ynE6Y2EE~p7uI-N4=+$!Q0v31v|Rw
zePBmVgTI$C&_|!v&ye2VkT%eeKFkyzWe$%uXHKv{apcaj7R-0lU+QeQ3WCvFy3H4R
zz#n_aTXDqS<Y8aav%VHj`dVG|w|m9k;Wys)Z@JsP0;KBdtx`P06lXVsyR*^N-Qen}
zxJD|TA&P&X5};H?=N)Kt4Kuq&>!~b?JOw}III^^fhV)5X7G-dl@f|6)Z<sR|m@}xr
z0dQEd1UPb6i9BVkHGhLWf1|x%v%UT{C0XgX!&2)VAc)>a_|W>O<e_n|RlIBTj&&Nx
zgSo@MQfAfYr(M%mRqLy2VWw%<opZiwb1c!}<n7L95?uj~M{9eZtL=l#<?QW&7ivac
zj(0wHGk4Y(O5-<7<rl4GPnaW5n~I(=7M`@!f7n!TL|3p|o41`-Lo?Rv0&Df2HFnn+
z#j~z>*7waGx-s(Q_}ELe1D?1s^iplp$7&lKsdl%0(_HwxQu>U!9)6Ff_4%jtc~Bfj
z5u&6xGIr@gJ9Oz=wP~C5>5G-Lm5P78#<x=Mo@aDT)469U_PGtld|9@zy6LX(vhKU>
z9A6U}eY3%!>**byRx%f8(iiFd3k?1#`rue4P^HP-Y0Q68TZC-oqNem!UHLnPrXO3|
z{mFaJXSpMPD42Vz#gdxFYpyifSl#njP3gXx`is6dQgMEY-nYb<woxCxUz4>*Q*c<R
zf7V!h!CLvIqtl1!BmZ8s@Q3D`sypqj>3pE3^P!r4$7;I2P}BVQUotlRVDR;`=qeO*
z2SwjbYb&9J73U;f-Y#9yX-nDD-d2|~I=_|H=3;h-=Q3KI@svH_jc)c7uW=Txu+>{`
zN4A`|0O4WDo@pj2K8dMe2#!LK==@BL0a|xoo%0@;-rikj>!!7J*4jFX^rVf(+)^<?
zXf)H9nrMxUv_@noF^#@d2#sR1($J(7)0PcgeT^YkXUGO7&{fPOiXMYSW_^y?n5h`*
zDdtwT`ZFC}UJv*EFn7?Oat8b%z555=j=%ACc+Jz{m9%yjV1c$z!ThbB@V9!5(-U{|
zvt&)rxSE`Xxf`8=xhiSh#98sMqx^)U?5Ml^h^y?NE4JT-^d!350ijWPKNUesAT%~R
zkg^r7w->K*&=#*%_JS3Tg2j&fxwgD%_S{Lf416n8nbRkjg2T;-XK!c4(Oj`L(wNJ&
zmI`5wbk@egn!>cgbT;UYW}+<GLg#E*XO7l-XB$1GDjnH$-flW?4<JM5@2T^NRoFmZ
zBNPXcl(f-?&{$(=f-z&NDSL(m|3~@rOoj99h4;A&H+YM7dW!eD%MUr49<?+FI3Dvf
zd&<@31!u?0?#{1+9ciszOmFm5sQz@FYp~+zuW=$z>8o`^YxLH6?$LS%Xgz~8-oYBG
zj1JNGhHL$!U<3|YPr)Am6vsq;aIzt-%18^bGem)-ZXwo~EQ@lDgTRru){?j0R<IF@
z!&Yyrqy8>egFU~>jyrM|$qtQolhL(FC)lC0uT`u&?Cn3$Ouu<2JFfW_e%JbF9XooS
zs{uQDLwcOO-T&#Dk*_9tJbAlx+4sy2OYFR<^hsmkV}^z&01iX`K5gy;+U%`5fFrch
z;9F*JFEu&FEBSjXm)>f%zk1Y5HN($;+2g=pyC40uWXpTm%ipq=?>FY$ujFqtW^T}C
zuGNLt(Ef|``;c5{g9|l*xmy1$t#^jTTc!1mQ#=zD*F>#zw81e<YagQ6M|m5pEFJr9
z@x*r<%zWKB_%+8p@A|vG1@W(BEl_+TXy=T3kk$n;KS1$~(`PKxW^UEy?$G8xpsjyE
zUv%6Qd&Ji4NneNOvwFXtKl0t;@$VK+zFao%?ItVV&6)j{x9efWfHZih-aB6Bn@OK1
zv{aM1TAQ=QRDX{>`mndn<Kh0#H=OjFiaGB#Tl{X5``&J{;_Y^u-fgwxt<b_tj*eRt
zeQTqkSTQzK3{eF+g1sZHr)IA(0Q}M2z9t7e6?+4fJA;*591Rvb>dkiKS6Q>iTe8L(
z!}pp)!(qm>!N%YKgTJrA*W2LjrT6sIy1Qy!U9`^5v{lIgB(*{6PG)He)0i78rV6cz
zFrgTu8e>E;7HbVKsEh^*<skWrE?3cIYjt6bE=!{&U(si1bg*o#HeX{5>x_9iU7nV}
zk*4^Y2Fn&@G(8gPbQTtDd)nRNn6t@YXQTbjCVQNXcY7;$cq+ELE4I1Iwz^`QozYFs
z=th{MbOX#@vd&h#)=|9HUbMzmNM>!g+FH2M+F*sP!E#%J`)u`>+UhU16)dtA%(E8E
zwdT#X=FPO`&ama+S24w!J=u~y){-^Glre@DK0~8SX~RuH`kk1)eT?3o22WS5qqSmf
zqFADe8Q^QEH5Cdg)|%N$>&y}n7S&p#TIdmLxz+}Y>F64k3a!0T=YR}pqH{KdX`L-}
zt`>TCYrVUT&fP}uX=m_uFnT*0{5_0;p2lDwV_JV>XfXbdEE)G&v&LHUs+{@Lob_k9
z8_ahXE^`8TkuA>X4rk>KcjX>eqeHHWL+<Eqe`K8_e~RMnNmtNV+i7g==|7Rp*;ZI5
z4gPcSUrg3b>+Y^~Ba!KeL<UAX(7gS1-u`;;0E2HZOdl9c32bPJF=L)7bD=St7h>-d
zl~DqRHJ9WDDUO28j(S^cMO*DfyKF^!|9@x4My+Rq*}2K!T(9v!cdRiwb}9{@vQ7R$
zKka8`hhge%up_+uTB{>qM{TFmi7scU(s9otumsxPk5`X)CDHSl>SkN2m8P#7%bztP
zV@JZ$@SL&1VMD<~y1WOqSvzQLC4H?iu*~3@XK>C?98-L)FH|hM-Sqx%dLR0v`NHQ4
zhMml~=di6}3(OqbXf5AtDcb}GEqpc}v6gSKl%cD(wu)`m@~v#}EoB(T;C4&dR`O%p
zEU~So$Y!*vm2JUHOH8yh6D^&GtZb_}w#inGmu#_>ZMDWW+b}t{31-8`h_1KAHrUHH
zILOx7V{7fPHLmh?j@W8v*=k2@l{31MEVA4kTj`Fia7CB7qxX4Z_xZ|}xg(3cu_fNf
zVqbKzr*wfox)A0mnd6Vn_ebUiqH}#EvjUOXuwaxdJqmwj5LPlht&}WSQk52|N-M1j
zmP`pns?tlRgd<bKktw0l$*^z)HYFp9!O7v0Ntw~f;nIoW;t3fg6WQQrMJB_^ES)5}
z<GF?Lc&KO`TKIg3k7h@wV7_$N(B+n=@l4UuTgZ1omo2koVm1ba6D}H$HVdBtpAGX%
zCuWvR2p5e*%a(zYm(Vzj{a=n}M<-|Eg_wYG92Jh*;;qHog$n77*zk73nGDM)hCey0
zbP7At!bNyH8bKQ>#N;VirBgGC(Vdc6GBvBT3T?OuGpoWyc<od;vdt=;hL*eV(T0kq
zhKs8*N~XcGN~goe2>eX)F-R>N`)FZVky)9gGhv}3jLZlZPltmRJ{ym)Biqc<Ss5iW
z+2DtZF+L;Mpvsd!$(A|Jm^L2SiYa@kIfvy2Qk9j~+%+~R4pHE6)Z5{#ztd8(-BP;S
z96bzn+)?RZQ`sTv9fBR3zz&TU?ATy(tk=2M7+h<Nw#|xnuYc?pNp{>eR8^a%U(H!_
zBb6OJ9;qdEoCP})z0ThPJNmp-({^`4)ABWa>?u?9jHy^$x>A3?zF?<5cZWV>t3G|B
zA-K}$U1)Sw866W8=fZk}e_uTJ^Vs4yat9t`STHHrxC^saBDOb4pa_DHA=DA)qD7Z^
zK@dS#KxDhX#};!`MTWI(8;scjGez(&<ls~|kG&Gm0bh~?iGmti0S<FyBU(EMRkq1q
zwh`>GM%RHIw&)t*!xmj_j{+QPY>^ef2eSj<a7C93Tjq)^Wp=nq7r7&gd{N+IkvFn1
z5L+bhF`wBHjLl0go6qb>i_Hl{W`P~Pl4-%nj8JqIvm-r17A%<>icAALLio#$R;8Cr
z6375VCTGSli0<SJprmwSh{B05fmXyb1vdL4@YF*vNdW-`gpC@j6s3_#XnBOYJdT!q
zwCbRE3jhcX&V!amIG%wC#4{WT5%zJa)bqo@5wtibe+K!!asnLY5s1L&Orn8|_$9E#
zzC0>?l@SaG;DdP~A;Kf<gB>uz4vd2r1Q8|(GlHqX{;xQK8cYxd2Rkr~ix#9nv=cbs
zgo<bcZ7NgHh2bc=nWZzt9F-tU4dw{*1qSHIL1qvJeFalYp>f8{Ip&-d1dg253=V4^
z6vsAuz55;YA9Oa@ZI0|S#g17kAGw<yObu;dD@-kv`UxB`#lIfxFbj6*oU4u2^@?Mg
zzt2ae={G?Qm~q-I)6^@4o8v7GBsx7@+wo+g^O?9{N1`{9m($?Lt-;SH`n_7y<#58(
z@ojzV31j4>q2a?+A}!cu$lIpP+N2L})CX1?yi3jAd3xt0qjQ`R+8UYkdH(n}9ZeA7
zDlY&CrUs1tRFh<3jUe%X_)k?F+=b|1c38`{GdpbM<e+7_!L4vqg8%_F=(Kok`8I28
ziv#D3LU9l~EYS@B2kQ=dY(2BX8d(K)*rTfe4!Zz{t8A4J9Z(<3+_B}}vgH5=%oAP0
z?11h7JA9D^z(*jqz*`E@G0z{F<1Ym@<_dhw@|VsGmd;Fz3M-u<*^yQ{Efk#&cBGX+
zUjQ7eIN+1w07t+Mk{$pG!W$u7M+b^w?g~sykU9c!F8wTeNnIFopu!NksUz%gV6%~r
zL&8*Er1*D5IJzk#>f1>=z+s<T7{Ae-98u51nBWug`T5Lui4M$>?8uHFwuv2RLxnhP
z9Xq69BwU1XfCh(D-NE>f?11`UiNP(puuvi9&;)1=#s{422%?>+Aw-A72hoAqAq{|#
z<LsxJAd5;37&}s!Fe&5&v^+v{3a6XHlPx*RtobZAHae)fvBTEjep|zb9EJOxMF%XA
zGq#FHJ<XoFgB_{hNU~#79XkSR&8~G|hsM2D=U!#Bty1jkT`iw8O($^Zr`|G6yJ4Ar
zrF46u<-tV96LFOtXA`|3I?$e>T^<9UOZ0o=R<F|uZ|{#a(MOHNCv^2`LkGZN%-*8U
zSZ_#QX$UMbc<1UI({#?Mig~=Y>C^Q_zVGdL#DtivK<KidsFNGk3Kb<%aj4@ovo7F;
z5jZ417z(UA$QL;ajPwXg51tcKLBqNO;6MwxK`@Fzt!xH6kh9p43W=P>8Y9ucx<j%<
z>JAbeLU%AbTv4PgE0`TJXYoXlu#oQXmn~*?032i`v!OczkvYLA6bB_Nk{!?;>5-Y~
z)IxyFK-!WXnU-E!1$IDpFgqYO1U|@5FPR7fI|v+zF+mC;G$ujkOLmCBt~->}2&(Sj
z=#^-IgNS8cnmmd_d=#&RF)a8z+!9Ap!Z@`RMlVl2KfgQsa$Jt^AfrLxfX>7CkUoy`
z$uYu%JQ<oo8YBiAgM&vTM}&hDlI{?h3ml?G(ufz#2!RP=hxE}>SBMUPLqbIGg1`a8
zAt54gXnK0#RA7RA00J$`4LFRCq~hRlOi=TeRAa><VZq?wLHIC#y()9&Ok4gsYrzIv
zz0I};J8TViSqmSs6z#W_9&yGV_EbKR*7V6x^K)RwHkjmv#=k}SDmaK8>tRZ8wNbD`
z@vK$c%Z&CFTIV`b@v$U3ZkVQBcg+5={DDNPLx~Q@YdbugK-$v%OdQl;c62{m)A#Ax
z0dH5Mn?3sPO5~ir=!mZ1kl22{!H}^<m%d6LT&(xa)On_AT~&&;N^#828uVdWuV<1v
zg1`ZjT7$Y3n_!l5HBW(I9H2pqI46xzSM?y{R7D!=4jxoR2jwqY?$RA%0s#ofpccr$
z34s*?2eE_kVUBE&IScC!0gg3JDt4@K#8$h?2_LT5DzL*D;e=(mGjbp2ES~66Um02`
zj>VqRg<uB~7O*2&hIWCkbWR`&#X;bZx+5(z3*Z1gm>sM;1U{yM9h|d-Bb2tV?f^KD
zxj=M~^Z-ymiX=Odbl}VdydZsX7d0rt>tq7Hb;ohIa*J?fg0LfL!Yx-T<QYWWgnaQ9
z#3@cvM0JD07)}n9j*1UDr#zc1e6TMM$w7P`F{q+}9T?Dnb4rMyC0Gc<QFH}R@TRJ)
zkjQ`|$61o3I2ebTV2)6+L)1G+gD@<(@Bv;hJ|sk#9kBGmDUup!S$Ck7zA)kio75U|
z<SrkeL5pdU3z80ZVFe?Y!-MQQbEesHms{&?u@&yH7VWYY?=ctewM33MDo%TvJQ`~G
zNLu9)W7hIJ*a2|-zu1ws+TdPi0z15G71vUubGg>BTFJQIJgtr$uDL%p-jis3IMM!C
zjbsP16@Y`;(ff&-{_ouE{b(XO^J^t?Mpt-Ho4;S5v)hopRu|f&3$D}#=4riC6!!$h
zIYqJ0jJ7?KKjQb^4ks8E-~t2%Q=<+a6-ZJxfE^fNaL}NtO(@h^DF`3X*~X$n`XXUb
z8DX#30b_`mB7!DjoGl3;ypVDh_*^TsP|1Vv!R1m1jz-r5ACB^k%nq2VVm<2)DwGO#
zq}Dq;Wh>lK0td6hSGLqsx+qY#)Lk+k?11#}N9W(g4w1IZf<bqr$7XTP5{k|Y!>5FW
z*pU&Nkxt+MK9Hx>r7bWL9imnWa8TMJz#(`+r3d(;OS(YtB2|45Q_v#vbE5dNB}Q=Q
zvXlDF&tWVl@CZ(uYD^7eL!>@LkR!Ia>LDS57AN7e@kyj58A0Rnt>GlGrRFA#3^;r?
zHa-fI@4}X%DO3k-Do~KZ$O-V12@4r?2ZMt%7tT;%zyypTQU?xbkR&hIR1HFvi@HIW
zES*AAz+o=1BL^|U;NZdJA&jeNU?0W=VV}D&OvsANg8AytwC60gHQZ_~+G#6!&=%Qe
zFFWdPe8$`SF>lMKY>^#GI)ZevqLL!G8Kwzrg6RXBlhoM2)PQNdYc;;L8qXS-*0oya
zTB&g?*V>mG-K$NLe}weVP`UJ{@Y3r|A565|f4j}m+IA;vI-HJoIvb~o={cCFeVmUE
zy`1Rr+>J(Szf|g<w&g#d$=R;U+HD3k((g0-X6W406z?3ZW0KW6Cav_iqx*l-hJD~_
zwTE#4V?ZQR5;9YCJ&6vekE9+!Yp+CXtD#QGg$R2_0C<5G>|m`S#?=Z4@)VXE#FrRN
zhT*k*R5<F{1b{X(I~+)PVw<_%k(#sEC}AOR*kfxsXR$|DfgO+@k{zPhK{<;j#>Ecc
zV+nLepzJ=Gvj}|5L(US6&G(f;Zp;BVkhUOaNsG;)6_&`104=XTaj3cjIZG%yJsh3R
z?11P1K187uMvf32Q!){yh&Nh{P<02w7%_}UlRl3#Q#jOR*vp`0M;edFadxCS;FB;c
z;1e<giQprQ5#ch1IjWNcp_4Ev;LDRUQ@AS~3?_vM=BQ_bFI5cvfGHf2-6UV?aucQo
zx;)6pV4uMurU4e1gHs{$0R{L3j%5C#<|(l32yzorA8ewFxTV|#(u4gJSp2F_fZ*JO
zjU@*A3>36nUWK76$U<mf11y*$3=}qr4;)P^oaM+~VlCQgE`7)tJ!WqFxU1PSX)PWL
zH9F+XU#Im=gz0=!e#wpvQf_E{DmZk$bzleK!?Q+luhzO&f*oXzWg6R3?Y&={r`|M7
zyRDycHE-o@$&R)U-~J^#dOeyL{7RzN3)QW6UDFhwwdC#8W^dJI>@o+IYrM-$o+*0I
zXvIy6BN$q3%sb@i|9N2G8@5Uo5u2F^@WBp-2wBA@OyD*ZF#;kK`7An^9jqe|`3w%x
zVx|fdv?-|yX%lvs9eg%!<r*ys5RtP09FiRn9WY*Jah9|6SnDiX3wGF}D+wPWXK_VW
zc*<5eO7C+;mw_Fevw$7m*b?Xt$qr%jNP0x)fgM4T9%{}4ON-u-vyerniKP~*cZ8$U
zxK_&45DrTZhz?q3;WgSMI7n-Vcvj_r2<*BPhL1{ou<k&J@)y3$BRHOUkfR+V+$CR}
zfh7!sLv}fmrGXk8(!%J>Z1PQE{HClj_+9uNc_w}k1`r%JJ~NM_#hK-Zd@tq#Q-dW2
z`|L=pNT!IRDmA!eYM>1j;yk1{*Z>Q(oU@>%im4!itaoJNzpoHfB~kzxqTW%bP2_?L
zaKI2@W1qnxM;IbJIh7F%2&qJPkb#0$I5Vxe3+$x_ZOBt9&-$95Pj7k78GS$#UZ{8{
z>->{o`T*+=0S>{A4Jqu{pt8faE|nbs2eU)#Tn2V1riGdz|8h*Z4t$s<e_ygO(d@x^
zs{=Ky1UuTFs_l5Dw)2^I_eTUi9;xklE<X6BM4wAFoessdvGd04E!wP2n)EG3|02D6
znZZ3);~uCu#~VB=ZGi`ryoYlpej6BgS=KUGZZJ3`CRlW!B}*nOm>?!&8qon}uOwaw
z1SC~PQdWqxB{?EWq%ff`c#v9QcsUu3B-d!U-T~18e28MlW?H7bbDahFu*cSb9mrWE
zJ3JL@7#yB5WG=)G&RLipyuZU2TLf@;O6Ey+@Hz{#1G<CRft-cXmQqk-dZ2hJ*g;!7
zN~^fuk&ZuQDt2(mV`^rM)@z|VLdBD0t(56N@uMO`RTl7*p)O@e-8e@nS`J-~*k5%h
zjD_xiBhJRT&tx@K5k8$(L^4{Y1}hE(IgDPIq*AIQVId8J>KhT=sI<YxCl3{lhw(X?
z8W@-Fn`{XRj1Oi9^CA@-?63)TU=Uh^j0wV-i%45=lq#cWk+Y<%u+SjW0chYw7WSDG
zsSa8ga|CTFCfGqMjoHE4gu5`YzKf%T38^w9IPMy;7A&>J9`QAKEWP=;^vXlldaIRS
zl@hpDOPi7>0vv|m6a^Vd(l%0(a+e8kq_ATZvjgCO;!xSq`_H~f*KCu1a!>!Ua(klr
z?nH}&H7$=O+8nPD?4Z?_ZfE1n4%ncJ@xGT6T~8;>EuS)EZPaJ1rJHE@<{4bGwf1ou
z#~7_=mMLw6;@{<H_fFdQE5Sjpii!sDg0%*G$p~f#o4pZDkOq+=b%!a6m%~?i!T5j!
zng~@wqC-7erV0?e#9ql71n<JHLaP!))=GJemPH3luF;BeDUbnM%X`C^9Y|PsZ<xD$
zHF6f<BXw^WjMrJ19nc+Ok!8MQM<9x9Mb#b54&*El9mrWocOXfLOiznc@j46d@8Eie
z&>ds|hp>srSwh7VX=4~7O)On?SX1xYXCpRhjLre0q)W*m(v5W2=n!NyC@O4pcSxsz
zGzdtKMvxW(6)6cp1PKvQ-}C)l@1Of?*LBWwpZmT)^~AxXBI3#GxRl79NAW4Lbs5nE
zd(<_xU;y8Sp_w<mlk!k#WGg+paxPAelw44wlpIR{nvUza58eK${y6va)+X%_IbLoT
zMv=TB?(i%~K8zD=9jrtqeWfsiJ32$2fH#zOhbGB$74kTZ{j}ymgtBv3^4eas{2-6m
zj;sqb>B%Itnviv$z(s3YbPPmoUy&Y&wj9)cYrA8VSAl7Gu^RR)^Y;1z<h<;c^=G2H
zpAMWWMP*e!9^j4(8(X=v8Piz3Sw64vNSO~4z=~{|Rrz7fs=fmT5@O=P|5PzY^s`YM
zDs9iaS}Biee4cIupE-}D1XGO*_{bGS9CIEZI}#`#?FRpop)H!_#XhlrVdGpW^8S}a
ze(&N1@X&*v<NH5;wQA6}sc^Z=#B^hYp1x?uH~H&0sjx|}sjvxrh%lEQB&y&crOTk;
zA<OV9cH-e+BHF;}X<KGQFnSORGYM6q)GVGLOQJ|s61c6t6QGXra_U2xj{&TtM^IV<
z)nzM4R`v3e>jRTR#E^$?-V(yzi&)l4H(X-PRIoC(yNRxQ*g|sAL0-2Z1R6}F!|zU-
zqo*sxJ4!8FBq$T390=6!wrYFtkR&lFxp35AqTXbJzLCr$HPaMB9_||=;gPzAI;o6k
z(x})ZgVt#pvqzY;GZ&^VP6u*(c!aSNeWajMb}8rUH2)dYxw;o)3@Mu7*BqS^!Tr3g
z(zn$z#s<;3s#hoO+qbv%e>LQDdhcURk|?D2VeJ`=wK3F&8Z>H^f=m{~P_{DJ2vTE?
zX>u!hS8UBysptgQ44a>)Awcn8KTs=GzX_Nb!m7wqKt1zINhMhbz;pz#r;g$LC`lm-
zuQ<`)Rs=fK_V=59FaVmUwFfl==BEaWzxncdohQO+jm1{ngL&vR(RcM+W1rb&00MBP
zLFHfwDklPw1LJT_x#knUEFjT+DDx@D<8@E<ufJ<<nlufmpK^}&gUwwvf8IXrPqk;g
zGA|$Aj>ooe2$i|U4007cj$fBE+GeU=`QFwQ^1;@I{vS)#miNZG@8Y-v6|A2~Ny!|e
zt4`UN#CM86;slj<xah%yS4L#d<LYEHWYbEGG&gvV<-wywLzG$25=g^}w_tE?j?b%X
zANm56G$9+qH1#WEYcJ|<+|Q5*PN#rz7Wb^nN|Qc9&&2LgXXd81E-qat$5H~ZwTq~c
zXx74*xE7Ve0h>c@w*&=I<bEmTLDlUpTe9G&DL3OXy5_jIY2}1haDQjXL1dD2NYuPY
zaUOG#%7b>U08)AbPNA|beu!Lok#^*SrbQhg1(wd6d2}Zrymgi@9Yl+IGl7RD;qeVT
zarN2abY0mnVDnvJ;=;_ukdI3U@Sx&Y;O6S*cw=|}DfjK!!K*Z8%2Wa(Jt6_6j6lu?
zWa^M(302FnmTRmb+gEHNpeZE3Z$GD=D9RJBKo)MeNjL$2&@QaaqXwlESS8z5O{v-T
z$RwhMrDNj>2s!f@KSoQ4?LgV4TXv_-hi=o)hEje?Ke2D~t)G;c+%I`ZF)c;nJ{Qz^
z&_>_qi}U(>;Z2dkgId19BBt^Y@*kYsV*9@R{#5}iv}Zx9Z$cLvUWu^xe)4wEU#u8O
z>A2;EDlE^oZpNMX@xcy%P8blb-wzDuGkSe;o7bmh2Bo>3_oDOj%MjCpKOZP&?go!D
zjCKyMU2xA{Jt!l!$VV7I801s}Fb>|rvKj#jGh<$<8rP}_Wo-~s1rdxRTaP-HNoZ?`
zK{T9G$cWLrqoT^^Kmt_c(x)1s>KfbNP1^<_o)B&?%<C*sH>>Tqng{LEFh*akRME5S
zCIVTHTHc|H6m_R(kXyp!V2Ktz)}mXNF-Ak+gY=IdBMV&_{BsNg-T0*m7r5{06zI5?
znKrgXaQ04d6FM~PgPGIV)so{&Nf?1und{l>9?3U~A=FW|V^?W#WO$s5+Ki?Uqj^^X
zKKCW3q1<OjXQK!Y##?0}>5`E>;ikc6nrJXl`Vks8JG9ei!P^u13n3(SC4QtUg=9w7
zf|xUs9nk(nw;d-dXqW{RBa)7w{j(r)X?x2uNk|Q~;0V=y#S^>|wc;irUr_9{36I#{
z&*VZI>KQBqAS(uArb-@lrU6!7J+g<dr()^c9U30D<L`|r$^2$=hTgwJRE=e+-cSg*
z_BOe;H3{8pYEg~Ye!seD1qz1C7V73BSQf#Lr#i_so@U=YE*N`2`?eE~dJdR7{dwlU
zdQh&+|8*(ft_`)wVRzs9bpQP&D&W=6!&i3pTJ1JJ`!f0s51&`H%q)D+v{Ddy^|wg=
z=l$3xZOA_!9{Xl{S0$>M15nsg=0J3?R_vdi919|;n!JP)hCI&F=HVkaY%^jN#HJOj
zg*hQ|xsx~eib_7AzS18R7%L}uiHj88Af7SjlYSIuEl?R-;Z#8Rg8uO^+n227xCfg{
z8L|Aq_1Q;Se8O36p&7q*BB?@LTAI8)OTz_LA`8`<Rc)tLqK)5Jr8Ou$n)_NmVPzRY
zq?6t}$0G6$b#lQQ2oakDGfTQ}sxw&e^Bx%K6!Z_mpzsKwcg0gAge&owscGpow=8ck
z_`zs5-_TROv31!R)^JVf?qiirwI*_O=<tuypNW*vzv2(6I!4=Tl?25Wl5U@2a#!(V
zNAM+1XZt}VqWDzPOzsR$Cl(~3h%XIJIi7%751#(IhM8=NGBAutWDu!|&H!fG6VSGN
z9A+shIvsh6=jKt(xQfU`D6^=*^yHK1+pz+A3_)p>{mbv>w^&^LQl%b^AAo6J1%5ae
zbe0!@>0T@7hL*`W$Ey&-{>e+(oHkKwEJeICBAhs>p9{^!w;%t$(^&QB{S$O7zF*7z
zIjhI7r+tnk?+Y%T1UmZwo~-Rp@qCZB-@^E6cKo=ID@Kc70`*fDU-jJ|f2<r+n3x)_
zC~@;kZGN&TdxNIPy>4F7#ILdC^?RZ9qJ+nZTh@CXkLIPm-r5@}X&d_|BYW;T36<7{
zx1W&mPDT-fiA0>ic(LHz@+w>Id_MxNN?9mn-3X@-IMyfwOSQID_J-0AI&<cGGuz!a
zfHzW!L6bRF6^goT-aVLx?Zfig!nvo}xexFcu*Y=%xXbJ{-Q0ko@?GJUFOAR|(5N5B
zcOms5uGLMEDiwj1^!jWX#n1rAN;-RiNG0Uk5$6H5Yxo=&`3jyi(FFj&90_8dw;8@R
zbrEvpCq~Mv%?y=S-1ie#oJ)YRLAE{Ul=)RngW$7zl%$CE@cUj8{Fe@McchYPN6}un
zlmRY-XG9OHtjp5NPn&z_Alm@I`f%0pI>JHtP9Dq0=u~Q@O^ftM<zP%)s*@V*2TbB&
zK4K_>bfdJ9n7dNjG6I0v(Ef$^bo;m@s%FlVW^HU~HaH4_A;Qn*5r9>qWvO26`zMON
zq+trF8iqSAcK^=rb#~OaM>kHVTKa}yKK=eru1XuYoA7Oy26G}wOAm3`JcOVWk8D)!
z#+-bv7ebd)J}G6C<*XO|A@xV>GyB$)y_M=N7tKu7k(A}}e1u;!VM4_ovy<kY=9X$n
z1LCi7`TXk#V>gru0naBD9S+x>f_#@=OMCWdSqAT(|Eh4`p=u<3ubSBpK}|!|t2LOn
zIJTS!S-Y8Bu!daRC!mAV%kh8a-zsKTl~)M)lSmDfHgFh1vgX<C-e!PNxEpwlv-tey
z=v(SQ=w|Xi=9UcsJ)7P?{+*=m7>|*g7uAjZ6LRDZno~9kN3sU~&tl;SR&OI3L{^*H
z`xP!BJ5y0R)%R^`76icFWF(X<d@+&}i7*vP7P(MkJdMUoSdHw$77$uCq0eG19gSA0
zg`>CN1t_Q6CPA9=cEmDft=v|-hMhTXSUxUCY7`2-m(@^8pP>4Mm`KIz=C+inK9Yyz
z1d08Z@=#Lv(3t(H2uc<iuI5|ksEA1;gY_oL-VUn5<sh*+kgzEGJmcN8{xy2{?a7<f
z6-E+{JL%S{7sQ536w%C}5^@d&eqfDA8xs<yVZ(&J;*F>9&(LT_>kaZqRo1>sbE#4l
zZ9Rc@d+$4?AzlkrihjY9ll!rk6DFnOJ<_ha9<a$rBZ_)D@equjI58hHE|As5<XYG{
zv{AshpSR#x#beS&XjK_dtj4jNFthb%vxoupU2}WSIN6!B4d>4=HFQ2xvYUEc?j7b6
zc!oIg2)?uaL#_PVWN2*WE4%yeX;AlX4W=~i(GV8jgpCNrOB*c77qD9tCbG>)k-R5-
zv`3N{ki2E-%pWEnuwwBy{WB5Y%|_7=6U>Be2Fu6tDI(>U!LRAKz9PIiM=vYB4-#?4
zv3MIhahh#Du<sI1_~n##LHyRL>s$7j*o|D%BD>zc;%RzeN>99)>xcdF-w8e+QhO6K
z17@7crZ&HR{oi`D3{6v(BY%%7oUko_NhE9jddgy|AcTMeSgssuwQNci2~yOLGk*2X
zYyn7Icz31x5=z$nG<$lZkhmLn8KP7)=0=?Gf()Y+q30ePH31xgI#kU%G67-8wmM&H
zwU1?_`<7`H$T`8x>{Y|PZYf*y`9ob-+Jb6I^Kg0zr5)!9ej`F`Hl`wvd-o+imAXBg
zh907AJXf2cwIvGEF6l9LZ6*NNDLvXe&TWe-Sr0Qz^CYzf35LMMMH9Xkr^G@eIp;r#
zJH-dAfP{Huf%>hZQNt37i1kb$I0}2k1$ZPaL*}|T!8p|~SdV#EpxW&`OGzlMHn4|w
zV|tqn9$4Yf5HO`R`wppmh*-t5UJ3D4y2=8Y=c;XbTQf@MaXE#*>xqSmqFM71K^t>d
z=3j4KDp5)=vjpv0*9V9$%QGB&OT2SAn&6Y}<iOIu*K~2~sY$;y^@j{J@cJ2j!)519
zT{X-92)IG)R=|hB((^x09{`as@<j$N6p!@%np!@{Fn^;u_{945k~hJ*sA>GO!tgVS
z<m=^-?-nV7P7qy+JORNRPhv@Ns8{o;(Hn=1Bc&fhM;pfz(FTft-Z&tYL<fGZrZ|5G
zQ))S~Kly6_1SR|$D)@)<yBZ`iQJr%+T<h~KezZ%KL}Mc-vOhH5o=#q}{`CA)=e_Hn
zD2`_!Z7?X~v)^p`xZ>EvmymlO0<NFv2C6n`yW59ufBznSBe%ATgVlNJ1}67-7xe`a
zS3=(DL?2`3gW4-mJ28Pf!f1#u#hF^o3g|3nCKBm*nn-z2ZmaWZA#ekyHeQeMmZo87
zX~5Cs^!PKRH`nlmRNxSG`-3v#PBBp=>Rr$vsULDnnfPE$@wSiX%x$I}&rlI=Znd8W
zT5dvHQ6Y|C*!XSh*J~MT(X+lF-BB_WkC1UIJyXcLh1yWLnPD-_TuR0BQL$PO?g}gx
zK@tPDW?-R!8RAxvzqo43mUW`%II+NCsj7u-;uvjLB3ri5#^O?QU#K7E(}|liBxTf3
zP{{r7*%r?p)!5W)r+oZ!Th=%XFG9gK-}9TLOm?9z34Z`Yewl>!3k0-8KO}GeXxzMP
z*1l@fZMW&gZ_UY_&BF3sGD5W(SFED6%N5L2n247D4Ib@=Z_K^6h=$x492^}=G&`eO
zD&}z+2-3-vlowvz#dY8O5>Do~P0N4&dO2*bd;Unl$am&5-A|1I*Ub5DlS9j@w)Gb-
z2tAI!xF;?_Yc;+LW8uyvI!EX`H8iRbgk#*^8_+zJJKFZM*lG3VZJ&sW)j8*;{@(^8
z3Q?+y$Z`A7GY)PB1>%46d;g%NJ0a@@?+?njQ~w<AZ<j>C#Aj?HGBiv6odJ#C`CGBf
znfx&^3e7~lw@MbCRzv-G__FXXdVD_Q+ZUTNlwwrCWntj%zB7l&>QmBg=kuF!^#)U0
z800|t%91dc)7|ltQEpq@TSU2`&Jp}jm|U&T**;<k0#(^S2M=<}PmB;>)uX_pN+j_q
zXwoH3v%KTaM#P`enF~n5;}WfyI5OMH%?KdxP&)aHL@Dt8mWnw}+v3s<_Y`sRj22Cg
z2){`jf?cz~l-9`*N-2HGixSr~jLCquQ-C{MOkYZ>Nn%$ca}dQb6-RLHsPi-+hKvj@
zk^kb;mnlh204H5Xz9zs-{6P$G65H!y(sAe!u>`~&eru<3JCYPAvr0FiPaPql4wNXw
z52@~S0%es2SBvZCLF1lD!$EdwSY{*$1kntWOm)|E(;DAExKNlMELJn~o8?ozc6`%6
zo7eZz-nXI0qo679MUPhNHVh-|?zOL=%PZU7s6JuNDSw_4P4YXu!KZ%?q5EwWHKck^
z$Szb!aK)&D+vqiF-ow}D3$>Hx*>?OgI@bC}#5pJCJY3dqw&EVF-}d%?yxL~9P=asU
zyH*`v`xnGX(?a3jJ_o@5;-$al?5%(Qv)zAszn_Ke2Nw}>4M^Vdjm)5yN8B=<&5Phn
z3^kk4JBSl24dJKJ59v>CNV&tO#3;xPK=2#CouL<;LW5v9=s7lk;h|&B$})TA3`ht#
zLRP8TsinHz&iKVp(w1%L7of<67*|k39UNhg*S_wR%3c=#^=VUv6n$Yu15y{aSdmun
z6-I4ehoObFXxSqyAU3rlHvPCX(W;z0Q-)G?sCAGd9};|0ZR{|qm)<d_KU}i{2!6sB
z#UoVTA%M}~W!vI$ea6BrY>kF5IE(B+xtvfWI(ZJk)utsFy^}+kB18S|29Ywzy<M?N
zJwhY)Y7QweaJ=6n@BQPZF0<YoBSc-w$LVy_C}+y6zonETeN|DO9m|s>Ud$F%(XlZ1
zB|)H&hq_b>9z{f6%0oLCZ6e7`a;rdNqZCEVcO$?&M>of)M973>^Hji^vpbCfJ0ENM
zM@|=>MFzHV>PS*0P#`)^+;9$1wf5}9O}N_+@~Cax<|H7lCgJ#^s(>ZU;P#+g$CGqF
zy9S~G8zlmOtg2eMkm$a3d4oxF2bY&^_(yiTG}#CNf1FpjuuR5=rQQboNU08t$vZl`
z=m^VdUO6VuVSiI}qJQ4MHgT=y!rD@?g%2I=UrQK{=hKWsG_Y4^Kw7rx?%IKt57o-|
zxbIy)yV#w0LEEC*nZ4nb=$DS~Rr4)ujJhNud3wNfT@kPo^gFNQ)Aln8eE=A`QhzYY
z*HRH!@!I?DFj$eTUA(2k*y1k%UFa+IR_FOk-Bhw*r3V}QskA8jQX-zolo#wzHfOVn
zE4|N4Ke0I_jz5p(e<q=cH2bR%{x_3p)$iyo(<cyr_pfM~zwUG+ab3?Kb`fG<5pPKl
z)&oB;roR9Ez8}qVw`K<vZaC@8`wsP{YrSQN*Pr169R9|ZQ$FX~SvS2o0@15PPOc{4
z6S=>^`ft!fMm`W?_b=zsHpeT&=gI(-B42$LjoD&h2uhD$r5^ejM(6O*kjUvt<e>5d
z`Z>l&WlTDj3rDEPWW;z9k^yEAWf6KZO^vjZ(Jzc*(^H-5ik#mmKTRThxVp)^V(J2P
zP&BbXyeYr<-x}|a*?NwcQu<Z+Q+U$Li3kZvba-4Q-B$D<q=JXsiam-%k_8WIU%ldG
zG$9X;GyeicWpHBvzI0Z!p`29Pl7O}z#l-w^DD*b!8;35R7>}rNAS6UPu#!_%C32LQ
zV@tVs5Vw%78K(9ffu@+1b|qjVf4i#N5N5h@!r=Qe=cswvrasF3tE4+XB}b@M3i8MR
z4*o6%&q8wbCs`|w?QiF;_Kat?tgV`U{Tj-D&o$-6%}UE_v(@s=uel=J7XSwKJ<3;G
z92_-EXye)4pY1<B*lU^PVJXt(U;QvWCP#9{))$Oz`XaOpvKWNDpWtY4_LUuTm@2*^
zUIBdq83SEJ){rfUYA%Y+zEnTQ^ldw(_jZbNR$B!1gcT>55@cF?SJ+_a-p?Bj1I05>
z<=ne+h>&5BVFu&&wt`JW_U2hhYmSeqF(F3DLn}B!43*LkxvSEn@TOx(?&ACfanYrv
zb3t`OzlYdoFlHy@qibrz=YX$$MVf$Q?;}0yQTn@wYse0=qm!&A<)N)4VL}vJl`b!8
zglmeXdlT(#R2m-N^`TVD23QdpH*TW{V9SUMV1FB7X?Vn&2uFA|n0|#dbN6|u<b9X6
zR7p_fRP|AJQ&t?rAHh$@(rY{PKqQdZyPAqg`CL8X+GNK=j_E_(9^aMXl?czUAW#Vi
z8Fs20%ZzkHK8cA_BiWPnR*8Vi=Ft__mHsEpgqN_1HNA`<D(e<_>a0#1Fo8S(P4R=3
zBM8G)(AXqE{t_4=p*iQO%7{CPBKLCxL$vT4N*4CQkm1sEM;_HE!cqJcfh3P+24~l{
z_YX4<2`<Ry32UUzjcBbV<zL0>q_DAR;@u<OoR9RyL;C$0h~tcJF}*=+^`v9H0y({t
z3HVNx@9G(?reb=~<Y<>h;-OvU!n5;~*W!s!Vzvq^x){9J&Zd{G<PXDneIDQc_nBVo
zrKp{mNq2uoppDPLpZI;%)7HLI4M-Wvs{qmD6PB@%6WrT#9@slx8=9IaWyhgU@svyA
z{Nj1=9_`qVOt&d$;=`B>KmO2JjvL%SE7j|-EPhkBzjlWlbw+AC5JUQ~vhI4~sJWrN
zsOTQ2*Dl<-rUI|Z=&h{2my%5^y<?1|fD?%rGbzXF&mlC~e_y=|`4{gu^6cUGr;dbg
z)%<p^speZeehZcNUXKEkCo<*OF*qsD!1MkhejF)-xihe6ZzS}mNXt_EY`Zsws{RAv
z=&3=H!sQUh8S2P1*R$e5VY{mLE6Zv-5wEKDi46bk5?*wyOb1c-u$WiXG|akGe;(1>
zlr@M9&Z3dp2ZwXwq_eRITYlG1AdFJT;QkvKYnSxgb(4myLj;()eS#~rtd8o6>%`O#
zuNWe?B=;jM?G<6Cf1v~atx|g8bd>!>Kpvm?jJ`j-FN7v)k%5$abx2%40oH!hJgK~l
zP)L5#o<WyHB_NZB@K-|<bJw}%-k*u*yqYAS&PziQk<VCljcR4^5yAMNq4)(t5h`OD
ztBnn4EO!__U049VMW<m%@btRq{kEjo#tH0a&;5+AQ`83&ou#)EKQ;3GLpv{ro2;t@
z^nJM;LKJWPDIWSwxq6#o6(_>ncC>0%TsTiQSoU*${7C5$mv@;oU>(k^DGQm2$@gBA
zN|8$lD4vo2;8f6H$*@xXf;Hv0Ok0IobA^lh4J?>Vw>>nk60)M)qigUk_@32=Z*-qj
z>t{28sMycP=W0Wrw*7Fm15RwdUO#jm4g3qDyndrdAvZ-iyI<1l+(g9pgq2C}XyYv!
zi)b$fL+sojhbfhQ?{Leur-Jt#(P|uJ`d9FzmD8J&C<4IxW3;U_q{6sO9($Y7I_t|&
z?23^NEQ;g@-R8^RI=`67do_f9W)FEwtbNA6GTsp;g5hBytH4N+cr2~Ox{%2@M2!k}
z)h$B}!usQuIjRz^uucJ*U)9^W+{-8r&OM0hLeh@4J~53QZ5$pimUfO-FC_8%0Q#w&
zYU2?NV-Io3P<(V9JJ;nBQPdgvL)YnH9^w_p@a8fhuo-bI54i-FfI(<fsw9dDBCeq-
zC>2^56@yV?VB@+s37v}sAp>ZS-<+b77ij-S%yJyH`TYQM^Qy>^pJFMG;Bcg|xNydV
zVL*OmZEXS%)S8}m()V`{8&R{jBUdl=hdcs)xSIGxx)@?rf5yUK0#_T$V-*Uw`xUI<
zM3Hi5?`_+cCO`V`KeCRSWo+xF^2^B$q}*phzTEe7O?~&cI})IH8XsUh2`A9p7^v4i
zTN_&Aw_d{&l4*~kGMW1(A7854t@A$*>hlN-n*0iMg6&}`{nW91L}7<GO1|X&`7>FN
zS5o+^?(xOW)|d7c?N9D({#t+d?{NQ**!YQ14)tf0=ARwrKNTU<RFU!bu!u{SNL3g9
zt!tTV#0Yf``yGH?PogSAbj*p2E(yn64F$nVN9;+tycG>DVAhyOG0~U2)p0t&;2uHc
z0e}1jhK1hqS5|lmn%JNwfl#a2&N{{a*oC#T0_m`J^aXjqM>|V2mX>uv8QwCX61~t}
z5EHK=-~iR^#z}`<jZi}Hu>MU>2W4_h+}(rr*SNY$Cli6d*e)O7A3`H@$g2vQ0bBI;
zclNNJm5)esce8oqD&EXE$V!cA3PioPUl$0!6M0>_u{RMryvRi6pEmyGj+|)fx+_JZ
zsgf3C?5c~Lcjtxh^2bqFdlG$c)Ctmot*%GA8_uXk`49xl;n|l|oAck~u7G~mC5j|S
z_e>P8A;oHuiG58Pg}xA<Ffk_OY79`;;!YwZlT4BuTICVgaIRiq=W<XvO(j)`eNpyB
z)SVY|qEb9Y+ZDs*0N$QfFD&UEJCW7=^QySqr+BMj7fbxSUgElbez}nOa=Pj`3B+Q9
z8a1qij+S9ncLl&eI0z^uU%c;0HC|fPy~M3q|F&gaTC?RL#{~0rE(tj;T66yE^K!~p
zydk^7$yDR`l-*kqsj}bUhvAa2;6Q~;rtl;4f^pgkG2Uwh2a{*-9OzuJZKK-mv%bQA
z`lToboLEj9o-F+=p8x##`yZru@d^m|rhkpn@VAi{qK>37dm^rw0Z8y)a$ZD=0*X%}
z5Y&3)OAy1AO5Vv2GEX==NOlm~|3KgsnB&JI26`^xyCYIp;r{@j_<?r??RVmNq^PG~
z&dc2PmGYMdk8*a@+v|bD;l87|#tKaKKZvi^p~l&~lloQR^dH0BAcLDi`2u2Yo7SEY
zqJ0p_eb@n)Pg$}fpoHbk0^W7n7TiW*j;x@NK7YufRa|y%h%o`T1R;f!X+_;7uA~U{
zWFB>H<GvHApH!p6L(k#u557Nic8E@oiu($^gPF1-U5pIF<HXI`e()<I(~!*g5@vwH
zxw7&Ack01oz)biJcpxWk_9`uRlGkPdXbVe2mLUXeT+tw?DQ3{ovhultAirupxo#?t
z<e&f+8wF+UUVxtsdB8;sG;Us~fW}go@>v8&4Ain5Rq#9H^KZ`DhHw9>;dM`F^2qJ+
zNEYyY&ZjVwC-*M>_Eh@q$vj0ZX91IatLSJQ8n)KK7J{WYXc@A$jCN_x`o*EJi6hII
z_h=hm&so9i?SW~BLVjz%9t>qmMd$;{73x(x@?g`WR2jf39xl9ot_EJfS$N@78eh;9
z&G3<M46N;jJB^I0eb3!;rCMK-4e9QF=KbxWB5cs?&z#U$x&;p^TswG05Ghk5{N_J%
zLsVrf9p}JEtewI)(*FF*<}=yOc7|amqDpjD1XLw;F2^K^fVcexw@&Vd#r0;F8Eh0W
zm%1?iqhFIV(;=*Rn8l6?gPGZ?TY(052};l1g>VNB80%Or^*L_cuW}U%Rqf^vhNEr>
zAc2}uz+6AAawr@qk*H@0l(I~Af|RvjaNHxvr|PVZ%;k4FFVf-*iA4sLU$$NCCh0}`
z?TE{EeX$9O3ne6mi;sZSq-a4Y1fUF<tk>Tmk%Gc$oF1j+kLbEt&F@~5dBo*Acty4x
z_9PnV<Do7|E@pflI{XAW433fWhxcF2o4&?-pf#Gc?}CTfVxURYMh$cv5rr6}B2y%;
z3POl|2k8WcI6Nag?*et^d{vx!)C*&rbDn;T3`rP_N|G2*uMY%@-$H>~=d`{)4SU$O
zKjU`QXT&(B_}yg~`S@ve8|JliK%MlHdZ~cA+W{Ry4>D%ntGDEMBvI0-Mvhq;XxAng
zXMi)8lpcXynmv8YSjb-`cy>EE?E3x)eDvLbb-LfExxHia%?C=0&!QhKZMqt&T`UkN
z!PF5}4&56v)C|vc$xY+g>c|{<ykgTWYc?GsmVt)vr_rx|QdLJ<P!2!6lX``h`%&k<
zM0G52FBHIzIn>^75Hctcp7>d0)5VS$t^X<G<HIr%MOP9Ui;EEuzj=_+Tv~zFG0rAn
z$kThQ6qVjjAPGPv$)U*q$T=G2kqcqtkdwY=Y0W&on=P;foL5yKJ=>>%wBu`Te+EY1
zV}R=p9B(#WW8z~!QuEa1)Bu`7g-8)&64EEXB&U~vqnx|X`(cgueHNd?yv-NiDhoRd
zhg1@_XC6V)kd2P{!Y4>}-gse>&m~(q;amnr#L!myq1fx7w;(IVO>slQBQzm5Izr_>
z-LvOG{G0f!+_~Dy*=@{;VDJ^iNj_r|>6Q01j9pm>A#is@(@csOr#giFaMJX7!A>MV
zYZ&^JHN=nST^>R%%~$=3>B{>ADbux62FBL<G4id1B67!FrPNd+E9^$(oGg>WlAH}Y
zWQhnLT=7%=F#1KKNSefq4<vx)G3t>q4TDJ_+uj*s)k*U@%LH~F^->DsMG{lAEY(5M
zW_pzL0mvF<5{C%YhKHC)TrDyQt-REHpRY|1CopDpS-xF%JV2g$Rrj~ohVpyQJo??Y
z>j%efnpJ2>rDo=Kd^Od0t?f0YcX2pg^wzc=`~7o;-}<w$w10~4pFi3Q9*?DE{&R2f
z{Lk9j-h;D2p|P@iRvI5MDOanve>{IY{qs29f(WH$-aHZ!{{!MlDeLjeT2@*xy7D7g
z94OM<TaK5Dr{se_1QqqM)H@m>ji<gic66Ea7YGHt0ThWtDp#Bpzq7dlHV>_Y(}R+z
z{K!*Z6}DMw2i8zk1gWJp*K`jvYXd5vCslKZUgTX%k_$ZR@a}K!EiP;8(&+P28@A#7
zv3sM7S|Mq*Jwq8s8_AA?5Fd(6PjZJxvl~#PTILcO6IZC-kkP7_CcD9@Ib|0~@WwVH
znu=|dZHJpP?(3N>N+C0K2sz+k%eM|yPBCPJSqHC#f?0PXs3p@KpEvKL<Iqt?00Mma
zQtfGE2y(l5Zz8w<4tth|l90LC{+Im>Rk-rRe1-^HyA=T>uFyZ3jUskO_QoZ*e?`to
zE@>0PoSp0vCw{O9PKE|OrT_io6=qI{Y{P6$vbTEpmU6DmMv^Bn^~jFXAbw*<t&S<|
zXpqjA<H?wz%_Wh=u1n9e(lOgwrT{u;(Md|@mNC=vJnjTbV{PK`dQ*%?y$Lg$^%;+g
zP=aUO%k`PUnWo?0e?5L`rr$^WjxyKYHTcfQKp9kMB7ogQS$c)Z&I2;-io;X2+%t=7
z1c3Sq&Y%4$c~q#qqkr8bxljIh;NJ?#lLyR?-pb!pKUmRk9+tX%{Jzrn385Hib{T`L
z@hP52nf#Muf)R6emX@Rhh;t504XAYCDbI`J8s%@-O3qasJ{V;a%_Vc0^A}@&kBX}0
z-&7Geg!Pj+e7uVNiYSeV=5QDJ3aru}=?@Rq@0G8Bf_Z+%hy;MxB&^-3-w)MZz*;2q
zBDlLbnQWNgGHi6@?O6?T+ZzNaH02un@<P7?qdg}-?JuIWEJvc-0K5Qk5JzVA1Ssvt
z!$6+8R2(CwOGif|qBJKAsimw9=^T1Z2u~uBt|m+!_Ai$u4C3`L#X`9TdANx<;q6))
zruBn)!qYHmH;DD+s`!x7X5$W2gGiJAYBdikE*D4L(L=Hd(%g7o1iIB5@EKB}EWfa0
zR9uKq9-OKOa`;Qbz;+_}V^wp?7OgSCD5;2!qL`;NavKpt+Tn6sVR3`98_IG+c4LqN
z1)|#|j|+y+>hqoTJP~xdW#uoMr0y&ooL!7jjMDM8nJR@$#~c(*m{bp+ryOXEd*FQP
z=OrgSiW{YjBUK;dm$v8|CY>QDVeakErapYxPICMwSQsGUyLs`EUh3D&I@WsN`htYc
zv0C$MG!W8n)GwC)239HJ!@m3WfOJ2F{l$aFh5hf&=0|`uq=yEdr)~ZwFZ_Ny9Pxb`
zH_%D(YhL=O?#Yh9%=|t1?|oZ{kWrZp*XChSe}?(Gu_bsfd_v3ou2u|B5M;~*7}^Y}
zqi!=AfsCpknOH|;6bXoUaY-~3SqV9DY~p#1Oj@>L;_Yblfdf)WwNX>Mil8iC>@~de
z#PC7Y{caP1rujy<;2MK+k*3GZnYX$}%(~%#0S$fubJC2^%Tm~P$_W#cRqG=>g7*xW
zep2ofpwDe-K88<}zD2YTa6h+oq%P1=Z^+`2Zvzw?V956)c<-Qt;1=6_W6rHSPVMld
zXb=YlG&qm188gpxCCDB1G0ms$lxQ*qvuWu9KxN{9U~>pc<X!85?wQ(4MjAi5$sk@3
z2aBF?{#Jm%QZYgfquP{~oClngNl^MNnNqB3N1m`0l&zR^Oaj~KY!}hVjTJ|Qrr{g}
ziF<i2zJ&X;@8l;DjNHRTIE=otHA=zDK1JqH$fH@F@)zclgn?%_l^-+@$W**oeW#P9
z&MFwAFq+qt$HJe(HM(TklI4l0M7e2WFrKO{2J<T~_8Uyjb0$g7T#7u&c4D0JclqxY
zubu{3?0sJAe)9a@!SA8fd+!}WQO`WVM>PYDF{?(cx9zW$Y+Jcs?I2g@e{HJ$G?Dsb
zVD?ismnl$S{%okBJo%nL-+*Iq9^~KPQFH3w$kokn|7h9(_A&yk0VwDg^bcY21$7mp
zY$R$lv?H)G$q7ag4zNxfr-~CighxjUr{u?juui0Y-y9da`|_p8rT?Q2+Cx~LTseb|
zGTiU5`Jz{b;t1Y}po=#48&-CM1VS9hZykSb8FA>(YOJ6?I?0*A{o;27p+W=33j_V#
zV&Cl7-lu@I9~iAAvojRv44<3cS~Gf+D7;0QVK#?w49xr>A3@R5l;wj3w6$TxErMG3
zYj6q=w9`qA@~H;S+eCi`q{d^i)5W%_+)NUf=8wZ8pNOjy5OWKP&9%;@jpd=M(csj|
z83TDi1QXf9R~NvjOnp%CMUH~b9-BTt#b-1G`^~nem%LQ5VAQm%KMw|K`Djy%f6$Rb
z%zZnP$DzDDlJazxmx&bm(2>bq^LZg>BzS!PpuA1mh{8zSp@u2##g54XQDfn%gsSv0
z>&BpLp>kpQB1t+O<LW`Wap6%#JLjUBPQAJOTLNRA2|j+oN1Nv}zN@HS=lyHc`?T4w
zZ*OYxM~9S*OVXC6<0(TvK}T`lbh9`TEZDUp0ISDagAqKe`{GpFNwYJvv!|%{-5<SP
z;Ib)2Mqimn&DIBhh+CZJQqi%lS5hD1UZP{2&qEqpK1Twp1VNOgwxer$Ywu8jV%JL;
zU#EX%wKxs!G)(l_%DY%~YT*&tO;xrk9Y{Ec94QlZTpDdNWAY}X#-e9#yZ+su|J2O1
zfe<rod~H^rW2^Zaxx^RY$wFiYMlVn|U#9RdKZMBV0m5<|Srv#!SfZO@rilTyOQZv^
zFf<5YZ}w;CCb-AP;GqjFRR@!rmV|6vj%Dr9jqZ33HtMLa2sjHmmOqQ{6-g}>8#cAc
zJcFsQSzL;V3yYvTNuz*<3h){`f`+>kM&!s@6RDZl0FycC!0{I>r|{jVWi5S|<1}_X
zh#ddHAh$o??gTHZBPI??0Q&76<e`<$y5PRuC|n__%mlA}zviR{;A{$!$<D>M-oG_y
z#ns|-)JP(*%900D9_}SQwE>}qaf#g=ksp>ySYqdP)jU|(9y%&$&gTlo#5f^4l$?1M
zpR;(p<z>+|eej^tFXvD}pRSrDilhc#ML9}_(Ob5<#lL)N$o72j`iNoHz2iE$^PSD*
z<-oh3KeEnmI>T-^Eft(O1O51d5kT?_qgPslK*4GmM`@nqEA!WCg}UsB8mC7+AL740
ze6jrmFpfU?YkoNF_ib<%4_ibxZwszCBK+P;f7SfZ_n9pC<U-ixQb!F%nk=seP@Ya|
zh#gJ6);T4{(lSyo2h+%WW%VGDXgJ)2NMNN*h15(nT4mE;pc@T&C%YuYh>033GuPXU
z`&1=x2!LHo|7D>t-kq_2hxj3HZS4|2-*4QhWr=<`L5YX?9)!<Wm7+%a7hd<yWbo;*
zZ@nhVYQwZ}vlY+_*OJAL<4<=1mAmahX|iJ==&uXVwH0s-+|=C`Olq;=Pr)`M{<JL~
z89T(Ult>Dag5k)QbQ7FYDRXy52Gj`H#)zoaU1=D8m@3eIYbuW2Ya?;&Ds{a>0HL8&
z_@P_kiDj@Gqa2FS#`|&MZUyZ$#$iv9<sviOm&HF8nfU)^(r{<fooJiKG1yJJ#6DS-
z6edXNQ6kvhQQ3-!Poskcl_U!c#^5o?r}h_%<x}@+&qupkuNO}_4em=#TTtXDNEpoT
zc~OM1Jn3IHba)`V^t_xUAbQNGHb{Emx3z%vxT&NuTV|<L;Bvg%B2i`-c1*#(Meo&)
z&#d=Z`M^cbOiqc5)RT9sSM&j~KfjtiDL|ba_WrW)XLOjdvCkaXm0mG&Xs)>W8+wX6
zU5MS9?~89G6hv{}-FLd#F1Hnw%$=dK2)Spp_-!+^#GM9bUwaTL`H=mO@1Kb8c-VH@
z%U#ENkqC3Aae61sd)@C(?c5qx3Z2wwmEnq&I#eL+4trYVHT*RNn=$VsUCdaf64DZ?
zX)3Q~@s)ZX<`!EMXm~((6p>n}?ydVm%6i@6`5VAR>wQ|fx6yW-b|~B{G0kixc+5(2
zplqWHf>|7dH{*h%v*#~_&(XI|BZ%W*YZf{dBStMau_#(Oa^`RR^dW!JL*!<X=KsRp
zm~)v(I=5>S&=;@><|}!Ur%{(hMTdb#K{&!pxx@`(uKXGhC6;qfOC!ylPF1Q#<OJ_G
zBa0@QnAlTR6r8DURb`ot%)C|!7B_zJP>l>{&cexM7GoO_DZxp^y)Qk%<XB?Fl~m3v
z6$KZOOqlzDWP)U{RZc2p)X;vaQtYB5W7Bf>s!TzH7m4^*@ex{8s)Ax0&}_fXNrQ<P
zYHj%O&`Ha$@hqIjukpxX?i<15A5c^R{v}f@8XdcASV}0H#LEI$J{K&vJ?eh8FG1u5
z<xztY0;DOV;)#Cs%Xf@g-d^Oe&v^VU?|gSSv+FBo)6bYtXwsT;hv`?-M{S3_=^N3I
zzuASn_rBEk3arkHM<ddojHLX)k>0n-L--g}wsNok0XS0H&e&f6o+)lWgLf9_Sid>5
z;SCP`;YOR7e<Mejl;1OpKY3%Ywl;w6_s~NvovNe?Vr`8z>!~}AsLiI1q-w-Pz_@Bx
zT>!{C4<Y+z6qdtkD?~3x&X*Xwl%N{LbfU6^n(&y+0qBU^2v5KYj9S-fCX`F0<w(l$
ze1F<+i~@G#_Zw%$ftm+2&A8*w$_9f2v$S?Q)H2^s)OHgas?L^fZ7j-9d3T>0xZJmn
zI=)sl7-Y;{ha`ADgV3WgLXIPj(?X8na^#;na1Z_1B1xz_1(Nm1xS5R-5$EDW?F6wN
z)O|@*46r(^62WcRL2?Ze&8Pm)z1S`%^LI|rU*{cyR<6v%4^E8SATOyJ%ls`cQE`JF
zN>fUagqeDgVyF06*{HedF)EZtRhiIsa<^>!ioYN+)Vi8ro4_`$a)UZADvm9EEKh4Q
z`i&R^H1xr*uod@hQAt=>oDBowWAv%Z>E?mv*z62CdUk;F@1Kc^aA=AXMkt12G*1Mm
zKzBjpyrT~h#>1|Gq8}E679*bEY@?P!TTg{1d$w*_7B26HmtH(*WEeP=es;HEmAoV7
zR@R2R!y&mk?Z8ZNxKzOItlU}Cp739}5Ot{)qh@7S&H0(Na)_7i<%sT2KBwOg@_{BD
zDDk&N7EnqP*)hKVwfW(0%B^k=gY!rAEP(StvAAy^AeDu#@fMW0r{yB-!%bEiHy+Fv
z4bBuR%0IuO?FTnbI$#oUbh|0HMv=SB97l=X(S|CW|FjxAA`p5IM=w`^{n^6Sp)3Op
ze_*NK=y%z^kyNX1(*l$)Es3{u*Cdb~lSVD{-NRfu?7cF2%c!F*5P3Z+v?y9MidIHQ
zeP$~eC|ey%r}h~YDtBtYqtf6FTET~~5}~kFS#43}Z3il{-9#x+Y?QjfRWXCr0>Fgd
z5;px_N^A{1;^zd1&*8pDrcT#%a}}tAqjpFN^@zmPd+LZ~^LP<z3bayc#VRfOMnyE6
zA6<bFDQ7LZRO_4nF1X}#;!EU4idM=<*vKQ1He5PV^Q2RhFanRaJ3t%SXG|@Q7`?fa
z8<e#*!6o<9(#mpzU?(beKGY4STm;HmPlOdExXhe@YNF>b6e^5?76|{$*!ZRdIyifQ
zo#oK@!{d}jJt#3dc2D59EE$K0d$4%mFN+boVjKgm_Lfn*Cqb-JDJ8<%Iemt0(K@Z+
z&V2WCR)wNuJbU#Cr&Fv`Eg__3xaZEttHRDvSDQpCk+<tV?}SZ0Z~IW(uj1MD>hH<V
zwp-!Mb#*g&Mg_M!`9h3>@U723z6v_>2))-*aaCsR7OQ7-?4<c3QxNq?;ZeX`73*Cf
z<kF|BiW#FWv#<GQ5E#h(t_-jUfB_HTXvS$PC!w)gu@d-(yyoIMdjFrX{9cB3-1)De
zm>QMg`>16z;2mIQR8r>n00#HEG`(_Pt5sFx*<43pKvqX6W(HjG;h&m}rSn&AYXX=i
z^Sux8#j{&UG$`AxU&5kKn=@Bf0qr?&>S#SGgDP5AG2Z;>yV49e{3_9%(;b8w`6_%%
z7*I3dVWPn&yRZ$yd|iz|FP6U^aR^#GtS%$xeuUo;7Zgk>sc3p92g%jFJv8b2lzCH$
z#Dwsv#(dxEgn7caOPP&i&L1{Ce&$?UKJT`FdJ<joTWk%rPcSLT_#RZyb&k)J3tZ^X
zOMH;kGZvQCuBXF$VS#Ax70o1Lgt4bk!fwIXnYDhTDF}`UnDc7FTf|c=rD15rgywNQ
zX?D$%fSW0c)9EF~EyJ(j?fVP5n05~pn0=gT9*G8Y7|oz4r-)Q+#-LZ@g6D_Ci*Xzb
z_u}^d`ojj&Qg^}plNC2KVOkY$&5~Xx2slVc&oL!R<>W0dTW)*Tops!K1YC@F{rt8j
zzs6!{q9a((H@`IR*bKYq^VS~oDtvVQJfrEfN@;R2=RB6~-y@StKHa^a{+iE<?;Z5i
z*WPn^doA}E|Mnwq=ULACodzHwj>S7Av5;5!%R(&8JSs?Y+xc{N+{>l}ekB`Lu^6wG
zyX{ml{`vu~<mK_dz}~G$jyr_UmSBJF@9m(5(>SJ8pLM|gO-gT}-uF4Y{@t5q>sWT^
zVG@S7N?K_wzHVQ;h$1mdio1y>#WIq4i8G>AY~iRVRTb4%LQCy8w2$gCBjUoXzqzHi
z&ADF5zIkOlV-;Ejyz$bP);uV+wbq#T9-mwXAqOzuUtVqiD8{YYG2}_k3BV*f`U?U+
z+O4X#YUBqJsJrs0yIc>~jp}xVZI7S~27nmm?SD!K9TDp{Rtvg(gCiyzX&omy;!Y55
z?pM(Sk;=p;x%Xlv7&TuHg7n}5I^$n7sAET9?F2gJr<QJzPVd?yG+dk|kD3OaArMZ-
zt-!o3sGm`ZmdAXeBhjb~cFap7jIIhcGuDdLj?AG{bZ{8Q)zZ%C@N;&!J|7&D!;UD|
zIY!M7KJ}V{Ijf|cL0M}+fNE0hC02<G*TZ)5(Txtg97;bAY6!$+IdB1ld1Z?3wyO0L
z%ZjEKQg`O^0jMbXl^!{!%ZB++QD9kcbrQa#-YQ{TVcmnhs*}QEy5bH#yX=Q1BH8|x
z%%k~FSLGG^Nz%=#z+E*HYu-X(oW4r~t(yOO&|iO|H7}1?r&EB-jIoH*Ya1GX_pQpw
z_(W>$r9F=bY29X6nYXfhfBPO~7bajXI`pM#=ecUr*BDy~ia&UzFAEQ*VSD>xc6}x8
zUI4M>^J&=_1TE#MS^zmLDTlu0orEg0MN+lHS&q1U982S<vC&K~a(bNJ<<#IwIC@L7
zb5X0vrZ_^W8guK8_~0-#?Lg>(@&)YHr~T06zCgLaSd)*pihNl#9uMy$uL5TQSwQgu
zF%T$GqIUSAAm)@s<Zj^?0Pg<Oi(AEa;}|`ZDM=s>IF6J!R1AnMuwa1{Nx-F(J5AQ0
zyh`>Sg~qgk$a!F;5qivV+!K;%CUMs_;tU938MI!SUM1@g6W5UoT{&;K5>A|x0E<EL
z@_Ey6ooi^%`@QeF5f9|AmF#jQROXa-vACZGQyR2Q8|x;7S#J=+X0=Bl<M-Bj;1Lr5
z09zeVILv+W>($Z!L$8h;B534Jj1J@gGdLw`Eg-tWm>KEDM(kiZ6+xtX;I?g%?j6P#
z-Z9P9Y>!ZW`Oe+zg7VdvN>P>CgXI0A<aQth&leR?S|ISUQ_4N*wr@wdRO-BCtiZ0a
z&Kedynt43&p>aj%_{U!T1<Wh_<=aU5-J~F$^^WO>vo5JO3hp1DwcWCtEPg8WU?%xU
zz0*Hu`Qv1YnjotDw^trwYbXb>F+ND^XqRL6{fCii*>(gr@wWHB71fXSL+h3mFT0=e
ztBsrGdF~r5Z(1}A4+N!LkFEaZ+8>-i)BYY=%7A2oH9?F}N~<fhD26d$MASH_g&_}Z
z3>7Wy0m1kZ``GVH#1c6%@!m<!pi6Hvv{Do8LO-{3r`{-)vPRwo1V{Y2@^7RueYgOI
zeb^(>LjGK`Psqzk&76gG@ry}eEt{({%m^S)8U$=F_8kOA@DQz%OxT5yB(6U6`AX(}
zgTY%u`Om2f@SQ9aiHTOB>CtbhCdPCfw=VZhzelu|zNk@haxvM&304z8auw2=4L4QY
z;8+%whczE0O!c6_gN}sUd5k~+OLJxxyKK~eE<KTKY9(Pf30WrCjy>J(Vbx77tEmai
z2zyy%5Tv_Sin`s~UosQO=StGL__c4>ATD);yt}feppK15?h!W!E}xj)%$*<=XyPiL
zXXSMT;|S~`3A0(mkB3GIyJg)W_}MYxG~9;Ni)8V?e{@TXV9wfktoWWZoazY7xop`M
znCE<4<t<EbFN)^hk7lfY$h*6ib8pnnH%4WnIo13|_r^6<zFf?*BDXL7)`e9M{Xb*f
zYw%-_bUE^tN7B9%-*0O?D@GlBsGqcGb+ex>3^8#XuM1sY1B^18DQiP^e$BXroF{(w
zZ3NZU7S25sCR11@Q$$}hem=Vb(!54{N`Qd<KlL1!$q(mJ$MEm<RU55i>|0>}#w32Q
z?%icnhAbn%@WZggSd7*qamCOmAw*#>0j(OyFP*%M$VyMoRC|en*lvMwI;E1LY_B7(
zQsY~KYVUj1hJr1#OF$W{Mdef0;8goxx(|@$P;}q~ILwb(W4zV(VS>Siqgi6H6)Lrz
z-meQ9-Cr9l>ExcMZd!%_7&?f#{Z>(sW~mEb8!kxGUsb+o=7$feS}QnCMZiZ(a}E3n
zUw~?L`pOpwA{WKfkdp6^tfb@BDeG+Ome8@-j?g5s#Ecf>hlWA~_+G6bf^=KBW|C5j
zIG?e=V3Jbqy3v)e1SZaA7aEvQNP)w7Zk;WC5iZ3=K~uF_Iiu4X^3njGF(N~dFthgY
z`>0A4Jd_!yM3!Lciq|yJ#IW}=#AFWcbpk;m!UWJ5VjQ6eBR7u}k+P|hxa^7};EN-s
z%Y*8Hk}$dHAP8+JAFBz@Mh-$o&CT*8XW6n|LNzeU^C<g~fl$OSQ`a~R3wp9>lRxi3
zIIom{8JXZ4-?YyhGS51*Pi*sxT7OM`v~wj(;&ZyhY<kPIv9GV&Y^r3;lYGDL&m?b!
z7f4);>oq(7ZJ1W?Y|S;>Yp5qi{doU=`9q;cvy@TSU8B%v<yXp1nl8RR-p{~C{EVKu
z8Ho5`z~ahg5U2nPUkZM7rSVhqDf@MJ?{DXK`DYJ3NdAqB?>v9XxpG?Jy3(2B=<oq~
zHxBW&2&DuuXHL;**Pf1Q3fzK{!_BgxB^na~AC|l)(pC5F-5lN<=nFfPJ`(%)`z=0z
zLmE(XO^}rn)*vtQGVV*L$8*~rY*duulw!K|guFOR57I7xS_cjXkR~9s6>8AkRT=Hi
zu*Ry9PoAy&E3CbDRJ9?brt_pUb|X>O^H;TFAflnuB^ZErPQ!DcpN6>U3b>_XPAMVU
zA;7_)JTT=~9|B|Mevm0g9e<=|kRt~UO$W?P^S|G45XC5d?80cx$0)F=K2TheM~X*4
z)<9XN;>5mv-^oy(?ow88ggEJ7P&T5rnbR#kUnP66OgWOOcnrtnnAObVSfY(TO6zA!
zPg&xNAeTg#^ZF~86*m)RvN={mP1>^Q^z_{1#aTiXS!s!2XJ9q7vl3cOUb_UH{@k{7
zN^w8JL$h!yFIO$?ALG%+0OzZze^LrVVk6AP_{f|U#|b07(F8d#W}n~2)A!_Oa}>#1
zo2FI39*V5`gMTc4!sG6yO;Q7#MG>Wai;O~LRJA8zK>cc>UOxGB{?GijPLhJV1$Q@|
z;f4pulm7??Z2jEyw7Bi|hs_=%<Sfy`9imRz;%ryGUL7SI7J<m>IBJMKud(rxWAP2U
zGk<N_`>lnjWm~OxkrbNtwekNrI;*fK+b#;zLk^%w4~^tdg2d1ujUph8bc!@HbeF^s
zQliq0bc#qfNOz~yNO%74_aATqTpTb@>}T(_?q%Z${z-XwKKW;TN@yT!geW9nnz)&9
z_V`(q#cTue{m7TWX?-p<Y<2<>`wk}cnA3XqcY#NZ71#B-Z+w%kq#hu?XL13j5N?Sg
zvK*ku2?STk)$WlKH@Ux3B360dWh_4Qwr-hmZmn&I(nPToke*@!-iD)PzHC?|#Qghz
zE5Lwr4`5IvLhhuMD?{k;bp>=61!E5GJL@!ez+MpO5das-#09}4?;(4CV4Kv?Ss9oL
zvwNzA|K@Msn5Vqed_q|=)g+%Imzz+g4vjnS6G|eZ<epHKjFNz}<+Fkw*;z$K1r#^w
zdEyvQE}Wz23fVl%k+JJiqDAA3b75m35_&bb7T}t+eyNOw7sf(bgv~HJs?JfI=+Z6U
zBA-Tm7wKC}orY0u1;k=;EpCy%d?p-BMnb9vnx-BiK#y)xlaC@$2siD8P|KuKwr-^Q
zrXDj^q4FPQHrFWL2|lN2Wgn$gJbnzGS!d~xDHYn}08snn6C%|6i)Cjdkao$Gm;~e^
z9ssu{ffQ)yc7F}%TUy0?)7cB1Bjzag@_rOFv@K_KtKx8qEnfBa*)3kopbrH-2=VPj
zk2X5Jc>YL|;SUwRRq&MY=viOTA1rax(b+CjU+hNafFdEazqBjme$;n;rF*ReuazP{
zbZ#aGNLxFudlzj4$C4w<wzUw{RiXbVQD+-XPrL4rT&p1Q{lLpJL!UR}5Ls^$$ux#1
zv`io8Y)eB~vSrW{VlNcFq9cVRuLxrzSDMaGueEdwkT(U2r4_&G8wKpH&J|yql0>|J
z{Abe^frj-?^9y80GdtArXL+?;nS0Xl$F3q(T66(UxF!#CdG6Ld#ORRZk}H2H-}QSp
zx$%eS@`Q7+e~QqI3iA?N9C1C8P;Pj?HJA-EU4P%ZXLU7%`~@`sd`Hi@*BP$>PrMCJ
zQq9o=cz%)5UD5Rm9Nz@HS0S#scSXz`ZQOV@WP*HHKX1oWb;)UXSGgqL|I;x&kHIwv
zU+w7aLC!nHME()?)xd4Unu|Y7Z;vrUO;agPe5Zty`C67Pf-k63QoSfTU_fhBK;2ZN
zi<$3=j}GVq4ou9ZikNCTQ$Xc{02I*c4XtCl{FZo5IgOAQW%R*VG<p%0JSC_^R&oqU
z!9)05+We5M`&bUw3wgTKM^Zw9T0XvDNPKYY9DoHZ<2SL0vx6jiBM81%l=06_&{8{$
zP;C!YxIR;>u_hY3N)Lfhe8Yb8LEt4<2A*|5@=QP`%pw8$A)nDHqN;r?2JEzXcJF69
zn>pU|AmP`6pwcRT0{gp62rUBh0vymj{l-mnIKcbinMfI6#;eTjPVn5%{q$1t3#0)?
z*GdF;m(-V7o%4L$cB-4x&82?`b6g$agoWQ<rlKl!69=Tf$}1aJ$x*(O<1;T^?25|0
z*ypW?p}+Cy?Lo{D6BK^FAlbuoN8<=3g#}_J3>V$Plw2aWo-NZ&S1z<5q^{S0(K{Xu
z20YGGY&*4B#*S_L2#VW;1a`G(Rt+Z(fZyk0!)QrMl9_CR4k#OrXop`ow(FbBRYzAm
zkSYLV3LCsG^4na3;$<1TK_lykR`-;~CH^I`7>|fPee0$FSXAb3nkFGs`R;L=FXx{r
zteSSqd;z+;vT4P8fC!SwP{wk++>M>U!0TCl>>|4?fVat$>004;3wjKm+vcH9Hr`zw
zYCezd%pj8dfFE@YJC8(7t1CShIHF<_kJNb`D0faudPfMpBJ1IpiU)*k4AP!p8U#P`
zn%k^PHI2ajqCGtr#46<cTCGR5u|8OrpEtBoL%CfO<F$%PaEd9qOM6~?Uwo?=Afq2x
zDG_`KI}QDYi$wOvcF=!T{_4_(J(@jS9q%tIjvqnf&+}lT+B4qmgcK+%O;}zSUp=&a
zeQ427doc7B#gn!>L{&lTuDkdws%F(c)+uQHoBi3J>H=tWA#aU!dG+6qLQ^aIAG{bB
zPdi5gTP+E1b^q=>VzJ#*ro$z~PrZ8<Y4iz7UZiT<Kui1e-+r#SfG^+72de{5!}arq
zUYbD2uSiHYF{{eu^Bj<^n|H39`~C)iLHT3%Suf|0OCGci5;p~xOyBX%xyd+f2>-3O
za4jF}cV|;8;ea-K{MoK=rl8%#Fv9o4;qf==aC=iMn0Z~;DVac(VGOw4NobuC<H`E^
zFP9LRD5s`|X82C_-W$o1hcm<s`0(1%{V{z+Iq|5~S}u-XGIUg9#_<&emKl|-p?G{@
zjKSI2InC7StHLUqB6)*)zs`pS1zzv)3Y#?#a-VA*7a~dA>g#gvh*Dq3QbkhCML6q>
z{-lkHm@0)7z{y`0=EisCUiSc=AT4jicER=lUU1#Yz#8-)H{-c6E*p<^_ALT;tev2C
zy&m$d?8u7S{3#2g+;8WUgD21BL2Ur94)@UVlQy4h8`IN(;EpuvGevH2wiQ({3a2Fx
z?-8QvtF(dVN{c7j!gd`>*|qX}sLkrAud(UF=4%t<M0vpu5rM;~cXs0c%Fz@qhbfq1
z)`|pV>baTnf^ew-=e)X{ZhcyeoXE4x%oU1o#F~r<!Vis(>@&Xr;~O%e*;J|L`xwR4
zBHc<QI4lfjT-}H90sVLMj0(;M?#F|z6gcT^qhZRvSyu3@DT6&4=pVK69vqVwa^Avj
zJ+_9^f^U}9-pC}sSbV>2U*e+88ReF3o@sqFB2f6Jp@7%L`bYg=$I7XIQA4lii(9eI
znJW>XduH(yDSeC96ja|g#0!fx2&&Imw-Z&=P)3egb>*0STg^r{7gx*5I4d(QSDpLs
zn7T4|gTFGjVEZSHoJr9?m-^=-8(ja|=xgsCDRGR2h^_|&cU1S|og9K8$~+_tp5IyV
zz{QeiWYjV~SK^<L3-l64A0G=$5OzBEyS*`Z=O!P^_96prhyBsS(sK5*1-kGF{+*)<
zg|4sOLynXYclR~_neC`1LB{ST_3w;SRO^T<<s!lFEwjI21G)?Gm$Ny|(xnGnTLv66
zutuGd<&Kd06rSX!PG-kP%%yhG=uwFM@H%hyZE`_1FcbVEs%oH|?3u(;CAYklHjvLE
z7D()J{u{W^8?Mm>5@E15B;UiNHWbZyv_Uu|WVbCXi|6rGfx|w@(<6xr|J}6;9gRR=
zN3$UUM=y-HPGxk^wK%TeQ4h%{LSHtwVdBrFc(z-DE=sYQU{&Nhq$VZPXT>Y_dCSIe
z#)FQ{VO)MC9Fo4+Gz|PrfT+DDQ!9c;(@Gk%B1?(0dm8;lHR6i>`RTTeg^D@#2a;iK
zmgkLMu|UVcopj*qbqX&32zd}g$P`GKcud_2Br5A?NshGMMW-*Do*&(`bv&u#%dZo*
zI;*o*ci#GQLax@Z9mCIP=#rGcalx4z5YGCsUZ{4K+F-43*|NN0kV+yQ$QMzlAeOy<
zpryX?vOUwK+Gr(s{SzN<IdmiHb^z^1{zyJX2??1hK7@Pz{`1Lu;YmE*e~P@Z1Cc5V
z6AU}meBe2czKagmnA-4EkH~egR&1D%BKB%2nE9E$$STEo-#T@1ONHVCKRiKI5<c`y
z-;2^riA);|%*=64dZbLIc%d(u6_#%7c+CXdZ#M+W{`nQ_B=Pb7dQ;H4>+$?><nb!}
zlq@_9NHrAa>!XnfMVk|FUDHZ4nzf+!rOg@C8`xnosKmt5uiSbjlM-MKuI+Dmad;?k
zDoN}9_%Mg)UZUId?kzpM8yVSKZLlE!X0a4h9_P4LMb?DbQ>U2*IP%JBjwC=|Aa+$=
zcQIk^^Na<{!i1s(v!vvgha@<bMHFLCB#UPGzhp9V@C4<43wufq*wn3fFT!1_n2YcB
zXS3~z&~X!6^2r|gECo3>(r}i7T0L_D^DqsL5o${;q&r)#M#F1v9h;GN(_4}2R@hWN
zw7QE0)Dbx`h8hfYN%1je=RR~j5vHyh$i>|^fi0$DxY9*87*I8(Cmsc9YNN`sGWVoM
zZ?D;cc>zY=d!?9oDCAj;sYP;vW}mhhqv1;|aTYl`jSMm}hn>Wo$W<v^toBE;#8iIU
z7f}k?-6HP?z3^!=wQRUvHhuky@i8_#Bjv~2i)OoW?;0bo4Z>YN!C`@Jx~W;!XQct@
z(2wCz!I|{Bp~T-~8Lfj)M5%4h)f)E=*IF`hKo86xuL6QE{lE91(jMGwr~kxw4I$IX
z;9XxJ*oGV*?HXUaze1}DnMnCH+x~3grQ(NnBv|q3cjOdY!o%Xot?oXfgyTKJc=ypn
zeP#b9ND3eBO9a>ZC27O@vkDoTYR4+HYAVmd%_7ldT^TFvw4@-t?B5N)wUWDA*j_zt
z1@Bkn&--l`Ik;?C3l*{v5+oFoNNzIJSS<fdZM|Ky(Q;>2Vob5)utAq80zX+02sq^u
znaY?r1oBb5F0?c@R!rVQ4_XQbXP>V4J)X8q90ozY_tFCCO>wXT9>ddJlh(U4UX$vB
zHiGVH&2fk+Xqy|ci`0f=?WWJ`w`(@d@VBA+7NvH6@{Z86|AMg;<ba(M;t}y9d3?{I
zxY3UC!TH@ef5rh2D|isur;p1D;4dQ@TsIXGYELteu#Svk#v_@zIx%)+^~kGVzZ8JM
zA<NO6W}JYCB|hfUA3<{HI1zrz@h0hnuY0hH+R<Zlg3-XYgrop=0ikZO)0bd!bMkIS
zfLqfbm^y&+!PHeAoMV+s4{8P0-)n`FBUL2~rl~euxMfkz`y!Y@RI{rfrYtqWYA{7h
zHpMt*CUGlez05`S#N$FUq&1nNELzl}QphH%)HLOnX$h-O*80bM5hiM%DswJPhagU$
zd58aSJw9a|PKCeM7<DJuCdA%@&+qukR!oBB9wC(19;QQx-KPO+nKy2pJ<w!Gw7o#e
zv?X_RVKwIe`w-!ykm}8<H{z~qrp?Fg@}K37$>Zr1KVSpdqw>AE$2@FK7XeN1Q8%Gj
zxDFTQL)pJf%idL|p%86&+8~2iQF1Z9VfCI&j~&5e!~jwi5E%$l0E^()Y}IP*0MfF)
zLmA(g!X|2cXaP%Jdx<|_kQE>Xr@nr?n0qF<T~qM@!TQp$YbB;KvpTWN7vm&$MLq+2
z@3$SmYxKbNUnhdxaG%F8`kU3*-)P`Wi-6T*d~OGu%n6J`D&h|S0-~;XX4t_>`$+Zc
zY1lX(696Fx#ufd!QFDL;YgoU_(f#~l=ZiM~vrBxrzd4$6(4=4rZm}zT1K?-%-~lZx
zfi%($fhdJR+rmByW&BMXT3RdeK0Gxl(Y}q79piA96q-c!@t{w-#VgCS9s)-!^0RBA
z94|OJ%n~so?P~>C*H*V>YSTIs;&?`E*pEaE=6(-$dHHu=xveXP9P1DqyNwlgN3e7f
zM`nUs>8mh0o`krxxyJ_vhNK8#e8vbbr+mvHjf|({=32ER@1*+v6gU$ezA9`hxBz^j
zrn?gHyWX|dI$J@68AD{dzN4Cx4dHpcC9-OJ*nR5jK_8@;z+Gc8S<I$*`YnbQ%FfMU
z?bS4Ds^IQlN(T_b;<jARTj=4#Hn~kq0(meq!BPl#N{L|gTfek>*M&Sn8B(1(s=_VH
z)hsJMZT~3yW0=W4o5nsXYo{6lsg)xfm$T}9?{YhSKlEP*TP(2~mf1M9{b?bDN2fv5
zc|mafgL*44lr&q_9ffoudHVEUV$i0XoZHT=C4v|_UXLqzqtSn>xx2F7MezD$+%3WJ
zk718xUU$!DtL{70uL5p*XV5}_CmsZ;^+&RM1yZA_B$Cxm0z0-p^a(q7IsSe9`P^VY
zz{SbRsx*SZh7>^X%?&n~{=NIdJJ;nmp6PeaOY#1m%OoV=V(v|Rhwt%LTpAiYGM{`v
z-_wb*&E<GXN*O3EfX-*;Yzi2T#q2h*lOysD!6yRTMoq`WEBrBlabJSq6SC+=iOqXc
zB2^WS_Ooo?-m89Q0zr-^sUzzZMuBqNW*YSXe@MnX{_~I!d*Z9V7?ymJfD!HuF3Hxt
zrDj=+N*^e_$JlX81oX^TvP)6lPbq@P*wKr6WHUuBq4QZn|MPX7`;P7ONb!NU-wocZ
z*->tba%|Y*G4XwQIAWB<YjE)VwJEy0u{PoQ)jiVjo1c>EA4LHI(#|A#KI&P;!RB}{
z0T$9t2Y;Led=<ZmEyt2;%QEkP``Nsi^sg4dVDxIN^Gj)avL*#YKL6yqNMt|Kx6*<s
zks?serD%0@KI)mO?I+d`$)bqppY3#pa~uKD1VO{C%7@1?2ANVgp!*lnc!Le?$17pa
z@8c!^DfA5O9ibN1u7$dgtaU@kA5(RrAD;eKPqYA^5};5>suxdVpOc#bjCs_M$PmaM
zVm1RhWP_yU!h>^8XM%h$^YQCmr*m<{hrVcGG1{O1Xdk~jw!LWrNON#sE9$Gd{1@BY
zoFbk<(_^+TPS;;k$)W=PYgu7!f&vy7{~3)~Z{q}9ozssdKR(=L&hyYHBbtx5sogKX
zdC|w92_#l()I1wA|E6ni_eRV$<psq9Lw(dzJ2;`nDEP_REn;@y<wh+*ee)0s4Io<C
zWZZAAm^?H(Pjow4#QlFg%x3Q)O*Xj!7SQ$rIO;a<1x&t78=!IKdIR|u`doiv)N_e;
zox8LSML(j8B#I8olZ4^}6=;z;=TSDf%By+Vd=0?WMYbn^qh|{cL2#L9e+N@Pq2)B`
zii}}WAk2*F%oyQlZx>8By=JFR4B^8gqfPWbsXO9$uu{@$EQqOeV}m&Vg}qPQQ)THt
zFlKh{!u1pP#d)AS0j&{NJh+?tg@!3;TE!=sO5?H@VaW`pbdbIy3&hRB1ZE_J)x5Db
zCnC8)VK^IrTzMz`Ed%y!!aG3$nhnz^XV*yX+?eHpf*2pvT<*7@TE^E}4x*TK4}Z}j
zhTju91DgodXJGYb!J+suP{MU6)*&DA33=utDcg}KxoOf)`lwEG3b?Z}WKp<(O2GHj
zfXGbbBRWiTJO!9%%q@Ffw*Y0_I1pRI2fQz;_6}^E2>sU#QlB=+y>Q}(onf{Jg6}l{
zQ$>Cum}Sh1kXL}nG#bsj?~r0`mZk48Qfv!~!Lqu4X8)3uJbuv4^anm=Vt?=Q-p<<v
zrz^9Qwag8dAr(O?-%zvm-B0XZBr=VI6o8O+wL2Ws$xPDp?c`}-orB?hxzF<Lrc@iq
z6{zxf>lTY)FB!~&&ZLJ=mf0R3?oC?U6?73aZe**0{RTk!&T9f*YOfm))U!v2O&X>o
z0>8*q-X3uyeWIxXG(LfWMipk0-1035MUuKK=QsLM<yF3gIXsEBszy%T5RKqCu=`Wa
zQ1%`;tth#Kt0EF~H|D189Em|ob+tj>7x?K0n^e9d_?H?<t%JK@7)7hY93Q$97HuB5
zV|1%Bls7IXIUU>h8n2tNmh6#sPhdE|Q99a1nMjh8&BCZ7jO~b4G}11oR5n(MIDl_1
z89ay|j!ol>#*|ELJEzFyn$jd5?1H8iNji$Yraoz^S;<?l7D@u4WCOXInly**wAq@<
zr2;AtcUM)r>baT4#JQC(FNTwKtwtb)MDA~m_{(xNoLKEEIsSe-|LgsWyF220Ed6DJ
zKgaJ4nwE@AtlNi#lDtmIH#GMi&Zy+oyv*@}Mcm=WFOsEVevTftGU~Qt|3=5tk4`*$
z@RK2P`x~M(_NOnqPaAsn|3%KMe6c-}ZZ;cGDQjkF?avn3$X!an8czW$+M5~El|!7@
z6e<**wpK2`7pz>SFV6rg<R#%<gG<}Y-`69by7FElvaBKlDfs-mSZ<q*A^+BTZNFTU
z?yrEKT{RAdOIB?R(nr#o2c__5J8ntOGZ{RORC;4;!qK43f4|9VvJrOG>m#86^__oT
zg}GrG(TGX1#0dc!Y4tnamB2?jsS*docrfmy){HzH@GJ#=+gjg}syYbV!5s(lugWcQ
z8vhszhMYO4JkbcDtC3EvmG6=}dQ~O}WMQQ=lOrz?kzD%m&7)6`if7--#<|PRW7xA~
zGKlhDuXY2`58drK%!WTIk4&UGG-I*uu%orHpPRKK1?dttP<)Q^x<oIo!(z(i1IbA5
z3T(YFTB8(K-BRNQ%H8?;*qXUc+>Sp-CH!h+0JKVJ;3HP^Ms*;Xy!+RYQ}_y5%iYjP
zXM8(p3I)|jv*`w4Ue)7MIT)u<&TMSM$7s<Y+Bs2cCebK@apHBvpy3|m;OxX}iHVhZ
zvJip|;r;BC-xhHpLO2WQ)rGUCY)u3Qbzwf7$R2}8u%g`e+@NKhqMDbX9QDEfkRA8K
zCt59kM{wqi!5&@<h>^pP`-jArI|1VgcQh#67-o3ho8Q-uri#}1u#@^patGBw$T?z4
z1)g+Jx}|zDNG#($`4UD3g3Ze!Xg@Vb8DZ|b)1n&ZZmSHd)P<A$S8Q*LCe9yKq*mQ5
z9xK!!yn1-FG})4Yc(t<OdG1p-lBBRMPQtSKt8^!ye+{+f-lg?7LnaxJbAZko2M$A{
zy0}~H3=nxd{aE5|<bRl%@w`@yizkS=44~~%`2w(ybxdY$rZC2^HLmrp5W8J_3O9Fx
zya>Izt>0!eI|9Bg5(I@%q(IXp@e=26hwqIUR<VHcoIR=hETv*y)vg_!I{O*C1Yp)r
z6%*>Y&6fa_&ndgvr#~TQrf`jZxy1(%IeP~6lbIS|IvGP;)d#5J&QLy_sn2;s<>qCH
zopYdOtJr0gXjF6BJkOedjt4$Y75?Csro7~nr|1|$TxKrqA<nM3SN3J9V`jDXN-H^6
zgF1@NWG=xj57hv1yK`koU|IejNkre8ORX1a-9V(wgQTLk+c&pCQXW4?(W|)!UY@=e
zm7NpLNswA`#d<+@sgSESXH8#$hhwb(=p9V?q4})lw1U+t6bl;@z!-c9%MA?AOQM7p
zw@af_P(IbvYU`J)$8ct$Lbp%=IuS}I=GxX{&b5`O!~}=GwLB?{oVx9nio+y8w|hO(
z9x_TzR9D|21{a||aC!B{^Q-u-lOM<E!=E!A`YZ28{<6oF37miw$@SKDpH?vPQBvgE
zz#!RDQ9Th-#|hJ6O++beI{x^xkcbB4KBJ=Kyq)JeN};|VRXJhvbQmJQc9N{}f3t#m
zoc#Bfcv<ttFZ=8vVRr11K(4hS29jy@lMz>T5{(0w9D~U@l<;lEpEs_dLkkZ3*{9l9
zS5pBRw95qxb_FB=^e;S&A=p5|%HFxZldRik?6e%Zo)IzxuF@MEiCi%M^zo(Qq~cmB
z-~lsK6&4w^^GTEFxFpKm?!X(X`gWOovdmZE%>gwbXb7BZA8AhoiUr#b#eMqY0Bq<Z
zs2lrgug*CUqJ5&IpUVoE{=(+amt?{;<;l#YcfhaTHCm0ytYl&^5rREH5e&FBa$+5P
z`b2ohAZ;nCCzI-sHJRN!9H710Bhz=K6#E9O3!mMlRN$*|`Bu929V>#+M>GgRw+3Yq
zk5zBcSeN^rd57kyRePnh%F%GOnT7T!QrsG(&34`^pQ;=sGiFZmLfNR27ds3M>v}OP
zA(EsouxbQaC6^VX%$Shie!$nZUS2LVxsU*xN<dU_0Hc3y-EV~8rtgXn*f-YR#pF2e
zuTqB}Zkt*sZg-cYj?ZsDIFCvtRE8=9e1G}(*Xk90$malZRMBfQ#ed&XN|qI>xbQAF
z;pkc`pPc3UIwJX>N%^3a;gE|$dZ65cf?4NjqZ&j#e=TLF!y_CKA_fclRWu=)zm_gm
zp%X`s?0){E7q==ihbutBDb*QvP$!vTG`VpQp(d4c{BUI50*lsUH%0kZN86XEz92XH
zyIp#dl}3G{+YPA}93g6AF^8vdU-M{~qs=4Qu*xQ*qBw@-2x>dF%|Y$Kv3HxA1PQD^
zC1N~4CL`v^AKMau&0fD3p;}m$KPH5X^uEp9%&!HeQ&&_3e7sBD7R9_OSE~}cL9-nU
z(23zKZ%|N3iowpbS*?WHq8Q;9VDwGW4S+w*IzaypN$>`>{RIfPwTD(2;3Se=a7}9f
z@jL_uFzC^FXxW2D$LhE)jGE8zz;*GA3a(5dDhbSTvSKGNawtM;`-mapX@jd#GYOc=
zCCIY1M5Hl{U&omYynz{Uk~kM(q@2JV$d3zrlbRAg5qv_@;4Aw)Y}QvMljR(;Wz!Sa
zMy7Pnv8vShHleJo_$fn9w_vl%$C@Yx+M=9KDedUlK{|xyU`9;vK7ojmu*in=SA4L$
zs02D$b(G?!LZ1u)eH5l7;+mZhDIwnX9o9}uoz-Z_j%13>&6r-6{=hY+XYK(IiZV|H
z{iYXg-kJ0w?w2H$_s?w}0|RbAk6a=ssh|WC*DB^P2+&Hrxtl*)7nvnBP(bw=QH|(*
z?=$!scoq*pa9skRd5WFJ#~q;VrMSyUKFKy@0qDse;vPdF_C|sd1nhg-;$8T~-z<Wu
z?{O=H+J3ob*9r@VsvlPZ_HTXdY##+@L;~aT&KR=Wn=rA~#yN;x|H&mu>G_Smg?)Uv
z6{GN@yK*4Q5WSdUIO;3i=Yuv}Ijq3IGZNPjcrZT<0I|gMkTIgmszOCL>my`B(3q@U
zptOWJA%v?WqS2-1pBtY9NVt+C=EUBJ8qBAFm)6*Sk7zy5P~@6j%l#EG_Afww9ykdM
z*;VK)_gco+^%)I5lJ0Xe*{t~i=$##KAhZ0IriU9~I7{WoFoFIT$I#IRE^$AavRZfb
zX<Cidd<G2GK9S0RmV0GHo3n62m^s8or{6M6DHG8kN#?dlciqU2v1(5U`M|G4)bO!N
z2o30z6?oN^APHG(JR{qwgZ+H&UVI+lEh}a9pcLZcw~{nS*LIBOQk8<ocE!IZj@pZo
z!+H1s-3+|g6kWP<z%)CEJSGdptiP-Miz6Q&jfwSXP?yFl`S)b(j8^SNrY7#_;Fy@c
z=yeumSCw|;+E3DE%TOWl(PW|7)x*5m!8#<4fnrOKPFB^pdK?vPFeEnftlqbM;y~Rg
zmAF~rfn?`i_%LwfPVNChd%V)N;}mQWaD@$9HwAD9H;KS1cn^lNXv2S4EG0<K%U;b=
zfh4I9R2<JpQa5`q*bc0F+kuS2kEvQyriyVj!qwXWg=hCFl^X>8U}Yjku`KS$=V%d@
zAi_PlHre>F0s7i=xkbD$nRoKiYxcN&GRWBh^iPbmSwXYy;9RUS_V1b}=J|wSM~u${
zc@0s|-0vmh8QsWzy5XDL>-GjsmvQQg4~oFv#nQKlE=PxnGekCeP!2I)Ae?_=iW1~Q
zWf6_t9ssK&^tfgGI;ke|pIOk8gvzeJCuN;o$yXDWze9L)fH_1BGfT#Ejyc97ewjsQ
z5|X!b2}3%Qq1b(^!SsVfOkqlTZP8@*8i}%#k){Ur<*&gJBrzLNhDbquRNx2{=5WOS
z#nAn_&NtGeyNp&jHh^jq<qV|mXySPofpd~8*8el=){ZAetQI|APM7?8_pSK3;;QpS
zJ2uca^i{y=p`!O{t12?jvg(%c0;clO1j<Ayl)+$oa0iYcANQ;oeJ}>_6c|M}LSxW`
z1cpGYL9l5J`VZ7?V|v*%keQi<z1<(@LesLb`GR2(7BQY{vETppAF3*5GJX9X4`}Yf
z0(Js0nSm?1<q74bob&oQ5It8|$;>$S-yneDBf4aK{ieoGGL#Z7oP~O^;@}PMobez6
zvt-d^!7`wE4oIiNJbnqXU!W_>uibK1kJu2tkverdJQa@8G1j_y0CMV7)#=9}H}E%x
zyDH=upr<T#Ru)TZw(@nvd>z2UeghNQ)Pc*Ig%e|mD<9-5FBvHN3GaFcTx%Y>mj$GQ
zb?Q`ouf<vUr9BD5rD6(L`-W|f1zqtPeX_Juq>;(pk6P`8iCXNV^10f<!b@0@^fi^i
zhcrD6+#abs;WCIuRq|0DVwVM(pWU7GU-o&w$9`j#5SuX(XVwt-%xg!=Rp$<Y&H}yM
z548Z?#XHNg-*N|emUC<h;;q)`&{R={?jbcx5E>;+4IXIpKi{(ZzH^s$L1W!ypaViV
zBuEV@$C$)Lv_rKhD2rvfC11$mBx7M2d?MU61y@M+x%e}xy<W`~$E7b!<R=C_FAgHb
zl8SRnWjmT1J=r#kc+(egwNb?zcOpW+o-p}_37ilKVBJ4AubPn3_5<lmx<aoKA)F$K
zLeY~tl>8Xbv#=v&MLz7&oWUMr%2L9e=pXB5qWP4)Z`C?|M?)1xsY8qj4+Oe(a_Y$U
z%fh@rBn;0>%M}EN%&s||H@DvJKkyvhc>AyK-`fPV1_VNa%uH|;{ZiqFmyZ;%af+UH
z<XJx8C+f%n{Jf0gDe@0UKuL?rilswTGG}xkLoF3=bA@juJ<3)-3sZl*{W3eY&82?$
zxa0k(J9EHM3EbbzlM%Bk2}}~J(fdY;CGt}Yp~NMhOu=>TAgvUjFUt|$&lF91KDOz~
z{Z9B`5>hgNCZIN^elY+Der+}U7+MUto~2HWF9ou@z0Dk#wIeWAr!gM+Pfav$KyADq
zQ@*BZ_qoX;j7#N`3tO_;YA_3SMG6JNM76|B9HB%#rl;+|$?V<yRAQJq#S*l{_FX=L
zJ$1a!*_R){u`hHsF3S`g97?OILV;HxJf(=ymE1rR7(Ggpt}@u;?xL5q13?>s1E$Uz
zE=dp5qG=qaU6*Xwc!;qMMehDa^Nsio9R+TscIL$`AafGhBy#f@ke-FXRmZhG$defl
zj0ORahA1v*Vs_J#ZZnfwBk=eQ)Nhr6gO%?~z^k-46Vj$lTuTy;y+l$a!nb+S1ZoUa
zYn(W7(u$Q?O3HG5EF5UKqcYS8bX;e~8e3aOtQUCXe7hU*d7suDi$(VKX#s~MAVGG5
zPU+(d)!$G*VNiy9E;Ro=JZouPU;}!$k^uzZE0e>@#~Vf8?i^;mV|&x_^VLb3ppvf-
zU#1@B8iL)NK-;>7yg!spG(Y>BsN3p)^z<T16$j|yK60|^hV^Xuy_n{4#f?Ae-JNnA
zoYcD|mEy3D#!gIg{yccz-q-yjo`lbuOq|{chw%8%SRalw1wD=d_qN*z#ZAWJSe+M6
zUtmGtXkcd_NsGO&Um4%Kz_v!)C~lnQKxW^jrvlsDi;2wk^s-i!H^4yJ?3KF=zIj9z
z4l6HU>7uqR76E`c3!k2^=ZH*0ng=^ogn8c0*g~w<WuR3aK+#6k@+;<WMFw>gxd0A^
zWb|payc3&Ju~5x|Z3;jE_b(=i6Y<jqu<Gxmm)!RGU-+AnbXd42#-n!&%=lWIDBmfo
z?%L09`gJO~;GU!BJ}K6qWs&gY<*?$CwT&zRB~lnfZaIV{p!@bQY&yLK6N)&XUdZst
z)RO(9b)_xc8Ti~M5_-%iii;_*$+%nCk`nui@(sjHG2<zYlt=KlPRY!dbv`q=w4zK%
z^Kbr|5AD|t33uOtsk!)dY1T=hO01=%tVa~tCv-7B5!0BM<{ipfJ_VdpCc8Y2L{t$o
z#)dSq%|`8r;d3z13+maR_DNYDmv*u%Y9QO=1`t_!&+MS*b7Uq9Gnn6{jy!I=0!B;{
zDzR{$z<iloj#pGsM{ll<AI%l#*B5p#rvzZKTpzUN+U-=A>qU;x;gc)LYKH#pNMLLe
z4Ec94<31bktCx8N-0YnHFMEIb?F#$lo$l_rQ>ENOxGOoIEQ7`O{FoF22Dw#f_qNp3
z?H7`s3uz?J^I+1SlTJWQXM_|gdRNB;801Fu*xd5<Oq|8a@GPtM3^qZ`C#hv5)EHDr
zHPRm<%NwiGOhJbvxuA)4ZCM1aF9|FQCjUExCt{-)_Q{xT@HgO0-Gg{EaI^X*x%6AK
zFEt#I#MOYK*i<oSwRr%(p%E7#H3OblyOA2*g52(k)hYwTNn}FEKCG5bh9Jy@=bR9x
zcW()Deu!9>FwF+_WqYo+Nprnq(D>FyNu@@VHpv_*yxiATm1<A9hMQUy+qX$78AWbP
zc=F!}AI~d3&h=dwXs*4{-BV*Y;+UrW3Oc(wsN0`wE`QH&c2_f)sr#2<ybFsOOGJdf
zpNrKwo|PcesKZpcvh#`D4p=||XGTCEn*CNuU5%1t2)DKki)JH`m>=T#4Rp=^2Ea%6
zJo`|;Z1BdZtfJxNsQx~)nX*AA8Qk5IYjle_;8IH3{p$AK$$7N3xwECjqW3EE?sLU0
zE6jQccxaiy^Pm851_-!eZpI(aCAU+ZzG+l4JTL_nLc58_a_udA02o%!?YjD9uOY2c
z?XvEIqX{j_w)GI6`gsNHc@Z(pR(@OBqIGa>G_fxg{{E2_t{n&{Wqx3jQPR7HR{Wu;
z49sE(lidgwT8(4}uG^j~G!Yg>(;ot+_4vTpOMce!8dI_=q#ZqTPG*qnE)TmMO!-dD
z&hSPDcJe(fy+)6@R$&l<R;@TKlJjA)RxZXh1=xwz&&&at*JLmE(FI@T>^dWFC&ioE
z0xO^=+$2|C(<Wd}!r+VE(zs@7_sm^U&xo}5L#+`ztFy+Zq}l((fI%s|Z6F~MsAX-l
zENZnD8=aZ3IV+vrFQH>HEy0ZWmw3nPJ=*^eDP~=H8R+5VxUc>jt(#@q(~dZc4Ck{b
z3nAfpdzN0DSGJ$sc8t^HPuP8HPlk5PtG_Y)9VMWm^~KRUvDhe-PMv4baz1(6p&c=Y
zp5FJ89#A(%DQwExqA`s!^l1eq=a71}MNy_Qi)JbF_Z%C<+j{zw8CYY{*3P}^GzH|O
zwO*!*u2?C?;(`ri5qy#uA7A(LrA;TL4uJa!%JPHGo&^+MvYYK5+nB689ur^LnD%Yc
z^&_iv{hp>lgzqODi&1F+Xg3eq2r<&`1f-oxCZrUoEP#1z!JH5MY4|8Ly^J|fzCQ5a
zzm#~>J^a(KOh-EFz`xiq=$jgtiJ1hKG|6pP6y(}7=PABQW#JGkaWRV%*A6(_Hqd~C
zW9dE?^e0bbuNQ7nP3PrU8Am4c`#%h}r^_yzrkZbl`@Q~Nvfr6<->w2BkZ3~=`+(yi
zmk{xbQzV2f_c!9u&gAxJyceEvx;ngk+VG0Uw`}LGK@B0ENJ|-|K}ajm&C9n7Hj<6I
z@?Y)L(aRD+O9(zw3M3u+n$yd}!H?hEmJj`t$Si<Ig4R*f39JR^gxP+b7j8UJyIV#d
zl59D)Da1@we_JfY(^B`HdwJLa`yfy18T%l2aUVLZI6QtTpGq=6A0Gn?kUS&n@?Tv8
zSNjO?wWadmU!z4Aw+@}cZu@qJhjVQGoQ|PGLibeo+%-fcwaKPks9wK1H-u{9`6#+u
z2o}14qbWxOHn%3NEvqnP&Cx;&--3`~Fz-9zDL*MSp9Tj)(0|Y3LlW!Izl^j}PYN<~
z46Bc@6u4?u@OfP%(l7YVvQ|t=6p<cHCL*5O9ZFJaPBi|Yd&!5HiwYr7*^6RAkx2En
zNJ*;2?tE-!$Z(^(Y+)NNnk-UyDcCEkjqe8n6rN50-Sd<biis9nDgkNc4Za%AipV=^
zj$eBsxT|y0YSv3N^46X3-f*frprQqJp3e31DJ}DI>CcPKlKqCMn7OwvE-ZSH96s&H
z`Q2N4n}21QHIG`TQTxH5j8b9&2Xsltyt5qyL4Je@P_tJf4l!XkOFqthzd^{Khi!P5
zbRyTw_olu5mk0NYx^Sbbqw;Lxe?#TB?5+>032qN#8@`nrzw$%)*BI$_3UPj_fksy`
zsp32E)!GTdphiFHVmKhGsR9;zW~7ur(g#N%W^fp7RWrwVBnCNiBmnYdd~+0pS0$Gn
zB_AQCMQM#vdP2Y7jvT*hvP^lC4}7#CX#Lz3eHE^S`8Fv!e^X@;O5TBx<e#sEzDIvJ
zjdl?Jw>W^*Cp7$a=KP^ntXlgTjKe)=M^vBx3S~Mp-ma*p<(;;J21{c9*dM$7f?N%u
zR}hjAJ<GUc_Uq7$0lQ)3!olLp&xPyoFC^T(_8GPhef*gd3g3gntW!atc|KCpM(tLE
z!<~;pIIlgU_IPMNP(3J-+IstJk9r|5IS6sZmMWkVBOMic0dm(jY&+XI=ZJGor;EWX
zddc^}zvOXfon>U@yolDBqkqj*_Ev=$p<xqZy;kqr%ry~^@7#=}08_=&j6!;FN3aVy
z=EHMM$jKQxLdhZuaR>nnu2?(L@z}p|U9Z)=_Lv#tlw_B_SnTxj-FCB{#F^7GidF-U
z>-{O+V2EL9xmW9am4(ezV_Yd|r3f6w46{B!pm0+RWKkkJb7M`%(wSesogI}zdytsd
zzb-*25nEK&0UGS}_4>i-!@rGax;fEJWE>MkD<O~)eh9#{-gX|5Hc)HTp^L0`whw{0
zDJMOb&_OXr*cSMPXr#F~R*?b0v<9X8?^-(Z#pQ_z-hVsOAeMb*7L0%h0h=o0G&GGh
z!<c@gJlf_eo~<(XhuiP*{H<%DQHYg(foeC>H5{szD(fwc&^F8lW!iq9!jnGboTyhD
ztUlBC5KZx%w6U3TpMAT#s8Z_ISup9LR(--Zoy=s-ztmps&Qn(#_s%b3Eu?H(-#~x?
zHyVa&)=UG_v%wg|(vPiFgBxQx`38ty6A!aW<!*kc$C6Zkq4I*Hpnuv8je>fT_j4RM
z@7uWdrNWm8q1b!l*t72~y>SuOD>9OVA;*bFhgrh`7f;SR+e<fhAgc?|JD(u5X4+Ii
zLxuJaV{&?J_>*Y3+{d3(U$L(TJ2OaUeWY@J#)sY;O@PgTE`%HX{-f^obWo==1Kd*&
z_o?%!Y>cOvlFpS#z7sj~C*oS@N8Ky_Zr0xq6eyAXxT)>Oy1kB8-S;Qn&oENBgmnSs
z#O(WjbNnt&X%JjP`=Ge%+fQ+?ZucqZZH?d>W~!$pn9vV|^fbg*m9J3oXMAv4+Q`bS
zj1a{YpVcd$i%fSQlE4R%d3P;g^DtPhO1I#$PEp?-?iBS6aB_ew$T2~*A=rkaGS;*~
zgl2HL)xftdl#&?sjWKq52<ezMM)fR##dHEfcV`r?Hcsv{k>h4~W1CsglR>d1voJFQ
z=WJ&95qI1ViA|2^Kr0FJ6m7VWJLtH5Pcs~va;W!yN_j$4)vFhSJk1&n+zb9rhXbE2
z&R0tfhD7SyOB2BkD4Rm~RUOmaBR+Q8v|#Ra4j-cNrg0@7*zT>`NAJP9zzSUPbW}#J
z#rZ<8CcG*%Omb^6HE-u2@=0g?@l~1yYl=erHd55Bqyzl^v0R|MbEx;WbIj07@o*I?
z&ail>-f*OIqrW^O#VC#D!T|a>n^$=!CAHIaHKIu+EiGduLV`=q6gf1}1$(b`NB<7z
z;QhUw`teE;;h22O5BBLZshZpy6h#|yfZ*}H%kKWW&gCD}4}WbcEjltvlrtc=kD@Sk
z34By#QiMRkz0=ZRXUdTAts4Sz<p5u7*siVk*SIrA{Q7oYF<H3zndk@A2DfE)v16Ed
zgww`%G75&iLI!g@(hR$%ftt>XdJ(u@EQeb@=Oz0n7J77@3bN$2T2p6WHEAE8FP}eu
zy7N11sF{rKViKykd)7tks2RI_vfzY91!iXo(xR&`#YV9=d<Ll_xQX3CZS9<K)ky3q
zqhe!?&u(w*-dc%a02*is2$DY<@~AZ-*}V&fiT$WIeiQl?tD6ztXk`EsCTz;B@>3(&
z@ACBn#TXhGjOS7l5Uc%^LGk^3t3lg>rdBidmyV6tnxZXRKf?d3PudH?#qQ=kQM63g
z*V?}|DyCwdflWJPW`nNviF*Imbb`e02d6e}#|Bt<eA#epo4q>@3mU3lt9dquij4Bo
zAK>i->aGzTyBcZg*aohQM5Q*Gz07h7f1N3qA4*t_p}Ai9Eo@UEkgyl`ux|%6htDtD
zEP}=K^3lvZNQqIp=&7XGn5^U7r7wrdBqI9qo__YN*Fp3<U=Q7_&y?^k82NP@)^)BF
zQy%+IDFx@+0|_d*2yNt&zK|J3p5pnY#FW;h7<@=f1Ga6tbQf|?05%xttil}6wcGL!
zg|<cL80wjpe5`9|x;Z<8fL<WzLeD7OFWVUr^x_u>_qc|yn`|EYFHz#x2NH$;W;5L@
zOYj3>sU3;^e|@4A9xxlXF_$<zsyrZ}koK+IhuV&aXMuqXL*A5<lw)XAF9WYC^EjT;
zlTgQK;d{_iDg^Vz<Jn6PGI1)UuA?b3h+Q4oi>yXME1YRsx`A4Dj`YuLkFU@0Q+LHD
zov!<da~^mq#Cza;@kVAOKY^}&HVl<L4Lo8wYb+z+b=p?aM3Qzgs!*Ah5LUW+h5bEP
z<JXrj>X2pxgX125vr-JMv<;&5e>BRWN4w@vLZDw<)c@6!4g+r=R(4L0I<pK&5?$JB
ztRMo3(e%z;GBqgthVIMrCquBNQXNc(m##O(kCpu1*#|1~J0J)SK^0mVW%lr@Zik_0
zCo7I^rSUkSuVcr;?Js(YvsH2`M!hyN7d^J#Q1#~c#!*T>40$x_uE@%QqxQ(rRg3r*
zs!E*pL1%2{^)T9T#-tN0Aygu_Gy$#YaOc?OCD|yN2pz3|3~fv(y+7WM#=I(#>4hI}
zTxh3-EBzB}ZCLy*T}l`=J(f*MA|8OO-llJ;qL#e?Q^h~EzlC00e1g=Sg3*BXA(5)_
z?6@Td@d)_eM^YHs&q&D6Utn<aU{z;cghek$=88wV9R2&FQN`UYdii0Wx+|1$2TF+u
z14D^q#sWQBF!B{oDWgQ5WDEl~rb?E)npGg#khfAupKuZu1`F|x=dKK}kMvY063Y@H
z;}8S0gagy*&JuAogoE0=3cwPwGU(!-n;M0fMu1O7?N!^5`KA#SJlHUj`bu%`7Y#g8
zD@fR1O`!VvassJ?#OT}4v+X9-0#~jELNI|LM&IGf^fLszF8)}%yB#RLU9rEE>^Ixx
zAk%BSJ=l-x-1E`9oaY(On=@<EMAKb&9?!JT5EAl}cs0!Si_k;*m$7C|lf*>cqhii&
zsk@g6#cU`VeS9hE!vgwEpVh`{0(|@!#nxy^QyrVNSw^93|Ig1>nRD=3j8;h~q=}9@
zC}om7yUo0aw4OpJU*7R0uc0&QdBW2MoNJawe6wY~+uj@3E>9l9)^M3lh-qRBABkX5
zpVe)DrRFiGpghC+!BrMlK94bwcc0<9>T3c}KqUV5#ckm1+g4|jrJQ>rRiGKeeWur6
z*=?nEzfAs_t_K+cY0v^HJmVgu#lbuXP8%@N^7&xdYuwo9b@TRy8{OUNdW00U?*you
zqJ<DHkMz;*BjMf5wX#yoD4vjZC!tdDm3J#4#{~CLq$v~DVnvkwtOOy-tOn#zXuMe>
zZAke-R*jFb<eZ%YQ+2<wE3<I;%i7gI7F4RK2Ibmc*V9hWBvm*hrr88OXffc<nVChu
zODz!KItvt8nC;+<E4dS>%#GTwBOtBOb{~2*oAZP?C7<H;apiAkK3y6G_^bfbL(%xw
z^U;%y4r2YG*1)D}9b72c28K?g@31@kZWsVJkRpF6sk^5wGQjRwy2NL&QtaqTv?L9T
z>`OkpE>Yarx;i%NRIUAE)Zkl+IJFRzzMsYe9mXZx5#>uxa)bqwn|2UL-OF7M56Ou9
zW-vi9JkKHx7JyDUV%su27neVi{ly|=xf*uq*J=~`Ex4<aESz$!8=IE$rt{QD(qK(m
zK7Qw@;74JA^6Y5t%m8tNtMfjvZ|poS^&S%sFqugp?<jub!?oYH<ex+#O3H756IR0G
zO&iir$nDZ_)-}s<OeSC4mJ2LcA+TF@U|MlL<b5?oj>w4!gU-SFkunH+G#K)iDr(ka
z{kspc^+WHM$LfDM5t3rp%fyMDkI&(O)K%X~I*eWlGGK3o^LXf9RSHoI2Bz(hz&!gX
z#i0H{g#6v@i;4^qePF{>YymyC=ZcJk27Iz(QNH~|H{$gneS8sATFIViXQrPNIUBMC
ziFd1-1RLrF8x(-I@Texi5&F{GFMufPZGyhTc;{=hYWHFl@g%OgO6-@VJe{9G`gGQ)
zRi@}}?)h-1)zy@gzbKYUOn%@@%zz9a^xAS>z!Vzh-QIVDBf%CRE?}=ZV@8)b&L^_@
zlFHW@oTh}UO1%j2^89EbPqkx4wB=!IwiD`SO{^9&#nJoKTT-IY3aurdpb`L}5I!!f
zYx>i>9(iw>1P92jT_PUw<pMdoBuMjw@*tBq3|STN@@t>G$>MA&4MG_spvX3|#8Cbq
z)v8W|Ufe&HL-woEZggedmi~bUB~K;a(>%u@JPgzc5gIqKmu`G)HB%Ih1d?6mc{TZy
zK8+6yF0<3u=dY_&=boe!0|m@}y%$^?xvd#(qj-MyI|I;GnkxS5z%-5MRBS{36}ly&
z2RT$-NUs=P{JJ??h$Ie$en$vw@m~!C7aj7q+o3YzpX9D%<;I3qYxTdxh=$CE<jW7e
zcTm^qg1)MuWC1BLTj;9@clkE(MsWVCkavcCvEwpn+fDm3AC&P;Sb7{HWxB*zC1$Cg
z=ZQ$u$75(~R%2ppK8FZJs^Z2oIN(j|7$t*(WNRwJ;y(13y|JE=LsZIg|H9!{<%lJ=
z$AfnrGY}ux_j8x`adYgO`Y8%AQLKk7tZCEfY-`fhrh~h=Ur@W%P*=YIj?Mi^&4ADd
z^Av^hdS@7I+t_GNj^-yI+<heX87%3rGT5DG6p#;dP2u>a+kgr(TY5rh(Vym|yMFU{
z?`S&!!N;gw#h&lHnfgS2?>u?^1#FNYoB9yOkVMv7h?k?&aJIiIEIxEx6)qek*L*am
zJ|<Hch)3TT>ScdL-Vl6Ds0{q|)i5_TbFB0ZXmQC?t(g(~A<IAZX_PLMWP+MynHPM#
za;y8S4=Kx9hks#PJFL~~w)aw2im1MIy$Z+T6s0ZfiX@Y>%c#L+G8kw1{7tKMFM3t3
z<AZ-?E`vl0z4kz7HC=g+AX)v<81$petiTaZHRkw6+OG>)_ivsvY``1cWY%j;Zeiph
zwc&QiTOFlQi{YD<90ow!Q+Ns`Lz5eapVmO@%|Sx~1(KKO!6I3diZ3ZuD4X@FL&|jQ
zp(`@LQLi<F(+|#&q6ENvYTZE3q$-5Qo^&^!VPEBRKMO`#FS1)T@cI}{#4{c=`}T|6
zkoh=sLt``Mq#mwTc`Z+CmYDj|8r{hxc#OYBQdo-(%?0)i_FxkQK@4#cE5$u8ub<U2
z;NC*F*V7jxYU-@X{RydL=dNadi@#*1=<h~D(3Wipdd@iXH&0!3T7;B#GwhGrkT9oL
zX(Abc;K*-<HtkD^BcaDm!7)|Kz~G)f_fP&Y#I4Vuqoh~rrsiL~Eh*7{X8T4RQt+bT
zhGg9jlgChsd<!F4MO*trJen_(^O92f^K|?o8Vn6rnXsSe3uCS{)}N1m?B@z$LZ?<t
zVK(Rn+300A#6Ea8=Q`9C?GIb7OjS(*J;)q+H<l^k#GM#zqa&5>?yqggYBQ%~qJYA?
zy?_Cv%B<z81!77t96D8Vp*!MY25h*_#1NuE@JpBcX)853{kYY;vjuhu-&u2%^k(&C
zC=8zIIn&#_^z*dq7M^jr8nGR4N<a6^kjbWnT=c-KP4+5&V=98QT{cZ)j#4c7d~|7)
zk0D%$VIZ+XxJ)M4b16HY{NI4EFS|7(j76A15H+c}p|t(Sxv?_Q;->Q`d$CtN<<Qj1
z+ip8HQvZp5N(u(;r!&qSq@}m$Y{I4tou#6kHDK#Q_oak!3Pc0t<X|l~6dUG=t6}}x
zFJn9;c^3^dLb6euKZM}3D}lJogL|J49~8X%sMkbNbLC$Av9oYD(qaeTay7}JG^{}G
z5%og`wH+0Xei0FWZOmLdu)uZX_3;?#7mQ5OBW@`jWb=GKNhlrhBm~ZPQkEyw4maG1
z44S<tsrcT24g(=K-M$4A7P8+3KR*c$o(EDV2jri6*asR+xntjtl7$_~yT>=~e6=dd
zp;Nb0(^hwq3KFXF;4tZI&OH`*<ovDC>0bP6&CFRI-=jltymjDlN9o5!W)*Yd4n&#O
zcsf7_3tjb^6&+UYd-)gy9D_mxp~Ti|5-`bR{(GR`vFv3!3b{qLxIK;`4n!Z|)f=-g
zKtY`G-NyfZiGXh2bx8g2LL@+SbJpoL-Cdu%^$ApTJ($e;joovxK)i)h460zmp$}Or
zWFXVGrXcSahDnHY_$26aLCW92EE1T*yZkH|cc>Z0Gw4Q=Y)c3h-Z=1oO)H~-X<nam
zL;sX<h1^u8VP6&XRdD{nrT?J@f(=X%8n%HCx*C!qwp6xt^S1*bl_kh8=hr_ysPe@N
zge-x6XqDVl{^x&J^ciS*_*DudU9)Ca&in*rof&(RK_ah+^)zyl_PK`=(-$>bFj0KY
zWSk=BtZ_dF7PB)m8QJ^Z(x`dbd@I7_%LSW7;P{BOjiH^FK1Bw|NoiKdvdy<pNk@^b
zmO69st%T@2rw<{P3t<W2S@S`L-g@jFdQ0u}QnK-H22wyV`E;pbim-*ad)vLDKb8F4
zD|BqEo-pZne3W>$cRR&QaQP^VV&{PUkD}|2X7g>sA&8kssU4%Lr8ZS6Hf<<swSHD@
zYSk7MEB35ayR}DAD)wk8VpVCa5^Ap+F>5Qn_xmR&Ir%5&ym_AczOVZl1uZtN-xsPM
zRftS?KT7}J_>9*7v*+pObiqs9zwB2xCj*~(;1goSxiS*ZnmuRkt}YAP*9;tPmixmS
zDY=3gdNdQyOCT(bl`;gffXasiFX6YPQ4=u;xlO}Qjkd0enO~PJClMDs^1xG^uL0`T
z;*S@1XWF;Af1`8vS7DJse{&3W1DpC*gJU=@-3y(c3pG)jDbYN}B5rU;TdOnBcZ*P^
zg18LVNx%|@zg1V_1voT%ND?S-Q83<EF;xs$+-#wj!IGPoa6pDexyHFIAzmE4a9miq
zfo0*}#~(Kq&JdBX^29fdh@HoPurySv6q%AG^=)vI`$a`&gjF1Zw4PL4^SNu*y|K=O
z>>29~Xrypf3kcH1l=fQ57w}H>YrZR|UA4Wykh>{+=hs-~u5JuOa7>ax+q>CJKn<cP
z7y75GhAn3_OaN8`pyJk1Pr7c)3Z*F-u_*LI0~aMZ+)Y%4hNT<7dcU106?|D++UE9L
zY4ze)Ij7H3gu9s5<<+OJ5$SH6Nh%q8BVnvNb}9tGQ`dDv1QYPV{04?cd7)t8H||WF
zR!a!Bc@zPOVtrY9N3qoTwSvEehBgakJjPITM7W`O9C<1}2Pd~}riDmx(l2sVaLzst
z_Rui6J;xMtvYqT86eE4izcD7C9@G7Ki7ro&{jgzrxn0ly@G=3BmcdNWJJta*_29*F
zP%A+4aTK5qvzPB8I+$q$L?a^N%WIa^HT}W~9$282YhHf4?8b|Hdin1&bKutO&%njm
zijnG2#J7+IQn8wQbKhRonmd4)0F?RZnFG8<?(e^~mqFLPqQTdZCYk1Te4I|-;Bkg5
zxctENC{c4M_N38iYLh4`RjM+QP!LzVu^f{7{xFq(cWt~uF_J*_-L)R!A+6$@>QgYA
z)L$8~LpfR!ZDv?H6S5(+Uj_mqo@oWUD-Ja8jSd5SqSy<Qcke9T<^1<?;E>2cCKL(d
zPcW7ho4q&Y_YA{8m;7CA9oj84M9;lJB`;}GDqLAt_5i?i3-M3n9&7q$E^#9<ji2wf
zID%=)M#d0>%4s2ng77^le=AN%=d<v5-?~}$bC1dY<oi+VT6&Y^Zl3eIfm-%<BH~I5
z^v-e;jJ~JLn+>-@cTYMad@b2{Arwsf)l^LU=k)NdO9#6r5w&BMi_arFLdv7F%2~HQ
zw61-~!?&*b+cqD{w_Aj@IcCbPIuBZj9#*F;_eIf(Qb~RUhHU;ReU7dF%sg#j{cmi&
zZu_Y@ZtcyT(KYlb=z0;qKBN5?N~oEtD_W|kx_*!FmqS*R!nvMH(s3mqL|n>EJwaA9
zdpu|*%xm;vyN4pdBYY8TMN^F0IR@u6@whw`TS;i^o2fZz{_TtK-TK7fIz`pvG14^m
z@KSU4F!u;!8*KwId5DcDyy-|+3vME&DAkbNd)6y#aj{x;a;-lKW+TJl3_{&CoRqK~
z8g#WXC0^T2L8nW<yuKEtMtPPfYeRS${Z~kH9GFOw$%W9Kkia|0ewx)Mi$;Tm4A=*y
z2RORM=_StbuFcVzP3oOK3*&4O8AC(#r+Ys|K5m+YWR}R)mECKqzxSDih^y@Tmpv0Y
zJwvJiTTjToUzo<q)VNnLVHt(M3_=>*8+wYPCK1{jF>)l72|4UcKhi4NRnMRy;EC@{
z4ns5cOg2%bYljQN(sKLoZpL16+3cDJ;8|fUJ)bVI5UGcY(cA~(j+ZR&THpU{J@g$(
zG;FfO6zq;$9{F=cid%=v+FeD=9jY8gjVuIaxi6H22l!0e*Qq2v=(4$Ct>VOX@sR3m
zDE2IfWz7q?IL_?mqLv{=zwBPe%N{`&Pe#;de}U?gZb!B0+Qb$e%`Vf;#Bgm#cTeB4
z%ZhFMh~W%0eep;2SJ+p>+-nubwI7rWCANL0y$L5*?C57&1iFA{Pv>ZW-T(knetAKk
z4S9`%|KHPuX~1Yqq4kx&=biCEUj@H@mFKsxiX(JZ_Pz2?Y`<K#ahsw-zYjS1{3mF6
zsBSkH*>>=zKgsQ(dFJ6BTQ|q|cWegU<%5)ffOZCRE!hD9dHf)_$sOXE^A&>5w}8Na
z1DnG`h0BEeKMhoZU){vxZ2JD=yt@34Gl=sv)Auif;^k4P#Z}PXrl7sh6^ahHt-MP)
z-%mc%?<sRG&h_JnRx;#*n2R{tD6J18(y%gV;>RLAUfY`58upws+W21WIO66MpH@aG
zk8G;AosVNfgzzuN&4f+pohKo%^w-|pmR7Bd$(n)F+uhRd#+5>~92{O6V{DL<#@*0W
zWc`oO%%18IHknMpS3|miV)h~HmakYIMOiaN+@&^pRzznT4Y!Ue{b(;#T4-NsUv6^!
zyqeRe0+sWchhy=veAI01hW2IQ$z;h~pYOoQ+U|Li%FhB(Wty`vO>bE*G7k-H*|}~g
zix|n<-HWQeAssFC<gTA+ne6%lyv5Px_yX?i#~#aWG*rUuN-_Ly-cHn`!f1o+&wZx6
zBfPE813xK9es$~*{H4mt&-HJpc2GX%_;(7}l?*utLJo*rpw4dYiv1@$(<8Jx=_>m5
zs_0+@*_jYq^BHQ_*N#P8e0+)EMy_#&?_gsPN19pUH<1cA8;x>U_B^&akAFi;-H@4|
zUj_f!zMz<Uista@6TvN?zVpp>znGA0KRzFZ%(Hrrl`buF9^kNnchrVihpItRx8)fN
zGIw566tDaDZmUKH!k4W3Z(5Mi&^HdYouMqwj(6R+2#Xd7&z=l!`SznQ#l*~$+3J9c
z6EOzFR?z9;e3aRho$m7H!+9U&CqZF*%5+`iCZB+LMYT{>sm83FOx@MSky*Mi740gt
zYB+rqpsUFl8}`#wxAlJ6!9q(P2xaH$=!b#ZFsUbE5mJ<<%^&T8k_3GOVC&FpcMV+8
zCmT;2`+I~=TuInX>lye<ahknFFjJ3E&>N=GO!7OkdIVosTCzy$e;U5-LtPSx)SF6=
zEoX#dvtqJbHo<kzBp=GzT$W(IRDY`^agh4xqgjkyo>%6TS6*2EG<b42l)w7#q$V<Y
zfmz$GFw#VkqAP@TNC~@cn0H?U&ail+nr%)R&&e`r_Ip2<91m*1DdcNd1{OSlwtT6O
zjseM99$SxEA6rX=34o~m?`K_BPS9R!Md$w=^Q36kEhIrtUJCuAJjJye<HB;*M?^tf
zPj62!h-=;!&oADYStB0weyX0JJ#QNC2p0G@pW*abz;8U#_WHSXAJfl-+K+RJ@d&#j
z-%y0zGWxj|!PK&E{4%Ph2*WuQf-6DS;8ATFiQG0%HVR&xbwz#8oWpSY3*ys7q7!}}
zbNc^IuyLF9_@|9b{A~C8Pka4Ys9U>N*Nf`APyKJFTfle24?%b6U6T+?(PbeIq$o!q
zbVT=y)p&$-@HX=>_vMc-%WKtFH&m9tS$rLs>FYSc_QUe7erJ5WocZO&)o8YH?smCH
zzD|S1A0TL-?*uJOq4Hk){c6)`%0)-%B$IM99*_bXrso;i6duO<xjbv>FS-+oH4@d(
zulyz{a+i`#O@HuGW*zKp=%+<JH}(+_93z3p8CTTN2#(Ps{#J~X^2po&vR}g@(gjz+
z`(XjVRo)r0fiQD&{6R2qWUXuVVG1@Euue}OG}?X%m&yL^=NZL}pf+-$;n?cL!t}%V
zNz^Lm<N{Qx^;Dyrt>>o4eUeG1-9vd@vNxT6Ek6q1DLfL=jnm8wR`uEZRDN?wiE_C9
zBtdp0mRt-5*9uYv5AovP9d&q^VX1E2itgaidhL~Jbu^h)wap^NF`l%He8Y>EM|Lq7
z5yj>s<Q4$(_Mm~1_b{KyoAAYSj3oul2j20Ryd_p13&sDwVzq*bi+zhLEo$wIysjon
z|4DCB%v+53_}&UceYu<)PZngjOz*uAzKt9ZJt7h?EXaY!+aN%E*^zLt?~hH4)#yf*
zXe17>MkY={1pjb=0L*J#MDBFH25)F;;`RVNa|_MEh?I5vExlq`yPRpNAiL9>(>Gsx
zx#HjS{<`D$hoHrwX`1%Cfh1r=2l*<>L%=;1YQD8wh+;J$0JZyItvUr^5qRor;dkmg
zIe6jfxgd+f9~3#8=zM-PH>4PJ7?Xj`GztO`V)upG6Gz`$o;AOweE!4-(vvBhja}4#
z)(5xP89F}mQfI&cE5ouyhLYRSw$W)(9t}M|=uP`JN523*@~OTB&pWzi>v!n64gI)*
z(HL-%95~D-hMF{5_7Su1cPv(Dve(uH4C?<DCvOE4Wr|zt@r{e7gN47C7MF3Ez&dqD
z*8`P_D3#%t&6i3giWOMVl*oRV>>v@h9t|^Kduz<_`{GK!PJRZ4Vrnnx><GbyYKlMd
z9jV}=7tgjlmSqYb!A_`l@^^4%=DV{9EjVNb=#a@soGp-Y`2XU;e*uZR%V?F+sjB5D
zJyz6m)N*-xB)GR)O+|d!AR={5P6H!NR>`>)YSH;zaT+gTh4H$+5(`mP{C+WatA^y;
zl?@w(YuS(BmV3d$_x#xv>dT8JO3&vqWvqj~{G55cHK^WV(`R~Ziq@L>LlF1*O3;(q
z0uhuqtcYdC-ubRn`+CgOrd>xHZCbt@9)CM|-5wI`TX}=GuKrco_K7zIsi9qF{D|7W
z6F)D%@%p-d%xW<;>U?_gWdIujce2W-u;ejNyv3~Wt*2s=gnSLzY8bp+qgdH~@^b&j
zufJ|*HNXlIV1M_B2lXuHQxNutVHO<XC!f8P-`=&@2|P!D`uvu!>F$9uvF9w}Cwd)S
z;gL2`Nx=T3HVo+y67SGUE*ft~<Y_q0Y(BC(F8iQnuYK<`#WnjAFJM|O7Yg)y1Qn-=
z>%M2jDl%qROac{Y7++&DZ2W6QW9CGnAZs6rIKt5uL#6=NV+@cz9BoM7Xq1MUuBwYh
z7_KX$9l#11j$!hr3jf_hgE&Z#ELBRr{3d#@Nm1VgZ6T%N$yTHIwZ>9k!Z0tBrOA1D
zTvp{bB64KfR%Fm!+x|sGACje1v%Zx!QSYuf)S_y)iS@^4Htd6FR}O?_E~&fa(xb1m
zz3vB1w9P8qSoB_~iZ`VsX}fxeA(VDJX-0`Apri9k5Ait>%akFe<>_sG702k%R&L-8
zl2U?Xofqg@l891o;^&4OslT*XhI~(Nv~sxANewf7)28@e&Y6?XWX1r+94D%Nu13Uf
zWx7`3yPzp^&-oy6#MwmS`|Y0z!Krlq>_mR9tDucvT;cnA9(bslh*ox_KIhHI#8}4*
z!4Cj3Zz<&k8=Y~Yp^@KAM*yN1WVRvK-s$>KpC}ozdDXH{7~<K~dF(UW>bqCvA2|ac
zA@3Ar*Lq=3n~&P++V_66oVaZ$?&!gw;-q)XDQ_`VG(Tmyqm`cyHNQKXOf>P@Id$V!
zA&~;E>`4cP7tZt*MnBiM6fOr^mN}IMt)1%!(@e?^^z+7c&j;{7Z90HiZEY6zZ-U#}
z5$anOrIVo_4`Pu0s+wS@H2$qSsvKtO^sP#8%Pdd5TIA)MjeB__4ZoO>{k(O>LTze5
z3KzG6?3y0Nc5Tvj?Y}Le{usjNp_<5`uTkqbx_g612l4iuXMiqE$Kq57mV6v1EG)7G
z0K-er>>6+^{?C(!{z6<tgq2Y0!c)I!D0kQhbpz<mO>IwbGR?H%Q@tpdObS)X4Y47e
zOkc~OtN-sM|C%+qpKY9p3RcFOeBh_YJlx$J#dq=3bLMk?iBXMwtxRK&G~pBIrjaR#
z4g-T26(2`(#=~W7n}0iZh$X8mP$DyHBnFML_N<_Gk1`R~WPr|=O{~M$NzBBOyo!q<
z$m_Cl@8=_S3hL?FA|^xMS>xQcw)*AL+bfT+SIgVu466R#XtVF}e;P0SChkFkY&>EY
zgHC<(&jrnIPgPem3QW`-c!*?a<8<x1<@V?$QzHkr0yWVc>3lKkjk_L#KxVXn0nOHJ
zcGB<roN^P9lh%Ev{*v%cL2hU5<mu->ReyKpQ*s{9!n=7Rn1B_=zZYi{F@`-h_l1Xg
zi4S$qJK{j_5GS{)RH;K%S!w~b-6LHdraJIgfsA`h5RE=#h0%FfgO!#aSwXCzn6|s3
z0z=uJfRd0)jNL@(!ItJ<cB5625i3n$yO!q_2bQg=;@@irW@-=achnS1lxZ;|n;*Z+
z={vv;z6Undp$9lt5UK;Ji+?a~GDwPU9@R(I)_;(<SKiR?7Me!UxUc_%E)+?{(Nma&
zweptjHj4}cJJe!irnudM@pX`t)#=`Nl0ZJ?-ePh15P=k4IX~ny<UWL^>)`uO7JT2~
z_W9z))1%X%HZUrb5}`}Ri;>*G8V5>Y7QVZ0Tv%O7Os?ze0+=&~#4C5KolcTNw2x0L
zWOC_pswl$-i;AJm=rkqw?g)4LOuFWu$`?`47yRq{eIKg{sysD%Ah~;fDZP1Nci<$)
zVTkrI0&j|CKLm?BW;(56q1`bOL{WV8?noUy>{a{SdaCEVj1tm0HhsU@#yuh-IO2t=
z^l+*7@Yc9&xQ3vO2nQNxYD>!ir1=cE$&@hBh&LaP!CdJ_IJU7j<mmeOF94~J;6Z%T
z(f9f8?EW3X$ippvPP$y?=5U*b&nS~_?%|0GC3af-Dm|jsko(cp0O?@mQT)3lqxldV
zd4?hQu|5l;A1-5G!DRD^aa^pFF#QAs@27iZpFELtyI>vHCQNP0EuVSNe~?VGnzL2e
znhNoIhCc8RHstKp_Nb(%IY8WdiW=0nNo;J)?5V+TmzF%7?K}`e1`KaO|1-(9b978P
zSop-``x=#xye+F0=>EoVBsS65CHc`e=p7k#dK(BnY2hq#l=(4r@0}|#c5P2lLCc^s
zu<-X=q2gAmiIzMZ9cm13p2cbM;7t;WNu((#hrHhX=2e6E42Y9;>_>Z;iFpmEP%3?8
zU02PwEN)Wur&a?&)u_*`XkdGy`~Aa{?SNw7ulxPi{0ldJT;GYhClZZN0SCa~K!+Cj
zP3Mq3N5;vn{`z1YuDKk@)NS&o+r+;6U8x%TUA3+1T|HmzrtHOQMO=~fV-l`hL_=IB
zl(~_fE6*A=&kp1Ccx!`NTLWjA9<RF1A@|mFC}!)I*Vz?i?U#?2U4yQhO{McL8id1`
zQxF{?CW$btYNk3=4d%raL_5vD+j>e);gkwBaeGNxrHvCxV>hC`rKGXWts<sUQi4v8
zT1AyeuvCz7j5x)WsE@EA$>MO}TC!2#Ty(`FR&&_D%T9(MR?R9)cKDaaat$TyHAF)W
z%Lar${t&Ipw9|WpQMSWy{uI$R@Ev#Wv@`VS)3V^1NQxMu<!tO2)kmxpq(;4p0xP_B
zWg!&YfUQ0W0pcf1(huBQ!(zjvO5=?)nWVgkls99J7aylM_s~$$)f>)eRE20j!$eVx
zNx}S5!(A_1mEqwYB)sBpUf333RT8-3C+eyGd`*oo3F*-B911>ru=tJgVY}kL6g*3a
zCXkZj_HDn(a$>ibY#78JZncPD4M>FP(81M8HDS<OO5BtVp-c<dWjcM*Dy}Jpe-ir9
zaCb3Kj#8K`pQ<ezXzYa%V+a86JvkptJkDi)mBZ?s#r7)KXjG;Z(&_O$G23dkLPS0s
zQIamA{o+wTs<~=F>I+l=0Hcc`2k5v~4Psz6eaf{q$I5nEtSv&ax^=eKR;QFqW|>Fp
z;EkI7g=A??4)^7&Lv67do5UKMy9AHH-m1QtFK3mauUKo>;iCMvMWA>xZ-`L3g=_oU
zyY5dQ)iyAOTf+!?flB#^9o$01XqfzQxQUt|hM?j^ZyT`z1@+u}LdW5qVwfb-L&B>}
zpGjs6Yr<IzHuTb{bl<16VcJQq<E8Y2(mQKSIvKn#Mm-9W5*(|u?9+decwYxpp)N{>
ztp7-U3PM&$3hlewZM3x9+s6VdPHuT@qS*hxB04zyF`Nd{Y6q7(l34}Ogw4vmMb4^@
z)tm6{^k*y|I0m4dfGIU#DUwL*5n_TZp=Z&FW}%@bgEMz|?-7+~<{8v{N2uPyBtgcC
z(~XOzqW5cPys<}YSj&*iVLpoWbhn|Ffk;FsMb?hQYgUkyvc=`1%%h9}hYmIB`ZfyM
zzZqg7;PE}OMHWpZb=OlTn#JX@P?amIOr^V80{V2^#(Qfl_WCMSw<!h<zzMDe3}JzB
zS1F}6BXg2PZT6{$?@1F59XP;F-qq|QZO0XyznFciTgyy;4PV~`h88_cYC_2&|2rk%
zLDrXFIE+QWo+RoP^mT6bT+nhw^!E@7WW{rBfC0x-dV9Oo@uY)Yk*#*Ws7TsH5re<z
zn`=HhylCX8J2Wj<wj?`>5KCSs<)*LGb?sPy<cPSLa7QcmrQ2klf+VmoUHmu%6k;d<
z;M42Auj1`HnM>tpIcT4g!A(t#MZpsKfMran>bC?rore$5GO6kw{WTn$+H#O+)-fLe
zg+DRRIU5TMt>WZ21)2)w0DSUQnYO5{k3bXNqnsQ78h{$;RgopWs?2HPv?#fM=KgKN
z$8jebj3h4Tf2!lQuaO+%kv&Xh8beHV{WZqaiVgnq-RtKPyw_kR!1a76lTW4!yugjj
zT;rBX{f<?(i{{=W<F+jfBMHS}3&w7dYd!d3^{&^73l3?I6(F(P)T0@bJ1Mo=Osy7Q
zWIon|m9}Ys=L;2GLPJs5(t7*mJm6;h{j2(^Od*!y^eNqAn$-Lwn=dsG?+zUji7UUx
zQOx^cEU!hTn5;~<1MWYO0EV#8^@SGtc3PxE+j<i0RcK@J{(-}HHQl0O$AH9AcFg^F
zqF(UxlUA!9sSI>A=XBA*%ud?NYsK24!9BeP5u?185P)@FNv=SO2CN)l5~Zntt0atU
z+8uY@3${e{y@ANO&amTb{v^>M6U@H`_Me|5PMxl4__`{fd!$1sa7Er?;gQSaA`B!7
z3;h{8Vi77DHy%U?4`7NZ4lKoG79t$!_3^qYHm@a;8m#{Ri9%wcBI?O)Df(Ddq***X
z<b3Z;Z&iV@Q7LdiB4U5aXPS{27xo8~wtP}^cR37kQ<saiR5R;fK|<Ij{oYP@p2bkw
zG`S@zFer#lvedQwk$Bv_Zf{cE7k$OOl~9sfNVXX`r#UA6)g74`<38EDh*mtg(9WQ;
z02DFTsd~;W+nl1(Lh`to7#U8X#nz4CrYjTpQoDERu3sp2Mg@;1&$Ra^1i(1pBvrD%
ziaxJLb%rca?%be%KoD2Kt!K2$YSFcS5GTJ>i8L0g5ig>pU(DL|w`~n~#91y{khT>3
zcXRF@Si`PZ%(kqrfvK+Si0!sg7z3L_C-fVgu><YY;y>=-eaEewMVoyR8pk&ZQ*btc
z0S8)+GZuR1X0Zvm2h(zQrriS*Bb{3(Ure>3jZU)TVn0S6m&w-oud>b#=v;iQ2|LZ)
zqY~~;sC9&VIV^i`KxtaRi~s=yr>_f3fb@59%457YFc*;{9Yl(zHUDbU-?|+(*%o{l
zDcm>Tx^bEYqo!A(kRe40%a)*&=rWIV9Wr;gC2q@iCDV9EErM}-q}^fofIXGFAUzDf
zC66*`fO?|XDtri&pM*Gkv1g6)ci->f(=JyiLuMYR+n<d`Fm^F5*`!4X&m>wTN8Efc
zZdljBxM>qoq4{w%z)&+uWYs<ZLHca#i6)PH>8LC{4kxEYv`m9^BxgDJlq3M8WQ<*3
z974D;@qvuA)}xY6rsjBf_kf15eZirayRO}9_h{abhcQ-qkuRfY#4R7-vl6k!=5NOc
zVA4BeWfmFkwkZ@7yL*fNhd0`&tMWlo07(wwOGTqfH4kB!Ta(jzJFoM)KKpv^*}y95
z{PWc+OFreJ98M82C}oH$l;ZHaIUU+zI*uIByM*BJq-5f@-1j{4;ZkBo<5<Tl2++cS
zXb$N)*84!glQ6@dRtglU<7VcguT`l!^rUP3xA$Cs;bT9NB>auL_j60n4|5Vb7W@5a
zOzMk6%oLwnx_N8K;X#u=eonY;scpr5smP@}sspvr02pC66&;@E*hvSNJ;3~TmZ>w)
zyDh@?^+Q0{+=0f$y*s<2d6@iw>D<^2f2xG63qkwc>P-K9&$-TuGss8gotG25>e&;Y
zWQ@LUTH-gu-pG#N_dL2I!%*3W4tJH0ZQZ8FT0AB@=#Ug{ga@|U{;CsgJ~P0dKm=np
zPA_w#R6-6($}1K6xjPDs`tw9SiG&!vuf$!|7|o{T7tOqw?oDZ8iY^FYOc(Ugi+?zL
zCzVqI6w2@6??etSeb^0MPjIl$i5=^K{!WDT)Z9y3wEw5Co>-r=)EOq1{;|IPy?ETs
z4=;^OD#GOI$MrK*o$WR{T}{>#B8lEPpzZ^lkd9{4rhXp~G`XQ)1;ldON0<q8TD6Sk
zZb#Tg-7GfnrsOcmCcl#}wQ{Nz#S_*FzEh=aWONmpMN>p!!fM|<$`Ex7;vW>~$cTZ8
zoxa~56j-P-yDM_Z@&-cF5iv)}Ar_)&M*&|?5EKVp!L#6OF-$qu%5H<-(Cd`{gt$TS
z>wR(%#=W?j=de3p9aK2T0v--BD-18C#CQCpZs2gChs$)3Dyyl{3)$X^?qYh&b00<j
zZg1}PEj7B3q7p<7apZ;f(x~L4QqB1Rmdx=NBSlb?<yu!MX5Wvp)uz9Ud!B#r{U}p~
zni`qaOcW52-w^|b1{rkmV_ghKFLb(jwqzNd@n+uOLGmg8yIKokS!T`d7?E3niR;+}
zm{?}&2LhT5%qP16yhbA31;j;e7|lDC+_Fy(9O{cin@KlTnG<n(<#Uxg3DImz5$aaZ
z=aB>}L7~GCnCy<mWFdvH)rVL;J2FVAfiwNBr(rBoWl};^U5o+-JccgR<_^i^RU}=1
zwB76te-W&{K{=sh*=myG2oD9fkW=+NV_|22vb8Mdf-*yA0Vmo%!*J>>OzNxzs1GEy
zL#I+xXEVP>L$DD<%TME@B|eT=n@E7>XI6f1>_zMSN@Vu-xPFh&n^)3Gz67*PS`?gX
zz_(s@LwS}2T~GGXHj{*b{OyizsOq?GJMa7PaN2#W?v}QilAuAND-|6N()K}N8a^wA
z$znH3_Ev;$;nVu&XK_!Bwy;*0V#3>>niohG#Yw<w!__~;Q0F{1Jov2=c|$Lsh@G0J
z;I4INNkTiUoMTmmuw3rNN^~A-XV5xJqiE(3_l1@JUf)6~yk10FsYL#Xa0n&YlcIg<
z(K9vcEV^wT=-8C4+4`Jr+t9DEL(k0PiQYkcVeK;S>J&g(DNp_#l9;+!<juIRCwu%B
zKPB$NwJ&bNRT(gGb?}gr3lg1Z*;!(L7SfuQ%K63_`k=~d6i@J2D5HZ=xXcKmSEPxX
zCf6hRM_f?zzdQL-Zgj?f?Ss~M&8<7&LUPD)$4l~1Bh90NMoXT6b&&YSUG6)nSNTg~
z=%hO@*s0*ubQGc{IdrkzWY80%fH>V|CK_9#_qF1`d^D5z?Dk0A_e9J|L-)8<n#T3h
zO~D&_xe$d)mBD*s1pqg_lHMQ<<>M-D%>?jS=o+K|s%>eOh|g$PqVpnJCI>`@zHk3Q
z#do|R5rW(lo*yA7e0muP>prp4G`QejeX_kSrZB2;2E`Tq%2jqggNh7Q)Z*_xNt*>p
zn1tH+({fQi7vrLYQ_}ItSO$h!stNPwPrT%}TO`%4r>4Gt_K2jPOv`7;ONWegO;OgW
zRS*JB=wE1n(s|nMc`)ZVNtq|0A}x7D!V!C<{Ca}6`DrR6n%<MW3|?XpVug_y@9%Zs
zJ3S<Kb-C7yhe1+u3f`JHUC=EW(l^2P_!VBQpBU*S`dT)dngu;>+N1%>CDVVokOaoG
zJae-kC%v<8k4o;UrF>A+SG`q|b&Wy~-=XI!c^d-D12$|>MuL?wECTQp`2Sv&sKkvc
z`gtCPs#NU2+2Pxd-}sNQ`?4d^v}T`Q?PXV4_AN-gs~h8lbJJ4ar!h($=a%^QVv%<c
zZZA8N9cKgSjwTmfh$t)QCvOddWKfLa`Ly}uSK<&Msy!rV%3Jwin@@&#BxrAqBkm|Q
z|4^x0mP={zspo!SQt?O5*aP#(_0jV`6$i8@<NBDDXRDoca`gr2AB7QKvwxW?RcMKp
zcC9v1Y3cU)3Z+iv<irK=(kO#z?OUSW>FsC&yjYXw!l4HsJP0G?Rx^o|_nz2UMs>h%
zqrSmu%(+EA874OqNUC^%vvJtqedjgF+fsS~TKdfY3aJ>PBu?HSv>boZyujG5-w;+>
zAPMPoz}qY=e~K(1*Y^HT7<dGjJrliU&jqDoUH1INq#&Qd%a^HC99Lc#x@I#^{C?MT
zknum|_cOY;N$2lV{!>)}rX74&A<Uj{g<U~r5e5zck#Io=U6o_Z#z@68DP-OsZFZ=y
zLyx~Jzx0^;Hv93%wxJJj5RD(L4!SaC<UD(ZHq+ZAEY*_ql$&`3xECLGX_qj&J$-Rt
zzgY|TUzA(zUhM*oT|8)duCWvRfc=i(JK+G1%J)rNr)4G%r$)73G37R>S*Io7`aFW1
zSN=}Kt(G12CeZnNZu$Cr`YrA-iw3gLH>D*FxFA9S@2wpco>WoM>qMp1{PQfQHN&6@
z1)SsDIF@tqj^Zfc>W)2=Q<qMfe6_yl7=(h02hb%bIT*#JatO#xPp8{N&@!-n>Z`*a
ztvoQYlg)FbLl;LUO4(Iv-382(YVUuP<CY(gl$D&7C`BKN6ZG(#qvWzDETduX_Pw++
zCcL$(mp7~`4;ECbo|~|xzRm=u$1WeHMb+Pn-p^WtIRS}Xs-Rt9RL=R>z}<J;E;ZYA
zOm&BJP?E3-v9!)Ex*h>qtxyN@R@MHbGcmIGy>{tAk?U9SS@DjvF$D`<Ixa^xU3fUu
z-BBKI2}ItDXYo*r!NBttoFOevInB2bgD0iQn;H23$cyPo7sBAp&+eK8GgnE|n3_3&
z!+6_=qil$K6o5y-T~~6zF>pbwU@?hAiJ#pmlUvHxO7_rYxdgy>3!X|I*4-3c`QCLI
zSj)TWEr@J4?b+zT)f%*><>;r%wl^OV3dhBJzIF0_Q{byHOXNgxbtT*`>H8cbC?KEm
z9|M;qWV;nn&mNsPp7}yxk#`sY<r?FcAF$`7tO*;%*VybU<BII3l$UIdI?ts<wycOU
zppB8>%eh86f7uBnTFIBz<nLU^FE^N3LyOJQa(?8V)fe}B;Hr$9DeMy(wwcM??&H?C
zwIVq6xpX-+av%2Yb(2NE<<wB{xWR9=c|UzQG%mQk_#54)3QE>gmgD$lEMuis2AI`4
zLmDLs<)8SrIXe0j`GdD^;>W?leu;^bz))q`!l!`$H!*?@Nu1NVngL=ii+`C;Q@=r(
zGVjg9WlxNLcIOq&)*o$ulB>)*wQMg+?t|+4))USUmMCX5@xxz)>?wo@l5$~>+isSg
zU6d>elt|&UjY=5Qe;>*e3nqf@Fy=-xC$UIag-Z67g)mj*j(t<1a)j)wY$~O6`dX*Z
zP+Nx_hH@|22Pu&x-UP7JOzcu0po-3O)0A3#7MXXQ%N!c|m9LH@!YoEejUoGWXK*vQ
zXe*;=v5aLe97UJav1q!eYJv~L-zT>!ctA^2ea8~WY~=AMc-pCw!BW}S?5*BZ`?fVL
z&&&*?qDSqyyzW}w+4C)A_6FEy<cC9|vV7qgDKaI)l>~VC%3zN=$bMys8ZGX#BC5Zc
z2TsBr0hcLJbm|X+h3t1t*kh428V-eubmCoPI#(rt3~{?y^?Gl2&N-j3Baa(i5opl1
zlYuiWXw+mj4DxAix?!^_L~!1LT?cJBZF3N1%pDVAs4M0q_Fnle##__o@P;D6vn<v)
z^9ZC(%XOG0-q0W6$(wEp32>-+P<9HEdcPwU4dQa4qx&IFgBjF=5t2PoT)dt<NN*R6
zL|a#dTsoKoH}H?zChAphleWh&Vp`WU&5B?x0LxX3#znxKfKl|_&O*or(EDgLy%5HH
z@^N<(7%QQB6#!N6j^d>I@anWNj0yVlYJ^Q#OPodx(n&J^q)W>|-IuXL8IotB++BDx
z;%=+~sYi%kX!%oWEM;h@mON?rf2?!j%c;lQdkp67S{aL+J{VMfa;J3ng0|B8?<2?C
z9nOAKA1v5x_5cGq@m}BKPCoOS{50V1Rrjv@RP)ba)=XR#{pxi8;Gv=3IMq{-P%2Z&
zq1fXxxo1`PDNWw+=(+^t3DGM#se4BYkj4U+_}?yGZ~`-8vyZP*W{Mmz&Cz==+sgm2
zSmq(+IRDd?xTTgIKGoKq+T?Y;1cU~m#Pmigr!8dP<LIKE9+@)9!1Zl}>n<H|PKzM~
zo`BS+d<y*up@%Z>5wxbHXl|E%q9vg=XdZjy|9f)#$EV+E7GSi?uE`N6VWh$OFSf?4
zh@2T<@JKLIkdJil+>@k!Y>8ctqcc#1(DP3?7Eqh)R7>?J8%1-caBlJ-wXjOQYF^H%
z8~J%JoQb*vyhfjgru?i8hxOcRx9C_qAmdT1%FnV~tu$l5*GC&qq<Pk)3nbPG!4CMr
zQl5hSP=x}+o(+I*@VB9+L{_r8Ht>Nr>V>O_cU0QzBn0L$M}~>#*sB~nY9CY|*{AX8
za^OHG?>M+{y=o0ZE}3MC*nMII&Y#0j{3eyH5?1V)M~i-@@NjMHGvG|7u7PAQ%LZH2
zvNIL2ouLc33gJ?fH{6*)=Ex*AF)<ZZx-71Is%pO=7Wfx^rQfj+S>yMYrPgrCPB27_
zFE4XAEel4CVfUj&!ecgpFO}|3)D|cWRPXRv8yXoU6K}|zi)SpZP;eKHQ_w>HA_`>4
zUoE_)B!xs7>lk@NGke-j=xp$4MMK5bY4lVxx}s!5VwOg2VhvO&6J!`s86mu5!s#)$
zDb!Nhcz=PvC5%6EQ}RtUKTjO}J}2<`--~eJa>02)ALGPVC6i*SdQ7+?mqQT^SVbb0
zKV!?O3BaN~ForlbF6fKr0Yk_=W?*Z{(n1K0`*Gx8?1l58!>6}z9U~fCe`0;|yeogF
znP2F+ZXf^KJo#+cKGqPR`J2!u&$wa~A`ruk2IT&ik+e}PGZI?dqi_qek3pX*_7Dqi
z5ivj=OLrF0=d#xd=>7|cn%8ksCcc)f=`ZLTx$ljP3Ox+Hs@x8)@zS!p!M!h3=3yiE
z-5X%c4-{`yFitx7ky#0pKxni8tAd0clgg@znvJPPH#g3#Auy3&b%4adYShNC4cR=t
zigfyY_kodd>r{7ci^fo;&L18ndIUNM;#ERvikYg*F{!i3p8iCR^foX5nI>Ux^=PBP
zI_i;Ntl8e`!;~yNcb-6>JX!}8_YR?Zz;B!g0f$fxd4#B_ChR7M>5`6_3fni|31)$`
z3ex98A~|PASu$N6aaz8M(QKW<qa<rQq;IPY$CGY~<Q(#YRM18+5t7uPRF?44P{s;c
z25u-9i*Y~T5yI%|35JK$W+pANl6*+Knb{T9uC(=*O(jxRnS@(OJi2*dBR{DA>Oc%X
z>l&k#xRSpUqddEW`>~`Zn<6KXLez9Bo{lp?-OoF)yzSHJ{C{J=%@pDC@6m}XH_6er
ztFP!!b$g!?bqP1pIXSr$JO$qQEr_9?3D3X)?9ZXIr><x+8{9StBowzF+tk{;sj(pk
zkfcmi0*}7sRU9cP8D_XE1Ki9a@O}pu6v~@z0dJD6v7I#0EDB}RN*$o(qkY~D*MI?>
z1eTU!3VmJo#dKDKJyJN`mbNx#hH(h@EWU=Sh$R-_XC|Z|nzejpy8=DV-juwME<Knr
zV8^L`HZkHc%r!N3^ml?cx|>#&Xnyq4?11`@zs&)6f6)3tj;tVp#Ia##P=A67Lb}Je
z_dem5H6&VlC7~Ibll3D^j=nLRYxgiqTvPP7+V|BoXwL9rZY&6`?$L}Rw^C<<{w-pv
z0x_ks|9_*YU&Mu#uq42BCwnRDdHRN4vII<7F%D;nNddOBPcEo-@3sUql=4#VCNfnw
zH1UZJI~AMrp?1SQdk#C%ijFOiQjv~$7=?RgR%=DAMAG)tOC3tXktWlTh+e1+wU!!P
zB1H`^f#$nyl<gz_+l!#VfV|1Q((k#iSYpI~oHPY|Kxudsw(&pYPZ?zDL$>xwCUfRI
z+V6x%C)6HKfAT}+9KD&S3px+BjOt>-0o2d8oOwM^wk{^-7NTe#B!Gw_c(NetkqJL5
zUudHbjX&@9H+)Vs`OHpSH>y)5_P^VaaT+Y*4&CqCfC|t^7AoI|E4w?Ign?I<U9m6}
z{Q`L4*2K3b29h&&_0}!0z0gNo%1d~|m)gEYgG&S+I%{zn)8HL(jn3^x*OG||GqZuP
zC*4)!2Q1<@GfQio-?jk6`U(k7<$iC0k8+-dw|jXhGxjw+u4rrSbGg4r%jzphC(fMz
z3y_~?16*gl%J~S4($C*5<s-9e4cM|y7s5=MOL}r+=DU{VX4r(^Z0JWr?KOH5_6n>l
zAs@RW0vw9eAeAr$E9Lq^p>jfjftQd;!OY&mx^oMyrHUUNw~`t?;$P*1uVNvuj%5SZ
z(@Xc^th#t@w|UlMsXsmBUv9p4|Jdn-mv3jN(rN;lK3YYS1(0&3o#FFh?mOy`jtF59
z61ePRIt^IEeRrPz6qDzfnsN8yNF-%-JwP0z@LYu0e9_ZRzGwsJ2-_aaCY<9iif-BN
z>iMJnM)fK9qx~PQd??>IyEy%-<k#0bKKKN=weNvHPc?Syf_}YT<Dw?2o4b6k&uB;3
zqn0XQ*hHO|T6kj^yt}GJYc*7JBfcv%4rpqNtVei8RZ&@yQy$?pMXzQ*9ZMlcog3}`
zYs)j;fBHuPx19X??wVq${C_V;FzAkbrF|%<KvQwfwNsrQ8-`p3QQAcDDcqKA{@LRV
zVJMkc*8kvsBWDl;Vx7r#Ytg599xyuoN84ECiFrQCSU>!s>o>#uBQ+c82l-VH<SDM1
z7N73PnY;5t<R<bS97on#bgK<39=Gij^87DVL*4TiCT|y)O*)`&ISqK^*(7!VSVAjr
z_`UL=L{0mv_yPR0^iKg%xdKxzQN>M!tT5}S?U#C=Qjx}(>0aYsVdbfKeNK@f60}iA
zsBz~Ce-{%B%B||Dx}mc{4krm>q0TPMUYXdvjm>L4kmAIz)I*zTn^v|&TsJ<MhZ<(I
zUyqgg;`TYPOzpCZTYoki05Swuy135<ts{Ms${nY}UY0L@xW=V7n|S6luj_XV2(e9Q
zoIy9#T{$zUR4I|;CsYG=w#KOS1w_7b`eUz(=^q!7WyE?yFi>0PU-e*oco^XQV0)tW
zb%$?ihY!rVPm(;Uu!_K+=Ui1yyuF_AKF<62^fHimYVkNl)k53+6cc*7pie_cW?3sn
zd7c{9fEVbImL-$BWB?Q%k1%m3K|b3eK@ZzAGMNo<C>&>qdY^J5(_0M2&zk=|hhVB?
zhg&fgU#0vLjQ)PZHhi8o3?8q+_}i}<;&@TB`?G43)ObjDgyt(H?bBBc>tt%SBtU<4
z&LCYZ`bE-rUw$fXXTaRsmnp$`?bhK;M*CiFD}yU3vhd*-VFs>Y1SqOgMK8YM>CGN`
zu5kpKgD1u^2G-F<$_jxBKm{MBO$@^~9ZJ-qVVoA(b(JW4y0MahOnqPXl8NKxx{g$K
zr&(U+%-sbZC9{`Sy{Rw#Sdh=M%-?1i=j7_S{mdXkvUxdtnDo)I?yYyXJP&^yE?kQ2
z00>}YsFITbZkNR~;0OHl&0HT2Vp4b$0igJ*@2qYhD%bk+?Mm^~vdvf2w*4b=a3op6
z1W9I6c!ai|^tX`#4@t?)R_;*y$`{ZvzJQ^ZM!SvQ&l{JYXB=&@-1!i^_C%)nu=M)`
zNyd3o*Twqk1ekxX@9d;L=tQt{FPD++6yD2Nf65m^RRZi5FpIPNxA<kr;4;>bi~Wkj
zy&z+L2`4()P=W8#Gt<-^JU}H7n}VweE`|1mm+^Q2(=!mAB8%?=#Qu&)N?7Az0b5+(
zJoz1^H*1X_heMf3qh$Us#u()_xS@FKhO@vY*@AK}pLxlk8TSddk3TM6Y^Kh4KMkl|
zA?#jO1CB->0Lh+p47a1MJq1P=mohV%k)k;c0fU(TbG$fR%pHkFd}yLLnn;hVwd|`E
zMkV;kNKu-AyGU+@o{HIolNx1)b=YRjmJBCN$e>S|+b@=xbAw#Reg<7+H+{&RC6f#u
z8~fRIHJkV4^<kPt{Y|EWTT=ZmWhoP|yh4ZhtHvdqL!ZQF_0)5oc$Yn;C5fZ7e!Kw?
z3kdKbdcJ_C!VX=3g!fMMalo)zPMfGLI`(#nv2o=^0U#vJQC;c6_2eGkhZ#EmDlv0X
zCZxQpN<}4!<QV=IXKgK-%iXgj;-ZATL0odGmE~b~ISss<`;avcggELP7^=2kT1m+Q
zg^HJ-)&_Xm_;nf%v|L`rj~?g~T4NkX+!SS=myFAUM^sR4lS9i^Omjb+Je=yspTnEY
z&tO^#u4h4~SNcjJi~76Zu|%j%*ToX$+{DS=A2#H;06M%Fl1x$;MDu(&QM&uWmU<+X
zgIqwYM7>0+zLC`YwPb*d06d?>ikGKQ^DS*SrR<P0p=)BCjG}`_Gyo006T@SxWTEcd
zu>xko%}qJ4=6{fxXfplcc6%b(sjXs{%3?ckvwBO%zu+Hn{!r%cK4D*x=rO1&PZ4+)
zY!3`SLk|{JjbU7kr<D*|;sWMXG(rH664(>ZFixx`e+uw`Fr;CGk=hjEdY!%R*Iz&t
z{=2XD(YL;OdZPW{a`3>nR<nsi>e$L%nF7!}iJhgexEDXEd^=ineCm@Zx1aIr<gz|+
z9RdFFxoA6pkmEibHAn7@y#B=dGa~pT`{y+gsd%M1<iSqMKx;l|^>Lv`rdA{y@2~F-
zVzrFgfc6SS((VjJ6`eksGN7WP)lHM-h!Cboen%vDXB^<DYv=%SN<c*B@$$z3)r+MH
zWY$4{j?dUhUI0&EFDCu<3KQUe)5}PtJnqr+?dX6q#dMz9YM450WD*ABH)Padf`|O6
zQD;&nSk+cuf|~y;9ao#0s*@zn#$9uOtGoWaGRoAHM1meiz)<tawwv(WKc6P0ru75_
z0+M51%2o6rJYPpaOqB-o8`jXvTx~Csa{<eM1fuL7Hm~}H7y@e4IA}nWs$YR-rpQPk
zM3`c4G^ro}qQxKLM`GP?sTqwW?d+nyy0Z|$7}cN^hXIQU0c<E4EyHMDiD=4490xt*
zGEDDubq^!aAjS?~?1C;y;b#u|Xc`^rhB;-^@uL5V3qMxapudh?75#Di`77trrDsFu
z&ePMN!*#B13i)TFM`;dg69B@$zo_MR8(7bT*Kv}g<EPR%{s3cc^7}9Br|M660Scek
z1{?=Kx}8vUn7_5c)QEG54eDCzb4NlW7Qwoi;8sFWErj@DGLDVm&Sh>#1%#}tTfCkG
z_?73zHaok)KVE?#W#S88fHeZ|&o(-FRF3c6%Ik-|@1@q*zXn{rIsUtQ4?*TZqEu!$
zTh#*Mh&H}0s~`5D@N%p4#CK=ft9Ly(Z3g!%-3J2WeBZE$A`90HC48C^B4uSt$vz}l
z0xbOZuJ^6dqU_`!+!l}DYH%JvPG<a>O#kD@sQW1Bx!s?8hS7EzX?9E*rDxt->}vrG
ziVoxNA%1Ab$krkW`QKIJY)Gd%$uz(m1yJ)#ua$nS-N<>g)m{Sb&VG$y5$pz{yGD4>
z;XYANy09I~7XmsDBj1DzSn3Tf`9$>ynHh<r=~>^iS919jP!mWbM?(Cfr^=`_5IpGD
zsFB!G>9vP<{}#mW1#xM)NuF^sT*~$*w{NebU=(K55Miy$TxJZ_U{c6DL;~`a<zb;F
zkRPJEq`hEy_v+?C&ISN%=SPw<h2oQV06YW4DqF0&%6<c3zY-D3Se}SGi!Xl(IgCJ2
z(Plg`Vo@7jo<N1)NLEo%CGJ6=Mc!g0QK8_9Eqd7}C7hK!w9UKFk+KTjjGCFa7>wHb
z@lRvQSSRiMdDwagw5b*Zx<1rUQ+~Fem<~NRH$I2(Z9rOK&7b>{oq<W3yqaC%!ClcS
zV7O|!k<pg(Wo8-gjiPV7oqE)KwcJhjIi*NJBYrN2qwa(EVD30U-fsB>kuI+NgYY)H
zh1n`DgEQWYiKDW1s6lpIm6(5M)KGm=(H3a9z0u?}sVC@LUqzU!32?@2n6~hlCU6`%
zcn-&QcdR;W$n-2G@tD6>y~{r)ewdJ99=JQD=;pUMH5qjEc{2El;}&DxOYonTN%$8_
zP-KZ{Gcyqv02wPu;iQ0XLV?&;nOo?5DYW|#IVqU|=D3&3v|eR{$M)2Y`M2`cTLiT^
zx2!9f!V{z$8PcT&{ld|;>Q&h)gQ<{<RqHcYc0Dg8^Zy+_D6KSo(tnkdDy;o?ad-Kp
z{ix6jlMFioDHzFAech<2L`!s7cW(t$(bJ=&;}k86PNP;;0bkw%h?sKS-LD$Hr?!BY
zx?HAS#5oJP34NYn&}P~}>Q44hZ$GpcTP@Sm{xd7F!?t&3?H}!(2iA1p?h;SiC_V5U
zi}<}$dMV3hwGR);slueA_5&*=wIKB!5Us0%%V)PzAB7x>1;{ux_xB`?&|Kd);IJ*T
zW+ElUS%%^Z(^Ow~o{wO8W!njbEM_T)NGeoPN5SwO;95h<%MF-cLaFGD@`yeQ?bZx1
zXpQQt>cjpymbYz86lg4WH|o#K`B<=-|Fq7%r-2e4Gq9yTIVQy6kkOU%$YEd%uUp*7
z3x-{(T`@EurAOZQk3v&85>~_OG5cej?lU&A+hK{9oc;3$@0q!uwt$9*f>=gN&{N$g
zxVyFs0oJ=SldYaQyJ@z4$%1HFqxP!6DSt~8djB0N0mHEn?JNAYGm3UUHf+;o_=#j6
zqtS68GWhI5`UlIARJRZ=p}@Bh)>gOu?>ADU*}vng3BTLCkW2Ds-mkZ;+Qw+D%b!OU
zL?bBaQ>f}J(pj-BYwBlw(xknsc=qwXkVGGge}3HZ-3fX8LCT3s%z$;=!5*L$jatM{
zn5Bvjwf<TDojdJg*U|u#(^OQ8yu%GL;N2VHsUADT-&t1cQl!&gn*9HBKqOc7eu?M2
zjJA9EV9oxPefdurG@(?+Fk?E*<j#Q~O~CCc|0gt4BSB!oh!z^xt=bA+aB#)Hj3YWk
zWC2-CxKzlL6(4Zt9(u;|%6ugK+r4d6Gyy{17U_WVs&h-b98bR&Rbv$clf7&=!fMhc
zk?^tcj`2lW1?-Y!^fzTNrbf#YKE33AxgmHu2A&1(hrriP1h*|~rgQsYL=t<Ho@(j8
zG7HlJn=fK$nW{y<kUcUFYITyoWa3^p%KcC(sHRu`TjE}<>L$1!Oa6s>J%qNN@`3yv
z7gll$Do~%4JC>HkU&{f@#>wHZMKNdYJDoTH)Q^9eyN@8jO~rrbpVV3iZ!~|rNS1zl
zA+j^)_4wpmFS+|HSO+?r+H7g?uS@#2{8GjZu2{2vXd<v^#KLf@qX1ij67a*~-%5V}
z^#5c!)x8?n>2LvO-nWD+a`czC=Kt)k**P`o%vaU=I#zFRKS@xr#v;O_Yg7T!nMnKA
z%ddfS{WzmYNBHl-uBv(gkuA@x2XhS-f$Ou17u%(Sk4}={l~;hFUyo3%S?YyR23z;i
z;YtUcE=S_^;p&maKk_|~m8laYJGDAzA^WqMs&Uumlg^iboL3z4;A>mp%9p;B7t+=%
zL^>U@n<=w<eHn9Szqo)}H;m9x_&d$;^UG$19I-%{Yj;}G4IfO+6^z-an*V1dIS%Pc
z&%4^(RSaB9iygH7^2*NM%CGOs_3ML(Ys^}8FvgJvvsWRiuvg!eeoiFj$^RYg`;0E)
z`XN}IwSx=j6Fv#NzJ#F(r?Wcpf0q`<{v_rdk(-&sKoX&<*OQ#5R8z_ALElYx=h3^o
zBJ-WRa(gi=eaUHv#z4bD@c4R<Y9O%w%o}z@?OF{8JmrxA(TuUV40&*OtS~a)&r-$d
zI=!`#WApy+3hoGPB-u#^6?9@LO-`?#yK8+-;x+GAw<x<Q)J@Z{5P_l)*+;UAW^T~S
z(Bmk%nq7Ln(uB|!vdrChJmR(qo~b`#tO@I<6eDpz<yH65Jd&u~7rhP8Mj9z74^;Yf
zIqP-M#UtG{z-lF&Le_Yk84D(>`GIBQrextUQu3f@U5DwWtp8Kl@R)xCJ41U9tMawD
zrFsVl$SyQ;UjFC1+g9fPQ?KU;4-kv4Y0<Y;M|p#K3;_bz9+9O5OpN~AZzmm^vBI*1
ze<{y_447C>>Y2tO&}FF0QSh7ZP%#(dnrgcqb6nAG><g68yvNG_I6BX0xZ1Cc>qPH;
z7=$2t2{A^m!J|eGqekz9(d%eYlIV$E6QZ|7oza3s7li1djNV3n&;MP^C(DPi=A3=s
zd++P|T_^kdTFZx~Cjo<NKh+nHOl`rH^*DIxTt$lVrZ$m}*#9R8ET*f&wHFmNfDzuR
z)UkJm@=`YP1&jKtOCZ7;P{nk^lo2Sga*uh{Z|lbo*RHbN2dTo{Z*x5P?Vyf@{Q^>7
z?~r4f#8co@`709zykE8X%O{xk;n9oIyXc!|-OZp+0@NeRMBx{4?0;x1Vp9FP!@^E4
z^F#PD%;v*p_w$w)TF#?W`JiH2%OS3RZpoHwhXG!81Adk&j4-Vpc2}au{%}9nc*N9F
z`uYx?leHYO7fqt}S3fKNqGm8G`q&omKS>CfJsggM7_5WE$B(9ktyM;Gas|w8U|No7
z_e*Hpuh#|PWhRc(^{;>Sl7x=hZrU8IGgeP5>{fFF4Q-OKC7-&8yL1U{4I_jxyD(#|
z(6d8CMg&I1Gd?UaBRRH;qT+HRwHgUKkEe3-t}?Dw{c>!hF0UF_KpquAGVBppV>1M!
z2z$v#{(Zzv$bx`x8br(7LQL}B(`Wq!7ts`}$G^Ng9RZ`F@rd4u&xth5#<fLZN5wGv
z$Ry(rgmhv8O5Q#w0H!~$7SQwYS>J8zgPCm%3|l)eU|cGL!xYm}weM1|-1@CdYJd=`
z_wE6%xdrTsf{WGvnohpaZ1Q*1Jni%FXHetU73PPEQp+D^^j*~^fZ|dGVT4cnddTNQ
z8UPs1G*N+2*#S`l+cYR2RJYLwg(1eWulvp2M{9}pQ|#uD!1?q<F7rJ|@ae^w+0LBz
z^kmJxR&R=+y5(55YMp{Bb00AND6~UIq{gdZ(hi&;56|!=2gna<-->p=Sfa8WbR9^M
ze8fwom9=n^XiLvaJ`>m8hwvke@ENEK$LHBvBx+yvDVq?8IQbR5eA9?8Ch(uSeCgoA
z*aJ?s#)fCdVP1FeiAi2dSliy&9=q%=dTf1jkzsHs_Gxp%XzqDI`1Q}$mMlk;@cT$>
zW!DI?*VYd+7mXg+%uNPKQbxnLXv~gyc+K$W=5bkj(6)8m1w=9@2dgi8{_^*0N3dI!
zmM*?Jea#KMZKiy8(^b)6*i3fLoKsm@1d&=4h!U(Te`;&@hinY`Fx<+1vw6cFg16-T
zCp5JSGs)7TkTir}@Vr%Fq%J4Hp!F9L!QbpV*s1#gKGi`jE#Sx@Hu`3z$EYa>O{dPG
zT*UPCk!RMySGeB}AtM#9f=JKhjVN6Cfk&jXeKi4t)uKRrE5^p!MV3bfivids8*1`C
zk={(Sh<7E!sl=a<gb%bWlur{lPUR{iBUH}|6U`!$>(;Og@rdm3dTkn_rt2bNdAzcf
zT|K@t>nBLW+V^vG)IDS*zwmkrJ()ru)d)O;IY>P8ze@=&#`So6VNG+`2%hyd&|HsS
z%N<F23J4Y1Og=E0!qm}Gzo8J~NxQk(X*yEijEWKbtXpv)5@I^LPE!kMS^?}oGnrL4
z{p7RRzhsC)(m-`rH_a$~3~!y?d{_R+Wdx|x1ijmMTXH|r5(#ooT6VSol7O)}O9^o4
zN8y1{F?d8z<sL&Nw9!uN@b4Z>iaiWNWTeWpxIoX91{(8tVeKW=JJBrTte%)N3>%;&
z(8l6K)Z<EM2Dk^V9LwVn|M>dWmM|^y`w{Bl=ieh57|yQ<U%6B#{N53oF*i8yC(Ac0
zzTNQqpZ4^C3BApDbTaG$%J^vFcu(FfzjYM>97u=DA-5C-;VUNHVfSQpC1QJi>Z)+;
zIqWaLe$|c$SN_uD5wLvFc$Jb;ds4X%>$00z@RW3{Fh4pGtSjO8c~Uo!a?ChCEqXB<
z%#K(D%x{vDB`dlgLzf%J9`?iVgfG14XWzuknqiS!xB$!G&A2jI3|dvnos{+9%bWlf
z!WZ^2F}L+AUI~~?V$A;$s_gcjDLJO0jnREMpo3DlS1>oEX-k^BIBSn=;<LJ7SaDe8
zV_j)jx-c1MMk!JRMc8XojB?Mxmt>VY686a<9~Nq=c8^@FThs4VQo>Eyh^voI))P`5
z@<JCzt>Dz8*_1N!DVPeC=#|@K9Xyb*YQ>7}@nzVcy~=wG>xj6x`l!ypMv>cX<Z`U0
z9l$>DA`i~mEC=rs8+sdfn*Hwj>35R?2EK>?NpXrzO}r&ena~=hbI5-46}vfOO^P+H
zq3rUn9FPy^8n1K%9;?x?+p60lJ?c<L^|cbosq>L%zy~?2d_}rb-)%D=IZ$?!Yl6lH
zhMEqL6w{XdA@0K@5D@j+;Wxyu(3|(_9q9P$W*W;HJ{`i2c+R_G3ZzII9if`Z+$580
ztuGVkZo9JEQUv(rfk`O7WT9l6&M)`TCvqXh)5)w?d*wASLLoY21gNb~7AW}v;No`R
zI@3HI<rLdre#NqW^)@_Y=aauRCRX(+3s@QG*ADZ>GS)n1p`|U;7yWm~WvxIT#i#NV
zFvji4KUf3T8NrD4QwrIVHNRVMuq}x{Vy>tpwLfJ6?IvCFdf9qPlx(u3#g16%o$4N&
z%aAs<3LE_PH`&f39_WCu)s4<}ikjR%X9>HUW{R$(NfyBzQQ$s<1j-4%w9n3vKMdhA
z8T`7|qzgB_@dTv!mDbQfy2r)=l)NwMUY*Dx{R2n*HP#fK8W{sVp5bpztWozq^4+u3
z#XOzB!PvS;Fya+F1*6pzsN4}<$w3k(6IVZV3Us+!kaO2Rf+QAhm(W-ON&NI8R>ErQ
z+5G^!k5S>lb)`VGwTO2D=}4+f|7vAqCEm5tib90}OB|g6ZjA_b1@J9y5Cn4Uy>EUG
z?AU*TwFr{I!Z-mUlOF)<fdLT>3=eApk0Ynkszc$+f3J`+@0@C%bKhlUoSErOy27iS
zjhX^XHD~7g>7J+>s53nAQJrX6b9xw?1P!Dpz&i*7Fx5a4l!6)3O5N}`2M%0nJ2PNp
z{+K7!05;f!3oH<T-wprUKb>5kLOZ?c`Z8uvX9t-Rg-!f%Cuu$Fyf`-fXF!RaoQ5T;
zJ&v=}3wXD~epvbqj%6RVDFZaj)pzA>c@5%yJt;sJMBZmF)S;eWP)VVWI`qXBj(GIt
zB%+267}7^NZRQ50g3o%AC6`vI%eel@6Q_LiMn$ivHk_6_Io?Gt2V;N07Iu4kQU2-s
zg{|pLyLJ3)sUxP}Oy#n}-wG9H<un8v_kWLh{#Tv_oIzl7Z1u_4%jW660MLCX0wf&v
z@TkrX8=09~ZKtjSpDnOnIN7pb56G`C=75|M>fTdXn)dl;@<}a^gbWrpKg@pk<agZM
zs$hM4^y6QUIXr;1GIFH$c25^xt}guQ0UW|lCDiPdWBg57H0d`mW}llN{^7n^I{gpy
z%(rd-?aGQ&qr3Pqy3o#WVhvv^=Xs=Z6&Yh6zEK?Sc*Q<7Sb;|-P$5t)CYb#6*w~4~
zp0;u2Csh4R8K2~sleL3)Gg7OHVuz<5<xF<qWf*|^tfAxk11tlqGR?xKRe9N1L!)+m
zxW(*~b$FMJ1cyKSrXf$5@etN7FAZ?J_)=V#9>^1uaKr?96}>cE14B6^In?6Gx2Xii
z4`bs9oJeJof|tfiF3}#)3O`TQrIL%pwM1V)AD{SvJmIl#`ka0`TPW9(1!uzPJ+u5n
z?Qu~!KwMiz{h~}d<pqCj=_C0fXkmi{K;L1#+>fCbeS?RZ|1GNLbx4UiuybZ@oZ(h6
z-555KKmNz6oem;I+GzcJ7wSK9@mqN5caxvz)FiYsbAPvUqohkq4&93B<YMUb-9Sp+
zSYEbS7m}qZW)x{*zTvAqCP11I8`ukVo$maz!c|<<s@_H&t^PJ^qmd6jhU!AUSAF7p
zX%z*cFOrUmLDDOzi;fs?y>LIqM{D@iQ1}g|R=441X{Q&z-a~v}aShsR+GA6opam|Y
zA-BhyZ_GGs$EtKTpPg)+Eq-hG^|os9Tcan2K+OY#G^`pWo@2L$?|J66WS(rVI}llT
zefjqOX01zi>DczAqg5Gnh53$THnf6A{LAU+OnBIij%5@rY;d_<?MBZqg~g@&tXB8h
zKa*YVST@U9To#J{LLnRZ%kJ05LEI^bN6*qj$l4pIyYR=c441c=#Lwf+ddRn4yef|#
zT4`EEmI48Va6GES5lNqGCh3l0N@3d4!u^6s&XtYUN4i3V{beE23JEf+PTA%;?A8B~
z#l`mGJy6Eu@uO()YOEVx_Skl}h=E{u5B>(M<III>%gLI8G$0I#hQ}FFql(m!HPN^a
zUr%`rCu=R9h?Bj8=<|?hxgHC#RS!b+*m<buf#gVOhjhdt8A|{UE}ea4BN0zT%`CDM
zmB7FmJBVOkF0lzL{s-tIM!wJFTU!RX=<kTC{%`|OXM8*Cd^;>V6U=-bDScz1z`^wK
zaQ;|k4*L`>5~BB}57GSuIFUjap8#++^P<`H_kD9qFyM3o<}m6zZVf1US8nJ9K3dv~
z7ZQ*LN@{@zFmh$~zKhmY$D@3tjh*!Vu^xT%U~T9|0>kgno!1~`PfvC@B#NO4q<k1d
zt=~@=nBKm9aBdy43y}}1zlb5DWtLSYatDOsili?E-1Il7FPK{Te2m!jxIfdZ@5H=X
z<U=^c&XgHDevTqn5&b$IP4RtpAmr(P{{}M29tAHLa-ybEM^2g&e>EFFZu!jF{aN-k
zMTpPMT3c%wPpj!atOSr`&hxIG4}<XzL2hs;yXX%2iAduqAyuP&wvhX;;?1H#9cK@O
z>yKo2x9?wH!;Q4!p0Fi>63sA0q;ob&0*gOz0-6Z?w-e1^+42kHt4B7=b1%G{sB_oq
zG+9RN4`Fazb{k&I4+>Typb@<P%3jU(_6#aQ){_^!w5szBw>!fq?hd}8I*w}QNZ`4n
zxi;Nz&)!a(kgH~ZlQLaU5Sq1VZHn|`dzoq#afB3}vtsj5=2cFmDK>)fKdBIqVt9{`
zf`!s9G0BP19}tBa)=yX?s8(W4VSZRt#F39!YvrP_$vJoVzJeA?E+*GL7pZPmsJ}=}
zD*eV;PaYMWSfX1RJf`7&$AQ*hhO9Aok{=x#-}-0*>g_`&Im-n2Ewh>s3_<S-k{d7p
zwlWEt!9b2>*2kSADq6TSkcfB`^jqsvQiua$o{4sO)lo9G<_;UAO8R@y4bwVwZU6O-
zSv#as5VUqu{uuwMTs)m`)UU5}gQVSu-{pg_cX9Q97>-SD;AK?{0gpsCtN3kFA%TEo
zpy0ye0*G0><vZCZz1}3{xOd=fY_UM<hKR`@omW_dM8FE80mUuXMpl4;$1})~&VM4X
z$1ndOTSnO1+ediWKmV7WzJkl`cq{}Upw$csP2?{Ok19PCad^v@D*W@;IevMw8GVJg
zUG68VDY+apQGW9B$2@~&(Jl^XQI{PMsug;ZJs^Rihg!dT$+j~gD2ulp=NK%+YD@2q
zSpPREI3*L1J^CzQ<x9qH^!tk6SjJG=QbaxKq5=@A-bw_(CW+~D2Y94nDAagyuvveG
zP!L^tA(;$2Rffi2o$qlwhJ@E~)hP)wg|XK(&ef_fVVh#CXPl@v-ayHU_`oFs-#P4i
zXsgW3r)!XK`<~YX5<{*U4uJ_&X;IlniixV+LeE6c6;0D<Gd*3f4F%{HAS4M?rQ#xg
zK0T+3%<)VS*DEpEy3QPJh6*khVT;w_ayej;nV+v1>(BgHdislB=nlAhVl;48oP_yz
z7<T@CZ?kYMwW!tbw$pFr9}sAY0P%~IF#+z|_|%bQ@sJ}Tf9t)~IjYa+(%Qf?P!$2P
z0#N34iC5aW=5w}V!`9zwZGQY6;115sI@oQtSKnK64`t{CAm{aIXe@HuPg>g6X|zsS
z2pIA`13}Veo2$JIGhKA^{iN4P+?i_YYoQLV;Nw@o^;0G9JI3R*om)P1^_Bk<k7-*$
z0UP~fB|1H>Twgv48s-$L7W<Ki{s>z_9Bf_!@-&>Rsz?<ASkc=n0Y)x9WZp4IrK$T_
zrdh3f^CCmmD~nufYl7&odT6r<w5d!M#VHyiICHfrqgE|LcwS%mth+L^g7R1FLFI0?
z8N*76ka(k9g>OV#5wN=dKDZ|3z@r2JEYsM|_e%f-AmZ6NB;ZV9NzrwXf!RUics0{}
zC`AraXy`!;EU9~UXh%iAzQB_N&H6mQm|BUbHFJl0EFhkQ&rzx0E*$|dtyBxg?dKb>
z=TlGH4Ya!O+9!4YN!wdGw`^3-I_UVNf#?fY+4pD>nMN=q!W?i*Pc-hoa3)(-uA>wl
zUu(b**DjaOA$(br)w4<#e!KOoLh{4<_S-6QV$(F7D2e8`<D;!}crH<D_NBGBa^uvj
zOwmNKk5)LDkl*hoA=}9x$kq(G)|C_2t~8o{_Dp=Kw6OE`rYX)SUi((;L6^SqTo?ju
zEG0%$Hn=^X?|5GY$5BATI4WsKUTa5JBOJ8(pa$!g=97LD0Cq?8=dkvtvm?p!cWgJj
z&`flVwRV7n;QUMjro<{q4i9oI82EiTN-Fr(X`u9fqH1;LMZ`qZFx8|sw8`X$TH=eP
z&#`91C~`_>UYELoX~mcXibZ_BkWr<OLWeZlp*m6`f5I4oxpZc{n%;fE-iwd{;YkpT
z@bdSTrNg&1hKFiR+gNfG{nwV2*o%(~C%^nJD$NH3GCsMsRkZlN%mFEyW>}QJpZd}u
zD+{tAxtwko$Nd)lq~cFzNNWYXjh1o%+|DB|Sle<?1@bIZNqMkMO=vd76HhV<MVPnX
z>2y#S3F;IpL81#8TkHt?fn$9t015t06e20pjVObF56yfvduy9@Z#*iz$?e2$t^_7*
zwy2pzq+j?BGcee1Q-S<;4vX1qJbKTR?r2eX;e8d-$P?d!rK13i%Hj-19`*JPrFgtV
zWs>@9gkjLtlB*i!X;9o#b2{%p`!mx2j;ZA~@`ka@MCKw<8tz5J(NyJ1p&vPO_a2gr
zbxUbsUVS(eIFZU(g448UT18p)X?VPof<C9k$8CYcvZP{lHTaoYnv$2F>$b6xiIJtX
zk>&baWF5E77eNGlc2`c_wcmonVHC)?m~CNIY^`KkavJ1O|BT4u10eBMZD!+vCWFFW
z3zDKK0rRUyYOd-{PYOZ3-9(C2Qp=@TTk|2Z_2%cYEn3gbAOe4m>d-uK7Q6-@T@*ng
zGhuxspi`>Nt7z@42J>o?NQ!xEmr^v5|EI9gY6M+EBq)LiFP?ZN@{tP}iRq}+gpH<Q
zi5kXDw29aXKs6^vw0Zq;@oad~(&h`TMm%jU`y^HFBdbYjqZRb;x)j9a_yle`3JA!z
zQ%;hD$4f!^ze*y|c!q3T#(9mebpl51-#R-Ilp>&|0f1^ESbK4GvP2a6s|>K)v6iaa
z{W*t<m*o1xvq2A2x$RcVo*2qM#bCKv<8z`J_eo{zI+?m?nuH+iGP)e@^F|;CK@!$*
z^npN5WX2))0SkdcQ-sZ9Fr@G5#G9=C)GCm$Re_kjW@S**d&tO~b18CJ&j%G<;)PC|
zpj;W3PrTAkQ_9!^dIY8(WUIgw7N5YgM;ip^_>~-{D+YOb=y%g~TGGXFG|cpZ#Po|{
zQN|r$F-C_<Q&gmKO2I7~u@6j1*^mW?-az?NKJ)HG;9ESgZ~Y62CF*n;XMDTZUegS3
za3yz>L6YejFH0+V-bvqZzh|rM8w-Ak(XcASnfeJs9HqCRUjccwM-a<w(N6gHqg7Yv
zW2llD#S9$nFl)y@q8&ZN-O-6Z8Er!{r{5Zbb~5ew;yjU(+5g9a!DGL1rAF@b(}9SZ
zhP9rKX{snvMLmLaoBZomaREV5<UO*>qN!RmmL2y+Adu0w2!!>Ko8!id_+U#167YYK
zg~1SI@|AMM&;QavVCKDLY&MhA#=e`|k-7&tq|*%3U;^@WBB^y;)&<a@0zoU~`o=7u
zTfJT1>@}hA(b1Vif%mKYSLO@#8WrqWr;MU<?A>C}TA}Vb83=`qR%lp0)ajj#md@bW
zH}u&;3ZE?T&?J!j0sywQ(4|{w6(Bc~09+F4N0XdjK$Hdquc@(Rr=(J4nLkcAc0QPo
zd)_k^>UuMSM@W)`aUcotT4?ix{rQ0$ij94#INU>otSbYSQ{_z=KItUI5$1<P*t_XL
zR)ut85(BBf8D05AksnXcl<G$}SWKAyGp$4rmikJgT&!Z^6bSPsop};;GU4-<Ps5#2
za;44`cQ%PwX$$8)n9X}-ocRTbFRP_m@2i_rv0Cf|s_J$F@0i%QCIW!`Mx(fA3KK7Q
zIJBn^v-*?NPP#+>`sY3)n$SzOOK`esWR0yxbwV!v-QV<g`RQzAs!MyEOF-PEhQ51g
za8PNR%w%T<I--B<&SK57AsW-RLdG};sEI}2vmNTe=MJQ;_c#K0eW)O7L{`MjY~R<{
z&GtBUj+xLzzc}%L;3xWnnpYhaVfA+EW2%4Pf`Ma=C{wVSo(ChBWdkZ1YMYqF;l>9Y
zeM1<oU@H*4U1vD`D5WQR2Ow`9aY$*<0268N7*ZRr906IyUz!vs!bhC#tMfKK%1?!l
z_R;Kigg8t`IGBiSqGHAY;Q-okK<NgQ^p-i7BqUJD?M*UINjK<Te)2l&kgfy}<~FhJ
z&C{R*-okH-=+7z6=kqx-ghM`MhLkN5N8r>SquBw;jdz%J_!f`C8xc26W$$Dcx9|Vi
zB;Cj!ZzzUY@#PD?uNZ@7IUmm~Sn2H~-ro2mecNJr@|dS$)DMw2@DA4p>C3j&PDzAN
zidh>hG~5c_*ya{-rtfGED+U)o6FCETHcBk5GkA4-HOg~8k37>OnI#~tIcO29AtkxZ
zxF}k|!50puT7!4z0veHK2Q=XZq=nle4ud|z`lu6T9?=-jlDHpa-F`UnN7NlengsW$
zcCJ*3o)eGk=w*GCT{A_i;P!2$lcS4R)^C!6CA>LWO1Xh@HQ6a=iv~->mJIr#yYRl0
z#J({&M*#VJ5obMS{I_lI-%Lz@o?RvYquFAxtb{B^DwuetTAxzwFMvb@+xpZ+-4aqo
zcSHj`Lp}<&X)iJqbjXW3Sli}W)Xp48LsUbp`)@;G>N8Q$W|B9*1s9g;oJ>xUASi>I
z=cm@@%Z@kKqpG7P+4Vi@+!9B~wAEs|MODl7s?}?%nryb?Zzw_m5kuCVpTl0?j97~f
z6e>1#GH!@A2&!y+qR|R-YeJ`BqQ?ZFK`IhcdrSA#=jDs}!Zqp4+b88ON=`B_0IHB|
zpG3M<Y#n$1>69X+oB%m`JS>Evr7d}f6VmJVm0aO#%T(%~k1z1!=L3HQXD+z-z%92s
z^&Sijye~{L1L)zy(NCM_>wlI*fH98b@sZ*ndC2;4<H(_MsOZ9EM16GdsvCU*=vHYU
zt7Vh6-KP32B6Pvc-cj+C{&YTBnutab>eGY26dM%c6v57A-9cm>2Y14ltr)Ge6&nCu
zj<&1xIq=^+Cyzok#f^B+$?N>k|HC<ohX{-e?*eib*d=VxdOk*pT-wCa7~Ck@ulT~_
z&gd2PXVN;##VA_B-na5$m1!L?HYNq!ogR%C@nvP~6sg6NyAu>a;n1<L3d_!{f|Z{q
zuaIL(Nw9aQcPWp7CDV>E-OgVtS{9>^GV_h=4*!#;&lNFG&8d1ufa<mGSLdmw;5GGJ
zVKdKGxt_fP+#|L<gO#tEMB`FLt7+DwM*2d3XaadeX>2$A4Cr%or8UNT3a5VkZnhl&
zP&bxc<*Mr#ONVGU#4~WXI7R%qP_n{H8TD+HEFpMw0xC^7RzkxzaIn|P2>&3jlZce!
zfhFAtP%ESvksH6~i(*REu&BOHyolCtVwB#VdsN;>?58f!m^n81W-P?q!ecBc`aod=
z5S^ogyooHb&ozW`<oMeRzO2h`X~C!M70F(t=8kHAf|=VPumHdNMO&r-YePvolVJqz
zt{o{dGv92jBoce1GE+c_v6ABEs9C(gvjFxcCOHq+{Wj%%rO>&(*9Y&yA1Y7{5qU0Z
zcfMIGjXz~^qA1R8t9Z)J6HsVvC)c?AJAXHmHQYHuPeCQBr&N*D!tz+ZOL^!hE}}n{
zf6<!V$d|XdH~d3Q|60Kgs!1sYH$4gZa!L%OogRfFyNnmuoWW=4KFOd|=fpYKQhek^
z=1j&IxXMXOq79>D7SoR=CvcsoEBs;LFeD($K}2q+V#xBh!fS^q@|iY$c9Ui)OOL(@
zVD*3D-nzEC#;N5M0ba^WT8|F?kgsPDL_cpMIx-^qBGm*pq~pKu8k6hnHX)U>xEM+Z
z63{bi!~1|aKQO$8{!bTPeGcr0CO=^2UNcQ~5?S#7JN#;e(cDMs?$RH)n6{M!^|s{W
z2gni#^?lFmlVNy5_}o4)AREh!lL-e`%zg!5Z%v%59I_~r^jsnC9cY}Vn7~3`d4O`@
z2>boDh`m#iU@AV2+-UX*rL^ty*#vARHR7xjktLg_!XMbG>BR$v=82xn`1=Zcx2mAz
z5tIE@LW>#t%GZo&`S8yq>!0z<6IMfdxR)mh1r4B3n%T(Wb&CX8O@)x%(^Gzkqj5!0
zvZ=e{H(}~2E(TI|fiu0>?3!tpW(PMzM*$>Y;OvW_xOrSZs}VKd)2pholVa7<79ngA
zdi)KuoGGre@g9WXK`6cv;buw%b(|4p1^*yF?I+<F;G_~PY%`9YiGv?)rO-M#kXytX
zMj?%@18uvD!d?!O(dd-M0XcxLr-_vQQCihW`a0|9KC1v<Z;wZJIhV`Dlm3}3-{eP7
zT&a;cQR4Hd#6^9e|NIE4gvJufT~K3G6uBZnJ2}$g7D}U<vK|2)W{58FVa!eE)vw~U
z&l;`FO{z=7NlC+;{dDPTacgXM-v=lA9V*nm{7RU4#iq#!p>65=b@v@`@bS7OSasl|
zVYBNedNqV)gU^JaAsaXWeI8&rUZ~pBz11U*0Kg9RrV`*82J=C;4r{FHDjZky7x39x
zAT80L&MiiWnykw(PKPP8Sc7sL0Aj^asiIUB8X#Bbm1$pS7;Tvp3)Ao6O!DUs=64bC
z(LYfBhSCE1V=O`ujueq)n@=eqYS5^M$X;(<?4H1ZrjSsWO)jeJKR)Gm#IMn`$j1fJ
z?deaOgI4U^kI=D57m|WMw)o|n)if3c8P=9LW_o$n8^8^E_A&c{Et6re(})CJ0zSZf
zGT1}XH?0>zj6SAhm-VwHjn#4EMzxLUxo*K@1+V+oM;fI_XfS1oRmh&d<&-1!OC}QY
zHU<UXP+enmv~B(5I(D(tt3N2FHZDJj)Czlz+z@L^XqRi1=_An*JA+r?*l#E!f-vr{
zrP2kC{Lwl3cI-#1`O-Dnu?_-X?NQGsnT^?AczJ2!hrd_w$ex9X*fw>RmwnnHr64bR
zmiwpe>Lr28N~(ZM+H_H;3pmzVmrl~&%2mX%KAFH#&b%LN8~GX`GjaVLpp!1YLGtl`
z<y}*9b0}@29k6sx?OL*nE-tI^tNjKx4p;36GI|`gRj~g0uD?PH3ZYg80mCtTU<L}*
zV;kfk0!H|At|+;x6u4xI08X#I8l&WI>mob7GNR?O{9F4~QD>%gEa=LD?h@zwi>)Aw
z;9sE?{ui0$RH+G|a^Xt3K63WYr3Avlpr{;O(Ww7EliI0A5#slH=eY*OWeaxoC?taC
zdwnQO0bdk~a1WwF*<|i6>M~>sOPpO}$P66%hifUbByRcP9!pwQCCZ#4*_+ScjEEIm
zu?>%gg6(A<a%hy9K4J5BnOm7LA=qTYWZ@Bjp_=(L@&%H`Z)g4&V2mKL`Q7TX`!mhO
z#P=E-djRDiK$^F#k_^yRnw$KX7c+#v8=czUx^|YoGtt>#C%D&3!78V0yk?UiQ@QOm
zTe8&m+>yN8EI@_i%f$1+9`c*XxGf4}Q@2Oam^#a7o@ZO_iIA0e5?gF@VP5<Hj~k8$
zGvf|g;Uk8|{~#w)T|q0qh-pS(K4=D#MCoMaaprP}WhM2qdfd41>V5$u*0fg&1ouQO
z^sdfewWpYM1-PE~+%j=_O!}0^$;1Lq;?qTuf+W5k^+SPs%sUp0wE_*KR3LXjJq^?X
z=M3o4kD|HA;aC2|nWT*u*{j$skeph)=95UioASa@Gx&@z<&D2q=-1MdVm30aH9<S-
z(DHOpg7}Y=x#!_;3r^o4QctBKLI1($T(q#+je+r(=&f=kg(gKEAPbTOwq1%#Ht3b8
zks>n+i)z)426l9%sX~C!*z(I(m^vzIU+47i;q!l=GM~c+*9q_|gi9d+CqOP{RS*|}
z7mv&Y-zjQKFBN6?<It}GSu2ieksNENxn3uHL3S$^J>{Yobza|R^EZ@=u$SpQHosG+
zg3Y~|RrZ>xK|<m#KvP0z>9UD0Xqy=r0G*@K{XUa9`OBZkV%X=)$f;|!MsjMhZ!Ft5
zh`yyQyPsSa0aRy~wrSf~Hu@F?_*^tY`3-+6{IaLw5t;Kgc>~ZSmnUcmmgF1`B~KWT
zG_u{sV6zfiVA`{8pMehi2)htVt@Zr^H7(jtmu$q}dq*~tT9iT_6N+@&WdF;)z=|B5
z!j?FudYfqn<?Hxg{;=+mafq)jB^U+IUMd7&Q(*I*{eVlQHzG=pevsX68CL=Z3Y&h<
zI|afKKfGe)IxOZ&V6fODm4Bk!r*)grL`<Ts;J1CI7l~WvwL@x2&q<5v15626tX*4C
z=BUy^j;#4T3X32*u4-8XIq4@Co2XcGGCg_LA{AjO$VvogG@1UTY9b34^qTGop}(+v
zP4GE4_uJnp!8$L_^2`=m9>0^m(>)fqlGsrU7|%Wr)WN_8&X7_Ry@(k&Aj`l-q=NT~
z>SEDe7^2^B^jlrOX13!hjvam2VAsi2&)^dvZ0<I7_n*7xN3DRfkDX=5E_KmY6FsbQ
zO5{q^RxVga*ap0g>6)P$e!On=xP5`i*|zjr0a#2ga&y;UHH4?-EBN}h6_g9MHJPs%
zD|nBw?Mn&jduX8@O`+Zj1gyf)(Mpxa&_YRGHEll?@jbiwa|3qsYSlS|g&%@f1LXMy
zRuk>BeuMn270<K+dZN^4gkZ6ZhHOB9CwzKSf%3q8)kP~))pj_W6No|2ZFt|CvL)b0
zXyW3W0xGd+urn7c$t!|H)y1+qyq~hf@zRtVB$o<zYmbEV3J7BXaW%#-H(#SO<lGcl
z@>jF}7Djl1GdP6s^kAH*H;KYwSmwSMxqGr>E(Nl41zTPt{TNOVUO<{F0lCSg!-z5%
zUqyZSZ06Ra>D7c77Ox`XngO!BF5<t!-dKK4BA87q3y>bJDGq$iZ{I$5{QPK9vVB!V
zaj>?O@zW!6m3U%<QZaJhQZZ8cXFMuoPndcbIOCFg%A{Cug~pFE!0&4jC)=4bG*jv<
z*pP2Dtg6tIU3&IOL4UQ&&m(Y&6oDN{nc46FvzvFrw{bX-wbz}jkQ=%>AY#s*P!Oih
z>tj;`<T<kUeU%7d%{`B&e^-tlU^*Mky$ek5U7(ch=%)qWf6vwb6Q3_~Qk_Im7bhEQ
zdyJ#$gDKl9mxZ`xh^P|CJ$n$5(KTY_E2<I{<q=}qL70xJ%HBo9OrDYlU_}vZ6X^vY
zh&(cjNcTd>M=Wgh9uhvP_iXktYYfz-r;Z}3Pn(U{N8xQUqR^UW8S7l@m~7YJ3!FLZ
zry~M2LxNu-4u*u3<_yvaq$?r(Q@&59d|iA`Kkpx%?VcqA?eI4N6AKqeIoPLa?7x}J
z5IT4ai8cq+^s(b4aG?d@A{$8EmN9@7dE^f#>vHTT59MfuH>dKsSg(gpVFnyuP;dS7
za*F$o$1h|<@7IQhn2xE$CVBBp8jFAsg_mBpSSPj0@>$&+S3aHfk;{w<ncCCHMG<>1
z4&!;fI~r2XMegKTPFjHfx4Z{T_e?Jkn6!CoHFTl2p&MsSk$fSnh^QYPL5C-xM&@e4
zR0j<H%g9BpdU0Oh(lBesi?Jwi4rvf~@cV|=F7nzD+T&j;2h#_t4arI)?U?_3eVHos
z7S!B7G5b!%M8aQ9bEeJ-<zGL0oN#aWVoK`^;a6AbgI^lxWO=^LNFaWSM7%uKoZ{0q
z)q>fGFCYf)c28<P^l8QqI47)Ql-ddo2x0BcPip>r9{<*EK!P9y=!o;|HKz)Vw7&>C
z_+Dg<&6_;)e8cT_@N2i7edgzqvD6#ab@UtN*Y3`3yWX0lhV&BeS&HM%h#;{P-;=bq
zbnHHLkVFCLxblI#v>>4dJwLqZLW+QFMk*D{dcL0kkV0gI=*Y$#rHm&xuP8tC#z{+#
zi}p7vna^fo(@*{Lo}*wJCQ8)u+rHrActA~3pNY|Mh*C<uJxN@gBxb|!t1A<$JOMDM
zVm*VFP|j{1@e-MzGxV{7Wb@8M7Djs$**QjI>e@c?az_&%L4*MkP0<WU!Yp%egwEiu
z1=Vt9;>>fYYGZ2a#@n^csnH11#2_u9h0&O`Iy+&fYvk`J62~@`$bwy;ab^<6_CW2P
ztTsK05Yc{*;~M*@*uTUz0;SR+3#z-(-FadqVhCB~I9B>(0&OFe0q!|0)@zd_=D%J$
z{E|3cfrze0WVdA8GAeKXnq4kh-v{C1GLL#YiKtUY3ks^d<>6&^CMz5~nt0!~x<N=A
zf%`n4=%k-$c_-K}fu4THm})0|pI*L2eV&P1GD{^-ZQxq_KQ_r$fzDF+(OaD-f2U5H
zZhnxjtyg!ejD?v2O;S|9Ib?c$?I#kEk(ds8^yNJM)erovxtD!}b5tz#OTx3%?20w&
zegenX0ew%<{^)FKV7l!pTsDaAEc2DG%DzdM(-*%)Ej&LA3c#yRs9a^;ge24cjVJX-
zCNncDM~O_WBI&nuLU)a((}Lo8JwLnq$fl<a;#09^%9Ig^rszdH7H~{BuKG<2^3(S2
zJLSKI5k+e?|L2{(jRoX{stSosJkB&@_=j2>H7)BZpJwX-2N-Rb02xdIgmT(&qs^Dw
z^^`VR4gqWw3N6f2{J~CIKwON`04=>NXTe~Qgu|2bQ61yC$?;yntDj8!?tnu$f+A#^
z7I%Hh%{uk=zKIXp>nO>D;_3Qj-6mBKJk|kv7MkL`L$v1eUfY0wvuJiKpovGBI3g|D
zxZGmapswe3D^wBBlPH=iy0)N<-5oios{4+`#aWSxP#}#Bk1(w${6hkHp-l{k>&4*x
zk7;HCJput98Qwv(uyXtycgUnM;J$whB_6_}qKq)5{t#|Yz?DKGVxzQ+vW~k}myDJS
z%s>&&c`K8=FaLNeqDyw=1m#0N2pkSe5NvT6SWa4glx-<pn|9jAPuQZWlA{5J02b-5
zjHLo!jlJ()+&c?*hVJF1W1Pdma=+~7I79Fz*JtLgYI#hbv}ncxFon<OdO%DMb^spG
z9>d<T4QGFzMKuDaKbvN1UsI?3;OL!AfYIpHT)o}JY@C^AG|1nc(2kxlEz%gR;HpR*
zswz<qahe3LX^i8lwaxC43quVo?Xev`Y=I#kq?+quR|*LpxxatEIF3^@6Gz3mXy&TQ
zuE)e9p+brAi>I3c>#@dB#EAeDdyg`IG;GybqVZS0UuPu5)z|f%@pjSm*~u-xgLeB0
z&QiLC0r^Dw|7S_fMFJ$2at}`uB)uJB0mJW}Y(QEI1oTM$%J*;|s4II8&BQMUNR03!
zyFQ99p$%6*o%tw?gXW|JkFimf4W3)8q5JxW*)g(GvVl>L=CGsimT#S&qheE0b4CBp
zsi5(YLwS*SMrD;En#tSxG$Q{KBax?d#1w9)tpVV;KP%!@Hl=nw#Z8rKv|!~T;!QQL
z(X1YhsBB#?M#zd*Qag_C4b6Odv7&+Uio&18tp*k`4T=bb2(>@caoysM(xLv>__VQt
zKI0UKH@=u~6>DiPFr{L(`@m8J-w`l=BCDY($KE!nF!u{cYCY$bhZ;j9Cj9&xF58SA
z%;<79{neKzeTF-ADxh;dv#r6OE{W!;pm(W6fbvxsDk}%5%a{#Um0#|{)IVTWqLQY8
z*S9lwulXI@glmovotzvuuzs@iN<W*+%Edpge<B(D=IY}sU}E`kf5x|E<`<j-?UcO(
z>;_4R1q7kY;)^@vG|Ya<%$D)#)cRmtubvgHXx?CAFX=sVD)ymd=MECJ8tf<yj~=&2
z1ac*GFG!!B9r5fas<q)SjPX)8`bO|VX=~znhKtPSl+JBZ^QL)18*oKQrr3Fu+g9FL
z<&8#z)7V^%wr%#BpMs$Rd-Y8cjiqAU)%@MlTB*Zl9l5L&qN;O9d<I}3q9w<fb&Vcf
z7;Rb@HTpzQn(SQSpj{&k5=}y>)94<9fqfby%I)&`?BFYG*~-;`*D!;exHr}lL>3|}
zW=ufn7ZG{bAIQ14ikdp5SlDrC&#ehdJW<Q;hu%viu4!Kf&$Qxwg9y}UtZK;Xm%gR7
zXWxw|KlA>VzL++?Qk!TE<fWEM+FQmvdl?%Jt}G(ti)7AZdYPgePAr2(s7*yoM54`G
zThvc0ZCs>PwA$M%^7z9q(h}@&ue(hspX>|M6Ibm^VOq(@+?61=dt5?J9EFu2j^(`W
zB#UoJZ2p;#Q+M>k%{u-`R>`f8q~x09ym}dq-WRM0YrizJ_LRF^wNhqx?!<^TZ~=Z!
zW8i4JSnPIwUE>06G96j+<^dvk6ySBh8~nc^rZ9Aki=-Jq3irJQO(guUgcp1h?n?<B
zNLku!d}I9cFGs-im_z_+xa{9%Moa`YyAMFs(qsKA6+lT38?5>rzGD&|xIQDb9KQMX
z@_|h({AzdWvLNXG?fcq0F%6qy+|sn|hy<RKDq!kEg~vfURfdHJ#xa#n2|SOq;6K(Q
zX`G>NRv{1vwV;tRW-n6DEekgTEG%4B;}~GElggS?Mq%z^-xDja%{B}s+P{5F&9k)1
zx5#`U45&#Q2P9f6`3XbXW&psC7}SEv(2!kx&sV%gF4X*0fcY!tmBKTp(f=aPoEj>$
zpZO&N*Y@QU-Mph-b3jv5Ge1#YcC7C>3tZJSy?-)sljJ~X<zTXPG~$gYdP@=inisF|
zdOuw7MD<|f+gl}25-O_Dv>ah|;wdQ~#<e0@kdKVwWcZ}UUwBl8L{oFE?{;Z>SPH)P
zLmn<m1(W?YOlCG<;*r6mN*cdo#<a5VF&1g~X{1wCWAiaC=Nue$z*gfvC9YL*;1$w=
zHii(2I!CFV`UHUc6L^k*`XQl~i2KkeEdYx|;Df0T(${;jY0Pf1Of~y=xPSiUzW$Gw
zMWj`xyJaWlJ3Q>*3v?``@b~j&x2_|IU{+Y`C0(j2b;X^PO_Er79L0M!k9y-t)C_!E
z8!XsH$=<TEHiu0EiAi-uCIL6J$E=X-bAU^K@#OV^*3ZSfkLQ~6Xx-u0ho3*5>(8Jm
zTpc~|A-k{Ls@hMyr)bkC><Oi92Qc_|KDM8dNSRa~HK{FWx^|zwm#^)(Ot>g&1^NH2
zsRJy)O#2b1Hm#tb13~pq!4`kU{}?Y{P9eh2{^hRs;zR*xZ7du9=x?ZcW$Ywc!b+;2
zRof^h+bTm%3MVq@d@!l$hx<AQb8flfdC76`0C^>aMF5o?pm9A{80C!OwaZm<dT)_8
zTBEbs*4QG^ZT>GI;~(rPzne*znWJ}E1KT{l+#V1!CI+pL5wDPeei=yYGqNMz(J#oE
zWn76iqcE|PQIsrifusO&$;Ebkixsn7cjg>*Oa;C*qLjPYCPpU*dGpZNzMtAF(Ren)
z(chwXQBhfS?a$eVLltxYx#>D{GL__X!tb@%wb;&7m(GvumgEo|nIY<8;+K!5I@+fR
z#$mxx`&m*o69b(3{X8w`7oi;Ok>S##ZO)}&<q0vGQp>p240En{V^(Rj?mz8pN;%|E
z+G_2-CWn`XA#d}<w71~T%>Tyu22*r;0<DPgvLD_C7Epr56Uh<!sLRXYx0%uTPD@u4
zVeeo3*)pQA{1dVU#TzuEX!&@vKTFc(x)Rti7XJ|6Cw~diq$oI#FF0>-ff^OFK?=%j
zzy7D~Dr5{SA}ePB&$oN$?CLsmtLf8_m@>jS>?Ga4?0F5BdI4ymI=k5m5eOds6s-^}
zGPZPZ4OOasjr;?=;^&P6VPx4NR*MT^*ftZ-&WxMdRDw6!Tl1f9ed)fv+mn6L35Ldy
zZYtt<Rho~gJ|*V_N)O2{xvx=y5F$rkRftCvEJN85!R4j{ue6?w-V^2ldZ##y>Lk}z
z>7a}qA!pW05slQzjx4qjIYW5Q{oV0DwVzjUr3h}F9MSVhTnv#W1sf3_Abp!AoaE|3
zyl2DAitR*>Z9f>p7sJL{58E#PWPdE+hJG}N2-@j=q<h0&M%cRH<K=V{!pIc%h`#Hy
zDiu(+`OvzL8d#>8_p2A`aC~zcSUMqUXATYwQ%n)DpUz^#3rP${O_IXfp3+Hr_kvZ?
zdV4S9W~~z_Fhnv+k4O%Q=>L<(>rzG)(OCJilpguu+G*#TCMGsN_sG`HdNA2ZcWQr(
z?L`U%O|OA|R)ke;RujVWFZD>2GPJsvFB91>*pJ_rd<{=T$A=yS2}4QQg%PgMKJpnr
z-_<qCWn6h)S6Wri1#ezO&8;4J^Fm$#eAhI#dcK?9l)k3WA322Y#4orVa}To5z57S^
zGsIgXLH<+ARR#Bs=X9x02x;hX2(`OJsJfaqc!PWXXRN-QXZRa(-ToUU9}ciL!qtNp
zSn~r%l~b)%^-dd?y8@<zLeA_bU*_^_eIw?rSE-8S$A;X0bKd*)D)_(d)vzCL8Am2f
zKpW!p_fx|tM!=9DtCsww#qzai$wAs#8fkrL)ed=nr3bQ)x-9UE*<QFC<*HoP;|<M#
zSFDGb*wVA54PX9w-0CJzgag*f)6ORk2AQwSbFArCqM4?K(IJaCa-Y!&?<MEw(*RmO
zgR8j6!Eo)Ej_c5ltSG?panYVyFNC-uMojB)%kddP&`0`P|MGTZB2WeqAH_c^VMEU7
zbml37kIQsK!s@?F(kk_Y?i)tT_01Z+eu1-}*lZno-YlqH!pvM<&?V$9QV>>%BW}6C
zwX~QwM4N}VBGQPCTcdr?sJ(W93y!D2MX2(MWahMbi>j``UbW-%Vbqzxk86ouj6{fW
zEIbK*<;!yaLr9}u(nMIsOVe~{<*7zwm);r;`Te^S(bMDB{tfk~85~8Cnb4x3uS^G_
z3FJ+1!h4Egy(iZu&LR)X&tFSaGga5q&&HVGyN{7x>V9D-7c#tyn_=tx_AjBe<>N(c
zrg--({BL)&6~<|gdwEalRvlOE)@1Npek?hZ937Y+!0fMno6OJ;gv9{jf(AQYt^SZn
z2^S{AZSrgfZIZp_;p`~Ts*Gp@>ZsSx*{PSC$O3p^(Eo4QKi1qC1xkGs2-1_X%XBz1
z8d#Bu4iu2{@~(E(w;iX>PP3_hltDyGXv?G(PbAcl*NM5Xz73mVvg;CCxwViHY9mW0
zsa}uzGw~wyBm6E)xBXr#C+QIFJF7#dUOO=>tx2&Sdr~fUhmG)22EsquZK#OXX|?U@
z0F$(%!YWnFB-mEHA!!#l0{~^4OsQfr*t~gjo$s}0NECL`{#0uTpl<_1e7^j1!*C3I
z*fM+a4DjN*-NF7{h7*SfU_<zQdj^$Mgf?@o=yrl$wg+X3s&0to@ue=h<!{@N2=ySI
zif=kARMX%}5B$8EykSRU$pH=QD%Tt{BDG`{HH}EgtV2Gzxt@`jvQ-hbLxduHi(T+P
zuxw-t`5z~-aZ|ikkmeK*>0hYrxL%M~z)R=UCfgyY6%%3WvOz|oVo1q4(#E$3<A3Pm
zb}L7aI!MtLr7>SasY<2W6`5=?BnB*CE{%yN(y?>J)CwvjGYAb*z+hSu6U)GiD0>z`
z`uzUg>7qu_4`HjG@n|np63%EiMh<J@@gQSook>8lRq<~nxD(^3eq1kk(F*8DN$&6G
z`a79k<mFz27_{rYFF05C=Ea!!L$kwntGUqqe}_-m_I!V?-+5ws(_F2#86T9E=Y>^m
zE9CyoQ$g<VzlZ{k5Ep1vT|baRgK67-OAYzW1?NN2*P&K%zoBMbKONLn13;b5d&(Ve
zM#!4sWfUl3=llDqH|ZepfXp#WrR@L$rhb0b>RRqz^=(aGUzvbRNgSJVBApp&6d$R~
zY;U$z{0ID0;cWyD;}86Wz~7Uf*Nuh0-KnRsEkDd_aczZv@f+euYQ~l{{lXTZoMA_5
zs_^zn_&NVk{RN3GHccEwaAtEoZgGj8=ddN;aXNElL&{17#S^ICXGU8lle={0A!&S1
zN#DD0WTY9bZ;4nrz-lr5&JUCd%VD3Vg^>G}olc)W#(QOiH0<s8lAlP5fUL<Qz0}*q
z-O<r&*<=0aZ0<o+pNqJ?dMMn-&cnwpV6xc%A?1zZELR%aPo|7ua3IstQz?Q1*bS2P
z(fWUaQsE*t(u2t$4?!AC&nVhX*XJNMkfR6D^20_>+(#5w<*{;REjFZuh|m@f3;RP%
zI){2(n2E^&+j_)zp(>lCT7kqj|ISRG85QFW!O|wT{@bGx%U<b`@2#}i{h^PdmQifa
za!+e*48l-Ic`LeTcw_KsJz;>k!iCYrIRd|l;68#gUdN~W8B`c17{Fvqmir_3=<m2@
zBT;OrNPp3rac(P;*+2yhy=U2f=i8tBtJn@<rmuci=U0Sxoug}8$U_Uq`j-zN=m{>h
z+wDr0um!pMoD`<+pE{w=E7LXh>S&{Kt%TGm>q2}p3OnE&t*hkLDPf=njv3fs5e7E-
zp_vUO?}y=?27HVY`s~pl8-P7akB-+}<_aivM4zB5bGv35aqHs!g_N|kNzHMXIOE&u
z`kicdQB;rL{P-jvJX^0UQ6Fm|G*6y)1x98z4u<ZJidsY5r?Xge&4dFq{35_aR((K<
z2qO-?3#HxQx_oHR5<>xwT#C%4kRj6-(M`u?3>Ut@B@oRF7h2qEZAtz300QLH`&Hg6
z`0O7ZzQ}hxN}w9430*U(?d_vty1p`I2_u~lb-hak9*Daq;mwbP)&IR8>v*w~ZXx~}
z*DezX=(f+K_;f2bU*Ft7Lm6~jG1h^TvLbYZ{rdiTP;D#-t5@rvnd_IyMi*aSwXv&f
zz{IZ%PtG}QmRi2X;_|+Ve)6DKkRL;zb$yue`>)4vGK<e_6ob`5vQ~1?ZVp4<nX{vx
z&d%|XT{q^&)ze1CMo1?&lp*fbGaqgsM~%sFmHo|D6X0HH6$w7+$=Ggxh-B}2=vDUu
z3#G`1zQY^ZFl%+cA`D-pki%?4QttsBC^$vl9eJ4lZ|dS`S^n<=adjaL)p%;bt)SnF
zy@-*nn>oY7@VZxt>nXwAZ$%AQ)wttSi{mn1U5#6M)N@FN{5L&9=0sLgO2lf5(2u6d
zF^_pNKr;MRMC`GY0$Cyn$tH|PLW6ja$Rgk+g?TU1K~%(qjP;jyotK}&NQHZBd6SUj
zDhGioF+(XHW%_kbo@wRUUv(ar!i>X1c<zv5Dy5-Rpnh#**Yv;Jn;WYW*s{&?f&2*}
zuG&L!=puUqfSmKZ_%hFQ$Oc`1uYulpod9$u6H^HkFDU-3Qfp8k0BQur3*8o&G)JW(
zbf{V@0_20oQwYwQZ}?=NjoZ3&0{)iVxq2XhGOw%A?K+^o#AU%^#&Eg%+gg2JApqW{
z1St@J%tFA$j29R>%Sc@Ji#13-{9>l1sI_t!w^+HJ6x^_uU$A)m*7`ywbR9rJR8$lM
zyHCGEynN+C5n|JYLT0|C2HPT@o^4wuBwS;3t#MTDF(-d?Z+Bm=;{!Z)Y_IB@wW;jg
z#%H&b%y{wGDut3^cL*u=;1h?4lKqZgELwl$%Gh7bdIU3zcAndcMa=`1Qid7uC_Y3E
zK9GiQEUK@he!Tf)6jn0@YM-fE9DdGnk1Owi`WK%2LYP1$A|Yt6yP|Yw`B^8#^R8s(
z3ZKZO3)3^^+Ax}ZzjgIH>|%7}{K`x|@I+VY?+yETyR+R^2;Jc`$6r}{Q#1@U6$c7O
zI6D*BOsznmefZ6dN!-WhhwogaY!|{eBMXjBU1$oqeV4eoe#5+62@JOvD#EWS1U=pF
zcBR7N&EEX!q<FY%4p)HR{-YU-0%aFxS2A8Lo`yqrs+|WvJ$vMPzp5S{w*z(CI7xjI
zdh%&7KPvnxzAXD8*{quAoZYkYa`Dibz!t16f`t-UxevdiAf_RZW2~bK=pUkEd^okf
zKUUYhrT3(cP#%gH_F8db>Om7ke;^MQim53*`)P&Bp#5?#R-|H|?N>ak@YG9$mt<CN
zoS2>(1Vd0W{T(8|x#{^pnemAAt^04J0-(sBu5%U+k-l2t3D4c!a1upy9*p;8uD|{c
z?<o21B8er8*m=kGGuL}$L2YG#)l|zPxtpZS?9FJyU*+zwzA}mn_WOP8-*@VN+A97$
zxf6wMo{yf@>`z^`3N9`M|6oa<<Lgc+K-Q^Z^k$XOdNt~L#rKJ|=U5O@_R(x&_Eq!L
z?F@DRhDe^lW{cSEi%(7Xt^-FW=q`QAzSgu|c=BVXAmaZxI?J%Ax-JaULo;*^4BaUx
z-8giMbayw3#Ly|-Al(AeCBneaAsu4SARz*R4*i|?`@?Up>zp%t?X}i(-;k=s&RnhA
zX4|8W*#;X;1+6`{G`3XuZ=sH5Rk3`O;+t$Bz0|zRQgnbiZJPt!o^j?AkA~559bSHZ
z*cS}zIxIT>S9pq2U#z3oOl>wK>}x)Yo=;q3cFjBIf*z$jvPc22oB$ieo(13~LkmRX
zA_@DQif>;kJ{LaI_q*Z#&H$mzH?Us}3jeeF!4gwS`{M(>$HDiwTzYXhVbc&>;~Iq^
zv#u|_qgM#VhgQ3YZe)zyzlmHxUR`)P7yciwV(X9GVi|A{d?*S3#Mf5K($y{P)@z5f
zTkeT@d_egDxDySJ6#749P=W5P;@)o!l4jm@GYC}toyze5_F)9o?=NZZ=JN7|JU{0O
ztqoD-<UgEEYzzQ_;XBpyH#!7~s~7@Z8~;>4Om{%1kg4}~Up5{o|NJ_1dbm8Z(@BEJ
z1z(s<1rv^aWeggn_?3mJi<Z0c*9IQRZXj_Gfi@0mv0IonLnlDPkR?<gx``;<(JqYt
zC$W`0@zU}m#wMD1sRLj(m=i3=xx_ZrtLPw-6HxW=KXZNoSHjcV6H_JvT#s}Qc+4PF
zx6zve6(R##F!i)83ZZOT5p$~>kEe@FA|^QR&f{@KWnmRrei4q>Mc9@P23JB9?fA&>
zn309@oB1rFwL~Om^79rn!P4CJj8s3+wfx^dRPKceT>pD`DZ3DOud_aOU+%H+=hvd;
z@4OCvnKxdK*SBttzf-lPHrKY=fF^sw6O&_7sTw#SgL7|rIv(7|9rAx}F<={3AZTS2
zwS(QwefI%G9;r%edXgS-c4JwMqbb1ZF2K%Eb%R>BY{s0(Co%ptn+HWvYecFBK^-Fm
zzuPST?EctyvGyYA6g9s%>v2=OCzWBHNSU{;ppb0BH)A8}BV`U%a(@zbpq^x6sqb)u
zxpBL*-_-@6EJ`v+<nA^ah#n<2``&Dps<cOLVx#^e6)?9CR*68?1woOBvGFhT;kGBJ
z39DzHn5I1A9akcuXH1WWR^$@EK0{QY+n+4P98n9sVzY<)k_T*?Bz9S<TqmmkAUoM#
zt`9cOu#;y?KK&iN4ZECl`)yR^Wa#9WlK<ywL-vub7F~W5keri<?bq;Z3@+zPM~@so
z5{04Ul)085cNAnyd1N~G7qiV8O(t*6#)^b7y_Oe*F&OmDY<qW1-lvwH{&XnZgOjvW
z=oEm3KW)0o=lH$bW0Ic$u7FXjq|8VmZUXD=&$o;?BHnl_XfnB0Z47cPUhA%E2wZXq
zm`>eQNLqnr;pw+H&QI%2uC($!%=R>5A=R<vm^cYGN!&(yo*MJ=0DDb`XpCSBnL!7Q
zc?LzEspG3U;DVxK@Q94bEw?EZz&_)7MWgIv-Oh>}_}&j@a+XPqq|DzQUHs&*Sur&c
zaTB?(?NP#7HI0WsS0p&!&J1r+8y#99hqZNHjAC!TrvLeSS=>X7uHgFZbX|`Lw#|9J
z9>ZVrV7b8R)B7vs$zj>J3j5J?@Y;`%+^g=ilQUo^wLF)A>9<BO*D>j*>NHVGS$wrc
zypp`jHAu;YTF9h8Gpn%2%fqEq1B0$??R)r1-i6WL?z5>l85ZwSF?~3-HyUy7ZQ3P3
z%YtTnj6PAd^8cuqhsHEDm1_Crv8eEC?2q8d04vG88^HkcSGS}G-}D_17mPWdyH-(U
znb6K)a%}@345(yA)XKwKKNP!}rHv`Y$*a2ontUaAJOn7=p5^fFsW$@UM|j9JB>G9B
z(Mss~!DR5a+ZiV!hHtjK-tiFNfW>_mZ;l|~BAzPrgg<^Nc@SIfQ2><cLLm+6j=ArZ
z@88JX6I8-X0@YMJ)l6c0?S9;hwQpY3<URtv*`u8#5^0OVLW9hAF|Qwfr`|ix-^3la
zE@}ly8<xE5dlhw<GCdsJy0fwI2-x;?c~**O7uO<4sN_8U;_cUjFBH8Ytq-|vDN*uo
z_czCU?0hp2mG5q~&MGZ+_C2KwTcN!cT^J+KIwJ}q_~2lW_8b!SIPkE!thK}n$MuJm
zh!Q9vvckT+hm*xqT$YC3<c1Hw=a}if8g8q$rLn|D$LN_CM8;{L(>B>--VC+lV3NlZ
zD6@OKyiz-!L(9oAd&6(4i#gDIL8rcfph-2>HmoC3;o3KrWSygP6i_7<!~j-W=O6+?
zc&ticen5+-=x=AN3Rlo(4$pZ!nu0>3LmdGIn<oC%)VxLh??E?-HS37SAV$Dr)Q895
zdY_l$=fx;=bAUPe(B!f3-ea-zZ%I$v#)%GH^+^NGqs^4qt(ic$$ihL0-5B?PFhD|K
zWa?L!3GQT<{d{kB**A~`nJ+6ur2ND#BuQt??cV{keCQ$F4KU}yJ)ywiG3vGSJm5}m
zx8Agr^=>qUWQud(V9iIuj>>=`i)J#T9$S`8X_)xEOjSw$&rYBK<9{RkrA!mn=jL*_
zxu<b@H~-<`ELLXzX8G}E=Dl~=-8ApwYWS?-sBe|T9bKd8I1xD%K7KUtN&9;`on{~!
z5$i!XtVh#s?CAF4ZNdWSA4Y9r^YGDHuZG9%S#*lCZJ_dsN85cFzUE$N{&bt2CUEyl
zkV!j+cejk-*$6R~;D4`~F6K#dUQBOAyIaMYUV)XtN{2wU*^3_?qk-LgQKw)jHW^Es
z>5Es`Zkh)hsOu6m2B3FkkclnsSQ7sI`>Qx%zsD+Oxnm6yS?ut^Uaw`54TV5LX*WHk
zK-<t@>9zAH&SED2(Yx4``L1vOP$R6*yl2?mn1$uei+HTTEV)xn7GE<MuS;~KK_Sxj
z(<Rq)aN;rIThC|T2a7O*a(nWs>`;{^T@_53OegRVc(wHaHsmb)-<?&eT&T$1Z|NI~
zut}d9t)WJ4ztgpg)PHbJ6cjrzG93)nr=9kchqXVUpX|c{JC0kw8p<GIlp@qeRgp6l
zV`*^Of=cD}fBL_2A!<{Mw%uPSnX`gp6ZWT(Qqf_=)iT>#b09@qqF`IP{&2dt4d{MB
zV)9fR7@9KuBdP)QpxmPa2Pn&KJoQDuq1Ux`DouN+VBZ@=_eQ5qNL}dBN6cz3uXnv|
zuG4=n&c6mHKfqj8V^#kxswbu<D(i4amDfnq^EdCz3bAY1IrUS>_<Mz+Xa(ZUw+C&;
z6U~9WC<35GZS&?2EX>dr74Q3Is_AE~lB-NP`M+U~UvK^5rcQ^mbPy@KyT9rtzD`!V
z^OxLdUsv+)<@&reIsxLjFPSnJcgHvP<nhRvqH>nswcn(3S{mQRZ~|L8UwpQH!6GXT
zHg1wOyn3A{2ZsIwZManQhx~~CP$IQ;?3B{8(K$g1d^GYz1`O_H;?p)ONZXv;FLq+p
zLZw)KXu=x4o4re=S82?f7{PP4_M&4^BS3j&HP;3-GTef`F<FHb7O)t%zIA+AxMP>Y
zgoF{iRVrQcq)rY$nHb>sL+{wgDV5P9me7#NSXX4$5PF9<%s0jJXKGR;sZxrkmEiqF
zQoS!9<?RQjhe_YmJ9E|4@bHtaM5F&M0dqhOlR(DT!0OB8Q^}IxeL>CF(+>+J9`CRp
zKLNGXj#GFsN%&;)X+GoI)OU@z=8q@8A8{<#KA)#&IzACKYyEp1Y%5<Xg&Ii-E6Ki_
zC!f`~T4QOl3PBe`;1ay(=D=`;GH#J{2INn)d4iO=bR=W#?q<WUVHz>|vDWbRSVJ7b
z?Z}%*7vkqY{CAw_ITt+U5?eH8Pk~#QqD<9la{;NiIVXZ&%N%H2v|Y>Gh+b3Y!S;&T
zb#5?vn6JZuf?Y5f5>uCwbLNmXlugn3oT!5ahpM#WQ+)l5A2B=La$<2A@{#mtp5J_%
zs``^-KNu=7zFGysdf>cxw8NzmBAR<|DiHRwHsJ$A;#WsCtyh-zn~(M<DWk`MSF*p(
zPaT~8BzS+nr3m;97|{?Z7_!7BANVDB5pfy?H>M<~Gje<`_=j6-Krd{ZnCZXplO4?2
zsnHG=BC<5bIWZwMoU$<SI|1Ub1ktdyASjcyw+uz7rv{G42T913XRq(TzTN)J6nwb&
zS7`k5=Hn{k>x-BjSO}x<PD6`T4B6qEm6?s3EhZnl+rh=~w|}5llxkFPu9-n9o1|;)
zAR1*=FpB4imNzE>9+?sfaaT+H-0_PsxTpDVmN{<c*F@@d4v^>?dooEDlAR)stk%0!
z_k>Szl+XDWGa-G(^;OHX>uJhVquSmo8&uL)TE)U7HSx|@mBiFh@Ab-Zf<myN<G~C2
zeM6@Mqc1-~YExamZs`~9`EectjPn&oj%T~oOAZ_>Rb#6)oJ(zUQ7?|P{(@tx3EwY~
z_Q0WUQQc3>$3PZ3_lO|D{s{iE@jnl+%g>6_e~vBYBc@%O+9@Vc*wtF6{cPXhkyE_(
z(~XYZjl|j-UxnHOS0N(NgZv)ddy~e$8uR9L^`lzw-i{F`(Fqagj}to+#c<ZIrfnkx
zNqXkL#hU3;33QaL4Kw79qY3tj*$owbLt}M!7>2Pc<1As(3?_K=L1hVPU9Yipv>dhG
z*hQ$8F_K_k(L2YJz11T)&Zg&eRaM_4+H!t)!-6vFzv@d%)y@mD4i&t%{4h~i&(Tjl
zuoYGCzU$w>D~-O#cGYs`3?c8!pBjO~+IQ@0dcGH4BgDutCTZDnCopjT;tOetI~#0>
zYl(8)0~A$baqo`Nfi-g>K_CjU9E`@Kw{7>VYHav>i6iVwW!Dr(B&30tC~b>jUtBX(
zywS$RkQ~zFONgqKvFTXO{;@85xdKc<>wx0>kLNYIu88lT5~kq5?d80cM9|QE$;XE&
zSn(UP$?|MxMnS_h3`s;ho`a0LovbG|3BWXjE5B8yep4>Np?h^^>K0m;7sHl9R}VHT
zT<SS;?A9c*UqKq;{X0zJ#<l7GoWUvEVEfLYnj69Xv6@1VP3jdNcnuwpBwCsL=qVTN
zYT)~5co3X*XrB75y!Ep0=neyTCyEJ0Yb2l5@W{0B$W(AhwF!(N(~f-?-4-&Lf&EK_
zvE$?~esgaZEb$ZP)cq6j#-3(f2$Oi`7y>k4=<x*`C*<c>dMv$}JOX?^T9-kLq_Joc
z5>h=@_hN4A=(rfd`#6b)lh!eA;SQTEJX1z-O$CK8;rlPKB~8OM806GI7b*hCAd*Q5
z7;Yt)LR!#~0~890jWuc1BG!r#3ClrLKjp_B)HCQM71oUri<M%_SMm(#Lw*VzmI!~1
z+%Ou3t>;gypl6bb``l0~6c{4P7xGeuNWM(M`B>oI()TiFDZuOL+gI=Zc84cbrkom?
ze{Y2Ou^HjJ&Z(!cNvUh!yf6+P)(JS#?E&P7LG3V<ISIg4$gH-8O*l*gRE72}?O>sE
z(q`7c?_<CqE{*Xcw@e;tjk2VVSNOVOx6)%mjj5XB6K`Oa>9lPnS2L?Om*_5yNFEoF
zNVU6zBHr%vne+EGAHwf?sJrg&-~O|@yOm0nzTUnjAMl*VM^osDSOGxtXtZ^MZkY25
zjm+~ARE|q&+kiOuPTs$nU8Lx;bP|43N+TSIKua=C2_AM`&i)P8OUC-T>+J#-wl@xy
zOuYuezPl^zQ2ho&K3cx+tUYcS^)`E$i=%KQ%q3XC!PCbftfiIlh5Lb#e9-Rx3!gZG
zXFY~hHOuzZN}-~=PD=;XFM>3ccQJtaZON$}8FS)XdP=jJW%HxG40zW64n-q8S{XJ*
zB`IbTtAoENeHDIE__YZ`xgo`D<B`zDeTqQ|IPy<uv17?DSP<wg+v&_%KbuSmg+e2=
zFTFvD=R?0522+KqltOJ3k$+E2$d>+;(*hZdPDN1#^=6M5McCPy01m4@6T0BiwtfWO
zT10q&vrKkboEqM~6gq(ub2j>MHY5p;&j4+0E=-1y0*pK4eAZ|eZNc~yPNfK+{!t|J
zW8R{J4ox(k^hnM<+0t0#@(tzcL(5j5Rlu>B2-(|!B%^@iA2pS=FL^TFUjDRNvXj?K
z4Qyo%TX<3o#O?nYwki<-T$POKN#F~&3|5X?&uE0iPG^Bm7J{T@p)wdD?!2@L0CC6s
z_K+-~l~s7_32^^DZ){EQsuozJ<8Q}F5})I-PNz8^m5y)0Y<&L=($2Rs@%;u}3JCWm
zY@Q3WG&xi$88MqiB+xMvH~}MZ5HW;fKRLCBLpB*oXx~o0QLmjqxCo^wRlK^Y#LQbb
z%*JIKr5om>>TK3dHbv^!Si-rEZNMf>vrSq77%a!zUzQX2)>^7X2kQIW0%-AokhJs|
z>xgmrXNW-3<P!oOn$GFCOZi>>>_UP=y>~62uCo~1>K6@O*Mg8#jxtARDGfk6bJsnp
zXbZ_gy<Nd6dn_SkMpz=zL;%$l+>A<9u)iDn?bl^GUsm<jO{m2qI1?)We72K!hEu9i
z8BTVIc$vg_HUg6bj%OcE=j&MO%mvz5LjTrQ0*@rfdxgmMoteh5G@F6SmZ*Ir%j|XQ
zB46iM7*^x(Ib0A&X)F~C4L1{qnCY$!E7z6O1SLVjP&>kI>VuUIWw`U$+SGsNY;)&U
znEKJ1&(7ji!n03vrZs|_^6GHxVuIePk3*o-&Rz3zw&cS4Crq`+rVzEO#LL>BmLZ0f
zW{;}>Qp&eK8~f-)Q~=_~gc6ir4F6CZuioRgKMAuvra)}O?1R`L>3ZSsFU*I74P)$H
zZiDO$Jz3@s+0_C-wq%P0*igR3I*CtxWRpDKS*uLl$?W9h2%`bCfBMVW`X+E{g|wk5
zGzMk7F|1ys&>%V9r&BboWaw}lGv+(qxoVsbwlCI7DTOB9BG)3uRc=ixWjE!M0V=c!
ziPSnP7$UitRgO%v>6=5IM`_m)?%=*PMT*;&M|Fvd4+s>D@Ovy<f$RaZUycJs=6KIA
zD3UtKd?hQWk^k5{dz?>cS0Cpvz2;`KAZe>YI%#u+PwIoT4E+&u2RSL@C?CA!P_t?;
zpH{bS#T&8|n7ot0Zwdo@W)ehFhs6ssp?Zd4L{?LIVR?=ekUW=loLDukKx<h$k&h<)
zk<OhO$!qPLxY1<iif~kW)JpyMH4iK42JO<%%so5ZXu`WvdD~=n7kYHp+J>a04+>SW
zR-)&`h<Vq;Ss@Wz0{r*KX8D!=I-Gz{JZZG^*cyjG7tP%JMiK6v*E|+=Ocpi2t-s{#
z3NpYYoesQ{abP48u_(_b`4bgD%UHJp-xl&QuH!Nd*N|7>O{q0Vu_UWw$V)WLQ8s05
zxlvWq=o<H7PyejiE}P-be>9KoO_6QS+CpB81Ee<NOD^7QVFH|ttSj#~yPv~i*pJqC
zeHp7@myt6WjD%(aujvC{?b>!Q0t2nMuZ7|9mnb&kLtvMJj9gAtJA_m0oT-ZZX%a+e
zPaKQ*Z0MNSpXyElj<M?Ymg3^w_Ss1@QWmO-mYYq?@@^^%*o}nBTh|S4V&}S#5W|t%
z)J;9LKSXn!#98eDIHM>LhL3_VD%2;$)f_?U8!;OxQed1YDh7swVX9!6d8$MtF}|<V
z9+$kP|Js9TE9OxY{jPk@bbVF~f1)|KbIv!}yi}Iwj|OR9mIHVI4$&+yIyiXg^cK?d
z1p)I2GYSne(!v=e7#t+>?Qs!<ki%1BzuBt@<lI{Spg_&_M9Z}8T=I|o=3OC8?)*ig
z2`=bcZTW<V+dmTfYaJB&%dg%ngDf-u8kbZ#;`ti2?NWutRYi8{3d1B3LQ##Vu@C`}
zSEJvbDDpNkYogd{V@%mpGT%}1jFho)wbA4m?jsP`b$Hf_i$Bl?!%)@{@ld($<C_2t
z85|0FDlj_V+{R*Id}-Kq?~*mqS(i8MUnIp@qo!;g3sXuQu7E=?-zh2o+odb6*i+}E
z;o!j3oLmYbuA`^o8SdPt>Dc0l74Pg}m(f<yZHz6M;heyF60oa9-P5<bW`jE0V{9RK
zO2CwJ^-2RUiDLvRf4D1!%G~A4m)OE4qTkIYNZFBhjc|s50V!36q6PQ*LPc&A1rF&V
zT@I*4JLfH}82-5KDN>Q9d{~i^3W(dH!P?2A&K0o~rfA#z2Yt$siNk%fYsw62L@N`A
zZfF!!vCbYbha`<{s(>|XB~>FyYqxt5PDoy@P$|Nvs@IBH2^M@B38{;CMyFM)(7lAg
zIWXwew483M)&~sHTz)jJ<~Zi&?pw#Hk{AaZWL!*3s|bj_!?ko=-90dJbY$_3xU8M|
z4E$2N0qab)GnzP3M^MQHa(chatY<No&XeU1XG0(np|yR^JS*qqrVr!_LW|;*`O4nR
znu2Cn*<dt5K3AyJTrj9ng#k>w8w2UuL7-bL;hthJl_qo}Gau~#?#HO^E;d@DXQO)y
z-P1yq9Q6`-#5|ox2F71Sbhf;Oy;3lz5sXI@6rL{o3CF{qfuLcTNx2nwNsFHd)Rhh9
z9hH4a$=4(>YCU_24b970p=rM{c&~z6!6>i%PH4kLMpRE;Jgxgome3zf96XOoKe`l5
zP`-I?`-zpEX#P};U4>r-s@fjzllssyE)TD$WwSCDnezuquK!{_#5Qr2K#ZVgWS#3o
zy0v0>h^j=Cf1XjotbxDhr12*u0#NYqZoIX)vP>}Zz7~4wYu3EE{iOP1e5%jK@|~a&
zj*~>4wR{?qkdVB*W-*C}#-;9OBgFZGLks2mZd+7fykXpcxbsNf4vuGRlC{9Z<ExfN
zJl7t&@thB;dD|Ze{2PQ7Xf0f$^i?1P=}aLRIs_xI^y;-i8q37NNRK@z*G0=2v319(
z#mA}W3T845L^mo`n7fHP+-VwD94V8=T{Wi}GTv>KjnV#E?6rW2W%A-jPixj|gH1aZ
zm9QQus_~3!s-87J8sBQ!i$CzxdSEO0?!?s7cPoQ`)y;1)CiR97cl%85t86Ft)MeZm
z`qlhgL@M6^+Ic#WY)8FGZ-4sN*=$LNyM?7dBGGt_3e(T6v~Ayw{I;UFWy&C6A1qtt
z>M20y^wYT6ZZ@40env(c@<ykXdl;9Frp)eR){s1bRrRvb`>8VmE>VF3<C`a3Kk1f}
z2C>!Vr?jmp`1-2hcFt(T-nq?SacO9XoT&+>y#^ew9RtghggBu53Y;Frn1B5lj@QR*
zDnFb=dY=l%!}@^==TrvGW951;Rjdrun^iV-o6UNDH~VP94fFYjKJxu*Qg4lmOs{qN
z&rQ`!R1KR9;HW)h4ndiwLS1e$fID}JpCu_UMx*L6NA)_z@pt#V5ION^VU@i5{zxQc
zYbTeI@+kf^3>NY&uEY`44W_w_iQz=o#qgsAzpM3BGmsFtxADPW1CpO2(Y{E80<ewT
zXRZ)JXn(Xs0Wv#dfsXV1BwmCHd>P!);CFAqRk<c^H_uW@&8Uu!VV5H0nszRYxdhC^
zHF*+DL2s#*pCgFrDnY9zy-yW`l%HruLf!RNSeJX6+WkDhJq@akxlw>A!x4{#nx+Jr
zYi5{}Z<TFjsBk5mi`s0RYT#K3p05A=`OHlK0Sg$j-<LHOdRiqr#r{=NAK8Kg3F<Q8
zT1KXR4DHB(JQMA-dXG|h(k2FqdkyAyYL3PD!vKz8RPc_tF8S0nQH<-wXZ>yKaBdR6
z2}2!Yr8ydl6`LT2ZHW|}wNmg*$t8x4sQoUq-Im23PCe<|4&aZ8+|Ir9UMW^t=ON_c
zbcN!@H4*Zl_LF({XMwe#F8lIWp|Wcdt6U)+{JfA3AtLye5sIu@gGg$6PB4XL?mC=}
zkW^T4Gws7?Au&K8uu3a#n$-J``_zYRZSc-HRnsSxfdb|;v046eJ{@%~hY9S?rvluf
zG)UYway2-MMppeZ(GIeH$%fiXpl5hBxQ`#WGRK=s%LY@p$^@FeTN@i5TT8V$_d%B$
z4FxkjTH1b-%dn$ut1U9b2^<FXN(#sDM??rVTnNpV_0=&%L^b2$4y`~Hf$I=+G7EKk
z<tSp$G%!Nt56v`c<N`9CT@Nf~m)&@4@WZi1ae=;ZoT*Ix$_?!}R+VimA%PPvMbo+n
zKR&1rto~|hQ_<3&l)?P<L?)!WlB|Vw1Ry!@8gcea0F$V*7R~e|D?jcjKE5eFu36t1
zY+!N%?lj!nH*$1(DeRt)7XtMa4mr~!1OQIxS7i>=d$O-;C7DIEk1B*`ltv@-;X2H6
zA%;UJKnHTcKQKLrJFWA1ZU1k&mNlqahGtM5d_>wl^DB$_M>J)|$WJt5;9-F+>9}{n
zROL8_;JkZrTqaXq7E%H=>mzExf*w7}Or}2!>k&Mx<L0VbXCe$f@fgwAk8g|0!_=o-
zCf>Taj#(38>J}}2+dA-zAm~=+jhdwntFI}8WYUJ~WGEUd@EW9gVuxQxe&HvqAR}aB
zeyl+ZHK(!8Gs~1~x3g&YbWN6@ezF;nNfGjH#{&|Zl1a8oXerxkKIv;dkCZu#!((a#
zZ{Iastt+umw<vWmj;46;0y<T*Xp&g|TzX&^V~jXEpOHrf|0MqH_k5Zz)~A0lfnm~T
zfQNEk0gV(QjT~33B{64lSKtM{cKJ}}4(yvDTdHuL)~SpFX6r$-Et&k=X5E-Rp^)ad
zuVyG?iMhd!Q3COHXGXMEHdS3tj`=bacCt{mf<29bIf6w-F+T57-kn7fja&pva0Sy&
zncSJ2vDq_M+BF%8lE+!7Y(IXUWDXvX57G_J+BtCKmZ9j$+RJ73RjZ<Y5f}kYDwT~+
zt^Wpez$W=LM)E{w@R$|{Q;sg%k3?;A>cm{?NzDB6zvY$Gm#6lo_(;-x(bNf`{d&@G
zD1lB9{YMEeWb>GAk<t{+QKR@%BwZr3B-rBvVA8=gl_<y4-EP6y>GhgB5(xS9Ep0f6
z3c|(}X-dc$vb5tS&n!%lSIcIuho_R6q+Ik(H#JqfmfPL-&7#8-G}63R%=Yb@sdkYV
z9%~VY9bxOY+G{pDVmMrbRd+(lqG&b*rk~WkSX|d0vHdR=j9v@>a8Pq7ruMEBizf5m
zZZ-RNvCSBoWIXAU6@gi%&e_myud4^R=hyH?&NC+fdsm6@+mcJoiG+b`zK}cS;Pnz2
zAnk)5;vEiTKoG=J!Nv=QHX88M4BmWEqDq)eP?1{dI|MA`^7GHUch)e#y$aBsPj1g!
zeshd^s-?UJ9xiKX6p$F;fRji7&9O}y=i76OY|yiDZuf*tQq7b}IG)$HGOrWd_ax<P
z?e_06fFOouppapUGj^j0#M!~pA3@QH#c`zoHr9{gm)K^ZuF~5AgZFXS+2U)<8i3Hr
z!Tiy)(N|;_>&CG*Nh@wWBSyDwe!P<xMlJ=<4%4ml^R0l*{d6<jkSr%Oz?9_&PhJ1~
z`Z;*Jg6GLhWUh-Y(C6p50Rwm<a?$}TUct%Y`XhhowwgKUDW=vUtc`m{9R!YcG5j28
z>UXow;Y_59=8wyTR)FAozQ9_@EG)9xN`$s0OzH}uwhwlqNss7>m?*s>opQJYI_P+s
zx<;jo%R!)g0&#gf8=I5vvKAtFVN0wY%^6qITW6EmX>k+sER|q)yW70t{PU3Zw-&LG
z=zxcXLV4)o^gmhC2sAn3+@o`CR8tXh&8Ca(*%{9R`N`u5b26&^H9AW{=`THVgQXo@
zctv+*qj&+g0I681cr3+;Himd2S&ho}m~36M3hg4GRNX@6zCjo|;)mp2qLRkqtQwYo
zgp8%2F)8el@jMX={MpjM0hm&3t;g~pz=NE=O%Re22&V8+Kb)T$CQwjr=8~bSgrnI!
zRhIE(lQ&jzd~M(Ymd84QU&aS+3;cMSCog9hD?micyPNlW4gEV1wes$^d|yQs6~9~$
zx`GHXb=G1FYC7xsjFUuCZ!5v&kNv8gE50mCZX41X><~mmew>Eynol|8HpB=uEf|he
zC!1&Vyik)`$6Tl=cYBdYAi!t%;mCYc@k)9-_c~jm7O3o1LxKGC<mbv8-4R$y4a=Lr
zwN`?c9<Q5vH9~}Z>weRGEsEOV87ugeWpLZ@hnJMes_>0a?sKttW7!2qDbpI_hNgx(
zqGoRjxS$6M(n8R9I%ssYpkeN#iH0SLFIJJP0{OGly~rk>un$cvYw2e;gflyW3MGHM
zlhs^`%Q3JQjG+nVcn-3*<%42mAy%t``GiF~%j`roBZ}`EozFr!V`BtmxHnZp5!A{{
zzon3@S5DMoyW`Z#r3!ow?;pkP<k;tEeiHDCd`}8iDHT`8p~&{9$lYa~k5HK(9BHvj
zvKxcprp!`u&L$71yjENQ`T)o{6@ii=(3*l2uyhODTET#HsA+|@{h5_XDjL&o_2Am+
zB@L1!^FZC;<aJWWr>GN}HVDv>_+CKsM>}M?Fk$|~n1J&1HW>p37PMTW8R!t5oNGqd
zC3UZ?i!}N&d6&OSvM67&&B=1rr0v{<D3kMl)D4EZql=&sKaniOF~t(h0Y$v>Ip$MX
zQ?y#ZOon^)S?5s5o{`QpsuQ(}#{HU!Q?e8~-dX_|(uCyN@OZk-_=r*B+h(2siDb`<
z&WVvV^s7NFfp_MC=(64RfG$KhX)8*j(~wDnM=F7Ys&F63bwK(4c_)xy3l7#do-s!*
zRnqne1-Q~%_T4y7w_aBCW0s(VO~diRfBxDzmM!>OHRj^ZxdCS17pnCUiHM=pOo3xa
z!U<%0m3bv`$$x+oj4vV^hp}JHuQ{g5+OlmclA$YBqH#b4<niSrt_d`}ht8y?P=!i@
zSOC6}5Gzu}8Vu}kC`WyC%PqkHJ<##hKH;hr%9TNfSr<c(E=42o*iZ1t7;fI*Xq50O
zq&nd<ptHj<XwjKc5-2cKWH8jdb2(@+YHH~*ayrX1{;G=7C+wrAl%s@4e4=?cDcQ9J
zwTtzNB*$7<i>~5}&yta2W$79TGCiHcX9|H>=>WUqK=M$}7hPinL2R0KReIkAm?BVo
zfow3TK&}qbQJ5=kJLWL%mk8|`evW72v8F&D!Bm&0nrl=90>$o#)r-O!WCs9+9Rb96
zL;TlG)`ZP)Kt;HXxtVrpy^UO8u#W2hA{U1W?6$Ja`nYD1gt!KbDXbP~aX+D<WqXvH
zQR~Bh`?vt!BQ{^)v?LCzZ_6;~9h>AJq?Og!Z{h>bvH6PvGt2o75eL{CLx14Np0@qy
z{<{1o1WOPBdmU`#;Ao_RbCPF~zxBmd%)E84o?nM^TKoO%Je$1hB6$Z&-%BT;<)n_v
z%DC6Fqh?1;>5{Z7RZ4E~@1Z}_OtE#G4^}W%BO4x}W(&^?L^(L9R_t1SW?RapGx;bh
z#!9~<CIds<I*{92yh2mlpHW@*m87a}bcnA)C77a?17D_nUo@EG)z|~E-7-F?zk@A(
zR#Zw21J*A&e<Wch<X;XOs0s5(S3H5|PqMZmtJ4{on!()WB-cQ!^^(U<b41LWMJBkd
zx`Iv1dl-jmB#vS%6(ruvuKm=z=zHU(bn{Nlx!ogg;K{6dO4KE)rv*rNeOS#Yy7;K{
zcOUfPh^nXdTU3>8gFXpMZmGIOs?QhOgW%c~CHA94^KMJ}Po8fsZ+^AV%O<{EXJmR|
z4fCIVGe7S&Hrhu^-@zTmY)6GYG=~r~r45OSw@XyahPDshbuoGm+vXUb5$0k!4?(ei
zF`J~y2lK&pZ8c4*Oi3Ux=TX+B`9wNX51_cM^gh&|$|hqF`f9~{IC#Px((ZXaV)R0l
zXaZc99N|n`1He9<;AA6W^cf*M?6<$D5X`gyGqcd#*9{KTYVV-qi5E@F2v8O5$BU!{
zNOSA7v?>XfAZ5M;p{4soCkF|w;+0<JJCp2UoRGW-NYg1Ms`=Yk<>)uIO(Yr9PPP)Z
zLI@d~sLUCqWPQX&#LXyjY$<eS>q(-<p}mJh%%BSn@ieKHaw43x0iT)_7lNrwL*+ap
zgiv8GrWVo?TE#J!|2l^QQEq`-(G0xSNVz~aPm6bU#xy}o!s8DK6kM&z-V=VO(&4~d
zcr2`crXO_gun8t-#P7};{GGr=S4;9eMsTs}6=@{KBjuL11R12?Dpo^B?QxyMnqA0y
z7^Pjk8Lp-GuRlG*y|S{6OOlIB1^}-DHYoNC@lRZ@jeIWpJnQ~^%(k%a-N`F?o_a0#
z-zkZ2Cj04`l|!}cv4YeA<rXrAU%de5B;IneMxNVFJ<#05xPekiz3J=oK=awBk~bA=
zKRsIJ&2~mpe*T>KPagzJCdG>D(Drn$!%kVV!STjr(aaTbkxc7rP6U4EC?K|=X$lZC
zh6a&Mx#3tY9gIsY!!wFu3I8>E2=rC@Wiz>^#lq677P3uTaSVA~HyU+mF`5A|(O(KK
z1BRbAI6%DKlaM?D%|@Ku$yE6W$xC_`St&GT%J|nt=Jl}1amE}s&1mvr!7E2>V7kLN
zIOXe^S#h&TWmbHeZe?CjY*lQgn{Q?Ky{8u3x10YATUlE6m5^`XbFCbe<8_g-D{75!
z?_X4OSSQT}a;|tO=R|pIgFJ-Q>az^vBGtkbzs(9ly}!R?BHZed{eYn!!I8%H9JGbV
z9O_Kt^4Rh%k|j*<7P1#|BJGpwpU!vALdRG4#=wVSC?#8CXh6I1yvFCEsj;nTbT?9H
zKf}VGT?nWO_e)4A<Tm5{B>gjg2>KZl8UI7b{sC68VU6x%lk04u11IAqts|Kr5>^yH
z+n3rJ-`rtp(r!OF?@QYjT71O4wL&~XMu5O_h@KktOMAPq=i8jm$!gFUR3_TcQ??ff
zdUGx45*Y8vTX&4Nc3he(hR@0>xz`k)0JjhCmZw=)P^r&1g==NQaX``A2sE0`xpnP9
z=Y!vUWZVa<?6J=EeEH8>-Yy{5NSP>Y$7;K5E1to;pi;6Hb6WwRX(j?JAdOqb#86D!
zW8*|B(4qp2tA{}%j(RCbp@?&L{y5ic2%*_{3Y^Zf4!asiPor-Hb^w$!ERb4Rv&uM}
zH3e%v5sClGW@z{fodpgpRf5Wlr++&V;+wPcRT3>*vF?E(NZWCZq59&C%!EHC|Blnj
zHt2qLU5+4W?2!-6I(Xes7sH>#b73A>Hz`QCW!JP^__?Y4)caf`z_FLVzdI_@I^N1q
z!e~{vO!!$oZ5rWAn<I~deq7rLLpYLyWIv&hj7^nXc6iXKw+ylbM{3Z@_Af0^wfw=<
zVo+6Rme;6kX3Sk$nvAbP``)fFRTp{aS{7GbzF(RAM<|Z=G%aF<<LO`-<4#NzhB2Bz
zbi&-)7EPJ<hF}Onp7xsvQ_!{ND<>L;NAiHf+xy@9Z<99A9H>x;%cmELvRL8r_e3^V
zzn(=)EvHgBqd{v?$)w)?+{Qps!1V4N@Eaq0<|KGJzkwLM<3i|ViC1yGcJw(aDqnj2
zU0v|hGSH;!f|sR*Sq@!RJ>|8CD<G6S&$<AR4O>d-8hnU2odTZYi18SX!>#(I@4+5$
zl3d{{DRY2R*aqZue*rO-(dVD2>F)*BNFf~(fynBg*r_~1EvnJ4i43Tc&F8$H8<&c)
z3hwfn>h)vBHnXqy;PStS?Z^=xF-wPfqY-cucg$<IVsZp3|C!=bExW|srltyYwqoc;
zu;(e1!X0$@<#-}X-|ia)2d+)XM<zW%0akI&N~{|Qb*(HKG32k!CRCQ<GgtYbgQ%N*
z*-i5tPCCK)77I0p?8W;@aOZB10r3KI2lJ?c@T57|09){dG>fyP0|1pHuynnUrtf+B
z%nWq~Jm)dC%?eqms?X}HJ#N4s0HHjM<(!5Seg7pvy`ny?q4)$&GsrH6%Yn1LNkGM9
z71Axyr9#e()+j)~E}yn3_2iO2@q?9IY>rXGpqQaPQft5m7aWbJwSzb(XKXx<v$;Te
zPbJ~D%lJJqIXt4Xzw`<9DwTQXRLwcdbx`Ek`{p@mv~P|o3kVNv0{8ta0reH#MC+WO
zWh>VbqA|0!V{O(F$#eFlnmp?I_a(s1bZFq;Lu!CgqX95>J$3Q#|8ZdW{VR2QEjz0+
zSSpFb3U$VMwv40fy$UOwB_K*Pao$@K<rF>1^kGU$vk^yNF<kgVt^Aj6!@kKHYiCB0
z>OS9b^}#h%oRZ+szZ@*z>r7GJ@NNy~l4vdkZ_=2g(UA*CFeFx#?yh+s`fOboC?@pl
z(8v}8sGxerCg-Cn&|(fV$er>@U|&xA0rUGKh0IIbv%xV8TG>lc10=|+NyhsF=<J;6
z+~?-m#NtHC5I4G1^&K_fTRAU5kv0TjjT`GPkobFZ;Vs35Xj!jcEVwcKjL3ZyeEf8|
z9tT%p6f?epvmf^?4Vk&u$#yGE8#(n%DRC#efQ>X?2*i+}ms43R44*cLX{OO-(Gc@q
z&UEuCv!*du!bz1;@~)X^*snm4y;%B6oOvSOX%mb&=i%PYe2aw&ajoxq=5f0tr+#JU
z0%rCC>;a`XRUkJe^VW``IR0-p9(Jmha1tY(#c!|b@m0MS`9*PmfAlEM_XOMEV-gL)
zsOS{(rq1@MsSMCbS;u>3TzgoM{x}gtq@T~ygjJ;tD1`pb7Q~&Hy<}E4pmxlZ07VUQ
z^Rcg)B)^ERO`U~`SPYv^jZ?Em6B0bs&72n#VbP#tOwVBxuT9F62NYf{=><U|F!yJd
z-*4_+I$ml=K7*6fZ*6myE;Gf;!K&qqD4b)W*{$OUZZSh|L)OX(o+Bo_#7sOM;%jhB
zjk$ivD0?%QA}GI*V%N2x!4wYlwp#57CbjW%OBkA@-<_ylUcZ|%ziD&k`MwoYa8nOj
z+d3yT1Uwi+^GlFknDzqlm#9Y;qq(<_&J&r>{N1}RfUffH;Rc(w(yhlu@&|GQSsm?b
z!V}fvbM&=z@uFis(_9r^a&ErdGQkjIf?v%P%GMVPg;VXiEbO5@YML7S_5Sky6#o>0
zF^u`fcA>8$R;*bJ+zGlm2QVv3^Ka6AdT%zj$CM+7ao;mmJ`b##kJyB_U<@tbxM2KQ
zP>S_zj+xGJG<>Gg8A*y2e&1{8r7zD>nir)|PZkx=8v;#2cZl?;(+;f^Dvr1@HZ$xZ
ztDdReyL$gRPS!)sC0MOKuxtr9nhN*2z1<v9<I`R1u;vhg5Yc_X#rJQ{V?)gb_gD#-
z<xlEj4v@9V$<T4zf=#I}jJ8}vk>=IdOX%g0vd>K(UR}luT`iGgW0W|Qa`I6lB*gQ2
zsKEk72ds^Q-gvJW8ideDC&^*8%;)q1-8)QLe()}il(8&_GC6%dkJ}G|9q(5ZJKYqf
znmZ~O!)x59DxYkWjnBg?e$+o0qaJkNQ3Ism0b%rWSckFX1fUk^K(-AA8v3_glA*Z~
zal-zTM7qD`;yhAKpE*G5Mk!l4jheXG3=jdCr{-a{wITWnBfH+qU&`!%kBtzkrDB}{
z9R_u?J0syu<nJr*ubNuHG_ojX5)HG+5?ior!x1p@dm|%@DP_wkx{a)7v@!@T`rF|I
z+oFAY!WDg*2QP}LBC6yhqstlUE*dfA5U~t}^NprdZQM6!_HI8ukdP+^3r1D6k7(Na
zaJBqmG?MYK{>%czDk^V;)bQ#V-A)F_hd~QeZ-Vo_z9+_dMH^|vC2T2<Zi|8{By$K2
zVS`%^YA~r9V#nu}Gqtv)CiA??qbOH~L`xiha#q4ARe{^Os#$buhUmZg8YobvSSIm^
zH2u{x?J8wyGwvYqkj9p6zeS$Dwz+CobM(v<C8*VMc~a;w=X+n(yBagdO3)Z<>O?=`
zS`!J?3N9Yw!x4_+Qc-5M2CKwZ_5LZm6#rPoD<k4=J=o=MhdZd3>=HS{%q<%Ebi+MT
zgMm-?^?9G$1(&9+f<jXs$u6c3V!W$sGN|xCbc8{wa`3L{`DM_cJCZ=FUo@APw)kfS
z5l0abrcC~q`9Zy@6K5weY{=0Wx6LkJ`&sDA6fZHwgYZG@JUFXWN=U%oE2Juy9{sja
zicKerRDbEND&`nodZGb7&n)iCca(J!8*5vYV~Y*JP(QrRH*m=H3zC6VAU=F=BrLNI
z+@yL7&CU0H&jbQwSAj>1TM1*8BC83-3}n-J<ntM=NmzU=6u-aUJw$+gsg4MYp`xm3
z8DT(pPnT6Es9B7G?>gKDgoVp6OZ+~g{-{MdJ;shi=fEzaRtj~?H``z4U}_eQF7}Oz
z1ce5o_N2Wl#W6<E)hk4pH>=ls2FzEJ5Sj)kHP2}WveD6?Q?%ZFcYo-UZI4nT+hZNY
zcH~mE7cvQtc_b;1`ndG{Y1>sD&I1)ilR<{XOT#htuiKaPws6*uJTLxRo5L_FFflE*
zFe<jdzbf0UYNyI4_(Kg=E?l8@e|7fjpX@56>u=U#em20maQ_GUm0V3*iiNU9Uv8yw
z1%rn>Bjgiwqt4Ec`>12VF0QfGQ8ai%3)qz9T`%Z1j__|s;V*5-s>fHm8MG=2ejXAJ
zQcFc+wigpPV`Ach+i5D}y(Nc+(}m`XX3e61H(=|IFFR`@L~pKf;<3Wx<Kl59a0eAR
z?00uqe->Pb;8jy?S}QuOP?)lkuosgyip+W95d6fZ_m9I6g;Vz@<C9ZJL+0?g=+a-W
zP_P~0C&tDm!PbmY@UYoo)L9TF0Xc4c*@Vqn$!F`kL%NlZ<jt=(HYl&|Lv03X5Gg3;
z*`e_iq~X<?srdNc;O<7-UYT(EuEZ}u4B_i3>9=C9&9fIIn>(fSyS8JYLl#Gzp^Q@b
z|Mtgp?h{dYca(fS>n|r3`^W9Z;wBb1G?K%?y{v0E)kF}08RbhiRdr^A%eE)Z6AtxI
zyV}ac&+Hw@Nou93$!u7)M>S1HC_nFIHSuC6sU!KiJ-FfY`Y%yqTd7+wrbu)Qi9Rxe
z+ELiEP9-wZ`OHik9V3%Di~fv=1uL<Y{<ybq|JT2Pf;SVH6x_6~;AR9aOW^o{&X3PM
zC^dTJb&PIryZDlXX@}G5jV&2BBu!AkdaDNa5AW|6WR$WZLU21Z6CCd8ZT(7qlb`_x
zH>UiU?0oD$&!kbm|H%p-i)mm~_Ihe-ITD|h-Fl`Eh^irNNR>&L45%=P7Nnm*z%Dua
z<ZFdaXcV422Es26lN&#uJxI1=B$6n$<4_aG5!{Bfz>V-CO-ta`#HMgGbA*a?@tuQ5
z5w1AbgM;J}8Qx2sY1qHWoWrDozrz7SL!M9Wn88Le!q?&ESjK}IyPsb7b1@ijok7F^
zkv!`_MS>>m51#ElbfNt8TaL>#v%==oyq*M|vc`s{M9Kn#{cDjbIl6x^61qXrc5IbT
zteqe}^I+v}d)wMO6b4Vq1opC1bp5PgZ9bi+BrC=7tvF$CMf2=$V^PSN;q=+oB9+Gz
zc3GVJ7{>)x;ib;}NC>*@w@3}BOk_Ri3u#-S`EUx&^ctz$d0R;<tL(K#Gpo;f4XCA}
zJ9P@!Ai8E`QH)(y_!jDOM<y%e6k+wv=}Q-ghjhxs_;<6kN)@<@e;7motN$P~j`XF%
zB^usB&h`-pa+wJ?DvSW$`zQpE0^KF!>(0v(l2f%&#jhuH1=ol-9Fx(yt?qO<db}dE
zkXLx$=^E9`?MKz;*No|l*&m_Qh0x82=V*H-n{eEGmTuwpugCasX$h8y<L$lm^hH-U
zVSdt<(lx<(x`}b|zJ;GP$RC8Isw@BQ#k(!L6*tt9qNm&*W7_(mm@ZQ%zEb>UuP*&W
zsY3l53*DW+QKfF|FDAhS$T-@dI@@R+ddUHap#CRg3Lz}e`<J2M1p(&(ibk8r#Z3dP
z?!mh=$LR`63<L(sS**5V@L0R?FygnLq_cxK)_gQ+`}J=FKldUOl0fV*g2pi^*K+|A
z7Xig0#yS6tCzwh&$Wj8qm{br^J|v9aMBfSxkP(6ESTm5QD_-lKeUD=B0==c6_={Kb
z9Hzg6Y)EA^&<(Ry*kgmUnui*7Phh84Q>zrr*negrsAn7iNlD8_equDc7YKM?==yPt
z_uS?~1O#9Qqi_T328b}Foc}%%05CHZm>~>K3p>NJ@u`{p$?q=M&wY+^(Lj8{*M7~c
zcp*i9eYV?40Mrzx>;rl;W+iH%3S^KSau`vnKNVWVA+xCzRJwPnpAp%MY0+UD_mXLp
z037{M<BH4Rg=D4FCN3>pCD-R=-_1T}H^#%)-e1V3oevnwj#hUx1HaVp6XR!Q`|zHy
z2u;oD=nM@Oosu_YUK$7O_%VguKybQ#uZ4cic_|!O(It05w*<nuHpu>SDyEQb1thV6
zJgcIpurZjW=JUr#q|PhuqJXdaFE_$|^U8x3D#lQ5R-sV?cd@zMTPeAlS@uTwOtbFy
z|5E?%<bCKr-zc_wn(cHQZNDq%VBT%fZoPxF9<wlesFpZ;Vz=_b2_+>s`*5vwKg<w4
zVdCdic2irJaysjEi#f{l=4RQE7MJ`Dj_U`4f_y@Bg{*mTT9$&%!lHRMaD*gOe9eRS
z+wMrc;_6$h!4I8kseejI<IyY=|M0JqUYpDPjV1k*)AVStSVnc2B&20=-L1V-*q$^#
ze|!GC$7U%ixqKTcBJR8p#gNW;{m3JOOF=J(kWb6`<_v2@myf5Dj|~!yUm1IR<d-Ss
zLnCnNZ`y5i`2KpUydRr=hf8vjgDR^8+*Cx-B+IJr7ubFHI^FR}`Ha(Z)6Ybd%X0dL
zk2FAMKVo|1Z?JqQm){n!Wf=9}C3OKAn4}jBW@5F>zL_%;PE9pFb0z_VMx|Qz`(!dt
zb%L9Z=EqZ_TUaG}(jgNQwjf&O5u5GEawUrvC6w;5Tb1)Q!{QGOYani=i_F3f3M@VL
zqv9rZ;AO#0V~#{)H`;Nwht-qh8p2brp2-A#&GE1pv-;vOw4A)m|26T=2TCbTA0a1n
zamKKHB68}x`4ASzZ(<f>E)VZ@soDg?7|x}~!ZgE&v&>?3dayHnu-C@h!U!IhpUGhp
zZ_4XZeEsAHrk*sp3%AD7FHCoOpvvtHopOUt#d8k~n%r5KY1sS-`>oOEpF96Dkp9hH
z(pS`*bX_J@%i@PW19Eq}Uxf|A=Iy50KYY5L(D*9bd;wa9seQQCW%~0}8p~Ds&q3GG
zsCzBs(`m;uxv*bvQ{O-NGg{*Fi>b3;EbKz;MMs<En;lkTv5ef_{O${l4}FES9T;@V
zQ^I`JE0&e!)oKvkp~4#?ChgSHW$m{809?c9jTj-OiHIoD)s;*6kX`|8Kzt&jbucu>
zEJqvV8ZgeZEG{4bMxf#5S&BYZiCL}YmL;7RFdhs>wh58%u*EazfNRMd?DbhTadBoO
zYOuX^r}%JEK)|+>t%^M<EQDpTebt12;b5p>^&O_0(VI?9S<_`0n@&hIYj?buWVDMb
zHiT$W!Aw`Q6cG{iMZMcqU13IIi^BjpBS6@d2XPS=To2Z(6~9&GxyAi5|2yH;0B6R1
zv1s5KP7fMWxF%5j#itHiKX~?6#=Q^TrPSh<8SO7F>7kK&u%k3E`yjK=TFD<6#PG$2
za#4`HMzodH<wRBUflc_3^(aLRP@-{&)^Zb)TY7r?^<JOqvaDGrhW9II$grfqA#yV&
z!@x_l;($l|q-lPry<;g^4gbse^s%Xv-VjC`C6&Mm2Cp^Nn(zUc5tjl!jef?=tbPze
zAtQ42=;;Gp6%Wm-Xz3tF_f7memG3PN)d$R$WQQ*h_}bBm>D#3#n>m4&M7>CHjQK$}
z>?OqV9HrIDca(Hf)amXu37nfoO-v~KQ24>M2$;CM52Wq(zPbC@=-(UiV-z;W-()eo
z%ie~CQCaCZc=whh{CehZtE4C6dsRVkzaNd_&y2(KqbRC5q`c;zuPE08U=fivAOAa-
zmvzKLFs{`v$moSpQdZnE=6FOYY?nqEP9i?-k7{TBiR%_xL_mHf!zT@~rkQ7+i8xH-
znDVDc!5;XtJToAx*>9T1v1amC(<f!NkB&sF;A~!mC{(#bUYH0Y#XEX}SPMKKW`2&b
zQVAL=W-V7EfTKk~tT9$ZFn#Ai>T^#IUvrGTdB-1ui?8@xmUU@eycxSBrIpPKdjwOd
ziX2I)%YZgUi@kh6C7Ms?@>J%Vtx@;ho%8#V`KMD#bvLl2g~H5FOho_QFr085-AAvH
zZX&<49-Nnzb63V~MLiqGV_H8|2z(WC)*}CybE(Rpc39?7T?`2>Ha@8o98bv{P%XMq
z30a^{P%B~Q2rVd54rJr}q!XC@af2;3lTzq?)IzDkFfk2|&v>TdiTpE{oqe;$c9QpH
z`|?J7TK3%f^5ABqr(^myLem@;)D0(?8X<0MlMh0p%4usje7aR%)7c+|GNii@nrIFF
zJd$e1Vf(cb6#jeNAJm&1=x4ly5ZA_1p8Na*m6ul5HfIYSho|BdLy9)3Jl~z>eLDBS
z#6ORiR=Fk>w;f6E@Dm7I@E;5I>mOFNanvGhtr6WwSe7*!lK450ak*gl-In*=0wSer
z<8~-lP98ixkMmdR*&`+QG^`{finO@`s1+Rqk5Z0AgIb?Wd=4yBK;iD?+k-0qN6}dZ
zG}*UN9L9iAW22kFkOz?tnIN4CC@tL}Atf*=1x9zbbV!$!bc2A>AxekDXb_O_z2C3f
zx81S-b)9p5CoCeN+?2Nd=f0eifUuuT$^@=nJ1+aTsc8pT1FkmdqiI15Us|xQ3B*w^
z3ep96;T}LVPpY&EzSb=4{wfxecM&G?h2eSdjg2>cTP8A@3z<omHB7=GI>AhZu)k5S
zL>!DzBGQ$}w5B(h)`HNk%)u4&I;;fnW6-LMV<N`_6wluLg|-TjTyUGG=;8Ypj}zFl
zLG0ns@~qMe=(fl%Zb_-?EYh~8w~WoAh+Bv06Rl3JwuZZG>F&Af*^{-@GxjRnSer?7
zg<Qm6-hm9>y5%^k^Vf@sdv^*2|B`t8V65%qirC}JVK^(Ho+QJp^0MUH{xDrhCaGAz
z@eL&4w12vLqPSkf&jnCtziNMtEn0Bf13*)!$?y81wKB%Ahrs?BmoSddw{L;n2rjiF
z#v`fnE-y+JmD(%d1ecm9aCB^F5+7xC%|9Q09mZXFm8i@v@H=q`7aoA8%qD{a%IhaC
z=m&F#Gl%?`_2X@xw_?UHoqXK;R=;y#WQvc(q3Qwg{;1m}G6tJ)h@ukksoJtxGe~M+
zm7fD3dZ!4f$I@ps%M}07nN@e)J&+$1M+|xp4h6;~ygvPO9VJu|`MF{>I_IrBcgL^j
zNBri5!05<hKC~Stb=}0%N35b~dosxQf!qm%`}X&CnrzH9BMY7X;01~LyB%D)7IRMm
zA8RGuB{ir2<k^#&i<dIyY-C_JvcIA-ZEQ0+PH29;du@^rwwCRjE}B<Vcl^|oIjgR0
zG<_!LX)!CwH!Mxe>U1_n8j~0G^#i6mn1+KQ$2u<&Wuwe2`!xErQj-jqy_?X`70j#3
z>kUpQTO>v!LJ|ULpPL4g@4^rLExg1+1vN3KPmkFY6o|=5hN9ZtU_ED`&Iv@`6`a1i
zC=FJ`fd69YdM(ictPFrwzWqqx{H>Vzf<!Ef(!NdrKqgdvdmezCvv|*y`M$LF(4rPO
za|GP&MS&SnH9p<92iK-PVBNT`t(6>d^g^K|LvdJ+3gmNS8GxGl7sY%6tm;0Vdf(2x
zr2GV8`iBp!3OZ?P`>M)0g6^32ESU&o0-$ySa9uG!)g=qY?qH%vPBI29vj$yaV@UZ{
z`3w@}t6LAgiB_MmEuIf$_|YxzM<3@|f9E^}X@O*R9|zL+T)b<CfX5zx#Q}H=CuCrQ
z2oJ*B{Ufhu7f?u&_V1OS?|U1&!9RM4Apz?PYs0;{p_o279)g6=5X#WFi=^!p7yi36
zYo801If>5qS*=0TdhOs9CA7(W-8_arUC&yziQoC=cveh`UUch~IbmYj7e>~HL#+DE
z3Rhgu_yKsJFz3pbYZn{Os6q8FMD1SN<1V@-w4LW8zBR!6MRBRU?vn}O1+F$t(AW03
z7v$`!X9m`ZY`T6z!=%=NvyH;szNTP5pwz7eN6j@X+({?f-bhiPK#r(qlC&o`2g(N_
zEC^8R)W;dB3%XnsNt8o6WSu<ZK*Iyd2)$&_z4QYR1w`j0Dw7~#Uv|R4e)C7b4lIBn
z@GlPSM;y(H$cUI}4#|E<gA4&K{J57Xlur$6_z>y|AKc?Er#`?M-m{~_k$ZpL<T%I$
zGgm)dyD`_pKSqf~Ywv`qD&sIEluskozek94Ag28EiniMID~juyMlBCs4M|kSy!!<s
zX8wDl(w9{HBTRMwNd1pDmq-9$digK{HMCkh6*IelN!(Hr-I<dA<MGs0bE^9jbk$F8
zHS~c>`p^n!PrRbCSG_G7ABf!q_VO>Tae%%2?a|f34aEh?1Ht6-VW89j-z6_}R)bkW
z07D~%MWFSYdUdHiBqdHMX|8mb^d2?l8rT`X?y>&Isxyd<iXgp0ouALW3&7ifZVL6v
z3f%Jz!uPttN}F^N%fa!$p=$?fLU_>1n2X0S9IHNN&<)?>86+`k`|5hh4Z-x>{`>!!
z8Hs1u*Y&`dhIcy%l|=irw3vy>#DC+=HB!hi^0T8)bcfG=6ZyGwPv(W#Q|-jMC06vj
zvAyl?ZH!U;=ck`9R?^KCr<*;0-=|Mk525(4F3@(c9ca~tWs$gWbL2Sgns)Ldhn@t3
zWHxWuTHK^)B%JSDsBz6|<f>ABB6yt1GKwcO4hq-vd(@fdWGK-=zkLZt?DTCy=mpl~
zc_-xQG1kQMMAjsP)6=+cdOx-AFOwn3G9Fit>2Ue&3^55O)$8q<Drc=E4n7D5HZ_4^
zMH*Rf6(xf=Q(b~m_;5GCGa=i?_wNj35K^Cj_(`uw#57V*qh9QSg9NVD>g(`DwR=T>
zhh~{jISW#jJ#V>~QZeF+ZLIr~Wtq+Q(xa1G$E~*_pL8nqTk(&Zr1y`*Zhl}?JJ0Rf
zzYZLqbkR5tKvj+I=^1BRRtsL2Irb<<HTDnnlNS#8LD1j|-drso*NTPLCrQ$(A8()C
zCjT3Jc}<4}LO!f@ef1PWBz1TMS^*^J@V!1TgpD1Y_ibFG^Yi)Urza#R(2zy}HO)qd
zu6T<`g^9%<E4Ln(Mvb8K!U0+*QY#vyJnfZ$+uEOZD*T)D?(}qis?YR(JVwX<{^piJ
zGG<1cv{YQbpV76@sjI4+Ud6GeN4U>lnT4UX)8?tM3~s3-h6pozusu6|)yJ<^!?&3u
zC<8tyUmuHHKaWfti=4uaBw|meu#q}GWf05DE}l@g>(p^F!@R6ZCldOf<vfN`(qE<y
zL&{1wzO?{7Xyh{e5Ftv~TGibu{xNPW!h4bz-9G>Qh-NKTccREXR6;qk<Td_cuo{5i
z;Bm#4g=;*}c_d)2*aA0>7WH!uXni};duigH&Whi*sPCP?5=g|Q5I1gVj2{dm@?(Hl
z#v&m<aJg!wo?}$r=Xo*_c})tv4=iU{S4m=tr;ewqtYT1S;zx+@Ajkww;#m*u-rxRy
zDf6fgG8VTPgvTE_-}`9fy!xD=cWa|h^mSNPHmki9@6=m#!$kqak;##rc@CH9<ohd*
zR#WD^$CqasM`6UDv!aB_fkBdD|BPcHq1lx2*QT6bOF7|*+kz@!NIV`TT$A^e3?{Ef
zb_1?YiKpE|lY!^8k|lMNQb1JCd%b^r{XfxqWWrGFLi$bQFk~WdI3N%~K^6Ebujkc0
zMXi;+)=S=l7}?JR#<&XR-!Z}XoVl7*m9?8kSb^AMs3C8ooo~9VwPyf%^D2hsVYFrt
z(p=fiWmzxk7Jto&QEA>_lZ4(8hvWpbq>$M>PV~SQ`lve?2iNR3@KZ=l3{VH)v50En
z(3{JaTObLSUck16*6|I8GyXp_eg~$-P`V$j2gsr)Do)QC=KkB)lMA2<w9J@&aOJ+2
z`sw($K7Rl4q(1J$4bGW?tsliH2Fv((xLSrJ4me!xK~V6+iflqmX`*4q_QCC946zwg
zoy2}in;L!0UFm}bi-82g<?_)xTl;bfnIZ!H-6v%1_-bW)_!e?4!*Gpu*;*Vf)27>*
zXrbvWT&2J_3H)q9)k87IfvGR@%-SF0D#*Z!pL}~WTDe#G2Laj^;vJ@qBlSfgxw<`n
zDPe#Wv9$B#^Tg5$QIim{Av~q4F%VQAF-jOLy@)D!)gyA{`CD|?6RP&X9I<r$ZQ85(
z97(OLkf|Qi)FQC>R<B|9*3Kxv%Cli3)a#S#hDkLDl_*(FPS*0~<(u>AgwQa+X<Z-p
zfFURR;seKW7@*Z#hymjskGuExau)y4bC}erFs-gyAbB0~@n5oo3mm|a+;d@Ahjfbu
zz*bjJ(K126qrMKLE&ubUlD@vXdUiDU(uWa?!*Dw&psGtlMCpJJ^|Uzt_pgJH6{h*U
zfYssaYh|JR>C}`mDZjU2cOp!RVQvaPpGA<Tw>~$D2HhUuhlm^A|7oo2;~<DDa5P3h
zBN<PL<jjVLhX~aKrk3uGL+E%b)9cNbL}1LWOsI*a)&uzmoOZd3f1R7%=D}z4@&JK(
z0EVL1uzFx9!;#_%0$*w12k+rA0J%>Ql`n@qTbwhBHs)cHADCf+?$R=^vQ2PYWg=#*
zf2ZM5HVNx80pS6nvf50nF>pPtcSWbQ7?&@`MZ(Ja?I}}LuSnnJS*OCSY5eFEh+DND
z>F_lfm=2fj5rI*DIDFp%@|BX0?JF%K@2FT(Ack%VGMaTXylKIeG^&1d>dBMoU$Wi>
zB<|(>KA~Yr0$8M@W^eG*z|YJk*!#>NX*J?1>UpBZUW};IX?kX-j4v`$(A`qbeJ-V$
zkgqNYJy8@i4){@-Ij^()`EYPIc)!zg7;J_ZMnl*WMj{fnafYJx_q`_{s}>ySDN0nw
zd3JIvZ$&Cx?&HK-*JQ~BIgd3;{Wi-FCEUnRCZ3L?vSk%TKh4}>)RDv}`wnwRhLhjW
zr{%88Q)|DvsvR(-R%iUNRvcE5E)IYf8g91~hW@`Qa$Em-qIsEFk3-eMPND=9LnOG&
z$Q-L$y4Hr@C$4vnMqc6ZVGBf4Wb-W?8>pB&j{{}5c)Vxw{^n_SvCq;Po1cPA>7+^}
zu+=pGNm@(2uDjbM^~!D1kC)I-_v=RFBbex(2N1+jyqI8n+XD}Nl~h<&iW*?G8Rb2I
zvN{B9Dh8OBgHmt_gGMY@3mdJ&qWDAdC`?5<$^|+w*Q!8zug`%9W-X}LsLCM&#Ha$2
zZ7^--S5fX`mNKwayob?c<dUSGEC`H32{#_*IN#cC^x(_LR)?*gP+3Obx{43fCF$9?
zQ(^|8DU6=}rcSj!2uOVW;`2Ji@5~^gx#t4+Lo(PY^#r&wyE%0IXt9t}L^-vMOhLo~
z?iqcI2eI1dR{@Q_$BWtlUjKi8<16RMD#UaC(GaCWO$D3X_zhR2zO}$1)&Nl&;J{yk
z4WyXO%RkHU1c0<)ryYJ1;jO*6TnMIc+I7(2EH(f6i<w@JX3e6#E0rkvIz4wQr?mdX
zs%TFTiZA9}htQ9^R<AflijEKPnj2laVgAd@AIB!8|N81e|D)LDRU|WZPdG<N@wh+x
z<G<bg$=CIhJysx&+?MZ|Eua5?5+FbQ$p*I?<y+V0`My_bK|hV|8Kv((_n+hqei}9d
zw4(^t2QO{~K1}(ZP_9Je9@8vXU@#ZZ1}RBR5+!r+s>+24l&}^i5nr3$r-QEs=R9?%
ziKY``lBfi_cf*hn!y*B|7lJqR)}Aa@|2xPJOit-&O~_<~S-ZQ6MlTsSa=}F>sPUg7
zi+B_$-P;dce@(VL(Ge7nlzo<x2bl^dzY=)T8`gvG;VJ|c)+H9i2=oYIT;+s1BEOQD
z3Vs#}=>jp7J3kQ#hsgO^r>5B$C|$hkL4;V09$1$s$i$N#4JoqYVZejNO3#BY2duY)
zkbY9WOH95}Z8^gI|D}8x3Yqy{jm5{*lIVhRO#%j+;#G3Oc?7P7&N6NgCuKX&!c}sH
zaTU})39wOUlxk1erV`?^u0sqX61wvY1U}WFv}UJy_b~{J%GuaC@JvS`Qoncqp7UM6
z#h;N0MLfra=7W(r4+TP+<NPu(|MKK>;C5SfnLBya+oevHL82YsXRSR%dp|u`<z1US
zS>7vADt{T<kjd!OftYjluH0DE|E+#f{c51iEO*CEzVc66#QC>~F&8;`|7=E&gXPl=
zQ|PR8rkxkZq^ntb&QD1MV6%|w(%xRrwddZ=kJ%eBhE`@VNWJNp)0G^2e0TwqDrj1@
zoRW`fjAeEU*a&{P{@?8-0^P5)RQNh15Pvm9Aq*(G>GpsW1<Y|BwlNX-)vD_AT)gcg
zAq$k(CBHT_ax?6U9<JpstLrP~4SeF4K3yt-5XXucdl~V1<=4JMAnojuSxTsi5O&)?
zT`UPjo`ge>-KqsF%81|j?GVdS1k0l%*<{`#Uj_(R2<ETt1XNRnCCKIFb36o9eSBe%
zjcK*G2gO!`rS#=RRq15|;?~89V0`Pn95M>=iQ)l4<XUsgf*S0r;eUz>QYZpR;mVaf
zy^G}^Y>2tolzrH;^Em>^(RRD@X{y!%;gXcyPbPS_DIXxBsGbKT%Cv*kWJ!`#hyp<M
z@yMo={w)-H_?GC4&?_HqRkm$&@XW+#)u+lhv4{j&RZPoI^jIMG<a`@MD~PGz&||is
zg5N(qeZ7%r(1LDqS0HBR|GT_oVKOp-o&j^W55lg*{PQIAbKa-3y$bOvN!o=@H2sTw
zF`mZEN9}^kTlHR-`xKHc&;R^YWOrA!xT^{wdlwwKl*#C`aX;2xBj3RqH7osb=l#2O
z3t`0DymK#x?VQ7&-k~#d03a#-%;%~%tjV_@n`X@LgUwHWks?b5=o#b$yfX`e0ND9t
zLxyZ9wx5V~;N=wpz3vZOScwn4S>}Xv38n8YG}$)tK5oe<KN;1k#hb}HL`dcFgp)T|
z5*pg@2|>snd87Px4t<wHa~nYpcOwc)aZ=8|Z1=S3fUhv9aQ%S>w?_Oy1o;OaEi4Q!
z;C%8Dc;YZBuE{%fvi=WGKt%`xk4WbFH~9Yn?Tl=5On8CMDB9O?uW)SizJ~o!d!fM>
zG`DIg(&Jkwn7}5%6Y{X!#KBRpI+_?$8f~c647t(}1v3PD!ce;*?KRRJ0Ybs_WNhn6
z46a2}r~-Tjsj@K^6h~e-Qi(>-s1c2<UyaZCN*e1`33;Hwm3lOhyy}&Wp;_XL7Y?Ox
z1sjlyLfq*~$+snT7@oJ>^&iOyhPQ0ubCsdRh{YJX0~JDzuw@d%P^Z#nK5sVHJbZNk
zk!el>le)Jc_BsMaF~JW4|9<6)r>`a?)Nq0!b$CvlLYUltoL1_bLyNo-p87dE?T;t7
z60MsnC@S4<3rY`PeZ{&&`K%bs+#F6!m~DkFB{I5hbxxE@2Q#ufEc2yn?E?>6Ri;0F
zPQGlZiUwZ}KOpFoL4&7|3&qeS09|qEvsu%mKijutz__|$r4rX)$2#=#3gy;2#3?T2
zip@Lp5*9yo9#wb~NP`ksY3_lPt@W%a5NgvgJekTOQe|&L<st&dPs1XhI0LUFlLr>e
zJ02zs&Zcge`l!5@aSNa|wAP%DCL%#t+LJsCs3k<9zJ;3yAW-J!VS+a5<?lW?&2IFy
zm_tkKF={{MVYjV62WEmZCczsps+~*<x2x4C2C2$F`9?R2FjajB)U*d$^<u6HGE%By
z8XlL3<xXN5F<St!HxUOZgl7F<mcm+;QqwOdI(owHnbeN0Va;4t*wwQi6`!Lx<gxbh
z-`%dv(LskFpGVK^{kGci!gM>}WGn5;%D(~&vO>vLVG=VJiwd5Ut_qF%bl`Aq<Y4S>
z(<O(1(Uxeq2;b0x$rBwW=YJJWF0Y&2B%Z1#WVp~YlfD59bI6>Hg%F?m^`Q(&Jbh^@
zuRAZ0LVJ*)s4I3t8O>$}oDpRB<-y3|-Ec%BN_ft~vwh>QLfR<BQjJnM#nHv6^^!|s
z#tMztYTNDd`Umn*Xotl(q=<KZ%P{-Qx%99n@!S>wUBe{o-sAZ#I1ARvH~;>vD`~t)
z!MJ^#(4~KqG@Gil3kST1)2UWck<9-zZ?EDk|MR1hUV9J7>6mE%hHOtf1buSrz4#Qp
zfU01O@EHpphc7eG)*>}n`HT{XSP4ir`A4<hU+)uZv9`wyICsBZD+~-F-+_ihfn^4K
z9qHeQU-BTm+f7lsyZ3Vtk6qqh7$llmP0d_JM&N}R!9XA!m0m*hcxA0`xIWgTO&0ne
zjcxkm0_62u%o>s|;SdP-`4F3~Qn3@X2e?=UhZBVdJ?U2`+SH<n7|W!Zce5|<wp<cQ
zM`3sfzz?fUj7`a75g`VKhQI6SXtWQijp->f#2GX|c)+11IC110!!6T)EA+~A>vNig
zY+0jb%5cq~=0-R|uF~t7<psPkhsUm1fs|f$l0$!5&`%>;BXkB=q&<7Qo=(*|zIW59
zILw|`DI!`8peO{K$N$BV^@I2Cl|c*#KXsm6=pGS@#?F0~fyXX{CXoYv(y;b2Rq<}3
zBI2F|Wg27pno`>OS8n{oh0qZkv<9o!Pi^2p3_PD%JMDr$4o<D(_7f#t)aLHW1$-Sf
z|HSI7+-Tjga!XpfmtLkwg#G%+=pkP{UY?zg8#lPm5^2MD0^esYjq5aYx9<-F3=Lr~
zjqI+kAb))N2Nz7^5KeV5EPfPkH7>5gr-0#f-D@cJ>I9Iy>NZxw(+@S6MOf(x;6yMj
zdBBG$UW5`M<UO(2=jji7Myl0!O7&N7w;MvnBs;G_XaooIGWUl%ky9#Ewu$RI<xk)s
zE2r`gEa-|3xweC5sBbytRlo<kwSSBI2)|;yXb_~Vq`r)_{5$3vw!;D3C(|nQ!QvsI
zyg%$fK`YK-f$}nR(Z}3giW~4ATt9%w&kQ7Uts`-ZPf8()UEz!})(?*JeJvvQQw@nX
z>glSsLF^jrz?575i9G>VxuI<=)$=;Q23`azQ}?mZMb}a5J$#nDgj#tBZ?@iWd>}_;
z=&}Q1DtJ~X@b!BdDXzrC^Ef(f+gVpx<vpvWAV{gE1T(DeFT{`=UKZ!TF3%*0rc?Gx
z6EM6xRH&sX%=+66w3&6|CbtYhyX!o*dx2xp)+eI++xXBzMYF5O>%pNKeAvm11_L{@
zMO7PyDW908wrp}f<z(=DxpG88ba}5`AuZ->bsC4SvB|=Is2pZPOp)we$=_diu0>F9
zl<4uK#?n9=!TnRQ+wEVgkKC!1|2;^4FOc(I|EhLuV6Cs_3xpLgpZ8VG6a181m%p})
z3t*1%m0Y(ni;MBRnsA7saa8y5i-$?X-U&b@4ucj>jt1g<bFrvHr&^>q1}gy5ct1P|
zSy&roVu!SX2n`u6c6FXasSU#<)SSE1a1vN77JEq_l%~98lEX70CWhe##Q!z#1*y?V
zF-c4qF81=pTlfTr(v{SkUr>D#2&L{A1kvz}y$WU5uO;JbDSRyVfPJX?tI2C6Sb=PM
zZIt`Owksh6zhfggwYEaFLU!?srdkRdP?cbBe|T~@{kXa)g3XdF<y}vJ#}D0K1X^KK
zwv9~%hWEYM2r7i9n#C=qdavxhr*sOrslrRbUYodhO>JCg;ed=q=~_POOy;0p?j;G&
zOF>E|x@fSQ#zDA_-^b#`c5}CsY$P%?);{0lY5LtLzL7IHQfvlPnu|~?oDx~S+gkXH
zk0ru;%OROO3WiqMFY*p~q4RVf_JgP)sDFsqE4#EHy^U*150&X#Hje?2zvwRHTUgKd
zXc5#aGE!~HE353JI<3FWBm?XH-eQSAvc8MYp{1~NTyo%!6-V?r)VI=O_()E2{$TgL
zr}GZ)m!A3G4!=LJIC!B_y&+dBGh*v~yU-+-ulMa;b4xj_wa6pRv@X#9WhqnlsXp$K
z>x`&2pcU*&z<Z1^hdE*cI2pMe1u&mjnGs6#<IDFIJjIBdvTJrt3@(W<t7{f@H)mVP
zey2FbU{x;gsZ_|K^~>d?&EDk|)7j^-azXQCb;)<3c|Dr)tH;=Yky=q&VJpDuU?d2_
zeIxY+0aGzvjfV%H_9%rDWyv^z+cfbZIW{JzidO;1%$@qjL+Kb`|Lm>A7Xadk!Z7^$
z8<+ru-GjP&!p|XP*2;n8Mnj&WIz%v61#kjEAf6v0L9mcwZQS6oGijajqo03Z=~bf>
zI0;%s0;!V=ay2YDBgBsk^TE6e7W<;#1)V@z6GhLv;XmWIkJkc0;ib>lt3Z)Kj@@sr
zIYbV1vrLv9eem6B?n=PInVF>OuzZSL(U_NB-^YUK6`-}5PyNzGDT;{Lg$2-On8)M~
z!rh5*mBAV8D@naCC-SD)_kF-uulrd@A^Vn~&2f*P8NIZk?-k6Vqnfj6_CI(R%r|~L
zA14tOqka6#bmnr|ayUl5xrjj8K<Mh-gT7p%3;mQ)<5UUkt1lK}zyG={P&1rVE+oXo
zSsy81YxLrs<d=t0tN-HxqV4*#8#NIY{C&gF=GEQ~fTpfy#MypOG^E)*bOUUbFAKYe
z1X=szyrn;2{Vj(&X{G;UU)8xpFe^5ZFYPfG;pHL3^Dg%J<wC`x(>d4-(wp?FL>AaM
z^JT+JZ`U4`3~ONjGc1*e|D@v6{p<oCjsrPm=gP!DDHwEEU89lKgcpi3l+Dsh3;EVP
z>w1{pG&#{;FDN@}Qc4_*E6{tSyUx1*`;^LZo;DX+Hm4wJRl}|JO(ij8&88I(n%7P7
z@P(kYj7_aW)TmsQOnyr}L^Ry*kewv;t!zAn_3L;x9Ku|y(rm=&Xx?Nr!dY=}&SP}{
z6`eAd(&>|e`f!Je`baE=hpHp3j&0g0k*yl~iWKe?OsiqO9zLc4BCOTd$Topwc0a7i
z#!L1REHLZP=9AA%r<fFqA%dZF*qa=eKg^6!(Ax@@$YM>U<P=B*MeUa<Nt0CqxY7ha
z3Hl4-@#|<kP<C**CY=weBy#PpEYi%`ym2kZg=S5YYTyWU$F`D`$Ioo`45(pow7vKY
z^-KlQ2N}~H_&xFs+gYWi1B|UIEY)>ij(rhW{-6g`SAK2HrMC6g)%SPQTxpB?E3N<Z
zI3ckwhll=;NVlfY-)oI|n=d(xm*-zB##haL6PP49`V2}C*7a>{`0Ghx3LX{{3e)xx
z77x{?-C0(x0dPhjhdeJowXt(ap`65A7ZHP1*{nkf-B#-%=bBi)R3Ge+xh_U8PWWv4
zG}bp2iZ#(U)*b9bi7q(wi^mlHbU-nYI@<}qMOI!wP_)e~xGRl9*9S^2Lag75t3ut2
zW?j)nh0Gt^vfybA3~0g1rBc;NCy7(7D<>u6$dkD~`(q=rpVn1Me87kGkCA*EtH+~1
zV~ZMD(DoJiX?aeP*!stP7EGGWTQD)Gqv-h*8d)RsPfNWIVn|nV;()BS6J`pX7R*3q
zPB@gdwk!_VdAenlJUW{_@GyRzlx^uAYC1v!ZTp3-pOfeB3q~WW`%&a%UA>E=M$pdS
zu!Rn$*zIP9x6giBq%{sykS@)z_|L3H{Ui%=e|D2k`;O_uvo<!`zQ7)P39q0hj6cbj
z7AzJ94#M8-ps?#u`AKJNIC>`(DnIAR)XFmV;n?tR(0mhXJHZn0QSXs}o%$!XeQ|P=
zxTcMG(b^aC^Byd%)qQ!o*`bxPKW%mvV}tb2^sNM(pQcw+n8}TnZFcrv1nK1+2zluK
z?s;ULO<=*av}F=jjV1LLsM?>PHVNhVL}sca+%;_x)kbPC=gCEohJNzqSz3>3E7V}o
ziHnnGSKP~9tRaZz-IF((^F2{*WTwB~Lt3L&^A5!A*eXXYNLtBcCA#+W@a@{j3@6?n
z%QcvgXOR=mUDSFn5%TXmw)+srcD~jv0Gfs{#oSbL+La9YlA2CTFCNnMe3W&5v5bFh
zct0D2PN@8eU^1C;-=Vm6U1#2=V9Lm){d2Fbxgrrsh|u*evOZ3-k<aC0J_$?I98Zb)
z$*|YJHSe@^ICdcoZMRv8&)pIlMgJ#64q>t;L;$+4m!DltSUC%jH$npW1;O*0I*VWX
z@EbEAtwK3Xb5VFNzw37HYdti16vSL-wOo9T+Fm)aT8?Hu^YOScNo3Tb6e=Z3qV_;M
zO3o_!TXh_X<Vvg87y*^<0*cwHww;WR{(kwVN=N+x5f!84QT;{G7Yjx;-e-Z80eN|c
zwTh{OAi!i<8PO`Su8-B2oFQhV!Y=_8@o*8UA@eHWPM3KuPe>?XkF-#`@Ewwzib95j
z`iU0xX%hQi*%a-O(I!kOa`}k*+kqz^Uk(J$%{j6uxiZhna;YJViexwS=L)qTmx;S>
z)&m*T#l~s*qz}K<^Ol=L(v*~!M<f&%J4fwNNIn7!DO5RBEDC@~o>vL&Q0YDM;ICN;
zF5%@EaVwHFFYeejL<`Tm#55O$f)p6QyQDM9-Un~2`D&k+l8;)JUtbkuj96lyfrJtA
zr3xT25H7G{#gOZ6{*4lWR1y=ZW{wKl9h}&WS!UYWiQ02fHO)5C7E}c~1SG4N?T}uB
z5+R>JT$JVU5nu*cr4Z17<~v!>10A~7c#01%K9jzj$tw!xfzeJVc(Juh`Z9VEIo@Rj
z>&mmUjX!_+(!)?A`Ac2x{dR#=Gc{Suf1=0viLx(~$=;X0x%ymOn9I+2^Sc~*&*0F-
zG4H)~-x}jfxE#-TI%=Hj*!ht8GEJke@9Q~WiXx1vC+}xuiM&WSw^K9fhU&kO*^no?
zL&q&39%U|KRHur<ma>kTO3#-4#-V+L06^bu#<$Muo-zya<s=tX>W2L(7#S<JK6ESm
z7>k1*4kTi=3_Fk+(tO9omHf7UWgIk}<B?n5-7Fri)B@OSqMqW*Os<n8Sm<gU?$(kH
zWH_B5Bm(f*@LsTg29-tT_uKHHf`jo*=9GC8WZApHJs&>LS^gaQVrd#!#Smslo;FyW
z9S-;OrXk>ETMzF-m<@lh&O!(zBkq$jQrM{s%s1>(hP##TG4fJrJ=RxGNu-)T2sqV!
z!+PkjYCfQjeIe-Q`b0@=pq2`Ai|>y*Dl-}=A{a)9l5)`>x;A@+hRm7=D#gljv{e?c
zgy}n|&+^V~!*e$lHgss;u7%zxlRnrDNx4uRN%#WeJN(W-2LZ))PXe80V0tn{FFQn)
z&DpFyNQJqo9j&LU0a%}Xs`1Sr2@d~o0!3J(OQ=H0UyJ(b%&WU31`2mD>=J3GlTar~
zN%cVct03#luTj=F3a5R`1`M(v0$-Dz^eBX4HG~rVQ~iom0q3894#|tP%3UwdCp{8@
zZe`)p6S`s@_O_gc(HyOOd~aHcTP_a<?ucU7W#dvveYr)~$!!YFxaj}QM<SbaU)(B}
z9uyc4ZTb3E|C~O`yz6uRPImPp&U3npwD?H1h?Tq2H?KAa8~(@kbRBTdU%~+6HINm8
zW&%psl}&9Qt$LN^b6^E0<rKku?|eS|PTi-SG5d;dL3Z*)dI6U>0FDC&<G*jv16xdr
zAXJb-Z!|>mRn~U7lh-wlY|1*R09-`8g&ZDKH*^+-HL&QJ?$bGi@u)evdMiF4CxTgl
zJ%<9Lc=`cTyCx=`l*Z9}nEl848P3<d1t>v801o&AZ2H$j)7sMg@d2A}|3Uge?x-hp
z`8{=CE0+Ffccl7iPE%#R!Pj}wWLbWK@%<{G-S(Z7Y2WivcI(qj13=ycy;<X3BU|My
zew9vVum#aN(nAMzu<5;Q954y!`%n(8GAo2XAC8?8Kcs&+Iez)mCuTA7Z?Vm<$n8J1
zQ<aOvkG76(+RDq-sN+XgS<I?#<U;i&sg-|2m_&bgr+D5ny8uvKJ&P-Fp}3@XFu5S+
zaDqliBWTriw0TE}s#xk=w3`3=_Q>zan;57RR@dXWla*Y5b$CidJ{gA<%D!zL@A_3@
zp48-3Cv|(K&B@@f5V>d)i$dt~<7NMXo5c0d6`ISo&(^C!4}w^pk-e|?*mSqCGAsRf
zoEBMVTJ_|Q+3bHE^bV5J^B=z6S3i1Z!}mjYr{q^&?veDHgZqj6xX|g#2h-#npUDUJ
zSfj;6Xw)+R-P7_eM;wPW^-BQrWS{9+8cQg7*Q#X($#kk1;JJ@yA*@A8C1Asu&-DD*
zDN`5v{T0HNiMSv%WgkWxia@MLna~{^l0>T0UM5bV^!UBzk7|>HwVi54MWR6SxzX1Z
zosl`FVgbI_M2S?WO-O5*l$xp5`%<2#C?0t?#wpoIom@`^qRuf~cz3}`TJ=}xF7zdC
zM(=`ik}gM^8*VRuOYi25HW+^c)G9p?HYhr^v#-EKA`@&Fl*H@522G}>V~cJ8TPfpV
zAdehx$yx}2$(slUD@yk>DCQ}FU6a^Aj`lzO*w&E=uCfsc>4Co65|Sz;N|&PtWkR?p
z5Zv|Lg(v%+w+8gi!7jg^vSYwm%D*^8jMCU7eu2nPi3EDv$(nA6ggRxK;(UctiPL$r
z_<?jveN)`VP?FXrKN2)hh_z#9?7f!O4&XzErWKgr+OW;V<LZF4zBb#bX~8N3w2#er
z8H=O_<<o(&7h<2aJ;eF&wM4$Iep~f)!(Uh9R5I77T3E}rj-xKaeV5GS<MLzm+XH!4
ze)?;j>ji1OX#cXk9VgxY+Lt#sn={ovh|M^dRxhm^r&0U*RR5g)xA<$qY@5I=!SU@#
zlg9S4f)dt?t|ZG?=OX?bCUGj9=C_M`_O3<7XTe=k=i*BFqc5PC$oRCAq5EU~{zK15
zOct)hFyFm+18AIhKP-6ib|x6Acw01VaLBH!lIZkqa5!(P8uCIH-~mCR&|+>*J}$BN
zs&Ho6COO;!PZ|d@U&Gd>V4??aIYj&(B~1wI$}Z(U51XQ4Y4lQ>{}auAPksA%r=0wF
zmn%I8?%6TtN;Sb2DC2JaTuq?V*?cp^Pa@&Vv*i@GRO=|-Haea+&*(l0^wd!eRzH-q
z1SgQfWz9|F?AjsIm3neW**Q8{uOz;s*g7L@{6L<fI6zF*!=f`a6T1ne8kG8)ob3e_
z!XCmK5D-+sjh(r<a{O?&nNE(bY_MZTu_wv%{T4MVBgJ8;8yKufTv$whe=hChtV^SY
zD;3{0h9PicBBC+Fh(pMp_alV*UdgCMyE6JxhWjJKZTKLkBpF>rpYl^If)mCU3DtiD
zE24A*jvN#Sa-Zja&tB+XNLX>GH$3jORt&)F6kmy`Bz^_BJRXaE`@a5NYzON5JETL8
zmb|^qdP2UqkL3~l_03e>xGvL)*4AW=4(q@1J?#}|pFw}ak9QWO10RjE@V~^W{z02{
ze7diHZ$88}zg4f=2^IZCtG<#u<_h4N3OnJfQcjZ?)q6B~Ez+4<yR9$8SF&=ir^+&(
zMTfQ8@-M+RAWeLl-490$OK7kHqRLLQ70%G4OaFhJEYf?8JF61WP$+9)rQMjad3wNH
zQJ8Q50D*KOvWh__Y$=g5YSsn)?WF`)@xYkV2Td%#tNEzB<MM_}fJ~Y4Br0123z=jc
ztu+q-U5o|@jH=+uaj`M0`3QXHt$o4^u@dV!jNM=ZOB*u2;qf!vltAZ+KE0-WYjU<V
zF{Js?Qppbt&0t@`osRW19eVtpYGbKY!h;#*r({*)Q*K+0=i|l9DHMyaeMFSdFls~W
zm?j&MPGCVIZ(1l`p%X#DbX8uv$SfigVRXV<?HQs=@18NX9?9c!P&NGaCgV;GOa#J{
zDzA^yeKvdNW#j2S(i0_a_~10{{8uEYp94(qWfe#(DVwpB{A;{YI1VdLn4vy(FSXez
z>8o|TP?-xZT!nskgSt9x=>u(_Kw21nGI#3p+9qysuk)+vj+%@X&~HYbXmwDk?<8ji
zeM(CUE{H(+1GP1TMC9;0^RrLAtz;o#OKA+P#U7hU#T&Vgq)!J%teSOmk84Ukb(**j
z`e)|ex$Tp5K}54M<QJzbG^@`}ml_%Wklq?Nch|hV<6kln*(+1ozE{ZHZ?snaBU{yu
zLeojz0+-td=>7<Z+ti=|j_qs5aK<z8xVVL2v5l}UX6f}6bLI14|DjkvvDiPQ&48Y*
z>Czu}pSFMtrlVB|3o2V{n_vJeO6Pg_s{+<7!HOx+2FqX~*pz|^<B8O}kc^XR8Z$v^
ziOOSHzdTWE7?Xe%Sets9VG6;65h!=kE?YWQV%KkI8xBLl(%G&QDQP%eBjW@4O5x%7
zwEs{=g#`FHTio@}#Yu6Oc?#kD)=<`gZYJgz0c*zae%25d+Tg^*9dlwlt5A#>WwL5x
z2x+@O66u<CLqUXQXv(YH$?gVC>fLB+?Fb4fG}kJ`v7*TWY|`-DK`pC$K2<mZZs@H?
zPQxaZJghHB{VayX*)|S;H5C?4lGdeTORF<$70dtz2kKg{j^j&p$CmR5F#v8sI1G%{
zxS+ZU0Cv`3y=6!7SEj%@odPoa9Yb0s_w==ZP!+|>S@^ZcN0JJ<>)UN*6-M;{a=$f7
zcI&_pNduTbuV1RUoA~#w-Gb0>B1-X4fij>?&k9rnO%1feFf3=~$8aujY~rtGY3let
zJE;Y%rjnYE?|;-6-W$7NS1MlqeU<d=NJM($j^_9KslS-<pX&d_XRLjoQ-ycE#-ECP
z5t4t66ZUWRf3dwfaC$e`Mcf^AE?+k$Kgk2>?btJJYy=2w@cpyRmnUl#Eau9tK_8u{
zDW#O0gV@}0rINpJ42snwQ-S6Dq{|@C7h$Q~$w2QX!G+_{-4AK|dVu4QF2Kgq!sHm$
zD67}|Q=dab&0wKEig)_CGaaXK#hU@z=lF0Nz7d09(s8K!#~qEV?pMV<a@>83qGeL(
zqsn4l0{ABgPwfN3aB_IR64mdRgqlLxkB_ng`)CNBVYIE&qfZokivLvgQr))JGdU75
zn6UEHVu?O&P<>C(hCsD?VN9)1!X;lMegG)~(T!^ZNx^?GxTmo6d?UQ#Gr&7D)4Brg
zz9l8y_<>qWhJNA-KfUk~cEdbPtqoeAD2FtP2eF9Ja}iruFqdF>DPmnLXR8KV&LD@u
z;cBvKWRLQ&Wf@CMyQZdpokH({8|&@L{TU^$tVfiekkdCn8>Eu5#gBlD)vOYPR!5C>
z({-?ihX}R_On{l-P(Py}59G_DE7{nr*wWw;0k)vR-e5ZL&?3ExjH``_w1$juv}H`X
zMh-qD&qVz>V>GR(v8K>oUA^1O6xNGRBUWbBPfl1xlkS&1MhJPwuZzBgm^F0ljQ$bs
zB$`zl70pd?6n60s8}MzdTrg>N^S}G{MZRW~xd|KQdMDp5%7@%2A@5oOQYf_6eE+}7
zpOt+}_wpr-yP*eK@5H`<v3XB+1IM-wuGU->*(77V{!_v|wZ)c-4aXw?Jw%7YpQ}9;
zl7Tr1G|DdH|Mz)|8q-Gy`~epmFis-cwoxew!*9FnH8xyZ<-wZUmb&B&UbtWKMGenP
zs&t4{ao~|qlzEt@Jns;&_!v8DTf*qE@zMyK2I6c$CSky<JN9RUhxubxN`?qzC!$yP
zhAM?>Pe>vPiB{K=?^HLn;KoDR1(LEfR?`K4_G(<cYl%wVab?tspgX%m$y!DBsmQhj
zJbWBW1de$~)m#XUbzsjyer?@~Me6DERvLxUFlj2`2^Rc3)}g_b%2OWMlcjH#u@dT+
zOyklWEjA{K*Es;)zet%zB(jlk*K0h`BgREdok8G_{AJv9Y!beYDbXOwv`ocFrT`||
zvF4m(=zrnenkh}Md*<2n;E|+;rR1Fa5G)TS709K2;}55kk|E6NVN<e*t7dhxm6_Dk
zSF9nq!xywWGjK|1fyB$It!6KT@Asa*Z-33j*<kF|L=3&1>U@<Fb7L})Fs}RZR`pxN
z&&(G-6$8naMmaanvdYYGnV4<;rrqYq^E1o7Y)`xM{@z~X`L$y4qw~<wJ<K$l@oLog
zPE=x@GB=`xm1p<focqokXdm@LyYsXte_uiTZuUhjCA<=}S)^F)YbrHb6iU3@cC1mZ
zeTn4-G*r}2I`D8pJe#%h?XW+PdPSPXkadch8AF(!n?6PLlgy&>BuK%K54MjcXphzP
zDgl2|pdL{abBborLU`e`0P;v^5}TT-&JiTlmRX@6I!(px1YxCOrb__K(k}$ebjb&E
z>SSQD;fbJQLAxTD5SLms$eF2%AHC_h>+58RVdrvU5R#$nC=m0cv}c!}Q7KAe<X;e#
z_mNx5myIFeLcwW2E!W*)=?LLmeCK-Vi7-k~%&1K=pzh<jB)ZTEDHtiX;4eeg5tdix
z2K{z`b!8gKT{%}%@Wmr^oE<|UORJ~TrXUK36>${aoanz44d<!%q~`^?d(`b7XfPQ_
zan$ih<}z@6&TDYytEZC<rj9>1CWbvv{6bCtpG<i@-AC<EoschM*we)f>S)Ol0Z4l$
z50l4hT{ffuo)k`0yINq8#&Hmc1$G@fMqWUT=*PEE+_nc1hVK6a6T){OM8plE1`|E?
z-0VRCNk1SfPgJ{Xi^EKf(EVq+L!CPAQ%$x>D{tK9e5=0yql+y3rfAlfb@Be@hqOof
zjaBJhyRmQ*OBF5FvCG3HP50)nY13t`+4kR+^nHPimHhL&0ZCSFtfyJgWruUk-@xYI
zZ3iraP~H|Mgk-}vs;gBR&sP`6QH|DwCnvUVdX3y30Zi%><T6Ntf{K|3?S+Og!5FUh
z<gqYRa;?B?d$ngRiBoPHXFrCPU9S3+FZgdOE_3e%SNZwL{dO-qjygKtjxoSFRztMu
z1Lt5iTuO<p^eav$u1})M$eU|KWJ2wU89WJ@8Z7}~Cjq`GWE~ums+e}Ot<2QQYicgr
z4ZVuion)g+&~&`&S#@xhYF))JNi2~SG^UyF5QtbbS=zZ)iAe-U!I(lxneh?v-&eW#
zRYzJBLftoiR%lqlz%$H`0nfz`3u1hz79Gn#1g8w<t4Ox4nuA6}x`74t$Mpl@U%UlH
zN_xQ!As0H_2~&Tm2khm*fb?$k5hS(OlVD@>qqwY9F(4eQ@{Ac@#T$_6F{eCsLejdb
zXdHHS75XU}Ij|5IR>uyhr&b|XA+;hDQL(W_Kk00KC~qqt8h}WF^p1_a1v|kq%#|PX
zqE=PZC3R&Gk{>tlSW4VH$wZz8%N~O&C$0UfV@LjDCZ*J&O!ZO04WuF<kv+gsN`E<N
z-5T*ze<qczGyil!dj8{Wb4ik^i`%wD)%Tm)Z}_>5+4r7p^eYrh?oIDLHY0W1UQ~Y#
z`C=>VUbTJT(q`u}v~?rA|Bm&oymPnumu1IJa&j*bgG<-?KlgUq&S~v{tQTZI8tBOP
z>u@bcW#<@9DfNq)FEq})Mp;AfefE^R;xrMA*<~QsOY%eiejQTHgX!dQCvSzArXX~l
z8MqgMTpJQCFJd3)4*g2^##Stk`z5{qQ;2mxnvwiBK1T9Wi2wE=zDr8X`X}XvSy%B2
zKfmAr0N-5fhbxE#;<>7L=o=)f@-E{f=&-K$K@;FUSi}@%t-N$>4e3A<{-BY)y3f@)
zZUR$(ZImBewiW`$w=$(v%UM-G{UWfG`Zg10nZC4Y{8vi^Ev`(e<;N!BfD0J(U<t_2
zZnIJ%-we7d5#J9?;LkV(&nX}uQ0Pz6H9^(XvdIG)mRCiCY0_#bEqf6r4vlj*Z>rLs
zgTF-2BmAJBCBXsMfTy@zL5lRby#dT+tq+>kvOz`Z86=lM3)=8&bA{5lNT09q*C`iK
z2J+toLQVjeGgslcIT`h;%qgY;Uk^8&P9nKWXXYC_isyL5m(7^|<CReJkvpcafOa2R
ze_MN*j<WkT^%1Wnpin@X-5`OSHtX@{0$M)I^p``tAv`(TqsSmBF-=-0)9ny#+gGIj
z6fd6nJBeSjek*C8-TQcHXmaefZ*SI+eXZVRumWdt_s5F(zb?JS8ed$0;Y@9k@o6w>
z?V2w)d0+F5`K|V0{OILl$&(`syO{I4lLo6WBeWnI1vJGcf7w)x3(hJ2Zn9?-Bw-x?
z<(3Q!;DZ9<78d;BtcLCx$F|sGG2GZI_&*AX^+9Nj(9AXxuM@RC7!;DSx8Xb{b?tOF
zZT33%n&S@Z+vx8_f-QZYgWb7VCn>!5zFZJH{CIv6n%`vrQKIA2;{bT&0i+cDv=ZHr
z+2=6~Zw`odalj&w9ya{|XcF!6yPMQkk_wpTgpTZ-lKNmaWh!5qZuAf_C|VY>0u`0(
zVb``e8vG{fv;HTvfLep9dxyJe5?^D2;6EWO{3`*3n6+&?lPc{4%DF<?1M_5xIgzfP
ztTivdJgmC9az7klI~If;2_@zGaXkL!=~92l_w@>W@gP}MYcTXhExh{50pxN$<hWMf
zLS^5Z8IID@Z!@lFAF(qQ<>+Xy#Ep$C8y!nco#$_kIf#nyy#hIuqos}mH;Z}j>W@q4
zw1S|s%1?yS#%}#EUg0|IA%Ym4`SGB?wTizo5D>764Z)O^o^I+%1XGXyS(bFi-|ox@
zYO{nY1Z3p{d6aN^g)5PVw2t1)v4rmCJ=9l`7?9zizo`5?)2m-8cuEk;x8=g_vXV~0
zRuX?xIX`tR-d2hke!Ow6AdzwqKKR`9xzkzfciSI#{~Zw*!phO!rTi)3%U3yB6_0l(
z-yU{0MY%7%I#e~wWW0*{#Wug~^Zn-O%xia^Gns-vISSjjbwL%pJ$iN4E;kR-@N!k?
zYJ<Aof5T7f;pYr(=h($Xb11bql?=xE_Yd7a61<P;Z}EpSxkCLV(N|rTVgH0bTshYD
zH4i}l8F@^&^h00@k9gQa0usmJn(~+Jvr?z(ciJnjbMD#C#{Bnl?p}_+{x`cp{?q4n
zEd`rvy7w>bQ)m}@e$8bGb-iKp+8?diHocuSqH!u`y&xqx1gzo?z`pw(`~bWHh#)))
z8Zc}YzWXa-I=1x|02z>K{6D)mhRajg&4wotOtH;FfrNNQxhv4hj~1xvz6|Xc3gij*
z3$0+Sy9(|?pZ4Bd;5E#zoFrDS{#dKYGwb{FZ;iZ8Wl+QvEcFJ+I-d+VlF>uFz)cp#
znxS?j`3n38%T>!?2-XT4yGFB%6C?c)c*1UOggotHcwxa2(XgHh*NAy?0`S+jeQn=>
zj+FB96uFQ1S>N^&Ceum3@;q|XPZ&XX%hCiz+Y*s76oCtnWU)LvjmjBp{t1B$owslZ
zY#mQ80be6eK_9oQ+-xGf3&uWdj6=eekU<^39DwLnR`ekteMtHl08LFGqyObSB6MQ0
z{N;78`B4{YU{Ormu(O?O6O{f;tyGa#E1bQ6=E)4Ht*(K!u3C+`USYoF)ahrl;80z8
zqnNI$9~u7~+`b!Cm2|H7EPir&?KkQCN9^GDn<IgD%D=BA+ISWe(M2y-$agh8Wvh2d
z`R1Ao;`iIF&Bhyn6Gg84_LOhm;qdS$lD$LTJ#X@vFy}gIDGE->4?ZpcxWGTp-ftqe
za!(dOiOxlqbSrCI2%t6I-IA<^_i^Gd{R?LV&Yz|yK;d@$$}ovLhgd&U|K`Gf<o5pN
zvGl)Jvwy2n82_1m-c7MhyDPgp@W+=hzwq}#ubPR)eK;5_TyEX`H9nquzGu%V;wnz^
z;5deX&m9+qCEA^#h43ouIvJThJd7d5*NETIzh3)q1w-rpSn`D|d`2BNDyS(ef?2ks
zP;i+lm}ZmjbnVgUZ28n~?qSmFkGFeSxz0;}*q9bPo4dlR@oTlY*26!L8Rb8cKWDcL
z@(b3o{4=NwfKXH&aJL`wojQRi>7yA%QAu^*JdGov`|IydzvWeQshDIR8oh+c$W9c!
z+|7S<e5cX1dQ@*5dRFDb?U2s@nP+e?s3=r1-g@b6MQA*t3>!HWs;f9`EHoN9rK*}o
zpN|q!RozcZnU#;=;r;gZVKdKYV|oB0o`uI>CSa%9c$&GN5CsAnDg&)R9KtmX&M%1S
zsoz@1I+Tj|70)BH-4tP{?P(mSY*8!Aw5^?jY%C;f!<}%TOS-rco%v$(ODMU3T>6CC
z6I;HG_)NsG!)v|yaq5R4BtwG=7>_?Vn){ZhDTT(it4p-`Z+Kf~?wQZ%*^1Nq$swl_
z|3&BRw1e0FD;9@w%)bw?;{LDZL)zMSml?S;+gYay*Kdu#iRencWv1O~ty;|bV)-w>
zYwV(fect+1TE6kJ1SmftT-(Si4>NOhYn!>lQx7DUn%@|>()fSk#mF_`+$#o4cQd|l
z<sZQuLG&+N-HZ3}+U(U;*U(TG(-Z9c$n$<^8F`G?m$gf`(gW`!|It_f>a3TfNBF!e
z)=&LknOwX`+Fy1;-*p+8wozk;pZ+_~=U);%WKCl}`xE)>DEr-?q5m>RTuVOU4?||c
zQl7q{eF${Tfq`lkU70-P?KkT$*ShZR(<Ycf!Q<L$mMG;`yjX4az(bkn9-dTvzQ*)0
zwm)_(xHOS`H}UxHbDej~ud;IAYcBz`9s9*V3nsPI-OrDuh|xP+uu@m5ib&H@q4vX7
z#G<ur2z`P@5duz1OzPVPdT#=&dh%3Lrp|u3AE8!4Z;9$bY%LQ+dq-9gR%DUG?O|8j
z@rYwQGEnX;45l!kQ(FiF+RnxT;);J65}+px^b$=7Fv-?wa_^IE+0^uv6h}ea$GD?>
zAO)T%1Dx<u5D2X^$Io4s&8Q<|hX|)v;tA<_C)&*xF7wWsO$h=o5r(oyzQ$~PA_&1W
zu}e}?uHp%1etjHIK^Nv1kTUy1Oi{kSbRZ8Ll19xAWIp^Nc?wY!tMLv!B3e*@Iy0<2
zw))EE_bk)<m!oIP&Y~9`=xHf?vAfT)pF0mwzX`cwzn{JHG;0ZKvNkJqo$5>!erxkv
z%SR-mGwy#Boo6(geHg}#kXR9W1wkpbH#K8Ll@@KS+O$-wVk<$!9*tdeSk+chyS4Wo
zwYRFhN9{e{=RL=V9Ow8V&$$2Bbzi^hqIKop>bCF)ucI3A@tbpVudWl4BkJViT3I9S
zjQ@9(mL4*iV@B0g7Hw-r(yAiZ%dzZJn>3tPW|%D%pgCP`E|`&%8m;O9uutMG;EG4l
zrD~>;V)H-4@^WM<YmfS8h0U*Z_ReK>Wa^)IbxpT+Or?CVJVlR|s(4ke_Fr9lY{sP&
z!cR8Nd8|Gtud6)jJ3|v4hI)Xl<2x6~1uKge#>~am+~`8aRvawB0%Nm>U^_6n*lqel
zhI!y>v|P@|XMMb}l0?D|03pNaMzDB*4<PPD%FCSt(P%LVzeT%<YT#<fBKzuSDJ@c<
z;CWq_8jFOh@!^o2;Q*p1T%Hx<yIC`H+nhoqbMvMp`BO@d(q%6j2V86&8d|8y*Zv|A
z$JCtcGP{4LFw^m$^1PEi?V`_*&DXQ!V25>&+BbDJx@*ewtfAF&wB}>3$f8iAXzAwg
z6)@T+pRP%i-PVF<!T{HUgU*p?2dS%t`PeMJ4q-60{_<MWfKhogT)11vf&B9)1j{Xn
z9#vR5?*Ka~4NXo#z?*x|#UX|XrjND6ODk`ciG_x=jalU)JE052@)S~l<)CA)3VUq_
zmQJc|1lA858oMDxm<$CG{?0UI2%}eU%n-TCwTfOb0uh&oP$!fVnt|~pc_;13-gVW>
zjg`lcn#F}VO0priU9+sJOHfqSL^X!+dg0B`p1vRHJ}w^)W?%R<fw#W}4%w_QeR>`^
z{^oD2K7598YrVwLrN8aMS7?S)C%slhTHe^p=)utEvjX$!vx~bTeMcsrHvONxo};Q#
zm$}lHSV_~K2`;Iw$xie8Jb95l3FfAvMs3KV*fJG3B-iHy8f5-jF$_B_TsxRU{Vcb3
zDMSKF#<uC$j_v>~>jNi`Kbs|cMIG!4*DS@0F4p0huuPy=$jUM2oNMGBoyU)fDoQt=
zl7)=WmzJVtCt6O6AHKL}2(VTWE_R)NN&Aqob#r+XTw!^4fBC0%2ic9{PI+J=J3%=4
zmjt#Yk`a_TS|!?sDC_6h<hUle2Qo3<VJ1eENJ4C3q9hXNfdjxb)+m7M1tgjc%2TN=
z5qW!~S0iKI0P^qaADoGr&mxR~P#}ozhffJ(IN$FE>csKcLq$A*<a3RCwqy!GnI1a(
z8+$a`Ka5iKMnJyX>QWSQxa!y09h9XuI4z}B%)PI0o(!XW)|&J|<?`^ULdsUL_cgL&
z&$wy#_8dLs0<1CUMe3i$-IoM<aJ9JU`cf@MvAIp-AQD57U1y@$_gVKjZ@)i#<fA=4
z$fYn&1F{e!(!#G9S|*GA=0Z~Pd$ovonEPsS_2CM;3U%j8*Pk_pM<GaQ%Jn&0QLe02
zy$SRT9ki;z`Pv16M5r2iQgpKkg$A8>-iZh3f6LU%q70^|owi#mOe>=05|}g!-VmZV
zB)*Yf6$<frr!BQm1CB{Gi+{BjMpH=s^g+&NZQU3OJpBqBOQvjzbs^Pnsq(lbRc>w1
zW|FC~@?_qHP}-zBZQ5gjc)RbWvL%$$J8jQ(RX)Qb^+vBIR6#*xYQ~e00kvJKw7#sM
z7MXa=@Nfzkdfx0@=TV#-9KWmbyDQS`Y0<Qr%Hd|W6DR29A%8NPReiDO>D@Mb(%y(a
zyc!e=j3V3;!vG6LE4C`1r~$zwjC%Tx%&vTKi|AN;*d;Hc&{(@xEiL=mor$3G<(uan
zJ@G*m5j0NQCu!zPo%;EjlZfjS&6I1NUzb*q$u~MgocTAVn2}LUb<uXNxy+WZo(m<v
z(MBc__Jf5gRK45Ey_@$wmsVj!jCVI)!r$dhG)I;2j5<&a(M1o9*WerAT(YmaMd{L(
zAsnq)4qzWHFKhcDoS*oQo=U;wZ?|9^)*V`Wa_CH+-R&r{IOb#N9tdh_u?OC%8Z8*B
zcp%ICxQU3T!dWX$eV&a%CIPw7HvL%L1%VK!>zn=;7>YdgN?L8EQ4pdRZ^nkq)IXcf
zcL}g<>VjB#FP2r(+Xeu`_11#+6FDdq&Rv>nG44*3r7O(9*`~j<;?6zT^wv;9+A^Ry
z{gJ~lOH42Tj?K6L>xeFUGBs{OYWhKQL!TuiDQWWATZA?F3KsFo#)nwP21~s|C{9Rp
zWRPS@6v2#omo&zcVrou=QGIPMpp;r`&!iKar0R=ic&_~Wor`e1O<y*UVlWKS_W&Uk
zrs+U{OB5$Kr9=}#0B3;C&B4CDfS#nMB?dB*&ck&7WVfF=#)qX&%zu@RC3S1k4l>FS
z^IsZ^gu2}+JFuDRC3+dKrT#<Ix1psxwz}`M{Gy;pp?~u4v!=eC=zv^{OV3zdKZ%|b
z`>`!*Ui|DMpYHmF;p60tx`u_zE9v3mijQ^Qt}e}2dH-L`Ji0L5iOWAZG(C3C{nxT*
z>FxIO%Z{bJNJ%d-2PblLanQudNXhmpwMuHiF7tJqAJ_Yeadn_yP1m=!yZjj?WIuMT
zGO*RLsJ)|(m90TodB>&1HSjHbV}i?4+k;uayqU;;LWU}W<PL?2&z?&5{Tl%c{R2M<
z&k<?O#lli~K_|}2`q^PN=v7OUP5&qN5v$m{JIgc{U(@gFE^Sj03jvZ_LD<Tu!ry?5
ztwzKMxc*%YX8;2ZJfu#`lfnL1;1~E!?rwZ<p+@g!Zs?&?t9>Rkm)=8a)K9%)Zyd*7
zc^aM(0InneF=v#mlYP*|Sc6uHxX-q*xAv;lPm9TFPygIcZ^g_6e=`P!p&4}z!eLM9
zh=cBQ;Knp7OM-_8`j9v4e=s7AvQk(D=A_u-a8gsKm7>IZv3r9No{^NFKH!{qP`k>W
z)t@6VwIOmuSzJxc$lL0T6dzvY%U9#1AXZS97ElBtn_i3c771a3=|^sbh}g%^4el`#
z*$Y63fSfrNp>dBLU~0hxdiq4~l@S@5QsZHqUrzJ-`$A1c)Nx7N9tZZ2XvEl)xThc0
zAq3nJ=nz>Vj@xd01?65}Ph8)5qpK<Fofs8+))2Z$qYDd<VaNKkBBb-5ur$>j)J9MK
z$<&e*qo;SBX;?>ytyX@@?PR@^{JSo;7|bDApZjUgBGz=eMs#A*eO-2aIpfe`&#q$h
z;?BE&)NQfTpA_G?>@C%OaoG8x=wfxGS;Z)M^6S$}hT)$VWyb$F(LiFR-9nSjD(a+~
zZA*J>=0ic9N?HKHX~d{X%u?v)&$^?7@g$&sj#vU%wQ!xYq)z1cY{{jp<y>}T28P;o
z%r@aGOVojg7hs#u`3!3}Z8Z>b(zKuk(@wtP>kCiUUPh6+5FqZ{7WwBpx^YdNp>nvF
zc>Wjd7ESl{!x{lXn<^6e;;qIz6;+DQlw?j{GPPX)jn0uYlSUEK6n67NBiVt|coGeB
z&TZ8&0jNk(9D5#0;xBW1WrY7*$pmqnc36G!5j{L~!5X@M>^DLq7d@>NBPYfyXA7Dg
zm2@E|uOupRSu}(@0_6JUm+R)K&D8%mMIC5*u$PmcME5?iDQqnqzqM#^YfZA6H-7<^
z>+}#awTYzjd~FTa5Cmt5aE2L|Ff|Jl)NTkVupjV>_>kNayLgJeOFARxVED3ewT4%s
z67ut%T5!&sHCpde=TDn@LT*xbBOZ4HDuxjPWK<;e`&|RWesah@Q!()ze_`-~Y7Ifx
zeQ_TflE**hrp}}Ltx~H}*YszS7~=ALDV@%YTwmI_eCXDNR${}0fOkE_ZJ@Fxs;N1c
zr@=3d_-^NE_B(9nmg}v9{7t6JpWn#Q(d1KxIg*oSzl=$~^@fVt?`m-bYxgX2zE)bS
zdmyQ@C4VqHH970`siN*+;gdzm_D;PUYMSA~X=TUBx2Yp*O<W=I_Lhj^GnX!U?by1}
zNA7yhx11#v#$7E74@&ElL?+!k^{N7lSIiz>i2XU}bL_9d#x@`NH-<Z(5GeZu{`lob
z!1-n<c=PA6d8|Vdo>=g!m-ol*BeC^8omYpyP91?9s|nWb>8q_@rxOir?bp&W$C|}F
zqfCSt0s-j$lj}HUBsrb@Q4lWl2BG}!QquMMvo$yewUNqZ_*n$?nuw4)i%?M6L)yp2
zEO<+7risL?yzST>ed$Ru%&toM`EXKpE|bCu5w~K#FBhTz=K~>SR(wD7RQsXWkLi$n
z8*R`Q|D+9T5Y0X?QfCPXv8EXzY`H{eUu4?=BMyo3>#}p+;!*%W=ySMmTg)ARS1MmF
zDeMw;6OGT;_^#+73AY-#C^zC{YYW>{vZ11Hwe6&co-)^7<C$n)6nJBreZxt%ooX3H
zLglt(uDhLG0&p)F6Z7|05x-eHkBeN%AAq0bu$ueGYKdBYGLM@C!4oh8y6h6<FnbUk
zKJVq?gUC*?*A9E<zVeh#Y7)PvqAa05etWp6rVMexTHC84Hpy%iCgU5h2y<Yx;nxvW
z+qWfMZ`u#%6_px8zG64t_$*XLPz@AV&~v@FK+MDg0yAQOofc7y<xAq|)8%8<PhIS+
z{i@G&Fz7@A#(!F4=0er;BSc{2No*RyU{L#yWn%Cx5k<a{ZV!la{-Uh+`(xLNw3}`5
zlZF|lfT<UgC+x;MTa|9!n{WJ@4^EzBl>P*$Us-E|3JV?Ey6LsIJ*SklWAhH&Mu$&+
zeN5gIlO2DtcP+B%b=bfqJ2z$i{A$M}0}QA;__4c3K}(@OW4HWY*Zs07%L(s5*<u6Q
zmrZwo%LT~II+lz%OR}Ho*wRl1mA94gC?Ed=a5a>ZG)ha)=LpR8k@PDyVolAQ61YqY
z#`hN|xX>a(&JvdXZ}{qWTXN^sLw2u)<j>C+T#b`s>I>}uEI(Tm6=ZjJ%@YNTW5S5k
z#T;;jkJN4&J0hYencHE|%P@{efD%oRxI=)N>#tiPJ4F*D0YfxS)C<IM9UR;w&*aV!
zHm&rL+k^sx&=)7nBt(c2Rh4*7qgX+Z2cH5tRk3IP>wZ=aG;;eBK_kJl6OC~zCcl%5
zxQP?QQg1R$h|!M9B5nXl730F_lE@@g*ig{0PW>_VA)<zyA6d#+Tj4T3a|))g4*jx7
zvQK{tLT+aImrGW@&El+3P}flzN+xCG<XPVsBui>#VHX|)8vJ4{$Idun3fE5(T!$Sn
z`Gp%@&z;|oe;Q~?j$>BfSJHqPU+1Elo10OlN}C8Ha%4>=B{J1Q-%yr%3rofgAml^H
zq#^n^k9G`>nBPVuSf85cuRd<TSpy5V3dVM=u6OFhDAP)3(wgBX+K_@`_qm%_*|E42
z66qf>uKpq0GLJ{kuGF3?68-a0Dfwu0`_(#Tu*1S3V9N74P(k>r{NVle_PZ@dB|pDS
z_l7&nd+6MSTA(mae<_#Ku46|V-jMG&l%6o`ZTzvU$aZQ6@RhfpuiO<bUQM+u2^@G^
z_4mVZMe3<x?(wnq%3qVX+FXx36u`FM^L;J?RKVH{wam8|D?z6=fi!(YN+k97Sn=}K
zRAXDaYeu#MH%zb9!siMcyQNj`)$H<6Jw1IAt&xZxWrKti&|&r2acJAVBi=Zf!{2$m
zH6xkb(_%7yJc-lw+2rZ{sEZmPq1<S*Jk(hE@4mvo3nLL;orGEvJc=%jL99kaldUmV
znv!>C#cYL7_sO4MQ01AH?U=a-R2uc8Jbxm3VVP`C9OF3FqG)6ueal?V+{p|j8Arlx
z?Va;ZNJlk19<RQizx&pCZZ4@^J2+1#hvt>s{h$ilr8M1vi65vGgFHE@a4zRW3u_)7
zX)b;*xx0;*rU73^HP%2SGum(q6w^t)MQdI4UoSLLH_o-y>NmgEqdFs0u+gSyPjs1J
z)E;j<iGoq??tE`ai(%?vGkrXlmyrH;aM(l-cM+lVO3FAfZy|#YEZ;J+k^XOXB!c@r
zmWTt)O#~I#6X@>~{{HC+X<L>=l)Ph=@LQ&N5$R{Tj;_xb&3h}1Jse?t0Ne3AA{9&G
z_m`C&tKQFz{i*DFf0c#P`_qN#c$<~C*|EjunbpsXJ><b+0Ov;Wog_Hj9eKXT0cQM|
zC9fReB#v)eI-h=h+bZzqW!iZyBRuY<Rk--a|5M7<gnvtHxMjwsx2cH2)uR46UjKZ@
zWJXEo{n+1R?b%PAf9zt9=j`;@6?|1zCbN1;fSuhuzk{?YleWixO4sKq6XM7J@a%Rs
z++G@_m*gH;GL{5p9YdT5UV<<PsNKcEIKL`$Q~YAktEM~Um%ofk;3?!+Sh!=dUfB}`
zM$0p96-$5z)KQb<!;IX)Tl&qm(?dZ7MzWNGayqVrnVmEWTaJq&hWhGrV&I!@@wZJ|
z#MAIq!A}1YVl38l9Ne&i(5}4B7U`8q-{9|WHdusG4Ua^LVu-;DExnrGsl^=M0uL2R
zPccllD3?}T9zTR3H<h#Xn_bXZL73TP%_$`%&s*0`>PSAaThK6Oswo3Y6wiB?lrI?@
zdiXi|L^g136o#0QeXdBX=1(<-xT{y<!-^wLz7l^$M$i#u?@P98kZMVeYmBSa_m>j7
zKPoEx!-^b}BrPO~A>gK<<kq#(4U6F6Q-x)a()2@JL*Bei%bp3ZUN8^78Ad)eR8R;s
zx5z?1-nT$=WzdI_eM1Z+lX1#4?KR_vm_(N#+|CcChTiP>SukP7p8p+}9&X6LyP7zV
z<sI_=Bl{gTHc{3@ZFUZU_smi3^@0JdeWxWVjOmAV^Gg=rCEb%(_xq++B#(cl*A!hf
zU(Fb;oLeMs25#4%Q&kN#qCPAA)A4L5D?Y|+pW_`#w<;fQ?Y@Y%3;!|BcS@Y}_Teqv
z%KuG7eSgOkU(D$&9Zw89kJVfE-^<CZYYn%x8fd9Kz!O~j5l}*eqTE_$vR!+O7Ekfo
zQaHD}6<!D<E%Q&b>-$5-j5jWA0<tOi3Hy}nF#?IyWVv;uQ|1!`b-WD@E2g`aE_>>+
zPc<TDgOitIa`-W1QDz%19|2NZ%Jd0q3Qzl2P6|I8Tb81R<ntv!H@Y>*P5zo<BZ8Bl
zXU0-*)Z)22<c65TBb+i)GyQ!x6#zYs0rZVTg$HJVhj6nROWkb&GY~ZMnJ@>p*%N}D
zl?w;tg5u!_btVI*l+g&A`-yvQjx0A`+Qy56^!%~9t<~Vtn0qj|HAz~u!O%7*v2t%j
z?85o8?_tZuw3qpvh&QH`xSY6OCN!Wk3QADP&(u(~&Sn*iCn718a!;q#J%@(d>^&hA
zwi`lG?XDC5W5kZNU7V1>mSUJI6<)rxc0&L@<F@bAfTiVt%=Xl<xdm3BhThkI1%BR6
zH94v%nZ8aE{;}$B9x&*j_cic||JHEUv81}@XWH-cg9(EqydBNWUv7tSFIIFwXK6Aj
zmEJ5IFMY3x?(0m>_>^CT7=LyC*U0_&*C*=r5*5FDJFrBK(T*FXk<Gs5bZ<Vt84gJ=
zAhnYHedwJdaSnKLJ_m)4{W!fjSowS8nMgZ6r3t?TDPBxI%{3<Sx)hc<FS75*RS9M%
z3P(0EC@2c-i^q#<>E@V7k8oVleWWm*_pu2ULi0Z?d6%u;h6i0=xjKht6F>JZTGL`M
z(%R-HB;?e`CT^6C&FZ{-LvCtk7Hr`}#VheuLCDvbrwme#{T$5V&M5rzl!WO6k4R_J
z`ppIG6gRxxofF#_6uk(;l<$gntSES4H5~PJ?OHW!LK&+BhQl-GS}VDSA0^YpK*UJO
z%;p;%d-9vMJXle?lT(>&gsgJ3x?*So&;o_l;X7RqIbNb+gPX!$E4=)Qb-m@d$j)De
z!bKl2&N?nLNDX=Cy{S=>#q%=?v(x*D>uqfWV0$6>rF(ZV#8xLH`EhYDYYqp`np&*X
zii7~B%Yi9rT=IL+nTFO#++vNG4X>Ps7}CBzI)9m1yS_Je@ynyRXr2)@njfH%#;3SH
zxmJ*j;6DeyAbcIi#g4aoaNUU&kJB$K4~DN<yUZEyD9Jy@*jH|?>9ZInFH*s8hx9xo
zV~DwsxjWx6F*r?k`!b^Z%W1j!I{gk^eihpLfCbp<yesr~+<hjUa6Exs={bhA`w!dZ
z8&v7)r;;fJyFbFD7<3IlTu@YoR(EM`Irf^9vME>2?HlXF&IiWgPyJpk&Dwpo#K)dL
z#f<bs8i=-`8g6+Z`UpwBQw}zL;2Z(P_;5NaOH*?9<w#hQ(mc^x?=&vwmzm2Xp&%du
zHApaxD$h06@}M&r^eCksvk-+(#Bcnr<A7L5YAC;?i<H8>L%wd`!%{>ztstVj(hNwA
z(R3k{l;l*;cRbQYz+Y`}jag~Fnx(zGq7mY{jXgFXy4`nh4OX7vC}j^^yw>cTEhjyv
zUgIi*NkIZ%9ZSaX0lge(<xU>Uu?7K`+Hj^V$8dsadqar2c;{<)iM%!WJdP&yTX12R
zx;<f$oe&}njf|<>oW|6V585fZ1q)yV=eC<<aXGsWaa)-{A3;<jh5lzkRuIfIV$6j&
zh{0jyGl{Ye0kj+T`gU*-VlG0>nD0HJDTu^^>5Sa(9|7nrRW-U$W#czw`2iDO`IScM
zKy(7DEr^yyvW}{b&g07m4@kh9t85$(#~t?LP5tF0^n7l1v(4a0d{zRT`j^|GJr60%
zl;jPSS+-8^D(-}@8K~UCPp8YhaTv7U5&t3QV0AR26vrX#Anv?g?e=h1(EX~Y`^cg$
ze{KN9z3zvN^(j&Sgi03WKd;5Lspncs)TyPYc3rWDb0SBpTuQHsfCi`H#b?FDAVP%&
zo+f+)>DGjf*WpcQn~JoivOp^|#?SK9HSqD)F5e)bS8h3toDmC^2Ka#K@<76gpF`-D
zqCh9Kg`61)_pt}cI8Ql;SrwBy=ghql<4#z6v!8`Lz4eF{QTyZB<+L1bxT6+@&733p
ztHv(38}?{ofm|#O5?qb9)J!R*V@G-jr0v?ww!b0)yf2beTS{S9>*U7)5<4$HLJ5N!
zrV=Q^3N^?{DB!uYzsN1h$wH(?KdNix#b&5$-IBQP{ILLOOh>!^MRA5NLZFc_hK~8H
zvY@S&kf^g!02@L2yGcMs1#utCP$ziO?m?me0w3Iik--4WvaDliLHUWqoH}a`^N6EK
zLY@OJ!yLb}iTRkHD_Q++8Aa6afsM99lz{3-+MpnTgj>%bZjz^8R0)`a=D>(vV<yt@
zU^J1x%_-XEU*$k2LZy(qutlRjk^-$LpetCV>G)L5kln#1d%soR)~5iiQH$27bX3b-
zI@LeR(cY*`pa*q+CqPx&>hMb)OBVBZwE|Pu-eSe=hkuFJ4FZm@^A1jAKDD<^{W>^<
zcwSp?dsYRo9ZM;#C+pA5l%#uex!)W48w5;O+V(qTY)kusU(Jh_>&~i`R8FawX6A{A
z6=;KRUJWgZwt`=^&eHO9;#)f#__VHoKZqexuq04;eEqnD80rzCi-idk^vK_}UneVL
zP8ER4ibUjWc{|ux#t;ZPA?Z{#;Npf8Dpv%&5jWOxwJ@F~Kb*EL2=71r^5u61Rv~ki
z17xG5y1}^G`}&YD+rNBboks{xJs63QIv0KA{cg870#F>Wk34>YYe6;kcraM96>^Uf
zOcCu>etG9t1ASnrRt&3L+k7x1BAJpZRjuQJ2f!7T%BX)PV!r#85{WL=Y-Q!)zXu^{
zy<>$B{;n)X;<{7)%JtbWQ<S@Rbr;o#6%*^!-NYG0gmpMNdodHk-Zn}pwHwK15?3W8
z+T<NM{~2^6BN4}OKT4w4s+SSzPXI5LSfkM>5DW!20ne@Z@5CbodATi@=rmNtzc1`^
zp&O$%S0WI1bC7c156z3rL3m6=(%jEn1;*qB2I7o4F{{p8g7w}(uGGK6Q}ov%z0LXt
zU-`umhEjJPyS?J~#N6_HWwWu?oUpjSdz&dK!%|<F*WC31ztnjP!~>w)7>S1-cJ38k
zx}TKV-c=fZ{u=+HXUad^Jdq9krm*8rzgk+2ozjlLPE#K0mV3>%;caEW6g};{xtg*M
z6ds#$S0bh5+(QOZ-uWtuW4~vI`uI{rv;%d?tGxfEwKHXb=jJ2xnOga*C~Th0FR6-K
zg_`@!wv}p1?uBhI@PS?0y%T%W&<f#8WiAmb7S+0Z#E8sQ?sZsyY$3l80W2KA)b8^@
zh$0Z_!J$uXb7M(Q!^rTtf&~zG0yTH^y)fb=NN?eRif$KVg7E$Xu@9CqsAZLpc|@*;
z6q*Jj&{?2PA>gti!gZoY+9OH*9+cWNqv<|IKa5QXVOj#K`4duvgo#9tMbj`Jk+eaY
za?)N4YdPF|i3lvoCMC8!6_fIDf`HSZomTIju7}h=C{YRemdZSTMBLWY)Yt^c>DX`X
zrG>RhFv$sh!U2+7R~+w`y7(T@{VIeu@d()1o?mN&DMfbo*WKuQt%~-cpChr{UmZ30
zY0Nbk2}q!3r){3@qoa_@Mr=nUAMZdn91=qlpuc#{|My}2d>!&-BcZeu(QSG*<~yvM
zI_zwB<OK{dx~79`-Pt82Lyy#whbg-I@8rrUn7;|&_Zo2^v8#`cxiT2yd2<=t^~mk}
z@JY(2pWl3)3fDEOjLNu_j=e0ZD(3g=t_pjPENg1!iaUTIT40BC-PKRdpG_i#fb;DT
z@w?88E3<plDOHq9BA)lC^MQuAH{#-lq9ya0?LA~b7RoN)4t4WkKg$}2<8Ge1WOHKs
zeM`$ugt+67B#Q@)WeS=f(2>gy!>mJD%NU+q?7F0Iaq&+e*!R?)7o)f09$N0wC;-f%
z1OakN_!5rW$^#}!DN=xiFv=}GA+2_F{%A@D|1FN*%{7KQwox!o*zi#L*{ChzBEE&)
zhL}C@%F--TVL|pF)v+z%JfXsy*@DSgu7M-UysC_H))e<mOIX^icY<Hu<yN)LrO&4E
z6n2Q8H&^I}$m&jjPRZRKARt7X-SM!di+NB#L_Lgie)JNq5Y_aIHHcSIJL%nfYeJ-0
zpAy0vERkY+nb;$Qvs<P{gSsea(=<cZNgSgINv0FYF^-y~FoBmQwzi<j-_6<8Z}NUL
zt26?V;}dR7<9MdlT(khkT{kSpI;*4;IEX-*62FF+jqORwaWq#JV%&6zT9h*pk}eVR
z)XhH3!R<?`Co_cz_6KX`i9kj_)>CXjVkbG2F2g4V3w&E2P8qjOKlL(Bub>|K{AH)W
zqPlEnf&Hqm@2JWruqV+n`mj=A^r+B2cDi|ecK>>6%C8k#ShaTY@_@rJuUwO1*gEB$
zvtT2Ogb7H)6l2--;Vo7%v8V2sCC){jYvy(D&puh5)C(DNox}7V<(?MdhW=dewbcwk
zI%(aPa`rx6Cd~^IHWxZw6c^*Vl2-bS4L*iEYqTtHc;Fx*2((?8^YzCR^EmdXH!o?9
zN0?Y;pK%c`Xn^_F%;|*WK7ExJ`yA#5|A;RPJQui9bkEVhuc{B8r$TF>-co3gQIiy7
zc})hFGF*ZcncTNZ>=eg8qeftIVs!X%L@hnh&~8(CXzv#So85!5<w_Pwrub$y2u?jU
zOuhSM)UHYomfKyU@kW&63v<aMw1{U2iHcSPLog9oJ|jGp``+u!qf-LuUT+H+XoF{z
z%@)iwPa0?MYmkYA#&J15(G5jL5^x)ln^KAs@#20JRPajcGg7S$1tlL@_8JO`(F|zd
zPYt8!g2yDAdl=iQ90<LCgPWT!IKUgtBMf?%+TUkXUnw{aTF~ENVG+EmXdtC*fO(vI
zSgyYe{KTN!lA?wpN%7y~H(q3UNqUF1`<sZJhj&g`?C}H&DX!EsCwismPCfP2D%{_K
zySU5~2OU?KRyKGYU6Zci^W8tK2GHUL*1TNuR@oyhE8^JWIM&<iICP(~y2Sa7ypCJ^
ztYjOm_=RnWHav<wiNhK^^zJn7$DU0iICszRRckb!o#z_lrEzf$N9cbiLc}fXcE;6f
z+cUMqi++W`<=Qg%iCHnPZO6GZtXW44rgv;ki(MXEr07_tMnVBR>oY+|X=sa2Lb5?C
zX%m-M?oVuoiiZR)ct!OY5IVHYmH_J(!;E_W*blbGI+hYbP+b)3P*Y`O@3%D=5B)a8
zPqUtrhUueSewi9U*4(XBI@<s~-I&J8Pq==<M2qI;4(X{XF&fbGj8z?An+!Ass$Zhw
zJkuXA*lSL0rfVX32y+6fhw(~`K*ub|?cR*;ayjkt<2bX2q(YgPm}T$6I9Y|-$H_!q
zzteah6Zk5pi*^kPSEJwr3AAQy(asT*QmI8$azi!|q);REC<zLi$J~%>MRiM_OafkX
z(mIxp2!QW`F<km$5d}GfceLJ6JxKdktX7YXC8O6fn88?fmy=Fm3<<zkHPb6vmdZ?;
zX}<fqj^@F4qh2Ei=g=Dy=#5HrS6BQ{*ZjV~e7AcH>nbW=B<k_QSfhUEk$FNi=iBn-
z54+4?g}WkWZ$FqY#dPnCytwG@{{vnh^qBhlyzKawWpU9(sZv^xn}1>7Xwejh%9i)w
z&WW0LtKVOEex1b@_AugEB=rWg1y#_`=<QNJW5veai1O3-o)Gcuhfc-)D9I9KQTU}5
z?(&vunw9PP+vzToZA(V%VO<x9=yxMh#K-W|)0B(Yf<UcU^@FG^?WxLkTu|Zthr0d{
zme(+0*<{kK;zo2lod)DSab|GL`(`;JI;4;~QVm}w=D2{1|B7Woe5@CH>Tr+z8wr3)
zdQ93LN<GY~iiP7H0U5BRN(<Hj<x=<l^Aa|Kjm1`^hW8uA?9%IRJ|T<YZg$G;HQI8i
zQ29efJ`DAcqC$~CctY*M%`n(X+=o}Fw=^ET-&okiP~m?fY}7^&D6~{OQqldZ)>1Sd
zpX?gw+k}KLtOc1z-P~NAO}5%8ZfO1SFpJbQPd(w*4nLCE3oES;*M90qs8C52q5}#F
zpDPb#{>dFtnp*nz{?CFQHv70L0z$2~w%EoJ^`Eq*Eyppc!D7D+>Unq&ui*IHpfpE|
zpKT)07K-mrj&BL(wO|^`U!AN^VBTtTf2U9}ml850LVsiy_(U(F!ebcVRk{BMJ$e?u
zLGf8yGJCX)TW=+#G~X>bv4P_48MorGA22raG{mx>@BlW{h|(8_-M*>!6vr}YB^7NS
z>)4sLzfUJ^`so$^JFgRd;3GV8Rp@gvP2qPX^LNv0o_GtPytOi=h1rENEvU<m%lu!N
zYqakZw8ebruy4B-?YIc)$Y{gMO}c)@aU#TM<~71~a%{uReh)6GrmxZC??3WU&D`X&
zU7WJcd#9jN)ik1$bGmPTS^4h?gWPUE{h-<ra6(WRUJhnzr@4LCx|T{spN`yZRvHE)
zm%$fu-sZDMP*msn=l=ZswlY4r2M6JEKBSe4HZ`ng4w^I=(jbf0Uyvt41*F@hMf596
z*n?t<=iuHW{bb7gaoIGmg;4D*{fg6X=f$7543(K_n5$1SLivAo;c!&dpP^t%AFn2Q
z-5wR$w%G;TAppC1f#(~bA+&`fmmb+_V<+ImR5dbcJ0Kw6ZX<9j-jb3qp&8h|=(cT)
zPY8RKNs1tn9L&nQv-v$V!t3@u6UO*6>vzErhl=!-u7ug-U>RyzDB)QOt&X*bOZS12
zs7L<;0p&!gJ~idg%>mSXucUN(0VQ7Z0N<R;0!X7lmm;sZq|%VRSNZxM$Fk6@FzKoX
zlI~e0oJ=uicO>R7CTM0+x3A+A0~`jsYIGjVJ`EV-5FV4ss4HsuUyIz{^m|q~%UgB$
zr$}9C=gyj!A5G)nfy^9GW-~$a^M8U_97kAe$7dizUj^q^vW%cQmjsIJ$uXDm%JiV1
zKc|vrSRR?JD(wt5*cl-^1PTa>->I{k_GuD`$nf#a$Xjw7-uMJ2i8DeC^R|(%gP96(
z8<KZUMJYi|4bLy#QQB)4iCb7vr_AI@gRGDTszL2zF*ej%s=-TCL;qJf2h{KAm#E7}
z|9pF}400f&8ewe)Phl`?{8}NDbLt=(KKtFPOeUT&&s6QBCWJqwQ@uMSOy?=AOYHRY
zk8T!P%!TM)5H`iMTrek+IQ5x$lzpg@*~k1-FpUPI_v6mu;lVZ%LdXMBl7VI{spMNb
z)(-!1H@fuBkWkSaI(aG{T<BXm-Z+j0h-j*5o(Cx`h_XZ?Z(F@BMKQq<bgO<zHwFt_
zh2tx1T1hjx6!ipB%q7U;u+q>7LII&!*ZL9y`dvpXH6vobhxL?F$`$!_yZ9H+yMXIT
zvwxYR<><j&BJAg_a^MY%ZkvqH`%dzNDfH#@W^TPz)Cb`xDJ#Z}GG*h6TPYt;X9rUI
z)jmg3m#9C9Efv5ZU^%D*mW!vqC#PSm*PrWE5gIR@7tXM;p8Djj&S=iKL?2Z%Y-x}D
z<?@m;QZhO9(SAa$O>K3gP3d#zP3Ld|$FHe<HC(>1XlwYTy!c`No=qT;G;K>`yh=OZ
zy7z1O&00gya|A+IN-M_DNLCKIeR0RA78~waMU7ihhW>8^e|Uudf2@PuK4$1Hdc@rD
zB6yh?37P?rA8t~%^>A{abQlzxL)bi>i~NGHYATWmY$Y9}g+H$(Dh#8WjH2gI+8t%3
z>4X4fXGSBPw<BDXMC}_xw5$ojRq{kKl4!Potcp~424yxhBl0t`F3;GgY(os{%6?BX
zoRS*~K3hSBV2QssJ@TNZxBke3-BXc`h03H^{APk~dBhAPM7Y}}HqLiY#M2+db>hm_
z9C2(mY41e4MUFZRVYkxanQiU{{}L<XPqQ?MDUyW*`R2!{(u0m3$Ep2jg_tdpm<Er*
zN6pte=Yl1e4>3V|tyl;L$PmV=*a`dt#J3)(d{emeY;If3mAms*Bd<>ytt*(D&hlEK
zB6G49w{pMvcZ#N20p*cpN>5>@w8BBnz#6r>T|;EdEQkEL-|Is;o0Oq<Iy>Ss<FCvL
zmkZ1<NG_blxBq!-iqzP+{LTps^PPDza)sCEf4cbdf$x$rQ0lF5rLOYbSJ6gxMTJ4-
za6QvDs&_fG6;VvAg&trzN0r*Gx$kB5Yh7IGwoyFe+^uVkJMa8PDim~+5_I#3Wg&=G
zk@^#yMkogHt5ywf&37$6|B~)z1x75jh{HtKGigS~U>1m<w?V%MLmr6yMBAn2d(aX(
zItzrHtLei8KuoDn({%30CLH8>GmTCHO9#E4SQ7fZSs;XOU_zjlwUCkysln0(^VFm&
z-zOwt{*<{v2DXVc;(1O$xDd`sVFn+q9DL`YZ=5=iZty8TZLAHB>Dy&FLqt?J$$_8o
zJw$V7n{}d5Z=tnG@^Ep@mKS2|M5aRfZ=!nFR2L?CwK69RPNFz?dyVAODCGx%X<FhI
zx)Zw1J^TRn`c}({N^*p7NAWRIlByY-GEh7RhNP~n<;H8ehtNKtD7N*RXA|qttiK&<
zf)LD8|FwYWmDdh~(241)3*sB4SnyM5Crl;oyAE=cWZntK^H{Pda~+2+Ya<ah3VB)p
zt+3?mF6chenv$^dcI*XPqkR6v&hym2WiL~5{e#a=JV|=+ysdo09Ef(L#=n$wcv!*U
zw^1}_7gy7Jb?33)!_tFoYoL8bf3!tuJa~wwVWa8d<%P=n?mVFW)2M94mNW&%P@mb^
zc2anRU5ks;R|juJ9M)SliP9k{;kx#iKH8W#Au&%ILQx329sv&s`kgY7O|ETQDpWMd
z(Y?A^HK({B1W!V+fV9<+YJz+TH)LS(4DuwF<~nMMkbavv@wJIbdf%gi&^#`ZDAaV-
zPXy#>ZS2q_hI5_$NmK6YDTim3;HO}tER9v9;+9I47xB?rqub>Soh0lWuy06Kj~C)x
zWF;g4UgHtZm|Hp`hFH>`+>`%}Ul7u&cYd*I;L%3mNwXwJ4i0Xom)$Y3HZGQjcd6Xc
zY9y)(Vk+$=u~Iue_K@x)Bj@IZoT-5$DSrU5WMeKp6Y>(@yfF{wa0n?C5P>AmSJR@w
z!T&KH&;T8jZ~YQE$Wj;FxHXl{idDZB#&N-|_2~u}<Sq@~wwwgdC-9J)z(27TKF>28
zuzy{-o{c{E63^J9N@bF>{Z+sJOHC7gDzvIO(ki4K!_Hb(H@E9zi@LG)(|sa7^T_p>
zLpv7m-klw`w@d9&=R@XKPpY=MX9m?d1UKBgYdc(;pjJl%>>|qU^Xg=6(0rhVrP~}A
zwa&?}MC8>9z7dyMs+t&BT~tqxrMgmowKi-W9*Zeyq*Pwuw7^@NyR|fCCAGe7X@yD-
z2K5LUvaGmkzDqXfwlL(0<2t?FW?dY(96@;bvL}}N?hw1o+v=9G;4a)Yxq6CDD=2g#
zD>Kv%p2a9esD`uFfFUV<1Qqv(<9f9sh+}$|UY2517H&7nM$DO?Vs5une3P?p4hPhu
z7}yJQrNP<gIQ10RAlKew{8?+z)McA-xp^s7s_opIL-dOwdN*vaBIq<fl3k8H{9Rhe
zyftj&qo@gl?meG+IZr$wB@yTby8zm8Fd2x$6GcEW1agREXYF7>yITH+*OzDTu&7}s
zMtx|4A;}OeF}l>x!GeiA63Y@|UnGg5I9Q1~jvF?|6iSKt>Kk?Q<OWVZEAqY#i7@70
zE;9}y!(xSd(_6@;<XRvrj{5a0OBu`pN)qOt9Fqo;JVW*mQlsqdfwmlfN(`ObVtJ-^
zhV(nCs<x)gXS$X2`mYtG_Uk5cIe8ZABRQ@uFblC=i(U*FrLwuHJ4Lnp<G#Lyn_K=r
z^WBb&SABoXK5_pu+cNVn^0->~&t^sZ)Kk0l>EAorBQsA;POv%uyE6*3_TVqz37Z!^
z?zSjfm<EbRAzPhYA)89p2hB{QO_f@dN@}i}vd5{bKmhk5c@P)LP7tDPQ!G|G$64+v
zZ#!svGf>qDFb;&ZnZ=OhjjPs~3b-rluRv1u)|npO(Z1EJi;kwJkSo}^_y@5?kpi5F
z{zlsnL?elqBe=^<KM~s0B|E4=*9uM6rhJ+@r}}*5aTpvx)dzMWV+I^>NDXNf?spHU
z1mA}NO^CGM5N>vLtV$>*ehr3_n$!T3emXBMW6nPQ{SXeJa$@+4-nS3sHkFh|o{FL5
z=E~<Z$|>F0kRppdHqdC+%zFV$wFHg@L<@M^09O~|r|~S(5Sp9g)=!!AID4?FX~A27
zxtDV59)!?*vYLpTUq33aT%S;;Y3%jKbC|R>p`ILy&uc;#+8q=U^snRDn$A??WtE$K
z<j7tYA5-Z2J^**a=2Rj!;`SnUv>RvilE+z=zPyHS<oZ22JR@}K_aCbo?(p6(i@ofU
z04AG&p!DdT2J$g5t7>TlGI3mZ+Ba8}e6F}1JM-d2PrAgkotdjm;b^(}w=_Rrq1g{r
z5-D}|f!l`<)o1?Uk1LbMHpfi1or`_gC$qk#RcF6wS#kV#6aT9f`i6W<e~MOJ0W#;q
zv87EJAVQ9z43N1CI(}RpR1H*r7^p|7pYD>YIp>K6B7p2-jV9bilVtFBfBp5CpVeI4
zZ;x}L=R?FdJ!hh9%9Po}T=8f&P8M432-}wMs5nBa>Xs+6x-SV>_Jd*x$g@csE`!&2
zHPDZ1RRyUQkePEQ_oAAJ$Z^wMwCke-d}u|Zr3m`J`?uFZ_jO&!P*p4%#RSSr>i(I$
zdPHcD;~Y4<pB#U+-I|MGC*o6N2ZgHY?+X2{cqI3TRb#G`i4_u1g2-TxxaX0D?6v7_
zIXNB3tfnP#eC9=O5mxv0jXeamwjmUZi@ve`DA_~=$5AJpM&FW%MpxI#HmQAEdw(go
zB~<5J%lSo8BQk+C{|Bw$ui+TMdLwQwQR_FVS@*K|_ZjB7aT-xLPT|bYD8}{N=jTY3
zh1Hh*E+S6GJVkjkNx>m|%kuSX$LME+@AB<_jCD-CimIrSn!28H?AXly6v*i0Irz6Q
z`uHnw*NOBpaGq#7w*D{TlE>cg1uRiV+Ig9@c^G%GD8&CtdieV%aHGC%Psc|eA5JCZ
zH%N^KPWGWQg!f)Iygjk*0`l=0MoLM)ChE>!H?{4~4>JPF?HhT@IUi-^HR|FCYoL-X
z?i)AN_!|MPi+k5<_WIH$OpD+88V-6~em%6*z&L_X4lcf+;LX>*D?Kg&A8U6xZi`UD
zb7HTvE-p3ilO0pD?^%x^5FxPy++Y*&46=~5Y(=uTCPo+y%|IxR7lf1XZzH*0iLf|P
zOT=wW%j?o64b&oBp(hgh@BhcHE#0Y`Pb60VF`!xH&bu={g7<Y;MLp!1Q{zz<Yrg$q
zs?sbHQtr0jMuN6Jqp%&K$`j1uvQK@0JmeOV-@biD@w@tb#bK?x0=>)?<EW2(z4)H*
ze~t}>BTYYZ#b{!i#3vF)lU(=u?3uo7yYZ!G!p`#`^KLD<2*C;ayK2dWcC~Xg`>?&m
zY|`FeQ6NwW2n9FTlP=bZz>2;x85EIT?R>a^!)x@+P!Cvt&EoQ*eJ|P6Y^MoB%0BjV
zEAU0uK6lMtkMcQ??vnYCuwAI@Rr#xU@hI}O%KgJy@u{nJ{o#WXkJJj;8oqJ&dxd9d
z3hFH?BFq=heEt}h@YFj@xn1@xJo5VbU^=w?%Vq7Ao@nRK^k3g*E@x)Omd?%JZC3a`
zTy9OVvvAS#XpknucsR`S<ofPHQxq|ZTREtIsD&#I3W=22MD}n+x?<wvf(aTDIZ_om
zmdnQ;yZ@S?Z4KQSyLFkWFMpX2snd<9nPcg{iBt}!HsjXDoH>Een3268@C%C5RE;Af
zCXT(S!H1f@jktX|f*uI5t9MfQb~I)wt+%2i7U86K^ocT4cL=1bA69xDl(~4Z1^#F&
zi)nf#oQ$&to()HTbIHO8AXJ^?C~|=ASRO{YyhhJbP3Y_4AG6EI9L&_$hJcp>r_YH&
zIorS@57ch>aMsyW-dhTCv5P+@GmQ}spKS3*X43f2b-yHlS`)zt^)U&yLTGF;<FK4#
zC^gjS579K2`d~hPGBu;Mc~cRM0L6!P!KGy$@&Ipb<1m+R03GnYNpFq2^p40=lYdcs
zav`pAG83oDGZ9Y$2g%>OpG(Ebb*MbvdGjqJV+$e}DrX-9aQY+T5Mndy`D6j_F@&0U
zEYPY-#W@$66fHZ)V<=yhd6tciUXCAospc#ba@Ue^!^1Oo+B565Y{-yG?D2)(-khJB
z^y=12B|Gn;<*KP?Reh3fS>l`_s6bMT2DQUfcFq2yM6V>h$)^DPV&&4jEc*D@`=9we
z`{q||RfKHr+oI?EW7~Mg@uykJ<TW>ppnJ!*Q`xAfN%#L7btmH2D7+L&y>5~2dNViT
zC$jomsr_XL2^S{zVt`E8r3dgeb03Z8LGL(ahQ85_K%mPR^FNo~qv(P-!Wy5onl}8Y
zxAR_gO^JdMgm-`^vI0A@NpGiSYn3CMkuR<Ck{Dd}z#lo1*Tj-b7Pe2$qJ_^+2MWcW
z+)brGpMaa@KVsQ|rreaC<p<0EZi`*(F^LsxQh7LQtdms{bk`pJHI{p}DadKtDycS7
z+y(Edc~2Zi8cc?HQ42GB1jlHmB{CB#59IZHIC)E9i^3ZCVN?Afr@AYzeCadN{f!>H
zbcDqaD3`m_2fqQi;(Mzhp0=9&NI~7qpYMq<ZHji37OBy)iPSRu8SVqsYui6^jmj6v
z=ODy?Noh9ZqO<VonpEjRjX`|YA?`Rvl&fhjZTd5m{OkjIkG1Lhb4rcgVH8u+^9Op(
zO$v{{ekPlXz;Z)2L=z@`#qe&_`EqLaxRXGsyD|Jt-uCI|19E0BVE-=E1N4bHVtdGB
zRU}8;{R>W>d`C9qa(F+id6d54c|A)iblSiB(<-LgW3@8>m_1<TT7T5^;)7LX&Elnh
zT5{FSfm>(?#!zfy7*~>kx{YuSI-IcdX@+XYmJWLZ)?3lW<&~bupK;rjzfg*k=VL49
zuey&+N<Qb#H{o_FxShG=V%W8xnusr3Qr93KZ2o-XT}c2`ROI`r`YR@4Srll)l@gf`
zbuj~FB~1_8NSivLSOSk-H)4G5{3I7Alz;J?js1SMpOAVL+xPAj2P<z!F)dxQM)hyP
z)zn+N?>1^!g>8wm66V6RZ{Cu_D>>24TrJ@2&a0_J%wQ`A`*Yfs39blj|6IqsUXuAJ
z>vvqm!hQD`HT|sR?%)a<oO|*)1NJRW$i_)jUAxtccT)#OaTL{`B|c=Ppo@6%osH3t
zRu712logSVr1-faFPJOm{VS&dIz<K|5VYK-?xgMGeU4#m{XT@~KB^oYP2;H-Gv}d;
zP$nYQgIPxi{z|7m9fBINc~QZoK=!Vjc!YVpzN46FLvAsWD99Y!A3>Ep(<^@_UR2me
zUhU=IO-@9_=j1rRXZMvYB>2ViyEAp!)jrdRP{-8OM4f;x(svd8RHD_bGkU=j&$B}I
zHH1mGxp=Gz*NSh21}@buhVkr%k`_rT^4KHr_nmu3+I(gYI9coWg2ht;WmfWvQ07-N
zarqV0_0LzcjCVG?m;0`b|807Y)`tn6gm*uj9bc-Qad!CESJ*u&(k(5&Sc4n92|ZMu
zvK?9sU)ob){8an-u-xL0o$t<dH^s5^hx&?{k4nH$T_@UeG*Ma97NQbbJ;S=QH|+!H
z`Co(wtJ{Cro(%<$ts2x+y#r7U9slfz)A21(|GVO_v!3C-mUKL|@7=p=CnZe{(d@_e
zIoGU(>1KcD>0t7}UHj?{2`sA!Ij3%4bro-%DOcdpZ5C$64B<X<om%kIq_b@O!6P9<
zf2$c>i7=d?mJ@%KBax$k8)aN*fs<3+J@QCpWmcds4-zjPyfd<m3<Bs^NxGe2kd}<f
z1)~QTo|c->J9kLssPwGYJM4v{D~$ywl$ooFF!8W4I$JuTAkD79+u1Ex0`%j~_fx+a
zcT!>s4RA1LMq|O-*v67m2h&^3f4CVDbX^@mMX%R#;aCFKg)#<rW@|AGrsj4Wm@DM0
z60(}wl4)q(wZ}s~^4MxY9o7Wlo)n276AAMi!KG=EQ`)vd*Gm&9DPQTyv|u<wi;PRu
zr95nysT=3f*1~#$27f;!4WBZ-apxIf*F~4pSOTanENNO`^&R*b2bCc&P}1@tm{OCP
zn@eLUi5t^9&b6KdeN-`0cu_ol9{W-@VA6fKVn*aTtLH2GC)w?tVpoTYw|-Lv(=$%L
z3-!C!FY^0lhMn4>Il}9_RrulKAi#mMM%g#Z4t}nG2(PHy&EdSyx4ohj>wf%1cX?ab
z`T6!nwY}AGsrku$_w}+_ilfS(nYSn7i_3Z2rJ3?mNz;0e-j&+Ej!nFOZ@k}Z`IrF<
z$;b47FnpK;?4k8|!c+-IV0^97nY~S853z}zBHID2%N5RN7b&x^!jZ12=an7!yXXie
zU`S)si2Kt>vbPOZe+6M_L}e;#M`64GL`jr;F)`|>XY`?qKT1V!_b~dOt+K64AKx|X
z&vtBWp6jVayXCXlgO`I(UbzIU{Qg!^pKle{Qoi}`G@7J=7)<FfA9wx1e~<1%#`0x_
zaA?VkT3lhQ3LUv-ZDaYjU-kL!XRD%>oDO@mK7LPU8Ja;f<sUNMsE6-zJ|L91>>tRo
z2ps0zdT8l7!~XON5yGY)-SsZLAnd%+FSUH`^)S1YrFTb0ma-UK@NOt2e6;_!4eaKT
zSi(kd?2bV%=Df{YOnEf{#UO(Sjg?B(EDDZ5#r!Bnx8n50V{T0Cqcr6RZB7vi8iaHt
z4}`37KRtRs7GbHiCXNpL$3^&$nxZ?2aN4G8^!4gx!6RU^dS~`gKd*YR`LT3%6oJu-
zbSwBIW+|V#k?6cxeM$8QsY(F<stk#^x$pl!?o`&}LwZTo*@E{6;q%P1(ueOwZnAyX
zQ<Cr3f4BTq=eAD0d_N%9q`J;_GB#`I5rDL*Z#X-<sOjtH0#@I4JC@>aNR-uhRATXG
zGG3<@faz!G`?0*jV?VuH^5k(wT}9W3dGw1aJcYX_o7-ehz}BzBaQ%kx=;~R6k-c|5
zu~y+j4UuCrMt_L6DuGy(eTNcqYCo=_r7Z{52wa1N3bx_OfP{GhJQ<=m!;ZUJ8#_Kv
z<{u1V8Q(RC(<{Tz#F|Jt8yh+&KX8Z>mg>?jj*xhhu{fgAuLQ-Hk5Rv}D7<!Yd|80d
zC~*p-CjhCb9YNW047?Q&NDUdT<~E(5{<4|MA-ViCKFl~13mFkL<1sqRFJCO0JYM;B
z{BpE03dr4uYF>ZTd#I{`*q{GUiEbvOAAr~1t)6Rc>91`%V^Se=y0tMz0MmBR(mkVk
zKxm3~ywdBx=y~uyPz6)VfB9otS@+0NW!3h&eknqr0w5;$aL%^N(TAsVgmeMpN3;rI
zAblT+!mhDh^M3#_LC(I&vu}X|R(6|kB?k4G01B7`NA*#BEMUa!i=jtW00%hh)cJS8
zfB2c#kvw7o=3@{on1X3I7ymD8rBl?fZ{0wEDAEFC&<qxCrjBC7W?H_081BPvUJSe1
zM<YQR8tWaVM<_ASg$xl~Y#eiNh5Rnwh9d~f4$*W4y^y_x%rV6i#NHCo<E4;Yir~<n
zpuYvJ2EhxaF!-k)C=pIDF_K8r5m4wiijGDNB8~tJ9vKoKaPrw9AIQ)M9F9+ZsC?GP
z6>~qSn*V<Ff`2!i|9<oNU$mUFtJUm1?PvecVb1sM=Y1C{Ib~nPY5Qu<-ra7-zVwP*
z&!u~6PWvG=;{EXGFTsxJgl`f@e*@_Oc0hVmOxas?)}EU4bImWxwVAW8$C~{OSL{x&
z-CH{0PtmTo7Ipaz*-`uJXs=rfduofit9o#+2aIXU!FRZb9kKqr!zF&`Q(#Bzkl%qF
ziGc^OLnc6YQm6$i{83{H6Ba9!YMljhIL+{}9qOaY_{;R$MQDdl`K2^Sl8PGtcA2&)
zPAD8)v4f%m$UsQUz2u2tkVy(62kZb@phrIZ^xIS)`vIp0Rz@Cv`gQ7#OP&CpSoN?>
z0bl-z8S~d!pt6LCAV>TQC>o!$=}CY9J`96Y7SFx~p@A+y0Cw09wYfY6e~1Bs(`@FO
zh9|NEm(?}rUh*U^+jZR4B83I^<Aw}&Es<%=S-=jojcH56D!yk+Qt(>0ZF!~3xXaOn
zI>SeSzf^F!?)I(z1H|C<cW$*5gZAp1p8yS30Y&@+3T_Ulfi83h{=Z0=cxvd27iK_V
zTxn2UABTuQgkLa$(Wsat2mp)T4BcSP(q#Q28W6ym2#@NJox*6h1zMs6N6|GR@KOh{
zKodMK5}AdmKDdq;A-;IBaK2tWcp*Uz^ZC;GM=@?|&!h<~?~k&gseLT^d@v$vsFhTq
znc|QJkuOPN<{$z`C_yU|J2a?iXe&>+z3I$9HJkajrZeAcI`iG;v)^km|357jz0qRP
zw$=;((|Z1U?dE+LN}as7Y|@_Uv-Y&QU{Ci&xn9fmx4U3(Xw-iSMtvR`^Hprz*YTsi
zP8{<?(FuEsPuX2|`tHgzch{V=ujvK3mNWNuUb?IPlD)O-_IEhz-B8zC3%mX%*8P@n
zFS3J=1#)+|+yQoIvDVU-plBNG^@#OT+5&<AA5X;(f%Cf<z%lU2_`oOP10RcIuaw+S
zKB88n@G?XWMl6wG(G;d-+R2OVw!#Oe0UQ+D3-6x2>Cx^-TnTjz4PuJJ#7JY=pL75P
z0tbUGXMuVTBni_NjPUp3gPcV`NoH43k39P(1JZI96+0BGh(oVC5Y?&P8xZ6$i(%F{
zFb+*&#S5IG@(1Ve`i2tC7b##C@T_{^6m%ggFcX&rVlWMO!YR-r_Huj!AO$9f9U6fp
zGyIKyn?qi}*4_9AFbFd-$Z=yR@)UpoU9_FYkRbR=0S>-5`=CstS#rn47gzWMIJP_s
z!md1Z{+-}8j^Y$t#IpkmQItVfd(VBSfEQ>jid^IXAO5@ARyysg9?{O|)t5HIvKaB)
zdugh#tCbo8$O|Has>C4xT~2U8j+Pg+D+F|Cz%<OK2Eia&TnZz>WPetpgVxrDg$A5L
z5a61S8#*^2i$jCnn?Gbni4q}F4*xXn6LBAi|8VqlB9>PTB`N#^c5<Uph6Ds5BSZ(7
zjguEjXM_xYwB^KGT2FnU^@UqoPkXu5w7<8W_F9{nueX`?X6spRwwe7#`<ZWanfcF9
z@kx71Pu*K_`mPq|@9s2bU)}Otx7oSG5g&&}eo`>%3$o*gZ;}(gFFJl#@kzT%Puo>7
zWf#(xrsw5aOyA#O;qLT?{h5n%+4<jx>h6hk|82bcEs-9#M0?sDF1_sjT4pY+dPFlG
zAC1rTFm^l+cEmvt$c+KN7dzsI0vu1q4|VJi7rf=8#8*9RoYW}JyB$vI0}#<1Oolp8
z@<MeT<S!;VSnLS!ftEE6RXtPzMN}Y`p4$2j9K?yT7+lI$ULd^54j~4lfN#G|zXm!5
zU-GVEnq9O0rsohg7O`Z9&qplCU2)Wc>Iu^nEL&jYAa)1}B8Av-s_71m;1J#?rs=YV
zp7mk}-hg0XvHgUoA%ftoiX8&S<OTQPeF7h+B5g6<VYqbG{qU={K}tOHI(%FTJjLG#
zDTJ9a3?er%iGeuhHeV)&4J&ZX+qb-8SmB9a2L{Cs&jmRaY-|-aX1wtPfn-Pd%?ux{
z->C(5FbItx8WBDuH;ft#POiB$P?bo1kR#T`Q6mUiPOxAmJCwHAv_;St@CBVh5=YSC
zDZwDmlG(X@Cm6&bP0-(Bbl_x|u4%8*h!RW?Q1A!pbHKPW2nvL^sW5z2_{8*lvqJZL
zX5vGZ4-w%*>5QnM^;#h#fQaJ@{1!+2y7gIqYkSV$+nuwm{W-67Joojk=f2zRoR7Pn
z^=bCZuN%(%sO!Y%$&S>?yUQl;YI^n_q%C#Jcwbz_DPM&~eH<S7MRe>}i3wjPj{dIb
zm>oqY?k=6Qv;6cONL!kmyT8SS`&-Z6-F@Z0%%!>dWjl+9KUL8EH(*Di$FJi(e#>&H
znQaxL^l*!{_4ljr;i?|oCkA#rk)ZSdK1h%RTCro`V~K%}L^D@{3y6FHLgkG75tujv
za42E%rY#=A2PSKmhxUds1Gh2<@L{3@Uz=_P5g`#M2x$=hWF%m*_Qq#$`t^6bh{;{Y
zUx{cjE|4<P9dHtStd?U3f^hamR|i3Sj+k=Gho5}+^wxK6frE_D@`qS}5%>soj6-(_
zC8^#Um5g8xu89#C6pcZFuz>k`2Yl5#kn$XKS+6^^s)9>Fo_KJW<8qd6<B`{_zV7xH
z@ey?$cNMy-VgjQ`Qr6x0Y_|zl!e<)t%<IC$?28}mI{pg0?$cY}!6E4md@{%f@sT3O
z!J!dn{t|}ka7S;$%IoiZk$>i<M=@c}rbon%6z^C=<j{;DlohZberSpx#S*vxQUDP4
z{fw}*onV9oLLL7SC@A3IkU1=ZkQcoL0t1ADhy^wh9LSUUg%;QhW}KDCE&wuIY&U=i
z3o(HZ>5I3aq=sgIFz5ujLv7&DBr6ODc%OI`{S|K9Q$~mh{!EU@Fj;>!J_;VSY=v5b
zq70H`nLX<aBkl>ToDhIRtsIz`qU=UA(F7gRNc9oFZGGmS+Me<Ej;FodZSwn>)Bn@w
z^lj;r9%(h=+VWnfgsO&ziVq8c2uNE>Pu*QTWq0cf_w`tmt6RLU^?5r&BR?n@@p*Lg
zSMl**C64^IXd<8JQF6+zveSO7I&*jR+54JJ-QRk~-mZ&twVQI;HT&C4ek0W5xAAVj
zNp@q!G;*Ny$gg^U9r@4o06P->pFk^iBo2APvEz`(z>fH#TO#SpJSM;hVL~Gsgv0<c
z{N6CNFo6Tq&@K<8Dz|O<J2W%sV<X!!0&4JnSqKn*qay5O%tz1~I3y*w$^ct;)3dk~
z{@vq0eD`*naFtD?;Ad>xOw~K2JCs3afde6gI7jq)b|9*qKzNoxF2ne&jgNyDq6UaS
zZSt(s9q=E1`T*S_eBk0Z5$|o?jn7GI5HWUHvSTB;;DrV*<?9{xW~{DJ&$o?fMz^&f
zBYa%;XBOx9C`O$5D<~TH_z&#pGVXF<0yzt~iBD<r!h10pV8u*a=k_hz^g%)Bffvvq
z5Fij8dY_;SE7=!sf$o6%u$+b48T5^+FI5kVAZEaKTm&t<iY4JA)ffNMEgym02u2c&
za|Z}9LgoO`2Xn|58M=&fH-Tyb0W5sjAP&jUrGxosjV6mQ4JZLt@ajer@*+S6eM}G<
zYy#DUT0hOC6FH(eu;3{F#ztYq6KU?x7dsI4h;~qbYcXPn)jonl#q}#phL8weeVFuc
zszihGy)_y8vrZ>H-{r*Tx*q#v+cCdRr5A;o9~&y^6DsN+iKk=9Y`m~O1R|L9*jahn
zu4d=#?mQ<~w`@<>+56%XJ_!x~4ALV$?n_9I<WWB)j@?;&(vH$eKUSQvv+69SEiI?*
z?X)1*ePgbELoPk%%TW4`MAu&zb-4xVBisw@_>Jyxv9v{158{Km!>ze+uScve)W_oq
zsE>Y+#RfbPAMkj50PyiR*#R?lfEWIk-11GCh}Rl${KhaVb`Ttzqb|M-S?9NNCoj5}
z6BgZ@>bn~3@VWyn5FkTrU|dTo!61QROmVw8l)UJuI1=pU;GT4Z=-XT$aUq)GQ+$}e
zh#L8ZfY%_9Ap;joeK2hiHPFg1E^xqX)4ChcWU&J+d^o`=I7D{f)$I-7`s4_F!x_57
zha443UDp7rk3y|RVB)Fw{Y?9aFy4scAQ=P>oNo>eaU>Y$w<ub>)lJ}F*S3u#V3fbO
z%mrV+e0H4S0~VwwjDL|rBjAV!2SDICLO?VS1mFlLW8=mJV-UJj7H$HhM{v~U7dFs<
z9)AVU!C`_D1`zS`fto@<k=D>Oumdy^P>dr^q1Y+Tv=(EAIpT}Rf=`A_f!PP*il!7A
zU@JakBM8hM-Rw#s`k{Yl4R8UD2m&9i{q~(xB?1ck<^vWr&#nu%JUdhZiIEN!bqE!8
z3Kez_CwfH_J)-emAV`RhCOvU?@kzVNC+(;?b4R=Bx%Beg-RA5sKmI$g1JWZl_6tal
z!Xv&<Fm3s<<kam*TPn}k+vMC_v#Gn=&ED5(4fm(_UACj}(9K{+VdtCk*zp^%!yZT2
zxJ&(@=X%8ZkR5TiQT-rxJVJKVQFnN)0o9<cWQcqvGMWJMvck`VX`Q9p;g@4jsfvwo
z-$xJ<{$II^1Ro4A9~*%=Qsg@UVz?zt?2zt2hz7BWFs6^dmSIFeE<jk2dkRo`z|l+#
zeljHhierZ#0hn;Q=Y{6yUq4{SDnLQ4M@AyO(nf$hx1H2Kze5~JW>zwB3mzthahiQZ
z`dAM9aA4>*mXLhcK4g)Cr4Z>6QyClq6lBGG-aY=WfeQ#xgfSh23XOnp`oegDD5Vmy
zqfi7mi*sD&V!;`l;<bi^11&&_5)elgoWdx@I8Wp>LZN=4;e(S^{y<kT9|S+80ZbzZ
z`(VYFm0DfXj<Us3j9AxE0Dpo2A*R>_{=FKsnWTm*e;6!$iSz(un9wN9Kt2!|U_rj+
zg98RfU9rPY2u1paVyz;D9iz!E1+i|CXk8-KClTqB2=@!c4h_Wz79<CS3Xj_bOP#o<
z?9|;=r|)fXZm!qj{XG}$YkkhQp%HI}M*KH2>g(9Juaif7QF!$B6ld-#o4l)H%I>Oj
z_tZ??(|pGM9!vISH|4so-cxzvwovEamUa3~N!ObrJ%6ER0#SDy^h}_G)0TX8JVtgP
zf9d~dwErXV0b64IACA;r?&DvZ#5^g`0w3t2)wtLJB3M4cqn<BlHQB(yJOvJ>K~(FX
zyZ&X{Kk@&U?^rlabmSAne8&!i+)vq|Z+itf+F-}0>mvT8I7E#^8rLBO#04{LIR#KS
z0Z09a0HJC5Jn{}Ch8`fI_a=kSU+1?G4+Y^P=xPE7F(RM{F8V;!>VvXRhR=oeAEru3
zf{0|DX9paaZiF)<G9W030K-87Nr50jiJ_-1AebpJ8X?k{!f*mkLC(T)n`x0R)({O!
zLlF7QQvyk1a}cPOaTpyiffmq2xY3|pP1m#$!w1Yx7dsI7w15tc<|lZ^m||}}ARq<<
zQ?ka7!sgp1F^yPaB79i6lq33$2pHG_aKJzin7Dve<qUxXT{!}W@5%|qTNlK-7sPuM
z#CwJl>4I1$9Ip?@d&45}0kDF^p`qllJHd|P6Ly!Jyt88R?q+A_I?dhPYf-NAv|W+0
z?}mnd7#a0tY|K}Q!#_vbQjE0agq>xl?kqoJSJm0Os?Xou^rHQp=I*Rp&wXNDFZyq&
z>#fC|eqGe{SJCc22Rl?WwZ&TgXuiL*)<4(7R$I0(Z3);B13vmcDt5&BZ;thUC|q}`
zVBygq7Kj(}W%;Cl=`0vVL=AN{0^I>~wNeKNemCMDH>iOT4a!k?_;E9I5j=E^7XS_M
z;dMt4nKZxxc>zM#5P&dt5iUcV%L#&<ED#g|E;P=;NTLqcY&>dk*?`Q&Uqs*t<`X?=
zF=(j@M)bxUK_n{z0YVc#yg`rPP@qBBavO`D6%>3v-aJQu37LJK{A>f1AV>%fm~=;g
z5By(napI#0AV3Rnz+rTW9SEdAS$IIehsv<i5qp@1e;YU*r;r*dj{1Q2VQ)HuH1Tx}
zj}JS=<u!&9(nRwEhs4oY!iR?lC$MnK<VCzdn_^9u7e{MH2^wh=PYS$$w8DqTq7i*8
zrbp1_2tOaIkNSkAFv|rOzvcq-1cCYxHGl>g03pW@3LhFLJ0iWrj&Pz5><GuR4jhTT
z1qpy-KsY%tgiOTn;h@mu%zf=<?5bOm>pnMEa?F22!`=&XgX!mq@t?(y_^xo`kE!E#
zl$`uy`Dr^V&)i*k&hDlc?rT41XOGpn%!XX=#XDks9*%XorLgNQ@t(hob-zW@Bi7UI
zj;p;>(nI*jOIs*CC_uR8@@S&pW3hgq#-s865FKPkr1sLhfM*MX05JuTzd-9yBGZT*
z-+~l6D&OIwkqG$b+ju{VOp%~gGvS*tL-EB9-<o5$;k)m4l0pPgi8SaE6F;E_<2+wb
z$j7+ki3Y`vgYcoN`OA7o7e{Lj--dhx3c4(9pcNow@V&V3>_F?s^~>1O9r~2u=q4BM
z2*hBAT79-)gm!$OmC%3>h@gvrAtnqTa)K3Ed>?=m2qXrK2Ehg4L*NiQG>9PQw|y`!
z0fGou{KL0aU5N-t8`V2B!4P0j5F;ozf)TO9N*<0WiR=Q5J4s^ffZWg=_>M#YKH#h5
z5zGV&yfz^|?5Ly%J|FzO?yr^^P=pT_P@ytlK5elDT9>v6A3EeS7YPc_2v3cCrodDa
z35R=y<FMLrJQGO(91W2~AAkb}YRE$IiQ5y${Fpp;M-id0v-*sEEiTyEb8)W6yj+XZ
zzYh(2Co<xb$mq`!<G+X<{w>m$;^TfyowTED@{WoryDHA!(`4%Y)-!i@TAIsl%rz|A
z)8z1%3cCI}(e>t7w_nD=4#Ni*Yl#m^kAv`G(!=lp>kE85iWcmklgADfN)i8XL<EsS
zrY_89G@7GR`~+*=DFzYym(72{EN55%xPRiJgQ5Zk1@3)|4VDiBiQ#J;dT^-<s4izg
zuz?gROrq7-KC%YGhl7P2nBp8EjXcHU118-eQ&+`N`D!h-VVOgh(&T(F8Is)f(W+!?
zX!Gxr4qBlETu@eGO2i$4`J{%TgC$}2nc(BXXXrmP>w+T=9P%x5L6_73GVD<uu4^MM
zNDw*hYgVGe2A%E*0!dszZh}@4!*j&C3iX4=JvD#~hP`PG2LkxPQPTxR3QfRKrZb$z
zvoHeF2z_3hW|!rfi+F(vJl7Z@YRLbIBgNqe0`q^efWkl4Ew%7(50;`_eS}6{5EC#h
zwHQ#SK8zs10okF<#jmXhB3faAFMRl;MVUq6XzNhCE)-7}B(ep`hJr*Nv;N^E6-PKR
zD3Tm}06PE$rY+~~=`@GCJUU#kGd%L0@bHhKBR@@y`7A#Eo8(d76&~|L@rgfjqsJM$
zAU&$j+uwZp&UOp-r`P2gR_3~#^IoXiEs?H}9>0opW6?CO?H(pQn6{7|teC=#9S<e=
zOd!XOL_gRgXaNqhhZA5&=BlFJ>pcj9;BPFB<|iXEPZmuu$2Nf3h$#;E7{^imTQ_##
ze-C`JLn!gVkRK8<J4BTsSik{L1QAPQFyCba2vM;E$S`~$0?82{;jkd8H<%F_f!y%;
zfVfznOk=V;Dr(3_tLq3Hy0UoTFOJr~A}?hd)$Fw#7xL)f1c(h16Z&mR9Woz>Tndx_
zndl?Zhi1kP6YWoRhtFBiHQhlob~thF83AM{Nok}8^AQ^{O!(XcttW-G1cC8_<Cq{8
zV8jv@5rJ8W+reQ#(Hw&UaiGE~4q?8ZW``U>bRA(OILol&5+5ElE|4kUg<4<&Bgklk
z52+8B@)sir#h3lP!Uxqy@Co4P0Us0qVTDpxJv9SL*cw(q5TCX<j#w^Zj4&~RR_u@u
zE9`b&DA_6$&xGRHf<$jvI0<U>j}#81B?pHK2S<vAhWJQy!$**|aMyX;8M(T}x$d*}
z6&?P5Xvn+Kk^ha4{uJy;90}?1ed_q_mbUD!n6kU(oc&EM+TCi--kz&+4QuW9;`-bN
zd?Y)89ls3l;j13RNB(m?tYZ2w@DcB`nYyFz=7bR>)^BsX-$P~(M6)+0@bBL4c>^Z$
zaNy*I;lLF{0)64e^NcsGz){+wghl`2@z34<#XE4o^hK(pYQ5o*(E)SdV+7x*Y+-_k
z8L-0evp96@FmS*@>>-95)j?iJQ(stM3kSr67-55Jzz$?98qra-o*n)=!9|D+42l|R
zeZf`lN(2!Xj1<gY;P}!h=-_pSFN=s8(jEHf@M-uDC-39(A13~l)A78p3<UvzaiIh)
z!T?=Hg+&OXBEK~|KzfJ>0X2vcj|p=eK9rAGcoPT0hj4&F996)3F4$z^ATWm;WhHjj
z0{QCZIScK|#tV^!uV^U`<~U5?Z$a==Vpw|OR0(JTaCnFqFPs@@FpYn>w#j+aVg%{~
z21od?qABwfU-$@&$dCaX0X~?y2pp0j0tYPC>iAHiS16V(h(mFJ9mrD-i4-0hNkVQ6
zGH?tbJEBMNAsxU6q(|X#KO$`@KVwge3-<I}kn1%!*W~0cLxcYv9{OQ?<R`IlUnUQy
z^e8^=2PhPi9($_J+FvzwXY=X1J1@>PtjlGW?kF1bG}w{o_{(^gUnp~lb-zVbj|1`H
zp6d~BfEhkuWXHqSiX9Kf`#l(KxFwd}U`oO12n+tkI;iX*UpLo+5lT-;3bs7OVI}Vi
z(*gkhOZYDy(pq6)K%uWzfdP{vl@Y+g8Sr75i_2Lo>JXL$N3aD8v4`k&ajuY7Z2M@>
z*Axa6iVlQ*aXt5#iW=U65qCjd0j=;M-;V?ns5oHu-u$?G!$t?1cp>xS7!*(_I<nMX
z{s~EH{pTaO;XhStnWqRD1`z}UzeN!V+V=$mL@***Zjr+kN;nogn81Kxmk$<2lp-t<
zpDco4#N$JQh-Bje%{U?>KI|qJZVy9LQzitYuuw-TL<(rWM+1&(vc^+=F#+Sal$&XD
zxD&))BDk8>K5!yWH+Bdg9wK4~%nGZb2D;QB_%n?ZWQxfRqC}s7J~890x~@J-iD3qg
zB+^TizrgG$WCg?pHHhUe4kb27d?<gBA1NOeiZ_H3^&#Xb$-V{1Qwk3=6Ez5qXwisJ
z<VZfGBgkB~Lwb}<+TG-wUESv9YUkzJowcK2*gK)Y@5e@b8XfzEZ4&#g=-BU(wv?R8
z2Le@|xv%WJADdmYr{nznS+HZ}?pBlj5$bw#vcoUHjzm{V4;4+Bw)`Y>v5M&ff%JGd
z*5_fgB1o+7LvgkbMEl)q%d~4m2SmOQkdF@yN|pFQYniG5AKE;MX`%@Zi4HRSqu0Oh
zRG-!MJS)NiQ6a}7!BIvnP60T4!s0oiHq~dHJtEA0Z^76B)AK<Ux?+b9Y?wtd9rKyI
z01Bzz8xv_vc4#<=9Ud{}GyZiQt7XsuJLKz-p@guI<-HlU0qMvK`RX2+!bp9f#nIJ?
zbYp!~pN|~>dCCM4v_44*jQ{lQUq7j#OkQ32h#Y;XDrSPC>^d_{SUy6t<rs+$4kB|A
zH6#ZRz1r?&ED%!|)xd#>VB?~ISVOXC&{_%*O+Yu1oi7J+1HMRM#t}dSK6ycEEP&%D
zaL|zP)7FeaBS>C6DPS&(vCjeX`MKre!v>ccCfu@%98d!S1mkS+zas-Q@KzTQM7|Oh
z7}!yQ80makB;GNatPMeN5FGsjb_@!@F$CZsJEBMZkUVlbGLgcgzb!g;d+NB|C8ut$
zK67vT>ACI;bDd`Fii~?bGU7k6VV_4ve-=0Cfte;fwnKVUoW862tX<8f?rt?}PuJDC
zo@@5j&iy=;zAfJAm(i{_MZ5nz+WnWY9>0qA{I%Pk&TXb-hdtNBbVoK|NAE2OWG;QS
zKy)B;iNWu;Io9vNc)$B&y>E^6+E9duHN_!Vpp{8t$QMx1s=O-2VU-U0!5kjKKXm_(
z9_Ig{+k&DCfZz}!q0w*_T2Vu-RZsJk2wKLQ#U7%L1c77505<8tc(xdBjAz3ECgadS
zyG1Sd)9eBt8V5vR0YMH>E@<HcA3~B{nGRa`L6?&?Vy(jm47`AOU*m!3fbT>H1xOxJ
z^UX$x4?~8W6%ZXk+Jb-Xjj%A4!M&sw4_vJEF~bt6ZIKch(AtQj1{_2<bcF9B=7Vp3
zgg3Jlb!CX;yxpP)9Q9q>E$XgdB%%*$DEO^)WU*6NE|Gq*qvVSa!=sj`z=z3);rg7z
z3<d4d6xWsUA-D>N`6P&!9`186=@Ix8Bl^%}_R;y7L<X>ek2laDuKc0o1r|Jo%pPuN
zBQO!Cux?(su&y9c&pf3Nsfrax3kMby4=N}cTu?MDTs%BnJhGs8R5&#{6q@jL?1=B7
zCXz>e!#e1(y8s0cq4fp1uJd!<=Ikpu_WjV%e@BOY3U<WCeqm|LH;^8f2I*0L+V0A;
zb~ZV0cZ(T&IxNlAt;;nm+g>zqORVd!!H!rr$BuZ9Uq^dd)g$;32Bj^w+Cp~FSTQ9#
zC_Vas8W12bV@F@i{CTW)LlM6BOi-ADa4aw!sFp!+_z{B$>lzXrVuvPBi5NK48Vm4`
zo~_uScn~JkwK)We@dATxjW*x~&Y}_#JD9du-~k*#l0vfxN9-|fVTxya;2<MhBL)js
z$na?3ge-ZHFFj<|b*CR>7#AHpp(HnC9v^T#I0T4%cAynFewwpLclb}nFG$(vrtFU`
zK3J`%_-qCL;_>ert&ah96#(A&bqX1Oun7|s7l=b+1R@zB$~~q*^fJO>8W9T+&q9D=
z8{-%h2sA;b=q!!v`kD|VEW!%j09q167c~9C7qS)?0Zk|<Y!SCHH(~viIg46kTW$}C
zP{Ij)z=B0V=0fE~bmFfzcK8Jsd~U%frcaL_9l-&J2oU(EZV(YW3>-v;i4o!>sEn}X
zOu)V48R5d(f&|#nC!FjjaInl#beMr-Fu+le8eUL565t4@#)b+G|0;gu_lYCFO&s|(
z@3lW>NAZb2luz2#{M=mUIk}$mb1kQQ6B_bnWXQ(_BR}CrkHf#j%)(>7!?co<e=M8K
z)fTejqCM>v>;pS`uh`jQ;!7dZ9iAO7Z3*tIb(xF%>B;+*w!|7(@(9uvst;qwL$SX1
z#leogcgK4FCR%$*JiRWCf6#p|_Lz`^)|=5mbyMmNfg{y-b&%TFI!o|v8T`}dKlk8!
z(gy$?&kk=kk`D`t4z$5CEq@wL(TK1_xT@G;_+a!ZXj#HAa9H&6kQfo*fUO({7h?yy
z!b<)$T)|&NJ3#;oT}?iY!cmLY)qBXNn7D9|+z9>zwwA4E+!Tl51D_i{3baD7KB&O)
zA0{18L%PH8;Yfj2>O(%5qVG?O4SttOak$kM14j~>zo`r@sUX4;tCqGPVi~%OSPOem
zz)BmS22JV!!Hg`!hq}$wp~e#}<#G5BJB&4CM*t4dhd|LdS`5n6g_O|6In%@i+F*r+
zSkWLxU~qyP{8>pAJMakv9|*f}j3aFIaS0se@I!MZIs|poKyj={^@g0}QD6eCroj?j
z&X2b_F;X=o9Pd_;OxvnT-%#NIzpzqJG$>pQ#WBpN0mU%};E0rr4~38ZEIghM=>QQD
zM}Jc|@yEjBzbiduNA;B5ooA9A9WMAWJo4>=q3=aTd>k45Nn-pL$s@i(+LAhcJ2!ev
z+EaeUu9~xVH=Vk(_3YiXYjX{&_S9YY-%$5k#SX5v7&~I!f8+2G{BkYThp_|F1NcY)
zAH5%n_cqaC1c^a(^Z`2_Fm~J%>vvbI-yPA0pGULTMAMhVYS%_;*Tm}9M(fr^GwY+7
z4bl3G%`S;HTpI0jX{^uXvA$Qt`dtz4e^q<{Epf=z$wRL#9C%$3?6B*L2i=&04Zg8t
z$W5g~ZYmr4^NL|VuN-z$)rg<hjQT~B(Koa_^5-2+_(l7PzlhhZ4Ru&v&|!7B)4GDL
z8zMb6#p^Ch)L)hCdri?H*A)-`S?RDF%17K-G3v(3Q8!hMy0LonP1U1sY%+${Y~0V9
z9dTpp6Mo*|_@9^eUma>OHPrNiaPw&eEvAQC&I-4l6K*pv)P7;8<KluY%Oc%ZM>Ct6
z47#q>kgH02EeKVe9I8A%T6tWo>ez7gN#UB4!%a>JH<=V}Iyv0@^l*zQ;TC6xTbvbc
zbxyeTIpH?vhudBdZhujv{q#tO8Ig{&qMc?%yUdMtnHTLgKiYj!wCCa&tk=?b?Xq~?
zvUp}?JhM6hIsjWhPoIs2eJ?KRyQ!%EB}D@+D>~$|!b2}BKJ1FrVONz5xw>@Zbrs`&
z*7V35+f4j<ha+#SIAm?4$?2i8lM1R%#hVN}I}vXZBjKt^&T3AhHG!Q`5Lmd$lyK9)
znw?qD?5uF}vkRJ^0}G>VaULw(;{0%nbI}&GoC*u0ZFK=G-1@?B>#5G#Tv%WhZZi#5
zU>0tBptXa|ptYZwZ;=DL|CdEN%<^{7p*)*T;|m4W_Cgxp80>;@8@$!2(biKVt)@m=
zo*!*_W~AkmXp1vp;pS(Ao1aE&Ho2h1#Bj3{@IN<NH91~+a-#C+MCFJ`DPp)?DB2<v
zt_g*!!r{trxGWkj3x`r6`c>fw+6o)5F>6{7Zc-3#8jdt8h%_&Vw19;oEn(qk%W$N1
zL9}%^+9n)p8;Z3nh;@L4V_m}W?%W2JtPdvvjy|En{$K|cN8w=wg#gFU034u(14kI_
z2p#!BXu_A#BY=;u3?D3omY%qy>h#@hrta;vfSc1(M}8O@@^*OmNAc00#>RdIb|7sj
zKF&6JoU*I@3_f<O*?D_fP2bgJ>HhjPwo*Ibk$BgeB3*8@rIuesSurI$gb%R8Zjd88
z5}A9!jzs-~U`L{X>_~th#*RdvhvNMnw6x{EMBjVjeeaI<yDQ%B&RG9D<Na@s54bJf
z|F-xccf=04D?ae9*kSj?2HzJSd|zzHgYluThvLJw#791ofQ^1E2^;fx;n*h%$30mz
z{`aW~Pr*tKf4209Ka?N!T=`MYS043z)zL3hPkf>2F)uVb?vE`_{9~JwpKmwixo#J|
z(0%F)<s<J8^}M;D=dIz|JHnZ}BMtY*`aP69?2)2jPo&2FzU+vnD~@@#>exTjobY^;
zlb&yW(jS|j{CxA1pKEo>^RPCPo@;%^a~&`EW3TCdY;)q~P^WdFHtS+-E)KW5B;4V$
zaHlK7U9KtUc73SFjRkeTh-PmI_rIrf*yeUe{l5L-55;?I2sN1&ZgN4Q>3Nan(?Fa^
zi<yyDvm>qNhFi}Mw_O-+w<z3hNx1#;NT(IiPOBna*G9Xpk9NN}+GA6+=cTb;m&fX^
zh^4QNWv_|VUmx%NvqYbp;{AS}81T#FfL|pJy*WAXH_5|pEgXD%(U3b*L+?%vyC*f`
z-qgtZQ==Y8jef9X?8BvFH<yolyzGd_QxhLAJofRjQ-0s_tmitN^T)2|{IS!d&9UB>
zg__I?HJKZ$nH8&<9&S1<)cm4?rn6+>X0r>L&ki@A8`wNr%Z0E=tA*iKi)pQwcq?eL
zw4lv$Sh(%-g0?FQ+AR;aTVb}Upxvr)`_<w0YiJ;NU<Do4hC8l<6@clT*2BV`Hqbh6
zJjfzlE<VV@T{r#zHcSgF+SS>?*Xg`I(uo%Cv^LUtU98i(Xs6Y%NT-#w4lAM^@P{mm
zwp$WuyCl+Pak$-_a6A6*E5L_fpGLUFyn+^UV$G(;n_f`Z^ulD-lvw%U;o^o+vPCG7
z3PsADg)0iem63ub(NObf2p|9;%%V-h;bvjbA>6tk($-lN*1jOxAru85I?2NE&f$1h
zSSa2-WcR8R*yhoKL?)cf8aSXh`V|x&Qc!qkLE*q~(U5Qvz%e|W5;#DOap95);gZ86
zrALKA6W<RX`DJ9nH!({_Sj(9BUF!H9m8b4%dG4NWb8|gr@2@)fv(T`&3WmQQ8~t%~
z%zu@(u;g+4j*^phm!7t(YRaCbXYXlo(XI{)_ovt7GK+VX9rbcShwFe3+vQ;!J-Rt|
z<li7?71Mj;^{(mxd_ZW#jU50-qVL0rzTD!G==(sT-+l3Zk{)+O`x76r0e8d)+zxQW
z2Hq7v?B3{M0LT5r$B>8P!#2l<Jre)_boLg|aU9wA|F9$rW~7m1$t0GUnc0>tvMr;`
z%*=6&VcgJ$VM7~cGcz+|VmoAKL*6)vL)P!Uce_htC!6p8{O8<L=XG^WPfvH%XYQ-+
znQ6ZwtiwuQ$CbX$tHN?thv%$`=&}~zh|Jv>mAf%IZ(~fsRzK8jTcG>)xb8cHJ$A(x
z?M&>sGpWzc<i0y97Vk(Iwmo~&u4)r^B^Iu9RDa1;<8^2CH=K3e_SAph+hl22%asxB
z)<kvL;4jz|+ha?x*S7dR+Y|fkOzO8Ixp;fI{yWMK*j{1aj!FY}qzv7jHfBeSX*;t=
zZFbarz>#{FxBT70j*NeR9nS1WT~(fNf*m!UbJu>+S^xF0=I_LJS(VXqQ%cwO92Mp{
zlBc*6$GVaxxsxZm%1v>VpYEzK(^YA<tI}Lo$}MhT#{zf8A~)EPeTN(DsC<v7+Wnqt
z|L|6S$XoLvZ>>kYb^htC`-HFl)4qn!cpE?KYXWxsE4<lDVJ%*Y06SW}9?|-Z$Tn|A
zwS6b5-8<3k-;M6{est%LVmdF4>AK9{b!Bwks;I(M5j|E%_F5C@w?1j`wzSbZQzq@m
z9<#N4!Q0NXC64&%uCmjeNz)ujlU+&ETxF*M9PXqUF40U&$_{tAS*~((ES0}SRAIiQ
ziu0Wn=esH`u#_SYQ7v+%EEc6Lai!kwPFw5-M@k8DhbRLjAaWPw&bZqsbkUPpDp%&c
z|3gY2N}g`XlX(~9&baeWS^~M!u~#64$dkHAlr|ry#+@?HopOt((i~5P+3pH6J>@}-
z$*u}GiPM}(Q(Q@t-ANNXNn<=oqsk=o_XP@Eku79k!)SQo9qu@hBg5gW0B|@wWt`p!
zr#sf^tl)BFx?IU3cX_9$ywhC)a(F5_y_FmS4p4*O05Y<i-fW1}a9Q7Qt6@oIH~tbF
zEnQ_=yEr*2d5TPMC^eu$fJ4|3J^Wio-dD<w?|g+{hj*8JB(ms7f4^&Ghy9X0U9Qwt
z8u_E6{Ygn%I)3Kv{DrUUe*l_@?mx(NnZCb75BxQ5@Na0GH1=A`Ou0#{&cf@J#(WNT
zxHF&RT^={FL-3)q9`=nMijVpq`09NahOz;Y7s*z94L=a;ft;oBd$1nfChvHgyp7V=
z<SlR0H+@jEH^Z8}?Q8LlujPBbR_}XTf9PuiEe~tE!q<MKul=g9j%$3K)`WFl8`foA
zc-Qq2T{o1;-4L0#B`R-AbpDo@g6;lpJN(^u2D<Nw>#--;b6<SVy=8mtP3pV1T)%yl
z`tPYUY*)sF-PNb;g$HreeA!j=EmzHVoVDL|!yh$X9^P_wnRe@=a$sJz#P!%7*Lzod
z-`xrQb|)3@N*=JM+<@H`2JWgjXm`ayyHbYkN*TGM>a;!8ChhjMd=BjJRk+)kcAqN^
zzT**R)}yY<k2|YA<E-|)tJaI2darsLy;-KsN6FnbrS;rYw#}=Kgek6M^s|Ys<jHOX
z<)*nR%n;uJcF5=0e0SOcSK1;BBzM*w_!ty+RJqSx^+8Xy2fZ~O@z#9QQ|mELoyR?O
zpY+v##@FyUU!&)JP5$KrJDR=hYw_>!mam1kdOfnu+mXVKcca?BAJgH(=uRKTbY2#d
zvpl-%%9z|$F$Jq)x~+-nzBZ=kx<H@xas4-!AGIrO{GO^4_Ea6QCD7(sNAe6uk`P3|
zkvPSbI34(q#iW@|6#_TdAq1HXxdk7$h|13sRk#&$l%Macuz+$^Txe^NtCG=e?$pKZ
z)Flx7i0U?{S`ugK9j>%H|4Mg3?)01G`X37Af(0fOfJLbTDwR8Rp{11hl&8`>$X#)^
zr{ZiW0s3;&JTQz9oMZAtZ}NC=*|EOF;l9NFVTnE5aUC5o&0M~0hvXM=4quGJ9f_30
z;ixF!K;TN$IL+Zqb-2nqJVCS}FP!d54v#I#L;#L-RfbXn0y3(=WuSD0AvdY+46ES^
ztLYMI)KY5HS8z0NmTBUQXe#W8Y~_p;aJX%7xT6g?3IrU{Js?N+ttF29ORn7SJbB-O
z9bw(RkvlkgT#fGYQ^Js+Qzl%iI`ew=#NT{fK6bSE*wx`vPp8k3w)pbC=Kbl>eXd0f
z_$7AGuL(nbDLdv`^5mbg7nan$qom5LtI@SyB0Cfx!VdYv+Nu^lN@qR9dRUo@Pi8$n
z^h)N!v<23KH;DlsA9$O*=WX(?r|~<!rtf%~0v~UC0gmSHcv}D*ANpE<<ZZLm*A`k8
z)^3%r!`iTp>%uy%^L1Vqma`!&XJc5`P2stl%j9o~%-;@06>N{`w%ZT&*c0fnKdxwh
zu;+pJ-UkzV?@#J?Ai4NJ#Q_H@4%?GHVNcCz2eOClbJTgwQR8h_&G#I&-*-1y=54$(
ztmWE>b{ivew#4Lbi!It2*Jn?#@7~1z`;!LjOCGqt+`xSm2JNpfcwfqp11ZDyrH<a4
zJ>@`+X$KMt-*Z&DE4<?UPJkmFzT**R_T$dVPr0f-E9|KGlCSP7t_H8Wn;~mhm(puT
zcF|gYorfIqNj?c5Q?BG`u5$1lvs@MCI0257d9F&gy3ldSj?6pVS$DfD-{+}vzpLs)
z?rINtYCPtt`A>JP$K7?F^45FWQ|}p1!{@z?Uhp<~(bx24U$cLM9bv8B3~&8rMC*6T
zw0<|T-FuPk-;e6>QFO<p{?5z&omWKUu8hiE?ax~q3l*;Sci#}*b7M^3EoFOeO&+ql
z!i0S(Q}<;}+L1MIMO4juT)`PGBrJ)r9+I<^nvSGduB6#U&ZIf6<hhp0%@dUeI~F*>
zj`H&z6&6BRR4sC<Toso%D~ViG3UnLfNVyHvFmk2d35C`;Q}2RYsW5ss$eDKMUkcX7
z$QdG6>SB?Ypc^GF=~ib&<X<2lY!qmynF!8NxtUI!FG%dzL|5VjSJ`py_;KF&(Z1kN
zU$D13s+}Xero&gs;Y)P70+0*-!WH9m`BhS53j_(e+(|AMJV=Vul@4k+-Kn$~4zJ3W
z0tq!d87@gu<fk`Wnw}^-sw+6ETVIV0hX4-FaWrs8G*NambCm%&gdOfO9o=OBj!poF
zJ1Q68aL2%L6cQXRe=kSfdrN$M&%5%!^yd9HqTp&o!IiMWALPdKUjL2j|6_$wzg3@A
zk~#T$RG%*#ZB9Ddo%MFQ7}ohqSdR#~E^{TK_f>zfT$hO({7b^f-^-2vE&G;|8n>5J
zUUV(8%|=J{SA3P9j?8{4yz;ZeM?}?^1RT8A!~Q`a`Br{iGwbo8m=2jSMZzLEOUSIp
z`(6kHY5Jb0*}L9m@A;a&>udgjx8+h_>t((+E4*!2`r57Xwp-(Azt-1ry|>ePZ_XxP
z&Ze;3En&G^!}GRA<Zmxiup_c?XH?<N=)&DG-S_%??DO|L5a@X@uGgVp@52dwjwJRu
zn$+)Ta`DmRL5C_0JDfT0aLpM<vnL#Jw0PT5>#eYAA3Ev^JKT*|`C6<GYrDBj&W@;j
z(C0v~_rAn_hY|-IDm&;%(%{3%Lk^W6a=7BqLzRXcN*#JIeboNU$p@?5awKKgW=G}&
z-g5W4(jIcAKjg}I)RpywEBk3zmFL`5UvyW0(Np_1cfEI9jX(6ZUKz~Yl+ky4rGn)S
z<lAM(JIhW&w&Ey1%Ta!gWXl!j;FHajGGC0nuww~QZdcablAj|jukxU~%0JxIA9mMx
z)LZ*Wm=15<r@i%_32X3tSi={>8oe0S_@%I>{|;;RT3CxW!dt#sruAEqt=|Sa;5(u^
zd=S-XX>{jhQSco(EB#$p`*YU?^49tD*9QtW1-fmH?Y=p>*N&LJyJH9LNgjDHebV8q
zNrx*>JP_!yG%WpgM*>JO(-lA2BL-x$GjS@$k0S}jgqr3^p6)6)!<~#Ie}<jHs0R@#
zO3K~J(p{cf;Hj{Xa#UPIIV)LmRa$(rge<ly-Tqg)&8b2lN?GEmw8UL$v0JugHNbYX
zMk^~WWK1jMuCUOJ^h&*wf)6%on!7wQ%1H?1y(i9blppRaH(E|v!c<pqsyl81kl~3R
z5*1q*7Sq-hQPts1aCo8|?kJ}#*5yoaIO8CvD=2a%P%fSLbV_<s&IQLI;HcmbYNR;b
zGP~jO5FctZJeiuLRHlR)UQnaD!v{Rc#aBT_SZ$}3p)_ztG;&5X1~uGentEh*qoq5t
zjk`>HS7ZmbOmHAi$#KU383j&%fitGN%MWDqbozT!j%JURB#pb`$oowG#wq{5^2^4`
zj>w)@0{wm{JM^c@Q{|V_%MQEZXnWk*?zFqZd0(e5!g6HBRIbbPz8cf-2mgR;v4gJ3
zjOo~4_;-_47X6mm@3bTPU+&6Jg=aq*mi>&dqw0(LYo<5c=mC6q<R{cEb|7srS6k#J
zvBviO=}ko5CLem5yzg!Hp||M=-sT_rT72Ydxy;*YIfj|H?J7^Z)n2Im22aP0-cB36
zoi~N$Z1Z*9=F8m{mbX1Te@8^Yu86|jWxDN&>b@ts`~H}sgMO&jkwEXG!QRJ$eU8QV
zJzloo$>jd3A;&8XKbA4>Xw6wCt4%xU>$t*E`@QfQE1Y$fx*M)?H(3|fa!XjdZDn$H
zM-}Y%7ab1vIhas<G-2S;q`@bWh8#;8dbIq|V-<%TuQcpf+VG?4qmN`vI$HhK6ICW1
zbk=&xTk%0>+QZI_$6OhYyRx2gSAN!2<zMcquehtd;;Qw!tL{6Fh99|GtPF3zu6)ss
zssnZ>b^g#<eikID0Y1&j&32Wa<EnUz8{QZneW{DwGI4l2QgmnLJ?`xLo!R#bII2G6
zsrHz=#^at^PkL&@bUf>=_q@0MzkCf|^fh|f*W}f(rf>L~zu{}~R#?lo!&|)@(fYlJ
zcJG&I|50RzrIDSMMdz%D?y@Sn%i8F!>->2e{5rMlFWeI7zAd)L_Q;}L(Y<#^_uUoK
ze^<ir{i)-QWKB9&ZR&~Y<9Ek*dEHTdfjfS7cyNX%IL%!SyFJ|kN7-49BxtrHd5$Y-
z?oDzh-)gDce3vbNqf`|ZJIXJl6S4gW#xr%Bk-O6EM$SLUQRz0wm2x}fMjj+u;;smM
z07mjGZc}PN3aZk4ds-LHVh&D$s5~gSz?C#l^D?BC6WvMUTuEafN5VK~;&@m5Sa)!^
zFMg0W*uxW><A`qI@YHm;kbRVOxMLljXoovmVNurMRBD8<1K@DEk^~&?aw<@xA_QbO
zJTf5)a40(fj!coxYuMlrui^03kgvmrL7+w*$O)qnfh46Ns39uT#8ajjWPw92sR%gS
z0*<ckm|U>KfWsN+=?wG&HC%x{u0TIW%O^{!Ei7>qo_BP)B;R(+`_5PJUrk&7>+kzR
z!r-6MCzMp3QBrB_HE-v$upX}VpLjcd>g#;jo-w@=)%yp3zn@?|f<t~y7<sMyq-)q<
zjm6h%kN?I|?NwLhr^ybFezP{birgnge1IJywH}^2Z%fXiX^XGk2S{7=GOdEc%3MD3
zHCgIy`jM#FQc;WLzLv{<tyX&5tn#*5<88Or*M7Yh0yv<~TRk~j!@BP9cHI${x67Bm
zE4*M&MB%<N-S(B~zCW_Zf#{+mF+Gp^q24EA`<{yHdn(xXbVBi&vc+eU2AoSCcrJP9
znTjJ$rH?yaedbxn-+c?%;jO;hQD?ae>}b5v+hSW-yIm1E`=as>1&WTw^*x%<|760T
zQ;9=PCk;EDJp4?B;ioH((2a~doj&G7`lORp=bf!S<5X0uH(e=@IMN?=ra$J)c*2?W
zw5#$9&MGgutG?>4{%?2fH(hn#1v?x~S9w~m_vdU*?|(3}cyD6!=N-xO9Lcjh__$7<
z?k+#uS>aX(J`7V-07v>A&WyX9nfE%g9&lwp;I8tJyXvFvs*ky=J?^ggv>WWG^Sry>
z3!Zxa^45RR*YH(uqknswyzXoEwztJQz83F<w|XzU&HE8;KZ<DgQJD_Q%5+>=rt_+(
zoYm1?*2Q$$7@fOOz)`R*rf|Ez+x9@w&X}TIf!=%lefIc^_Xhg!O&D^Z;^^a<lg_5k
zK3jFh$r_{f_?y1qNSx<Loa;=w1;}tG&Tu8-19_$+ah9{}Tu0e?jwEQlGkK0E=@wh_
zT*<c@0V1k}mdY=3sGJoRL!oh~Tp@B+EEV&e8*1!kpc15661JdJD!+(%6Zb*w-Yi%7
z8BREh^6*VlRFj=aQz2K`DNb=%6PyWSoQcC-@k8CQ<2`XBJ+b}0ad~ckQ%6J<hp&Qq
zjW~xV;Bd#N5P%ek!VXtF<a8(6N`hQ&nGJ>9f(+OV$x|GjREIm=<w<i{=}DH;!wJzU
znxsf>0%|zJ;5BMHgco(iYlPKzhSzsR$ebuM6qg`_)My22h@t?FP703B?r4A`AK-BL
zEpWI3LJfCpG399fcu9l%OQHr{a^zg_<$fEk?9lJaUWxAgLvX-P6-WOLc4SQYO|I0o
zJSO+2gB>|v%C7+xejQQtePply#`OI$w!i#Za&Y*ya^tUM-y&CA>dyGd-F&&L>hr#=
zr+isY`?BSmwP97BRd&cN>J~n%AN6>X)<f}OtjDr2>&vwO$1-6@vt{09%e~E)d7Cc}
zYq7%DYE@Y4)nRScdE2h{w%g!szsb{Klc&>GZ|7~EobBG6oxa@N-u&IZ{C#2h`@_2(
zfXehZ3`G?ki7GlC)9Zx4_ep=>Q-OY`gZ<6~i_gaQKUa3Z$H{}vmm74U+|ctCN1jU`
zf42JU3pM9nNFI2|QTIc4^%c&#E8Pv&d75nYwb~ipZf}{K1CjYhV~UQ)^*bFu;7t7B
zvt@^UoHYDg@`#Vik2qIx<i{09pGzP8amLuQX_L-m%{gCZ{`m?$H#*WDbEG}$O#7!Z
z{RvmrGp@@2a#eZBRrOU*_18SL-*kf=^*?enTIFoH-qU77eD}R+gHBfNv%_8eF-P((
zo}}qvNmISaGo9rZIPe*pvdELV*pqg<JN-^q`d!Wpn;qE?d#Wfqsz2_k@szvvGoISd
z0Uw^aFZ$}g>}~Lhx6!NK#&39=zU6EFPFRa~!&-e1-ulCEVaL*l4lBTp$j+-Gb5=)o
z*$~xrLrmVL=)A4b%8r=sJN!L%2a5K@_SzTIYj2?M{y_18*y4k6gN~FPcB<mov+2{%
zXU{#KJ?nJZ$Q_=BPdb8gz45oY6Q-)ByAx)*6KA{1&UTaqGC&rTMp&HdO1{O&ojlK-
zJm2C-@&d?F&XTkI!qE8ti)8lXh8jFk<dK{R2FFT~m^ZoQ)kUu4*`DOtZtxnZmRuZ}
z;!c|6Dmz}3G}f6s$dxqAnK0TF9OsG~>xmoVi5=k%3<>l1^h9-Wgf~JS;qbs^L_0l^
zE?0!Z9p-RHI9#wB$WVkAB6rY%^u%3Ol}wQuE_X$@r;=WCl?x~i$xs9tsw}xX!%9-B
zI=!Gq4VTx-P@L*A)Mzxc6y8`R6QZs%%|Q*?4ZVY-z1odVybyaMIAAv{aKLW3V+VNR
z2D;(~IvV}6r0HWN6{cKu<bLAmddb)I8*e_+mMi+d3jd8Q{;}MMUn);4$(r&<eBb}T
zcR1Rd_H?+2v?aVNtjB-CyMK%9Cc4knK=IFFJ%;`)S6in4g0!XPoNI|a4>+nAcJPAB
zv-XdAC_W@@F+YR+PPlw4U%pu@7i$|V)vvdF#Bb$?BYA1MJgn(TU-K2d<|}<ISNK}4
z3TwH_*Ltn5?K*F}jo$WKydAgtI&SlJ+9A~Fvdi0bw=ZwMFK?f(@BkFv;|Nry=r|PF
z^LTWxQ!%|y$MiW900=?%zSH+?p!nms;!lG8&nFDLP<G(Oq`{vh5BWTK=;swjUPzm8
zp~|d_bryY|Hs-9O-bc=wE1h-Lcp7eWH`(fGxjU@gfru_gq6&`ti%tjno{b-PAz|o+
zvLilA8u?lBs81`7{=CxYPb-bRm^$`i#@GvKlP+Y<{T!RBGWwXK%G0j2#{dp@=F{%1
zXWiK^x~sh6srGMojn~|@-g4D`$5nrsv%xAy)Ag>_n|+<OC-ps%J@j-cyie-gu5!0{
z%1-l^o9!qE-vM_GJH5!Aa+^E#4p;i!F0do>epl859<ZbGW1gyydEh&0JmsnRw5OKE
z4sX4ed=12R=*==R-z@BC`9XNA55wCmjcB_(qWy~S4lB!aT2m%xZB)*NXz?9egdO?Y
zq6>G#blc_czB|xkPi)cNK+k=F-UkBx4h8xh3G_eeA8;aJ;Hkus=gLmGQ1O<}vTwOq
zYx=3m#hbmLUgA`T-1jlvl`zedFx{It1EmLMr0gtPb8OwBn&U<mlXQ!vvhyey6C>M|
zh>TSc%7oOr%VF^^<OCp+!3ddT@qoz5c)8i7N}lO1J3}?iomeVY!W2)!Bu~NwPr^9W
zSa-q@PyA3%>@aWa@UYmSVX^(ZF$K=Z4h~;sWEKt&jE3LoiE_K6J<fo~5$|>d+<Kda
z(^(FZYbbIpHsC;dVpGHEDi0w^kvv7ffy6}THLN=|n43s?;u5a`YE%O?^w)ZT44nbB
zTn4|E(%2#M8qFwInHH`xtwe$hy?rCHgG=u;S8C)rg&O%vjUs?UsR8wc*Ko!TaK#OV
z+`%D^I{)~s*;6vR=_oww?(%t9&ew9mrQmz{g~9GW#PqqEIOOMyNhR6Sey=$6s<XYY
z!`&9v<MXgCmtZ|23jZVQkhJBRSdSss5=Z}BY09-43rlJ)D9IXq(NXmUkIfFb)3oX{
zzN#+}AD-&3*s~t|^C#<Kt<0Fp4+2^EkXesL%fg#1_cdAJYr4YQd==ztu{x~PI#HVq
zVE{+F&E5`Md>yv?I&SxM-sQ{L>+8DDm%C5ck$*6(;E=D|;jkXZ!;4Nv^gLCj*Qv<f
zr=xnGi|PA`zwdc}@uz|QpT!OMEI9D<_(5Nk9egQy$XDftepPPxR~1KJN}Kpu<yoKC
zUGi1s>0daSu65R0<E*#A-Egy~@eW_h{bB77MdTch%0C$>Iuq#kNpR3-@xwkVJMzoq
zQJ2b%zFc9<rAlKiR~Y|A>ew%`#(kMF`OCD~m+IVpx%P~Ujz+IJ(;jodbYwp5%6iU~
z{h~|Q@w%t_8?M@Kd+NOBskhACaFwUYMpw%%?zY>a@(-pA`?T_~v*mJDIm$0VzsCo%
z3m?1{mbfb{@*p#pi<ftJ((iF)+~>}E5b|a{>dt=DQ}v(js!zD9KaI4-Tl;xWofo`y
zUh>v`*<1frU&Ghrewik3du7V`Jzt9td@YxTx0Wm1;q6w2cUT?XacxAWb&)xnqq=N~
z&Q);a?}#ec86(rodjduK0zLP~^*k8Y`%rA3qp|&t1&U7u2Aqr<blN}oOmNt_ieoQk
zPX4UM+)K6QeNlDp`O5uPIjZ01NSrO1SHdh;aH<y&iJ$B$8;Xxmf`}9!bKPaZ4oj}2
zQmHHXKV{j6n^kTOrPP=Sc~A;0rc$27DW1g1kQ=awho)k0y}^mz;CN4Pv?q3?J9Zf4
z3ycj5j0*P;4)b^SM7431sUz1rfDCVx!xI6yype8qjN2Kn_jFZsJCcPOjtWjkMU)N~
zED3x^tX`mn0E-G*T323eaHN}Su1;SSrw_cS;__DG%^EJ54Xv#|)dOlYuoS`Xq#!+M
z4(WZOG9jurZU7nW6d4`N_fsIDMogj0-;LmK2YR_>b_3K9yFqZcgF`7twfn9%d8(x0
zLnV;|zjSu~G`!0<?p(1RGIiSRYE;jw!GTv(#{E`h#`TQRzj`{Kb+kU^YWuOby<BYx
z@A_p#!B=I9zDKi|zCQ<we~BG*En)c2<tP4J<(87_OG;|Z_}*FX4Ohk!V23yBS@~vd
zl_%jofDiqKi)B4R@d4{0X^Uk&^xJVVV=BKV=7Z^Iw$j^tjkm=bU(2;&E!T&&TJHlp
z+HUr?-=^T$>Fc!1+j+MyXOFMz{;=EwVflx`3Xg_$I~Lykcv#V?@SbNPdYvuP`&?w7
zb5VWHNB6xD)9<3c{}+J)U&amiGC1&3!r-qG2mdE&=r`qte_L+kw-rZ!lREKI=Ik%)
z-tld<*<X9wZgJLG=c>EG-C&Cw>}avi*X{_|5t)BFrs$l%-^JkIFXD$^P8|7F@|dro
zisQbnH1_NA6ECNY|0;9*f6^y^ojUvLns<CtZ~lLxx~y@gJ?>0<!kzK7EAu&57JSF6
zZehn;&RXxf>wM^~w=Asw8gIjO-sYR#t+$1B+7sF9bmr(UYYac*Z}PgM-0jZti(Taw
zxyvI<U+Af@!~=Gu+~G;P$DMYsJM%$z#y{Lyk9e{lbyt2I?C^jcHJ<g<e9lwrd2j6(
zJ#~SPSH1OL^EG_K+xTr?(|5hi-{;(OSnFkBtyhM%T@}_I>{uVsX+uQLrZT`s*R4^x
zJ0kOTMCI>{D%>00ZEsZ1{r;W@Vy#P5M}vKi#r8WM=zk)5@adRAXW|B&DLeR+<PjIk
zjsG<Lmj9$L_@>tUOSNWRsML3}qsk+W#QBc+InD%Fj~OnR2eGC?P~(iBWeJOkvmu2D
zorvW}{)a-_l*(Op)?dn5b_Qg>`ZSM9v#Lq1_=#@O1jqwY#E%sr84->0#18kw4TW#_
z#r226{Jnfp`52aRIm2B^O+=*A6ArK8bjLW|eurFPMPgFc;Yz+qde6AdYq*k>7Zq*k
zY^dBe4r*w6;^X}qm7QS<4qsK5x4Qm_c`ZmLHDEME1PAPf<R-3gP@{!YZY>8g)N7P!
zBX@0xBty}u4M|d*F}VPTE2f(((A^c=6Y>Q5KuV2%nxt5E!xKNu6CB}=AK|ES&-eBJ
z`76?vl&QZsb1uSnxVnA?>p^xz7X1+D_e1$nKUbdqNA<}i(cL}=JDhFKdD>kF>kRAh
z1=tbM<2y8q>HQPf5g7P${IH*r$Nii&yF`8fdG?R79acLtpY&!v1$MZzpC&s*h8@<A
zdRTvXZQbYrc39TK{w+fJ`-PR>rmH;44lmfzYJFJijp1!Jg|*un)?u5s!wz4kJ&-qN
zzpu*yU+%%Myd%E+qhSSL$MNv)C&GH33GaC>qSwa}y+0|_=X_+JPow*N9#i~9%z(@O
zftTY3eH9%1pZLLFmmTtL^04pA4Zl);^p%QZzE7F-RR+w$omXnzdL<_RkgNU%XWh-N
z2HQPNc6(bK^tC-6k#n+4{yBe-^D)I=#tpt49R79UsBe<TeqV0f_Z7x}S84qB<tKlW
zI^mnj6TZuw@_nV*-&VWrO2gZ(R2+O5>~N(&<;r;0nfZdN^2@F&|8`Y-(^LIzN3Hi=
zb(VVTt_Z8Q#@A?rr|D*Q%Wdv<JDmB)lLlU_KIY3B1CRJ>JnJa8#8rN=r`!URGS64>
zc2}i4-2g}W1D=eB+*uF1GaqqhKjx|YPj{6k-Bq9QRDaH0;{{L6f4OVD<f;9#r|!Q!
z^<VQge9P1LT~Cwue9b=av{>eCvCP+Ud03m3zP4+^+N}-iuuj;~X-h<xZDqP{FO#=D
zGH+L8{_Zk`d!o7>C{uJWy6BL<=x|)mBk{eD#q~ZGTYMsRz=`<2CxQddMGyWsV%UX<
z5f=laKTjI{S^DI!k``RaSahY%t=~7D{#lhC8zQPc?1-NW8={P`<Vd(d&O{JI<Vu`t
zYo4?0?Ej&;e<@d4nOpg@oQcyZw`i&;ehLI|K+fPex5^ba+8wJ340p#4b;l0&1p2%E
z{k(B~T>c)8$b3gcwj(Un;VtX%`W^0QmovuW40;@iE=PjPQP$x|7P(+366KyQZ>*HI
zIJ@C;Rd6|BF)VO^7Zy15-VK*G)4o|lzIdWWqnaxW;IOW_x_ouyCq?B~MH{%n8@eN!
zxJ1n$r+fvrm3*0vUZYG~cVs)a*bSkED#slSYUH|PYNNmv+XK{a$Mtf@^%i!-6{`li
zgM&Z~+6{oi8$Z&MFxnBD)foz8b_!%7$btOnonkX{;<CD+r2Offp+E)~yC8_m>Kc>A
z8Z<+VR3h-F<pk2Z#AW89j82u<pWY=lqpLr?D;7}(GIC=x^H4%DX;_Qxpfb;&j>WEV
zSp^8NXvD?nRJ6=Bu~}s*V>9zv$$ArWn<&u$uZ0pXN?|P)u~+(BJO!JQ{fyNe3#50A
z%gjRz1+(&R3Lv&&0L5nH#bshGULEg9-WQ(EEuiGab(d~_3)~HV8V*Z-ARR$oOe&5Z
zHdTNUF=|-J8q*-8#!_rXArweQWr05pr7orwMpw%7rxqZHNy+!8=EtUYLyVfZj2;Md
z(GqH6QVP%v^;B#+o}L?*(G5=wq!pmNDWG%_uaXy&k_%xmCMA#cDC07_$$siu?lZ+W
zHUm44cZBv*gEy#UZcJ)dsZ`;)vNj$2mWzO^<e+6>`)Ds4(VDJUj7jP0mqUbSVNY^n
z^`*7c=caT;jDTwq*fCy0ga!d@S@s8OyT+z<^{3=O0d$o#5rQB(cBM|SsX1|JqS(~V
zu_>Jq1S)lkOYIb&o`W(_sRK$VnARDkUl$R_r{x4wJ43ORI>x1RLW!6`0>(~Cry#bE
zEvsa+7&sL>#ik%eO&5Pf)O3Ng1|{OI!L+=%)LbYQ?*a!IXBlr9Cq>U)Or^Zov~K>C
z0+cb8a0Em+-8l8=8|)8|eNNF&aOiNfQ7I=ETevCE!<grYtDGCGk{8J860DLR$m$wb
zIWIOlH;~yiE;}EJ&B`;SU1KSLv5{Rs1uJ)B5Sv*LmsJ?d?iQ1thZ2hctqEj`g4x{}
zK(Se9gN+pW(Z4gh#b$L!5SQJ<#4%|F2q4t35+&+Gh4$1<TQKcSp!L@4s$|QiG3v2z
zsFwzeGYjLgx<USo0xUvYgs_UjDlTe(2J%8|i4vPafD&uDW$Ye;_{v2Z$PSnwkfHmT
zf#(**X7*r-MU)icV0O<x*TmqI<J^M+s@P0CQ5481@~2}vJ%d@jV>5bEahbgW={*<+
z(u)G=R;53!C^n;4h)UbXW}sOQe_HprOl%4*yQ2oBZU@hjwT!XPvfJ2)3~A42g*21B
z<!*<*1r1Qj5%7aw>D^JH5}Wd;;{f)sN?nC5vt+#-G(0y0uOa~!1A<O$M@wO7w>WGn
zvqvxs@3$LT#^K;diAo7n65}Z>xiyeC78}O~(=lKGP?Qu#6b4&f9LluZU`Bp0BM*wt
zw1T*_-1v;#1bkYg=AaCwcZE>Hz^X|T#i!?D@FM^PxQHMD8<ZFz=n_cj62u@voR%Ax
zh9DoM5}{P_8QrM3w89|XU}`}S#~%j}=L-i4Cri#3J|TL<W%LT96+yA-=KS{3{(w^>
zGUr-j94_m`@zg_HwA;v;br2k?uA~Oa*sR=OW%PIic}9UuStK%0hO#3z%MO$j#0O%3
zMm`rgemJ6JP}u_&k}+cqU=hbs>7cSJLsvnpXC)Rv0R#pjCZG`OQ!I91XUuc$2Bm8W
z2tvUGq3l2m8GNuAHwb)~mfB4A3T>o)$j$`N(e>3)@||*r4Kg^WP_hPqV1SasDj)+j
z1c%KF3BU`KesmqJiAj|PG3ZYjJ!4YQlcb~g)1-@#9d>|jgf0TmSbYoi;10S7dlGvO
z0(K?@rWu5qkb3m6(t1|f_0ks^V8^gZV~Yp?gaHRYKtKQrC}mXJl(B`Da=?WJSvXc$
zlwmJi$dZ<bDH4HD(AQ!;89`)7pm>r%*P<Q`#KZv{DtsVYW<&^rID{Q>>4;0&L3{uc
zacNz+$iT280l2|aY=|(h7qLp%5dsdNN5FwHh&@qi#HFDIDhT2brRK-ugCrdg0W7+K
z8bKUY33@<ehd;HuVTX10)8zDpo<ws_d4kL-LtvjNk)Bhjbi`%@7O)$+WCz>_tVdjS
zUVIe{NHH2FfD|7HO4$*tjJ3iJEMgUq0U34}eCTkM!3nPstc($bkt1Um5W%qF$f3*_
zGnJ<1rZ@&4ENUnqvlb=90cpf$GR_rP+_Jv9d7{*_0fxP-vP&|;2o%6uARVx1O1vUS
zp|4&F8f+XJ;TuN-?v?ILk+zg)aUW0yD+?4z1mc4-H9B}ijM-S@8>qoW#Lx}(+C}u-
z%Lk5r=7_UU2{KSZsMKbqgP(((9f<wO9{=D42E24Q)}s_u>1P+Wz(saAeTqC6HQWLN
zH3h;BOY#Qsmb=4vs+G_<6@3Y-Xf9Z(;J~?)BOvuC$q0=9U^ZR|<6lUjwngXzVf(1W
z){O5^i11m$4y@JsZb1MD+sr78$JxPY64L>%F8By#2OS645t|B9<YEzkD8+=050qSl
zA4$y22QO@+kw@Lc4iN^91rAb!_y8<K00(jtu!Ft>;IOQRn2v4%oU(LSk5YEPcK{!;
zIJs$Z(s641snQedULmEP6k!L?jyXr6Vt>#xRpg-Q06WBPWak1Lf{$!~AeX!dwH|6l
zgdL;?lNXiL3qF(=w%4#wg0zLCpmg+FgG$pDj<M3AMJSlj#RhEim-QHR47iGcS%fe$
zb(=DVAti<NTm~5JtS38^1(u;eNmz(?P<$|En~;{WDJ_K^_6yN^NE`EtN-lXXcC7X2
z{Rk`{QOXO(1{MrhuVYE14Nxf}CQ!n6V3F=4nB7a(sxL){VAs*b-Wd6R$qwyF@)UFz
zGvF)L9#FZ-@LH|LK($+st=V!6RIAlk#Hgv;W?UT&uvn+{I8$G<<!Eg@nrm4DG1kVY
z$0C|xaZHtF!z<M()&xx$VVek5DLC-HP$E`Oktx;#CFp?huWKbHJ6K6}5EEF`4GJtQ
zvtvO-0>uYbVavh}<2#@rda|-ZsZoH;1=O$vnkYU12;((C5JH5D6aWEOFjZmNLXJQ{
zhN&bt>}?7=VpCB=yCKsVC}BFFgiJ9V3XVehj?kP1?@I=JN;mor+6|mp8cYo=n&3o}
z9p;Ra9SRGfKVnuYd5a`x0XTHlLmUT6<}Ch<E+7Sr2JvAhEaE#tMfVZNv=;r~Wfh!A
zVFx(^a6mHfbYx;g0UR7!BnU>1j5^B;6aoYYtPy1oZ>)tFht{(+0ZKOGB6wjMAlBDH
z8xd;w(j3(&DXa>?0ea!hC4~lfNAWOFrImQs@>-}TS>pAL=njBB@+wSWbPr2+l7aOG
z|HKQF#*CP?sDVfg0}gQ(w&^gHv>xP$f<R8WW+D=6szOpA5F0{**d0i^6io+|-FSF*
zqhV?F2B+2?lu~CP%8IoHP$_i=p&n#0s!+3krP>403^B@3p+=wEpK(eZv_~wZ1a+mR
zO4H$4jRxC{uyPh*0Xd@eeth=g(Ba&H2wEd+anR%tkp*HRNC&H4YH$Q3R%GZlrAD5}
zReTD-5tEvaw8f8ss`!u@Svzgvd<PW^vydSrhk78TOJWu>2w?|}21PT%O5-v}5aukb
z#9|@_3q6SDEKFPCGvF^^H-s9Y)&t;x_0Y^kz!3+6;G~P=kmSXmf*QOXWGg+u4*Cwx
zci^PMcOc*=1pT8L4LR?j;JB%zaP-h6WUf@fVNrtw31oIfsseTpAI5j6#CNa^5kR2%
zi&Dd|1EwRsGES=Xkxqhei0a2OpkNIlGm4D42(3q@F(YiowFC_tgswG<p$*6^eNpBw
zsFYG0$X@9nhgU+6#Qs}=APA(TZ8{*v5b(h^-~tq186WcUDrk=#W)_2u<5lcf_5?y;
zzqGy`bbXj3G21sxD3TFG1_?rTm<HMgE<<2JaD<99AwkeZzyh3jEe$f*S0py<Km&Fu
zT`PSBEXb%Ybl`wzKx$B^Ar5Sz#>8mZpJHsb0HxN&1}%0}tW^wlpsZNCUv{IR$u;_L
zqEvVxra+)zY6QeM#W=0Hh?2+<l*r(>ghil1OL9TLft<zm8YnR&B#{9-u&Aa38!14}
z0(Qt1BE7yt-(i6R*#t(lx(`lsP|RP*2n!RLc?KmA31WDG63Af8MQf(RW(RqM0FEP&
z0zA=cl(GYk!=CaeP}2ce2si?%VnARz;>9fBErS$zFEU*UcJTb-Tx%&kLHhs>j#vz7
zrkGHRDjyq+QEBj@r^BA_06YAdU6{5==5k}sf>N^;2@Eed!GS>R1_;V5#?Dzd>jCjP
z3t_==MPwkbWsP}^a~<I_#-L#3o~R@R3^<_BA%~~%6Pu$E^=!|zriKCcL0{ea*oW+w
z3rRFofQSJEL|(8&OU4utgN@i}i)@XH$|HGQzLvg_ygG6gvk1u^vPK!9I4GU?K*<;a
zTudcmyL|{CjLWz&5UkiNP--xiZlt{jT|}}K8zRyGoyl|~IE6~JWWW;vvMA=F7=TEv
zJJ{d=0St%&VgLgQ^(@(pEm?vc1|LEV6>^redV^2`2b}egg8-YLQ>S(%-o8j+p}vER
z2&INWLl6kYff9g{7eXSkLu&*pF{!1`y(wpb^$4OH;A0=uP=Ok;7}!D(Nm~LK@X8Jy
z>XM;^8VwVe{KZ%gBY-0jPq#0%KnYoZ0;nO5#s-JQ4nq*IgYz9=2TTXpL28g7GTD(P
z4ogltFd>s27CUh2RaUkF@m#C0Xy&afX}7UT&_s`3QR!T1X~F{cQCX+~UXUF&HLST(
zA_Js=Y=VgI5M|-)TKHh>&j48<`BaxtXAfZcB$q)Y<H{buB02@uaDZWGVUbWkfXdLP
zpgx2S^cU9Tt7&FGi<>RQ2TN@!!Y)CE2m}O4VZdQxE;3Nzqfa)47%yQKv3<di%?_0D
zib%xVZDJ97f;Ub;Kqe(YX=uWji(G5iK}H||CSub5B8!nJ59{LvLq+-u*+G8+UIerH
z(02eI>`&}i>SK#wIxzS#+6@8#4p2kQg(M)L2^0bdiy9h>nCuvF5%nNNg_`|R>sk1K
z?~u5T7?AY(0|^V^h2RhGNMcwFu*3Kcfr3^l8f4@fPhlGktP)bdSzwi-K{m+78pv8S
z)Amvc#{qC?Y0Y<p&Xq!(?|>v*fpG|NAD}}hFG{C5?97F0={~4XlrU!jLFhP80v||N
zbg~0aFC;Y(fFLj(dMgKfkd?E59Y|Y(I97U{C8!=jyaP@sJ|W~vEzYuhRD^tTuro;C
z(9@0BG8zb!6s7pEV_B4(1?=!=<`~l<muYR&5t^_tCL`jjpu0<8qXff1fI@IUyv`Eh
zK13LwIynmHNY=m_4k`*UN0b@WTqF??u+jvm<RXJmq4G~g23rs);B|F3N?Y1{f(*;b
zK?o7h!9av!4Fgl6Jz)VM#@6KJZrr6%>tuXK>AS#32i}wo1(TJSk^y<aW~QEw!w>{g
z=vdU?D#>d~FNjz%dXHYUMI~c&3&tY*6G_tG%mzbroR|6w<${2N2@6D6fCxl}jfNY%
z1}oWst7tUH4nU+*o&JcCvj88N4F`c8!EC${$wV}p!+RGgQ}hlFP*{!$U4}F>*#~d{
zQc#Kmyb&P<5*A&nMn*FlyV9bGZi=P@F%uTaS<FQiC;`q|-3KR1feabyEbR#n0}Jwk
z$k6-Bx+0NbZbEh#a4=^<Del7t2XhwAcZ8Y_1bSx&V(d(J<}8w`2uH+vNW#KvWcY+g
zgZb(WeE8)o7saHYMyR3Sus$jvw844DQ?!RzXJ6M+(tngMLJ(mGud~2+AZ_7%hsjyM
z3kU&o7M=bOe4u1ttJHUp7bsyjfDfH0#b~kE0Wl^-v{D9=8B1h@8S{o6I^<-L%}j|g
z$!BpDOKt=Kg+<+(yqvH=c0=gECu*AzPh>;E2#XMrVOB9PtIQr^3tEE>%08HB4il)X
zx5lTS27^K3KXD<nhLt9u6Hy5oZpvA10tZUsKw@Qwe&)!>j&=x3+Knu-kR9@ol~F`?
z7$_j1?*KSZqQ;N{s|W=IY>$#p;ab#avLhuH!3#6l0dPQY8~_Kz=~7N-*zX!d#`}^=
zPy?hE>!G7vYApL8KEl94ITBhg>52LaX`}VhjDcRe#d}AL%?duij(|>=GG_^*KO<H7
z)BPQxA}>(VYmgv@9fl*km}2ljf{+>(LDYH}b}(nLFRxex0XPCF*toDGpi>@_v!r)}
z?*KbOud|qY!@v$b>Ag5ts%KdsqWwY8KvJO8SfuU6i7?Pg#CFc2X-gg@nM)QdhGjh<
zwHqcz0wS3Ua~ANz_zoz5Hykoo3L)S%S`JQ*Pqpz9Xe<NI9#k^mxyYe~lHyucve``~
zg$BR@6CYCvVKENwK=(n{$_7zM1EQ=c-9zph15}1$MTldA1N8<d*a*bNWCvEUGISrf
z|L`4Tmc1ySoM>QQn6!`)8lVh;g~YsJOe+Nwh7l;?J3tUlb66K><%2>xgyymQ06}T7
zgF+2DP>4N|Uc&m!217MB0XT#g#&PgE3k`)Kg;_KZ;i74P(q;|tff`{4?1o%qsXG9s
zgUW6^M5rODguHR(g&Zg(EQnz`uojDA6Lb!hu0bVSpr@eMz#_O16mDXJv?qA8r4WJ8
zm}|AtSdYR#-&g8SMV^w!oCUBjzJo)ZfG~`ZKmoyNQ8FSnr85IGfD-{_tfwHC0aj%8
z#JW0*QiZJn7Ut4yDLZ(nMerd)&LX###^Z=-&SDFT@@WBr#HRO>3vI|;(&e)O#uMxy
zI9RHrtDuC0J5q0<#Li_TwsIDf<_e2sE(#8mobph+VWC7xAr|At03%J9LS&$X*N6c=
zH2^zwAjxPn7dto_IlwS%IF>lTD2yvCa&)mY!w&&hu?Ej&1Ga%!!<f>wz>17^2CNKS
z%U!xDpsfA3*+G#YWCvaj&Vt~8xHH^7OYR|GF1~V4vsSSsV?b6(R)Q@{(g7$C8Bi!n
zC@i9Z<|e`gu@#C5nvP&rukzIgW;Ga9q4v;V<vys1%aV>_cL*!inNd~>AVS5yqKz$f
zfDu4Og_`gV;x!PHAc}y}WF(`@?CkMRR()}2_0=EO-u!W`&1Y(FJyB=-;o2K^)p>t;
zwb}P%6-`NPG{okJ1rEtpc!5?;hsjxl4)PHvZ<g#p4cLKF6BcDISs?QrGVD=;5dsvQ
z_~6rRB1lWb`V>+|kf9|S;LS<{tru{hj6?4d)6p$}kA0gRC^cJw%MjmT*dce3!+Iz$
z;5A}Xa~OaTCPU%WhJgsZ37df$WQVBKaWEF&0d@cxzz3)SX&~Uxxl)<?h{JI}&yo8|
zd%%F)#15Day+aJ|7eqk*BHchqVfu#E4fO1r4j}bJ24n|PTHj}3&H`$%<dg>q5<-o<
z!u#HxfAW`wAD7HLaAnfA%M-U<8o%Yz*v*$lZ@M&U<E0TBE&&z;KQ8Hiwxr+blHMmv
zdLA$7ajc}<k&^sFCAkMma`u(fe`q5HAx0oR@NJIBa5C(`7&F7(3^oW2;80{jF{Iua
zcsdU8ta|OoPMGuPGp{V$ec<GGSN^+c`{75QeQ(6n2kdc+W<ms8r5n*Lh>t)UmTZFn
zA~+yGfzE;iAttD&Us_h8kL&vQ<Bvan|NZyhe*5iL`|-;!zg)X^?dP9={z)G{{`ljY
z@2}$y$Xib5MFe4op#uTI7$r%ep28vv15ks`qI`|Py?Z@Af7-G~Zrl3kT{|AVch4ga
z9DL;ABTMeyH)8UKRhv$=I{|wJWThveNeTjd7O6pH?~xCp>_)@M3;GVdj50*CmC}nW
zsjVhdU$U(3`xol1zg%b2=e0LosJZD}&CMrkZaG$K+u=Gp_BGhGv-$qD&3C`s<mE@J
z_L(48Qg}~?5=5s+t;vp*y5LBEutVq|mRsx<!C~=2*};R>v0ck2rdN1+R{3XUm4A9>
zIV~laH!M4;iaZ^dP@{qOg09aw4grd}_(I|sh@j**36&s)%vk^qz0M-|kUPYzghl2%
z<noG*50+^QUafPwBz^7w6xOER`m%6@#w3ItFdd`@=Q}hI#}SWCn1b}Dn=u`b-cf4Z
z;vrvV!TzVoTxqE3km*t}7uIza>(r;o4W>M~JnxY0KIl7y6l4dwhrK9kAtmpP*Jzou
z2th*TJ2=z9$&LkQe+M|`pDUSn=K9>z*Jq!)KJ(=D=_jsFJ$8Na(d!eBT!-l>K2r*g
z?niF`N2fg{9d?&+WO7&nA2*GE4r!FA4}}P8*jNVJjYb2Sc*|qoUHRdMt3O`-@uweu
z`uS&!RE*bOfBo&Z-%p<Tv}oAkU}Z2u5WrX0z<Mo|x@FlV2y_72hzYi2CD{RRP*~*c
zVbJ$it`Z!E8U`GO8UzQZfydRWSHJq|E55qyfX@FZ2ui_0OxS=Be6W&>2w1~ZrF+36
zcTQdTkGX3foWJqGg<Jk{+l~kC*z>?W2OhZZ=z|X)zyIMg_dfjbkV(senw3D>QA(Yv
z=|BJnV#5yYH$@rshtOyk0Urtx8yu}C)_wj+y$#>i-}p`4O<>0twKsiIWAmvRn@`l(
ze5~fygLQW7X|Q{HlYQ%3A70w|=qsJ}KVE<8MB_UouuVsWT76Nb)*F!BXsC{7MW^^F
zNlb8jL}In126kibV`1lCaQs<kpL5+kK0O{ERMvEcKtxMnhkkNm00>-A0v|D{mL*Yw
zpkAzpAEOj!N9Rg|__R=Vi2KkBv{0;m(U$HbUdKNMJkS8ezI5$>srr%MsvrJUYzS{W
zwe1GLAp}us#N$;gh`>{zCQt7Wlj|&S986w9vK0`-+~py6h{;Sxs@&qC5(;RlqTrBE
z2)W>*fmN~_s3cD@_XKJ;5Q1n-a1h7cZ}>h-XwJfH#Y~ivAhQo$z4fdGj#($K&p2^?
z+HngU6AoV=cjynWqv!sse*=!TJ4)he_TzxGMxdSfL!oFu0P!vlh^rto;0->iwHW@!
z2OGZm{tCRtr(b-vY5SoU{=M?{2VZ^Tz4Zr<oB=@uAiw<%4`M)|;E<Q#78rmFU;$Tg
z-$L7y8X-xF#Ar{TeE0niq(-RSAT<aMLk&Ctjvs#b;qv9n<}C;~a2$jMGV6iS!jgap
zWd~%~!NtmT#|`WK!rc>>-8XgRy))L{GiSp+^EThTV8=a+_uO;afxGWIeAm4v?z;cX
zT@Qb9*P|CFE!^EO=MKA<2rozt))<1IXRw!`68J#QV!I5P-~c-i3o`U-Yg(JhbzVH)
zXyere8?PukzO1w9(^{L(5gau(AFZ+FP_1qI>+RgxZ2#Iehd=Cc^5yOyKhf{}?Tu%T
zO>2b2M@)x;qd&712)-ku{vaLL*1I;oLrST%bQ3Z{b>MN|h+cI%v~3A*(!Oo;_HA2q
z>d>k~+ZG+$W3dG)JGO1vp-s#7ZCW&H+Rl(gfdZd`_b%*U&ceA;y}Q)9M$5DX$bbSe
z<`HoGcdfGjTIIbz!%*<*thpS^Yz2!I*MD1K-8TrZmX1U1hQxpcwqUGB0y>`UJ2Wse
z9i00R#{qC4XEC>>^X3k<8<zXf$qwG!Ve`WF9X#C(aQ5|{W3d<t2pj>d6}y3w{XrMe
zUK$8H{+zP}E0<1o5FaR^nFp`la{Bt5Q>EaTa`gJ7BNjNu9Q*@0%in{e^>*<cH>%Wn
z5Ffm@iW&|r1YFA)4Gc%v;FY)5eD(FW|M~X24_0n17;tO59y8l^pV7K-TAOauq0!U-
zaq#FF0m!evExzw1a)BkchCoY;4h9w|Lu*6|4jK(ewqTdve)r#-sA25JpQ-U*eO$V9
ziEk6)TO&K{p(2ZrVFW~Ka4i?hS06aK?@M=&|LCp>OYfYp{ProUZ=b&5j#-;;pS%6G
zdAo04aA3)jBe&goV#z(Hm)v)5$wL<xJ@UoGB}ZzvUBFJmegit7G`g|(NUs7rjN{Nb
z4g|0aG8>xFW>TH!jyK+T4eV&R@k-rIU)A08MXgQeYi>SOee<zun-8lFRo`;3*0w#3
z_N;Gx=)=y(U+wYn!^NN8QG8}r?Eyms9B?0ckp<L{oJIYJ@g0`vJFMwXaU8TE=bm$%
ze&(<B`Mc>qY|Fj6Bme65+^gGie%#vW$E_WH+|u^PEv<jt+~Vq{W>+^hxw@g@)%EpG
zzg|sW%gR{*4jUg<&H`$1$|LkEEw=kWso9E@5+twuDrv=KutV|@_y~KZ!$2hF_4CoM
zofn$e2@9<UkO8}qkOgO9COfR0MXiTW1J=X7%R`W%*$NGa#g2HScwno1rKNPTLk4_$
zPqIV2WSVu-)nkeY#kpooI<Q2xsJuWY5t&tbMl@$J--YA7VUoFI%Y_xN1H9lx7N#xJ
z_WxkzDYo4}o-+RM^|1&47=7T6k^6-m-S%Al8*sGPQtCTw=?AZlA_f#<GJ@mE3^NGz
zd=@lj=0jh8_4TE%z6KYFj8+9x+jN`JGJgt!)`inq^Y(|EnZmRxm?ERyrUPPZjT^+4
z0SnZlBrLedfF;>stcN^Z<FCK@UYMbeP-+-(kQxNXl`B`i|Ni?gzx<Lf%2EPl2X7uV
zfPev^`yfPkJ1M9^V=}PE(|3*k=+5yU-7#+I;<3vYjbFWJ^7=*7wk({!ec|lg3+C-#
zu;B3g#m5)iero>R=Wf0C;=BjHxb>mS6BZva)X<rB3nCP{1wVh#QM5Bz*I78zL4v?;
z5Fa%buV}F0r$!rpZn*Jkz4hN!`{-h|r5{&acBba$)73T~0X2+jZrj^<&-zveKkRty
zweII0>UZ&uVV9=$ST;PpiGai8ETY=|)9MWZJM?OZOm^VSa;_BMKyo3m91S^K+aGYO
zxx=yg_8YY0v4sC@?)k^bDJ3UHmK+~ka%^D9(c+RL{YsAXDLLG;<WTpLL)}Ua6_gyz
zEjf@=vcL27y&W(fbUu{{j-)MM2k-CTr55-Om33P>*kQg7_u4z_INQZXnU~K+ym;1H
z_^XHGv7?Z+ppRGIS`AnrRiWunY5+YJHBjoM763wIZVZEXTe{xp0iXywczYNV7Pt>#
zhh`j-u%yWeg=jh10e}ohPdAOHSPa4f2cO-5H7vD8Dy^JF@sY>0h1Y1o3x7rznhxRv
znzHu?%Wj0^DX<%(4*W4<{~yElO3sqM>+0Wtqxt5N*qZ$?AUS}|B~ng;QbdNKiK#(s
zh8f{fqvh~(7e4#!%ggU9-2{sPMi3cF4M7HL5V!3%?d&I?|9tJ*<{gKK0|@)TZN`Uu
z?In~K+)0+GBrm`Y&V~>os0n6w`_I?kg;FEbZh#ubZjc&$eDTE>c)1vKO`BX`fsPOf
zKnmkHSVLhT0UrcMi&hI3kADBoaUb2T;8-wb#jRsj&l|V?mI+(tP1%0S^j&jj@0)YW
zp*i!9&0ctF&TZ#r-+5v7J)hn3z@=Ls{wi<qYea^jhV~m-ys@K*vKkHx1qYCUYz0d1
zJiFohUo~9&Q`I*=Eql*4|LkRfd8^~*uZf$#Dt`X5icfCN`e1j}jTSp<ZQI>&_qyi$
zKk9h&#qMYC>wEszp`TA0b9rc;V!4YH;(cPgaEmgt!C;JM>s?#7X~-v@Bo{h8B#B;D
zkE=&!mz=+|<oq2apDZc)cu~p6^GnXnEjc@@<kSS^MemX$JxdPvC^>9+k*CP$qSWYA
zvcE&gzV;>i+F|3I3Q>Z{WJgS@{2Cj<!Rb<DE}FdL!F|woBxK=pKHma>{pk9^1;|?X
zt4G%l&UbnLyqQ*Kw#y_1Qe=qfFyLUqqP!660fi<kb|81A`%|!2phoFjDNIK&i{E4s
zQt*W0%n}>`0T%6#3e-rhs)t%SfaY;xJ+vnXFVu#}+z{4U--T0xsN=A|gAZ_!AP@|Q
zKSO>=Y~tP@Or9ckL%{*NF?`=2L-+nMc#rsw!oz<DjwTyRa~69H3lzu##$1%KWV3^n
zB#7Y%%Kl^TJpb7jXFvJ0V8DFkh2SF;A}CwrO>Uk$3FWi}PjDKwX6q4nT~2LaBjgvi
zuftf}kYdFuwV5yiq#!T4bRRx->eMOvm^5k9m@#8^?AX40_paT$cJ17`6Y-Ai)??eY
zty{Ki*}Qr4kt0V8IKKPtyKle!_Vdp_=es~D_FLJZpQQo_{iKzTTtbAtgAg(0gyL83
z064}jT|8#_vk&apz4gMbEzreXTR+{o?X#WRKi|3Ii=|61%$|32+PqWK7Mz>D_`=LP
zKbv#U7r@8Nd(Ova^wDl4J{Cex(km?NPts8|kX5`!YqLXcFh>bh8UI|J556sX-@fR1
zn_?F2^53yPaQC6Odk+QgJ(zIM-h?~1Cf>HT;**=ItUFkJ%Yj<kwl~<hy2ZYCIv#$y
z@YG#>KAt=9;>1y34(Y$Ww_!(WUF1RHJAe<v4xNKQmlbwE;0SLvg$;p9&P*;jIilpm
zu#)3L)nW`PIo3af8b#_d3Y8l97B%*h8Xc7yZA<pHDcRdvw=dGmE&>i-XW@K@KQ&h;
zN{J7dF%6yau#oV7J#K;pA2O+~sV=Xoprrdyj#%tq!opOAr9wogVPBnvkjo%dxglra
zM5zpT{i*>@E`$IlS9u{2v5hAUh`3H13Nk{|L#s1{5(H-ff%uM4cA$g;`kRBC^5B>8
zbun-J?jM+^z-};45xcSPk0E>h7`*$BfxCnqUAABS8*nsQZ}|=mNDXA%GB8kJ0Ff!?
z=22F1EmqzB&?_Hb{Cw5M-EbDb1bLy3V_LJW6I<p_1u{?xc0eujC;#{Ak3anQQ}O6K
z_|i%Z*$pm+l7c17g|Q)MY<$P~36nvM$&)7o91|u?7(IHlLIc#m!vY7W0c?O8`q;E_
z<3>`0;P~d7Z$AC>Q@$ybV28Xlfr4Z%Kn4l&XX{~tta@V>j(Y$0F&`}&vwZG|r9b`n
ztJOpQ^my#?Qxj*OoP6uqw?FuN_8k{y0U!5$am$03S`|L3Uc=6TErLj=fwU)CbMN#W
z>NrpeLDK3C0ZM8=e<tzXgJtGzk6Lmt=C0%Zdrt-)I34$oGr@<>#6NT@;UC8m@7tSr
z+xqlZx76Ict<KhUjds4@V(%**4?S9VVqxzy(*|D{G5qrZBQAEQ(cqWj7(g=LVLJ}P
z4lIg0P;j7UW3lA;kdouz#Q+N#NBb%@dI>dPH!QCKYUGt1=&Io8EYzUgP->LyX;reP
z1=)d|1yTdT8B<ULE<^6};9M!EJirb~UNGAAGOcx>|MUoj1s*rSf)AM(Q@a{Ok^)|6
zsevdCsY+U2Y)aSo^nwIX1IQ?yD-F3PT}_AH-_afHK&s+Tfio%+cJMPmudwiQLI=Mr
z@(XWzilt2mDXbEQSC7B&La#%yd+=P`_+2>2TxYT8O7nu1Wug?|KsjdT521Mq><01_
zfMd|^KL+gjqu-9-;okoq9QD_hgbq%WWPy%biyDv&BsBu8<RTR6N1(TsZa8!P;^Qy8
zZ;XaALLdTm7{}4H%LFV!dk>ws^261;9(he)w-gqkf!Q~E_pBHYq3=L2Zu}&IW8%b#
z<HwI5HEI-KL2xKF1RFLuHVHQLVW{!7J}zFoh&O_FRGP0zsv?sev>22z9kd~22Nqkk
zU3lA=4;PJII)BvinIk^3dh1_3o_YT4lsTu)oV|j0@qOo~FZq=C=s9+|^1`yR!~{N$
z&@HqxiP+n~4rVJ5QWgF@2UPiA7bE8HEwlJ=<Q*rY?miuJ?-~F7X9EwOi+ku?@UBDU
zW-P7H@8R-2?@5~WTGbUB>uz1qc*pB4_dM6(z=Pe6-`eZ+)B&FiA9k_tsLy+l9V}@&
zP-Zn8f<9{4!LE#wmqNs#>8%+h#|H{Ej*%LD6dXzoNm5`plo|(>8j_^g)UfP^P@`mb
zv+KK?U~6CpH?FegO7+Gtne`wz;?W0m%7b@#aLR+n84m*s27C}4=0SV_7JQft*HD85
z0WuOY3Q)!)K^Be(HR4jSC^?JfFG3C87zTE5zC&*b6UPB|SiS?po<IC!pJLlwn9m6l
zh~3arFC`9$edMJ-=)uP-i{@xqnzQgb_()iovoK*HL^$gKjok4A@)S;snmh$|qyJ6;
zN1yG#!*~1{9L++&QD?QV14ES3Vadr0fdX)FQ%Ru#IHLEGmsUbsb{{(R@%hE~zX)nT
z#$^B&N)0*=AqWI^e7JJ!x8GlR`K{I1nttG0bRavp2sGF`X04_Bz@oL!nT2D=O(ZyA
zI>wC~H*(}i@B-XGDcsm<*$rTW;MlNX!}@jWKn;T9Kl-?E;R4<QeFp_J=ndDx2mpeZ
zV2l#Hp!62fo`pFNE*!P=)=|smjaoi!*oRi<{j0}Q&z#+`=@R3G_k1#S!TIU8T?9Uc
z%-DgR#4pa05!$z;C#ld&ta`8mE+bWL4C9^VVnDE%_|TcK1xLbfJ5lD2Q)TWv1$;yk
zAB*<H7u;8={!oBMZXs<vGVAI08f<yJ$@YJ>+Vx0>eRt#^p4H>{g#Ksx5Ba3$h>L|F
zg?yV<6BdF40df|Ttr%I89jMpa#$r+nY_9=o^s<u_c#Xo6gP~I!@EV;;_Jt-XphnA*
z-OaD>YI=QFqd#`k$LA`L0T?MV@LIGU1xgK>^<d5d>AfEE#TMo)z=uVJ5NCn-zunS}
zP`Plm!w3y@8eJY{QjEy3OW_4d3dn%zNW`b9J>Q{TLvj|dL+=plmH;=Zz9UwC^#@$z
zL@C~moKsb)>99?uumB=E6c*B+(;S8!sL_o`Gi@nC14n$-e6j<j`3VnRXHg-LD=f4g
z!?yj`nikbOg?6KO=O2A{{N8)p?>)B)I{=RMyZ$FQYOgBc$mFm@z`>)jj33a!2&)V%
z7>5c#dFIunC(eHI{Oiks41fayAV>-zgI<HCL(54=Pkj9Kci+!k{3KpZH^@6mur&)D
z3@Gw~HHZ<!SJn%<S=~mD84qgU0n-6?j2JNj$e`V@vy@Hr8$yls>i`Zs3^nlh>Z`BL
zpFbb^ma!)a2=N`pXdqxrj&POUMcTbj;nVX+Exl#r^4TL-P9Cz9X!y&=lTV-7y3Jz8
zoezFI>DG^@E<8W|_D{#m+Nb?Vx|G@t`A|aVFfqCpR*@Zmg;2n<9&&dn6m!oh-@@Zz
zi%*8%b}~Zo5ea-O+!xvXk)&o*&|aS+Gb1(beYwHr7n*H*xb?34I_;j5dthSsBP05p
z=s)O8x8Y|x%T1-W-CzKYfF0<s_>|)Z9ZQHnQG+dm+)h%I8aE^<pa$%Qnc9HeXjifq
z;6Ren5_W^sxW2Q&A3N&(vAs4n#jn^ZHLzv5)S~kpa&MU4*<s}@5ZM865Fe6+=)<HT
zfJG=fuqu=tXu}zFJj~U%5XT{=Bh+`8ghlNJRXWqboJA8B@f|Wzn!%qtmRS#lf-r(-
z)8>WXgQQ@MmR4gNc9d!~1Rolslb~bpra?I=IR2$Mi{9m7<t$_eauzimGWVe|fx-YE
z)L;tI8Ho`vHeY5zz?j0oGsrNdeyPNup>zl_pki>^LKZpFSfb_hg-?JTYq#tnHDENz
z4nqxsqjBePO>)L}>NWH7f4=$Z>u)>vnT;JFJGe6x_t4ZJFdl@91P3%~^f*#utUiVh
zAHGE%1{-2GKn;QekF{&pu359jP~-CD%a<-)`uO9I`CjzxD?nwY!vcpg!U6{&VweJU
zpzKxfxPW8C${E8}Pa1695&xHuC!RdDWvj)G+wMO*Vb0mfw|+8p(S?z-_Gz{vISW6C
z*tf7qv4<hZY%r8xeg!W$X^H?4@!WdUyWqHQ(TT9dCj=k2pDJ_v@yJ0hM|FFoZ1ZWP
z2Jbzswq!xW%}+JkdVlNf3p?zbn!9&+_rrtx9P8EpWN!YOU5N|`$l!NdAhJXIE<X~r
z*YfJD)~LFdPHh}kyJ1~<Ws+j1Hrm;CL#R=*8`NlWeP_e#LXA3qY^(MA*6KP%N-$aM
z(7QY=(}Bzd>@dC~PW~4r7u4XC2j?vCFlh*25y}q0B9t9yDR=nj<BC4M|NeVYLx1~6
zz(K{Pbk#toIqaDZEqPtmG9aAq&~M_)_gP}mXPB^P4r1F1`8>d4C_C&$k!?2&L@Y+I
z4Hgv~0u-71$PBr^L!}p4^!^U!ESxK4fHHUE<(&1GJFdIjVa?@st1h=*ak=I4%gvTv
zZt~&fM(<y)|ITG#qS@x_O*WM@+E7w|T}hoaCAC(S)L2ncby-RFhb5Wsm!!W}5?8A~
z2dXW^7|Akz2o8)QCMk#wDNGPrpWA;P*a3~2@gRAj5_S+AO}k74H4vb@|M54zxcr|>
zUwvJncHdA&aA&y4fH8ds9fw)VDUXq(#u6N3#*7&~di1bi!$1tBMyTBoZh#sD$LiIq
z4K?ui^2;yJojZrOz&C|-4B3iu!J-CThT#S9!RxXrNosO)9+@?K<;-ELrwv^*ZqRa~
z;V&QmeB#uWEnhOe?VdB^W}KcdSMV`l+$R1|7<(1^ld?nX2E<Adg!iP=YamFgH-v$E
z-Z9Vo;~pCyVM|U%+_F2e=!xi}r-JPl5iw#?S`MlE-o1@C-PdgMk~Ujsbl5Sj>#iY%
z`+650EbP81H@j0GkV3x0qP{~*2{dOBbHNh*7&1SquAho>O~m#ZNK!Z<3UK7uNeU-K
z)oWN&8%R=w8c0$=jo*bDHGbbx^|#HHl^3!>Iu7P6arpE~h1U>v*wm0qEfzcMOD&wU
zz{8{=fJG=f0E<v|fG?pJ-8c~jYA84)VTnrxM8tGJGQpu<gW%AcJB;11z`-jlygD1i
z!I4Fg`UL?5gj1<!R`8)GH<TIz1wGVqY#~(Y5tfo$u-7ucDCi--lTLi7`>=mHtn{YR
zt_T>zZge|Zl7F})_h3nv{Ux3DmbBkp(q?B#tL-Jtx0HYv4cC{%SMJ_;!ykVGj+A$V
z9cFxLAf^KWctIjSh8?U#Y1X1NLgm}bHi8`+w(oD&l@p=@4)Owm<DmMFz2o8+mp=RQ
z@_moLf!ETFTi~F;1qPw}#!3VhK~%uUh>>Fm4m?JU8Z~t2P{6|24WUMe-2gUL>4V?^
zHNMaX*n$1mw=Ywq@{R-<me;_!iAgI&z*w<jfFg4rZQ9;FW9X`>L)J_hymrjM6-2{d
zKK}X7laD@f?3=HDMm%T!@i9|QjGK9S;@orH2Ysjsi%^5?ATrR&3^lZq$#>xZ0%j{H
z$q|&UnFrjrmg2*=_(a6y^^x5ki|+NTKktD`b>+%#TD`$lCQPZn>fXj1mNefuyUmt~
z9kvbYva^4|o*sqU^J@+6lUff*8W743omH{!@34BRZ8TV8#~9(DMmICHaeaT+-}iO?
zb$7>KceVdzXWL(PwE1O6t6z4s_+@+ZU$!;9wyp8CtqrejssGE?y1#9$E!5ar?e{HJ
ze%qAw+op82Gr|r~1JYR!y(e96NauAHp$72b*Z-R1j4AK|>k&F_!8Al&i1nZuF%MFP
zyx`n9XTkXQZuSI+#SXpBBJ&;m0t@j$c0fp5%tR?CI|LlI?|=*)lm(WrgfzZkEdh<d
zKDJV_Qrio%wWS<<l=$>2{SLn3!@f+bQ=}BZL3Z2(j<zA-5MHb;L7viZ?eBjBj*4%U
z1ZxlA_yjWa`)M*zP0nKIz(IuoC1Q#Mfe@e`YLP#M*5k!DS0XC`H6SJ_1{?#%-m!Me
z-t(V*v1QjGB|<49jC2P|c>$3Zp_Qni?-(|G6u|-00d@=-G6aYKHk2Bc-4JT5Swm{z
zv2w)<Lk&L8oH@fcYu=q<2Tlwz!EA;2AUjaPfS{&o!)X%+u9!3!reod6{;Pic;TMwP
z&yV}=JKBH1wtMc{eQ4j;Q)V6=Iq}$-sVB$HIN2)qu^9O!7<3~50-s3omkWdlIl=$}
zI|vJ~1EzxkxDYXNnd_Egz=vD#aRT@VAGac^#}m=LpO5bKT-i2rD%IvJ$$+X0Cf0jy
zX5)7zH(xcn^@;&)-|p4onWAdF`r6;7v+M@vR*|`2F}>bE{l$$^FHMN(C!r9;W`{Mk
zaeaTzf48<jxUBHaH-`TE-$P%0b?B?F41V?Hfv>*Q|CJYuU;bC$mtW}p^7B1kdA`T{
zuXa1PywSCdm4Dlu{oAI@UpJ=xx}g%UumS5K6y5+IWQQ&JLrk40EoBFU!1@s&ohuEU
zwqP0pMmS#i&Iqt5S>-SSYsd>T1qM&bX%2wHwi~b^0EB!6E{IB<A~m;!@d7O+S7)*3
zw(pSth}19O+oN4%zya?7DH<$}P&}##3`ERv)=CM~vv9N06|MOWex(J}fbWQ}3g0fs
zfa!>@f|0`uE;3!(dE3?h2@ddLbxE*hzj~{F`x|hSdjq~>00*Q!GR1e;ft9wfBqL18
z2CPSbMbu|D9=vVOVd7)o;S*ElKh~;XGLg}!)7YFov+jQ6)idWWp1tttxeK4=5121Q
zR5rz1S}in$3N<7JO4a}wtRXm1f*qvBNPP?*Jovfio_qiO_uqT(-S^(LAMd>L_S<j2
z_10T&zWL@G`Z#*y<Mnq|nm3ER66rNs(1E-FI4HvoBi0lby*X|mOvi>1#cN-F{^-_?
zpQ%0%)#?@JM~~W4+<$Lz|7`<`R}LO=VEDMBqb437K4wQkwL$b900)y7`VR7f0ZIUc
zz61C`32M-NAWrCVr*qa}C-HHsxR3BL%c6>&jPCsc6xHL&V8<mO0w+yV8xG3oGB~?v
zP~{%|GusVJ5kLSFK$8AKy0U|yNvnq!D$Z&+#O~12(RHFu*kRY82g^{mCqz46+u7m0
zH;1%(VpZA4&IKPn7x#~|aSxo1z3-&|?&JPDkH*}7IC}AcsD=9@=kJM`w>|%!M^AlN
z@0SgrM#``2EBvyq95)Ex5tJzv@g4eW>8LCqI5=I(DG$i718Ga>v<1@;z#^0#fJG=f
z;84g5rm-}ngaz$}Nm%&H9maH+ghj8dSpNtIksbW@y+0MX6&7`b+pxfSgm4T|LvWa1
zGe)dJATge$_#m>S638GsxE3{7g>GrF1EvG`pzi=X;<8yv&SI<w@bNd`s0&`KEQ!l1
ztiAk~zX3<mYbCKYWxj)hR>voX4F|0-!Wu;?9pqMwRTN{af-)KpTDf7@i8G%79>>mn
zOoBigckF-ty|ugcALZi7bLUrY+TFSLY(5K5XO^TlRtPM(_-E@u5h5r-4RD0MgWwo3
zV#M&_!@-V$0|yQmFra_`{>A#}*RNmSzJ2@j>C?M+Z<cuQ)v24_oh30E%t|bA>J+jU
zdm=V8>Co|?qX(=X(SPHx{+osrZy3;TUBA8?`t{w|ukR*H{WcZ%+tj~!XL0c!;A6m`
z{ey-b96IXo@Ue$F75odl&<nKIFQhXcCM?u|AeJvyq9&{1Fz^EGp!-Ov19k{U$~B$j
zowUh0_o%@~*o3t}2H64Y5!2(z*e>@~XfTqvv7e4oNKwAgIBdr@9r6Q0ddI3vl!6@@
z^#`GwvU8)$f+PG$WQV3r2xb?VTg$I(Zav~(&m}%`F8I*7*ay#m8i9LG`0qL<)L3#b
zY7wZhx6HiV5p#Ej&)Oa{YvXG#7XGxh;;-w=|FSmem$iwStzfiR{|LuYf5-!N!^&Am
z4V~{0lz<(?N9eQ#(-6QSlpTOYC_CU&$P4DMG^8Q7lTye{q@?KpK2(UUufRc^><A*g
zvaikt5TL`P%I$4RUK}X;1?wXL(i%C@HcBKVL7?8m!VLnF1%aZ6D6#E{{$xSv{T+rK
zGV7t=qlI+70|XK4fwKLkt8(Lp4UVQE;HV8=EH8<#Rb2C<YkvcdgjY)fHHyuc)Ilqm
zi;iLI6PTaI2n-`A0}i%n)^*YgudM($p!b$<9ytE4=l;FS;3HIvA9xAvp^yz)Tp&A8
z-Xvkfjf>JuO$Rh|nAi=1W7x1^Lx&C>G-wd;!H0oJC_#Gl>cu^Wumk3e@O{B<$h#Ip
zA#)s{15OVDUb2PkiBjv<4+xEW7QRJr3@+Z>zu(q={dV;2yR&cK-B7=NAu8ToEZPGp
zJ`VKlza~Cgekt4d4h<}?fj*=+EXyi#g!hJV<TG2*WJDCx^GWCIL%;`;7uURF-f24`
zdp-qfSnTNeOia<!G2I`J%el8~%b69MPOQ*$Lb)ar6WT3^?sQLV=X)wN8VzuO6p9SF
zD1(HBG|6r}3|*G}o76zZMUD1v3~ae3CB8$hzqY@=x81iJTJ(JC)i_Y&{!@X)djoT~
z_-Aj5nYl4$`ugZ;>!PQuiJG)Ja^k9pX`8~PZT3yw^z75!uC7Y{Wo_AOYvQl1jy3Fn
z^a_jQEMNz67V}kFrY)MV$k%Gcbm-S=L#Hj6h5#0!>;No6*@5iFB(R_B<Fn5`v%mZ%
z-)A8;%+HkS90wLr$*<eXEn#FwASFLw<t%cAMXt`Gx7f5L2yhH>P9dC1#Rs7v0UGFe
zr-UFBpR1BKM25B(p%Y@!`Y&s`4}wDoqPKN`7YyJyAS|}saP@zJ1H4#T60B8R{ez$X
z1{}ecg&q7Pr!Zz1a71Cz+<|U}8RO8g*R<=T=U!b#aD1?GYyQAnQ3+M3)30N%Srg|y
zdfz`^A2Id*=6O@%t5`oZ2FWP3My$mSN?+Xyuy0IKSjif$MLm7T;3309!7*gW5Lgd9
z3_<=9A9!8!ri{2hoGVpBA+S)0$mA%72P(Cm*I$GhG#$y+1`O=8a#-<3f}?NW?S1-y
z9lLD(B|df+_utd2_sW{h7NeukcK{r;9@=#T7TT*IG6fB+d(t`6fxxf>LB$3mA_u<a
zfc2pJm~$v%z`vt<J{{dlraUZm^mx+W{Rw}!$Nhzm1qvPs6g(Wr`$r(}LC~Z^>12mB
z@d1u7h2dPOJxga>WjhIH!h%xo+GulqPwQ{iH7$Dl#lXEM{C6Mo-?A-c%Bq-2E2Af@
zh#J2vYV6X;F&~y0^+B1D?}trX<DIm@GhyA+Pvrfu0@MgzTNU_uWi&Ska2SHvg5#j+
z;60{!@#wTx<|4iW3Z1s#15QL{P4&U45c5ES1ImyWczmjlix)5Q`z!!QAVt0fXMg_<
zypU9d)&nJEI}UIJ`ykm0*&(TlDlX)LE5&olPXe=OAfh!^K%c^=6Bf1&5yLCTAErz{
z$x7!+A%2gR?4a+UXgY))e*+HXMQmn4m3M#o8*s$FSi<=Z4oj7M!fU=@4X4lnh8U%`
z5q4k^N~=GBsS33J$f@RelWihcLy<AJW42({Y9MGp&SEHL0`3?|fq*3|X*$4;L4yGe
zp~j!V5lW3vaNrSt<9CI*SKJ@Qh8-a?*$VG86>uQN$*bOA*3jaOgZgdm-`4_1pFTUG
z|A`MF$gb|)KC0L39%dq>gCfIX1cew(q3OUPKCd$B%P$Oq6sdLPYb*o@IfD8Mb%%zJ
z{K(+LJ8_dtdGvht@7WP-KOeadTn1-GRT2XnEVCL8Mc-A!%+4+NV5t&t2s`$+DcRHN
z`tBCrtZmf&(dVtH4J0WG_gP8GoE=C~!e(rR*YHl>=$W|QJ#LMA%<88e>+-|0z|X5<
zeqIsv(~1ae5I*0q!=5V@nP2fx2{kxls_sK(Jpc<cZNZ1hM2xe*BNP^RfERdN(8u}n
z=k;4~;xY_17;~nB>;OcRBbIo11ybuFmsgmx@Icv_2u`S+M?I|!ND#?c^zceE6KG>O
z+WK^vF*OIDB0Eqc^BuGviVwL)%X`xK_f859F&+FKZS%EPTWtMna8&+CcoAQ_f7Y8n
z{tY-{UXb|?J4s>MBC*Q)SPmUmj9D5k%)aeu1CEvjQ&3}|V79=3+re4}DA@)t9Xh+g
z`3@|y=BC&Jjb3D-diN;~r3M~<21h70@F*;lec*0zm(2c{dN>OM3tO_N283CRwH5?v
z(dMB+eK!d>`fTsrdq<z%+xqs|^1lhPt6$%3`33JJR~@D<1HA!#!b(+wS$){IG~?wL
zE3s&K5LEJa!_;VCc*A|%zz&q<8jdM5<Zb7S{Y+kbV^>G^el8l+==t=Y*%6a_e`4#|
zm8_pumm~$^En##V#7A}`<Sf#a(M{<%&~Xt^>JenLU)j*IWRKjn@%8F@-5z=d)QDcR
zKXSp|$a%ZV%-tD2dwckdt&*fn+320P-ZOr!d+ci0sFltU%b$F-<A0Y%{k)>gPs_tT
ze?5{LM7F|PJa~;(!GW^CuXlMEe9(I6#E0CU{>mH6Lt%l({|O5`zzaM+(Z|1D{ZLJZ
zP(yiP&2;GGs8t%@q12EvUZyrAVd2+Uzz+F$1$h@@5DW;^IABpuu{q0Ha;?mUYGbRt
z#(0X5LXWwCgU4SaKY$>oKynty_zsv3&W~!gBJ7B-f?*~TrNWNQzyD8gd?36CW_QbY
z?dsovBkDO}2L~rdtd4UT#vD!@_8jfdpT`(9YQ}>EN9)3AT#IHmJ>}0&<f2{PAd-T+
z1V%76^`$jB-w~6Z-?UABj{WG|xpSvZojTf&4jnqQZ{NP1KH7#n8aC_1orL%vA?^=r
zWG9s!nwuD8NXbQ&5Cj}SO`DF-7WdiGxA&I9?khWVeyMJ=JG1N0XxI6<q8=;y^xoK~
zH_Ql9m>qrlZ0+4^U4H)CH5xBu*Rel*5TG}R?*JyylMt|1ktw>C&1AkKt=>?815N>g
z^#CsnKCDTQ1|!OLS{ycNg>%*+=iFnSX*(l^yc6ByiJ0!t;{uLu|MV9;65sK*3QZ=K
z*MDZ<j45RM4l8Hjq$zv{`>}p<TAzE`r`eU!r{xCFf`Ysu#a#y%=M?wql+|ghzum2Y
zcJpG|%#CS1C%V;~nAUUst>;EHpBdGBR%EjoQO%}DHJu*W1e(?=CwD+m(?PwO4eHsn
zbEj4$5ln}cf()`lCru@7G3+ptrci9USdSXb2cJ59*1!Uf{}UFWk0VD<)Mz@0f206#
zKxU?cyx@F?ExAA|rR)aM6UkY?4mb`bEb^;A3Ry(}ju>T~O)aGZsO0dnhHY@D=~J`~
z2_ht7z#|_cf9NS$w%i*AYA|g9IO40yrCIt8n;?0>2XmI1kM8~(aHPE}?D%_dMBV=-
zhbunJ={_)c$PNx9N(Pc`B1{bfj5Nfp3a6&l>yJ3Jfoa3o3{JBcQll(Ta@m2k8-^6v
zLsO!GBrl2&8W7ok1r1_WqM5nw%U3}gh`Ypuh4tn}d#*B)@0G(O>tqLE0d^oJJG7LE
z4|<S<%Dv0i7zN9K8uLGraaq04CRn*&O3l%k^`}*;Jtn!@Q2oD1_8vh)K>i6`X3i8D
z{OXE;gDwLCHBhgT*)^=v-y8%ZL<$b;4lxSgKnaLoRr$KZ651~aAGy>u^MGsa5%27M
z;Zrt8j$a*^yr%4kS1U9bUrB5Wo`Ox08c0v%!U~KA*#YrNE!criJalCa1C;zYMGw|k
z4vw(Z>eJnWNab*3gfH@MEU4iCK#f*PzsD-I6&8I+3T-Jy1|_zjHR3xAL4r7ynzL}$
zLjx>YnG2^&Ycw15^6Se83q1ZF7NHL~j+)JfkQDS95Es>kSOPT|n2RiSsv`KH>43y^
z$hnqdLJBAXL^zxFXM<IPK-*Y>t`!fWPZzs^0Ee1~&JYC09No`ihrtK0voL4jGzSCD
zl|n)5TP<?QR%7s`RDlfnBRKOl7C-D<HijGq30lfvqcF5EN*U;2!w}+H0Ra|6zr#XO
zaA-09bG`WvJ6AC<ix2=2x=mdrIDi<C8mytXdkDCb2n;&_3xf}qtVBze$`QVhKFiv3
zd3O-`#W!nM21%elhh^A-KxtyJL+yr~Hm#Q$+7LFd+0m2NV)#cb*55l>KVU1pM-3_o
zg2mp73F%S*1Or`#-eXWAWXY&s$_|x93Z46~tOx&ffjBTUK}nN>l9gHmb77edZH#7C
zY!=}=G8^za__Wi~YmLyAb^Ifi&sc&0i)tC9o-qdxdp}AIEJo;dWD(5_KDd^f3bh_8
z`JC5pwGbbYu#g=92gL8TpoD^YuR0dvGxN<qFz^@E`Tw=3<gW?_Qo0ZsFdFn7SPcE=
zYB3;ky_VFF8iGT97C@#p1RU{_rwBEO4;&3W2smg6L^!SHmn9*xLq9XDfCq{-DuP1}
zEH<UT++kxH$3(j#`fBO-S=4&SL}`fiz?ip^7h^pPI~b4}!O9p32m~DD1;Akl0(O{j
zC_~G#8#3xN#>nC5<#>~U#IXcnbcNP1xCtVm4NM!xW^kHCy9SFK&uqis|G)Jx&$6ut
z_e9#*dnmtb$UQ;%*VaQ477G@{2Wk`q#(EI>mi16l$RZSCJ<QeIp4Okj0Tc2y5UZn@
zKqo!~8QN(?h8Kn@<V#k=;i2px4hRCuhK1pRfFo2P-o&EDpR9+}AU2g?2l}yE3|bGN
zK#27~?~)E}e;&%PSL=Z{B8zH0uu291r6WpKDIFle1QrcDSpF~T!Rb=Nju7i1S87QO
zDBk*yYx$0x5=3A@d@ztdxR-xsK|azo0prD**8mazY(3;BQ3(#nwjOes7P}ETOL`MK
z^v#M46nN5kPD5%Wuxq$h+Up^erz>r3>mf5ia*+jH(PBr4>F8>GnZ^1(i#1mYg6Q3)
zf)e0EW3J*C^AQ6jBKbo}&_sQQaUTi}@g0y3Dlr`>Ll!ZfStH|$!^w<!Gul}~1P4pg
z5<-AQ)blCa8rR-rI?x6~n!99XZBd$xgR6{CV?zY*2nP<lux4Zsquy`?0ZM%daae{U
z`rowJl<X~k8&#fb?>To>0wIOi3Zg+J5K&tp0T6&yqzTq4EM%3g6^lW9XpKMwB`QG#
zGg}ravIBvQ4Cy@@lvbh*d`D)3VL%3N3DfaE04(722WL+?fy#P{OhIG#5%b+S{s%45
zKruGpfXEckM6a{(^Ak|8@Ig{=<Oj1k$g!US1$+EsQ5=MFfs#%SVGH1bozBQc&?eM$
z5G8hu1_%m+ncd^z($#bTAMrrEp$3LG#<?<rMgt{%2TKM7hhazQe?i%cAvGdA3&^kn
zy|5w>(Na<s1&8H3KsrH&%ye*;RFJA~mfR!@ZZsWoZ3QP+`+#^-1ZaaY<W5sTiIyT9
zE3v~05p+m&JoHj4XCXL15VC`&!{jVLh6a|HsvuBspc!JzeSjVQj9ins(0#<D12Ho2
z__54EC5!rVp&DC5m*Yo<kdCF&5oHG$u8cA2fCB>v*59<qr!X*UDUGq#VgwceFSBE&
z9^yVT&{(z!8G>kFtwlhH*v({9D%k<uptS?Cg+GA<yN&aKbAyquTrekz21IHU2U2g>
zm_XP;Qji@)2^ZNp6a-doqBYWu)MCggitI3#U9=Q2XW<1}0z#o6mB2@Zns5pj@M10u
zHPFnI5FLjS!~zEbiZM$545~JhIHUd$y@)8eh7Jbl#4L4qAdo?Bb#6s~3h!481u%h;
zL(c-S>uY<17<m?CZ|5c(Vml51T|U)ingi0bMc5HgaF87w^I%6H6<LX784%qEY78S#
znzRM(gNs~iqr_r|Dd{zo8rHpGzz6n0e+kjL6+M6~MsEp2X&(x_5fKSuPP$60hkbtK
z6k}13l9i`udwC*C9A|7$0=>@&F@1*;#Qtw53hdye7M<e|fgO5lY3WyK6(9I)mzeC}
zKUyn66f0^s01gs_z9V!%QmCQb(DB2OrsKyR`KH7$V<l@i>bS@n6QCIvQF1Y~4J#EK
z*e2@bMOhkZK;%Vyh#z4+p+Lt05gckF#CI6aq8uR?tj%(-5a4yWOISo{c8QBp>K{Al
z$QNE{j927;Q!`Hi3xpjg)qqH2yT+Q`Pzgk^7CDPp6`AHhmqND?4`M?BrNs_|5B4Nh
znl?~+{h_IK;2q>53&uYILDNBMAl5)&QK2T%mQrLepuh#DClE<N!E1080{&1)CH(@f
zc6}KSIwWMk>!^@LjB`?eTtG}=5vxc9jvQT!8fivGKo}J!yD>6PR3Q+2U}R#HVz`=w
zh4-WjK~(WL>0&Xgv_)gfIM}l25GvG=CS0X~&<6@-2fzWxVPBmUaLAY6th~v($YK%}
zx!Pjm6>l6TT@k=DD<!1hus%hI6}Hs1cp|Ne+=|NWSX-0Z^Knej>zE^>&)eUHGxHrX
zQOaKcve|)>;6TYK55<H)L<u5`v>w(!TH|14mF6t=KU&Lx<XFOJG-->DOnz3&pfX(G
zh|*P3&*8_CYgx}#tRZ3$uniOn9g1tUUS2VjAPgA)IiSq;O@Ork2TPg`fCJK(v!0G-
z`qHu|d?I&-KcUD)5)EgFo{;QNUI-?X1q_58Mhb}1{Dt7qf3%jl59TcN9qc;F1@<KQ
z2%@J51qTDIH#PD}Rj$T>bafeog8h%ylBXDOV3o}jE3aY9IaCnAUJHm=$S{tBf&KGB
zvY1|PP}!<|bPUJ<U?*0)VZ}^6bf~k9#0nJ2M6jsS792v-=~2&B-~vCHAwvqpT3Sf5
z>(zQ_+Cs-+-yvpAb|^1|8amD`0|KLA20x^W@F1wMT!vXR5V7k^Qx%jHsli!NUSW~>
z4&*F)M=99BfH@1<VZT|iU5XDm*I2aAFAjoCnIlF6t(3+L80$vl_>^u<GB`bw>N|8s
zUw=2u%y-BvX;xQ&gX{nr{25*NJL$xS!h(5<<v|d`cknmFzz+TuKCiIQcVO`*-@$PU
z*@28P9ck8}!T`fq;&74?WsOo<%kuvifg#&riF#AXfIC3prJ1wnK3Mz7pBKa;sb@9Q
zr`xtd76}f>yeYO($s%OGC|_4rasQEap@#dW4V3Oebjw^QKIF0s0=N&<$KXTNUW-!E
zV8sLnYWU|*W>In(?J?{+DA9EY5kNt|gMR})5bGR=<#Od3u-;<|I;4XF;yx_j5puf+
zM!xt9tYV1<1|O!Lm9!X!7k>^?>)?gNeb~rg7Z-5cIP1YNFP&TIVC5Rh7Xg9R$QZC2
zNK33D9b`O+P-$%h0cS}mt=GS3NzFID1H!m9^BrUdd<V<|*+Fn%(fAGp!41B{<S8cL
zS~fOMhh))CSRgB5L6^AkA`9m`n6}_e;l1cv6Le}RuwVy(OixhBdFK&EGd<u^;_1v5
z^@zz?kWV!|VhFSc3Ph~=4*qH>O^0MIiVsplIU?x^CrVMHyb$Z5HbhJZ*@2t|0jU9G
zkR3PWEOwq^edcRv)gXX4t~i!RkWf-krGw25hzYYcbdfbC#wwMN!VLJ(eM5lKG=Pk0
zVxGbm)mO3RM*$i_L>H}`C1m?-FR#lTKxuFWg0MywHI2l%As|p<5hjA*fOJwLRK|~3
zro)z)j?zVdAmloWEGj#A4TUvatCb*&+<0nNVlBE6x?oXKwSMp#Sq+C}HW-RBqdv;v
znGGa>vKt{rFa$!Z4J1YYWj7vS1&vVRi9<6RV3m{^_2qIb7ZC$4<!Th$otWL)?znbW
z)|g{n`ZpKt8UX|-pf%#g`E=6^YZVO~V3x&T{z9y<0R(W!r53phOF!y$qLlL;)&<%$
zjCOG!WCvuZp~$ejgP{Xt@)QJIBsKUHg2OCwqLikCISVEHQg)z}ufR!Sg+=)y9N($F
zWjT5(Igbn=Js^04a(I=kI8Z#)=oM&b9cSf^7!62{x#lbg&>^+sDLa4+ir=H9^dgI7
zD@<5uF(AMKi=6ME6d5A@;ZlqNnK1=8i~tUl9E4_kqU561%Wzedj&=y6izUYxN}_}@
z#Zkwa(0Z;yW0VwYxJtJv$S~p{57{LNDAb!kjfOQvijvPV)WDWm3B{m$m6AyIO&eP~
z$$f^nhpd#{Q{RDe16U{y1oL2r<{$<T0t>|o%t$ZRYblrjO_Ul^GG~!V5M>9TfF7fL
zMLvtPOHoq8N(MT|A@$nHP$SLsDY6BwQb|23?b7O<Ms_puNE&Dxlz1V07@~m$+Fz}o
zlhEEQiwLv<b{;W4|E(+oH5~RB@Eqan-v}_~RoK2jL~HmG)`-#orQpLX+LGsD6@^$^
z0xOcRfE_d)zz5jD`3{q_sNg1qBg6+OKq&>Rn>!3UP;$|(FKurmzQg*#4$FP;mwpU8
zAajA1zC)%w^nF1()D0<6BfQX4KpSG61qRxHypW>}A;2-=ag#tUS6cx;(yaLo8yqs<
zK`Amo1ex#Pr50m75Gy9E>nz|1a~8E8f)#iTSdaM17yy<50X{eyIj)Eg1{_*g)EXJ>
z7)ZR=3-w&oq0ZrlW^6CwsAFl`-0(4Ok58`U*02`a$4ir6d}$*x0_9Bt2vCw81c&Z}
zfCCBvhrBdjog2g|HpbJn5`pXkWg4?mp>DwfX9z?9N*DtNT2F%f<yZ1$QDGsV;i5Hr
zD#IB4K*lo(VvlVsmRby!8klizwL#`WQfNn%r`yeBE%|~<h#izy{_t8XwFh?x9T>CM
zBGB)KV^bDK*mnsIyNwJ0_FA<DR*8BU;rbnXt54gmLHj*wP%qEL*4RLwBK7uK5qW_{
zLmYdp;DhrW7@3L>xDT-&I_n|7md@)eNLVyy5q5A9u)wg_|C%%gMA8#O3gUx-F&z+~
z!#oAg)n~~!-$L*qw{;+AfyfTtR4U(Okv&A_BKU|&EdVs}esT18FmcT7gN)N5#};P?
zHIO;ZDv8bE(&w5IA4OJxE{e{k({T2D2fxyClkZSl!5LGr7@!79e+E(*%XFYdCO9;0
zQHWrCT2rJ<SRlV#xW#s?G0D>S4vr|&gagTpB?cH#Ttvym&^D|j6j+*iKG8HlX^^C)
z3~aK4J7ZXe1cW<z<E0Zm#oDaBabbr%k?%sWqV*zuYqA~Q(4p^_*JY#zTYzrbXPgpF
zjv6-sb`T8|>_bTYA}G-|bR_}~gAZM00R^1~-6CYn%OKaDL|KbmrGwvUhEjO}Qy@>*
zdTFfnvWjbMZz9OBSILXwDG&nn6w+(;MX}cEuLc%ew1>LXqvR?`2_hxCHHSS$I0gv@
zx!u<V1V~l1fsjQd+vF2%8B2maL}RPQ#1t_k7g^*(UIr&j2d6yzsinUj22uo4;WEU4
z5F#3jYX~I*!2w>F()bRt!%)UN*9!EytnE9L8mT(#fl+|BfIZioMW=F0uhH@l>ARMr
zs^<b{2L}g0m&2=PP*(9c6C!$$<@kfnx)Gdo9A4R!94pBIW#i(DS%Mw>E*yOazk_d2
zlv?bd??9}x8>q<xFSL|z){-5}S<E$BQiB26fw8B9M@AF}D#jISFn%y-b=-<L&P~ik
z8CSMzFhh<d#0KVBe-4a7Y7ofS#_I+v%MNgybC;NLa3>)f99GW4*V6mVScx$&;6Nox
zxD0F`&*igpgR<M&*n*DP6K)3q-ixfVa~8S@1gPPnoIF_+E|4P{n0mC42@abVQW~MJ
zpev9aX5?#tMPUaAIqP+m40|2tU<&Ua<0OdHo*OagjJ7w=m9=beQw=MzClI?VV+b+(
zx9QMq!%nO%QG=&&z@v>B-qujznAh<yXh5LGfv>^_Y-v3a1B1N4q6#l3i4SUsBm`s!
zeFsWjWWi@X@!?l$u+&rq6u_`A1qTCVhZqW!Bm!%=3X51pacwC_)N#;sFkzwf5PazV
z1hMmYJ9u9LI4f<D%ms{=11N9bKEgcya!BnO5snFtkGemJQG)}EC#pjvtmV*gEf1h{
gEyNk!V$ur!AMnj)#=kA^umAu607*qoM6N<$f?}OT3IG5A

literal 0
HcmV?d00001

diff --git a/docs/images/windows-taskbar-thumbnail-toolbar.png b/docs/images/windows-taskbar-thumbnail-toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..41a251e8d7b366801f856b424c7dee983eca8dbd
GIT binary patch
literal 145030
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
AzyJUM

literal 0
HcmV?d00001

diff --git a/docs/tutorial/windows-taskbar.md b/docs/tutorial/windows-taskbar.md
index 444c712b3607b..92f4498b154f8 100644
--- a/docs/tutorial/windows-taskbar.md
+++ b/docs/tutorial/windows-taskbar.md
@@ -41,10 +41,9 @@ as quoted from [MSDN][msdn-jumplist]:
 > confuse the user who does not expect that portion of the destination list to
 > change.
 
-![IE](https://i-msdn.sec.s-msft.com/dynimg/IC420539.png)
+![Taskbar JumpList](../images/windows-taskbar-jumplist.png)
 
-> NOTE: The screenshot above is an example of general tasks of
-Internet Explorer
+> NOTE: The screenshot above is an example of general tasks for Microsoft Edge
 
 Unlike the dock menu in macOS which is a real menu, user tasks in Windows work
 like application shortcuts. For example, when a user clicks a task, the program
@@ -109,7 +108,7 @@ As quoted from [MSDN][msdn-thumbnail]:
 > For example, Windows Media Player might offer standard media transport controls
 > such as play, pause, mute, and stop.
 
-![player](https://i-msdn.sec.s-msft.com/dynimg/IC420540.png)
+![Thumbnail toolbar](../images/windows-taskbar-thumbnail-toolbar.png)
 
 > NOTE: The screenshot above is an example of thumbnail toolbar of Windows
 Media Player
@@ -176,7 +175,7 @@ As quoted from [MSDN][msdn-icon-overlay]:
 > network status, messenger status, or new mail. The user should not be
 > presented with constantly changing overlays or animations.
 
-![Overlay on taskbar button](https://i-msdn.sec.s-msft.com/dynimg/IC420441.png)
+![Overlay on taskbar button](../images/windows-taskbar-icon-overlay.png)
 
 > NOTE: The screenshot above is an example of overlay on a taskbar button
 

From 032e1d9befad640ee6edc276cec1ebd1e84bc73f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 06:02:43 -0700
Subject: [PATCH 529/811] Bump v21.0.0-nightly.20220627

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 775a50c55fc9f..038611d37a56b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220624
\ No newline at end of file
+21.0.0-nightly.20220627
\ No newline at end of file
diff --git a/package.json b/package.json
index af4d0bde7e759..a455fad3649ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220624",
+  "version": "21.0.0-nightly.20220627",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 804ffa694d243..508be5195cf99 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220624
- PRODUCTVERSION 21,0,0,20220624
+ FILEVERSION 21,0,0,20220627
+ PRODUCTVERSION 21,0,0,20220627
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From e86d1cba75be6e5134a3190432b4aae6b19134e8 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 15:50:08 -0500
Subject: [PATCH 530/811] chore: bump chromium to 105.0.5129.0 (main) (#34403)

* chore: bump chromium in DEPS to 104.0.5096.0

* 3651284: Use the entry settings object for window.open navigation

https://chromium-review.googlesource.com/c/chromium/src/+/3651284

* 3644598: Make RenderFrameHost used for notification permission decision

https://chromium-review.googlesource.com/c/chromium/src/+/3644598

* 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2

https://chromium-review.googlesource.com/c/chromium/src/+/3642842

* 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds

https://chromium-review.googlesource.com/c/v8/v8/+/3652785

* 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin

https://chromium-review.googlesource.com/c/chromium/src/+/3611967

* 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/.

https://chromium-review.googlesource.com/c/chromium/src/+/3665762

* 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple

https://chromium-review.googlesource.com/c/chromium/src/+/3659375

* 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2)

https://chromium-review.googlesource.com/c/chromium/src/+/3656234

* chore: update patch indices

* chore: fix lint

* 3644598: Make RenderFrameHost used for notification permission decision

https://chromium-review.googlesource.com/c/chromium/src/+/3644598

* webhid: Migrate HidDelegate to use BrowserContext and Origin

This is a temporary fix for  https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around  https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext

* chore: fix lint

* build: run electron/script/gen-libc++-filenames.js

fixes gn check

* chore: bump chromium in DEPS to 104.0.5098.0

* chore: disable flaking tests

* 3682394: Change pipes surrounding code references in comments to backticks

https://chromium-review.googlesource.com/c/chromium/src/+/3682394

* 3652749: Delete GLRenderer and related classes

https://chromium-review.googlesource.com/c/chromium/src/+/3652749

* chore: fixup patch indices

* 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization

https://chromium-review.googlesource.com/c/chromium/src/+/3671199

* 3607963: hid: Do not exclude HID device with no collections

https://chromium-review.googlesource.com/c/chromium/src/+/3607963

* refactor: use ElectronBrowserContext instead of WebContents to persist devices

due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967,
we can no longer use WebContents to store device permissions so this commit
moves device permission storage to live in memory in ElectronBrowserContext
instead.

* 3557253: Deprecate some signature checks

https://chromium-review.googlesource.com/c/v8/v8/+/3557253

* chore: bump chromium in DEPS to 104.0.5100.0

* 3680781: Add policy for Renderer App Container.

https://chromium-review.googlesource.com/c/chromium/src/+/3680781

* chore: update patch indices

* 3675465: Update NetLog network service API to use mojom::DictionaryValue.

https://chromium-review.googlesource.com/c/chromium/src/+/3675465

* chore: bump chromium in DEPS to 104.0.5102.0

* chore: update patches

* chore: bump chromium in DEPS to 104.0.5103.0

* chore: update patches

* chore: bump chromium in DEPS to 104.0.5104.0

* chore: update patches

* fix: add patch for DCHECK in fullscreen test

* build: fix nan build

* build: make the nan spec runner work on macOS

* chore: bump chromium in DEPS to 104.0.5106.0

* chore: update patches

* chore: bump chromium in DEPS to 104.0.5108.0

* chore: update patches

* chore: bump chromium in DEPS to 104.0.5110.0

* chore: update patches

* chore: bump chromium in DEPS to 104.0.5112.0

* chore: bump chromium in DEPS to 105.0.5113.0

* chore: bump chromium in DEPS to 105.0.5115.0

* chore: bump chromium in DEPS to 105.0.5117.0

* chore: update patches

* chore: update libcpp patch

* 3693745: Delete base::LowerCaseEqualsASCII()

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745

* 3669226: Remove printing PostTask usage of IO thread

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226

* 3687395: Remove DictionaryValue::HasKey().

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395

* 3691014: Prevent unsafe narrowing: ui/accessibility, part 2

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014

* 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567

* 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt

https://chromium-review.googlesource.com/c/chromium/src/+/3684873

* chore: bump chromium in DEPS to 105.0.5119.0

* chore: missing includes in desktop_notification_controller

* chore: update patches

* 3685951: Reland "Make sure screen object is created once in tests."

https://chromium-review.googlesource.com/c/chromium/src/+/3685951

* fixup: Reland "Make sure screen object is created once in tests."

* 3646014: [API] Deprecate LegacyOOMErrorCallback

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014

* chore: bump chromium in DEPS to 105.0.5121.0

* chore: update patches

* 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085

* chore: bump chromium in DEPS to 105.0.5123.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5125.0

* chore: update patches

* 3630082: [sandbox] Also enable the sandbox outside of Chromium builds

Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082

* chore: bump chromium in DEPS to 105.0.5127.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5129.0

* chore: update patches

* 3703741: Remove WebContents::GetMainFrame.

https://chromium-review.googlesource.com/c/chromium/src/+/3703741

* chore: update patches

* fixup! 3703741: Remove WebContents::GetMainFrame.

* fix lint

* more lint

* chore: document breaking change

* 3687671: [v8] Freeze flags after initialization

https://chromium-review.googlesource.com/c/chromium/src/+/3687671

* fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors.

* use the v8 allocator for node serdes

* chore: update patches

* remove faulty non-v8-sandbox-compatible code

* make NodeArrayBufferAllocator use the v8 allocator under the hood

* fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors.

* fix build on windows

* 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events

https://chromium-review.googlesource.com/c/chromium/src/+/3691954

* chore: remove deprecated AccessorSignatures

https://github.com/nodejs/nan/pull/941

* Update patches/chromium/notification_provenance.patch

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

* remove chore_expose_v8_initialization_isolate_callbacks.patch

* add link to nodejs/nan#941

* 52026: Do not allow md4 or md5 based signatures in X.509 certificates.

https://boringssl-review.googlesource.com/c/boringssl/+/52026

* chore: update patches

* disable nan buffer-test

* disable sandboxed pointers for now

* force sandboxed pointers off

* improve node allocation patch

* restore accidentally dropped node crypto test patch

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
---
 DEPS                                          |   2 +-
 build/args/all.gn                             |   2 +
 docs/api/session.md                           |   7 +-
 docs/breaking-changes.md                      |   7 +
 filenames.libcxx.gni                          | 364 ++++++++++++++++-
 patches/boringssl/expose_aes-cfb.patch        |   4 +-
 patches/chromium/.patches                     |   3 +-
 ...client_precreatemessageloop_callback.patch |  10 +-
 .../add_didinstallconditionalfeatures.patch   |  24 +-
 ..._scheduler_throttling_per_renderview.patch |   6 +-
 ...leges_in_unsandboxed_child_processes.patch |   2 +-
 patches/chromium/blink_local_frame.patch      |   4 +-
 ..._node_processes_as_browser_processes.patch |   2 +-
 ...build_disable_partition_alloc_on_mac.patch |   2 +-
 ...build_disable_print_content_analysis.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  18 +-
 patches/chromium/build_gn.patch               |   4 +-
 .../build_libc_as_static_library.patch        |   2 +-
 ...bcxx_abi_unstable_false_for_electron.patch |   4 +-
 patches/chromium/can_create_window.patch      |  49 +--
 ..._v8_initialization_isolate_callbacks.patch |  41 --
 ...screationoverridden_with_full_params.patch |  52 +--
 ...allow_disabling_compression_on_linux.patch |   2 +-
 .../crash_allow_setting_more_options.patch    |  10 +-
 .../custom_protocols_plzserviceworker.patch   |   6 +-
 patches/chromium/desktop_media_list.patch     |   8 +-
 patches/chromium/disable-redraw-lock.patch    |  10 +-
 .../disable_color_correct_rendering.patch     | 170 +-------
 .../disable_compositor_recycling.patch        |   4 +-
 ...le_freezing_flags_after_init_in_node.patch |  30 ++
 patches/chromium/disable_hidden.patch         |   8 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |   2 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   6 +-
 ...locator_for_usage_outside_of_the_gin.patch |   2 +-
 ...xpose_setuseragent_on_networkcontext.patch |  16 +-
 .../extend_apply_webpreferences.patch         |   4 +-
 ..._registry_to_multibuffer_data_source.patch |   4 +-
 ...screen_rendering_with_viz_compositor.patch |  55 ++-
 ..._raw_response_headers_from_urlloader.patch |  14 +-
 ...uest_webcontents_to_enter_fullscreen.patch |  20 +
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |   6 +-
 .../chromium/fix_export_zlib_symbols.patch    |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   8 +-
 ...out_profile_refs_in_accessibility_ui.patch |   2 +-
 patches/chromium/frame_host_manager.patch     |   6 +-
 .../gin_enable_disable_v8_platform.patch      |   2 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |   4 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 ...tform_electron_can_call_x11_property.patch |   2 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 .../mas-cgdisplayusesforcetogray.patch        |   4 +-
 .../mas_disable_custom_window_frame.patch     |  14 +-
 .../mas_disable_remote_accessibility.patch    |  18 +-
 .../chromium/mas_disable_remote_layer.patch   |  24 +-
 patches/chromium/mas_no_private_api.patch     |   4 +-
 ...emote_certificate_verification_logic.patch |  20 +-
 .../chromium/notification_provenance.patch    |  62 +--
 ...utofill_colors_to_the_color_pipeline.patch |   2 +-
 ..._doubleforkandexec_with_forkandspawn.patch |  12 +-
 patches/chromium/printing.patch               |  72 ++--
 ...r_changes_to_the_webcontentsobserver.patch |  12 +-
 .../render_widget_host_view_base.patch        |  10 +-
 .../render_widget_host_view_mac.patch         |   6 +-
 patches/chromium/resource_file_conflict.patch |   8 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |  16 +-
 patches/chromium/web_contents.patch           |   8 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |  10 +-
 .../worker_context_will_destroy.patch         |  16 +-
 ...feat_add_hook_to_notify_script_ready.patch |  16 +-
 patches/nan/.patches                          |   1 +
 ...remove_deprecated_accessorsignatures.patch |  45 +++
 patches/node/.patches                         |   2 +
 ...mespace_as_cr_to_align_with_chromium.patch |  21 +
 .../fix_crypto_tests_to_run_with_bssl.patch   |  29 ++
 .../node/support_v8_sandboxed_pointers.patch  | 375 ++++++++++++++++++
 patches/v8/.patches                           |   3 +-
 ...w_disabling_of_v8_sandboxed_pointers.patch |  32 --
 patches/v8/build_gn.patch                     |   6 +-
 ...ild_remove_legacy_oom_error_callback.patch | 168 ++++++++
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   2 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 .../force_disable_v8_sandboxed_pointers.patch |  24 ++
 ..._terminating_exception_in_microtasks.patch |   8 +-
 ...workaround_an_undefined_symbol_error.patch |   2 +-
 script/nan-spec-runner.js                     |   5 +-
 script/node-disabled-tests.json               |   1 +
 shell/app/electron_main_delegate.cc           |   4 +-
 shell/app/electron_main_delegate.h            |   2 +-
 .../api/electron_api_data_pipe_holder.cc      |  26 +-
 shell/browser/api/electron_api_net_log.cc     |   9 +-
 shell/browser/api/electron_api_net_log.h      |   2 +-
 shell/browser/api/electron_api_printing.cc    |   4 +-
 .../browser/api/electron_api_web_contents.cc  | 189 ++-------
 shell/browser/api/electron_api_web_contents.h |  35 --
 .../api/electron_api_web_frame_main.cc        |   2 +-
 shell/browser/api/gpu_info_enumerator.cc      |   8 +-
 .../bluetooth/electron_bluetooth_delegate.cc  |   7 +
 .../bluetooth/electron_bluetooth_delegate.h   |   3 +
 shell/browser/electron_autofill_driver.cc     |   7 +-
 .../electron_autofill_driver_factory.cc       |   2 +-
 shell/browser/electron_browser_client.cc      |   2 +-
 shell/browser/electron_browser_context.cc     | 110 +++++
 shell/browser/electron_browser_context.h      |  32 ++
 shell/browser/electron_browser_main_parts.cc  |   8 +-
 shell/browser/electron_browser_main_parts.h   |   2 +
 ...electron_pdf_web_contents_helper_client.cc |   2 +-
 shell/browser/electron_permission_manager.cc  |  38 +-
 shell/browser/electron_permission_manager.h   |  18 +-
 .../cryptotoken_private_api.cc                |  24 +-
 .../extensions/electron_messaging_delegate.cc |  21 +-
 shell/browser/hid/electron_hid_delegate.cc    |  67 ++--
 shell/browser/hid/electron_hid_delegate.h     |  21 +-
 shell/browser/hid/hid_chooser_context.cc      |  64 ++-
 shell/browser/hid/hid_chooser_context.h       |  13 +-
 shell/browser/hid/hid_chooser_controller.cc   |   7 +-
 .../media/media_stream_devices_controller.cc  |  22 +-
 .../desktop_notification_controller.cc        |   3 +-
 .../printing/print_preview_message_handler.cc |   6 +-
 .../serial/electron_serial_delegate.cc        |   5 +-
 .../browser/serial/serial_chooser_context.cc  |  30 +-
 shell/browser/serial/serial_chooser_context.h |   4 +-
 .../serial/serial_chooser_context_factory.cc  |   4 +-
 .../serial/serial_chooser_controller.cc       |   2 +-
 shell/browser/ui/certificate_trust_mac.mm     |   3 +-
 shell/browser/ui/inspectable_web_contents.cc  |  16 +-
 shell/browser/ui/webui/accessibility_ui.cc    |   7 +-
 .../browser/web_contents_permission_helper.cc |  90 +----
 .../browser/web_contents_permission_helper.h  |  37 --
 shell/browser/web_contents_preferences.cc     |   3 +-
 shell/browser/web_contents_zoom_controller.cc |   2 +-
 shell/browser/web_view_guest_delegate.cc      |   2 +-
 shell/common/api/electron_api_native_image.cc |  14 -
 shell/common/v8_value_converter.cc            |  13 +-
 spec/package.json                             |   4 +-
 spec/yarn.lock                                |  19 +-
 144 files changed, 1907 insertions(+), 1232 deletions(-)
 delete mode 100644 patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
 create mode 100644 patches/chromium/disable_freezing_flags_after_init_in_node.patch
 create mode 100644 patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
 create mode 100644 patches/nan/chore_remove_deprecated_accessorsignatures.patch
 create mode 100644 patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
 create mode 100644 patches/node/support_v8_sandboxed_pointers.patch
 delete mode 100644 patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
 create mode 100644 patches/v8/build_remove_legacy_oom_error_callback.patch
 create mode 100644 patches/v8/force_disable_v8_sandboxed_pointers.patch

diff --git a/DEPS b/DEPS
index b426c6b27f2dd..aa7afdb3214cd 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '104.0.5073.0',
+    '105.0.5129.0',
   'node_version':
     'v16.15.1',
   'nan_version':
diff --git a/build/args/all.gn b/build/args/all.gn
index e12aca35a29b1..9a3fee65b82d2 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -46,4 +46,6 @@ enable_cet_shadow_stack = false
 # Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
 is_cfi = false
 
+# TODO(nornagon): this is disabled until node.js's internals can be made
+# compatible with sandboxed pointers.
 v8_enable_sandboxed_pointers = false
diff --git a/docs/api/session.md b/docs/api/session.md
index 70a1a29f4d55a..ed8f895f1655b 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -281,7 +281,7 @@ Returns:
 * `event` Event
 * `details` Object
   * `device` [HIDDevice[]](structures/hid-device.md)
-  * `frame` [WebFrameMain](web-frame-main.md)
+  * `origin` string (optional) - The origin that the device has been revoked from.
 
 Emitted after `HIDDevice.forget()` has been called.  This event can be used
 to help maintain persistent storage of permissions when
@@ -705,7 +705,6 @@ session.fromPartition('some-partition').setPermissionCheckHandler((webContents,
     * `deviceType` string - The type of device that permission is being requested on, can be `hid` or `serial`.
     * `origin` string - The origin URL of the device permission check.
     * `device` [HIDDevice](structures/hid-device.md) | [SerialPort](structures/serial-port.md)- the device that permission is being requested for.
-    * `frame` [WebFrameMain](web-frame-main.md) - WebFrameMain checking the device permission.
 
 Sets the handler which can be used to respond to device permission checks for the `session`.
 Returning `true` will allow the device to be permitted and `false` will reject it.
@@ -713,8 +712,8 @@ To clear the handler, call `setDevicePermissionHandler(null)`.
 This handler can be used to provide default permissioning to devices without first calling for permission
 to devices (eg via `navigator.hid.requestDevice`).  If this handler is not defined, the default device
 permissions as granted through device selection (eg via `navigator.hid.requestDevice`) will be used.
-Additionally, the default behavior of Electron is to store granted device permission through the lifetime
-of the corresponding WebContents.  If longer term storage is needed, a developer can store granted device
+Additionally, the default behavior of Electron is to store granted device permision in memory.
+If longer term storage is needed, a developer can store granted device
 permissions (eg when handling the `select-hid-device` event) and then read from that storage with `setDevicePermissionHandler`.
 
 ```javascript
diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index e0dea89dfd9a2..08136f49a514b 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -89,6 +89,13 @@ window manager. There is not a direct equivalent for Wayland, and the known
 workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
 requires unsafe mode), so Electron is unable to support this feature on Linux.
 
+### API Changed: `session.setDevicePermissionHandler(handler)`
+
+The handler invoked when `session.setDevicePermissionHandler(handler)` is used
+has a change to its arguments.  This handler no longer is passed a frame
+`[WebFrameMain](api/web-frame-main.md)`, but instead is passed the `origin`, which
+is the origin that is checking for device permission.
+
 ## Planned Breaking API Changes (19.0)
 
 None
diff --git a/filenames.libcxx.gni b/filenames.libcxx.gni
index b14a775f99962..56021a48dd9e4 100644
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -1,49 +1,376 @@
 libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/adjacent_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/all_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/any_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/binary_search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/clamp.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp_ref_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/count.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/count_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_end.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_first_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if_not.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/half_positive.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_found_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_fun_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/includes.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/inplace_merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_partitioned.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/iter_swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/lexicographical_compare.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/lower_bound.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/make_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/max.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/max_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_max_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/mismatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/move.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/move_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/next_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/none_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/nth_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if_not.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_mismatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sample.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/search_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_intersection.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_symmetric_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_union.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_left.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_right.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/shuffle.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sift_down.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/swap_ranges.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/transform.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unique.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unique_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_iter.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/upper_bound.h",
+  "//buildtools/third_party/libc++/trunk/include/__assert",
   "//buildtools/third_party/libc++/trunk/include/__availability",
+  "//buildtools/third_party/libc++/trunk/include/__bit/bit_cast.h",
+  "//buildtools/third_party/libc++/trunk/include/__bit/byteswap.h",
   "//buildtools/third_party/libc++/trunk/include/__bit_reference",
   "//buildtools/third_party/libc++/trunk/include/__bits",
   "//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
   "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/calendar.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_timespec.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/duration.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/file_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/high_resolution_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/steady_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/system_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/time_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/common_comparison_category.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_partial_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_strong_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/compare_weak_order_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/is_eq.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/ordering.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/partial_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/strong_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/synth_three_way.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/three_way_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__compare/weak_order.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/arithmetic.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/boolean_testable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/class_or_enum.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/common_reference_with.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/common_with.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/convertible_to.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/copyable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/derived_from.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/different_from.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/equality_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/invocable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/movable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/predicate.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/regular.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/relation.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/same_as.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/semiregular.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/swappable.h",
+  "//buildtools/third_party/libc++/trunk/include/__concepts/totally_ordered.h",
   "//buildtools/third_party/libc++/trunk/include/__config",
   "//buildtools/third_party/libc++/trunk/include/__config_site.in",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_handle.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/noop_coroutine_handle.h",
+  "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
   "//buildtools/third_party/libc++/trunk/include/__debug",
   "//buildtools/third_party/libc++/trunk/include/__errc",
-  "//buildtools/third_party/libc++/trunk/include/__functional_03",
-  "//buildtools/third_party/libc++/trunk/include/__functional_base",
-  "//buildtools/third_party/libc++/trunk/include/__functional_base_03",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/copy_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_entry.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_status.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_time_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/filesystem_error.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/path.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/path_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/perm_options.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/perms.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/recursive_directory_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/space_info.h",
+  "//buildtools/third_party/libc++/trunk/include/__filesystem/u8path.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_arg.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_args.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_context.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_error.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_fwd.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_parse_context.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_string.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_to_n_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_bool.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_char.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_floating_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_integer.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_string.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/parser_std_format_spec.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind_back.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/bind_front.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binder1st.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/binder2nd.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/compose.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/default_searcher.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/hash.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/identity.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/invoke.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/is_transparent.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fn.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fun_ref.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/not_fn.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/perfect_forward.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_binary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_unary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/ranges_operations.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/reference_wrapper.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unary_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
   "//buildtools/third_party/libc++/trunk/include/__hash_table",
+  "//buildtools/third_party/libc++/trunk/include/__ios/fpos.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/access.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/advance.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/back_insert_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/data.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/default_sentinel.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/distance.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/empty.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/erase_if_container.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/front_insert_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/incrementable_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/indirectly_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/insert_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/istream_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/istreambuf_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/iter_move.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/iter_swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/iterator_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/mergeable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/move_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/next.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/ostream_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/ostreambuf_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/permutable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/prev.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/projected.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/readable_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_access.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/size.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/sortable.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/unreachable_sentinel.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/wrap_iter.h",
   "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
   "//buildtools/third_party/libc++/trunk/include/__locale",
+  "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocation_guard.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/allocator_arg_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/auto_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/compressed_pair.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/construct_at.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/pointer_safety.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/pointer_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/ranges_construct_at.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/ranges_uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/raw_storage_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/shared_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/uses_allocator.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/voidify.h",
   "//buildtools/third_party/libc++/trunk/include/__mutex_base",
   "//buildtools/third_party/libc++/trunk/include/__node_handle",
-  "//buildtools/third_party/libc++/trunk/include/__nullptr",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/accumulate.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/adjacent_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/exclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/gcd_lcm.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/inclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/inner_product.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/iota.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/midpoint.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/partial_sum.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_exclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_inclusive_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/bernoulli_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/binomial_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/cauchy_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/chi_squared_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/clamp_to_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/default_random_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/discard_block_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/discrete_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/exponential_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/extreme_value_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/fisher_f_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/gamma_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/generate_canonical.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/geometric_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/independent_bits_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/is_seed_sequence.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/is_valid.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/knuth_b.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/linear_congruential_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/log2.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/lognormal_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/mersenne_twister_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/negative_binomial_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/normal_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_constant_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_linear_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/poisson_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/random_device.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/ranlux.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/seed_seq.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/shuffle_order_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/student_t_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/subtract_with_carry_engine.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_int_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_random_bit_generator.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/uniform_real_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__random/weibull_distribution.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/access.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/all.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/common_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/copyable_box.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/counted.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/dangling.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/data.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/drop_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/empty.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/empty_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/non_propagating_cache.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/owning_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/range_adaptor.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/rbegin.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/ref_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/rend.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/reverse_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/single_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/size.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/subrange.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/take_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/transform_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/view_interface.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/views.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
   "//buildtools/third_party/libc++/trunk/include/__std_stream",
   "//buildtools/third_party/libc++/trunk/include/__string",
@@ -51,14 +378,12 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/gettod_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_aix.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/nuttx/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
@@ -68,11 +393,30 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__strtonum_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__thread/poll_with_backoff.h",
+  "//buildtools/third_party/libc++/trunk/include/__thread/timed_backoff_policy.h",
   "//buildtools/third_party/libc++/trunk/include/__threading_support",
   "//buildtools/third_party/libc++/trunk/include/__tree",
   "//buildtools/third_party/libc++/trunk/include/__tuple",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
+  "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/auto_cast.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/cmp.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/declval.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/exchange.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/forward.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/in_place.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/pair.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/piecewise_construct.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/priority_tag.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/rel_ops.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/swap.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/to_underlying.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/transaction.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/unreachable.h",
+  "//buildtools/third_party/libc++/trunk/include/__variant/monostate.h",
   "//buildtools/third_party/libc++/trunk/include/algorithm",
   "//buildtools/third_party/libc++/trunk/include/any",
   "//buildtools/third_party/libc++/trunk/include/array",
@@ -99,6 +443,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/complex.h",
   "//buildtools/third_party/libc++/trunk/include/concepts",
   "//buildtools/third_party/libc++/trunk/include/condition_variable",
+  "//buildtools/third_party/libc++/trunk/include/coroutine",
   "//buildtools/third_party/libc++/trunk/include/csetjmp",
   "//buildtools/third_party/libc++/trunk/include/csignal",
   "//buildtools/third_party/libc++/trunk/include/cstdarg",
@@ -111,6 +456,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/ctgmath",
   "//buildtools/third_party/libc++/trunk/include/ctime",
   "//buildtools/third_party/libc++/trunk/include/ctype.h",
+  "//buildtools/third_party/libc++/trunk/include/cuchar",
   "//buildtools/third_party/libc++/trunk/include/cwchar",
   "//buildtools/third_party/libc++/trunk/include/cwctype",
   "//buildtools/third_party/libc++/trunk/include/deque",
@@ -122,7 +468,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/experimental/algorithm",
   "//buildtools/third_party/libc++/trunk/include/experimental/coroutine",
   "//buildtools/third_party/libc++/trunk/include/experimental/deque",
-  "//buildtools/third_party/libc++/trunk/include/experimental/filesystem",
   "//buildtools/third_party/libc++/trunk/include/experimental/forward_list",
   "//buildtools/third_party/libc++/trunk/include/experimental/functional",
   "//buildtools/third_party/libc++/trunk/include/experimental/iterator",
@@ -205,6 +550,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/type_traits",
   "//buildtools/third_party/libc++/trunk/include/typeindex",
   "//buildtools/third_party/libc++/trunk/include/typeinfo",
+  "//buildtools/third_party/libc++/trunk/include/uchar.h",
   "//buildtools/third_party/libc++/trunk/include/unordered_map",
   "//buildtools/third_party/libc++/trunk/include/unordered_set",
   "//buildtools/third_party/libc++/trunk/include/utility",
diff --git a/patches/boringssl/expose_aes-cfb.patch b/patches/boringssl/expose_aes-cfb.patch
index 767013b5404cc..f7c95c952449b 100644
--- a/patches/boringssl/expose_aes-cfb.patch
+++ b/patches/boringssl/expose_aes-cfb.patch
@@ -58,10 +58,10 @@ index 852b76bea69988e0b3ac76a17b603128f239dde0..d443f4dc2daea0b7aa86ae75d31d995f
    callback(EVP_aes_192_ctr(), "aes-192-ctr", NULL, arg);
    callback(EVP_aes_256_ctr(), "aes-256-ctr", NULL, arg);
 diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
-index 2458847e5640fe955a9971aa77c27251e5091db5..a0b3ac5f6b55921a542f27108beca93d6372c6fc 100644
+index 380d25d9c2a8efb0636db5749a8e3b1ba6908ad5..7a5aa1c142e15cf06e63882e83d82a93c0d38785 100644
 --- a/include/openssl/cipher.h
 +++ b/include/openssl/cipher.h
-@@ -448,6 +448,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
+@@ -460,6 +460,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_des_ede3_ecb(void);
  
  // EVP_aes_128_cfb128 is only available in decrepit.
  OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_128_cfb128(void);
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index fca913719ee48..e0cb53f32a2a8 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -75,7 +75,6 @@ skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
-chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
 don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -111,4 +110,6 @@ make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
+fix_allow_guest_webcontents_to_enter_fullscreen.patch
 posix_replace_doubleforkandexec_with_forkandspawn.patch
+disable_freezing_flags_after_init_in_node.patch
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 9176b7a52a1ad..65e54de741e2d 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index e0ff6fae1e96699e7cb54c9e82a3c68a8e95602b..2179a906bb6c93fbfaa8e7b7e64fddfaab034e94 100644
+index b017e2bf97a4a15cb7af384d9b4e54aa729a997c..fc59b7040bf68e90fbbe516b5321a519a5e77b2a 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -241,6 +241,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,9 +24,9 @@ index e0ff6fae1e96699e7cb54c9e82a3c68a8e95602b..2179a906bb6c93fbfaa8e7b7e64fddfa
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -347,7 +351,6 @@ int GpuMain(MainFunctionParams parameters) {
-   GpuProcess gpu_process(io_thread_priority);
- #endif
+@@ -344,7 +348,6 @@ int GpuMain(MainFunctionParams parameters) {
+   ChildProcess gpu_process(io_thread_priority);
+   DCHECK(base::ThreadPoolInstance::Get()->WasStarted());
  
 -  auto* client = GetContentClient()->gpu();
    if (client)
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index bd92d7ecb804e..91312aeb13cb3 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index d921125d153742dd09e34418c19195a3d61bef1f..5348c3289a94c86bbbc9bb07be26cc56b4986788 100644
+index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ede21d73be 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
 @@ -136,6 +136,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index d921125d153742dd09e34418c19195a3d61bef1f..5348c3289a94c86bbbc9bb07be26cc56
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 831db39365764d4001b8d602b225f157d3562ca8..4aabe0781d9e4150dddce76a50b993d0b8da8068 100644
+index f479e7ce6ceb21e67f72dd29589dfda180e438b0..23dcc6507ed9151f657689904bf90d3b2e8ae3d3 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4502,6 +4502,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4474,6 +4474,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 831db39365764d4001b8d602b225f157d3562ca8..4aabe0781d9e4150dddce76a50b993d0
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index e903ba9ec4f8d32c5d3a6795f0a20f2addf95743..bb9755b981cf96e131e6545f778f73607fabdd02 100644
+index ac30039d95f1f4c73067df58d8af63190b352030..c674c87797fc8ea057f5b94aabbb53b92bded031 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -604,6 +604,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -609,6 +609,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index e903ba9ec4f8d32c5d3a6795f0a20f2addf95743..bb9755b981cf96e131e6545f778f7360
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 595441198b5253e5f36f97303e952e642998be39..1b17db7b9285cb874e74abdd896888c12b288565 100644
+index 9e2dc9b2ea07a1f9bdfd92284f73dd1977ea1437..18c07f44196e83cf16cace6863e3db368a86ce0d 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -598,6 +598,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -605,6 +605,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -79,10 +79,10 @@ index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b09415
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 6fb24096d3a5415f59cba2a8a5a6f36fe838dcc1..a4089fb3989ecd37d5b01baeb03c2ac1f4f05b53 100644
+index 27b366933ce11a029920b9f85060f8cce8deaacd..110996a9d55c1ba779e8aff598e9847dd6a38d86 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -298,6 +298,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index 6fb24096d3a5415f59cba2a8a5a6f36fe838dcc1..a4089fb3989ecd37d5b01baeb03c2ac1
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 40042e1fa2622a871d0ed512f1f6fda1cdda56a6..a377548b36712bd4971bae6b4c0afdc5c8fdbdfc 100644
+index 7cbb31ddff83ea89ae879dfe190b62a8cdbeb7cf..ebc2f572b3340b7ca8719073afda8d266b18cbe5 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 40042e1fa2622a871d0ed512f1f6fda1cdda56a6..a377548b36712bd4971bae6b4c0afdc5
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index 1f929d9535ca19a2c443e13f2bafce179f5870df..fe7605585501fcc1fd515f1d94fda7e27d5ba632 100644
+index c95ef4a4a3f9d40e0e4bedf6fc42225190626c42..36cc932782437b9f5d301416f5a4e8f48c3c837a 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,7 +123,7 @@ index 1f929d9535ca19a2c443e13f2bafce179f5870df..fe7605585501fcc1fd515f1d94fda7e2
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index a9bd5283d3c65728dd3293abe88ffd02d3eee4fc..f5e4a927f2f5114e62d76fec86d6a5d2d2321166 100644
+index d1e2d799602ce3b671e7e33afc57923fcc066f00..64dc35a4ba05521dc55b69d2413010ae47b10152 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
 @@ -352,6 +352,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 785bc29c679d7..6b6c839e9dffa 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -85,10 +85,10 @@ index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 229d9f2112e70f3bbff6e6986ab01c67483a1ae9..0529b4399959a2a2b9b0131dd8736a87fb973b0b 100644
+index deeeab3e6ead93cb3be26f4b40caeeef8bfaafa5..98c257b43cf198481bcaa8f080add28e60e7d9a2 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3711,6 +3711,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3732,6 +3732,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 229d9f2112e70f3bbff6e6986ab01c67483a1ae9..0529b4399959a2a2b9b0131dd8736a87
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3722,7 +3729,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3743,7 +3750,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
index 31c19ddc9a29f..3e7cca104eec5 100644
--- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
+++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch
@@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes
 This allows unsandboxed renderers to launch setuid processes on Linux.
 
 diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
-index b2b29e715d6e5ea427faf6829e935e91dd87d471..138b5da2e5ae85760faaeeff92168d1070b6f562 100644
+index 16d838b710d4f717733f4aa8f92f144922969b3b..ff2c78c7b803159dde97dafdb799d9b8761dc3fd 100644
 --- a/content/browser/child_process_launcher_helper_linux.cc
 +++ b/content/browser/child_process_launcher_helper_linux.cc
 @@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 931e0185041f2..5521df73eb7fd 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index f370d230361c3ab524c0fc74facf8954840aa29f..0e62d29e44a971d49d70e485509d0b59f5cb31c7 100644
+index 80f4314d205f4cbf0d92a331062f8a01a46d6917..2e5c15fc2cf5d0db8d26c1eeb759f6d2837e0656 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
 @@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,7 +49,7 @@ index f370d230361c3ab524c0fc74facf8954840aa29f..0e62d29e44a971d49d70e485509d0b59
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index d5ef00cb9870c2dc767d80595a39af4302c3e3c3..f3a2a9527f97902f357782eb445cf63777c77398 100644
+index 9d8a9be49ed025439b9323fe4805191db1be6e6b..9c618930625dfd7ca44c2d5c1ca25db4d9f36052 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
diff --git a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
index f550c068a4fe7..810480a1b56d5 100644
--- a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
+++ b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
@@ -10,7 +10,7 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 3933fa761768b5a45891bfef4c2c2123b92fc276..2eb52b71d7ebc7525cceffbecc99db6751429afd 100644
+index b1f8fd4494e7f5deac078023c2e0240d701e1f13..a372e9bb12f9cec6235fe529d73b6e0009328038 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -719,8 +719,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch
index 5fd0656a2cdea..47744405285ac 100644
--- a/patches/chromium/build_disable_partition_alloc_on_mac.patch
+++ b/patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -9,7 +9,7 @@ and can be removed when the crash in fork is resolved.
 Related issue: https://github.com/electron/electron/issues/32718
 
 diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
-index 97a57dfb1626ae9a781736dd8b0b55bf201162c1..5c97441faad781b459255cb1f7d0652ec86e40c8 100644
+index c3c62f83553bd0d258de4d5d9ecd8b02a74f594b..3dbf4462fa056db7a4084453ef35f1b944fbd093 100644
 --- a/base/allocator/allocator.gni
 +++ b/base/allocator/allocator.gni
 @@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
diff --git a/patches/chromium/build_disable_print_content_analysis.patch b/patches/chromium/build_disable_print_content_analysis.patch
index 7dff09c3e4eea..dd26dbc9c487a 100644
--- a/patches/chromium/build_disable_print_content_analysis.patch
+++ b/patches/chromium/build_disable_print_content_analysis.patch
@@ -13,7 +13,7 @@ This patch can be removed when enable_print_content_analysis can be more
 easily enabled or disabled by default with buildflags.
 
 diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
-index 559ac76d4e4b9d9c1824c4da186a6b0f7619fcca..72855e0c5fadb286b67144b34ff71f45e1434c73 100644
+index 1d2b24adbb39215531bbe189d6191dba026d4f68..88b7962836cfe93a59d1569245f4815f22be355e 100644
 --- a/printing/buildflags/buildflags.gni
 +++ b/printing/buildflags/buildflags.gni
 @@ -36,8 +36,7 @@ declare_args() {
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 93c0696100b5a..b87359449662a 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index dc59a88bc930d4d7b8e606434d940cac5b834bd0..6a583029436f033dc2736b9d7407f26637936add 100644
+index 672bc56194e1ad8b03acd639c17b7f7e67a5dba0..59ba25815e511af5ca6aca5467cc91d5cc3c6bf1 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index dc59a88bc930d4d7b8e606434d940cac5b834bd0..6a583029436f033dc2736b9d7407f266
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 79aa50fbb9944052163bfdf958c5add60a0151f8..9fce5f07a79f801253c6bd8658ed7dba902856ad 100644
+index 46197c5a6423f3278b75549d601421d2b5e139d6..b02779a76a238fd713796597bec8a82897e88f51 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4479,7 +4479,7 @@ static_library("browser") {
+@@ -4544,7 +4544,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 79aa50fbb9944052163bfdf958c5add60a0151f8..9fce5f07a79f801253c6bd8658ed7dba
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 65bee9c9d02c6f95cce6ba60d69e2a1b879a1c2f..e26897337f8c96a493936ab1342eb6b7c2c63ffe 100644
+index 5d7cfeb42574b15ddac55c797000bca490274a6f..8b967ef76faa8190d0064f3fa78a661f451228e1 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5870,7 +5870,6 @@ test("unit_tests") {
+@@ -5915,7 +5915,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 65bee9c9d02c6f95cce6ba60d69e2a1b879a1c2f..e26897337f8c96a493936ab1342eb6b7
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5893,6 +5892,10 @@ test("unit_tests") {
+@@ -5939,6 +5938,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,15 +68,15 @@ index 65bee9c9d02c6f95cce6ba60d69e2a1b879a1c2f..e26897337f8c96a493936ab1342eb6b7
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6786,7 +6789,6 @@ test("unit_tests") {
+@@ -6826,7 +6829,6 @@ test("unit_tests") {
      }
  
      deps += [
 -      "//chrome:packed_resources_integrity_hash",
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
-       "//chrome/browser/media/router:test_support",
-@@ -6887,6 +6889,10 @@ test("unit_tests") {
+       "//chrome/browser/autofill_assistant/password_change/proto:proto",
+@@ -6937,6 +6939,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/build_gn.patch b/patches/chromium/build_gn.patch
index bd23b789dcd3b..a8ab854a62f91 100644
--- a/patches/chromium/build_gn.patch
+++ b/patches/chromium/build_gn.patch
@@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will
 rebuild the entire tree.
 
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index d960648941d8b959b25f87b364a594ec44760348..74a14a2373305e2e62b974b34a28ea9a62c6a911 100644
+index c737e53c2ce7237974f6c749eae60ba1de7ec2c1..26ba3ae4a77bc8f525c2ad927ff2956c028ef337 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -123,6 +123,9 @@ if (current_os == "") {
@@ -27,7 +27,7 @@ index d960648941d8b959b25f87b364a594ec44760348..74a14a2373305e2e62b974b34a28ea9a
    # Set to enable the official build level of optimization. This has nothing
    # to do with branding, but enables an additional level of optimization above
    # release (!is_debug). This might be better expressed as a tri-state
-@@ -349,6 +352,7 @@ default_compiler_configs = [
+@@ -348,6 +351,7 @@ default_compiler_configs = [
    "//build/config/compiler/pgo:default_pgo_flags",
    "//build/config/coverage:default_coverage",
    "//build/config/sanitizers:default_sanitizer_flags",
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index f0bd3d9fd8ef3..ea753eee3f9e0 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index 74b6ad644d49c003996db0eab225ea30ac17420a..0a1ba3510be3047bfc34e603c5aaafbf15908269 100644
+index b3e5378f711c54b76c73179e791646d4e5e4e96b..262c8e53ec25b2e91a73b5971d64dbe5d5e005a1 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
diff --git a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
index 89e171dc5eb23..056be0692568f 100644
--- a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
+++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
@@ -6,10 +6,10 @@ Subject: build: make libcxx_abi_unstable false for electron
 https://nornagon.medium.com/a-libc-odyssey-973e51649063
 
 diff --git a/build/config/c++/BUILD.gn b/build/config/c++/BUILD.gn
-index 046792ac275853bf109537589b911cfada44ed24..e43daeaa8f8c8e23eea99b3f8f5f48f92012bbc1 100644
+index 2e5843b9f0a5d39d8dbfea0ae5d2ebb413c0ac7d..f4c901e9980ad068a2903482f712bfa8b1310057 100644
 --- a/build/config/c++/BUILD.gn
 +++ b/build/config/c++/BUILD.gn
-@@ -8,6 +8,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
+@@ -9,6 +9,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
  
  libcxx_abi_unstable = true
  
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 7f3714ced8c89..ef7bb00517d6e 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index c983b5f4c20acba8a7d779a634cd1593ef69b1ae..e612764997277da3411d8040850756eb38996cca 100644
+index 381bb7d6b1ec2f321dcab9a217aa57e5b2c21925..bdf2fa0461840d6059b4a7d6660a356be5c38ba0 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6922,6 +6922,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7127,6 +7127,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index c983b5f4c20acba8a7d779a634cd1593ef69b1ae..e612764997277da3411d8040850756eb
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index b94e87b6f90c986f115a87baf8214baeb8103826..987e437641b7978290aa2633755b67f9099e1d04 100644
+index 1470df421f254725be1a55be5756e47988798035..1c69625326df08b85ec77d01b588fc3a8ce58553 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3912,6 +3912,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3949,6 +3949,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index b94e87b6f90c986f115a87baf8214baeb8103826..987e437641b7978290aa2633755b67f9
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3956,12 +3964,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3993,12 +4001,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,10 +53,10 @@ index b94e87b6f90c986f115a87baf8214baeb8103826..987e437641b7978290aa2633755b67f9
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 5aca51ea4154941512e989048295c7de0475c14c..278accd8c6f14a4d91cc2ff4e336e365279c7b9b 100644
+index 3aafb44665ed475084355144663a3c7395a009d5..d32b572673e24f14c60b27e8a1fab683b7aa3e8e 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -569,6 +569,10 @@ struct CreateNewWindowParams {
+@@ -575,6 +575,10 @@ struct CreateNewWindowParams {
  
    // Governs how downloads are handled if `target_url` results in a download.
    blink.mojom.NavigationDownloadPolicy download_policy;
@@ -68,10 +68,10 @@ index 5aca51ea4154941512e989048295c7de0475c14c..278accd8c6f14a4d91cc2ff4e336e365
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 82d33875526759dda05a1818543c0605382597f4..ec89c920f0e0ad3638749b1468bcd54f74b3cce5 100644
+index 9a593698d9e3aebe21cb7e74e0e5603adde30f87..c57b933d2950a69c92d47057b83d96a66416bc1b 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -594,6 +594,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -604,6 +604,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,7 +81,7 @@ index 82d33875526759dda05a1818543c0605382597f4..ec89c920f0e0ad3638749b1468bcd54f
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index e2c88a7e692406c9774a0e9783df612cbc38d7cd..4e069af9256eb106b50e84d1243c92353daf2015 100644
+index 58755b9dca27ddd4d75cf08ecdc47c6d9d9da724..2f786efe35ebdff7061118a14247859ed30eeb2a 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -165,6 +165,7 @@ class NetworkService;
@@ -92,7 +92,7 @@ index e2c88a7e692406c9774a0e9783df612cbc38d7cd..4e069af9256eb106b50e84d1243c9235
  }  // namespace network
  
  namespace sandbox {
-@@ -968,6 +969,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -977,6 +978,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index e2c88a7e692406c9774a0e9783df612cbc38d7cd..4e069af9256eb106b50e84d1243c9235
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index daf9b4566396c6d681760329cf4ba6869bbb55e4..321d5cfc36e40f2a649e8ea5910f4082b71b62e1 100644
+index ef3889063b562a37fbd945fe30db0d776ecaee7a..99e8449e9c515dd70ed88546a71f83ae139178fe 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -124,7 +124,7 @@ index daf9b4566396c6d681760329cf4ba6869bbb55e4..321d5cfc36e40f2a649e8ea5910f4082
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b8f35f497 100644
+index 348dcde05d71e7d16e4c7bb1d8d9f8718070e669..5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,18 +150,10 @@ index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 03b637c4d3a68a2bff5a4e06f421f23f97f40911..6235fd626a377643851dbb98d4d089e5a59366db 100644
+index 9b42426f878a741290c89fb6b641b6c44423aa6f..d0c99c26116f6affc801ac59657b89c2ae159a0c 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -32,6 +32,7 @@
- #include "third_party/blink/public/mojom/page/page.mojom.h"
- #include "third_party/blink/public/platform/modules/video_capture/web_video_capture_impl_manager.h"
- #include "third_party/blink/public/platform/url_conversion.h"
-+#include "third_party/blink/public/platform/web_url_request_util.h"
- #include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
- #include "third_party/blink/public/web/web_frame_widget.h"
- #include "third_party/blink/public/web/web_local_frame.h"
-@@ -302,6 +303,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -308,6 +308,10 @@ WebView* RenderViewImpl::CreateView(
        /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
        creator->IsAdSubframe());
  
@@ -220,14 +212,15 @@ index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index a25203186cc2df437fe3f9fe309599d86284aefb..b288472c5a00d76077859f02c0e1abca826aa8be 100644
+index fd6118fd28df7ea3f86f7fff6ed7ae7b0517777b..a1cb624589a302340d152a1389adac26d5c6d6ee 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2093,6 +2093,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
- 
+@@ -2101,6 +2101,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
-       GetWindowFeaturesFromString(features, incumbent_window);
-+  window_features.raw_features = features;
+       GetWindowFeaturesFromString(features, entered_window);
  
++  window_features.raw_features = features;
++
    // In fenced frames, we should always use `noopener`.
    if (GetFrame()->IsInFencedFrameTree()) {
+     window_features.noopener = true;
diff --git a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch b/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
deleted file mode 100644
index e44f77536c7f9..0000000000000
--- a/patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 5 Oct 2020 13:43:59 -0700
-Subject: chore: expose v8 initialization isolate callbacks
-
-This commit is necessary in order to ensure consistent behavior from
-v8 Isolate callbacks in contexts which Node.js does not control. If
-we're running with contextIsolation enabled, we should be falling back
-to Blink's logic. This will be upstreamed in some form.
-
-diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index f417dca0103ddfd8ce6e3b3a4d033ea42133604e..d0ee37d147243858d997be230c12ea3e41e6c873 100644
---- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-@@ -448,8 +448,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
-   return {true, std::move(stringified_source)};
- }
- 
--bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
--                                                 v8::Local<v8::String> source) {
-+bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
-+    v8::Local<v8::Context> context,
-+    v8::Local<v8::String> source) {
-   if (ExecutionContext* execution_context = ToExecutionContext(context)) {
-     if (ContentSecurityPolicy* policy =
-             execution_context->GetContentSecurityPolicy()) {
-diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-index 932c6aad3df51dd6790e55bf708703767843dc5e..6865fd33e62f766c5a162ded8627c332bf2ed173 100644
---- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
-@@ -69,8 +69,8 @@ class CORE_EXPORT V8Initializer {
-   static void MessageHandlerInWorker(v8::Local<v8::Message>,
-                                      v8::Local<v8::Value>);
-   static bool WasmCodeGenerationCheckCallbackInMainThread(
--      v8::Local<v8::Context> context,
--      v8::Local<v8::String> source);
-+    v8::Local<v8::Context> context,
-+    v8::Local<v8::String> source);
- };
- 
- }  // namespace blink
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index a72ce1e616d02..fa12e080d2e2f 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -35,7 +35,7 @@ index 5b4d70991e19edcdfee731c56251932bf43e535f..4d996e3821410b2325ef85499f8c307c
  
  #endif  // CHROME_BROWSER_ANDROID_DOCUMENT_DOCUMENT_WEB_CONTENTS_DELEGATE_H_
 diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc
-index 370a2eaf18f86e16d4198a4f0001f96abfebad07..72f7032a8fe2011a0bd80d557e661fc487c3b876 100644
+index 3289268d3ddb3fbb625b8498c2f84370c37acdff..89920af3e44257b6091bb558537fe07d2bb2d899 100644
 --- a/chrome/browser/media/offscreen_tab.cc
 +++ b/chrome/browser/media/offscreen_tab.cc
 @@ -285,8 +285,7 @@ bool OffscreenTab::IsWebContentsCreationOverridden(
@@ -63,7 +63,7 @@ index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 2c877ddbb8c1448a73c0f0e0af27c7fecb1b7848..e1dfc70c951dd004dd8b37607dc8840b804a1e54 100644
+index 268355f22577cf21926e209a9fcdb3f52314f2ac..80f998cdb10d9955e438ba5ef4599b35c448fae2 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
 @@ -84,10 +84,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
@@ -94,7 +94,7 @@ index f0333177f885000fb22818ffa30a0c4ad520a161..03e82957f9d7bf009dcbf5fcd43718c9
        content::WebContents* source,
        const content::OpenURLParams& params) override;
 diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
-index caa6c2dbc6dbf87081da9a2e5c42e9ac2e60c77f..ac0b7dbee8195be8c165444a141629475e97a107 100644
+index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c4887cdd382 100644
 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
 @@ -71,8 +71,7 @@ class ChromeKeyboardContentsDelegate : public content::WebContentsDelegate,
@@ -108,10 +108,10 @@ index caa6c2dbc6dbf87081da9a2e5c42e9ac2e60c77f..ac0b7dbee8195be8c165444a14162947
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 706684de51b047abf2a355416a6361b7ed8542c9..5ccbde951b833bd9413a5c3506da5d982fb3b58e 100644
+index 458af711eda586adbc4efc515da6a21e62879cfc..221ec7acca678060f0f152d4fee32d3378875bc1 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1795,12 +1795,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1794,12 +1794,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index 706684de51b047abf2a355416a6361b7ed8542c9..5ccbde951b833bd9413a5c3506da5d98
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 1f02e2e3d3f510b52089fbc835c6401ed693f1b9..6116970cb65bb7699759fad4351497ab057e25c0 100644
+index 87859f4741386c967a0568273a2fd16ad26c4a96..8265417dcf7397b2eb37e997547d1e8cfd977509 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -836,8 +836,7 @@ class Browser : public TabStripModelObserver,
+@@ -839,8 +839,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -218,7 +218,7 @@ index 2930898b03d7b7ef86d13733cec3cbe84105c166..76625339f42a867c8b68840253e91648
    void SetContentsBounds(content::WebContents* source,
                           const gfx::Rect& bounds) override;
 diff --git a/components/offline_pages/content/background_loader/background_loader_contents.cc b/components/offline_pages/content/background_loader/background_loader_contents.cc
-index 9f46f0b26a0ea42d6bd36e7ec7459a1b2d9c789e..874b7c8d779f471214507417e35449c66b70c97d 100644
+index 186711550a45f4bf383cdceeabac9e1f46aeca89..df1ecec4bf56de72a6164644d3094557a7a52896 100644
 --- a/components/offline_pages/content/background_loader/background_loader_contents.cc
 +++ b/components/offline_pages/content/background_loader/background_loader_contents.cc
 @@ -83,8 +83,7 @@ bool BackgroundLoaderContents::IsWebContentsCreationOverridden(
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6f09c04cc612d2ac58b62d44516eefa1b66d145c..407f734b77d1ed4876f01327df958847d60e9128 100644
+index 686fc99becf068106cc9fb372d2dce1e8d8c5114..eb94d05bf03d04b508123675c31957b8d22ee13a 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3860,8 +3860,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3882,8 +3882,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index 6f09c04cc612d2ac58b62d44516eefa1b66d145c..407f734b77d1ed4876f01327df958847
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 321d5cfc36e40f2a649e8ea5910f4082b71b62e1..e78e2aad4f13d7810027b65f321691091611fd2d 100644
+index 99e8449e9c515dd70ed88546a71f83ae139178fe..4f395474d3e0e1bf7a594fe3fa3e4cb53327aa69 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -274,7 +274,7 @@ index 321d5cfc36e40f2a649e8ea5910f4082b71b62e1..e78e2aad4f13d7810027b65f32169109
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 2556c044b6e28501a5fac9b0040e623b8f35f497..4c6cd654551b2f5cfd59a5271a8d95a9e6862d3c 100644
+index 5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db..166e506f1afbcb1a3a661479d489e71d8d8ff552 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -288,7 +288,7 @@ index 2556c044b6e28501a5fac9b0040e623b8f35f497..4c6cd654551b2f5cfd59a5271a8d95a9
    // Allow delegate to creates a custom WebContents when
    // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index bddbd37ca73369adb82dad5bb8b25f0ab2a7f878..9bf28cd7f926f41041f40d4bc0a497c8b8730b86 100644
+index 8349c8cb2078d09c9550024ae5ca845bdebfbd35..e3763eaa2c6f7ce842cf8964bf5590efd3892c61 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 @@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
@@ -316,7 +316,7 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index b652f1f30ce7043a0c8434d05a3b1da653aee1fc..259c62c60f302abebf167709b4a1c68ad5607129 100644
+index aef9d1a79fcea0e73541cf8257b498e167c9dfeb..1f0c4209d1c6be31e1abd6bcfcaf181fd2d4858c 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 @@ -402,8 +402,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -343,11 +343,11 @@ index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec48
    content::WebContents* CreateCustomWebContents(
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
-diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
-index d815a972b079676e900be8e312909832ae81bde8..ae28b864fcc2f10007ce33774d2d787c91d65f41 100644
---- a/fuchsia/engine/browser/frame_impl.cc
-+++ b/fuchsia/engine/browser/frame_impl.cc
-@@ -406,8 +406,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
+diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
+index 5b804b3ad089154424eda6eb58edbb24baf67794..7f055a37080f40dede16dfa7b7ad6b3c31c5282d 100644
+--- a/fuchsia_web/webengine/browser/frame_impl.cc
++++ b/fuchsia_web/webengine/browser/frame_impl.cc
+@@ -412,8 +412,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -357,11 +357,11 @@ index d815a972b079676e900be8e312909832ae81bde8..ae28b864fcc2f10007ce33774d2d787c
    // Specify a generous upper bound for unacknowledged popup windows, so that we
    // can catch bad client behavior while not interfering with normal operation.
    constexpr size_t kMaxPendingWebContentsCount = 10;
-diff --git a/fuchsia/engine/browser/frame_impl.h b/fuchsia/engine/browser/frame_impl.h
-index 50631a4db62448699e7701f7b4e950e8058896ae..13ba38e1cae39ea46e64313c6a9312e504603bbb 100644
---- a/fuchsia/engine/browser/frame_impl.h
-+++ b/fuchsia/engine/browser/frame_impl.h
-@@ -309,8 +309,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
+diff --git a/fuchsia_web/webengine/browser/frame_impl.h b/fuchsia_web/webengine/browser/frame_impl.h
+index 0661fd642dcee69a7c8f955490dadf32dc0eb468..e3fa74da87513fbfcd035fa872dc938db96c2766 100644
+--- a/fuchsia_web/webengine/browser/frame_impl.h
++++ b/fuchsia_web/webengine/browser/frame_impl.h
+@@ -310,8 +310,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -372,10 +372,10 @@ index 50631a4db62448699e7701f7b4e950e8058896ae..13ba38e1cae39ea46e64313c6a9312e5
                            int opener_render_process_id,
                            int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 899b8beabdf1131a08583470ace5b468576eeab6..21ab4ae22c54846af78518e897dc23ebe4ce8317 100644
+index 807879aa4894e5fabe043d07d5899e5700a7c172..5044c462ccfeaeb4aeb2dd3189e40e60c835ed73 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
-@@ -177,8 +177,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
+@@ -179,8 +179,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
diff --git a/patches/chromium/crash_allow_disabling_compression_on_linux.patch b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
index bfe7658c28575..b64fe0220c598 100644
--- a/patches/chromium/crash_allow_disabling_compression_on_linux.patch
+++ b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
@@ -13,7 +13,7 @@ Ultimately we should remove the option to disable compression, and
 subsequently remove this patch.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 2eb52b71d7ebc7525cceffbecc99db6751429afd..d3ff2942d831745efed440be0fe1e82441a39ff7 100644
+index a372e9bb12f9cec6235fe529d73b6e0009328038..58f6f559265d0da5e6ca4c711df4b1dbf3d40e38 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -111,6 +111,8 @@ void SetUploadURL(const std::string& url) {
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index 0a049f6b24aad..33cc2b52a8a15 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -9,7 +9,7 @@ rate-limiting, compression and global annotations.
 This should be upstreamed.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 4ed2558351e37dde0eb35b6eb32f442346ff2490..3933fa761768b5a45891bfef4c2c2123b92fc276 100644
+index 3c28019ae3d1d8fd43e5e027fa3abe6786658885..b1f8fd4494e7f5deac078023c2e0240d701e1f13 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -113,6 +113,7 @@ void SetUploadURL(const std::string& url) {
@@ -75,7 +75,7 @@ index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index 39fb479eba509f7ba1528cafecd1c6b21f3b0e76..a28b88d078560f05fa295f29dcf8b1865839285c 100644
+index 7159bea91a25700f0cb36c48cab62fe2d616b3bd..9bcc5ae7e870c27c3533534c06daa890de5a4816 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
 @@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
@@ -97,9 +97,9 @@ index 39fb479eba509f7ba1528cafecd1c6b21f3b0e76..a28b88d078560f05fa295f29dcf8b186
 +      arguments.push_back("--no-upload-gzip");
 +    }
 +
-     bool result =
-         client.StartHandler(handler_path, *database_path, metrics_path, url,
-                             annotations, arguments, false, false);
+     CHECK(client.StartHandler(handler_path, *database_path, metrics_path, url,
+                               annotations, arguments, false, false));
+   } else {
 diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
 index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a59bf46b96 100644
 --- a/components/crash/core/app/crashpad_mac.mm
diff --git a/patches/chromium/custom_protocols_plzserviceworker.patch b/patches/chromium/custom_protocols_plzserviceworker.patch
index 5c67bca44ddeb..c0c4dd9f08a42 100644
--- a/patches/chromium/custom_protocols_plzserviceworker.patch
+++ b/patches/chromium/custom_protocols_plzserviceworker.patch
@@ -8,10 +8,10 @@ Allow registering custom protocols to handle service worker main script fetching
 Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
 
 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
-index 9aba6deb9e11ec2803f163088d1c321dd256787f..1dc24bb4c83acd2ff618b085059c918261b2a3d4 100644
+index 654219d75727c189d377cf14e25a8abdc1002204..3e243964f429c3afcb874b208c672991dd3468bf 100644
 --- a/content/browser/service_worker/service_worker_context_wrapper.cc
 +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1616,6 +1616,28 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1649,6 +1649,28 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
        loader_factory_bundle_info =
            context()->loader_factory_bundle_for_update_check()->Clone();
  
@@ -40,7 +40,7 @@ index 9aba6deb9e11ec2803f163088d1c321dd256787f..1dc24bb4c83acd2ff618b085059c9182
    if (base::FeatureList::IsEnabled(
            features::kEnableServiceWorkersForChromeUntrusted) &&
        scope.scheme_piece() == kChromeUIUntrustedScheme) {
-@@ -1636,9 +1658,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
+@@ -1669,9 +1691,7 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
              browser_context(), scope_origin)) {
        config->RegisterURLDataSource(browser_context());
  
diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch
index 1d1ec74f873d3..5a439ea80d375 100644
--- a/patches/chromium/desktop_media_list.patch
+++ b/patches/chromium/desktop_media_list.patch
@@ -82,10 +82,10 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
    const Source& GetSource(int index) const override;
    DesktopMediaList::Type GetMediaListType() const override;
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc6657b943bdd 100644
+index d2297c082f482219f35c3acf5bcc8dadf18bbafb..97b1589793962b2b601a78ef5118256903ee65f9 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-@@ -127,8 +127,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
+@@ -139,8 +139,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
  #endif  // BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_MAC)
@@ -96,7 +96,7 @@ index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc665
  #endif
  
  }  // namespace
-@@ -415,6 +416,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
+@@ -427,6 +428,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
        FROM_HERE,
        base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
                       media_list_));
@@ -106,7 +106,7 @@ index 6d8c9d940bb4488ffedc1eb8c543c065bb3953c9..d5092cb0245a4b8dc26073741f0bc665
  }
  
  void NativeDesktopMediaList::Worker::OnCaptureResult(
-@@ -628,6 +632,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
+@@ -642,6 +646,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
          FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
                                    base::Unretained(worker_.get()),
                                    std::move(native_ids), thumbnail_size_));
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 5944ac0d05cdc..de0f40a292a83 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 15e33123f633b29db9937b76374ef9c03853defa..c24f24d7f53a8ed1c5614244a938f972706bdc61 100644
+index 2d21f2e408004fbaf6a19980ad5daf47493aec65..c6a0ac1c5dd98a41392bd170bb0ada7418f17453 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -39,7 +39,7 @@ index 15e33123f633b29db9937b76374ef9c03853defa..c24f24d7f53a8ed1c5614244a938f972
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -1015,6 +1020,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -1051,6 +1056,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
@@ -51,10 +51,10 @@ index 15e33123f633b29db9937b76374ef9c03853defa..c24f24d7f53a8ed1c5614244a938f972
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 3779c5028db164c70432d042876692822c7dd75c..98d4b486f978ba6e8c1641c759dc9002cea7c345 100644
+index 73337f6b14516f93500705606c89e4c7b5a55f35..6badb272496a630031592372c1a766a9d70bb26a 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
-@@ -206,6 +206,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
+@@ -207,6 +207,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
    using TouchIDs = std::set<DWORD>;
    enum class DwmFrameState { kOff, kOn };
  
@@ -64,7 +64,7 @@ index 3779c5028db164c70432d042876692822c7dd75c..98d4b486f978ba6e8c1641c759dc9002
    HICON GetDefaultWindowIcon() const override;
    HICON GetSmallWindowIcon() const override;
 diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
-index caff85f683b7a67f14f4e66b588e40b9704c2bc3..210f39f68b839684c4ba0a4c57a76df44ddad7dc 100644
+index d8e0f1d3131aef80c9fcb6069df7d7f986af6605..5dbb192d0840ca0ded61397c399b774a8cb05cce 100644
 --- a/ui/views/win/hwnd_message_handler_delegate.h
 +++ b/ui/views/win/hwnd_message_handler_delegate.h
 @@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 6c05f861afee5..8ef3fa1c1b34a 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index bae9dd70c7657bf2bf66ab237d35440c14e7f6fb..796c3101103465bac8a7c177185c570dcc757fc1 100644
+index 691496d0ca6fce79c26b9da7322856b3bf06332f..4aadafbba17578cfa26a111eecd0cfaad676326d 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1863,6 +1863,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1853,6 +1853,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -34,7 +34,7 @@ index bae9dd70c7657bf2bf66ab237d35440c14e7f6fb..796c3101103465bac8a7c177185c570d
    // If we are likely to software composite the resource, we use sRGB because
    // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 14a2e02d9a6edc3a7002ca43bc82c8ef98eb32b5..10abba0f0610719cc4be0ce792ce64aba43bbe04 100644
+index 5eaf2d9cab94def423be78b414179e6ccc596437..1ca8b5968350e88761d9ebc073fe8c573d0f3b5d 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
 @@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -47,7 +47,7 @@ index 14a2e02d9a6edc3a7002ca43bc82c8ef98eb32b5..10abba0f0610719cc4be0ce792ce64ab
    // Image Decode Service and raster tiles without images until the decode is
    // ready.
 diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
-index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562e8f93da5 100644
+index bc48a50a7664f12a454997db54d893cde9b04881..810a8ce52bf9ac74f47a710f8b332980754996f5 100644
 --- a/components/viz/common/display/renderer_settings.h
 +++ b/components/viz/common/display/renderer_settings.h
 @@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -59,7 +59,7 @@ index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562
    bool force_antialiasing = false;
    bool force_blending_with_shaders = false;
 diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
-index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47da860679 100644
+index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd316fb6499 100644
 --- a/components/viz/host/renderer_settings_creation.cc
 +++ b/components/viz/host/renderer_settings_creation.cc
 @@ -17,6 +17,7 @@
@@ -79,159 +79,11 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
    renderer_settings.partial_swap_enabled =
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
-diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
-index e0a8510a9e1d1475bfe92153db8cf860fbba74b5..5c01d58b3121ecf81d0971179ada834ca37d54a1 100644
---- a/components/viz/service/display/gl_renderer.cc
-+++ b/components/viz/service/display/gl_renderer.cc
-@@ -87,6 +87,9 @@
- 
- using gpu::gles2::GLES2Interface;
- 
-+#define PATCH_CS(color_space) \
-+  (settings_->enable_color_correct_rendering ? color_space : gfx::ColorSpace())
-+
- namespace viz {
- namespace {
- 
-@@ -685,8 +688,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
- void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
-   SetBlendEnabled(quad->ShouldDrawWithBlending());
- 
--  SetUseProgram(ProgramKey::DebugBorder(), gfx::ColorSpace::CreateSRGB(),
--                CurrentRenderPassColorSpace());
-+  SetUseProgram(ProgramKey::DebugBorder(),
-+                PATCH_CS(gfx::ColorSpace::CreateSRGB()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   // Use the full quad_rect for debug quads to not move the edges based on
-   // partial swaps.
-@@ -1676,7 +1680,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
-           params->use_color_matrix, tint_gl_composited_content_,
-           params->apply_shader_based_rounded_corner &&
-               ShouldApplyRoundedCorner(params->quad)),
--      params->contents_and_bypass_color_space, target_color_space);
-+          PATCH_CS(params->contents_and_bypass_color_space),
-+          PATCH_CS(target_color_space));
- }
- 
- void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
-@@ -2149,7 +2154,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
-   SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
-                                        tint_gl_composited_content_,
-                                        ShouldApplyRoundedCorner(quad)),
--                CurrentRenderPassColorSpace(), CurrentRenderPassColorSpace());
-+                PATCH_CS(CurrentRenderPassColorSpace()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
-   SkColor4f color_f = SkColor4f::FromColor(color);
-@@ -2157,7 +2163,7 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
-   // Apply color transform if the color space or source and target do not match.
-   if (quad_color_space != CurrentRenderPassColorSpace()) {
-     const gfx::ColorTransform* color_transform =
--        GetColorTransform(quad_color_space, CurrentRenderPassColorSpace());
-+        GetColorTransform(PATCH_CS(quad_color_space), PATCH_CS(CurrentRenderPassColorSpace()));
-     gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
-     color_transform->Transform(&col, 1);
-     color_f.fR = col.x();
-@@ -2379,7 +2385,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
-                                               : NON_PREMULTIPLIED_ALPHA,
-                        false, false, tint_gl_composited_content_,
-                        ShouldApplyRoundedCorner(quad)),
--      quad_resource_lock.color_space(), CurrentRenderPassColorSpace());
-+      PATCH_CS(quad_resource_lock.color_space()),
-+      PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   if (current_program_->tint_color_matrix_location() != -1) {
-     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2478,7 +2485,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
-                        !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
-                        tint_gl_composited_content_,
-                        ShouldApplyRoundedCorner(quad)),
--      quad_resource_lock.color_space(), CurrentRenderPassColorSpace());
-+      PATCH_CS(quad_resource_lock.color_space()),
-+      PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   if (current_program_->tint_color_matrix_location() != -1) {
-     auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
-@@ -2588,7 +2596,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
-   // The source color space should never be RGB.
-   DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
- 
--  gfx::ColorSpace dst_color_space = CurrentRenderPassColorSpace();
-+  gfx::ColorSpace dst_color_space =
-+      PATCH_CS(CurrentRenderPassColorSpace());
- 
- #if BUILDFLAG(IS_WIN)
-   // Force sRGB output on Windows for overlay candidate video quads to match
-@@ -2769,7 +2778,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
- 
-   SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
-                                         ShouldApplyRoundedCorner(quad)),
--                lock.color_space(), CurrentRenderPassColorSpace());
-+                PATCH_CS(lock.color_space()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
-   gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
-@@ -2840,8 +2850,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
-       draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
- 
-   // Bind the program to the GL state.
--  SetUseProgram(draw_cache_.program_key, locked_quad.color_space(),
--                CurrentRenderPassColorSpace(),
-+  SetUseProgram(draw_cache_.program_key, PATCH_CS(locked_quad.color_space()),
-+                PATCH_CS(CurrentRenderPassColorSpace()),
-                 /*adjust_src_white_level=*/draw_cache_.is_video_frame,
-                 locked_quad.hdr_metadata());
- 
-@@ -3698,7 +3708,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
-                                const gfx::ColorSpace& dst_color_space,
-                                bool adjust_src_white_level,
-                                absl::optional<gfx::HDRMetadata> hdr_metadata) {
--  DCHECK(dst_color_space.IsValid());
-+  if (settings_->enable_color_correct_rendering) {
-+    DCHECK(dst_color_space.IsValid());
-+  }
-   gfx::ColorSpace adjusted_src_color_space = src_color_space;
- 
-   ProgramKey program_key = program_key_no_color;
-@@ -4075,9 +4087,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
-         cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
-   }
- 
--  *overlay_texture =
--      FindOrCreateOverlayTexture(params.quad->render_pass_id, iosurface_width,
--                                 iosurface_height, RootRenderPassColorSpace());
-+  *overlay_texture = FindOrCreateOverlayTexture(
-+      params.quad->render_pass_id, iosurface_width, iosurface_height,
-+      PATCH_CS(RootRenderPassColorSpace()));
-   *new_bounds = gfx::RectF(updated_dst_rect.origin(),
-                            gfx::SizeF((*overlay_texture)->texture.size()));
- 
-@@ -4296,8 +4308,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
- 
-   PrepareGeometry(SHARED_BINDING);
- 
--  SetUseProgram(ProgramKey::DebugBorder(), gfx::ColorSpace::CreateSRGB(),
--                CurrentRenderPassColorSpace());
-+  SetUseProgram(ProgramKey::DebugBorder(),
-+                PATCH_CS(gfx::ColorSpace::CreateSRGB()),
-+                PATCH_CS(CurrentRenderPassColorSpace()));
- 
-   gfx::Transform render_matrix;
-   render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
-@@ -4503,3 +4516,5 @@ bool GLRenderer::ColorTransformKey::operator<(
- }
- 
- }  // namespace viz
-+
-+#undef PATCH_CS
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index e0df775b22507336c249ed10fc0251dbbca088b8..2ba12303c28c39aa2e8f88b4a0e14a60e65b9df8 100644
+index d3375aa2370158888d35e064b9613cd696d4b45b..a7a33cfd499925c23a26a6dacc5add3d4c462d78 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -229,6 +229,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
+@@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
  
  // Command-line switches to propagate to the GPU process.
  static const char* const kSwitchNames[] = {
@@ -240,7 +92,7 @@ index e0df775b22507336c249ed10fc0251dbbca088b8..2ba12303c28c39aa2e8f88b4a0e14a60
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 8aa14d7cdb7edc5d53736fb959e3f9992d4fd896..da4830ccc3c3a160754dd9c89fc6292d7333ac67 100644
+index e186644f7592f7d0e827b7d8af6c31951738f6f5..5e8df8f92729ba851fe7ba8557e309a32899df93 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -199,6 +199,7 @@
@@ -251,7 +103,7 @@ index 8aa14d7cdb7edc5d53736fb959e3f9992d4fd896..da4830ccc3c3a160754dd9c89fc6292d
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3175,6 +3176,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3173,6 +3174,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -292,7 +144,7 @@ index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..b4ddafdd126edd16172f00448bbbd56e
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 9a5903820308299a1a480ecaaa1cbca9655f4093..705f1fce4d05694b92b4eb6de1044ae2232bb8ed 100644
+index 4f3b9b181b1998e0ebbd95955feeec28a5d6bcb7..00f2a213cded1985b3131fabf3560937c56f6ffd 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
@@ -303,7 +155,7 @@ index 9a5903820308299a1a480ecaaa1cbca9655f4093..705f1fce4d05694b92b4eb6de1044ae2
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
  
-@@ -185,6 +186,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
+@@ -178,6 +179,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings(
    settings.main_frame_before_activation_enabled =
        cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
  
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index ecc594be91742..3e685e539e743 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index f36e046b2879c3cd24eac04b1cf5f5c62338a11f..06ca0f25bc575fa8508934fe498d599964a7f05d 100644
+index 19396ba065ebab86903e2d52dc72d22de9d6bc89..fdb09a51829db40f4bcba71e76cd0dcef16a47ad 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -513,7 +513,11 @@
+@@ -511,7 +511,11 @@
      return;
  
    host()->WasHidden();
diff --git a/patches/chromium/disable_freezing_flags_after_init_in_node.patch b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
new file mode 100644
index 0000000000000..908c926de71b6
--- /dev/null
+++ b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Mon, 20 Jun 2022 14:53:37 -0700
+Subject: disable freezing flags after init in node
+
+This was introduced in
+https://chromium-review.googlesource.com/c/chromium/src/+/3687671.
+
+When running node in the renderer, flags are updated after initialization, so
+freezing the flags in Blink causes node initialization to fail.
+
+If possible, it would be ideal to do this without a patch.
+https://bugs.chromium.org/p/v8/issues/detail?id=12887 suggests that there may
+at some point be an API to "unfreeze" the flags, or we may be able to refactor
+node initialization to not update flags after V8 initialization.
+
+diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
+index 02b4f803369202a81f2d54f3b35aef04be13dfa2..76dd21fc8e97c1a2836ae5a5a11b56334a656fe2 100644
+--- a/content/renderer/render_process_impl.cc
++++ b/content/renderer/render_process_impl.cc
+@@ -222,7 +222,8 @@ RenderProcessImpl::RenderProcessImpl()
+   SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
+                         "--no-wasm-dynamic-tiering");
+ 
+-  v8::V8::SetFlagsFromString("--freeze-flags-after-init");
++  // This conflicts with node in the renderer.
++  //v8::V8::SetFlagsFromString("--freeze-flags-after-init");
+ 
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
+   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 7b943409e321a..2b6fcf3fa406d 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 18133ca75853394e616c3a816c1eb74b7da23fd9..273750752cdef18ccd7d54b9b28c524375bb3e8d 100644
+index e3a14e47ac328261f48bcd137961a6e794d4f5af..205921ae492bf30c16869cdd7ed9605d7fdbd452 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,10 +20,10 @@ index 18133ca75853394e616c3a816c1eb74b7da23fd9..273750752cdef18ccd7d54b9b28c5243
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 65297e78ee11fb3e7f662408f65a263f9ae8c550..62d3bef655580b1bad1077de797cdadc04721f8e 100644
+index e617a4496a5f8cfa7ca1904fea8b0c3c0ffa14f9..e5d0edc222755a20019dd1e4042b87abe3ae39d8 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -879,6 +879,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -881,6 +881,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
  
    SiteInstanceGroup* GetSiteInstanceGroup();
  
@@ -34,7 +34,7 @@ index 65297e78ee11fb3e7f662408f65a263f9ae8c550..62d3bef655580b1bad1077de797cdadc
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index dc52cc54d2a6078bef1cf9f09e8063011b4f5191..d9b9f49ea7fe9b0b6dec4ad49c112af4fc832691 100644
+index f20f35ae49d50f19bd4355defe1dfd3a20462c21..b8801f1a939aab5ea6c8db87d357c3d27c946e3c 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index c7593e21241c2..219559b32e276 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index cfc5263749fa3068ad3699892bc4060891d7a0ef..f0aa5f66bc62efb2ea2d105d86dc3a8ea13e5eec 100644
+index 8779affce72baa97eebc68779fd3be08ba4505f8..3d2d03366a6e7776d0bd589c32c09b8bbed01b64 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1293,6 +1293,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1196,6 +1196,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index cfc5263749fa3068ad3699892bc4060891d7a0ef..f0aa5f66bc62efb2ea2d105d86dc3a8e
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1339,6 +1340,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1246,6 +1247,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 75b2567794e49..c7d8872892bbe 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -19,7 +19,7 @@ index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944
      using PCScan = internal::PCScan;
      const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index d51b37c8a2df11f71fa6056193100d00883db43d..b44002788cf4d4f5d754dd35dd193be233e6ebcb 100644
+index fb5df2ee7c40e93bf2ebf625b14d08044006534b..67aecdd1d70ff58eb5b1b8b67990a7448a3b1ba4 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
 @@ -44,6 +44,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 7893453256944..9e23e3f582a8f 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 4aabe0781d9e4150dddce76a50b993d0b8da8068..4961f2db5bf80ad2b926617fe933bca4db5c82b7 100644
+index 23dcc6507ed9151f657689904bf90d3b2e8ae3d3..5c81b7882dda7d9815555b43158140f894dbbd03 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2400,7 +2400,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2369,7 +2369,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index 6f0014385b6f9..c42efd45fb14b 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 28d01a952a31bc7df63dd70df167421c453a581c..172e250660d30d703c0c104c73f627d13797e2f4 100644
+index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa19493c3c 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -19,10 +19,10 @@ index 28d01a952a31bc7df63dd70df167421c453a581c..172e250660d30d703c0c104c73f627d1
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index c24f24d7f53a8ed1c5614244a938f972706bdc61..ee465b298240a21929abd438d930b9ce8afa6ffe 100644
+index c6a0ac1c5dd98a41392bd170bb0ada7418f17453..738a56e976a510fcdb44020193cc79522bae0855 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -965,8 +965,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -1001,8 +1001,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index 74d7b3fecb28e..3c54bc5d8c658 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,7 +21,7 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 1a41a282f054d8ca93db19dc5df7f1de14cb8e44..452372aa40947531452c7ad7226a4ee6b0adfccb 100644
+index 03cbb536f9a5a3f9aaf8fe2a5baac1d62e398e3a..2f4cf65a7b75e1dfe6c2b6e472040b2a0617b912 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
 @@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index e2256f4f742e5..f9c1139dff817 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index e351c6625fac1037040f639e55e0a2e48abf2538..1bb2e5b1d6d061961933b49bdcbe689efaeaa8f7 100644
+index 7dc2ce4577594d16930fd97ad3370e28765a0327..68bd003bee2d85536f97569df8cdc9b7875c3086 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1407,6 +1407,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1400,6 +1400,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index e351c6625fac1037040f639e55e0a2e48abf2538..1bb2e5b1d6d061961933b49bdcbe689e
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 620d7b7b733cc9749775c2bcabcebdedafe6ba0b..984e1f04c01006b7f038538c16ad2dd224925731 100644
+index 9d86b641760c82f145d17a4e70813cd13fad9d9c..ac38bfa5d84b838ec3bcf6cbc244868105480c98 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -298,6 +298,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -297,6 +297,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 620d7b7b733cc9749775c2bcabcebdedafe6ba0b..984e1f04c01006b7f038538c16ad2dd2
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 0450b50b5545d9b8f9025553167bed2e78157130..1b772288816ee770ee47cb59cf6c93439729320e 100644
+index e180a77e7727acb093e12a2879c3cfb3b3771a6f..f440504f5d26b86ebe3e2a17a6374e16004f5b8b 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1090,6 +1090,9 @@ interface NetworkContext {
+@@ -1098,6 +1098,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,10 +77,10 @@ index 0450b50b5545d9b8f9025553167bed2e78157130..1b772288816ee770ee47cb59cf6c9343
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index d143a82b1fd021bb03b760b91e87c7714f5395b9..3c18369ff3ab80430e21caac03373605dad64a88 100644
+index e1598a296f2f54061b7b408cc707d6727b51156f..b51f25bec1f8a79765c5b27326973da00c571f86 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
-@@ -136,6 +136,7 @@ class TestNetworkContext : public mojom::NetworkContext {
+@@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override {}
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 216c2d3cb749a..ea5cbf6672a20 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 0529b4399959a2a2b9b0131dd8736a87fb973b0b..6870692202c40179870d7f00e20c7ce19bdb85ce 100644
+index 98c257b43cf198481bcaa8f080add28e60e7d9a2..d94a06f92bbdda28f4307dcc6a06dc2c381f274b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -161,6 +161,7 @@
@@ -23,7 +23,7 @@ index 0529b4399959a2a2b9b0131dd8736a87fb973b0b..6870692202c40179870d7f00e20c7ce1
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1776,6 +1777,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1790,6 +1791,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
index 72cb9fc018ca2..529cee547296b 100644
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -13,7 +13,7 @@ other protocols to register their streaming behavior. MultibufferDataSource::Ass
 then refers to the list so that it can correctly determine the data source's settings.
 
 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-index 58256037e0a2485a9f8de9f4086550f39e865b2d..3456f1d55b16239698ba83d1d27beec1c3806192 100644
+index 58256037e0a2485a9f8de9f4086550f39e865b2d..30cf2ee44f6e0629e664fcf2072ad14ca186f947 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 @@ -10,8 +10,10 @@
@@ -56,7 +56,7 @@ index 58256037e0a2485a9f8de9f4086550f39e865b2d..3456f1d55b16239698ba83d1d27beec1
 +
 +  const std::string scheme = url_data_->url().scheme();
 +  for (const std::string& streaming_scheme : *GetStreamingSchemes()) {
-+    if (base::LowerCaseEqualsASCII(scheme, streaming_scheme)) {
++    if (base::EqualsCaseInsensitiveASCII(scheme, streaming_scheme)) {
 +      return false;
 +    }
 +  }
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index b4f87cd57376f..18812a84eb3df 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,23 +81,23 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index fe988e3bbcf0c9deb5592f24fdeda3016114e3bf..da82b0458d0c87cf4de793007b826984d010cbb2 100644
+index d6cce8a676b93a67fa1a5e64d2b189c9dfa616a5..10f4ace6027c32b57f5d070026ecd9565c40b62f 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
-@@ -139,6 +139,8 @@ viz_component("service") {
-     "display_embedder/output_surface_provider_impl.h",
-     "display_embedder/server_shared_bitmap_manager.cc",
-     "display_embedder/server_shared_bitmap_manager.h",
+@@ -134,6 +134,8 @@ viz_component("service") {
+     "display_embedder/skia_output_surface_impl_on_gpu.h",
+     "display_embedder/skia_render_copy_results.cc",
+     "display_embedder/skia_render_copy_results.h",
 +    "display_embedder/software_output_device_proxy.cc",
 +    "display_embedder/software_output_device_proxy.h",
      "display_embedder/software_output_surface.cc",
      "display_embedder/software_output_surface.h",
-     "display_embedder/viz_process_context_provider.cc",
+     "display_embedder/vsync_parameter_listener.cc",
 diff --git a/components/viz/service/display_embedder/output_surface_provider.h b/components/viz/service/display_embedder/output_surface_provider.h
-index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e365803633459a86 100644
+index 2e9453c18f2f6623d31b477aa856152ddacc3e23..93b6080135c08bc9d4cf7020f4fcb15c06a01a60 100644
 --- a/components/viz/service/display_embedder/output_surface_provider.h
 +++ b/components/viz/service/display_embedder/output_surface_provider.h
-@@ -39,7 +39,8 @@ class OutputSurfaceProvider {
+@@ -38,7 +38,8 @@ class OutputSurfaceProvider {
        mojom::DisplayClient* display_client,
        DisplayCompositorMemoryAndTaskController* gpu_dependency,
        const RendererSettings& renderer_settings,
@@ -108,26 +108,25 @@ index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e3658036
  
  }  // namespace viz
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefbdd2c0f71 100644
+index 3aaccca596c0287f56841131fc6a5878281593fc..f0fc2e11ddbb7ded1964a815f79e5a1858ac25d2 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-@@ -26,6 +26,7 @@
+@@ -23,12 +23,14 @@
  #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
  #include "components/viz/service/display_embedder/skia_output_surface_dependency_impl.h"
  #include "components/viz/service/display_embedder/skia_output_surface_impl.h"
 +#include "components/viz/service/display_embedder/software_output_device_proxy.h"
  #include "components/viz/service/display_embedder/software_output_surface.h"
- #include "components/viz/service/display_embedder/viz_process_context_provider.h"
  #include "components/viz/service/gl/gpu_service_impl.h"
-@@ -39,6 +40,7 @@
+ #include "gpu/command_buffer/client/shared_memory_limits.h"
+ #include "gpu/config/gpu_finch_features.h"
+ #include "gpu/ipc/common/surface_handle.h"
  #include "gpu/ipc/scheduler_sequence.h"
- #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
- #include "gpu/ipc/service/image_transport_surface.h"
 +#include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
  #include "ui/base/ui_base_switches.h"
- #include "ui/gl/gl_context.h"
- #include "ui/gl/init/gl_factory.h"
-@@ -126,7 +128,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+ 
+ #if BUILDFLAG(IS_WIN)
+@@ -89,7 +91,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
      mojom::DisplayClient* display_client,
      DisplayCompositorMemoryAndTaskController* gpu_dependency,
      const RendererSettings& renderer_settings,
@@ -137,16 +136,16 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (surface_handle == gpu::kNullSurfaceHandle)
      return std::make_unique<OutputSurfaceUnified>();
-@@ -138,7 +141,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -101,7 +104,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  
    if (!gpu_compositing) {
      output_surface = std::make_unique<SoftwareOutputSurface>(
 -        CreateSoftwareOutputDeviceForPlatform(surface_handle, display_client));
 +        CreateSoftwareOutputDeviceForPlatform(surface_handle, display_client, offscreen));
-   } else if (renderer_settings.use_skia_renderer) {
+   } else {
      DCHECK(gpu_dependency);
      {
-@@ -243,10 +246,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -139,10 +142,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  std::unique_ptr<SoftwareOutputDevice>
  OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
      gpu::SurfaceHandle surface_handle,
@@ -171,10 +170,10 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
    return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
                                         display_client);
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.h b/components/viz/service/display_embedder/output_surface_provider_impl.h
-index fa9bc45b5c12821789270907f73c7e6f3c0c1424..6d2ad1d88631db82f41de2852c3e9a6ad1431b2e 100644
+index be10797e6f517ae069b8bc579155440d8a110362..fb6848b70a80c9c6cda42605a8b86ffbeb2a5ec8 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.h
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.h
-@@ -66,12 +66,14 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl
+@@ -49,12 +49,14 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl
        mojom::DisplayClient* display_client,
        DisplayCompositorMemoryAndTaskController* gpu_dependency,
        const RendererSettings& renderer_settings,
@@ -190,7 +189,7 @@ index fa9bc45b5c12821789270907f73c7e6f3c0c1424..6d2ad1d88631db82f41de2852c3e9a6a
 +      bool offscreen);
  
    const raw_ptr<GpuServiceImpl> gpu_service_impl_;
-   const raw_ptr<gpu::CommandBufferTaskExecutor> task_executor_;
+ 
 diff --git a/components/viz/service/display_embedder/software_output_device_mac.cc b/components/viz/service/display_embedder/software_output_device_mac.cc
 index 33e12349a951ef533b964d1158f8fa124623e946..fc04bcaffefc277dd1d0cdd766168de017fedca8 100644
 --- a/components/viz/service/display_embedder/software_output_device_mac.cc
@@ -503,11 +502,11 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index 4e38e0f49054cef3fd1a712c89608ce39003edeb..427882f8ed0d85c6e4170b213c3a3678b60a62df 100644
+index 8eeb87e2322821ac52e4bc0000cb777d69515a2c..5a7d1501aed1f01b1b67ae156cfb927ee696f83b 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 @@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(
-       params->gpu_compositing, params->widget, params->renderer_settings);
+       params->gpu_compositing, params->widget);
    auto output_surface = output_surface_provider->CreateOutputSurface(
        params->widget, params->gpu_compositing, display_client.get(),
 -      display_controller.get(), params->renderer_settings, debug_settings);
@@ -550,7 +549,7 @@ index b2f873919d68633103d115d7d9550a098c1a254c..8e38831a6df15d37e5fb87d63613b7db
  
    // Notifies that a swap has occurred and provides information about the pixel
 diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
-index a9a0e5a1167b2018e6dc206ecb7d37aad94042aa..3997ecb0228914144d6b04595c47376679fca3ef 100644
+index 3c495dfe499e1bae90fa0d576d5f58f1300c17fa..678700882d379f528ee1d77819b063cfdcdad036 100644
 --- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
 +++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
 @@ -32,6 +32,7 @@ struct RootCompositorFrameSinkParams {
@@ -573,7 +572,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 80bff73a5886e8e79d7d91de5e27bc747fcfce02..8bc43d1359fa2551713992d6ccb73949743dde2e 100644
+index 68332e455e2d44efac75253179f3b78d7ce0717a..0ec6343dd574078d381155238ddc2f1d0abb5323 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -83,6 +83,7 @@ class DisplayPrivate;
@@ -611,7 +610,7 @@ index 80bff73a5886e8e79d7d91de5e27bc747fcfce02..8bc43d1359fa2551713992d6ccb73949
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -476,6 +490,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -479,6 +493,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 10e839cd9d536..b5421f51314c2 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -81,7 +81,7 @@ index ef3e8e68621402db5a97977f49ac74c438b0a563..aa1c1bcf7ca30adde4c25ed9bd8ed8a7
    // browser decide.
    // Note: this is an enum of type PreviewsState.
 diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
-index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d602ac3397 100644
+index 5a0cc45fb7b695bef46e475232adb70893299b96..156073daca8c69e05b478e8365b812321af1bf19 100644
 --- a/services/network/public/mojom/url_response_head.mojom
 +++ b/services/network/public/mojom/url_response_head.mojom
 @@ -8,6 +8,7 @@ import "mojo/public/mojom/base/time.mojom";
@@ -103,10 +103,10 @@ index 4c4cc16db82d7434573f7740855fbe72d68815e6..f71290800b6bb51a39b1f86be36f02d6
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 8137159de740809e44bc3a3dc18c842455a6795d..7292a40382fffcc96998b04696f4a2934a2da9ee 100644
+index c1f5c1e8c4eab221ac4e2de312ade85fa41ab803..152c69b657a3fe549dd2ce7e6e9b9c4019554bdf 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -468,6 +468,7 @@ URLLoader::URLLoader(
+@@ -605,6 +605,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index 8137159de740809e44bc3a3dc18c842455a6795d..7292a40382fffcc96998b04696f4a293
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -620,7 +621,7 @@ URLLoader::URLLoader(
+@@ -799,7 +800,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 8137159de740809e44bc3a3dc18c842455a6795d..7292a40382fffcc96998b04696f4a293
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1347,6 +1348,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1531,6 +1532,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
@@ -144,10 +144,10 @@ index 8137159de740809e44bc3a3dc18c842455a6795d..7292a40382fffcc96998b04696f4a293
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index abc8ecdcd717b06552af7cf5c4e4e8f60db16ec1..4f633b5a818388f6cfd30a15496c94dde1e2b48c 100644
+index 6bddb19e692f274afd077bd58145fcb68d59c4a2..08b95c71575e31e5b4d87e4d95ea7d7c8d318d29 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -497,6 +497,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -522,6 +522,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  
diff --git a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
new file mode 100644
index 0000000000000..b154b4ba47d35
--- /dev/null
+++ b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Mon, 6 Jun 2022 14:25:15 -0700
+Subject: fix: allow guest webcontents to enter fullscreen
+
+This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
+
+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
+index 035aa45845d56d0a8edaa693689bb27e6cd3b158..26cfaa4c20794649dcbd5610796031a0f966e3c0 100644
+--- a/content/browser/web_contents/web_contents_impl.cc
++++ b/content/browser/web_contents/web_contents_impl.cc
+@@ -3413,7 +3413,7 @@ void WebContentsImpl::EnterFullscreenMode(
+   OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
+   DCHECK(CanEnterFullscreenMode(requesting_frame, options));
+   DCHECK(requesting_frame->IsActive());
+-  DCHECK(ContainsOrIsFocusedWebContents());
++  DCHECK(ContainsOrIsFocusedWebContents() || IsGuest());
+ 
+   if (delegate_) {
+     delegate_->EnterFullscreenModeForTab(requesting_frame, options);
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index fb9b97974a5f3..e863e3c246aef 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index ee465b298240a21929abd438d930b9ce8afa6ffe..83702d83078b68047f4464613033bc25cee21791 100644
+index 738a56e976a510fcdb44020193cc79522bae0855..7c7952755317a8069becfff58ca5ec89e2266ce4 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3625,6 +3625,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3661,6 +3661,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index 022773554260c..a687e2edd98ac 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
-index 41e9cb083e2abfc48976f21e4ca45d175671f69f..90cd537d117894cb73af61787d7085fcedeaebbd 100644
+index a22dd8209fd9c67e9c3637fee61bca5524ee51da..6e3c8da273aa4d24c32200f3d67210eb08ee3dad 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.ts
 +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
-@@ -859,26 +859,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -860,26 +860,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        dataArray = [result.dataToSave];
      }
  
@@ -48,7 +48,7 @@ index 41e9cb083e2abfc48976f21e4ca45d175671f69f..90cd537d117894cb73af61787d7085fc
    }
  
    /**
-@@ -986,30 +972,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
+@@ -987,30 +973,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
        fileName = fileName + '.pdf';
      }
  
diff --git a/patches/chromium/fix_export_zlib_symbols.patch b/patches/chromium/fix_export_zlib_symbols.patch
index 5effa32d57758..0590f70607420 100644
--- a/patches/chromium/fix_export_zlib_symbols.patch
+++ b/patches/chromium/fix_export_zlib_symbols.patch
@@ -6,10 +6,10 @@ Subject: fix: export zlib symbols
 This patch sets ZLIB_DLL so that we properly export zlib symbols.
 
 diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
-index ca58b86f7b5b760b8088eddfb2ab923290771e4d..5c786bccae90cfb6263cae2148a6d00c8e618b3f 100644
+index ee7483e9ef6a4ff85f8e6ac966d6e6c1e669dcf6..54d42304d84e1a25bb8b690282ff8268626eb5ad 100644
 --- a/third_party/zlib/BUILD.gn
 +++ b/third_party/zlib/BUILD.gn
-@@ -314,6 +314,10 @@ component("zlib") {
+@@ -316,6 +316,10 @@ component("zlib") {
    defines = []
    deps = []
  
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 4180c938c9330..33c6a648fb0fa 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 13253163b54c86b37c7b5654b674c5f920c81272..82c4963605707a0fa56b01b572c0ef9b0d093565 100644
+index a44f6d7364ad26965e84a432ae376fa922af5fec..7279dc98acdece8658fbc7e2b343f53299234741 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1820,7 +1820,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1823,7 +1823,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,10 +21,10 @@ index 13253163b54c86b37c7b5654b674c5f920c81272..82c4963605707a0fa56b01b572c0ef9b
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1..86eefb4d6e2d571965be9f40269b7f4fc633d26e 100644
+index a99435a0a9c1c4e26a53d513f180a07f8308cbc9..273bf488259f7a85b01182edae2d609c32a55ba0 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -673,6 +673,10 @@ class WebContents : public PageNavigator,
+@@ -672,6 +672,10 @@ class WebContents : public PageNavigator,
        bool stay_awake,
        bool is_activity = true) = 0;
  
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index fd64b412b8433..64fa426f75151 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,7 +7,7 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index 35568a00ef94ca0db2cbb0325634ce8d2a881e12..a8ea8eaabb7cf3248b19af93bf5002f88e23fd8d 100644
+index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8299fe9e8 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
 @@ -22,7 +22,10 @@
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 76157c2e242da..afee9f92509fa 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index c8f2abaf2991b415b117604d37e8fb8abded00a3..41b09cb5c3a73f72178db9efcf883bd04fe68d6d 100644
+index 398358851f4ec3d1373091c352fe864b8901f08b..0fadcf6eb5aa9e7e6ca32ec252f1722ab87b6be9 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3217,6 +3217,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3203,6 +3203,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,7 +20,7 @@ index c8f2abaf2991b415b117604d37e8fb8abded00a3..41b09cb5c3a73f72178db9efcf883bd0
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 4e069af9256eb106b50e84d1243c92353daf2015..8e8ba0a946c3382045691b788566885fb0e41ce5 100644
+index 2f786efe35ebdff7061118a14247859ed30eeb2a..6453286e79ac9edb6566c7db605ef2e3bfa7feb5 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index 3de96009621ac..f2cfeb9bf75dc 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,7 +38,7 @@ index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d06431862745
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index ec8de596ca5028e9d8c722cda082f0df668359ed..899ebbb1c2ba8d57532a1af43fcd5d44ac3a2de0 100644
+index d04aa76f6667c941637de26998b52b4b2f0d2802..1b41c6ad5681ee85250b27cb9d221995ca1e4b7f 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
 @@ -353,7 +353,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index 6aa34e52cb665..8fbc394f99fbe 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -40,10 +40,10 @@ index 0a01900683c73778565f9059b293bbe863d2d070..cd4e58f73e7d5bd0f9f41b1ec6303166
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 260a2d4ef5df85291eda27a0f7066646d31dacfe..1f83ab4a9b22b35dd2b9053553121b49e1c42ca1 100644
+index 88b4436d618d8b110ead2b739f1249232698f218..20376095d83cfaf838992cb720f369c98ba816d1 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1232,6 +1232,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1235,6 +1235,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index b9b2c2bd509dd..1148b8f694dd3 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 4ab466ef86340e97707bc5b14e0f0e67997c52a6..03d0b2f126c69df7af42095725a4f89880f0d634 100644
+index 626187e49ef53b5d74aa91dcf14821672a8f62b5..86f0e29fab782e5ebcf5977739dc6b72cf3c6b0a 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -955,6 +955,11 @@
+@@ -959,6 +959,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index f9b02be672a7b..6924ea290af6c 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index b1180a85530a7dd65022e174fe335ede0c7c55ca..c12133d82b111d37c8bac92980c22e406125c8df 100644
+index 52c52a8425fb2940d77cc6a0f73414aff3b32ec6..6432c01da49b89ef9d5c1123dd7f191b48184032 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 44ac6e99b22d1..22458236851b3 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 3a4bbeb6233f2735d5354c3faaeaef71c0f892a1..2a6891fb0af06d418fd3dc9ff7595f4b898c55df 100755
+index 32a309a31994453c413b5bf78991fc1a1b0ec60b..b42d000283d52b72a7b85428e68b06a2a52d2a57 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -302,6 +302,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
index f879002345cc1..3342d70593fd8 100644
--- a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
+++ b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
@@ -21,7 +21,7 @@ index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f
        properties->supports_global_application_menus = true;
        properties->app_modal_dialogs_use_event_blocker = true;
 diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
-index 22ba32317a74df24249d1528dcaaa28ff18bd0f4..fa57f97520a0327be2c7f5179591ca61b801c8b0 100644
+index df6b551b94bd4e04f4c0d6e976c68cc187a57d85..3b6dd20277af88568cdb17a7fddf89bdf89b5640 100644
 --- a/ui/ozone/public/ozone_platform.h
 +++ b/ui/ozone/public/ozone_platform.h
 @@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index 280c955d156f0..25236e534c2f9 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 4ea2ad7697bd4531f9538c16778b76ed7b439d74..bdc2e97e41705abe0f7b259635842c4f2e122b41 100644
+index 892ed9c63346595376ea89bd8161bd66bb43459a..328f8b800c36544f7906536416ac61dc87cc45d3 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -253,11 +253,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch
index 8f74c3cf1c77e..2408079f26546 100644
--- a/patches/chromium/mas-cgdisplayusesforcetogray.patch
+++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch
@@ -6,10 +6,10 @@ Subject: mas: avoid usage of CGDisplayUsesForceToGray
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 596084265973b955a02c87babdefd43c7a1fc8e3..747718d5a0f58911e3f5f6e7a04a0a8d22238627 100644
+index fc2ac4583bafd1847fd8dfe3fccbdf4eb40bd929..50fb6b583f84623bd8a146d9476cdf7989627d8a 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
-@@ -159,7 +159,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
+@@ -269,7 +269,17 @@ DisplayMac BuildDisplayForScreen(NSScreen* screen) {
      display.set_color_depth(Display::kDefaultBitsPerPixel);
      display.set_depth_per_component(Display::kDefaultBitsPerComponent);
    }
diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch
index 06cd665d2e11d..7c7230f4a4dce 100644
--- a/patches/chromium/mas_disable_custom_window_frame.patch
+++ b/patches/chromium/mas_disable_custom_window_frame.patch
@@ -95,11 +95,11 @@ index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565aeb8bfb01 100644
+index 48c86f5aa9578545f43b04b520e9f1dd92d224c5..fc57c47fe6afaabf363c9efdf75f60e866244fdb 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-@@ -16,7 +16,9 @@
- #import "ui/base/cocoa/window_size_constants.h"
+@@ -77,7 +77,9 @@ void OrderChildWindow(NSWindow* child_window,
+ }  // namespace
  
  @interface NSWindow (Private)
 +#ifndef MAS_BUILD
@@ -108,7 +108,7 @@ index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565a
  - (BOOL)hasKeyAppearance;
  - (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
  - (BOOL)_isConsideredOpenForPersistentState;
-@@ -48,6 +50,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
+@@ -109,6 +111,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
  }
  @end
  
@@ -117,7 +117,7 @@ index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565a
  @implementation NativeWidgetMacNSWindowTitledFrame
  - (void)mouseDown:(NSEvent*)event {
    if (self.window.isMovable)
-@@ -74,6 +78,8 @@ - (BOOL)usesCustomDrawing {
+@@ -135,6 +139,8 @@ - (BOOL)usesCustomDrawing {
  }
  @end
  
@@ -126,7 +126,7 @@ index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565a
  @implementation NativeWidgetMacNSWindow {
   @private
    base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
-@@ -209,6 +215,8 @@ - (BOOL)hasViewsMenuActive {
+@@ -281,6 +287,8 @@ - (BOOL)hasViewsMenuActive {
  
  // NSWindow overrides.
  
@@ -135,7 +135,7 @@ index 773158df97f36f69d2226c9ae748aa5eaade0c0b..ee17b53daf9e9c5b53f42704efbb565a
  + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    if (windowStyle & NSWindowStyleMaskTitled) {
      if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
-@@ -220,6 +228,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
+@@ -292,6 +300,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    return [super frameViewClassForStyleMask:windowStyle];
  }
  
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 1d607671a6b66..a6599f5be1646 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,10 +44,10 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 4c76aafff03b76d78ab8c84e962cf96f8fefc091..32ac66e9ac5a643f5e4ddea979bf4239d441d23f 100644
+index aa6a1a667af13a76ef299681367b31a8668d7425..949fdc533703862d02a19f08dcd26a56e7845d4a 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -579,10 +579,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -580,10 +580,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -87,7 +87,7 @@ index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4
  }
  
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 0048862cb89d519b8c1c111f923e6dd960c855d6..c7b9124462b0779ed4d1b27fe167e653bf5c6be5 100644
+index 71369b69fe03409ec0eb7fe071b1d49524748fec..9ce1e4a7efce6b39306baceac953db23e8d14240 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
 @@ -49,7 +49,9 @@ class ScopedPasswordInputEnabler;
@@ -114,10 +114,10 @@ index 0048862cb89d519b8c1c111f923e6dd960c855d6..c7b9124462b0779ed4d1b27fe167e653
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c62338a11f 100644
+index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22de9d6bc89 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -254,8 +254,10 @@
+@@ -258,8 +258,10 @@
  void RenderWidgetHostViewMac::MigrateNSViewBridge(
      remote_cocoa::mojom::Application* remote_cocoa_application,
      uint64_t parent_ns_view_id) {
@@ -128,7 +128,7 @@ index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c6
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1521,8 +1523,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1548,8 +1550,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +139,7 @@ index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c6
    return [GetInProcessNSView() window];
  }
  
-@@ -1566,9 +1570,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1593,9 +1597,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +151,7 @@ index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c6
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2063,12 +2069,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2090,12 +2096,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,7 +167,7 @@ index b72b540492abd9d9060bb06996d2d849ac580aa2..f36e046b2879c3cd24eac04b1cf5f5c6
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 4c996a80ae71aee8c2d259a7eb294fe3257ad9ac..5e897496539a365a5de15073f1dccb16db3987dd 100644
+index 9de91819e2658a58b8b7a8c90fd97544e22964f0..ade6c4085720e16843faf63f43688f28057a34dc 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -337,6 +337,13 @@ component("base") {
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index 093c692d94b8f..87a806ed62c58 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -16,7 +16,7 @@ cases where performance improves when disabling remote CoreAnimation (remote
 CoreAnimation is really only about battery usage).
 
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h
-index 7fc76ecb3292a892e2aa8c117cd6302f9ce63fa6..efd5da9daf8fbe80264b8b55eafc717317ba48e6 100644
+index 506ff3c2b9a14a725d13e3933bc281d05c0b6b13..9726e2d34d6d123ad3e62d843d21b755788fc062 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.h
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h
 @@ -21,7 +21,9 @@
@@ -29,7 +29,7 @@ index 7fc76ecb3292a892e2aa8c117cd6302f9ce63fa6..efd5da9daf8fbe80264b8b55eafc7173
  @class CALayer;
  
  namespace ui {
-@@ -115,7 +117,9 @@ class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
+@@ -113,7 +115,9 @@ class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
    base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
  
    bool use_remote_layer_api_;
@@ -39,7 +39,7 @@ index 7fc76ecb3292a892e2aa8c117cd6302f9ce63fa6..efd5da9daf8fbe80264b8b55eafc7173
    std::unique_ptr<ui::CALayerTreeCoordinator> ca_layer_tree_coordinator_;
  
    gfx::Size pixel_size_;
-@@ -210,7 +214,9 @@ class ImageTransportSurfaceOverlayMacEGL : public gl::GLSurfaceEGL,
+@@ -204,7 +208,9 @@ class ImageTransportSurfaceOverlayMacEGL : public gl::GLSurfaceEGL,
    base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
  
    bool use_remote_layer_api_;
@@ -50,10 +50,10 @@ index 7fc76ecb3292a892e2aa8c117cd6302f9ce63fa6..efd5da9daf8fbe80264b8b55eafc7173
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d121828ce85 100644
+index 3378b9a6d411b853fe64e02812c329f68cbbd2ad..7b2f0b3dc28ff71ae84fe63aa9ea80c2aab75969 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-@@ -59,6 +59,7 @@
+@@ -60,6 +60,7 @@
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
  
@@ -61,7 +61,7 @@ index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d12
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -67,6 +68,7 @@
+@@ -68,6 +69,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
@@ -69,17 +69,17 @@ index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d12
  }
  
  ImageTransportSurfaceOverlayMac::~ImageTransportSurfaceOverlayMac() {
-@@ -146,7 +148,9 @@
+@@ -145,7 +147,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
 +#ifndef MAS_BUILD
-       params.ca_layer_params.ca_context_id = [ca_context_ contextId];
+       params.ca_context_id = [ca_context_ contextId];
 +#endif
      } else {
        IOSurfaceRef io_surface =
            ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
-@@ -408,6 +412,7 @@
+@@ -378,6 +382,7 @@
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
  
@@ -87,7 +87,7 @@ index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d12
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -416,6 +421,7 @@
+@@ -386,6 +391,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
@@ -95,12 +95,12 @@ index 43be379adb3df7dc31e59319c921cd89654db57a..bc495df301751628117356c8e68b5d12
  }
  
  ImageTransportSurfaceOverlayMacEGL::~ImageTransportSurfaceOverlayMacEGL() {
-@@ -496,7 +502,9 @@
+@@ -464,7 +470,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
 +#ifndef MAS_BUILD
-       params.ca_layer_params.ca_context_id = [ca_context_ contextId];
+       params.ca_context_id = [ca_context_ contextId];
 +#endif
      } else {
        IOSurfaceRef io_surface =
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index 124bb9afbc651..d6eb624fba6d6 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -166,10 +166,10 @@ index 69e60d498941c34cfac9e79c7517765bf93849f5..b998ad7cf01c21e93c57e1283cfdcb1e
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 1b849df0ee4c40a765a14bfaa75720f5570d4846..1f7a4fe36a96d076ddcfd9c9f092f95132d579dc 100644
+index bf0142f0089d14e8fef22afe3d1d3916b7dccefd..cee63f36c1a802eacf878a119ab1904cf5b56d51 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
-@@ -173,6 +173,12 @@ source_set("audio") {
+@@ -176,6 +176,12 @@ source_set("audio") {
        "mac/scoped_audio_unit.cc",
        "mac/scoped_audio_unit.h",
      ]
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index af9c65ee153b1..ab99d0e9c103b 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 812cfebfbe4f95cf38ce2fcd115a5a363f51363e..e351c6625fac1037040f639e55e0a2e48abf2538 100644
+index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28765a0327 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -128,6 +128,11 @@
@@ -114,7 +114,7 @@ index 812cfebfbe4f95cf38ce2fcd115a5a363f51363e..e351c6625fac1037040f639e55e0a2e4
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -733,6 +823,13 @@ void NetworkContext::SetClient(
+@@ -742,6 +832,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,7 +128,7 @@ index 812cfebfbe4f95cf38ce2fcd115a5a363f51363e..e351c6625fac1037040f639e55e0a2e4
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2302,6 +2399,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2295,6 +2392,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,10 +139,10 @@ index 812cfebfbe4f95cf38ce2fcd115a5a363f51363e..e351c6625fac1037040f639e55e0a2e4
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index bcd47e726ad4d320cac3c3341d87b9a3ca2c4065..620d7b7b733cc9749775c2bcabcebdedafe6ba0b 100644
+index 4da0446b68ff11f65df809f04209a0e0daf12015..9d86b641760c82f145d17a4e70813cd13fad9d9c 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -105,6 +105,7 @@ class URLMatcher;
+@@ -106,6 +106,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -150,7 +150,7 @@ index bcd47e726ad4d320cac3c3341d87b9a3ca2c4065..620d7b7b733cc9749775c2bcabcebded
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -236,6 +237,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -237,6 +238,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,7 +159,7 @@ index bcd47e726ad4d320cac3c3341d87b9a3ca2c4065..620d7b7b733cc9749775c2bcabcebded
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -823,6 +826,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -824,6 +827,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -169,10 +169,10 @@ index bcd47e726ad4d320cac3c3341d87b9a3ca2c4065..620d7b7b733cc9749775c2bcabcebded
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index cc3f99007db46a488d7f8dacd3ede4a90e1d2ae3..0450b50b5545d9b8f9025553167bed2e78157130 100644
+index 9428fe1432ee5cae0d0f812dd48878861d31e09c..e180a77e7727acb093e12a2879c3cfb3b3771a6f 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -282,6 +282,17 @@ struct NetworkContextFilePaths {
+@@ -283,6 +283,17 @@ struct NetworkContextFilePaths {
    bool trigger_migration = false;
  };
  
@@ -190,7 +190,7 @@ index cc3f99007db46a488d7f8dacd3ede4a90e1d2ae3..0450b50b5545d9b8f9025553167bed2e
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -833,6 +844,9 @@ interface NetworkContext {
+@@ -844,6 +855,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 4f582c7187ca0..d835fbd379677 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -31,23 +31,24 @@ index b0e64049d411305d58802fd290bb0480e9b36fee..4afcf3b7a5b841409b0e1c4c2f32fd48
        const GURL& origin,
        const GURL& document_url,
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index a3df152caabcadaba454f73f58763a89fdea4247..ba76f2f294a2eab8581b5ef8d879cb464f14cb1f 100644
+index 0c59d3cec404bc28acd112329ebd8332cfae96a4..62f06f55ec122597af442561fb688c0f6654be6e 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
-@@ -82,10 +82,12 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
+@@ -83,11 +83,13 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
      BrowserContext* browser_context,
      scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
      RenderProcessHost* render_process_host,
 +    RenderFrameHost* render_frame_host,
      const url::Origin& origin,
      const GURL& document_url,
+     const WeakDocumentPtr& weak_document_ptr,
      mojo::PendingReceiver<blink::mojom::NotificationService> receiver)
      : notification_context_(notification_context),
 +      render_frame_host_(render_frame_host),
        browser_context_(browser_context),
        service_worker_context_(std::move(service_worker_context)),
        render_process_host_id_(render_process_host->GetID()),
-@@ -149,7 +151,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
+@@ -152,7 +154,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
        notification_id, std::move(event_listener_remote));
  
    browser_context_->GetPlatformNotificationService()->DisplayNotification(
@@ -57,18 +58,18 @@ index a3df152caabcadaba454f73f58763a89fdea4247..ba76f2f294a2eab8581b5ef8d879cb46
  }
  
 diff --git a/content/browser/notifications/blink_notification_service_impl.h b/content/browser/notifications/blink_notification_service_impl.h
-index dc8de24c86f1769680ce7830844d35dfef7eb7e7..fcd99361fa8c895d6bd89bacb9fb94e76969e7b2 100644
+index 20db1f61b391f7b154071f24e91fd0925e3e0df2..4816ac66d1eebe0823844b07b146707db7727c21 100644
 --- a/content/browser/notifications/blink_notification_service_impl.h
 +++ b/content/browser/notifications/blink_notification_service_impl.h
-@@ -42,6 +42,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
+@@ -43,6 +43,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
        BrowserContext* browser_context,
        scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
        RenderProcessHost* render_process_host,
 +      RenderFrameHost* render_frame_host,
        const url::Origin& origin,
        const GURL& document_url,
-       mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
-@@ -102,6 +103,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
+       const WeakDocumentPtr& weak_document_ptr,
+@@ -104,6 +105,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
    // The notification context that owns this service instance.
    raw_ptr<PlatformNotificationContextImpl> notification_context_;
  
@@ -77,7 +78,7 @@ index dc8de24c86f1769680ce7830844d35dfef7eb7e7..fcd99361fa8c895d6bd89bacb9fb94e7
  
    scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
-index fe015fa7d7813115a2c6a23a00cb509c4c16cd93..88e04351204c786d0fc72a99ccc421f76fc26ef9 100644
+index 41fb02d532190e82d50286e2733a6c3627bf25c8..f19bb5dcb69233733125029d8f997f7343d7e04b 100644
 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
 +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
 @@ -129,7 +129,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
@@ -87,30 +88,32 @@ index fe015fa7d7813115a2c6a23a00cb509c4c16cd93..88e04351204c786d0fc72a99ccc421f7
 -        url::Origin::Create(GURL(kTestOrigin)),
 +        nullptr, url::Origin::Create(GURL(kTestOrigin)),
          /*document_url=*/GURL(),
+         /*weak_document_ptr=*/WeakDocumentPtr(),
          notification_service_remote_.BindNewPipeAndPassReceiver());
- 
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index fc24d16beb5a0ae61bf3123d0594287031d69ddf..6a6edfa8f919ffca815cc0f50fcde0b09067d494 100644
+index 61ac1d7760432bd1a4118c0929a35168a3e26f49..e2ce4aa910053b1a4fb52fcc1197943af95b02f6 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
-@@ -282,13 +282,14 @@ void PlatformNotificationContextImpl::Shutdown() {
+@@ -282,6 +282,7 @@ void PlatformNotificationContextImpl::Shutdown() {
  
  void PlatformNotificationContextImpl::CreateService(
      RenderProcessHost* render_process_host,
 +    RenderFrameHost* render_frame_host,
      const url::Origin& origin,
      const GURL& document_url,
-     mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
+     const WeakDocumentPtr& weak_document_ptr,
+@@ -289,7 +290,8 @@ void PlatformNotificationContextImpl::CreateService(
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    services_.push_back(std::make_unique<BlinkNotificationServiceImpl>(
        this, browser_context_, service_worker_context_, render_process_host,
--      origin, document_url, std::move(receiver)));
-+      render_frame_host, origin, document_url, std::move(receiver)));
+-      origin, document_url, weak_document_ptr, std::move(receiver)));
++      render_frame_host, origin, document_url, weak_document_ptr,
++      std::move(receiver)));
  }
  
  void PlatformNotificationContextImpl::RemoveService(
 diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
-index 69f000e5cd25c6d89c88238873f638923bafdf0e..4f0068a92a0e99e2b34f105954689c7b5c19f436 100644
+index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5de8612403 100644
 --- a/content/browser/notifications/platform_notification_context_impl.h
 +++ b/content/browser/notifications/platform_notification_context_impl.h
 @@ -48,6 +48,7 @@ struct NotificationDatabaseData;
@@ -128,21 +131,32 @@ index 69f000e5cd25c6d89c88238873f638923bafdf0e..4f0068a92a0e99e2b34f105954689c7b
 +      RenderFrameHost* render_frame_host,
        const url::Origin& origin,
        const GURL& document_url,
-       mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
+       const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index b661376d97f515574385dde451ed21fb3f3e4f7b..733931cf9f2b55b63c0611cca673250696f1300d 100644
+index 6a94b868e963d98c09d130c70b7c7740c6b544e3..654d7d77b2a7ea8e1819288bb49084e435072ba9 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2051,7 +2051,8 @@ void RenderProcessHostImpl::CreateNotificationService(
-     document_url = rfh->GetLastCommittedURL();
- 
+@@ -2055,8 +2055,9 @@ void RenderProcessHostImpl::CreateNotificationService(
+   // For workers:
+   if (render_frame_id == MSG_ROUTING_NONE) {
+     storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
+-        this, origin, /*document_url=*/GURL(),
+-        /*weak_document_ptr=*/WeakDocumentPtr(), std::move(receiver));
++        this, RenderFrameHost::FromID(GetID(), render_frame_id), origin,
++        /*document_url=*/GURL(), /*weak_document_ptr=*/WeakDocumentPtr(),
++        std::move(receiver));
+     return;
+   }
+ 
+@@ -2064,7 +2065,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+   RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
+   CHECK(rfh);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
--      this, origin, document_url, std::move(receiver));
-+      this, RenderFrameHost::FromID(GetID(), render_frame_id),
-+      origin, document_url, std::move(receiver));
+-      this, origin, rfh->GetLastCommittedURL(), rfh->GetWeakDocumentPtr(),
++      this, rfh, origin, rfh->GetLastCommittedURL(), rfh->GetWeakDocumentPtr(),
+       std::move(receiver));
  }
  
- void RenderProcessHostImpl::CreateWebSocketConnector(
 diff --git a/content/public/browser/platform_notification_service.h b/content/public/browser/platform_notification_service.h
 index 9646cbeb31141e3518f51482801431f3a6010360..b13b6ab07b4931b892749c84879d9a6adb3bcb58 100644
 --- a/content/public/browser/platform_notification_service.h
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index 4d30cc3869be4..52c431446b661 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index 14d91a0d19c01a856a9614b127a4ef3655614684..a243dd71886af7c5313b16a8522a50ae50af5959 100644
+index b981338d714f66d14dd120cfc1185b97902c45b2..dbe2e0ce2bb9a2122c608ffcea923b650e4eccde 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
 @@ -128,6 +128,16 @@
diff --git a/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch b/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
index 5cb0508a1a082..9bad1bda3874e 100644
--- a/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
+++ b/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
@@ -33,7 +33,7 @@ index 8dcac3238870920d374b86033d05d77ebde351e9..02103924332eddbd158c04f8a395bb4a
  MIPS Technologies, Inc.
 +Darshan Sen <raisinten@gmail.com>
 diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38dfd4cd9d70 100644
+index 295ec1615d83984835e238e349029b8755611f52..94c1cb02efe328ab45bc30fc7db8992872ed6b08 100644
 --- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
 +++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
 @@ -45,7 +45,7 @@
@@ -45,7 +45,7 @@ index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38df
  #include "util/posix/scoped_mmap.h"
  #include "util/posix/signals.h"
  
-@@ -454,7 +454,7 @@ bool CrashpadClient::StartHandler(
+@@ -459,7 +459,7 @@ bool CrashpadClient::StartHandler(
  
    argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
    argv.push_back("--shared-client-connection");
@@ -54,7 +54,7 @@ index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38df
      return false;
    }
  
-@@ -609,7 +609,7 @@ bool CrashpadClient::StartJavaHandlerForClient(
+@@ -614,7 +614,7 @@ bool CrashpadClient::StartJavaHandlerForClient(
      int socket) {
    std::vector<std::string> argv = BuildAppProcessArgs(
        class_name, database, metrics_dir, url, annotations, arguments, socket);
@@ -63,7 +63,7 @@ index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38df
  }
  
  bool CrashpadClient::StartHandlerWithLinkerAtCrash(
-@@ -658,7 +658,7 @@ bool CrashpadClient::StartHandlerWithLinkerForClient(
+@@ -663,7 +663,7 @@ bool CrashpadClient::StartHandlerWithLinkerForClient(
                                    annotations,
                                    arguments,
                                    socket);
@@ -72,7 +72,7 @@ index 53c2dadac9d6cb74a3c3e07d9917e9162474b8a0..6761db0e8ac5edba6fac90cdf79e38df
  }
  
  #endif
-@@ -692,7 +692,7 @@ bool CrashpadClient::StartHandlerForClient(
+@@ -697,7 +697,7 @@ bool CrashpadClient::StartHandlerForClient(
  
    argv.push_back(FormatArgumentInt("initial-client-fd", socket));
  
@@ -135,7 +135,7 @@ index 9e58d94aa499fdb7271a78ea21a1dcc1b12e3a52..3caa3b987b35be575558a312026cf6f1
          Metrics::CaptureResult::kFinishedWritingCrashReportFailed);
      return false;
 diff --git a/third_party/crashpad/crashpad/util/BUILD.gn b/third_party/crashpad/crashpad/util/BUILD.gn
-index 30f03b13f3a018e6a96b0689452a344992675c23..64fa2e9e89b700d8a265a9737cb6a30a210cdffe 100644
+index b8daef48b460ce2771a9f5502ee48d5efffc4039..8d4329e6b56062a1ef48a8607ddf52c31d251883 100644
 --- a/third_party/crashpad/crashpad/util/BUILD.gn
 +++ b/third_party/crashpad/crashpad/util/BUILD.gn
 @@ -296,10 +296,10 @@ crashpad_static_library("util") {
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index a3d13a71f28b9..826c1f5136be3 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -55,7 +55,7 @@ index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dc
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index ee713c5686d4ea8a5d73cebf74e67381b685cff6..375ce3294727b84bf0071681c7bc35c772e4e3b9 100644
+index d9ae000f1348529ab849349d7562dbb04fe9fd16..cf66978761f5dda2f8958234d62c3cf11ae4cf9c 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -74,7 +74,7 @@ index ee713c5686d4ea8a5d73cebf74e67381b685cff6..375ce3294727b84bf0071681c7bc35c7
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -229,16 +229,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
+@@ -222,16 +222,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -113,7 +113,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0adb5365a94 100644
+index e665eb42fad5f47b1643315d2cdcdf2eb66b069d..21451d9ae0cbb647cafe0e9ae47f067068aef1b7 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -141,9 +141,9 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
 +#endif
  }
  
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-@@ -192,7 +193,9 @@ void UpdatePrintSettingsReplyOnIO(
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ void OnDidGetDefaultPrintSettings(
+@@ -144,7 +145,9 @@ void OnDidUpdatePrintSettings(
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
 -  if (printer_query->last_status() == mojom::ResultCode::kSuccess) {
@@ -153,26 +153,25 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -245,6 +248,7 @@ void ScriptedPrintReplyOnIO(
+@@ -172,6 +175,7 @@ void OnDidScriptedPrint(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
 +
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -254,8 +258,9 @@ void ScriptedPrintReplyOnIO(
+@@ -181,7 +185,8 @@ void OnDidScriptedPrint(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
+-  std::move(callback).Run(std::move(params));
 +  bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
-   content::GetUIThreadTaskRunner({})->PostTask(
--      FROM_HERE, base::BindOnce(std::move(callback), std::move(params)));
-+      FROM_HERE, base::BindOnce(std::move(callback), std::move(params), canceled));
++  std::move(callback).Run(std::move(params), canceled);
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -293,12 +298,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -196,12 +201,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -187,7 +186,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -306,7 +313,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -209,7 +216,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -199,7 +198,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -334,6 +344,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -237,6 +247,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -209,7 +208,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
    enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -502,7 +515,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -405,7 +418,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -219,7 +218,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -517,16 +531,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -420,8 +434,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -232,18 +231,17 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  }
  
  void PrintViewManagerBase::UpdatePrintingEnabled() {
-   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+@@ -429,8 +446,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
    // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
--  web_contents()->GetMainFrame()->ForEachRenderFrameHost(base::BindRepeating(
--      &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
--      printing_enabled_.GetValue()));
-+  web_contents()->GetMainFrame()->ForEachRenderFrameHost(
-+      base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
+   web_contents()->GetPrimaryMainFrame()->ForEachRenderFrameHost(
+       base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
+-                          base::Unretained(this),
+-                          printing_enabled_.GetValue()));
 +                          base::Unretained(this), true));
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -642,11 +659,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -546,11 +562,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -258,7 +256,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -676,18 +696,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -588,18 +607,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -280,7 +278,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -697,6 +719,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -609,6 +630,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -288,7 +286,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -722,14 +745,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -640,14 +662,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -305,7 +303,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
      return;
    }
  #endif
-@@ -767,7 +790,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -685,7 +707,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -313,7 +311,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  #endif
  
    ReleasePrinterQuery();
-@@ -782,6 +804,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -700,6 +721,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -325,7 +323,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -792,10 +819,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -710,10 +736,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -338,7 +336,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -855,6 +884,11 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -773,6 +801,11 @@ void PrintViewManagerBase::OnJobDone() {
    ReleasePrintJob();
  }
  
@@ -350,9 +348,9 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
  void PrintViewManagerBase::OnFailed() {
    TerminatePrintJob(true);
  }
-@@ -912,7 +946,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -831,7 +864,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
-   // Disconnect the current |print_job_|.
+   // Disconnect the current `print_job_`.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
 -  DisconnectFromCurrentPrintJob();
 +  if (callback_.is_null()) {
@@ -362,7 +360,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    if (!weak_this)
      return false;
  
-@@ -993,6 +1030,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -912,6 +948,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
    }
  #endif
  
@@ -376,7 +374,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
    if (!print_job_)
      return;
  
-@@ -1042,7 +1086,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -961,7 +1004,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -385,7 +383,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
      return true;
  
    if (!cookie) {
-@@ -1150,7 +1194,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1067,7 +1110,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -502,7 +500,7 @@ index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d18
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 1664ac8233e74cadcf19ebc53e41cef37d13019c..aa341dd9a6f2b6e2ebb6e8048d2d9a3e5c3e89ea 100644
+index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804fe5039b8 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 288bb9200db53..dc0896803f661 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,7 +30,7 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 273750752cdef18ccd7d54b9b28c524375bb3e8d..3eec2e5c14186b39a67ca8ad410a3268841e5f4e 100644
+index 205921ae492bf30c16869cdd7ed9605d7fdbd452..51a720da21417c1e83570770959a44d90f172d66 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,10 +43,10 @@ index 273750752cdef18ccd7d54b9b28c524375bb3e8d..3eec2e5c14186b39a67ca8ad410a3268
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 987e437641b7978290aa2633755b67f9099e1d04..6f09c04cc612d2ac58b62d44516eefa1b66d145c 100644
+index 1c69625326df08b85ec77d01b588fc3a8ce58553..686fc99becf068106cc9fb372d2dce1e8d8c5114 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4491,6 +4491,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4537,6 +4537,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -57,12 +57,12 @@ index 987e437641b7978290aa2633755b67f9099e1d04..6f09c04cc612d2ac58b62d44516eefa1
 +
  bool WebContentsImpl::IsWidgetForPrimaryMainFrame(
      RenderWidgetHostImpl* render_widget_host) {
-   return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
+   return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 36888689fe38e7873f09b1bc64a901f0771cbd5b..13253163b54c86b37c7b5654b674c5f920c81272 100644
+index 9af9ea4e10a51572e726309e619fb31cb5a928ee..a44f6d7364ad26965e84a432ae376fa922af5fec 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -954,6 +954,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -957,6 +957,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index 579052a1a0d70..f7f2e7210be36 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index bdaae69dbeac280dcc83baa217d6c4ab0039ba35..14e7b4386d8d8bf020abf5a1037761eac1068223 100644
+index 1bb9760fee301bebb5e940d6786999cfbf52656f..0b4b9fb7d64ca1615d5a03e86f421b8f282ed27a 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -691,6 +691,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -699,6 +699,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index bdaae69dbeac280dcc83baa217d6c4ab0039ba35..14e7b4386d8d8bf020abf5a1037761ea
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 8f76edf316a075bddb2963ff1baf3ba0481b5fa7..2604d55c46e4ef3e512554a645d3db4b5670995c 100644
+index 2f7dabc3317f7b1a609e6b67795036696a6420d0..a300f9b497f206086d9bba01b0ea3948a1b6413a 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
@@ -50,7 +50,7 @@ index 8f76edf316a075bddb2963ff1baf3ba0481b5fa7..2604d55c46e4ef3e512554a645d3db4b
  class WebCursor;
  class WebContentsAccessibility;
  class DelegatedFrameHost;
-@@ -144,6 +148,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -145,6 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
        const gfx::Rect& keyboard_rect) override {}
    bool IsHTMLFormPopup() const override;
  
@@ -60,7 +60,7 @@ index 8f76edf316a075bddb2963ff1baf3ba0481b5fa7..2604d55c46e4ef3e512554a645d3db4b
    // This only needs to be overridden by RenderWidgetHostViewBase subclasses
    // that handle content embedded within other RenderWidgetHostViews.
    gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -295,6 +302,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -299,6 +306,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                     const ui::LatencyInfo& latency);
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index c70ffd75bc488..bfcb6e2bb6da5 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 0282cf6bb6674b10e6a92897ec8c5b2bb9c4a4a0..6ce9f338bb92390b355a7cc124e8fa869a3cb4ac 100644
+index 6e4656b8f6dd76e4e13e066a87de4ec893063a46..2232f86b1c91700cdc371adbfdd7beed99d26418 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -61,7 +61,7 @@ index 0282cf6bb6674b10e6a92897ec8c5b2bb9c4a4a0..6ce9f338bb92390b355a7cc124e8fa86
    // We only handle key down events and just simply forward other events.
    if (eventType != NSEventTypeKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1761,9 +1781,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1778,9 +1798,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index 0282cf6bb6674b10e6a92897ec8c5b2bb9c4a4a0..6ce9f338bb92390b355a7cc124e8fa86
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1772,7 +1794,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1789,7 +1811,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 64adbef1380b8..83075078e1b42 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index b1c9b0c7e7d6d8694f123d057e415676cab607c7..dc59a88bc930d4d7b8e606434d940cac5b834bd0 100644
+index 06e3385d4f148eb23f9ddf560afb563897846609..672bc56194e1ad8b03acd639c17b7f7e67a5dba0 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1538,7 +1538,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1539,7 +1539,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index b1c9b0c7e7d6d8694f123d057e415676cab607c7..dc59a88bc930d4d7b8e606434d940cac
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1567,6 +1567,12 @@ if (!is_android) {
+@@ -1568,6 +1568,12 @@ if (!is_android) {
    }
  }
  
@@ -75,5 +75,5 @@ index b1c9b0c7e7d6d8694f123d057e415676cab607c7..dc59a88bc930d4d7b8e606434d940cac
 +}
 +
  repack("unit_tests_pak") {
+   testonly = true
    sources = [ "$root_gen_dir/chrome/chrome_test_resources.pak" ]
-   output = "$root_out_dir/unit_tests.pak"
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 38a37c6c62911..a5704c0b5bb82 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index f81f1104399a42009f7705585716579d4c17ad03..d08e4c8223078230e35afd21b6f98ec839664ea9 100644
+index ab74207b348f211ee78de1384c9c75f7682926fe..ff475b3978b215cdbe921c620661070309bc5f5d 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1343,7 +1343,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1283,7 +1283,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index c0ca856c45100..f56ee04810871 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 733931cf9f2b55b63c0611cca673250696f1300d..8aa14d7cdb7edc5d53736fb959e3f9992d4fd896 100644
+index 654d7d77b2a7ea8e1819288bb49084e435072ba9..e186644f7592f7d0e827b7d8af6c31951738f6f5 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1750,9 +1750,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1748,9 +1748,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
@@ -42,7 +42,7 @@ index 733931cf9f2b55b63c0611cca673250696f1300d..8aa14d7cdb7edc5d53736fb959e3f999
  
      auto file_data = std::make_unique<ChildProcessLauncherFileData>();
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
-index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2dd6f7f0d8 100644
+index af8173d4203150237387529aa2b974aeec7c5a41..9fadaa80a4547a583484355342c3fd98d53bcd27 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 @@ -31,6 +31,9 @@ namespace content {
@@ -55,10 +55,10 @@ index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2d
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
    base::CommandLine::StringType renderer_prefix =
-@@ -58,6 +61,9 @@ RendererSandboxedProcessLauncherDelegateWin::
-                                                 bool is_jit_disabled)
-     : renderer_code_integrity_enabled_(
-           GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
+@@ -60,6 +63,9 @@ RendererSandboxedProcessLauncherDelegateWin::
+           GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()),
+       renderer_app_container_disabled_(
+           GetContentClient()->browser()->IsRendererAppContainerDisabled()) {
 +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
 +  use_zygote_ = !cmd_line->HasSwitch(switches::kNoZygote);
 +#endif
@@ -66,7 +66,7 @@ index 2c4bd947eca08223c541de53390a18d19208397e..6ef28fe7ebfd3dfa60995184772e3e2d
      dynamic_code_can_be_disabled_ = true;
      return;
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
-index 576a2c0782bf49cb57c973434b5d1f2ec9fdcbc5..24d1854c261372353c9bf69a6cb0cf2d24e9ebef 100644
+index 3a0e25b38965de5b57fd0be1112cf62dfda846d7..f412080cfb49330d855fdf1cbc13ff8850530401 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 9239a84e8dd6a..360dd0395bc2e 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 407f734b77d1ed4876f01327df958847d60e9128..ddfa7cf439244a6d58ab73dea014b341912f503f 100644
+index eb94d05bf03d04b508123675c31957b8d22ee13a..035aa45845d56d0a8edaa693689bb27e6cd3b158 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3026,6 +3026,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3032,6 +3032,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 407f734b77d1ed4876f01327df958847d60e9128..ddfa7cf439244a6d58ab73dea014b341
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3036,6 +3043,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3042,6 +3049,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,7 +35,7 @@ index 407f734b77d1ed4876f01327df958847d60e9128..ddfa7cf439244a6d58ab73dea014b341
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index e82a5b71eb8a6ee2df8478ccd3432b4afbb096aa..d5c2a922bba0ff0d5a4a22d9cd25be46fd09d4e1 100644
+index 92a075098c41f118a4114424715eb61f212b43b7..a99435a0a9c1c4e26a53d513f180a07f8308cbc9 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 913a437ac1e98..4377c64198a83 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index bb9b9d0ce53ce427075fd92ab1da119c08f6e591..6792e64b2f0f4a5080beb57804f861d8297524d2 100644
+index 6f963b0a1fcb00a16bcf423a494aad29b4c86b52..004fbb98b212372f7af73b9334ff44fb7a2a5eba 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -901,10 +901,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // for the outermost view. Inner `WebContents` will have a
    // `WebContentsViewChildFrame` so when dragging between an inner
    // `WebContents` and its embedder the view IDs will be the same.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 1653f6c8f33ce..a476327757682 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index e612764997277da3411d8040850756eb38996cca..f0341511d7d00f03a52bdead457f1f9d60ac5486 100644
+index bdf2fa0461840d6059b4a7d6660a356be5c38ba0..867b0efca67ce1d4198c2312a6ddc6a784784913 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6284,6 +6284,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6421,6 +6421,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
@@ -30,6 +30,6 @@ index e612764997277da3411d8040850756eb38996cca..f0341511d7d00f03a52bdead457f1f9d
 +        options.Clone());
 +  }
 +
-   delegate_->EnterFullscreenMode(this, *options);
-   delegate_->FullscreenStateChanged(this, /*is_fullscreen=*/true,
-                                     std::move(options));
+   // Focus the window if another frame may have delegated the capability.
+   if (had_fullscreen_token && !GetView()->HasFocus())
+     GetView()->Focus();
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 00b3be1ea6281..9cb4db7e26b71 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index eb8968c2a86102d0d3a21f07c394f1c360083c6c..025ef3f70a5ae34faf8c6013fbfba171c7f501ac 100644
+index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df28cf05e4 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -26,10 +26,10 @@ index eb8968c2a86102d0d3a21f07c394f1c360083c6c..025ef3f70a5ae34faf8c6013fbfba171
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 16322f245b51465d77b08c0c5d4da0b79ba8ae03..bd63f484db056d099bada03a0d3aab7742016110 100644
+index d4e55604b9a8485bb9088a272abca4a6d4e7494d..e842f73029cd7a7a2bdfd7b7d7483a6ecca8527c 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -966,6 +966,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -909,6 +909,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index 16322f245b51465d77b08c0c5d4da0b79ba8ae03..bd63f484db056d099bada03a0d3aab77
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 213b0b9c28974aecbdd2dd1297dfa21cd716a337..f77763977aee112b854ade93b59172247599a16b 100644
+index 0d484ebcc48d5b230ba94a07745e14f4cf706702..0387f4de1e181200ecd7323d2cea2fa854de62c0 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -209,6 +209,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -191,6 +191,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -55,10 +55,10 @@ index 213b0b9c28974aecbdd2dd1297dfa21cd716a337..f77763977aee112b854ade93b5917224
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 3f8fbe6330051d96715706801efdefcb2ee3b971..be0eb834ba868bb7f6f40e08277f4475a6a92f7d 100644
+index 00a10e9d00f0aad692fd87b9ea51085ef3fbfd1f..f346dfc768dca2f616e6e3197a98a8c896516568 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -722,6 +722,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -676,6 +676,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 4d3c34796e359..fe77a9ab717ab 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 025ef3f70a5ae34faf8c6013fbfba171c7f501ac..cea3f3dc05f91927f4ee8be5eec85ec26c8e1e07 100644
+index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7b491b9ba 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -356,6 +356,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -35,10 +35,10 @@ index 025ef3f70a5ae34faf8c6013fbfba171c7f501ac..cea3f3dc05f91927f4ee8be5eec85ec2
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index bd63f484db056d099bada03a0d3aab7742016110..7aea168344138d6210216997047bdcd8edfab6cc 100644
+index e842f73029cd7a7a2bdfd7b7d7483a6ecca8527c..21b9c228654222263e4ec5b028f098e417ee45fc 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -978,6 +978,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -921,6 +921,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index bd63f484db056d099bada03a0d3aab7742016110..7aea168344138d6210216997047bdcd8
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index f77763977aee112b854ade93b59172247599a16b..f3518973a5e071bf428d928f20255c208cf4d0b9 100644
+index 0387f4de1e181200ecd7323d2cea2fa854de62c0..d1da5a8cd5c7967e5ace9050110314f9ea5d605d 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -209,6 +209,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -191,6 +191,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -65,10 +65,10 @@ index f77763977aee112b854ade93b59172247599a16b..f3518973a5e071bf428d928f20255c20
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index be0eb834ba868bb7f6f40e08277f4475a6a92f7d..00db8b6bdbf005a9aac20ede6ce810aefac4d03e 100644
+index f346dfc768dca2f616e6e3197a98a8c896516568..bcf4ac6bce4f83a7fe97621a8c9b49e6684fed95 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -722,6 +722,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -676,6 +676,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/nan/.patches b/patches/nan/.patches
index 3b26a944836c5..55f1dd90c6bb6 100644
--- a/patches/nan/.patches
+++ b/patches/nan/.patches
@@ -1 +1,2 @@
 use_new_constructor_for_scriptorigin_when_17_x.patch
+chore_remove_deprecated_accessorsignatures.patch
diff --git a/patches/nan/chore_remove_deprecated_accessorsignatures.patch b/patches/nan/chore_remove_deprecated_accessorsignatures.patch
new file mode 100644
index 0000000000000..8cd9f2000153a
--- /dev/null
+++ b/patches/nan/chore_remove_deprecated_accessorsignatures.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Thu, 2 Jun 2022 15:45:21 +0200
+Subject: chore: remove deprecated AccessorSignatures
+
+Removed in https://chromium-review.googlesource.com/c/v8/v8/+/3654096
+Upstreamed to nan: https://github.com/nodejs/nan/pull/941
+
+diff --git a/nan.h b/nan.h
+index df5496c1a001120d10cd7c4b87d5e7bce8169f38..c29a99b79970421a15c5520a94ab65b1c3c473ff 100644
+--- a/nan.h
++++ b/nan.h
+@@ -2516,8 +2516,7 @@ inline void SetAccessor(
+   , SetterCallback setter = 0
+   , v8::Local<v8::Value> data = v8::Local<v8::Value>()
+   , v8::AccessControl settings = v8::DEFAULT
+-  , v8::PropertyAttribute attribute = v8::None
+-  , imp::Sig signature = imp::Sig()) {
++  , v8::PropertyAttribute attribute = v8::None) {
+   HandleScope scope;
+ 
+   imp::NativeGetter getter_ =
+@@ -2550,9 +2549,6 @@ inline void SetAccessor(
+     , obj
+     , settings
+     , attribute
+-#if (NODE_MODULE_VERSION < NODE_18_0_MODULE_VERSION)
+-    , signature
+-#endif
+   );
+ }
+ 
+diff --git a/nan_callbacks.h b/nan_callbacks.h
+index 53ede846ac9a865a737218dabbbd48305d3d6b63..ea81e452d364e3d3c15a121dc69ae21134bfb586 100644
+--- a/nan_callbacks.h
++++ b/nan_callbacks.h
+@@ -52,8 +52,6 @@ typedef void(*IndexQueryCallback)(
+     const PropertyCallbackInfo<v8::Integer>&);
+ 
+ namespace imp {
+-typedef v8::Local<v8::AccessorSignature> Sig;
+-
+ static const int kDataIndex =                    0;
+ 
+ static const int kFunctionIndex =                1;
diff --git a/patches/node/.patches b/patches/node/.patches
index 2c31d38101c8a..2066849e25cbb 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -43,3 +43,5 @@ macos_avoid_posix_spawnp_cwd_bug_3597.patch
 src_update_importmoduledynamically.patch
 fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
 json_parse_errors_made_user-friendly.patch
+build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
+support_v8_sandboxed_pointers.patch
diff --git a/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch b/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
new file mode 100644
index 0000000000000..1c47ff5336b9d
--- /dev/null
+++ b/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Mon, 6 Jun 2022 14:46:40 -0700
+Subject: build: define _LIBCPP_ABI_NAMESPACE as Cr to align with chromium
+
+Without this define native modules will be built trying to link to _LIBCPP_ABI_NAMESPACE which is the default name, chromium overrides this to Cr for PDB size reasons but they override it on all platforms.  Setting this define allows native modules to actually work. This should not be upstreamed as it is Electron specific.
+
+Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3655638
+
+diff --git a/common.gypi b/common.gypi
+index bdfe81d11cc50f492c93fe48f6946765b6fb5238..559b7f7c220cb98946285bb15d0d63e203bbcea4 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -288,6 +288,7 @@
+       'V8_DEPRECATION_WARNINGS',
+       'V8_IMMINENT_DEPRECATION_WARNINGS',
+       '_GLIBCXX_USE_CXX11_ABI=1',
++      '_LIBCPP_ABI_NAMESPACE=Cr',
+     ],
+ 
+     # Forcibly disable -Werror.  We support a wide range of compilers, it's
diff --git a/patches/node/fix_crypto_tests_to_run_with_bssl.patch b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
index 44a303b93a03b..878160f610ebf 100644
--- a/patches/node/fix_crypto_tests_to_run_with_bssl.patch
+++ b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
@@ -251,6 +251,35 @@ index 3bbca5b0da395b94c04da7bb7c55b107e41367d8..af62558c4f23aa82804e0077da7b7f3a
  
  
  //
+diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
+index 4a5f1f149fe6c739f7f1d2ee17df6e61a942d621..b3287f428ce6b3fde11d449c601a57ff5e3843f9 100644
+--- a/test/parallel/test-crypto-certificate.js
++++ b/test/parallel/test-crypto-certificate.js
+@@ -40,8 +40,10 @@ function copyArrayBuffer(buf) {
+ }
+ 
+ function checkMethods(certificate) {
+-
++  /* spkacValid has a md5 based signature which is not allowed in boringssl
++  https://boringssl.googlesource.com/boringssl/+/33d7e32ce40c04e8f1b99c05964956fda187819f
+   assert.strictEqual(certificate.verifySpkac(spkacValid), true);
++  */
+   assert.strictEqual(certificate.verifySpkac(spkacFail), false);
+ 
+   assert.strictEqual(
+@@ -56,10 +58,12 @@ function checkMethods(certificate) {
+   );
+   assert.strictEqual(certificate.exportChallenge(spkacFail), '');
+ 
++  /* spkacValid has a md5 based signature which is not allowed in boringssl
+   const ab = copyArrayBuffer(spkacValid);
+   assert.strictEqual(certificate.verifySpkac(ab), true);
+   assert.strictEqual(certificate.verifySpkac(new Uint8Array(ab)), true);
+   assert.strictEqual(certificate.verifySpkac(new DataView(ab)), true);
++  */
+ }
+ 
+ {
 diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js
 index 35514afbea92562a81c163b1e4d918b4ab609f71..13098e1acf12c309f2ed6f6143a2c2eeb8a2763d 100644
 --- a/test/parallel/test-crypto-cipher-decipher.js
diff --git a/patches/node/support_v8_sandboxed_pointers.patch b/patches/node/support_v8_sandboxed_pointers.patch
new file mode 100644
index 0000000000000..a07e9f2560115
--- /dev/null
+++ b/patches/node/support_v8_sandboxed_pointers.patch
@@ -0,0 +1,375 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Tue, 21 Jun 2022 10:04:21 -0700
+Subject: support V8 sandboxed pointers
+
+This refactors several allocators to allocate within the V8 memory cage,
+allowing them to be compatible with the V8_SANDBOXED_POINTERS feature.
+
+diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
+index 4c459b58b5a048d9d8a4f15f4011e7cce68089f4..6fb4c8d4567aee5b313ad621ea42699a196f18c7 100644
+--- a/lib/internal/bootstrap/pre_execution.js
++++ b/lib/internal/bootstrap/pre_execution.js
+@@ -14,7 +14,6 @@ const {
+   getOptionValue,
+   getEmbedderOptions,
+ } = require('internal/options');
+-const { reconnectZeroFillToggle } = require('internal/buffer');
+ const {
+   defineOperation,
+   emitExperimentalWarning,
+@@ -26,10 +25,6 @@ const { ERR_MANIFEST_ASSERT_INTEGRITY } = require('internal/errors').codes;
+ const assert = require('internal/assert');
+ 
+ function prepareMainThreadExecution(expandArgv1 = false) {
+-  // TODO(joyeecheung): this is also necessary for workers when they deserialize
+-  // this toggle from the snapshot.
+-  reconnectZeroFillToggle();
+-
+   // Patch the process object with legacy properties and normalizations
+   patchProcessObject(expandArgv1);
+   setupTraceCategoryState();
+diff --git a/lib/internal/buffer.js b/lib/internal/buffer.js
+index bd38cf48a7fc6e8d61d8f11fa15c34aee182cbe3..1aa071cdc071dcdaf5c3b4bed0d3d76e5871731d 100644
+--- a/lib/internal/buffer.js
++++ b/lib/internal/buffer.js
+@@ -30,7 +30,7 @@ const {
+   hexWrite,
+   ucs2Write,
+   utf8Write,
+-  getZeroFillToggle
++  setZeroFillToggle
+ } = internalBinding('buffer');
+ const {
+   untransferable_object_private_symbol,
+@@ -1055,24 +1055,15 @@ function markAsUntransferable(obj) {
+ // in C++.
+ // |zeroFill| can be undefined when running inside an isolate where we
+ // do not own the ArrayBuffer allocator.  Zero fill is always on in that case.
+-let zeroFill = getZeroFillToggle();
+ function createUnsafeBuffer(size) {
+-  zeroFill[0] = 0;
++  setZeroFillToggle(false);
+   try {
+     return new FastBuffer(size);
+   } finally {
+-    zeroFill[0] = 1;
++    setZeroFillToggle(true)
+   }
+ }
+ 
+-// The connection between the JS land zero fill toggle and the
+-// C++ one in the NodeArrayBufferAllocator gets lost if the toggle
+-// is deserialized from the snapshot, because V8 owns the underlying
+-// memory of this toggle. This resets the connection.
+-function reconnectZeroFillToggle() {
+-  zeroFill = getZeroFillToggle();
+-}
+-
+ module.exports = {
+   FastBuffer,
+   addBufferPrototypeMethods,
+@@ -1080,5 +1071,4 @@ module.exports = {
+   createUnsafeBuffer,
+   readUInt16BE,
+   readUInt32BE,
+-  reconnectZeroFillToggle
+ };
+diff --git a/src/api/environment.cc b/src/api/environment.cc
+index 2abf5994405e8da2a04d1b23b75ccd3658398474..024d612a04d83583b397549589d994e32cf0107f 100644
+--- a/src/api/environment.cc
++++ b/src/api/environment.cc
+@@ -83,16 +83,16 @@ MaybeLocal<Value> PrepareStackTraceCallback(Local<Context> context,
+ void* NodeArrayBufferAllocator::Allocate(size_t size) {
+   void* ret;
+   if (zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
+-    ret = UncheckedCalloc(size);
++    ret = allocator_->Allocate(size);
+   else
+-    ret = UncheckedMalloc(size);
++    ret = allocator_->AllocateUninitialized(size);
+   if (LIKELY(ret != nullptr))
+     total_mem_usage_.fetch_add(size, std::memory_order_relaxed);
+   return ret;
+ }
+ 
+ void* NodeArrayBufferAllocator::AllocateUninitialized(size_t size) {
+-  void* ret = node::UncheckedMalloc(size);
++  void* ret = allocator_->AllocateUninitialized(size);
+   if (LIKELY(ret != nullptr))
+     total_mem_usage_.fetch_add(size, std::memory_order_relaxed);
+   return ret;
+@@ -100,7 +100,7 @@ void* NodeArrayBufferAllocator::AllocateUninitialized(size_t size) {
+ 
+ void* NodeArrayBufferAllocator::Reallocate(
+     void* data, size_t old_size, size_t size) {
+-  void* ret = UncheckedRealloc<char>(static_cast<char*>(data), size);
++  void* ret = allocator_->Reallocate(data, old_size, size);
+   if (LIKELY(ret != nullptr) || UNLIKELY(size == 0))
+     total_mem_usage_.fetch_add(size - old_size, std::memory_order_relaxed);
+   return ret;
+@@ -108,7 +108,7 @@ void* NodeArrayBufferAllocator::Reallocate(
+ 
+ void NodeArrayBufferAllocator::Free(void* data, size_t size) {
+   total_mem_usage_.fetch_sub(size, std::memory_order_relaxed);
+-  free(data);
++  allocator_->Free(data, size);
+ }
+ 
+ DebuggingArrayBufferAllocator::~DebuggingArrayBufferAllocator() {
+diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
+index 8dffad89c80e0906780d1b26ba9a65ba1e76ce0a..45bc99ce75248794e95b2dcb0101c28152e2bfd0 100644
+--- a/src/crypto/crypto_util.cc
++++ b/src/crypto/crypto_util.cc
+@@ -318,10 +318,35 @@ ByteSource& ByteSource::operator=(ByteSource&& other) noexcept {
+   return *this;
+ }
+ 
+-std::unique_ptr<BackingStore> ByteSource::ReleaseToBackingStore() {
++std::unique_ptr<BackingStore> ByteSource::ReleaseToBackingStore(Environment* env) {
+   // It's ok for allocated_data_ to be nullptr but
+   // only if size_ is zero.
+   CHECK_IMPLIES(size_ > 0, allocated_data_ != nullptr);
++#if defined(V8_SANDBOXED_POINTERS)
++  // When V8 sandboxed pointers are enabled, we have to copy into the memory
++  // cage. We still want to ensure we erase the data on free though, so
++  // provide a custom deleter that calls OPENSSL_cleanse.
++  if (!size())
++    return ArrayBuffer::NewBackingStore(env->isolate(), 0);
++  std::unique_ptr<ArrayBuffer::Allocator> allocator(ArrayBuffer::Allocator::NewDefaultAllocator());
++  void* v8_data = allocator->Allocate(size());
++  CHECK(v8_data);
++  memcpy(v8_data, allocated_data_, size());
++  OPENSSL_clear_free(allocated_data_, size());
++  std::unique_ptr<BackingStore> ptr = ArrayBuffer::NewBackingStore(
++      v8_data,
++      size(),
++      [](void* data, size_t length, void*) {
++        OPENSSL_cleanse(data, length);
++        std::unique_ptr<ArrayBuffer::Allocator> allocator(ArrayBuffer::Allocator::NewDefaultAllocator());
++        allocator->Free(data, length);
++      }, nullptr);
++  CHECK(ptr);
++  allocated_data_ = nullptr;
++  data_ = nullptr;
++  size_ = 0;
++  return ptr;
++#else
+   std::unique_ptr<BackingStore> ptr = ArrayBuffer::NewBackingStore(
+       allocated_data_,
+       size(),
+@@ -333,10 +358,11 @@ std::unique_ptr<BackingStore> ByteSource::ReleaseToBackingStore() {
+   data_ = nullptr;
+   size_ = 0;
+   return ptr;
++#endif  // defined(V8_SANDBOXED_POINTERS)
+ }
+ 
+ Local<ArrayBuffer> ByteSource::ToArrayBuffer(Environment* env) {
+-  std::unique_ptr<BackingStore> store = ReleaseToBackingStore();
++  std::unique_ptr<BackingStore> store = ReleaseToBackingStore(env);
+   return ArrayBuffer::New(env->isolate(), std::move(store));
+ }
+ 
+@@ -665,6 +691,16 @@ CryptoJobMode GetCryptoJobMode(v8::Local<v8::Value> args) {
+ }
+ 
+ namespace {
++#if defined(V8_SANDBOXED_POINTERS)
++// When V8 sandboxed pointers are enabled, the secure heap cannot be used as
++// all ArrayBuffers must be allocated inside the V8 memory cage.
++void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
++  CHECK(args[0]->IsUint32());
++  uint32_t len = args[0].As<Uint32>()->Value();
++  Local<ArrayBuffer> buffer = ArrayBuffer::New(args.GetIsolate(), len);
++  args.GetReturnValue().Set(Uint8Array::New(buffer, 0, len));
++}
++#else
+ // SecureBuffer uses openssl to allocate a Uint8Array using
+ // OPENSSL_secure_malloc. Because we do not yet actually
+ // make use of secure heap, this has the same semantics as
+@@ -692,6 +728,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+   Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store);
+   args.GetReturnValue().Set(Uint8Array::New(buffer, 0, len));
+ }
++#endif  // defined(V8_SANDBOXED_POINTERS)
+ 
+ void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
+ #ifndef OPENSSL_IS_BORINGSSL
+diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
+index 0ce3a8f219a2952f660ff72a6ce36ee109add649..06e9eb72e4ea60db4c63d08b24b80a1e6c4f3eaf 100644
+--- a/src/crypto/crypto_util.h
++++ b/src/crypto/crypto_util.h
+@@ -257,7 +257,7 @@ class ByteSource {
+   // Creates a v8::BackingStore that takes over responsibility for
+   // any allocated data. The ByteSource will be reset with size = 0
+   // after being called.
+-  std::unique_ptr<v8::BackingStore> ReleaseToBackingStore();
++  std::unique_ptr<v8::BackingStore> ReleaseToBackingStore(Environment* env);
+ 
+   v8::Local<v8::ArrayBuffer> ToArrayBuffer(Environment* env);
+ 
+diff --git a/src/node_buffer.cc b/src/node_buffer.cc
+index 215bd8003aabe17e43ac780c723cfe971b437eae..eb00eb6f592e20f3c17a529f30b09673774eb1c1 100644
+--- a/src/node_buffer.cc
++++ b/src/node_buffer.cc
+@@ -1175,33 +1175,14 @@ void SetBufferPrototype(const FunctionCallbackInfo<Value>& args) {
+   env->set_buffer_prototype_object(proto);
+ }
+ 
+-void GetZeroFillToggle(const FunctionCallbackInfo<Value>& args) {
++void SetZeroFillToggle(const FunctionCallbackInfo<Value>& args) {
+   Environment* env = Environment::GetCurrent(args);
+   NodeArrayBufferAllocator* allocator = env->isolate_data()->node_allocator();
+   Local<ArrayBuffer> ab;
+-  // It can be a nullptr when running inside an isolate where we
+-  // do not own the ArrayBuffer allocator.
+-  if (allocator == nullptr) {
+-    // Create a dummy Uint32Array - the JS land can only toggle the C++ land
+-    // setting when the allocator uses our toggle. With this the toggle in JS
+-    // land results in no-ops.
+-    ab = ArrayBuffer::New(env->isolate(), sizeof(uint32_t));
+-  } else {
++  if (allocator != nullptr) {
+     uint32_t* zero_fill_field = allocator->zero_fill_field();
+-    std::unique_ptr<BackingStore> backing =
+-        ArrayBuffer::NewBackingStore(zero_fill_field,
+-                                     sizeof(*zero_fill_field),
+-                                     [](void*, size_t, void*) {},
+-                                     nullptr);
+-    ab = ArrayBuffer::New(env->isolate(), std::move(backing));
++    *zero_fill_field = args[0]->BooleanValue(env->isolate());
+   }
+-
+-  ab->SetPrivate(
+-      env->context(),
+-      env->untransferable_object_private_symbol(),
+-      True(env->isolate())).Check();
+-
+-  args.GetReturnValue().Set(Uint32Array::New(ab, 0, 1));
+ }
+ 
+ void DetachArrayBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -1310,7 +1291,7 @@ void Initialize(Local<Object> target,
+   env->SetMethod(target, "ucs2Write", StringWrite<UCS2>);
+   env->SetMethod(target, "utf8Write", StringWrite<UTF8>);
+ 
+-  env->SetMethod(target, "getZeroFillToggle", GetZeroFillToggle);
++  env->SetMethod(target, "setZeroFillToggle", SetZeroFillToggle);
+ }
+ 
+ }  // anonymous namespace
+@@ -1350,7 +1331,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
+   registry->Register(StringWrite<HEX>);
+   registry->Register(StringWrite<UCS2>);
+   registry->Register(StringWrite<UTF8>);
+-  registry->Register(GetZeroFillToggle);
++  registry->Register(SetZeroFillToggle);
+ 
+   registry->Register(DetachArrayBuffer);
+   registry->Register(CopyArrayBuffer);
+diff --git a/src/node_i18n.cc b/src/node_i18n.cc
+index c537a247f55ff070da1988fc8b7309b5692b5c18..59bfb597849cd5a94800d6c83b238ef77245243e 100644
+--- a/src/node_i18n.cc
++++ b/src/node_i18n.cc
+@@ -104,7 +104,7 @@ namespace {
+ 
+ template <typename T>
+ MaybeLocal<Object> ToBufferEndian(Environment* env, MaybeStackBuffer<T>* buf) {
+-  MaybeLocal<Object> ret = Buffer::New(env, buf);
++  MaybeLocal<Object> ret = Buffer::Copy(env, reinterpret_cast<char*>(buf->out()), buf->length() * sizeof(T));
+   if (ret.IsEmpty())
+     return ret;
+ 
+diff --git a/src/node_internals.h b/src/node_internals.h
+index d37be23cd63e82d4040777bd0e17ed449ec0b15b..0b66996f11c66800a7e21ee84fa101450b856227 100644
+--- a/src/node_internals.h
++++ b/src/node_internals.h
+@@ -118,6 +118,8 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator {
+  private:
+   uint32_t zero_fill_field_ = 1;  // Boolean but exposed as uint32 to JS land.
+   std::atomic<size_t> total_mem_usage_ {0};
++
++  std::unique_ptr<v8::ArrayBuffer::Allocator> allocator_{v8::ArrayBuffer::Allocator::NewDefaultAllocator()};
+ };
+ 
+ class DebuggingArrayBufferAllocator final : public NodeArrayBufferAllocator {
+diff --git a/src/node_serdes.cc b/src/node_serdes.cc
+index f6f0034bc24d09e3ad65491c7d6be0b9c9db1581..92d5020f293c98c81d3891a82f7320629bf9f926 100644
+--- a/src/node_serdes.cc
++++ b/src/node_serdes.cc
+@@ -29,6 +29,11 @@ using v8::ValueSerializer;
+ 
+ namespace serdes {
+ 
++v8::ArrayBuffer::Allocator* GetAllocator() {
++  static v8::ArrayBuffer::Allocator* allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
++  return allocator;
++};
++
+ class SerializerContext : public BaseObject,
+                           public ValueSerializer::Delegate {
+  public:
+@@ -37,10 +42,15 @@ class SerializerContext : public BaseObject,
+ 
+   ~SerializerContext() override = default;
+ 
++  // v8::ValueSerializer::Delegate
+   void ThrowDataCloneError(Local<String> message) override;
+   Maybe<bool> WriteHostObject(Isolate* isolate, Local<Object> object) override;
+   Maybe<uint32_t> GetSharedArrayBufferId(
+       Isolate* isolate, Local<SharedArrayBuffer> shared_array_buffer) override;
++  void* ReallocateBufferMemory(void* old_buffer,
++                               size_t old_length,
++                               size_t* new_length) override;
++  void FreeBufferMemory(void* buffer) override;
+ 
+   static void SetTreatArrayBufferViewsAsHostObjects(
+       const FunctionCallbackInfo<Value>& args);
+@@ -61,6 +71,7 @@ class SerializerContext : public BaseObject,
+ 
+  private:
+   ValueSerializer serializer_;
++  size_t last_length_ = 0;
+ };
+ 
+ class DeserializerContext : public BaseObject,
+@@ -144,6 +155,24 @@ Maybe<uint32_t> SerializerContext::GetSharedArrayBufferId(
+   return id.ToLocalChecked()->Uint32Value(env()->context());
+ }
+ 
++void* SerializerContext::ReallocateBufferMemory(void* old_buffer,
++                                                size_t requested_size,
++                                                size_t* new_length) {
++  *new_length = std::max(static_cast<size_t>(4096), requested_size);
++  if (old_buffer) {
++    void* ret = GetAllocator()->Reallocate(old_buffer, last_length_, *new_length);
++    last_length_ = *new_length;
++    return ret;
++  } else {
++    last_length_ = *new_length;
++    return GetAllocator()->Allocate(*new_length);
++  }
++}
++
++void SerializerContext::FreeBufferMemory(void* buffer) {
++  GetAllocator()->Free(buffer, last_length_);
++}
++
+ Maybe<bool> SerializerContext::WriteHostObject(Isolate* isolate,
+                                                Local<Object> input) {
+   MaybeLocal<Value> ret;
+@@ -211,7 +240,12 @@ void SerializerContext::ReleaseBuffer(const FunctionCallbackInfo<Value>& args) {
+   std::pair<uint8_t*, size_t> ret = ctx->serializer_.Release();
+   auto buf = Buffer::New(ctx->env(),
+                          reinterpret_cast<char*>(ret.first),
+-                         ret.second);
++                         ret.second,
++                         [](char* data, void* hint){
++                           if (data)
++                             GetAllocator()->Free(data, reinterpret_cast<size_t>(hint));
++                         },
++                         reinterpret_cast<void*>(ctx->last_length_));
+ 
+   if (!buf.IsEmpty()) {
+     args.GetReturnValue().Set(buf.ToLocalChecked());
diff --git a/patches/v8/.patches b/patches/v8/.patches
index aa4ed2c39d565..9df51315c6cfe 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -8,5 +8,6 @@ fix_build_deprecated_attribute_for_older_msvc_versions.patch
 fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
-allow_disabling_of_v8_sandboxed_pointers.patch
 chore_disable_is_execution_terminating_dcheck.patch
+build_remove_legacy_oom_error_callback.patch
+force_disable_v8_sandboxed_pointers.patch
diff --git a/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch b/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
deleted file mode 100644
index 2c98e2ad7c6d2..0000000000000
--- a/patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: John Kleinschmidt <jkleinsc@electronjs.org>
-Date: Thu, 26 May 2022 10:45:49 -0400
-Subject: allow disabling of v8 sandboxed pointers
-
-V8 sandboxed pointers are incompatible with Node due to changes like
-https://chromium-review.googlesource.com/c/v8/v8/+/3114136, so for
-now we need a way to disable v8 sandboxed pointers.
-
-diff --git a/BUILD.gn b/BUILD.gn
-index 114cfd757b60c14cfb7a6bc9f9f69765363c9c6c..5e8a6bb2c26c3e5701e628cbf4bfcf9b2eb6b82f 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -501,18 +501,6 @@ if (v8_enable_sandbox == "") {
-       v8_enable_external_code_space
- }
- 
--# Enable sandboxed pointers on desktop when the sandbox is enabled.
--if (v8_enable_sandbox) {
--  # When sanitizers are enabled, PartitionAlloc forwards allocations to malloc
--  # instead of allocating from its Pools and so isn't compatible with the
--  # sandbox. As such, disable the sandbox there. See https://crbug.com/1323174
--  if (!is_asan && !is_hwasan && !is_lsan && !is_tsan && !is_msan) {
--    v8_enable_sandboxed_pointers =
--        target_os != "fuchsia" && target_os != "android" &&
--        target_os != "chromeos"
--  }
--}
--
- # Enable all available sandbox features if sandbox future is enabled.
- if (v8_enable_sandbox_future) {
-   v8_enable_sandboxed_pointers = true
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index aec7148bcd45c..adab060b9821c 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 744ae6a11ffff47872da4141b3f0e4af5130fff9..31dfdf8a3facd470c3f92c58a5a12566af96521a 100644
+index 41dab6bec85e6898bb8bf78c6287178aa55a7e74..f5879e1361b127f1213e6abe649d7e82c45b43ce 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -620,7 +620,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 744ae6a11ffff47872da4141b3f0e4af5130fff9..31dfdf8a3facd470c3f92c58a5a12566
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5905,7 +5905,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5948,7 +5948,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 744ae6a11ffff47872da4141b3f0e4af5130fff9..31dfdf8a3facd470c3f92c58a5a12566
  
      deps = [
        ":v8_libbase",
-@@ -5943,6 +5943,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -5986,6 +5986,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/build_remove_legacy_oom_error_callback.patch b/patches/v8/build_remove_legacy_oom_error_callback.patch
new file mode 100644
index 0000000000000..561e783936029
--- /dev/null
+++ b/patches/v8/build_remove_legacy_oom_error_callback.patch
@@ -0,0 +1,168 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <keeleymhammond@gmail.com>
+Date: Tue, 14 Jun 2022 15:12:43 -0700
+Subject: build: remove legacy oom error callback
+
+Addresses 3646014: [API] Deprecate LegacyOOMErrorCallback:
+https://chromium-review.googlesource.com/c/v8/v8/+/3646014
+
+This deprecation was added to warn embedders that the legacy method
+was being replaced. However, Electron does not use the legacy method.
+The deprecation causes build issues on Windows, this patch removes
+the unused method entirely to avoid those errors.
+
+This patch can be removed in v8 10.6, when legacy_oom_error_callback
+is removed.
+
+diff --git a/include/v8-callbacks.h b/include/v8-callbacks.h
+index b39921dea0415362d1a30159f3fac0e345e2313e..810fc4edaf69565959148d3c1ec662f0db3e8490 100644
+--- a/include/v8-callbacks.h
++++ b/include/v8-callbacks.h
+@@ -217,10 +217,6 @@ using AddHistogramSampleCallback = void (*)(void* histogram, int sample);
+ 
+ using FatalErrorCallback = void (*)(const char* location, const char* message);
+ 
+-using LegacyOOMErrorCallback V8_DEPRECATED(
+-    "Use OOMErrorCallback (https://crbug.com/1323177)") =
+-    void (*)(const char* location, bool is_heap_oom);
+-
+ struct OOMDetails {
+   bool is_heap_oom = false;
+   const char* detail = nullptr;
+diff --git a/include/v8-initialization.h b/include/v8-initialization.h
+index 5cadd1788926a7b305ba4d05792b9efa6183d73e..c01c337317afb088927cae0239542281a89d1bb1 100644
+--- a/include/v8-initialization.h
++++ b/include/v8-initialization.h
+@@ -286,9 +286,6 @@ class V8_EXPORT V8 {
+    */
+   static void SetFatalMemoryErrorCallback(OOMErrorCallback callback);
+ 
+-  V8_DEPRECATED("Use OOMErrorCallback (https://crbug.com/1323177)")
+-  static void SetFatalMemoryErrorCallback(LegacyOOMErrorCallback callback);
+-
+   /**
+    * Get statistics about the shared memory usage.
+    */
+diff --git a/include/v8-isolate.h b/include/v8-isolate.h
+index b54c7388603b4582356f6741c9a36f2835aa1928..b9533b78046228705e2038396eebf23b1d663df1 100644
+--- a/include/v8-isolate.h
++++ b/include/v8-isolate.h
+@@ -288,9 +288,6 @@ class V8_EXPORT Isolate {
+     FatalErrorCallback fatal_error_callback = nullptr;
+     OOMErrorCallback oom_error_callback = nullptr;
+ 
+-    V8_DEPRECATED("Use oom_error_callback (https://crbug.com/1323177)")
+-    LegacyOOMErrorCallback legacy_oom_error_callback = nullptr;
+-
+     /**
+      * The following parameter is experimental and may change significantly.
+      * This is currently for internal testing.
+@@ -1468,10 +1465,6 @@ class V8_EXPORT Isolate {
+   /** Set the callback to invoke in case of fatal errors. */
+   void SetFatalErrorHandler(FatalErrorCallback that);
+ 
+-  /** Set the callback to invoke in case of OOM errors (deprecated). */
+-  V8_DEPRECATED("Use OOMErrorCallback (https://crbug.com/1323177)")
+-  void SetOOMErrorHandler(LegacyOOMErrorCallback that);
+-
+   /** Set the callback to invoke in case of OOM errors. */
+   void SetOOMErrorHandler(OOMErrorCallback that);
+ 
+diff --git a/src/api/api.cc b/src/api/api.cc
+index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332f8778136 100644
+--- a/src/api/api.cc
++++ b/src/api/api.cc
+@@ -167,13 +167,6 @@
+ 
+ namespace v8 {
+ 
+-// Redefine LegacyOOMErrorCallback here for internal usage. We still need to
+-// support it but it is deprecated so would trigger warnings.
+-// TODO(chromium:1323177): Remove this.
+-using DeprecatedLegacyOOMErrorCallback = void (*)(const char* location,
+-                                                  bool is_heap_oom);
+-
+-static DeprecatedLegacyOOMErrorCallback g_legacy_oom_error_callback = nullptr;
+ static OOMErrorCallback g_oom_error_callback = nullptr;
+ 
+ static ScriptOrigin GetScriptOriginForScript(i::Isolate* i_isolate,
+@@ -231,9 +224,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
+     // Give the embedder a chance to handle the condition. If it doesn't,
+     // just crash.
+     if (g_oom_error_callback) g_oom_error_callback(location, details);
+-    if (g_legacy_oom_error_callback) {
+-      g_legacy_oom_error_callback(location, details.is_heap_oom);
+-    }
+     FATAL("Fatal process out of memory: %s", location);
+     UNREACHABLE();
+   }
+@@ -309,9 +299,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
+   }
+   Utils::ReportOOMFailure(i_isolate, location, details);
+   if (g_oom_error_callback) g_oom_error_callback(location, details);
+-  if (g_legacy_oom_error_callback) {
+-    g_legacy_oom_error_callback(location, details.is_heap_oom);
+-  }
+   // If the fatal error handler returns, we stop execution.
+   FATAL("API fatal error handler returned after process out of memory");
+ }
+@@ -343,8 +330,6 @@ void Utils::ReportOOMFailure(i::Isolate* i_isolate, const char* location,
+                              const OOMDetails& details) {
+   if (auto oom_callback = i_isolate->oom_behavior()) {
+     oom_callback(location, details);
+-  } else if (auto legacy_oom_callback = i_isolate->legacy_oom_behavior()) {
+-    legacy_oom_callback(location, details.is_heap_oom);
+   } else {
+     // TODO(wfh): Remove this fallback once Blink is setting OOM handler. See
+     // crbug.com/614440.
+@@ -6121,11 +6106,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
+   g_oom_error_callback = oom_error_callback;
+ }
+ 
+-void v8::V8::SetFatalMemoryErrorCallback(
+-    v8::LegacyOOMErrorCallback legacy_oom_error_callback) {
+-  g_legacy_oom_error_callback = legacy_oom_error_callback;
+-}
+-
+ void v8::V8::SetEntropySource(EntropySource entropy_source) {
+   base::RandomNumberGenerator::SetEntropySource(entropy_source);
+ }
+@@ -8633,8 +8613,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
+ #endif
+   if (params.oom_error_callback) {
+     v8_isolate->SetOOMErrorHandler(params.oom_error_callback);
+-  } else if (params.legacy_oom_error_callback) {
+-    v8_isolate->SetOOMErrorHandler(params.legacy_oom_error_callback);
+   }
+ #if __clang__
+ #pragma clang diagnostic pop
+@@ -9376,8 +9354,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
+ 
+ CALLBACK_SETTER(FatalErrorHandler, FatalErrorCallback, exception_behavior)
+ CALLBACK_SETTER(OOMErrorHandler, OOMErrorCallback, oom_behavior)
+-CALLBACK_SETTER(OOMErrorHandler, DeprecatedLegacyOOMErrorCallback,
+-                legacy_oom_behavior)
+ CALLBACK_SETTER(ModifyCodeGenerationFromStringsCallback,
+                 ModifyCodeGenerationFromStringsCallback2,
+                 modify_code_gen_callback2)
+diff --git a/src/execution/isolate.h b/src/execution/isolate.h
+index aed822d0779f3e7dac3c37b84b3aea277a5d57ea..ca9fd39138efb3196072b509ca9f5f9bae85c626 100644
+--- a/src/execution/isolate.h
++++ b/src/execution/isolate.h
+@@ -489,16 +489,9 @@ V8_EXPORT_PRIVATE void FreeCurrentEmbeddedBlob();
+ 
+ using DebugObjectCache = std::vector<Handle<HeapObject>>;
+ 
+-// Redefine LegacyOOMErrorCallback here for internal usage. We still need to
+-// support it but it is deprecated so would trigger warnings.
+-// TODO(chromium:1323177): Remove this.
+-using DeprecatedLegacyOOMErrorCallback = void (*)(const char* location,
+-                                                  bool is_heap_oom);
+-
+ #define ISOLATE_INIT_LIST(V)                                                  \
+   /* Assembler state. */                                                      \
+   V(FatalErrorCallback, exception_behavior, nullptr)                          \
+-  V(DeprecatedLegacyOOMErrorCallback, legacy_oom_behavior, nullptr)           \
+   V(OOMErrorCallback, oom_behavior, nullptr)                                  \
+   V(LogEventCallback, event_logger, nullptr)                                  \
+   V(AllowCodeGenerationFromStringsCallback, allow_code_gen_callback, nullptr) \
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 156ab2298be93..9a9c02bce0af1 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 03bb3f062c5510292c2c983508d284f8cfde5b41..6d0622863ae436dfae6413126884e0f941a3f0b6 100644
+index 8cb7a34b1a48956737e9964151db80308479dcc9..7d8d8b699d2b10e026617ea9716ac913a2d44aea 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9168,7 +9168,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9125,7 +9125,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index 03bb3f062c5510292c2c983508d284f8cfde5b41..6d0622863ae436dfae6413126884e0f9
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index a2a22674d1d50926fefac037f837d0e33d9b5220..214c0ac8d83fc74d40eb00d4d2641f329500e33c 100644
+index a581b318b8cd729370a027fe6b2135dea42a7e78..8f6a2164fbf8016a57742e6048e7f99c5af86d0d 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6208,9 +6208,9 @@ void Heap::TearDown() {
+@@ -6211,9 +6211,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 70f4cab7eb7fe..ededb3c9c6d51 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 29ce9b289eb33526abd6a430428b82e9dc8c7027..114cfd757b60c14cfb7a6bc9f9f69765363c9c6c 100644
+index 1859c2bc4fa262aa4a7f28a5d36d222fc195de2e..71ee04624868f23a2e204b5ff1e973b45e2f1202 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -620,6 +620,10 @@ config("internal_config") {
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index c9836854ec41a..6e46db75295f4 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 316f870e31f33c990793fdfe7ecb69bb120bb024..5db324b2bf0169657fc6e9dc3b15fa3ccaeac9c4 100644
+index 104a524dc45433b15f30529ecb4815210e72d90d..f3e234be7e3d63afb2c4560fe4d243dfa81e12a6 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -927,7 +927,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -925,7 +925,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index f69f6226168e5..05a232bf5d8fb 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 31dfdf8a3facd470c3f92c58a5a12566af96521a..29ce9b289eb33526abd6a430428b82e9dc8c7027 100644
+index f5879e1361b127f1213e6abe649d7e82c45b43ce..1859c2bc4fa262aa4a7f28a5d36d222fc195de2e 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5917,7 +5917,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5960,7 +5960,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/force_disable_v8_sandboxed_pointers.patch b/patches/v8/force_disable_v8_sandboxed_pointers.patch
new file mode 100644
index 0000000000000..ed88bbb205cb7
--- /dev/null
+++ b/patches/v8/force_disable_v8_sandboxed_pointers.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Thu, 23 Jun 2022 16:49:28 -0700
+Subject: force disable v8 sandboxed pointers
+
+temporarily, until we can fix node to be compatible
+
+diff --git a/BUILD.gn b/BUILD.gn
+index 71ee04624868f23a2e204b5ff1e973b45e2f1202..6aa33fdd3c767eb0045db918d2535fe35c98ca4b 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -506,9 +506,9 @@ if (v8_enable_sandbox == "") {
+ }
+ 
+ # Enable sandboxed pointers when the sandbox is enabled.
+-if (v8_enable_sandbox) {
+-  v8_enable_sandboxed_pointers = true
+-}
++#if (v8_enable_sandbox) {
++#  v8_enable_sandboxed_pointers = true
++#}
+ 
+ # Enable all available sandbox features if sandbox future is enabled.
+ if (v8_enable_sandbox_future) {
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index 04f2010a887b9..94b427ba183b9 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,10 +18,10 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index 400d8cb85ea3b45448e79903b05936998b1941b3..2405b99a5badd2ee266459d17d2ec352b4ef71c5 100644
+index 8b7cc072de2745002ebb715b606cf5f6f735a5f7..89162633cabc2d3f22e2fb4dd76321994e8fe66b 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
-@@ -6170,12 +6170,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+@@ -6142,12 +6142,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    StoreFullTaggedNoWriteBarrier(pending_message, message);
  }
  
@@ -35,10 +35,10 @@ index 400d8cb85ea3b45448e79903b05936998b1941b3..2405b99a5badd2ee266459d17d2ec352
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index d49403e9326b85ae4e52e7bc3e232834038fbe09..64f554332b1241aa22f1e292ebf9d0bc667a647a 100644
+index a8dda45985e8e74b1b7c0200779fe8a3844617b0..c017dafaeff050045b4cf4d2a76a474b7b0a2c27 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -2522,7 +2522,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+@@ -2528,7 +2528,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
  
    TNode<HeapObject> GetPendingMessage();
    void SetPendingMessage(TNode<HeapObject> message);
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index ee905e4f0f881..164c824a19d6c 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index 2511a0752037939562e861a8f492f6c9496453c6..8762c4dfa25dd17d7f36962410aeb9846593073e 100644
+index 52c5d32227029a24d9576967f27e7a8554edd66b..35c5cbe4ce68539ed29e6b365651e6b2c678d457 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
 @@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
index c03f3f36ca984..8f14c6ef9bae7 100644
--- a/script/nan-spec-runner.js
+++ b/script/nan-spec-runner.js
@@ -59,7 +59,7 @@ async function main () {
   const cxxflags = [
     '-std=c++17',
     '-nostdinc++',
-    `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
+    `-I"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++', 'trunk', 'include')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++abi', 'trunk', 'include')}"`,
     '-fPIC',
@@ -108,7 +108,8 @@ async function main () {
   const onlyTests = args.only && args.only.split(',');
 
   const DISABLED_TESTS = [
-    'nannew-test.js'
+    'nannew-test.js',
+    'buffer-test.js'
   ];
   const testsToRun = fs.readdirSync(path.resolve(NAN_DIR, 'test', 'js'))
     .filter(test => !DISABLED_TESTS.includes(test))
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index ba2bc83e85ac3..fe69ab29c7e22 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -127,6 +127,7 @@
   "report/test-report-writereport",
   "sequential/test-cpu-prof-kill",
   "sequential/test-diagnostic-dir-cpu-prof",
+  "sequential/test-cpu-prof-drained.js",
   "sequential/test-tls-connect",
   "wpt/test-webcrypto"
 ]
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index b757c598891bc..8179c7b6234a1 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -460,8 +460,8 @@ ElectronMainDelegate::RunProcess(
     return std::move(main_function_params);
 }
 
-bool ElectronMainDelegate::ShouldCreateFeatureList() {
-  return false;
+bool ElectronMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
+  return invoked_in == InvokedIn::kChildProcess;
 }
 
 bool ElectronMainDelegate::ShouldLockSchemeRegistry() {
diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
index 255df5c235d8f..dd43875cc5d17 100644
--- a/shell/app/electron_main_delegate.h
+++ b/shell/app/electron_main_delegate.h
@@ -43,7 +43,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
   absl::variant<int, content::MainFunctionParams> RunProcess(
       const std::string& process_type,
       content::MainFunctionParams main_function_params) override;
-  bool ShouldCreateFeatureList() override;
+  bool ShouldCreateFeatureList(InvokedIn invoked_in) override;
   bool ShouldLockSchemeRegistry() override;
 #if BUILDFLAG(IS_LINUX)
   void ZygoteForked() override;
diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
index 1c74cee891155..895b6b12b2008 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -103,39 +103,19 @@ class DataPipeReader {
   }
 
   void OnSuccess() {
-    // Pass the buffer to JS.
-    //
-    // Note that the lifetime of the native buffer belongs to us, and we will
-    // free memory when JS buffer gets garbage collected.
+    // Copy the buffer to JS.
+    // TODO(nornagon): make this zero-copy by allocating the array buffer
+    // inside the sandbox
     v8::HandleScope handle_scope(promise_.isolate());
-#if defined(V8_SANDBOX)
     v8::Local<v8::Value> buffer =
         node::Buffer::Copy(promise_.isolate(), &buffer_.front(), buffer_.size())
             .ToLocalChecked();
     promise_.Resolve(buffer);
-#else
-    v8::Local<v8::Value> buffer =
-        node::Buffer::New(promise_.isolate(), &buffer_.front(), buffer_.size(),
-                          &DataPipeReader::FreeBuffer, this)
-            .ToLocalChecked();
-    promise_.Resolve(buffer);
-#endif
 
     // Destroy data pipe.
     handle_watcher_.Cancel();
-#if defined(V8_SANDBOX)
     delete this;
-#else
-    data_pipe_.reset();
-    data_pipe_getter_.reset();
-#endif
-  }
-
-#if !defined(V8_SANDBOX)
-  static void FreeBuffer(char* data, void* self) {
-    delete static_cast<DataPipeReader*>(self);
   }
-#endif
 
   gin_helper::Promise<v8::Local<v8::Value>> promise_;
 
diff --git a/shell/browser/api/electron_api_net_log.cc b/shell/browser/api/electron_api_net_log.cc
index f30aa2aebf8fe..8cf645acbdc31 100644
--- a/shell/browser/api/electron_api_net_log.cc
+++ b/shell/browser/api/electron_api_net_log.cc
@@ -132,9 +132,8 @@ v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
   auto command_line_string =
       base::CommandLine::ForCurrentProcess()->GetCommandLineString();
   auto channel_string = std::string("Electron " ELECTRON_VERSION);
-  base::Value custom_constants =
-      base::Value::FromUniquePtrValue(net_log::GetPlatformConstantsForNetLog(
-          command_line_string, channel_string));
+  base::Value::Dict custom_constants = net_log::GetPlatformConstantsForNetLog(
+      command_line_string, channel_string);
 
   auto* network_context =
       browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
@@ -156,7 +155,7 @@ v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
 
 void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
                                         uint64_t max_file_size,
-                                        base::Value custom_constants,
+                                        base::Value::Dict custom_constants,
                                         base::File output_file) {
   if (!net_log_exporter_) {
     // Theoretically the mojo pipe could have been closed by the time we get
@@ -204,7 +203,7 @@ v8::Local<v8::Promise> NetLog::StopLogging(gin::Arguments* args) {
     // pointer lives long enough to resolve the promise. Moving it into the
     // callback will cause the instance variable to become empty.
     net_log_exporter_->Stop(
-        base::Value(base::Value::Type::DICTIONARY),
+        base::Value::Dict(),
         base::BindOnce(
             [](mojo::Remote<network::mojom::NetLogExporter>,
                gin_helper::Promise<void> promise, int32_t error) {
diff --git a/shell/browser/api/electron_api_net_log.h b/shell/browser/api/electron_api_net_log.h
index 30a6ad6981a1d..26450517c687e 100644
--- a/shell/browser/api/electron_api_net_log.h
+++ b/shell/browser/api/electron_api_net_log.h
@@ -57,7 +57,7 @@ class NetLog : public gin::Wrappable<NetLog> {
 
   void StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
                                   uint64_t max_file_size,
-                                  base::Value custom_constants,
+                                  base::Value::Dict custom_constants,
                                   base::File output_file);
   void NetLogStarted(int32_t error);
 
diff --git a/shell/browser/api/electron_api_printing.cc b/shell/browser/api/electron_api_printing.cc
index 75067584b1465..a8f3a035ba9e0 100644
--- a/shell/browser/api/electron_api_printing.cc
+++ b/shell/browser/api/electron_api_printing.cc
@@ -55,7 +55,7 @@ printing::PrinterList GetPrinterList(v8::Isolate* isolate) {
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     printing::mojom::ResultCode code =
-        print_backend->EnumeratePrinters(&printers);
+        print_backend->EnumeratePrinters(printers);
     if (code != printing::mojom::ResultCode::kSuccess)
       LOG(INFO) << "Failed to enumerate printers";
   }
@@ -73,7 +73,7 @@ v8::Local<v8::Promise> GetPrinterListAsync(v8::Isolate* isolate) {
         auto print_backend = printing::PrintBackend::CreateInstance(
             g_browser_process->GetApplicationLocale());
         printing::mojom::ResultCode code =
-            print_backend->EnumeratePrinters(&printers);
+            print_backend->EnumeratePrinters(printers);
         if (code != printing::mojom::ResultCode::kSuccess)
           LOG(INFO) << "Failed to enumerate printers";
         return printers;
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index eec3e6bb9643d..15312c2f94076 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -451,7 +451,7 @@ std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
   // Check for existing printers and pick the first one should it exist.
   if (printer_name.empty()) {
     printing::PrinterList printers;
-    if (print_backend->EnumeratePrinters(&printers) !=
+    if (print_backend->EnumeratePrinters(printers) !=
         printing::mojom::ResultCode::kSuccess)
       return std::make_pair("Failed to enumerate printers", std::u16string());
     if (!printers.empty())
@@ -944,12 +944,6 @@ void WebContents::InitWithWebContents(
 }
 
 WebContents::~WebContents() {
-  // clear out objects that have been granted permissions so that when
-  // WebContents::RenderFrameDeleted is called as a result of WebContents
-  // destruction it doesn't try to clear out a granted_devices_
-  // on a destructed object.
-  granted_devices_.clear();
-
   if (!inspectable_web_contents_) {
     WebContentsDestroyed();
     return;
@@ -1557,11 +1551,6 @@ void WebContents::RenderFrameDeleted(
   //   is swapped by content::RenderFrameHostManager.
   //
 
-  // clear out objects that have been granted permissions
-  if (!granted_devices_.empty()) {
-    granted_devices_.erase(render_frame_host->GetFrameTreeNodeId());
-  }
-
   // WebFrameMain::FromRenderFrameHost(rfh) will use the RFH's FrameTreeNode ID
   // to find an existing instance of WebFrameMain. During a cross-origin
   // navigation, the deleted RFH will be the old host which was swapped out. In
@@ -1771,7 +1760,7 @@ void WebContents::Invoke(
 
 void WebContents::OnFirstNonEmptyLayout(
     content::RenderFrameHost* render_frame_host) {
-  if (render_frame_host == web_contents()->GetMainFrame()) {
+  if (render_frame_host == web_contents()->GetPrimaryMainFrame()) {
     Emit("ready-to-show");
   }
 }
@@ -2088,7 +2077,7 @@ bool WebContents::GetBackgroundThrottling() const {
 void WebContents::SetBackgroundThrottling(bool allowed) {
   background_throttling_ = allowed;
 
-  auto* rfh = web_contents()->GetMainFrame();
+  auto* rfh = web_contents()->GetPrimaryMainFrame();
   if (!rfh)
     return;
 
@@ -2110,12 +2099,15 @@ void WebContents::SetBackgroundThrottling(bool allowed) {
 }
 
 int WebContents::GetProcessID() const {
-  return web_contents()->GetMainFrame()->GetProcess()->GetID();
+  return web_contents()->GetPrimaryMainFrame()->GetProcess()->GetID();
 }
 
 base::ProcessId WebContents::GetOSProcessID() const {
-  base::ProcessHandle process_handle =
-      web_contents()->GetMainFrame()->GetProcess()->GetProcess().Handle();
+  base::ProcessHandle process_handle = web_contents()
+                                           ->GetPrimaryMainFrame()
+                                           ->GetProcess()
+                                           ->GetProcess()
+                                           .Handle();
   return base::GetProcId(process_handle);
 }
 
@@ -2311,7 +2303,7 @@ void WebContents::SetWebRTCIPHandlingPolicy(
 
 std::string WebContents::GetMediaSourceID(
     content::WebContents* request_web_contents) {
-  auto* frame_host = web_contents()->GetMainFrame();
+  auto* frame_host = web_contents()->GetPrimaryMainFrame();
   if (!frame_host)
     return std::string();
 
@@ -2321,7 +2313,7 @@ std::string WebContents::GetMediaSourceID(
       content::WebContentsMediaCaptureId(frame_host->GetProcess()->GetID(),
                                          frame_host->GetRoutingID()));
 
-  auto* request_frame_host = request_web_contents->GetMainFrame();
+  auto* request_frame_host = request_web_contents->GetPrimaryMainFrame();
   if (!request_frame_host)
     return std::string();
 
@@ -2453,7 +2445,7 @@ void WebContents::EnableDeviceEmulation(
     return;
 
   DCHECK(web_contents());
-  auto* frame_host = web_contents()->GetMainFrame();
+  auto* frame_host = web_contents()->GetPrimaryMainFrame();
   if (frame_host) {
     auto* widget_host_impl = static_cast<content::RenderWidgetHostImpl*>(
         frame_host->GetView()->GetRenderWidgetHost());
@@ -2469,7 +2461,7 @@ void WebContents::DisableDeviceEmulation() {
     return;
 
   DCHECK(web_contents());
-  auto* frame_host = web_contents()->GetMainFrame();
+  auto* frame_host = web_contents()->GetPrimaryMainFrame();
   if (frame_host) {
     auto* widget_host_impl = static_cast<content::RenderWidgetHostImpl*>(
         frame_host->GetView()->GetRenderWidgetHost());
@@ -2632,7 +2624,7 @@ void WebContents::OnGetDefaultPrinter(
   auto* focused_frame = web_contents()->GetFocusedFrame();
   auto* rfh = focused_frame && focused_frame->HasSelection()
                   ? focused_frame
-                  : web_contents()->GetMainFrame();
+                  : web_contents()->GetPrimaryMainFrame();
 
   print_view_manager->PrintNow(rfh, silent, std::move(print_settings),
                                std::move(print_callback));
@@ -2839,10 +2831,10 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
 
   absl::variant<printing::mojom::PrintPagesParamsPtr, std::string>
       print_pages_params = print_to_pdf::GetPrintPagesParams(
-          web_contents()->GetMainFrame()->GetLastCommittedURL(), landscape,
-          display_header_footer, print_background, scale, paper_width,
-          paper_height, margin_top, margin_bottom, margin_left, margin_right,
-          absl::make_optional(header_template),
+          web_contents()->GetPrimaryMainFrame()->GetLastCommittedURL(),
+          landscape, display_header_footer, print_background, scale,
+          paper_width, paper_height, margin_top, margin_bottom, margin_left,
+          margin_right, absl::make_optional(header_template),
           absl::make_optional(footer_template), prefer_css_page_size);
 
   if (absl::holds_alternative<std::string>(print_pages_params)) {
@@ -2861,7 +2853,7 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
       absl::get<printing::mojom::PrintPagesParamsPtr>(print_pages_params));
   params->params->document_cookie = unique_id.value_or(0);
 
-  manager->PrintToPdf(web_contents()->GetMainFrame(), page_ranges,
+  manager->PrintToPdf(web_contents()->GetPrimaryMainFrame(), page_ranges,
                       std::move(params),
                       base::BindOnce(&WebContents::OnPDFCreated, GetWeakPtr(),
                                      std::move(promise)));
@@ -2993,7 +2985,7 @@ void WebContents::ShowDefinitionForSelection() {
 }
 
 void WebContents::CopyImageAt(int x, int y) {
-  auto* const host = web_contents()->GetMainFrame();
+  auto* const host = web_contents()->GetPrimaryMainFrame();
   if (host)
     host->CopyImageAt(x, y);
 }
@@ -3159,7 +3151,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(gin::Arguments* args) {
   // If the view's renderer is suspended this may fail on Windows/Linux -
   // bail if so. See CopyFromSurface in
   // content/public/browser/render_widget_host_view.h.
-  auto* rfh = web_contents()->GetMainFrame();
+  auto* rfh = web_contents()->GetPrimaryMainFrame();
   if (rfh &&
       rfh->GetVisibilityState() == blink::mojom::PageVisibilityState::kHidden) {
     promise.Resolve(gfx::Image());
@@ -3437,11 +3429,11 @@ v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
 }
 
 content::RenderFrameHost* WebContents::MainFrame() {
-  return web_contents()->GetMainFrame();
+  return web_contents()->GetPrimaryMainFrame();
 }
 
 void WebContents::NotifyUserActivation() {
-  content::RenderFrameHost* frame = web_contents()->GetMainFrame();
+  content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
   if (frame)
     frame->NotifyUserActivation(
         blink::mojom::UserActivationNotificationType::kInteraction);
@@ -3457,7 +3449,7 @@ v8::Local<v8::Promise> WebContents::GetProcessMemoryInfo(v8::Isolate* isolate) {
   gin_helper::Promise<gin_helper::Dictionary> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  auto* frame_host = web_contents()->GetMainFrame();
+  auto* frame_host = web_contents()->GetPrimaryMainFrame();
   if (!frame_host) {
     promise.RejectWithErrorMessage("Failed to create memory dump");
     return handle;
@@ -3487,13 +3479,13 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
     return handle;
   }
 
-  auto* frame_host = web_contents()->GetMainFrame();
+  auto* frame_host = web_contents()->GetPrimaryMainFrame();
   if (!frame_host) {
     promise.RejectWithErrorMessage("takeHeapSnapshot failed");
     return handle;
   }
 
-  if (!frame_host->IsRenderFrameCreated()) {
+  if (!frame_host->IsRenderFrameLive()) {
     promise.RejectWithErrorMessage("takeHeapSnapshot failed");
     return handle;
   }
@@ -3521,132 +3513,6 @@ v8::Local<v8::Promise> WebContents::TakeHeapSnapshot(
   return handle;
 }
 
-void WebContents::GrantDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  granted_devices_[render_frame_host->GetFrameTreeNodeId()][permission_type]
-                  [origin]
-                      .push_back(
-                          std::make_unique<base::Value>(device->Clone()));
-}
-
-void WebContents::RevokeDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  const auto& devices_for_frame_host_it =
-      granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
-  if (devices_for_frame_host_it == granted_devices_.end())
-    return;
-
-  const auto& current_devices_it =
-      devices_for_frame_host_it->second.find(permission_type);
-  if (current_devices_it == devices_for_frame_host_it->second.end())
-    return;
-
-  const auto& origin_devices_it = current_devices_it->second.find(origin);
-  if (origin_devices_it == current_devices_it->second.end())
-    return;
-
-  for (auto it = origin_devices_it->second.begin();
-       it != origin_devices_it->second.end();) {
-    if (DoesDeviceMatch(device, it->get(), permission_type)) {
-      it = origin_devices_it->second.erase(it);
-    } else {
-      ++it;
-    }
-  }
-}
-
-bool WebContents::DoesDeviceMatch(const base::Value* device,
-                                  const base::Value* device_to_compare,
-                                  blink::PermissionType permission_type) {
-  if (permission_type ==
-      static_cast<blink::PermissionType>(
-          WebContentsPermissionHelper::PermissionType::HID)) {
-    if (device->GetDict().FindInt(kHidVendorIdKey) !=
-            device_to_compare->GetDict().FindInt(kHidVendorIdKey) ||
-        device->GetDict().FindInt(kHidProductIdKey) !=
-            device_to_compare->GetDict().FindInt(kHidProductIdKey)) {
-      return false;
-    }
-
-    const auto* serial_number =
-        device_to_compare->GetDict().FindString(kHidSerialNumberKey);
-    const auto* device_serial_number =
-        device->GetDict().FindString(kHidSerialNumberKey);
-
-    if (serial_number && device_serial_number &&
-        *device_serial_number == *serial_number)
-      return true;
-  } else if (permission_type ==
-             static_cast<blink::PermissionType>(
-                 WebContentsPermissionHelper::PermissionType::SERIAL)) {
-#if BUILDFLAG(IS_WIN)
-    const auto* instance_id =
-        device->GetDict().FindString(kDeviceInstanceIdKey);
-    const auto* port_instance_id =
-        device_to_compare->GetDict().FindString(kDeviceInstanceIdKey);
-    if (instance_id && port_instance_id && *instance_id == *port_instance_id)
-      return true;
-#else
-    const auto* serial_number = device->GetDict().FindString(kSerialNumberKey);
-    const auto* port_serial_number =
-        device_to_compare->GetDict().FindString(kSerialNumberKey);
-    if (device->GetDict().FindInt(kVendorIdKey) !=
-            device_to_compare->GetDict().FindInt(kVendorIdKey) ||
-        device->GetDict().FindInt(kProductIdKey) !=
-            device_to_compare->GetDict().FindInt(kProductIdKey) ||
-        (serial_number && port_serial_number &&
-         *port_serial_number != *serial_number)) {
-      return false;
-    }
-
-#if BUILDFLAG(IS_MAC)
-    const auto* usb_driver_key = device->GetDict().FindString(kUsbDriverKey);
-    const auto* port_usb_driver_key =
-        device_to_compare->GetDict().FindString(kUsbDriverKey);
-    if (usb_driver_key && port_usb_driver_key &&
-        *usb_driver_key != *port_usb_driver_key) {
-      return false;
-    }
-#endif  // BUILDFLAG(IS_MAC)
-    return true;
-#endif  // BUILDFLAG(IS_WIN)
-  }
-  return false;
-}
-
-bool WebContents::CheckDevicePermission(
-    const url::Origin& origin,
-    const base::Value* device,
-    blink::PermissionType permission_type,
-    content::RenderFrameHost* render_frame_host) {
-  const auto& devices_for_frame_host_it =
-      granted_devices_.find(render_frame_host->GetFrameTreeNodeId());
-  if (devices_for_frame_host_it == granted_devices_.end())
-    return false;
-
-  const auto& current_devices_it =
-      devices_for_frame_host_it->second.find(permission_type);
-  if (current_devices_it == devices_for_frame_host_it->second.end())
-    return false;
-
-  const auto& origin_devices_it = current_devices_it->second.find(origin);
-  if (origin_devices_it == current_devices_it->second.end())
-    return false;
-
-  for (const auto& device_to_compare : origin_devices_it->second) {
-    if (DoesDeviceMatch(device, device_to_compare.get(), permission_type))
-      return true;
-  }
-
-  return false;
-}
-
 void WebContents::UpdatePreferredSize(content::WebContents* web_contents,
                                       const gfx::Size& pref_size) {
   Emit("preferred-size-changed", pref_size);
@@ -3784,7 +3650,8 @@ void WebContents::DevToolsRequestFileSystems() {
 
   base::ListValue file_system_value;
   for (const auto& file_system : file_systems)
-    file_system_value.Append(CreateFileSystemValue(file_system));
+    file_system_value.Append(
+        base::Value::FromUniquePtrValue(CreateFileSystemValue(file_system)));
   inspectable_web_contents_->CallClientFunction(
       "DevToolsAPI.fileSystemsLoaded", &file_system_value, nullptr, nullptr);
 }
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index c85708f45cd16..1090adca3da25 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -42,7 +42,6 @@
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/pinnable.h"
-#include "third_party/blink/public/common/permissions/permission_utils.h"
 #include "ui/base/models/image_model.h"
 #include "ui/gfx/image/image.h"
 
@@ -95,11 +94,6 @@ class OffScreenWebContentsView;
 
 namespace api {
 
-using DevicePermissionMap = std::map<
-    int,
-    std::map<blink::PermissionType,
-             std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>>;
-
 // Wrapper around the content::WebContents.
 class WebContents : public ExclusiveAccessContext,
                     public gin::Wrappable<WebContents>,
@@ -438,28 +432,6 @@ class WebContents : public ExclusiveAccessContext,
 
   void SetImageAnimationPolicy(const std::string& new_policy);
 
-  // Grants |origin| access to |device|.
-  // To be used in place of ObjectPermissionContextBase::GrantObjectPermission.
-  void GrantDevicePermission(const url::Origin& origin,
-                             const base::Value* device,
-                             blink::PermissionType permissionType,
-                             content::RenderFrameHost* render_frame_host);
-
-  // Revokes |origin| access to |device|.
-  // To be used in place of ObjectPermissionContextBase::RevokeObjectPermission.
-  void RevokeDevicePermission(const url::Origin& origin,
-                              const base::Value* device,
-                              blink::PermissionType permission_type,
-                              content::RenderFrameHost* render_frame_host);
-
-  // Returns the list of devices that |origin| has been granted permission to
-  // access. To be used in place of
-  // ObjectPermissionContextBase::GetGrantedObjects.
-  bool CheckDevicePermission(const url::Origin& origin,
-                             const base::Value* device,
-                             blink::PermissionType permissionType,
-                             content::RenderFrameHost* render_frame_host);
-
   // disable copy
   WebContents(const WebContents&) = delete;
   WebContents& operator=(const WebContents&) = delete;
@@ -755,10 +727,6 @@ class WebContents : public ExclusiveAccessContext,
   // Update the html fullscreen flag in both browser and renderer.
   void UpdateHtmlApiFullscreen(bool fullscreen);
 
-  bool DoesDeviceMatch(const base::Value* device,
-                       const base::Value* device_to_compare,
-                       blink::PermissionType permission_type);
-
   v8::Global<v8::Value> session_;
   v8::Global<v8::Value> devtools_web_contents_;
   v8::Global<v8::Value> debugger_;
@@ -843,9 +811,6 @@ class WebContents : public ExclusiveAccessContext,
   // Stores the frame thats currently in fullscreen, nullptr if there is none.
   content::RenderFrameHost* fullscreen_frame_ = nullptr;
 
-  // In-memory cache that holds objects that have been granted permissions.
-  DevicePermissionMap granted_devices_;
-
   base::WeakPtrFactory<WebContents> weak_factory_{this};
 };
 
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index 5bea00749976d..42bae87cf1c58 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -206,7 +206,7 @@ void WebFrameMain::MaybeSetupMojoConnection() {
 
   // Wait for RenderFrame to be created in renderer before accessing remote.
   if (pending_receiver_ && render_frame_ &&
-      render_frame_->IsRenderFrameCreated()) {
+      render_frame_->IsRenderFrameLive()) {
     render_frame_->GetRemoteInterfaces()->GetInterface(
         std::move(pending_receiver_));
   }
diff --git a/shell/browser/api/gpu_info_enumerator.cc b/shell/browser/api/gpu_info_enumerator.cc
index 75b330a3264fc..23b2ccd345a4f 100644
--- a/shell/browser/api/gpu_info_enumerator.cc
+++ b/shell/browser/api/gpu_info_enumerator.cc
@@ -49,13 +49,13 @@ void GPUInfoEnumerator::EndGPUDevice() {
   auto& top_value = value_stack.top();
   // GPUDevice can be more than one. So create a list of all.
   // The first one is the active GPU device.
-  if (top_value->HasKey(kGPUDeviceKey)) {
+  if (top_value->FindKey(kGPUDeviceKey)) {
     base::ListValue* list;
     top_value->GetList(kGPUDeviceKey, &list);
-    list->Append(std::move(current));
+    list->Append(base::Value::FromUniquePtrValue(std::move(current)));
   } else {
-    auto gpus = std::make_unique<base::ListValue>();
-    gpus->Append(std::move(current));
+    std::unique_ptr<base::ListValue> gpus(new base::ListValue());
+    gpus->Append(base::Value::FromUniquePtrValue(std::move(current)));
     top_value->SetList(kGPUDeviceKey, std::move(gpus));
   }
   current = std::move(top_value);
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
index fcc90988bffb5..70fc5c6d84775 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
@@ -138,4 +138,11 @@ ElectronBluetoothDelegate::GetPermittedDevices(
   return permitted_devices;
 }
 
+void ElectronBluetoothDelegate::ShowDevicePairConfirmPrompt(
+    RenderFrameHost* frame,
+    const std::u16string& device_identifier,
+    PairConfirmCallback callback) {
+  NOTIMPLEMENTED();
+}
+
 }  // namespace electron
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h
index 9e9888ab42210..39918dc2bfbc3 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.h
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h
@@ -55,6 +55,9 @@ class ElectronBluetoothDelegate : public content::BluetoothDelegate {
   void ShowDeviceCredentialsPrompt(content::RenderFrameHost* frame,
                                    const std::u16string& device_identifier,
                                    CredentialsCallback callback) override;
+  void ShowDevicePairConfirmPrompt(content::RenderFrameHost* frame,
+                                   const std::u16string& device_identifier,
+                                   PairConfirmCallback callback) override;
   blink::WebBluetoothDeviceId GetWebBluetoothDeviceId(
       content::RenderFrameHost* frame,
       const std::string& device_address) override;
diff --git a/shell/browser/electron_autofill_driver.cc b/shell/browser/electron_autofill_driver.cc
index 45b6aadd53ea7..30c63592e1edb 100644
--- a/shell/browser/electron_autofill_driver.cc
+++ b/shell/browser/electron_autofill_driver.cc
@@ -46,12 +46,13 @@ void AutofillDriver::ShowAutofillPopup(
   gfx::RectF popup_bounds(bounds);
   content::RenderFrameHost* embedder_frame_host = nullptr;
   if (embedder) {
-    auto* embedder_view = embedder->web_contents()->GetMainFrame()->GetView();
-    auto* view = web_contents->web_contents()->GetMainFrame()->GetView();
+    auto* embedder_view =
+        embedder->web_contents()->GetPrimaryMainFrame()->GetView();
+    auto* view = web_contents->web_contents()->GetPrimaryMainFrame()->GetView();
     auto offset = view->GetViewBounds().origin() -
                   embedder_view->GetViewBounds().origin();
     popup_bounds.Offset(offset);
-    embedder_frame_host = embedder->web_contents()->GetMainFrame();
+    embedder_frame_host = embedder->web_contents()->GetPrimaryMainFrame();
   }
 
   autofill_popup_->CreateView(render_frame_host_, embedder_frame_host, osr,
diff --git a/shell/browser/electron_autofill_driver_factory.cc b/shell/browser/electron_autofill_driver_factory.cc
index e49683744baa6..254836b82408d 100644
--- a/shell/browser/electron_autofill_driver_factory.cc
+++ b/shell/browser/electron_autofill_driver_factory.cc
@@ -80,7 +80,7 @@ AutofillDriver* AutofillDriverFactory::DriverForFrame(
     // 3. `SomeOtherWebContentsObserver::RenderFrameDeleted(render_frame_host)`
     //    calls `DriverForFrame(render_frame_host)`.
     // 5. `render_frame_host->~RenderFrameHostImpl()` finishes.
-    if (render_frame_host->IsRenderFrameCreated()) {
+    if (render_frame_host->IsRenderFrameLive()) {
       driver = std::make_unique<AutofillDriver>(render_frame_host);
       DCHECK_EQ(driver_map_.find(render_frame_host)->second.get(),
                 driver.get());
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 91c597f205309..d3b5f7902fdba 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1560,7 +1560,7 @@ void ElectronBrowserClient::
   if (contents) {
     auto* prefs = WebContentsPreferences::From(contents);
     if (render_frame_host.GetFrameTreeNodeId() ==
-            contents->GetMainFrame()->GetFrameTreeNodeId() ||
+            contents->GetPrimaryMainFrame()->GetFrameTreeNodeId() ||
         (prefs && prefs->AllowsNodeIntegrationInSubFrames())) {
       associated_registry.AddInterface(base::BindRepeating(
           [](content::RenderFrameHost* render_frame_host,
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index 2b7aa145f796a..e2408f01e91d9 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -46,6 +46,7 @@
 #include "shell/browser/protocol_registry.h"
 #include "shell/browser/special_storage_policy.h"
 #include "shell/browser/ui/inspectable_web_contents.h"
+#include "shell/browser/web_contents_permission_helper.h"
 #include "shell/browser/web_view_manager.h"
 #include "shell/browser/zoom_level_delegate.h"
 #include "shell/common/application_info.h"
@@ -416,6 +417,115 @@ void ElectronBrowserContext::SetSSLConfigClient(
   ssl_config_client_ = std::move(client);
 }
 
+void ElectronBrowserContext::GrantDevicePermission(
+    const url::Origin& origin,
+    const base::Value& device,
+    blink::PermissionType permission_type) {
+  granted_devices_[permission_type][origin].push_back(
+      std::make_unique<base::Value>(device.Clone()));
+}
+
+void ElectronBrowserContext::RevokeDevicePermission(
+    const url::Origin& origin,
+    const base::Value& device,
+    blink::PermissionType permission_type) {
+  const auto& current_devices_it = granted_devices_.find(permission_type);
+  if (current_devices_it == granted_devices_.end())
+    return;
+
+  const auto& origin_devices_it = current_devices_it->second.find(origin);
+  if (origin_devices_it == current_devices_it->second.end())
+    return;
+
+  for (auto it = origin_devices_it->second.begin();
+       it != origin_devices_it->second.end();) {
+    if (DoesDeviceMatch(device, it->get(), permission_type)) {
+      it = origin_devices_it->second.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
+bool ElectronBrowserContext::DoesDeviceMatch(
+    const base::Value& device,
+    const base::Value* device_to_compare,
+    blink::PermissionType permission_type) {
+  if (permission_type ==
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::HID)) {
+    if (device.GetDict().FindInt(kHidVendorIdKey) !=
+            device_to_compare->GetDict().FindInt(kHidVendorIdKey) ||
+        device.GetDict().FindInt(kHidProductIdKey) !=
+            device_to_compare->GetDict().FindInt(kHidProductIdKey)) {
+      return false;
+    }
+
+    const auto* serial_number =
+        device_to_compare->GetDict().FindString(kHidSerialNumberKey);
+    const auto* device_serial_number =
+        device.GetDict().FindString(kHidSerialNumberKey);
+
+    if (serial_number && device_serial_number &&
+        *device_serial_number == *serial_number)
+      return true;
+  } else if (permission_type ==
+             static_cast<blink::PermissionType>(
+                 WebContentsPermissionHelper::PermissionType::SERIAL)) {
+#if BUILDFLAG(IS_WIN)
+    const auto* instance_id = device.GetDict().FindString(kDeviceInstanceIdKey);
+    const auto* port_instance_id =
+        device_to_compare->GetDict().FindString(kDeviceInstanceIdKey);
+    if (instance_id && port_instance_id && *instance_id == *port_instance_id)
+      return true;
+#else
+    const auto* serial_number = device.GetDict().FindString(kSerialNumberKey);
+    const auto* port_serial_number =
+        device_to_compare->GetDict().FindString(kSerialNumberKey);
+    if (device.GetDict().FindInt(kVendorIdKey) !=
+            device_to_compare->GetDict().FindInt(kVendorIdKey) ||
+        device.GetDict().FindInt(kProductIdKey) !=
+            device_to_compare->GetDict().FindInt(kProductIdKey) ||
+        (serial_number && port_serial_number &&
+         *port_serial_number != *serial_number)) {
+      return false;
+    }
+
+#if BUILDFLAG(IS_MAC)
+    const auto* usb_driver_key = device.GetDict().FindString(kUsbDriverKey);
+    const auto* port_usb_driver_key =
+        device_to_compare->GetDict().FindString(kUsbDriverKey);
+    if (usb_driver_key && port_usb_driver_key &&
+        *usb_driver_key != *port_usb_driver_key) {
+      return false;
+    }
+#endif  // BUILDFLAG(IS_MAC)
+    return true;
+#endif  // BUILDFLAG(IS_WIN)
+  }
+  return false;
+}
+
+bool ElectronBrowserContext::CheckDevicePermission(
+    const url::Origin& origin,
+    const base::Value& device,
+    blink::PermissionType permission_type) {
+  const auto& current_devices_it = granted_devices_.find(permission_type);
+  if (current_devices_it == granted_devices_.end())
+    return false;
+
+  const auto& origin_devices_it = current_devices_it->second.find(origin);
+  if (origin_devices_it == current_devices_it->second.end())
+    return false;
+
+  for (const auto& device_to_compare : origin_devices_it->second) {
+    if (DoesDeviceMatch(device, device_to_compare.get(), permission_type))
+      return true;
+  }
+
+  return false;
+}
+
 // static
 ElectronBrowserContext* ElectronBrowserContext::From(
     const std::string& partition,
diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h
index c585859ce038f..844df7f65e65b 100644
--- a/shell/browser/electron_browser_context.h
+++ b/shell/browser/electron_browser_context.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/predictors/preconnect_manager.h"
@@ -18,6 +19,7 @@
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "shell/browser/media/media_device_id_salt.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 
 class PrefService;
 class ValueMapPrefStore;
@@ -38,6 +40,10 @@ class ElectronExtensionSystem;
 
 namespace electron {
 
+using DevicePermissionMap =
+    std::map<blink::PermissionType,
+             std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>;
+
 class ElectronBrowserContext;
 class ElectronDownloadManagerDelegate;
 class ElectronPermissionManager;
@@ -149,6 +155,25 @@ class ElectronBrowserContext : public content::BrowserContext {
 
   ~ElectronBrowserContext() override;
 
+  // Grants |origin| access to |device|.
+  // To be used in place of ObjectPermissionContextBase::GrantObjectPermission.
+  void GrantDevicePermission(const url::Origin& origin,
+                             const base::Value& device,
+                             blink::PermissionType permissionType);
+
+  // Revokes |origin| access to |device|.
+  // To be used in place of ObjectPermissionContextBase::RevokeObjectPermission.
+  void RevokeDevicePermission(const url::Origin& origin,
+                              const base::Value& device,
+                              blink::PermissionType permission_type);
+
+  // Returns the list of devices that |origin| has been granted permission to
+  // access. To be used in place of
+  // ObjectPermissionContextBase::GetGrantedObjects.
+  bool CheckDevicePermission(const url::Origin& origin,
+                             const base::Value& device,
+                             blink::PermissionType permissionType);
+
  private:
   ElectronBrowserContext(const std::string& partition,
                          bool in_memory,
@@ -157,6 +182,10 @@ class ElectronBrowserContext : public content::BrowserContext {
   // Initialize pref registry.
   void InitPrefs();
 
+  bool DoesDeviceMatch(const base::Value& device,
+                       const base::Value* device_to_compare,
+                       blink::PermissionType permission_type);
+
   ValueMapPrefStore* in_memory_pref_store_ = nullptr;
 
   std::unique_ptr<content::ResourceContext> resource_context_;
@@ -188,6 +217,9 @@ class ElectronBrowserContext : public content::BrowserContext {
   network::mojom::SSLConfigPtr ssl_config_;
   mojo::Remote<network::mojom::SSLConfigClient> ssl_config_client_;
 
+  // In-memory cache that holds objects that have been granted permissions.
+  DevicePermissionMap granted_devices_;
+
   base::WeakPtrFactory<ElectronBrowserContext> weak_factory_{this};
 };
 
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index b4747f06824a6..8ffd3e4a3089f 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -219,6 +219,9 @@ int ElectronBrowserMainParts::PreEarlyInitialization() {
 #if BUILDFLAG(IS_LINUX)
   ui::OzonePlatform::PreEarlyInitialization();
 #endif
+#if BUILDFLAG(IS_MAC)
+  screen_ = std::make_unique<display::ScopedNativeScreen>();
+#endif
 
   return GetExitCode();
 }
@@ -275,8 +278,9 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
 
 int ElectronBrowserMainParts::PreCreateThreads() {
 #if defined(USE_AURA)
-  screen_ = views::CreateDesktopScreen();
-  display::Screen::SetScreenInstance(screen_.get());
+  if (!display::Screen::GetScreen()) {
+    screen_ = views::CreateDesktopScreen();
+  }
 #endif
 
   if (!views::LayoutProvider::Get())
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index d0f813544f8d2..95ced64ed7c9e 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -16,6 +16,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/geolocation_control.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/display/screen.h"
 #include "ui/views/layout/layout_provider.h"
 
 class BrowserProcessImpl;
@@ -169,6 +170,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
 
 #if BUILDFLAG(IS_MAC)
   std::unique_ptr<device::GeolocationManager> geolocation_manager_;
+  std::unique_ptr<display::ScopedNativeScreen> screen_;
 #endif
 
   static ElectronBrowserMainParts* self_;
diff --git a/shell/browser/electron_pdf_web_contents_helper_client.cc b/shell/browser/electron_pdf_web_contents_helper_client.cc
index 0ddf94fe49cb5..ad0636bec40ac 100644
--- a/shell/browser/electron_pdf_web_contents_helper_client.cc
+++ b/shell/browser/electron_pdf_web_contents_helper_client.cc
@@ -14,7 +14,7 @@ ElectronPDFWebContentsHelperClient::~ElectronPDFWebContentsHelperClient() =
 
 content::RenderFrameHost* ElectronPDFWebContentsHelperClient::FindPdfFrame(
     content::WebContents* contents) {
-  content::RenderFrameHost* main_frame = contents->GetMainFrame();
+  content::RenderFrameHost* main_frame = contents->GetPrimaryMainFrame();
   content::RenderFrameHost* pdf_frame =
       pdf_frame_util::FindPdfChildFrame(main_frame);
   return pdf_frame ? pdf_frame : main_frame;
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index f41683704d651..248d5c71d1008 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -307,25 +307,17 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
 bool ElectronPermissionManager::CheckDevicePermission(
     blink::PermissionType permission,
     const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents);
+    const base::Value& device,
+    ElectronBrowserContext* browser_context) const {
   if (device_permission_handler_.is_null()) {
-    if (api_web_contents) {
-      return api_web_contents->CheckDevicePermission(origin, device, permission,
-                                                     render_frame_host);
-    }
-    return false;
+    return browser_context->CheckDevicePermission(origin, device, permission);
   } else {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
     v8::HandleScope scope(isolate);
     v8::Local<v8::Object> details = gin::DataObjectBuilder(isolate)
                                         .Set("deviceType", permission)
                                         .Set("origin", origin.Serialize())
-                                        .Set("device", device->Clone())
-                                        .Set("frame", render_frame_host)
+                                        .Set("device", device.Clone())
                                         .Build();
     return device_permission_handler_.Run(details);
   }
@@ -334,29 +326,19 @@ bool ElectronPermissionManager::CheckDevicePermission(
 void ElectronPermissionManager::GrantDevicePermission(
     blink::PermissionType permission,
     const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
+    const base::Value& device,
+    ElectronBrowserContext* browser_context) const {
   if (device_permission_handler_.is_null()) {
-    auto* web_contents =
-        content::WebContents::FromRenderFrameHost(render_frame_host);
-    api::WebContents* api_web_contents = api::WebContents::From(web_contents);
-    if (api_web_contents)
-      api_web_contents->GrantDevicePermission(origin, device, permission,
-                                              render_frame_host);
+    browser_context->GrantDevicePermission(origin, device, permission);
   }
 }
 
 void ElectronPermissionManager::RevokeDevicePermission(
     blink::PermissionType permission,
     const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  api::WebContents* api_web_contents = api::WebContents::From(web_contents);
-  if (api_web_contents)
-    api_web_contents->RevokeDevicePermission(origin, device, permission,
-                                             render_frame_host);
+    const base::Value& device,
+    ElectronBrowserContext* browser_context) const {
+  browser_context->RevokeDevicePermission(origin, device, permission);
 }
 
 blink::mojom::PermissionStatus
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index e2cd6655b8819..aacbd18c650fa 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -12,6 +12,7 @@
 #include "base/containers/id_map.h"
 #include "content/public/browser/permission_controller_delegate.h"
 #include "gin/dictionary.h"
+#include "shell/browser/electron_browser_context.h"
 
 namespace base {
 class DictionaryValue;
@@ -91,19 +92,18 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
 
   bool CheckDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
-                             const base::Value* object,
-                             content::RenderFrameHost* render_frame_host) const;
+                             const base::Value& object,
+                             ElectronBrowserContext* browser_context) const;
 
   void GrantDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
-                             const base::Value* object,
-                             content::RenderFrameHost* render_frame_host) const;
+                             const base::Value& object,
+                             ElectronBrowserContext* browser_context) const;
 
-  void RevokeDevicePermission(
-      blink::PermissionType permission,
-      const url::Origin& origin,
-      const base::Value* object,
-      content::RenderFrameHost* render_frame_host) const;
+  void RevokeDevicePermission(blink::PermissionType permission,
+                              const url::Origin& origin,
+                              const base::Value& object,
+                              ElectronBrowserContext* browser_context) const;
 
  protected:
   void OnPermissionResponse(int request_id,
diff --git a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
index f30b1bd24a62e..adab99632f5c8 100644
--- a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -255,18 +255,18 @@ CryptotokenPrivateCanAppIdGetAttestationFunction::Run() {
   return RespondNow(Error("no PermissionRequestManager"));
   // }
 
-  // // The created AttestationPermissionRequest deletes itself once complete.
-  // permission_request_manager->AddRequest(
-  //     web_contents->GetMainFrame(),  // Extension API targets a particular
-  //     tab,
-  //                                    // so select the current main frame to
-  //                                    // handle the request.
-  //     NewAttestationPermissionRequest(
-  //         origin,
-  //         base::BindOnce(
-  //             &CryptotokenPrivateCanAppIdGetAttestationFunction::Complete,
-  //             this)));
-  // return RespondLater();
+#if 0  // TODO(MarshallOfSound): why is this commented out?
+  // The created AttestationPermissionRequest deletes itself once complete.
+  permission_request_manager->AddRequest(
+      web_contents->GetPrimaryMainFrame(),
+      tab,
+      NewAttestationPermissionRequest(
+          origin,
+          base::BindOnce(
+              &CryptotokenPrivateCanAppIdGetAttestationFunction::Complete,
+              this)));
+  return RespondLater();
+#endif
 #endif
 }
 
diff --git a/shell/browser/extensions/electron_messaging_delegate.cc b/shell/browser/extensions/electron_messaging_delegate.cc
index 416254206dfa4..a2f509ea655c6 100644
--- a/shell/browser/extensions/electron_messaging_delegate.cc
+++ b/shell/browser/extensions/electron_messaging_delegate.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "electron/shell/common/extensions/api/tabs.h"
 #include "extensions/browser/api/messaging/extension_message_port.h"
 #include "extensions/browser/api/messaging/native_message_host.h"
 #include "extensions/browser/extension_api_frame_id_map.h"
@@ -44,17 +45,13 @@ ElectronMessagingDelegate::MaybeGetTabInfo(content::WebContents* web_contents) {
   if (web_contents) {
     auto* api_contents = electron::api::WebContents::From(web_contents);
     if (api_contents) {
-      auto tab = std::make_unique<base::DictionaryValue>();
-      tab->SetWithoutPathExpansion(
-          "id", std::make_unique<base::Value>(api_contents->ID()));
-      tab->SetWithoutPathExpansion(
-          "url", std::make_unique<base::Value>(api_contents->GetURL().spec()));
-      tab->SetWithoutPathExpansion(
-          "title", std::make_unique<base::Value>(api_contents->GetTitle()));
-      tab->SetWithoutPathExpansion(
-          "audible",
-          std::make_unique<base::Value>(api_contents->IsCurrentlyAudible()));
-      return tab;
+      api::tabs::Tab tab;
+      tab.id = std::make_unique<int>(api_contents->ID());
+      tab.url = std::make_unique<std::string>(api_contents->GetURL().spec());
+      tab.title = std::make_unique<std::string>(
+          base::UTF16ToUTF8(api_contents->GetTitle()));
+      tab.audible = std::make_unique<bool>(api_contents->IsCurrentlyAudible());
+      return tab.ToValue();
     }
   }
   return nullptr;
@@ -84,7 +81,7 @@ std::unique_ptr<MessagePort> ElectronMessagingDelegate::CreateReceiverForTab(
   content::RenderFrameHost* receiver_rfh = nullptr;
   if (include_child_frames) {
     // The target is the active outermost main frame of the WebContents.
-    receiver_rfh = receiver_contents->GetMainFrame();
+    receiver_rfh = receiver_contents->GetPrimaryMainFrame();
   } else if (!receiver_document_id.empty()) {
     ExtensionApiFrameIdMap::DocumentId document_id =
         ExtensionApiFrameIdMap::DocumentIdFromString(receiver_document_id);
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index 75298a5870046..13b36dd75bb12 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -10,17 +10,17 @@
 #include "base/command_line.h"
 #include "content/public/browser/web_contents.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
+#include "shell/browser/electron_permission_manager.h"
 #include "shell/browser/hid/hid_chooser_context.h"
 #include "shell/browser/hid/hid_chooser_context_factory.h"
 #include "shell/browser/hid/hid_chooser_controller.h"
 #include "shell/browser/web_contents_permission_helper.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 
 namespace {
 
 electron::HidChooserContext* GetChooserContext(
-    content::RenderFrameHost* frame) {
-  auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
-  auto* browser_context = web_contents->GetBrowserContext();
+    content::BrowserContext* browser_context) {
   return electron::HidChooserContextFactory::GetForBrowserContext(
       browser_context);
 }
@@ -38,8 +38,9 @@ std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
     std::vector<blink::mojom::HidDeviceFilterPtr> filters,
     std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
     content::HidChooser::Callback callback) {
-  electron::HidChooserContext* chooser_context =
-      GetChooserContext(render_frame_host);
+  DCHECK(render_frame_host);
+  auto* chooser_context =
+      GetChooserContext(render_frame_host->GetBrowserContext());
   if (!device_observation_.IsObserving())
     device_observation_.Observe(chooser_context);
 
@@ -58,65 +59,61 @@ std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
 }
 
 bool ElectronHidDelegate::CanRequestDevicePermission(
-    content::RenderFrameHost* render_frame_host) {
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  return permission_helper->CheckHIDAccessPermission(
-      web_contents->GetMainFrame()->GetLastCommittedOrigin());
+    content::BrowserContext* browser_context,
+    const url::Origin& origin) {
+  base::DictionaryValue details;
+  details.SetString("securityOrigin", origin.GetURL().spec());
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context->GetPermissionControllerDelegate());
+  return permission_manager->CheckPermissionWithDetails(
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::HID),
+      nullptr, origin.GetURL(), &details);
 }
 
 bool ElectronHidDelegate::HasDevicePermission(
-    content::RenderFrameHost* render_frame_host,
+    content::BrowserContext* browser_context,
+    const url::Origin& origin,
     const device::mojom::HidDeviceInfo& device) {
-  auto* chooser_context = GetChooserContext(render_frame_host);
-  const auto& origin =
-      render_frame_host->GetMainFrame()->GetLastCommittedOrigin();
-  return chooser_context->HasDevicePermission(origin, device,
-                                              render_frame_host);
+  return GetChooserContext(browser_context)
+      ->HasDevicePermission(origin, device);
 }
 
 void ElectronHidDelegate::RevokeDevicePermission(
-    content::RenderFrameHost* render_frame_host,
+    content::BrowserContext* browser_context,
+    const url::Origin& origin,
     const device::mojom::HidDeviceInfo& device) {
-  auto* chooser_context = GetChooserContext(render_frame_host);
-  const auto& origin =
-      render_frame_host->GetMainFrame()->GetLastCommittedOrigin();
-  return chooser_context->RevokeDevicePermission(origin, device,
-                                                 render_frame_host);
+  return GetChooserContext(browser_context)
+      ->RevokeDevicePermission(origin, device);
 }
 
 device::mojom::HidManager* ElectronHidDelegate::GetHidManager(
-    content::RenderFrameHost* render_frame_host) {
-  auto* chooser_context = GetChooserContext(render_frame_host);
-  return chooser_context->GetHidManager();
+    content::BrowserContext* browser_context) {
+  return GetChooserContext(browser_context)->GetHidManager();
 }
 
-void ElectronHidDelegate::AddObserver(
-    content::RenderFrameHost* render_frame_host,
-    Observer* observer) {
+void ElectronHidDelegate::AddObserver(content::BrowserContext* browser_context,
+                                      Observer* observer) {
   observer_list_.AddObserver(observer);
-  auto* chooser_context = GetChooserContext(render_frame_host);
+  auto* chooser_context = GetChooserContext(browser_context);
   if (!device_observation_.IsObserving())
     device_observation_.Observe(chooser_context);
 }
 
 void ElectronHidDelegate::RemoveObserver(
-    content::RenderFrameHost* render_frame_host,
     content::HidDelegate::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 const device::mojom::HidDeviceInfo* ElectronHidDelegate::GetDeviceInfo(
-    content::RenderFrameHost* render_frame_host,
+    content::BrowserContext* browser_context,
     const std::string& guid) {
-  auto* chooser_context = GetChooserContext(render_frame_host);
+  auto* chooser_context = GetChooserContext(browser_context);
   return chooser_context->GetDeviceInfo(guid);
 }
 
 bool ElectronHidDelegate::IsFidoAllowedForOrigin(
-    content::RenderFrameHost* render_frame_host,
+    content::BrowserContext* browser_context,
     const url::Origin& origin) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableHidBlocklist);
diff --git a/shell/browser/hid/electron_hid_delegate.h b/shell/browser/hid/electron_hid_delegate.h
index 0305828750035..2fc81abd3c172 100644
--- a/shell/browser/hid/electron_hid_delegate.h
+++ b/shell/browser/hid/electron_hid_delegate.h
@@ -33,23 +33,24 @@ class ElectronHidDelegate : public content::HidDelegate,
       std::vector<blink::mojom::HidDeviceFilterPtr> filters,
       std::vector<blink::mojom::HidDeviceFilterPtr> exclusion_filters,
       content::HidChooser::Callback callback) override;
-  bool CanRequestDevicePermission(
-      content::RenderFrameHost* render_frame_host) override;
-  bool HasDevicePermission(content::RenderFrameHost* render_frame_host,
+  bool CanRequestDevicePermission(content::BrowserContext* browser_context,
+                                  const url::Origin& origin) override;
+  bool HasDevicePermission(content::BrowserContext* browser_context,
+                           const url::Origin& origin,
                            const device::mojom::HidDeviceInfo& device) override;
   void RevokeDevicePermission(
-      content::RenderFrameHost* render_frame_host,
+      content::BrowserContext* browser_context,
+      const url::Origin& origin,
       const device::mojom::HidDeviceInfo& device) override;
   device::mojom::HidManager* GetHidManager(
-      content::RenderFrameHost* render_frame_host) override;
-  void AddObserver(content::RenderFrameHost* render_frame_host,
+      content::BrowserContext* browser_context) override;
+  void AddObserver(content::BrowserContext* browser_context,
                    content::HidDelegate::Observer* observer) override;
-  void RemoveObserver(content::RenderFrameHost* render_frame_host,
-                      content::HidDelegate::Observer* observer) override;
+  void RemoveObserver(content::HidDelegate::Observer* observer) override;
   const device::mojom::HidDeviceInfo* GetDeviceInfo(
-      content::RenderFrameHost* render_frame_host,
+      content::BrowserContext* browser_context,
       const std::string& guid) override;
-  bool IsFidoAllowedForOrigin(content::RenderFrameHost* render_frame_host,
+  bool IsFidoAllowedForOrigin(content::BrowserContext* browser_context,
                               const url::Origin& origin) override;
 
   // HidChooserContext::DeviceObserver:
diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc
index 84231d6eb5dbe..108ecb28f49fb 100644
--- a/shell/browser/hid/hid_chooser_context.cc
+++ b/shell/browser/hid/hid_chooser_context.cc
@@ -20,12 +20,15 @@
 #include "services/device/public/cpp/hid/hid_blocklist.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
 #include "shell/browser/api/electron_api_session.h"
+#include "shell/browser/electron_permission_manager.h"
 #include "shell/browser/web_contents_permission_helper.h"
 #include "shell/common/gin_converters/content_converter.h"
 #include "shell/common/gin_converters/frame_converter.h"
 #include "shell/common/gin_converters/hid_device_info_converter.h"
 #include "shell/common/gin_converters/value_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
+
 #include "ui/base/l10n/l10n_util.h"
 
 namespace electron {
@@ -90,16 +93,16 @@ base::Value HidChooserContext::DeviceInfoToValue(
 
 void HidChooserContext::GrantDevicePermission(
     const url::Origin& origin,
-    const device::mojom::HidDeviceInfo& device,
-    content::RenderFrameHost* render_frame_host) {
+    const device::mojom::HidDeviceInfo& device) {
   DCHECK(base::Contains(devices_, device.guid));
   if (CanStorePersistentEntry(device)) {
-    auto* web_contents =
-        content::WebContents::FromRenderFrameHost(render_frame_host);
-    auto* permission_helper =
-        WebContentsPermissionHelper::FromWebContents(web_contents);
-    permission_helper->GrantHIDDevicePermission(
-        origin, DeviceInfoToValue(device), render_frame_host);
+    auto* permission_manager = static_cast<ElectronPermissionManager*>(
+        browser_context_->GetPermissionControllerDelegate());
+
+    permission_manager->GrantDevicePermission(
+        static_cast<blink::PermissionType>(
+            WebContentsPermissionHelper::PermissionType::HID),
+        origin, DeviceInfoToValue(device), browser_context_);
   } else {
     ephemeral_devices_[origin].insert(device.guid);
   }
@@ -107,40 +110,34 @@ void HidChooserContext::GrantDevicePermission(
 
 void HidChooserContext::RevokeDevicePermission(
     const url::Origin& origin,
-    const device::mojom::HidDeviceInfo& device,
-    content::RenderFrameHost* render_frame_host) {
+    const device::mojom::HidDeviceInfo& device) {
   DCHECK(base::Contains(devices_, device.guid));
   if (CanStorePersistentEntry(device)) {
-    RevokePersistentDevicePermission(origin, device, render_frame_host);
+    RevokePersistentDevicePermission(origin, device);
   } else {
     RevokeEphemeralDevicePermission(origin, device);
   }
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-
-  api::Session* session =
-      api::Session::FromBrowserContext(web_contents->GetBrowserContext());
+  api::Session* session = api::Session::FromBrowserContext(browser_context_);
   if (session) {
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
     v8::HandleScope scope(isolate);
     gin_helper::Dictionary details =
         gin_helper::Dictionary::CreateEmpty(isolate);
     details.Set("device", device.Clone());
-    details.SetGetter("frame", render_frame_host);
+    details.Set("origin", origin.Serialize());
     session->Emit("hid-device-revoked", details);
   }
 }
 
 void HidChooserContext::RevokePersistentDevicePermission(
     const url::Origin& origin,
-    const device::mojom::HidDeviceInfo& device,
-    content::RenderFrameHost* render_frame_host) {
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  permission_helper->RevokeHIDDevicePermission(
-      origin, DeviceInfoToValue(device), render_frame_host);
+    const device::mojom::HidDeviceInfo& device) {
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context_->GetPermissionControllerDelegate());
+  permission_manager->RevokeDevicePermission(
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::HID),
+      origin, DeviceInfoToValue(device), browser_context_);
   RevokeEphemeralDevicePermission(origin, device);
 }
 
@@ -167,11 +164,10 @@ void HidChooserContext::RevokeEphemeralDevicePermission(
 
 bool HidChooserContext::HasDevicePermission(
     const url::Origin& origin,
-    const device::mojom::HidDeviceInfo& device,
-    content::RenderFrameHost* render_frame_host) {
+    const device::mojom::HidDeviceInfo& device) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHidBlocklist) &&
-      device::HidBlocklist::IsDeviceExcluded(device))
+      device.is_excluded_by_blocklist)
     return false;
 
   auto it = ephemeral_devices_.find(origin);
@@ -180,12 +176,12 @@ bool HidChooserContext::HasDevicePermission(
     return true;
   }
 
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  return permission_helper->CheckHIDDevicePermission(
-      origin, DeviceInfoToValue(device), render_frame_host);
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context_->GetPermissionControllerDelegate());
+  return permission_manager->CheckDevicePermission(
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::HID),
+      origin, DeviceInfoToValue(device), browser_context_);
 }
 
 void HidChooserContext::AddDeviceObserver(DeviceObserver* observer) {
diff --git a/shell/browser/hid/hid_chooser_context.h b/shell/browser/hid/hid_chooser_context.h
index 544984004e654..6e7bf2262f642 100644
--- a/shell/browser/hid/hid_chooser_context.h
+++ b/shell/browser/hid/hid_chooser_context.h
@@ -16,7 +16,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/unguessable_token.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
@@ -74,14 +73,11 @@ class HidChooserContext : public KeyedService,
 
   // HID-specific interface for granting and checking permissions.
   void GrantDevicePermission(const url::Origin& origin,
-                             const device::mojom::HidDeviceInfo& device,
-                             content::RenderFrameHost* render_frame_host);
+                             const device::mojom::HidDeviceInfo& device);
   void RevokeDevicePermission(const url::Origin& origin,
-                              const device::mojom::HidDeviceInfo& device,
-                              content::RenderFrameHost* render_frame_host);
+                              const device::mojom::HidDeviceInfo& device);
   bool HasDevicePermission(const url::Origin& origin,
-                           const device::mojom::HidDeviceInfo& device,
-                           content::RenderFrameHost* render_frame_host);
+                           const device::mojom::HidDeviceInfo& device);
 
   // For ScopedObserver.
   void AddDeviceObserver(DeviceObserver* observer);
@@ -117,8 +113,7 @@ class HidChooserContext : public KeyedService,
   // HID-specific interface for revoking device permissions.
   void RevokePersistentDevicePermission(
       const url::Origin& origin,
-      const device::mojom::HidDeviceInfo& device,
-      content::RenderFrameHost* render_frame_host);
+      const device::mojom::HidDeviceInfo& device);
   void RevokeEphemeralDevicePermission(
       const url::Origin& origin,
       const device::mojom::HidDeviceInfo& device);
diff --git a/shell/browser/hid/hid_chooser_controller.cc b/shell/browser/hid/hid_chooser_controller.cc
index 69f660fa03016..8e4fbd5443e99 100644
--- a/shell/browser/hid/hid_chooser_controller.cc
+++ b/shell/browser/hid/hid_chooser_controller.cc
@@ -86,7 +86,7 @@ HidChooserController::HidChooserController(
       exclusion_filters_(std::move(exclusion_filters)),
       callback_(std::move(callback)),
       origin_(content::WebContents::FromRenderFrameHost(render_frame_host)
-                  ->GetMainFrame()
+                  ->GetPrimaryMainFrame()
                   ->GetLastCommittedOrigin()),
       frame_tree_node_id_(render_frame_host->GetFrameTreeNodeId()),
       hid_delegate_(hid_delegate),
@@ -196,8 +196,7 @@ void HidChooserController::OnDeviceChosen(gin::Arguments* args) {
       std::vector<device::mojom::HidDeviceInfoPtr> devices;
       devices.reserve(device_infos.size());
       for (auto& device : device_infos) {
-        chooser_context_->GrantDevicePermission(origin_, *device,
-                                                web_contents()->GetMainFrame());
+        chooser_context_->GrantDevicePermission(origin_, *device);
         devices.push_back(device->Clone());
       }
       RunCallback(std::move(devices));
@@ -262,7 +261,7 @@ bool HidChooserController::DisplayDevice(
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHidBlocklist)) {
     // Do not pass the device to the chooser if it is excluded by the blocklist.
-    if (device::HidBlocklist::IsDeviceExcluded(device))
+    if (device.is_excluded_by_blocklist)
       return false;
 
     // Do not pass the device to the chooser if it has a top-level collection
diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc
index c74f0c9ccfb61..c7594bfdd0bc9 100644
--- a/shell/browser/media/media_stream_devices_controller.cc
+++ b/shell/browser/media/media_stream_devices_controller.cc
@@ -45,7 +45,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
 MediaStreamDevicesController::~MediaStreamDevicesController() {
   if (!callback_.is_null()) {
     std::move(callback_).Run(
-        blink::mojom::StreamDevices(),
+        blink::mojom::StreamDevicesSet(),
         blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN,
         std::unique_ptr<content::MediaStreamUI>());
   }
@@ -77,7 +77,13 @@ bool MediaStreamDevicesController::TakeAction() {
 
 void MediaStreamDevicesController::Accept() {
   // Get the default devices for the request.
-  blink::mojom::StreamDevices stream_devices;
+  blink::mojom::StreamDevicesSetPtr stream_devices_set =
+      blink::mojom::StreamDevicesSet::New();
+  stream_devices_set->stream_devices.emplace_back(
+      blink::mojom::StreamDevices::New());
+  blink::mojom::StreamDevices& stream_devices =
+      *stream_devices_set->stream_devices[0];
+
   if (microphone_requested_ || webcam_requested_) {
     switch (request_.request_type) {
       case blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY: {
@@ -164,19 +170,23 @@ void MediaStreamDevicesController::Accept() {
     }
   }
 
-  std::move(callback_).Run(stream_devices,
+  std::move(callback_).Run(*stream_devices_set,
                            blink::mojom::MediaStreamRequestResult::OK,
                            std::unique_ptr<content::MediaStreamUI>());
 }
 
 void MediaStreamDevicesController::Deny(
     blink::mojom::MediaStreamRequestResult result) {
-  std::move(callback_).Run(blink::mojom::StreamDevices(), result,
+  std::move(callback_).Run(blink::mojom::StreamDevicesSet(), result,
                            std::unique_ptr<content::MediaStreamUI>());
 }
 
 void MediaStreamDevicesController::HandleUserMediaRequest() {
-  blink::mojom::StreamDevices devices;
+  blink::mojom::StreamDevicesSetPtr stream_devices_set =
+      blink::mojom::StreamDevicesSet::New();
+  stream_devices_set->stream_devices.emplace_back(
+      blink::mojom::StreamDevices::New());
+  blink::mojom::StreamDevices& devices = *stream_devices_set->stream_devices[0];
 
   if (request_.audio_type ==
       blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
@@ -215,7 +225,7 @@ void MediaStreamDevicesController::HandleUserMediaRequest() {
   bool empty =
       !devices.audio_device.has_value() && !devices.video_device.has_value();
   std::move(callback_).Run(
-      devices,
+      *stream_devices_set,
       empty ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
             : blink::mojom::MediaStreamRequestResult::OK,
       std::unique_ptr<content::MediaStreamUI>());
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
index d0de9f6ae1b65..ba6deb94882af 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
+++ b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
@@ -13,6 +13,7 @@
 #include "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h"
 
 #include <windowsx.h>
+#include <algorithm>
 #include <utility>
 
 #include "base/check.h"
@@ -238,7 +239,7 @@ void DesktopNotificationController::AnimateAll() {
       it = stable_partition(it, it2, is_alive);
 
       // purge the dead items
-      for_each(it, it2, [this](auto&& inst) { DestroyToast(&inst); });
+      std::for_each(it, it2, [this](auto&& inst) { DestroyToast(&inst); });
 
       if (it2 == instances_.end()) {
         instances_.erase(it, it2);
diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc
index 57a169a5f39bb..6a6338aae37c6 100644
--- a/shell/browser/printing/print_preview_message_handler.cc
+++ b/shell/browser/printing/print_preview_message_handler.cc
@@ -117,7 +117,7 @@ void PrintPreviewMessageHandler::DidPrepareDocumentForPreview(
     auto* focused_frame = web_contents_->GetFocusedFrame();
     auto* rfh = focused_frame && focused_frame->HasSelection()
                     ? focused_frame
-                    : web_contents_->GetMainFrame();
+                    : web_contents_->GetPrimaryMainFrame();
 
     client->DoPrepareForDocumentToPdf(
         document_cookie, rfh,
@@ -179,7 +179,7 @@ void PrintPreviewMessageHandler::DidPreviewPage(
     auto* focused_frame = web_contents_->GetFocusedFrame();
     auto* rfh = focused_frame && focused_frame->HasSelection()
                     ? focused_frame
-                    : web_contents_->GetMainFrame();
+                    : web_contents_->GetPrimaryMainFrame();
 
     // Use utility process to convert skia metafile to pdf.
     client->DoCompositePageToPdf(
@@ -217,7 +217,7 @@ void PrintPreviewMessageHandler::PrintToPDF(
   auto* focused_frame = web_contents_->GetFocusedFrame();
   auto* rfh = focused_frame && focused_frame->HasSelection()
                   ? focused_frame
-                  : web_contents_->GetMainFrame();
+                  : web_contents_->GetPrimaryMainFrame();
 
   if (!print_render_frame_.is_bound()) {
     rfh->GetRemoteAssociatedInterfaces()->GetInterface(&print_render_frame_);
diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc
index 42b01a77f3d1b..1c4d534ba38e0 100644
--- a/shell/browser/serial/electron_serial_delegate.cc
+++ b/shell/browser/serial/electron_serial_delegate.cc
@@ -49,7 +49,7 @@ bool ElectronSerialDelegate::CanRequestPortPermission(
   auto* permission_helper =
       WebContentsPermissionHelper::FromWebContents(web_contents);
   return permission_helper->CheckSerialAccessPermission(
-      web_contents->GetMainFrame()->GetLastCommittedOrigin());
+      web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin());
 }
 
 bool ElectronSerialDelegate::HasPortPermission(
@@ -60,7 +60,8 @@ bool ElectronSerialDelegate::HasPortPermission(
   auto* chooser_context =
       SerialChooserContextFactory::GetForBrowserContext(browser_context);
   return chooser_context->HasPortPermission(
-      web_contents->GetMainFrame()->GetLastCommittedOrigin(), port, frame);
+      web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin(), port,
+      frame);
 }
 
 device::mojom::SerialPortManager* ElectronSerialDelegate::GetPortManager(
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
index c4001b529946f..356547f81a55f 100644
--- a/shell/browser/serial/serial_chooser_context.cc
+++ b/shell/browser/serial/serial_chooser_context.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/device_service.h"
 #include "content/public/browser/web_contents.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "shell/browser/electron_permission_manager.h"
 #include "shell/browser/web_contents_permission_helper.h"
 
 namespace electron {
@@ -86,7 +87,8 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
   return value;
 }
 
-SerialChooserContext::SerialChooserContext() = default;
+SerialChooserContext::SerialChooserContext(ElectronBrowserContext* context)
+    : browser_context_(context) {}
 
 SerialChooserContext::~SerialChooserContext() = default;
 
@@ -99,26 +101,24 @@ void SerialChooserContext::GrantPortPermission(
     const url::Origin& origin,
     const device::mojom::SerialPortInfo& port,
     content::RenderFrameHost* render_frame_host) {
-  base::Value value = PortInfoToValue(port);
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  permission_helper->GrantSerialPortPermission(origin, std::move(value),
-                                               render_frame_host);
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context_->GetPermissionControllerDelegate());
+  return permission_manager->GrantDevicePermission(
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::SERIAL),
+      origin, PortInfoToValue(port), browser_context_);
 }
 
 bool SerialChooserContext::HasPortPermission(
     const url::Origin& origin,
     const device::mojom::SerialPortInfo& port,
     content::RenderFrameHost* render_frame_host) {
-  auto* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  auto* permission_helper =
-      WebContentsPermissionHelper::FromWebContents(web_contents);
-  base::Value value = PortInfoToValue(port);
-  return permission_helper->CheckSerialPortPermission(origin, std::move(value),
-                                                      render_frame_host);
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context_->GetPermissionControllerDelegate());
+  return permission_manager->CheckDevicePermission(
+      static_cast<blink::PermissionType>(
+          WebContentsPermissionHelper::PermissionType::SERIAL),
+      origin, PortInfoToValue(port), browser_context_);
 }
 
 void SerialChooserContext::RevokePortPermissionWebInitiated(
diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h
index 2296668874115..a0426c8b8f0c4 100644
--- a/shell/browser/serial/serial_chooser_context.h
+++ b/shell/browser/serial/serial_chooser_context.h
@@ -48,7 +48,7 @@ class SerialChooserContext : public KeyedService,
  public:
   using PortObserver = content::SerialDelegate::Observer;
 
-  SerialChooserContext();
+  explicit SerialChooserContext(ElectronBrowserContext* context);
   ~SerialChooserContext() override;
 
   // disable copy
@@ -104,6 +104,8 @@ class SerialChooserContext : public KeyedService,
   mojo::Receiver<device::mojom::SerialPortManagerClient> client_receiver_{this};
   base::ObserverList<PortObserver> port_observer_list_;
 
+  ElectronBrowserContext* browser_context_;
+
   base::WeakPtrFactory<SerialChooserContext> weak_factory_{this};
 };
 
diff --git a/shell/browser/serial/serial_chooser_context_factory.cc b/shell/browser/serial/serial_chooser_context_factory.cc
index 914bdd49998a2..c3f18c856b7a0 100644
--- a/shell/browser/serial/serial_chooser_context_factory.cc
+++ b/shell/browser/serial/serial_chooser_context_factory.cc
@@ -19,7 +19,9 @@ SerialChooserContextFactory::~SerialChooserContextFactory() = default;
 
 KeyedService* SerialChooserContextFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new SerialChooserContext();
+  auto* browser_context =
+      static_cast<electron::ElectronBrowserContext*>(context);
+  return new SerialChooserContext(browser_context);
 }
 
 // static
diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc
index 5adfc5e63c583..f14811e65d1bc 100644
--- a/shell/browser/serial/serial_chooser_controller.cc
+++ b/shell/browser/serial/serial_chooser_controller.cc
@@ -69,7 +69,7 @@ SerialChooserController::SerialChooserController(
       callback_(std::move(callback)),
       serial_delegate_(serial_delegate),
       render_frame_host_id_(render_frame_host->GetGlobalId()) {
-  origin_ = web_contents->GetMainFrame()->GetLastCommittedOrigin();
+  origin_ = web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin();
 
   chooser_context_ = SerialChooserContextFactory::GetForBrowserContext(
                          web_contents->GetBrowserContext())
diff --git a/shell/browser/ui/certificate_trust_mac.mm b/shell/browser/ui/certificate_trust_mac.mm
index ae234d6fccf75..de9006728cec0 100644
--- a/shell/browser/ui/certificate_trust_mac.mm
+++ b/shell/browser/ui/certificate_trust_mac.mm
@@ -13,8 +13,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #include "net/cert/cert_database.h"
-#include "net/cert/x509_util_ios_and_mac.h"
-#include "net/cert/x509_util_mac.h"
+#include "net/cert/x509_util_apple.h"
 #include "shell/browser/native_window.h"
 
 @interface TrustDelegate : NSObject {
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index 2c2594ef3ff83..42eaf58a98c1e 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -400,7 +400,7 @@ content::WebContents* InspectableWebContents::GetDevToolsWebContents() const {
 
 void InspectableWebContents::InspectElement(int x, int y) {
   if (agent_host_)
-    agent_host_->InspectElement(web_contents_->GetMainFrame(), x, y);
+    agent_host_->InspectElement(web_contents_->GetPrimaryMainFrame(), x, y);
 }
 
 void InspectableWebContents::SetDelegate(
@@ -532,7 +532,7 @@ void InspectableWebContents::CallClientFunction(
     }
   }
   javascript.append(");");
-  GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
+  GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
       base::UTF8ToUTF16(javascript), base::NullCallback());
 }
 
@@ -580,7 +580,7 @@ void InspectableWebContents::LoadCompleted() {
     }
     std::u16string javascript = base::UTF8ToUTF16(
         "UI.DockController.instance().setDockSide(\"" + dock_state_ + "\");");
-    GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
+    GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
         javascript, base::NullCallback());
   }
 
@@ -612,7 +612,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
     // process. Grant the devtools process the ability to request URLs from the
     // extension.
     content::ChildProcessSecurityPolicy::GetInstance()->GrantRequestOrigin(
-        web_contents_->GetMainFrame()->GetProcess()->GetID(),
+        web_contents_->GetPrimaryMainFrame()->GetProcess()->GetID(),
         url::Origin::Create(extension->url()));
 
     auto extension_info = std::make_unique<base::DictionaryValue>();
@@ -622,7 +622,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
         "exposeExperimentalAPIs",
         extension->permissions_data()->HasAPIPermission(
             extensions::mojom::APIPermissionID::kExperimental));
-    results.Append(std::move(extension_info));
+    results.Append(base::Value::FromUniquePtrValue(std::move(extension_info)));
   }
 
   CallClientFunction("DevToolsAPI.addExtensions", &results, NULL, NULL);
@@ -948,7 +948,7 @@ void InspectableWebContents::DispatchProtocolMessage(
     base::EscapeJSONString(str_message, true, &param);
     std::u16string javascript =
         base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + param + ");");
-    GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
+    GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
         javascript, base::NullCallback());
     return;
   }
@@ -1032,12 +1032,12 @@ void InspectableWebContents::ReadyToCommitNavigation(
     content::NavigationHandle* navigation_handle) {
   if (navigation_handle->IsInMainFrame()) {
     if (navigation_handle->GetRenderFrameHost() ==
-            GetDevToolsWebContents()->GetMainFrame() &&
+            GetDevToolsWebContents()->GetPrimaryMainFrame() &&
         frontend_host_) {
       return;
     }
     frontend_host_ = content::DevToolsFrontendHost::Create(
-        web_contents()->GetMainFrame(),
+        web_contents()->GetPrimaryMainFrame(),
         base::BindRepeating(
             &InspectableWebContents::HandleMessageFromDevToolsFrontend,
             base::Unretained(this)));
diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc
index 15e0b2311e433..f276f59a3e714 100644
--- a/shell/browser/ui/webui/accessibility_ui.cc
+++ b/shell/browser/ui/webui/accessibility_ui.cc
@@ -196,7 +196,7 @@ std::string RecursiveDumpAXPlatformNodeAsString(
     }
   }
   str += "\n";
-  for (int i = 0; i < node->GetDelegate()->GetChildCount(); i++) {
+  for (size_t i = 0; i < node->GetDelegate()->GetChildCount(); i++) {
     gfx::NativeViewAccessible child = node->GetDelegate()->ChildAtIndex(i);
     const ui::AXPlatformNode* child_node =
         ui::AXPlatformNode::FromNativeViewAccessible(child);
@@ -286,14 +286,15 @@ void HandleAccessibilityRequestCallback(
     descriptor->SetBoolean(kWeb, is_web_enabled);
     descriptor->SetBoolean(kLabelImages,
                            are_accessibility_image_labels_enabled);
-    rvh_list->Append(std::move(descriptor));
+    rvh_list->Append(base::Value::FromUniquePtrValue(std::move(descriptor)));
   }
 
   data.Set(kPagesField, std::move(rvh_list));
 
   auto window_list = std::make_unique<base::ListValue>();
   for (auto* window : electron::WindowList::GetWindows()) {
-    window_list->Append(BuildTargetDescriptor(window));
+    window_list->Append(
+        base::Value::FromUniquePtrValue(BuildTargetDescriptor(window)));
   }
 
   data.Set(kBrowsersField, std::move(window_list));
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 093f6504d3e99..7e4548e9bb783 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -65,7 +65,7 @@ void WebContentsPermissionHelper::RequestPermission(
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
     const base::DictionaryValue* details) {
-  auto* rfh = web_contents_->GetMainFrame();
+  auto* rfh = web_contents_->GetPrimaryMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
   auto origin = web_contents_->GetLastCommittedURL();
@@ -77,7 +77,7 @@ void WebContentsPermissionHelper::RequestPermission(
 bool WebContentsPermissionHelper::CheckPermission(
     blink::PermissionType permission,
     const base::DictionaryValue* details) const {
-  auto* rfh = web_contents_->GetMainFrame();
+  auto* rfh = web_contents_->GetPrimaryMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
   auto origin = web_contents_->GetLastCommittedURL();
@@ -85,39 +85,6 @@ bool WebContentsPermissionHelper::CheckPermission(
                                                         details);
 }
 
-bool WebContentsPermissionHelper::CheckDevicePermission(
-    blink::PermissionType permission,
-    const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
-  auto* permission_manager = static_cast<ElectronPermissionManager*>(
-      web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
-  return permission_manager->CheckDevicePermission(permission, origin, device,
-                                                   render_frame_host);
-}
-
-void WebContentsPermissionHelper::GrantDevicePermission(
-    blink::PermissionType permission,
-    const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
-  auto* permission_manager = static_cast<ElectronPermissionManager*>(
-      web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
-  permission_manager->GrantDevicePermission(permission, origin, device,
-                                            render_frame_host);
-}
-
-void WebContentsPermissionHelper::RevokeDevicePermission(
-    blink::PermissionType permission,
-    const url::Origin& origin,
-    const base::Value* device,
-    content::RenderFrameHost* render_frame_host) const {
-  auto* permission_manager = static_cast<ElectronPermissionManager*>(
-      web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
-  permission_manager->RevokeDevicePermission(permission, origin, device,
-                                             render_frame_host);
-}
-
 void WebContentsPermissionHelper::RequestFullscreenPermission(
     base::OnceCallback<void(bool)> callback) {
   RequestPermission(
@@ -197,59 +164,6 @@ bool WebContentsPermissionHelper::CheckSerialAccessPermission(
       static_cast<blink::PermissionType>(PermissionType::SERIAL), &details);
 }
 
-bool WebContentsPermissionHelper::CheckSerialPortPermission(
-    const url::Origin& origin,
-    base::Value device,
-    content::RenderFrameHost* render_frame_host) const {
-  return CheckDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::SERIAL), origin,
-      &device, render_frame_host);
-}
-
-void WebContentsPermissionHelper::GrantSerialPortPermission(
-    const url::Origin& origin,
-    base::Value device,
-    content::RenderFrameHost* render_frame_host) const {
-  return GrantDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::SERIAL), origin,
-      &device, render_frame_host);
-}
-
-bool WebContentsPermissionHelper::CheckHIDAccessPermission(
-    const url::Origin& embedding_origin) const {
-  base::DictionaryValue details;
-  details.SetString("securityOrigin", embedding_origin.GetURL().spec());
-  return CheckPermission(
-      static_cast<blink::PermissionType>(PermissionType::HID), &details);
-}
-
-bool WebContentsPermissionHelper::CheckHIDDevicePermission(
-    const url::Origin& origin,
-    base::Value device,
-    content::RenderFrameHost* render_frame_host) const {
-  return CheckDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
-      render_frame_host);
-}
-
-void WebContentsPermissionHelper::GrantHIDDevicePermission(
-    const url::Origin& origin,
-    base::Value device,
-    content::RenderFrameHost* render_frame_host) const {
-  return GrantDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
-      render_frame_host);
-}
-
-void WebContentsPermissionHelper::RevokeHIDDevicePermission(
-    const url::Origin& origin,
-    base::Value device,
-    content::RenderFrameHost* render_frame_host) const {
-  return RevokeDevicePermission(
-      static_cast<blink::PermissionType>(PermissionType::HID), origin, &device,
-      render_frame_host);
-}
-
 WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);
 
 }  // namespace electron
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index 847093d559950..cfd4fc4600dcc 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -51,27 +51,6 @@ class WebContentsPermissionHelper
   bool CheckMediaAccessPermission(const GURL& security_origin,
                                   blink::mojom::MediaStreamType type) const;
   bool CheckSerialAccessPermission(const url::Origin& embedding_origin) const;
-  bool CheckSerialPortPermission(
-      const url::Origin& origin,
-      base::Value device,
-      content::RenderFrameHost* render_frame_host) const;
-  void GrantSerialPortPermission(
-      const url::Origin& origin,
-      base::Value device,
-      content::RenderFrameHost* render_frame_host) const;
-  bool CheckHIDAccessPermission(const url::Origin& embedding_origin) const;
-  bool CheckHIDDevicePermission(
-      const url::Origin& origin,
-      base::Value device,
-      content::RenderFrameHost* render_frame_host) const;
-  void GrantHIDDevicePermission(
-      const url::Origin& origin,
-      base::Value device,
-      content::RenderFrameHost* render_frame_host) const;
-  void RevokeHIDDevicePermission(
-      const url::Origin& origin,
-      base::Value device,
-      content::RenderFrameHost* render_frame_host) const;
 
  private:
   explicit WebContentsPermissionHelper(content::WebContents* web_contents);
@@ -85,22 +64,6 @@ class WebContentsPermissionHelper
   bool CheckPermission(blink::PermissionType permission,
                        const base::DictionaryValue* details) const;
 
-  bool CheckDevicePermission(blink::PermissionType permission,
-                             const url::Origin& origin,
-                             const base::Value* device,
-                             content::RenderFrameHost* render_frame_host) const;
-
-  void GrantDevicePermission(blink::PermissionType permission,
-                             const url::Origin& origin,
-                             const base::Value* device,
-                             content::RenderFrameHost* render_frame_host) const;
-
-  void RevokeDevicePermission(
-      blink::PermissionType permission,
-      const url::Origin& origin,
-      const base::Value* device,
-      content::RenderFrameHost* render_frame_host) const;
-
   // TODO(clavin): refactor to use the WebContents provided by the
   // WebContentsUserData base class instead of storing a duplicate ref
   content::WebContents* web_contents_;
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index 734f3e48c3361..d15e99c36d6d6 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -327,7 +327,8 @@ content::WebContents* WebContentsPreferences::GetWebContentsFromProcessID(
     int process_id) {
   for (WebContentsPreferences* preferences : Instances()) {
     content::WebContents* web_contents = preferences->web_contents_;
-    if (web_contents->GetMainFrame()->GetProcess()->GetID() == process_id)
+    if (web_contents->GetPrimaryMainFrame()->GetProcess()->GetID() ==
+        process_id)
       return web_contents;
   }
   return nullptr;
diff --git a/shell/browser/web_contents_zoom_controller.cc b/shell/browser/web_contents_zoom_controller.cc
index fafc0c450aa94..da377b5c20499 100644
--- a/shell/browser/web_contents_zoom_controller.cc
+++ b/shell/browser/web_contents_zoom_controller.cc
@@ -46,7 +46,7 @@ void WebContentsZoomController::SetEmbedderZoomController(
 }
 
 void WebContentsZoomController::SetZoomLevel(double level) {
-  if (!web_contents()->GetMainFrame()->IsRenderFrameLive() ||
+  if (!web_contents()->GetPrimaryMainFrame()->IsRenderFrameLive() ||
       blink::PageZoomValuesEqual(GetZoomLevel(), level) ||
       zoom_mode_ == ZoomMode::kDisabled)
     return;
diff --git a/shell/browser/web_view_guest_delegate.cc b/shell/browser/web_view_guest_delegate.cc
index 8f8b24082b83a..884c4be1ab871 100644
--- a/shell/browser/web_view_guest_delegate.cc
+++ b/shell/browser/web_view_guest_delegate.cc
@@ -32,7 +32,7 @@ void WebViewGuestDelegate::AttachToIframe(
   embedder_web_contents_ = embedder_web_contents;
 
   int embedder_process_id =
-      embedder_web_contents_->GetMainFrame()->GetProcess()->GetID();
+      embedder_web_contents_->GetPrimaryMainFrame()->GetProcess()->GetID();
   auto* embedder_frame =
       content::RenderFrameHost::FromID(embedder_process_id, embedder_frame_id);
   DCHECK_EQ(embedder_web_contents_,
diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index 7fffb3c08a0a1..2a2e598f93632 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -271,12 +271,6 @@ std::string NativeImage::ToDataURL(gin::Arguments* args) {
       image_.AsImageSkia().GetRepresentation(scale_factor).GetBitmap());
 }
 
-#if !defined(V8_SANDBOX)
-void SkUnref(char* data, void* hint) {
-  reinterpret_cast<SkRefCnt*>(hint)->unref();
-}
-#endif
-
 v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
   float scale_factor = GetScaleFactorFromOptions(args);
 
@@ -285,18 +279,10 @@ v8::Local<v8::Value> NativeImage::GetBitmap(gin::Arguments* args) {
   SkPixelRef* ref = bitmap.pixelRef();
   if (!ref)
     return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
-#if defined(V8_SANDBOX)
   return node::Buffer::Copy(args->isolate(),
                             reinterpret_cast<char*>(ref->pixels()),
                             bitmap.computeByteSize())
       .ToLocalChecked();
-#else
-  ref->ref();
-  return node::Buffer::New(args->isolate(),
-                           reinterpret_cast<char*>(ref->pixels()),
-                           bitmap.computeByteSize(), &SkUnref, ref)
-      .ToLocalChecked();
-#endif
 }
 
 v8::Local<v8::Value> NativeImage::GetNativeHandle(
diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc
index 9dc372414bc31..971b16b07e330 100644
--- a/shell/common/v8_value_converter.cc
+++ b/shell/common/v8_value_converter.cc
@@ -395,7 +395,7 @@ std::unique_ptr<base::Value> V8ValueConverter::FromV8Array(
     scope =
         std::make_unique<v8::Context::Scope>(val->GetCreationContextChecked());
 
-  auto result = std::make_unique<base::ListValue>();
+  std::unique_ptr<base::ListValue> result(new base::ListValue());
 
   // Only fields with integer keys are carried over to the ListValue.
   for (uint32_t i = 0; i < val->Length(); ++i) {
@@ -410,18 +410,19 @@ std::unique_ptr<base::Value> V8ValueConverter::FromV8Array(
 
     if (!val->HasRealIndexedProperty(isolate->GetCurrentContext(), i)
              .FromMaybe(false)) {
-      result->Append(std::make_unique<base::Value>());
+      result->Append(base::Value());
       continue;
     }
 
     std::unique_ptr<base::Value> child =
         FromV8ValueImpl(state, child_v8, isolate);
-    if (child)
-      result->Append(std::move(child));
-    else
+    if (child) {
+      result->Append(base::Value::FromUniquePtrValue(std::move(child)));
+    } else {
       // JSON.stringify puts null in places where values don't serialize, for
       // example undefined and functions. Emulate that behavior.
-      result->Append(std::make_unique<base::Value>());
+      result->Append(base::Value());
+    }
   }
   return std::move(result);
 }
diff --git a/spec/package.json b/spec/package.json
index 5102db8eab7c5..38ccc292934a1 100644
--- a/spec/package.json
+++ b/spec/package.json
@@ -11,7 +11,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "coffeescript": "^2.4.1",
-    "dbus-native": "github:jkleinsc/dbus-native#master",
+    "dbus-native": "github:nornagon/dbus-native#master",
     "dirty-chai": "^2.0.1",
     "graceful-fs": "^4.1.15",
     "is-valid-window": "0.0.5",
@@ -32,6 +32,6 @@
     "mocha-appveyor-reporter": "^0.4.2"
   },
   "resolutions": {
-    "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
+    "nan": "github:jkleinsc/nan#remove_accessor_signature"
   }
 }
diff --git a/spec/yarn.lock b/spec/yarn.lock
index bc0113391a384..3bb7e4d164a92 100644
--- a/spec/yarn.lock
+++ b/spec/yarn.lock
@@ -12,9 +12,10 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"abstract-socket@github:saghul/node-abstractsocket#35b1b1491fabc04899bde5be3428abf5cf9cd528":
-  version "2.1.0"
-  resolved "https://codeload.github.com/saghul/node-abstractsocket/tar.gz/35b1b1491fabc04899bde5be3428abf5cf9cd528"
+abstract-socket@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/abstract-socket/-/abstract-socket-2.1.1.tgz#243a7e6e6ff65bb9eab16a22fa90699b91e528f7"
+  integrity sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==
   dependencies:
     bindings "^1.2.1"
     nan "^2.12.1"
@@ -212,9 +213,9 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-"dbus-native@github:jkleinsc/dbus-native#master":
+"dbus-native@github:nornagon/dbus-native#master":
   version "0.4.0"
-  resolved "https://codeload.github.com/jkleinsc/dbus-native/tar.gz/bb7cba24533fac70f81b92f8357211a84f6e0c1f"
+  resolved "https://codeload.github.com/nornagon/dbus-native/tar.gz/b90ed62d0b5cb93909173c3e0551d9bff0602a90"
   dependencies:
     "@nornagon/put" "0.0.8"
     event-stream "^4.0.0"
@@ -224,7 +225,7 @@ dashdash@^1.12.0:
     safe-buffer "^5.1.1"
     xml2js "^0.4.17"
   optionalDependencies:
-    abstract-socket "github:saghul/node-abstractsocket#35b1b1491fabc04899bde5be3428abf5cf9cd528"
+    abstract-socket "^2.0.0"
 
 debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
@@ -685,9 +686,9 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-nan@2.x, nan@^2.12.1, nan@nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac:
-  version "2.15.0"
-  resolved "https://codeload.github.com/nodejs/nan/tar.gz/16fa32231e2ccd89d2804b3f765319128b20c4ac"
+nan@2.x, nan@^2.12.1, "nan@github:jkleinsc/nan#remove_accessor_signature":
+  version "2.16.0"
+  resolved "https://codeload.github.com/jkleinsc/nan/tar.gz/6a2f95a6a2209d8aa7542fb18099fd808a802059"
 
 oauth-sign@~0.9.0:
   version "0.9.0"

From 59d3c12cae423c533de70f595f2a4fd4ca19856e Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 28 Jun 2022 01:08:55 -0700
Subject: [PATCH 531/811] chore: remove spurious trailing namespace comments
 (#34732)

---
 shell/browser/api/electron_api_browser_window.cc                | 2 +-
 shell/browser/api/electron_api_url_loader.cc                    | 2 +-
 shell/browser/electron_autofill_driver.cc                       | 2 +-
 .../extensions/api/runtime/electron_runtime_api_delegate.cc     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index 92178079b3506..67cf2f213c1e3 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -290,7 +290,7 @@ void BrowserWindow::OnCloseButtonClicked(bool* prevent_default) {
   } else {
     web_contents()->Close();
   }
-}  // namespace api
+}
 
 void BrowserWindow::OnWindowBlur() {
   if (api_web_contents_)
diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc
index 86a7eb0cc3f92..9f13f4d4b7f46 100644
--- a/shell/browser/api/electron_api_url_loader.cc
+++ b/shell/browser/api/electron_api_url_loader.cc
@@ -66,7 +66,7 @@ struct Converter<network::mojom::CredentialsMode> {
       return false;
     return true;
   }
-};  // namespace gin
+};
 
 }  // namespace gin
 
diff --git a/shell/browser/electron_autofill_driver.cc b/shell/browser/electron_autofill_driver.cc
index 30c63592e1edb..951422d16d4f1 100644
--- a/shell/browser/electron_autofill_driver.cc
+++ b/shell/browser/electron_autofill_driver.cc
@@ -18,7 +18,7 @@ namespace electron {
 AutofillDriver::AutofillDriver(content::RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host) {
   autofill_popup_ = std::make_unique<AutofillPopup>();
-}  // namespace electron
+}
 
 AutofillDriver::~AutofillDriver() = default;
 
diff --git a/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc b/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc
index 7cf0c0ad92de9..7bdb2ef92babc 100644
--- a/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc
+++ b/shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc
@@ -87,7 +87,7 @@ bool ElectronRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
   }
 
   return true;
-}  // namespace extensions
+}
 
 bool ElectronRuntimeAPIDelegate::RestartDevice(std::string* error_message) {
   *error_message = "Restart is not supported in Electron";

From 47afaddaf50e34c1b98c2dfbc38cf15cde3f49d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 11:18:47 +0200
Subject: [PATCH 532/811] build(deps-dev): bump got from 6.7.1 to 11.8.5
 (#34697)

Bumps [got](https://github.com/sindresorhus/got) from 6.7.1 to 11.8.5.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v6.7.1...v11.8.5)

---
updated-dependencies:
- dependency-name: got
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 232 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 155 insertions(+), 79 deletions(-)

diff --git a/package.json b/package.json
index a455fad3649ac..c5b0e2effb00d 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "express": "^4.16.4",
     "folder-hash": "^2.1.1",
     "fs-extra": "^9.0.1",
-    "got": "^6.3.0",
+    "got": "^11.8.5",
     "husky": "^8.0.1",
     "klaw": "^3.0.0",
     "lint": "^1.1.2",
diff --git a/yarn.lock b/yarn.lock
index 2cf78d42fb160..8919a86531ea0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -286,6 +286,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@sindresorhus/is@^4.0.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -293,6 +298,13 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+  dependencies:
+    defer-to-connect "^2.0.0"
+
 "@types/anymatch@*":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
@@ -320,6 +332,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cacheable-request@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
+  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "*"
+    "@types/node" "*"
+    "@types/responselike" "*"
+
 "@types/chai-as-promised@*":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.1.tgz#004c27a4ac640e9590e25d8b0980cb0a6609bfd8"
@@ -423,6 +445,11 @@
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.4.tgz#8c3496bd1b50cc04aeefd691140aa571d4dbfa34"
   integrity sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==
 
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
 "@types/is-empty@^1.0.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/is-empty/-/is-empty-1.2.0.tgz#16bc578060c9b0b6953339eea906c255a375bf86"
@@ -433,6 +460,11 @@
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.2.tgz#4117a7a378593a218e9d6f0ef44ce6d5d9edf7fa"
   integrity sha512-KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA==
 
+"@types/json-buffer@~3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
+  integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
+
 "@types/json-schema@^7.0.3":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
@@ -455,6 +487,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/keyv@*":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/klaw@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/klaw/-/klaw-3.0.1.tgz#29f90021c0234976aa4eb97efced9cb6db9fa8b3"
@@ -577,6 +616,13 @@
   resolved "https://registry.yarnpkg.com/@types/repeat-string/-/repeat-string-1.6.1.tgz#8bb5686e662ce1d962271b0b043623bf51404cdc"
   integrity sha512-vdna8kjLGljgtPnYN6MBD2UwX62QE0EFLj9QlLXvg6dEu66NksXB900BNguBCMZZY2D9SSqncUskM23vT3uvWQ==
 
+"@types/responselike@*", "@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/semver@^7.3.3":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.3.tgz#3ad6ed949e7487e7bda6f886b4a2434a2c3d7b1a"
@@ -1492,6 +1538,11 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -1505,6 +1556,19 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
+cacheable-request@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^4.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1520,11 +1584,6 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-capture-stack-trace@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
 chai@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
@@ -1835,6 +1894,14 @@ component-emitter@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
+compress-brotli@^1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
+  integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
+  dependencies:
+    "@types/json-buffer" "~3.0.0"
+    json-buffer "~3.0.1"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1945,13 +2012,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -2072,6 +2132,13 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+  dependencies:
+    mimic-response "^3.1.0"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2106,6 +2173,11 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -3270,11 +3342,6 @@ get-stdin@~8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -3282,14 +3349,7 @@ get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.1.0:
+get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
@@ -3402,22 +3462,22 @@ globby@^11.0.0, globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-got@^6.3.0:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
+got@^11.8.5:
+  version "11.8.5"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
+  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
 
 got@^9.6.0:
   version "9.6.0"
@@ -3588,6 +3648,14 @@ http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -3957,11 +4025,6 @@ is-plain-object@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-4.1.1.tgz#1a14d6452cbd50790edc7fdaa0aed5a40a35ebb5"
   integrity sha512-5Aw8LLVsDlZsETVMhoMXzqsXwQqr/0vlnBYzIXJbYo2F4yYlhLHs+Ez7Bod7IIQKWkJbJfxrWD7pA1Dw1TKrwA==
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -3981,16 +4044,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
-is-retry-allowed@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
-is-stream@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
 is-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
@@ -4078,6 +4131,11 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
+json-buffer@3.0.1, json-buffer@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -4183,6 +4241,14 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+keyv@^4.0.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.3.1.tgz#7970672f137d987945821b1a07b524ce5a4edd27"
+  integrity sha512-nwP7AQOxFzELXsNq3zCx/oh81zu4DHWwCE6W9RaeHb7OHO0JpmKS8n801ovVQC7PTsZDWtPA5j1QY+/WWtARYg==
+  dependencies:
+    compress-brotli "^1.3.8"
+    json-buffer "3.0.1"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4950,6 +5016,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -5187,6 +5258,11 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -5420,6 +5496,11 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -5718,11 +5799,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
@@ -5856,6 +5932,11 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 ramda@^0.27.0:
   version "0.27.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.0.tgz#915dc29865c0800bf3f69b8fd6c279898b59de43"
@@ -6559,6 +6640,11 @@ requireindex@~1.1.0:
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
   integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI=
 
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -6619,6 +6705,13 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+responselike@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
+  integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==
+  dependencies:
+    lowercase-keys "^2.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -7432,11 +7525,6 @@ through@^2.3.6, through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
 timers-browserify@1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
@@ -7846,11 +7934,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
 upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
@@ -7868,13 +7951,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
-  dependencies:
-    prepend-http "^1.0.1"
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"

From 9c311a205971cc17f79b9d7e2528b09edf1a361e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 06:01:35 -0700
Subject: [PATCH 533/811] Bump v21.0.0-nightly.20220628

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 038611d37a56b..961c33635acac 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220627
\ No newline at end of file
+21.0.0-nightly.20220628
\ No newline at end of file
diff --git a/package.json b/package.json
index c5b0e2effb00d..e1e01ee06d69e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220627",
+  "version": "21.0.0-nightly.20220628",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 508be5195cf99..3ef2fe00dc1ad 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220627
- PRODUCTVERSION 21,0,0,20220627
+ FILEVERSION 21,0,0,20220628
+ PRODUCTVERSION 21,0,0,20220628
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d028044a2490cb5cd3af1ccb19764c8575c6da90 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 07:05:52 -0700
Subject: [PATCH 534/811] Revert "Bump v21.0.0-nightly.20220628"

This reverts commit 9c311a205971cc17f79b9d7e2528b09edf1a361e.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 961c33635acac..038611d37a56b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220628
\ No newline at end of file
+21.0.0-nightly.20220627
\ No newline at end of file
diff --git a/package.json b/package.json
index e1e01ee06d69e..c5b0e2effb00d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220628",
+  "version": "21.0.0-nightly.20220627",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3ef2fe00dc1ad..508be5195cf99 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220628
- PRODUCTVERSION 21,0,0,20220628
+ FILEVERSION 21,0,0,20220627
+ PRODUCTVERSION 21,0,0,20220627
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f1087cc830872365c7e9dade7b44de099853b08c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 07:07:08 -0700
Subject: [PATCH 535/811] Bump v21.0.0-nightly.20220628

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 038611d37a56b..961c33635acac 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220627
\ No newline at end of file
+21.0.0-nightly.20220628
\ No newline at end of file
diff --git a/package.json b/package.json
index c5b0e2effb00d..e1e01ee06d69e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220627",
+  "version": "21.0.0-nightly.20220628",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 508be5195cf99..3ef2fe00dc1ad 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220627
- PRODUCTVERSION 21,0,0,20220627
+ FILEVERSION 21,0,0,20220628
+ PRODUCTVERSION 21,0,0,20220628
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 704b2199b3457f01611795eb3d36b4cb85ff5641 Mon Sep 17 00:00:00 2001
From: Micha Hanselmann <micha.hanselmann@gmail.com>
Date: Tue, 28 Jun 2022 16:34:00 +0200
Subject: [PATCH 536/811] build: fix building with enable_basic_printing false
 (#34711)

* build: fix building with enable_basic_printing false

* temp flags for ci builds

* fix other systems

* disable cups

* disable print preview

* revert changes

* merge with printing.patch
---
 patches/chromium/printing.patch               | 82 +++++++++++++++++++
 .../browser/api/electron_api_web_contents.cc  |  2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 826c1f5136be3..9c197997a832e 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -10,6 +10,29 @@ majority of changes originally come from these PRs:
 
 This patch also fixes callback for manual user cancellation and success.
 
+diff --git a/BUILD.gn b/BUILD.gn
+index c46cbf1bec22c36b97fde5601ca9b2966ee80933..edf371d10bcac60db878c56c55e7244afa9106a9 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -960,7 +960,6 @@ if (is_win) {
+       "//media:media_unittests",
+       "//media/midi:midi_unittests",
+       "//net:net_unittests",
+-      "//printing:printing_unittests",
+       "//sql:sql_unittests",
+       "//third_party/breakpad:symupload($host_toolchain)",
+       "//ui/base:ui_base_unittests",
+@@ -969,6 +968,10 @@ if (is_win) {
+       "//ui/views:views_unittests",
+       "//url:url_unittests",
+     ]
++
++    if (enable_basic_printing) {
++      deps += [ "//printing:printing_unittests" ]
++    }
+   }
+ }
+ 
 diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
 index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dcf54817e9 100644
 --- a/chrome/browser/printing/print_job.cc
@@ -720,6 +743,42 @@ index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43f
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
+diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
+index 6fe723b5b4b645cb3d007787db2217bcaec7c257..e89d8b20aa27ac940e78d374ded9bca25940d3db 100644
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
+@@ -2733,8 +2733,9 @@ source_set("browser") {
+       "//ppapi/shared_impl",
+     ]
+ 
+-    assert(enable_basic_printing)
+-    deps += [ "//printing" ]
++    if (enable_basic_printing) {
++      deps += [ "//printing" ]
++    }
+ 
+     if (is_chromeos_ash) {
+       sources += [
+diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
+index 75f0fade966646dc7e738c87a3300be1603ec7b7..27f71aef278781c214dc430af7cd16f32483e559 100644
+--- a/content/browser/utility_sandbox_delegate_win.cc
++++ b/content/browser/utility_sandbox_delegate_win.cc
+@@ -95,6 +95,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetPolicy* policy) {
+   return true;
+ }
+ 
++#if BUILDFLAG(ENABLE_PRINTING)
+ // Sets the sandbox policy for the print backend service process.
+ bool PrintBackendPreSpawnTarget(sandbox::TargetPolicy* policy) {
+   // Print Backend policy lockdown level must be at least USER_LIMITED and
+@@ -105,6 +106,7 @@ bool PrintBackendPreSpawnTarget(sandbox::TargetPolicy* policy) {
+   policy->SetDelayedIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
+   return true;
+ }
++#endif
+ }  // namespace
+ 
+ bool UtilitySandboxedProcessLauncherDelegate::GetAppContainerId(
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
 index 93db1a80a360702a36f2d3113c9a83105bf7fffe..c3e012ec8d9a1c19434240d27553e486c0729d43 100644
 --- a/printing/printing_context.cc
@@ -756,3 +815,26 @@ index 58fcf619add5093bd99fd9c561e8686b060a01c6..76db2a2438cef84fcb6dfd4a67d2e171
    // Determine if system calls should be skipped by this instance.
    bool skip_system_calls() const {
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
+diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
+index 35d1091e0c555d00ac1fc5ac878fa2a6e09e718b..07411f07e69a645ba388348f01237f7d38755818 100644
+--- a/sandbox/policy/mac/sandbox_mac.mm
++++ b/sandbox/policy/mac/sandbox_mac.mm
+@@ -21,7 +21,6 @@
+ #include "sandbox/policy/mac/nacl_loader.sb.h"
+ #include "sandbox/policy/mac/network.sb.h"
+ #include "sandbox/policy/mac/ppapi.sb.h"
+-#include "sandbox/policy/mac/print_backend.sb.h"
+ #include "sandbox/policy/mac/print_compositor.sb.h"
+ #include "sandbox/policy/mac/renderer.sb.h"
+ #include "sandbox/policy/mac/screen_ai.sb.h"
+@@ -29,6 +28,10 @@
+ #include "sandbox/policy/mac/utility.sb.h"
+ #include "sandbox/policy/mojom/sandbox.mojom.h"
+ 
++#if BUILDFLAG(ENABLE_PRINTING)
++#include "sandbox/policy/mac/print_backend.sb.h"
++#endif
++
+ namespace sandbox {
+ namespace policy {
+ 
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 15312c2f94076..bab5d570cdf11 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -25,7 +25,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/printing/print_view_manager_base.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/views/eye_dropper/eye_dropper.h"
 #include "chrome/common/pref_names.h"
@@ -166,6 +165,7 @@
 #endif
 
 #if BUILDFLAG(ENABLE_PRINTING)
+#include "chrome/browser/printing/print_view_manager_base.h"
 #include "components/printing/browser/print_manager_utils.h"
 #include "components/printing/browser/print_to_pdf/pdf_print_utils.h"
 #include "printing/backend/print_backend.h"  // nogncheck

From a4043237da51c0499daf378f422889e8accb3bfc Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 07:40:00 -0700
Subject: [PATCH 537/811] Revert "Bump v21.0.0-nightly.20220628"

This reverts commit f1087cc830872365c7e9dade7b44de099853b08c.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 961c33635acac..038611d37a56b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220628
\ No newline at end of file
+21.0.0-nightly.20220627
\ No newline at end of file
diff --git a/package.json b/package.json
index e1e01ee06d69e..c5b0e2effb00d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220628",
+  "version": "21.0.0-nightly.20220627",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3ef2fe00dc1ad..508be5195cf99 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220628
- PRODUCTVERSION 21,0,0,20220628
+ FILEVERSION 21,0,0,20220627
+ PRODUCTVERSION 21,0,0,20220627
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 07294cbf15a94a6150877b67178911273cb022cf Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 28 Jun 2022 09:52:59 -0700
Subject: [PATCH 538/811] chore: modernize ListValue usage in gpu info (#34663)

---
 shell/browser/api/electron_api_app.cc    |   2 +-
 shell/browser/api/gpu_info_enumerator.cc | 112 +++++++++++------------
 shell/browser/api/gpu_info_enumerator.h  |   6 +-
 shell/browser/api/gpuinfo_manager.cc     |  15 ++-
 shell/browser/api/gpuinfo_manager.h      |  12 +--
 5 files changed, 71 insertions(+), 76 deletions(-)

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 77281437ef32b..e4fc3989f73fd 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -1443,7 +1443,7 @@ v8::Local<v8::Value> App::GetGPUFeatureStatus(v8::Isolate* isolate) {
 v8::Local<v8::Promise> App::GetGPUInfo(v8::Isolate* isolate,
                                        const std::string& info_type) {
   auto* const gpu_data_manager = content::GpuDataManagerImpl::GetInstance();
-  gin_helper::Promise<base::DictionaryValue> promise(isolate);
+  gin_helper::Promise<base::Value> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
   if (info_type != "basic" && info_type != "complete") {
     promise.RejectWithErrorMessage(
diff --git a/shell/browser/api/gpu_info_enumerator.cc b/shell/browser/api/gpu_info_enumerator.cc
index 23b2ccd345a4f..57c3448068aa4 100644
--- a/shell/browser/api/gpu_info_enumerator.cc
+++ b/shell/browser/api/gpu_info_enumerator.cc
@@ -8,127 +8,125 @@
 
 namespace electron {
 
-GPUInfoEnumerator::GPUInfoEnumerator()
-    : value_stack(), current(std::make_unique<base::DictionaryValue>()) {}
+GPUInfoEnumerator::GPUInfoEnumerator() : value_stack_(), current_{} {}
 
 GPUInfoEnumerator::~GPUInfoEnumerator() = default;
 
 void GPUInfoEnumerator::AddInt64(const char* name, int64_t value) {
-  current->SetInteger(name, value);
+  // NOTE(nornagon): this loses precision. base::Value can't store int64_t.
+  current_.Set(name, static_cast<int>(value));
 }
 
 void GPUInfoEnumerator::AddInt(const char* name, int value) {
-  current->SetInteger(name, value);
+  current_.Set(name, value);
 }
 
 void GPUInfoEnumerator::AddString(const char* name, const std::string& value) {
   if (!value.empty())
-    current->SetString(name, value);
+    current_.Set(name, value);
 }
 
 void GPUInfoEnumerator::AddBool(const char* name, bool value) {
-  current->SetBoolean(name, value);
+  current_.Set(name, value);
 }
 
 void GPUInfoEnumerator::AddTimeDeltaInSecondsF(const char* name,
                                                const base::TimeDelta& value) {
-  current->SetInteger(name, value.InMilliseconds());
+  current_.Set(name, value.InMillisecondsF());
 }
 
 void GPUInfoEnumerator::AddBinary(const char* name,
                                   const base::span<const uint8_t>& value) {
-  current->Set(name, std::make_unique<base::Value>(value));
+  current_.Set(name, base::Value(value));
 }
 
 void GPUInfoEnumerator::BeginGPUDevice() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndGPUDevice() {
-  auto& top_value = value_stack.top();
+  auto& top_value = value_stack_.top();
   // GPUDevice can be more than one. So create a list of all.
   // The first one is the active GPU device.
-  if (top_value->FindKey(kGPUDeviceKey)) {
-    base::ListValue* list;
-    top_value->GetList(kGPUDeviceKey, &list);
-    list->Append(base::Value::FromUniquePtrValue(std::move(current)));
+  if (base::Value* list_value = top_value.Find(kGPUDeviceKey)) {
+    DCHECK(list_value->is_list());
+    base::Value::List& list = list_value->GetList();
+    list.Append(std::move(current_));
   } else {
-    std::unique_ptr<base::ListValue> gpus(new base::ListValue());
-    gpus->Append(base::Value::FromUniquePtrValue(std::move(current)));
-    top_value->SetList(kGPUDeviceKey, std::move(gpus));
+    base::Value::List gpus;
+    gpus.Append(std::move(current_));
+    top_value.Set(kGPUDeviceKey, std::move(gpus));
   }
-  current = std::move(top_value);
-  value_stack.pop();
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
 void GPUInfoEnumerator::BeginVideoDecodeAcceleratorSupportedProfile() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndVideoDecodeAcceleratorSupportedProfile() {
-  auto& top_value = value_stack.top();
-  top_value->SetKey(kVideoDecodeAcceleratorSupportedProfileKey,
-                    base::Value::FromUniquePtrValue(std::move(current)));
-  current = std::move(top_value);
-  value_stack.pop();
+  auto& top_value = value_stack_.top();
+  top_value.Set(kVideoDecodeAcceleratorSupportedProfileKey,
+                std::move(current_));
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
 void GPUInfoEnumerator::BeginVideoEncodeAcceleratorSupportedProfile() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndVideoEncodeAcceleratorSupportedProfile() {
-  auto& top_value = value_stack.top();
-  top_value->SetKey(kVideoEncodeAcceleratorSupportedProfileKey,
-                    base::Value::FromUniquePtrValue(std::move(current)));
-  current = std::move(top_value);
-  value_stack.pop();
+  auto& top_value = value_stack_.top();
+  top_value.Set(kVideoEncodeAcceleratorSupportedProfileKey,
+                std::move(current_));
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
 void GPUInfoEnumerator::BeginImageDecodeAcceleratorSupportedProfile() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndImageDecodeAcceleratorSupportedProfile() {
-  auto& top_value = value_stack.top();
-  top_value->SetKey(kImageDecodeAcceleratorSupportedProfileKey,
-                    base::Value::FromUniquePtrValue(std::move(current)));
-  current = std::move(top_value);
-  value_stack.pop();
+  auto& top_value = value_stack_.top();
+  top_value.Set(kImageDecodeAcceleratorSupportedProfileKey,
+                std::move(current_));
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
 void GPUInfoEnumerator::BeginAuxAttributes() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndAuxAttributes() {
-  auto& top_value = value_stack.top();
-  top_value->SetKey(kAuxAttributesKey,
-                    base::Value::FromUniquePtrValue(std::move(current)));
-  current = std::move(top_value);
-  value_stack.pop();
+  auto& top_value = value_stack_.top();
+  top_value.Set(kAuxAttributesKey, std::move(current_));
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
 void GPUInfoEnumerator::BeginOverlayInfo() {
-  value_stack.push(std::move(current));
-  current = std::make_unique<base::DictionaryValue>();
+  value_stack_.push(std::move(current_));
+  current_ = {};
 }
 
 void GPUInfoEnumerator::EndOverlayInfo() {
-  auto& top_value = value_stack.top();
-  top_value->SetKey(kOverlayInfo,
-                    base::Value::FromUniquePtrValue(std::move(current)));
-  current = std::move(top_value);
-  value_stack.pop();
+  auto& top_value = value_stack_.top();
+  top_value.Set(kOverlayInfo, std::move(current_));
+  current_ = std::move(top_value);
+  value_stack_.pop();
 }
 
-std::unique_ptr<base::DictionaryValue> GPUInfoEnumerator::GetDictionary() {
-  return std::move(current);
+base::Value::Dict GPUInfoEnumerator::GetDictionary() {
+  return std::move(current_);
 }
 
 }  // namespace electron
diff --git a/shell/browser/api/gpu_info_enumerator.h b/shell/browser/api/gpu_info_enumerator.h
index 389aa9d604d48..bd1af0799cec4 100644
--- a/shell/browser/api/gpu_info_enumerator.h
+++ b/shell/browser/api/gpu_info_enumerator.h
@@ -50,12 +50,12 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
   void EndAuxAttributes() override;
   void BeginOverlayInfo() override;
   void EndOverlayInfo() override;
-  std::unique_ptr<base::DictionaryValue> GetDictionary();
+  base::Value::Dict GetDictionary();
 
  private:
   // The stack is used to manage nested values
-  std::stack<std::unique_ptr<base::DictionaryValue>> value_stack;
-  std::unique_ptr<base::DictionaryValue> current;
+  std::stack<base::Value::Dict> value_stack_;
+  base::Value::Dict current_;
 };
 
 }  // namespace electron
diff --git a/shell/browser/api/gpuinfo_manager.cc b/shell/browser/api/gpuinfo_manager.cc
index d797d0ec4a6da..e4bcf0dcad0ce 100644
--- a/shell/browser/api/gpuinfo_manager.cc
+++ b/shell/browser/api/gpuinfo_manager.cc
@@ -41,11 +41,11 @@ bool GPUInfoManager::NeedsCompleteGpuInfoCollection() const {
 
 // Should be posted to the task runner
 void GPUInfoManager::ProcessCompleteInfo() {
-  const auto result = EnumerateGPUInfo(gpu_data_manager_->GetGPUInfo());
+  base::Value::Dict result = EnumerateGPUInfo(gpu_data_manager_->GetGPUInfo());
   // We have received the complete information, resolve all promises that
   // were waiting for this info.
   for (auto& promise : complete_info_promise_set_) {
-    promise.Resolve(*result);
+    promise.Resolve(base::Value(result.Clone()));
   }
   complete_info_promise_set_.clear();
 }
@@ -61,7 +61,7 @@ void GPUInfoManager::OnGpuInfoUpdate() {
 
 // Should be posted to the task runner
 void GPUInfoManager::CompleteInfoFetcher(
-    gin_helper::Promise<base::DictionaryValue> promise) {
+    gin_helper::Promise<base::Value> promise) {
   complete_info_promise_set_.emplace_back(std::move(promise));
 
   if (NeedsCompleteGpuInfoCollection()) {
@@ -73,7 +73,7 @@ void GPUInfoManager::CompleteInfoFetcher(
 }
 
 void GPUInfoManager::FetchCompleteInfo(
-    gin_helper::Promise<base::DictionaryValue> promise) {
+    gin_helper::Promise<base::Value> promise) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&GPUInfoManager::CompleteInfoFetcher,
                                 base::Unretained(this), std::move(promise)));
@@ -81,14 +81,13 @@ void GPUInfoManager::FetchCompleteInfo(
 
 // This fetches the info synchronously, so no need to post to the task queue.
 // There cannot be multiple promises as they are resolved synchronously.
-void GPUInfoManager::FetchBasicInfo(
-    gin_helper::Promise<base::DictionaryValue> promise) {
+void GPUInfoManager::FetchBasicInfo(gin_helper::Promise<base::Value> promise) {
   gpu::GPUInfo gpu_info;
   CollectBasicGraphicsInfo(&gpu_info);
-  promise.Resolve(*EnumerateGPUInfo(gpu_info));
+  promise.Resolve(base::Value(EnumerateGPUInfo(gpu_info)));
 }
 
-std::unique_ptr<base::DictionaryValue> GPUInfoManager::EnumerateGPUInfo(
+base::Value::Dict GPUInfoManager::EnumerateGPUInfo(
     gpu::GPUInfo gpu_info) const {
   GPUInfoEnumerator enumerator;
   gpu_info.EnumerateFields(&enumerator);
diff --git a/shell/browser/api/gpuinfo_manager.h b/shell/browser/api/gpuinfo_manager.h
index 43357ececc22b..8b134e50bf97c 100644
--- a/shell/browser/api/gpuinfo_manager.h
+++ b/shell/browser/api/gpuinfo_manager.h
@@ -28,22 +28,20 @@ class GPUInfoManager : public content::GpuDataManagerObserver {
   GPUInfoManager& operator=(const GPUInfoManager&) = delete;
 
   bool NeedsCompleteGpuInfoCollection() const;
-  void FetchCompleteInfo(gin_helper::Promise<base::DictionaryValue> promise);
-  void FetchBasicInfo(gin_helper::Promise<base::DictionaryValue> promise);
+  void FetchCompleteInfo(gin_helper::Promise<base::Value> promise);
+  void FetchBasicInfo(gin_helper::Promise<base::Value> promise);
   void OnGpuInfoUpdate() override;
 
  private:
-  std::unique_ptr<base::DictionaryValue> EnumerateGPUInfo(
-      gpu::GPUInfo gpu_info) const;
+  base::Value::Dict EnumerateGPUInfo(gpu::GPUInfo gpu_info) const;
 
   // These should be posted to the task queue
-  void CompleteInfoFetcher(gin_helper::Promise<base::DictionaryValue> promise);
+  void CompleteInfoFetcher(gin_helper::Promise<base::Value> promise);
   void ProcessCompleteInfo();
 
   // This set maintains all the promises that should be fulfilled
   // once we have the complete information data
-  std::vector<gin_helper::Promise<base::DictionaryValue>>
-      complete_info_promise_set_;
+  std::vector<gin_helper::Promise<base::Value>> complete_info_promise_set_;
   content::GpuDataManagerImpl* gpu_data_manager_;
 };
 

From 44b9ee51f45466603728721d23fb4dd95061c142 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 28 Jun 2022 16:02:00 -0700
Subject: [PATCH 539/811] fix: resolve symlinks when computing relative asar
 paths for integrity (#34776)

---
 shell/common/asar/archive_mac.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell/common/asar/archive_mac.mm b/shell/common/asar/archive_mac.mm
index 3ad60faf24c58..c3550e24e26f9 100644
--- a/shell/common/asar/archive_mac.mm
+++ b/shell/common/asar/archive_mac.mm
@@ -11,6 +11,7 @@
 #include <iomanip>
 #include <string>
 
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ -21,7 +22,8 @@
 namespace asar {
 
 absl::optional<base::FilePath> Archive::RelativePath() const {
-  base::FilePath bundle_path = base::mac::MainBundlePath().Append("Contents");
+  base::FilePath bundle_path = base::MakeAbsoluteFilePath(
+      base::mac::MainBundlePath().Append("Contents"));
 
   base::FilePath relative_path;
   if (!bundle_path.AppendRelativePath(path_, &relative_path))

From 3458eac2760bac6bd022e3e770d31ff0eda150f4 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 28 Jun 2022 16:40:23 -0700
Subject: [PATCH 540/811] chore: update printing patch for main gclient sync
 (#34777)

chore: update printing patch
---
 patches/chromium/printing.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 9c197997a832e..ae77976658d6f 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c46cbf1bec22c36b97fde5601ca9b2966ee80933..edf371d10bcac60db878c56c55e7244afa9106a9 100644
+index a7a198ddd0f33bc0786b59e5027c72662d2c24ed..dfc5ba7e101ef8521bcb4d1ecdf68f1957b347e9 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -960,7 +960,6 @@ if (is_win) {
+@@ -970,7 +970,6 @@ if (is_win) {
        "//media:media_unittests",
        "//media/midi:midi_unittests",
        "//net:net_unittests",
@@ -22,7 +22,7 @@ index c46cbf1bec22c36b97fde5601ca9b2966ee80933..edf371d10bcac60db878c56c55e7244a
        "//sql:sql_unittests",
        "//third_party/breakpad:symupload($host_toolchain)",
        "//ui/base:ui_base_unittests",
-@@ -969,6 +968,10 @@ if (is_win) {
+@@ -979,6 +978,10 @@ if (is_win) {
        "//ui/views:views_unittests",
        "//url:url_unittests",
      ]
@@ -744,10 +744,10 @@ index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43f
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 6fe723b5b4b645cb3d007787db2217bcaec7c257..e89d8b20aa27ac940e78d374ded9bca25940d3db 100644
+index 87c464f6a565b0ef4930c87b5e32329c55d0c223..26af5b09600e4e064b098bac884c4d941e88e3fc 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2733,8 +2733,9 @@ source_set("browser") {
+@@ -2758,8 +2758,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  
@@ -757,10 +757,10 @@ index 6fe723b5b4b645cb3d007787db2217bcaec7c257..e89d8b20aa27ac940e78d374ded9bca2
 +      deps += [ "//printing" ]
 +    }
  
-     if (is_chromeos_ash) {
+     if (is_chromeos) {
        sources += [
 diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
-index 75f0fade966646dc7e738c87a3300be1603ec7b7..27f71aef278781c214dc430af7cd16f32483e559 100644
+index 5f6847dcc9aa6970d7c8c4831f2be160c0aa15ad..4bd1f7e3b4c50a319043c8041a9ecf4fa8a99ac1 100644
 --- a/content/browser/utility_sandbox_delegate_win.cc
 +++ b/content/browser/utility_sandbox_delegate_win.cc
 @@ -95,6 +95,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetPolicy* policy) {

From 40fbc05bb2fba653bfa490716285dcce6a355467 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 28 Jun 2022 16:40:56 -0700
Subject: [PATCH 541/811] chore: modernize base::Value usage in
 accessibility_ui (#34666)

---
 shell/browser/ui/webui/accessibility_ui.cc | 97 ++++++++++------------
 1 file changed, 45 insertions(+), 52 deletions(-)

diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc
index f276f59a3e714..07dcb52162c45 100644
--- a/shell/browser/ui/webui/accessibility_ui.cc
+++ b/shell/browser/ui/webui/accessibility_ui.cc
@@ -83,7 +83,7 @@ static const char kDisabled[] = "disabled";
 static const char kOff[] = "off";
 static const char kOn[] = "on";
 
-std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
+base::Value::Dict BuildTargetDescriptor(
     const GURL& url,
     const std::string& name,
     const GURL& favicon_url,
@@ -91,20 +91,20 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
     int routing_id,
     ui::AXMode accessibility_mode,
     base::ProcessHandle handle = base::kNullProcessHandle) {
-  auto target_data = std::make_unique<base::DictionaryValue>();
-  target_data->SetInteger(kProcessIdField, process_id);
-  target_data->SetInteger(kRoutingIdField, routing_id);
-  target_data->SetString(kUrlField, url.spec());
-  target_data->SetString(kNameField, base::EscapeForHTML(name));
-  target_data->SetInteger(kPidField, base::GetProcId(handle));
-  target_data->SetString(kFaviconUrlField, favicon_url.spec());
-  target_data->SetInteger(kAccessibilityModeField, accessibility_mode.mode());
-  target_data->SetString(kTypeField, kPage);
+  base::Value::Dict target_data;
+  target_data.Set(kProcessIdField, process_id);
+  target_data.Set(kRoutingIdField, routing_id);
+  target_data.Set(kUrlField, url.spec());
+  target_data.Set(kNameField, base::EscapeForHTML(name));
+  target_data.Set(kPidField, static_cast<int>(base::GetProcId(handle)));
+  target_data.Set(kFaviconUrlField, favicon_url.spec());
+  target_data.Set(kAccessibilityModeField,
+                  static_cast<int>(accessibility_mode.mode()));
+  target_data.Set(kTypeField, kPage);
   return target_data;
 }
 
-std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
-    content::RenderViewHost* rvh) {
+base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   ui::AXMode accessibility_mode;
@@ -132,12 +132,11 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
                                accessibility_mode);
 }
 
-std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
-    electron::NativeWindow* window) {
-  auto target_data = std::make_unique<base::DictionaryValue>();
-  target_data->SetInteger(kSessionIdField, window->window_id());
-  target_data->SetString(kNameField, window->GetTitle());
-  target_data->SetString(kTypeField, kBrowser);
+base::Value::Dict BuildTargetDescriptor(electron::NativeWindow* window) {
+  base::Value::Dict target_data;
+  target_data.Set(kSessionIdField, window->window_id());
+  target_data.Set(kNameField, window->GetTitle());
+  target_data.Set(kTypeField, kBrowser);
   return target_data;
 }
 
@@ -216,7 +215,7 @@ void HandleAccessibilityRequestCallback(
     content::WebUIDataSource::GotDataCallback callback) {
   DCHECK(ShouldHandleAccessibilityRequestCallback(path));
 
-  base::DictionaryValue data;
+  base::Value::Dict data;
   ui::AXMode mode =
       content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
   bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
@@ -230,17 +229,16 @@ void HandleAccessibilityRequestCallback(
 
   // The "native" and "web" flags are disabled if
   // --disable-renderer-accessibility is set.
-  data.SetString(kNative,
-                 is_native_enabled ? (native ? kOn : kOff) : kDisabled);
-  data.SetString(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled);
+  data.Set(kNative, is_native_enabled ? (native ? kOn : kOff) : kDisabled);
+  data.Set(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled);
 
   // The "text", "screenreader" and "html" flags are only
   // meaningful if "web" is enabled.
   bool is_web_enabled = is_native_enabled && web;
-  data.SetString(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled);
-  data.SetString(kScreenReader,
-                 is_web_enabled ? (screenreader ? kOn : kOff) : kDisabled);
-  data.SetString(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled);
+  data.Set(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled);
+  data.Set(kScreenReader,
+           is_web_enabled ? (screenreader ? kOn : kOff) : kDisabled);
+  data.Set(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled);
 
   // TODO(codebytere): enable use of this flag.
   //
@@ -249,15 +247,15 @@ void HandleAccessibilityRequestCallback(
   // command line switch has been used. Since this is so closely tied into user
   // prefs and causes bugs, we're disabling it for now.
   bool are_accessibility_image_labels_enabled = is_web_enabled;
-  data.SetString(kLabelImages, kDisabled);
+  data.Set(kLabelImages, kDisabled);
 
   // The "pdf" flag is independent of the others.
-  data.SetString(kPDF, pdf ? kOn : kOff);
+  data.Set(kPDF, pdf ? kOn : kOff);
 
   // Always dump the Accessibility tree.
-  data.SetString(kInternal, kOn);
+  data.Set(kInternal, kOn);
 
-  auto rvh_list = std::make_unique<base::ListValue>();
+  base::Value::List rvh_list;
   std::unique_ptr<content::RenderWidgetHostIterator> widgets(
       content::RenderWidgetHost::GetRenderWidgetHosts());
 
@@ -280,27 +278,24 @@ void HandleAccessibilityRequestCallback(
     if (context != current_context)
       continue;
 
-    std::unique_ptr<base::DictionaryValue> descriptor =
-        BuildTargetDescriptor(rvh);
-    descriptor->SetBoolean(kNative, is_native_enabled);
-    descriptor->SetBoolean(kWeb, is_web_enabled);
-    descriptor->SetBoolean(kLabelImages,
-                           are_accessibility_image_labels_enabled);
-    rvh_list->Append(base::Value::FromUniquePtrValue(std::move(descriptor)));
+    base::Value::Dict descriptor = BuildTargetDescriptor(rvh);
+    descriptor.Set(kNative, is_native_enabled);
+    descriptor.Set(kWeb, is_web_enabled);
+    descriptor.Set(kLabelImages, are_accessibility_image_labels_enabled);
+    rvh_list.Append(base::Value(std::move(descriptor)));
   }
 
   data.Set(kPagesField, std::move(rvh_list));
 
-  auto window_list = std::make_unique<base::ListValue>();
+  base::Value::List window_list;
   for (auto* window : electron::WindowList::GetWindows()) {
-    window_list->Append(
-        base::Value::FromUniquePtrValue(BuildTargetDescriptor(window)));
+    window_list.Append(BuildTargetDescriptor(window));
   }
 
   data.Set(kBrowsersField, std::move(window_list));
 
   std::string json_string;
-  base::JSONWriter::Write(data, &json_string);
+  base::JSONWriter::Write(base::Value(std::move(data)), &json_string);
 
   std::move(callback).Run(base::RefCountedString::TakeString(&json_string));
 }
@@ -368,25 +363,23 @@ void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
 
   for (auto* window : electron::WindowList::GetWindows()) {
     if (window->window_id() == window_id) {
-      std::unique_ptr<base::DictionaryValue> result(
-          BuildTargetDescriptor(window));
+      base::Value::Dict result = BuildTargetDescriptor(window);
       gfx::NativeWindow native_window = window->GetNativeWindow();
       ui::AXPlatformNode* node =
           ui::AXPlatformNode::FromNativeWindow(native_window);
-      result->SetKey(kTreeField,
-                     base::Value(RecursiveDumpAXPlatformNodeAsString(
-                         node, 0, property_filters)));
-      CallJavascriptFunction(request_type, *(result.get()));
+      result.Set(kTreeField, base::Value(RecursiveDumpAXPlatformNodeAsString(
+                                 node, 0, property_filters)));
+      CallJavascriptFunction(request_type, base::Value(std::move(result)));
       return;
     }
   }
 
   // No browser with the specified |id| was found.
-  auto result = std::make_unique<base::DictionaryValue>();
-  result->SetInteger(kSessionIdField, window_id);
-  result->SetString(kTypeField, kBrowser);
-  result->SetString(kErrorField, "Window no longer exists.");
-  CallJavascriptFunction(request_type, *(result.get()));
+  base::Value::Dict result;
+  result.Set(kSessionIdField, window_id);
+  result.Set(kTypeField, kBrowser);
+  result.Set(kErrorField, "Window no longer exists.");
+  CallJavascriptFunction(request_type, base::Value(std::move(result)));
 }
 
 void ElectronAccessibilityUIMessageHandler::RegisterMessages() {

From 3310e4039fa517d9216378804cda73ee77b8c0a9 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 28 Jun 2022 20:26:00 -0700
Subject: [PATCH 542/811] build: update makeRequest parameters (#34782)

---
 script/release/ci-release-build.js | 50 +++++++++++++++++-------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index b584a998188db..b31cfaa980784 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -35,19 +35,27 @@ const vstsArmJobs = [
 
 let jobRequestedCount = 0;
 
-async function makeRequest ({ auth, url, headers, body, method }) {
+async function makeRequest ({ auth, username, password, url, headers, body, method }) {
   const clonedHeaders = {
     ...(headers || {})
   };
-  if (auth && auth.bearer) {
+  if (auth?.bearer) {
     clonedHeaders.Authorization = `Bearer ${auth.bearer}`;
   }
-  const response = await got(url, {
+
+  const options = {
     headers: clonedHeaders,
     body,
-    method,
-    auth: auth && (auth.username || auth.password) ? `${auth.username}:${auth.password}` : undefined
-  });
+    method
+  };
+
+  if (username || password) {
+    options.username = username;
+    options.password = password;
+  }
+
+  const response = await got(url, options);
+
   if (response.statusCode < 200 || response.statusCode >= 300) {
     console.error('Error: ', `(status ${response.statusCode})`, response.body);
     throw new Error(`Unexpected status code ${response.statusCode} from ${url}`);
@@ -170,19 +178,21 @@ async function getCircleCIJobNumber (workflowId) {
 }
 
 async function circleCIRequest (url, method, requestBody) {
-  return makeRequest({
-    auth: {
-      username: process.env.CIRCLE_TOKEN,
-      password: ''
-    },
+  const requestOpts = {
+    username: process.env.CIRCLE_TOKEN,
+    password: '',
     method,
     url,
     headers: {
       'Content-Type': 'application/json',
       Accept: 'application/json'
-    },
-    body: requestBody ? JSON.stringify(requestBody) : null
-  }, true).catch(err => {
+    }
+  };
+  if (requestBody) {
+    requestOpts.body = JSON.stringify(requestBody);
+  }
+
+  return makeRequest(requestOpts, true).catch(err => {
     console.log('Error calling CircleCI:', err);
   });
 }
@@ -269,10 +279,8 @@ async function buildVSTS (targetBranch, options) {
   }
   const requestOpts = {
     url: `${vstsURL}/definitions?api-version=4.1`,
-    auth: {
-      user: '',
-      password: vstsToken
-    },
+    user: '',
+    password: vstsToken,
     headers: {
       'Content-Type': 'application/json'
     }
@@ -300,10 +308,8 @@ async function callVSTSBuild (build, targetBranch, environmentVariables, vstsURL
   }
   const requestOpts = {
     url: `${vstsURL}/builds?api-version=4.1`,
-    auth: {
-      user: '',
-      password: vstsToken
-    },
+    user: '',
+    password: vstsToken,
     headers: {
       'Content-Type': 'application/json'
     },

From 6257e0c348ed3e30b8b7799475adeb6019138f95 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 20:28:29 -0700
Subject: [PATCH 543/811] Bump v21.0.0-nightly.20220628

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 038611d37a56b..961c33635acac 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220627
\ No newline at end of file
+21.0.0-nightly.20220628
\ No newline at end of file
diff --git a/package.json b/package.json
index c5b0e2effb00d..e1e01ee06d69e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220627",
+  "version": "21.0.0-nightly.20220628",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 508be5195cf99..3ef2fe00dc1ad 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220627
- PRODUCTVERSION 21,0,0,20220627
+ FILEVERSION 21,0,0,20220628
+ PRODUCTVERSION 21,0,0,20220628
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 35ff95d3c71849ac97ced178a2330b9d4651f250 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 29 Jun 2022 10:14:03 +0200
Subject: [PATCH 544/811] fix: `<datalist>` bounds vertical cutoff (#34759)

---
 shell/browser/ui/views/autofill_popup_view.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/ui/views/autofill_popup_view.cc b/shell/browser/ui/views/autofill_popup_view.cc
index ce651f28becf6..fd2e50921460a 100644
--- a/shell/browser/ui/views/autofill_popup_view.cc
+++ b/shell/browser/ui/views/autofill_popup_view.cc
@@ -174,7 +174,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
   const int text_align =
       is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT : gfx::Canvas::TEXT_ALIGN_LEFT;
   gfx::Rect value_rect = entry_rect;
-  value_rect.Inset(gfx::Insets::VH(kEndPadding, 0));
+  value_rect.Inset(gfx::Insets::VH(0, kEndPadding));
 
   int x_align_left = value_rect.x();
   const int value_width = gfx::GetStringWidth(

From ad2b1fee59c2e4352b0c5664f72c0067a2ef4d7f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 29 Jun 2022 14:53:57 +0200
Subject: [PATCH 545/811] fix: re-enable HKDF crypto functionality (#34767)

* fix: re-enable HKDF crypto functionality

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 .../fix_crypto_tests_to_run_with_bssl.patch   | 13 +++++
 ...ingssl_and_openssl_incompatibilities.patch | 47 +++----------------
 .../node/support_v8_sandboxed_pointers.patch  | 10 ++--
 script/node-disabled-tests.json               |  2 -
 4 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/patches/node/fix_crypto_tests_to_run_with_bssl.patch b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
index 878160f610ebf..052e1e10ffaec 100644
--- a/patches/node/fix_crypto_tests_to_run_with_bssl.patch
+++ b/patches/node/fix_crypto_tests_to_run_with_bssl.patch
@@ -537,6 +537,19 @@ index af2146982c7a3bf7bd7527f44e4b17a3b605026e..f6b91f675cfea367c608892dee078b56
  
    // Non-XOF hash functions should accept valid outputLength options as well.
    assert.strictEqual(crypto.createHash('sha224', { outputLength: 28 })
+diff --git a/test/parallel/test-crypto-hkdf.js b/test/parallel/test-crypto-hkdf.js
+index 16744201a935dcd25af4e0f446701b08fe08dd64..e7ef0b78a19fb755456d038fc676eedb2f71ff07 100644
+--- a/test/parallel/test-crypto-hkdf.js
++++ b/test/parallel/test-crypto-hkdf.js
+@@ -117,8 +117,6 @@ const algorithms = [
+   ['sha256', 'secret', 'salt', 'info', 10],
+   ['sha512', 'secret', 'salt', '', 15],
+ ];
+-if (!common.hasOpenSSL3)
+-  algorithms.push(['whirlpool', 'secret', '', 'info', 20]);
+ 
+ algorithms.forEach(([ hash, secret, salt, info, length ]) => {
+   {
 diff --git a/test/parallel/test-crypto-padding.js b/test/parallel/test-crypto-padding.js
 index f1f14b472997e76bb4100edb1c6cf4fc24d1074d..5057e3f9bc5bb78aceffa5e79530f8ceed84e6f7 100644
 --- a/test/parallel/test-crypto-padding.js
diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
index 5f0d8ae50dab9..1e6d8e14b488b 100644
--- a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
+++ b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -188,28 +188,6 @@ index c7894baf00ee9ce4684f4c752f1c7c9b98163741..655895dbff8b88daa53c7b40a5feca42
    if (EVP_PKEY_paramgen(param_ctx.get(), &raw_params) <= 0)
      return EVPKeyCtxPointer();
  
-diff --git a/src/crypto/crypto_hkdf.cc b/src/crypto/crypto_hkdf.cc
-index 0aa96ada47abe4b66fb616c665101278bbe0afb6..1e9a4863c5faea5f6b275483ca16f3a6e8dac25b 100644
---- a/src/crypto/crypto_hkdf.cc
-+++ b/src/crypto/crypto_hkdf.cc
-@@ -101,6 +101,7 @@ bool HKDFTraits::DeriveBits(
-     Environment* env,
-     const HKDFConfig& params,
-     ByteSource* out) {
-+#ifndef OPENSSL_IS_BORINGSSL
-   EVPKeyCtxPointer ctx =
-       EVPKeyCtxPointer(EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, nullptr));
-   if (!ctx ||
-@@ -132,6 +133,9 @@ bool HKDFTraits::DeriveBits(
- 
-   *out = std::move(buf);
-   return true;
-+#else
-+  return false;
-+#endif
- }
- 
- void HKDFConfig::MemoryInfo(MemoryTracker* tracker) const {
 diff --git a/src/crypto/crypto_random.cc b/src/crypto/crypto_random.cc
 index fc88deb460314c2620d842ec30141bcd13109d60..c097ccfcffb1158317ba09e7c4beb725ccbab74f 100644
 --- a/src/crypto/crypto_random.cc
@@ -244,10 +222,10 @@ index ae4550e9fde8120c35409e495d5b763a95546509..188a7efe76df2a1aa2eb2746f4d74836
  
        if (target
 diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
-index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba1e76ce0a 100644
+index e1ef170a9f17634d218492a2ce888c3a4365e097..f55e292fbbc75448b15dc9be0327ad2dedef49e0 100644
 --- a/src/crypto/crypto_util.cc
 +++ b/src/crypto/crypto_util.cc
-@@ -508,24 +508,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
+@@ -508,24 +508,15 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
      V(BIO)                                                                    \
      V(PKCS7)                                                                  \
      V(X509V3)                                                                 \
@@ -269,10 +247,11 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
 -    V(ASYNC)                                                                  \
 -    V(KDF)                                                                    \
 -    V(SM2)                                                                    \
++    V(HKDF)                                                                    \
      V(USER)                                                                   \
  
  #define V(name) case ERR_LIB_##name: lib = #name "_"; break;
-@@ -684,7 +674,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -684,7 +675,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
    CHECK(args[0]->IsUint32());
    Environment* env = Environment::GetCurrent(args);
    uint32_t len = args[0].As<Uint32>()->Value();
@@ -281,7 +260,7 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
    if (data == nullptr) {
      // There's no memory available for the allocation.
      // Return nothing.
-@@ -696,7 +686,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -696,7 +687,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
            data,
            len,
            [](void* data, size_t len, void* deleter_data) {
@@ -290,7 +269,7 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
            },
            data);
    Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store);
-@@ -704,10 +694,12 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -704,10 +695,12 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
  }
  
  void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
@@ -303,20 +282,6 @@ index e1ef170a9f17634d218492a2ce888c3a4365e097..8dffad89c80e0906780d1b26ba9a65ba
  }
  }  // namespace
  
-diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
-index c431159e6f77f8c86844bcadb86012b056d03372..0ce3a8f219a2952f660ff72a6ce36ee109add649 100644
---- a/src/crypto/crypto_util.h
-+++ b/src/crypto/crypto_util.h
-@@ -16,7 +16,9 @@
- #include <openssl/err.h>
- #include <openssl/evp.h>
- #include <openssl/ec.h>
-+#ifndef OPENSSL_IS_BORINGSSL
- #include <openssl/kdf.h>
-+#endif
- #include <openssl/rsa.h>
- #include <openssl/dsa.h>
- #include <openssl/ssl.h>
 diff --git a/src/node_metadata.h b/src/node_metadata.h
 index 4486d5af2c1622c7c8f44401dc3ebb986d8e3c2e..db1769f1b3f1617ed8dbbea57b5e324183b42be2 100644
 --- a/src/node_metadata.h
diff --git a/patches/node/support_v8_sandboxed_pointers.patch b/patches/node/support_v8_sandboxed_pointers.patch
index a07e9f2560115..08a61216abb4a 100644
--- a/patches/node/support_v8_sandboxed_pointers.patch
+++ b/patches/node/support_v8_sandboxed_pointers.patch
@@ -118,7 +118,7 @@ index 2abf5994405e8da2a04d1b23b75ccd3658398474..024d612a04d83583b397549589d994e3
  
  DebuggingArrayBufferAllocator::~DebuggingArrayBufferAllocator() {
 diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
-index 8dffad89c80e0906780d1b26ba9a65ba1e76ce0a..45bc99ce75248794e95b2dcb0101c28152e2bfd0 100644
+index f55e292fbbc75448b15dc9be0327ad2dedef49e0..7719574859637aecc98f8a4b00ba6ebca8280631 100644
 --- a/src/crypto/crypto_util.cc
 +++ b/src/crypto/crypto_util.cc
 @@ -318,10 +318,35 @@ ByteSource& ByteSource::operator=(ByteSource&& other) noexcept {
@@ -171,7 +171,7 @@ index 8dffad89c80e0906780d1b26ba9a65ba1e76ce0a..45bc99ce75248794e95b2dcb0101c281
    return ArrayBuffer::New(env->isolate(), std::move(store));
  }
  
-@@ -665,6 +691,16 @@ CryptoJobMode GetCryptoJobMode(v8::Local<v8::Value> args) {
+@@ -666,6 +692,16 @@ CryptoJobMode GetCryptoJobMode(v8::Local<v8::Value> args) {
  }
  
  namespace {
@@ -188,7 +188,7 @@ index 8dffad89c80e0906780d1b26ba9a65ba1e76ce0a..45bc99ce75248794e95b2dcb0101c281
  // SecureBuffer uses openssl to allocate a Uint8Array using
  // OPENSSL_secure_malloc. Because we do not yet actually
  // make use of secure heap, this has the same semantics as
-@@ -692,6 +728,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
+@@ -693,6 +729,7 @@ void SecureBuffer(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBuffer> buffer = ArrayBuffer::New(env->isolate(), store);
    args.GetReturnValue().Set(Uint8Array::New(buffer, 0, len));
  }
@@ -197,10 +197,10 @@ index 8dffad89c80e0906780d1b26ba9a65ba1e76ce0a..45bc99ce75248794e95b2dcb0101c281
  void SecureHeapUsed(const FunctionCallbackInfo<Value>& args) {
  #ifndef OPENSSL_IS_BORINGSSL
 diff --git a/src/crypto/crypto_util.h b/src/crypto/crypto_util.h
-index 0ce3a8f219a2952f660ff72a6ce36ee109add649..06e9eb72e4ea60db4c63d08b24b80a1e6c4f3eaf 100644
+index c431159e6f77f8c86844bcadb86012b056d03372..9f57ac58d826cb0aae422ddca54e2136618c4bfe 100644
 --- a/src/crypto/crypto_util.h
 +++ b/src/crypto/crypto_util.h
-@@ -257,7 +257,7 @@ class ByteSource {
+@@ -255,7 +255,7 @@ class ByteSource {
    // Creates a v8::BackingStore that takes over responsibility for
    // any allocated data. The ByteSource will be reset with size = 0
    // after being called.
diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index fe69ab29c7e22..8870c8fe8492e 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -15,7 +15,6 @@
   "parallel/test-crypto-ecb",
   "parallel/test-crypto-engine",
   "parallel/test-crypto-fips",
-  "parallel/test-crypto-hkdf.js",
   "parallel/test-crypto-keygen",
   "parallel/test-crypto-keygen-deprecation",
   "parallel/test-crypto-key-objects",
@@ -104,7 +103,6 @@
   "parallel/test-trace-events-vm",
   "parallel/test-trace-events-worker-metadata",
   "parallel/test-v8-untrusted-code-mitigations",
-  "parallel/test-webcrypto-derivebits-hkdf",
   "parallel/test-webcrypto-derivebits-node-dh",
   "parallel/test-webcrypto-ed25519-ed448",
   "parallel/test-webcrypto-encrypt-decrypt",

From 1f814eacb2875c17d6ef6d0f702fc1c4003bcde6 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 29 Jun 2022 08:55:59 -0400
Subject: [PATCH 546/811] build: fix release_dependency_versions workflow
 (#34573)

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 .github/workflows/release_dependency_versions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release_dependency_versions.yml b/.github/workflows/release_dependency_versions.yml
index 7039b9028629b..d03cf272cc30f 100644
--- a/.github/workflows/release_dependency_versions.yml
+++ b/.github/workflows/release_dependency_versions.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   check_tag:
     runs-on: ubuntu-latest
-    id: check_tag
+    steps:
     - uses: actions/checkout@v3
     - name: Check Tag
       run: |

From 461561c19caecc79009e1d45c5172df375d3484f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 29 Jun 2022 06:01:40 -0700
Subject: [PATCH 547/811] Bump v21.0.0-nightly.20220629

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 961c33635acac..45dd56b31f751 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220628
\ No newline at end of file
+21.0.0-nightly.20220629
\ No newline at end of file
diff --git a/package.json b/package.json
index e1e01ee06d69e..272abf0eda703 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220628",
+  "version": "21.0.0-nightly.20220629",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3ef2fe00dc1ad..d4904ad4b3a19 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220628
- PRODUCTVERSION 21,0,0,20220628
+ FILEVERSION 21,0,0,20220629
+ PRODUCTVERSION 21,0,0,20220629
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7c12baccab6b7589db5f941fa9306e0aa4373b60 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 29 Jun 2022 17:19:05 +0200
Subject: [PATCH 548/811] build: remove appveyor hook to defunct service
 (#34789)

---
 appveyor.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0d12169703792..04cdb20e35447 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,16 +34,6 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-notifications:
-  - provider: Webhook
-    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
-    method: POST
-    headers:
-      x-mission-control-secret:
-        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
-    on_build_success: false
-    on_build_failure: true
-    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {

From 4ddd03b1b3f1224bfe3dfb094cb998f64fc8ce4f Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 29 Jun 2022 09:39:48 -0700
Subject: [PATCH 549/811] chore: modernize some devtools code using deprecated
 ListValue (#34655)

---
 .../browser/api/electron_api_web_contents.cc  | 103 +++++++-----------
 shell/browser/ui/inspectable_web_contents.cc  | 100 +++++++++--------
 shell/browser/ui/inspectable_web_contents.h   |  11 +-
 3 files changed, 101 insertions(+), 113 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index bab5d570cdf11..0c31c8b8702c3 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -547,14 +547,13 @@ FileSystem CreateFileSystemStruct(content::WebContents* web_contents,
   return FileSystem(type, file_system_name, root_url, file_system_path);
 }
 
-std::unique_ptr<base::DictionaryValue> CreateFileSystemValue(
-    const FileSystem& file_system) {
-  auto file_system_value = std::make_unique<base::DictionaryValue>();
-  file_system_value->SetString("type", file_system.type);
-  file_system_value->SetString("fileSystemName", file_system.file_system_name);
-  file_system_value->SetString("rootURL", file_system.root_url);
-  file_system_value->SetString("fileSystemPath", file_system.file_system_path);
-  return file_system_value;
+base::Value::Dict CreateFileSystemValue(const FileSystem& file_system) {
+  base::Value::Dict value;
+  value.Set("type", file_system.type);
+  value.Set("fileSystemName", file_system.file_system_name);
+  value.Set("rootURL", file_system.root_url);
+  value.Set("fileSystemPath", file_system.file_system_path);
+  return value;
 }
 
 void WriteToFile(const base::FilePath& path, const std::string& content) {
@@ -1986,9 +1985,8 @@ void WebContents::DevToolsOpened() {
   devtools_web_contents_.Reset(isolate, handle.ToV8());
 
   // Set inspected tabID.
-  base::Value tab_id(ID());
-  inspectable_web_contents_->CallClientFunction("DevToolsAPI.setInspectedTabId",
-                                                &tab_id, nullptr, nullptr);
+  inspectable_web_contents_->CallClientFunction(
+      "DevToolsAPI", "setInspectedTabId", base::Value(ID()));
 
   // Inherit owner window in devtools when it doesn't have one.
   auto* devtools = inspectable_web_contents_->GetDevToolsWebContents();
@@ -3595,19 +3593,17 @@ void WebContents::DevToolsSaveToFile(const std::string& url,
     settings.title = url;
     settings.default_path = base::FilePath::FromUTF8Unsafe(url);
     if (!file_dialog::ShowSaveDialogSync(settings, &path)) {
-      base::Value url_value(url);
       inspectable_web_contents_->CallClientFunction(
-          "DevToolsAPI.canceledSaveURL", &url_value, nullptr, nullptr);
+          "DevToolsAPI", "canceledSaveURL", base::Value(url));
       return;
     }
   }
 
   saved_files_[url] = path;
   // Notify DevTools.
-  base::Value url_value(url);
-  base::Value file_system_path_value(path.AsUTF8Unsafe());
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.savedURL", &url_value, &file_system_path_value, nullptr);
+      "DevToolsAPI", "savedURL", base::Value(url),
+      base::Value(path.AsUTF8Unsafe()));
   file_task_runner_->PostTask(FROM_HERE,
                               base::BindOnce(&WriteToFile, path, content));
 }
@@ -3619,9 +3615,8 @@ void WebContents::DevToolsAppendToFile(const std::string& url,
     return;
 
   // Notify DevTools.
-  base::Value url_value(url);
-  inspectable_web_contents_->CallClientFunction("DevToolsAPI.appendedToURL",
-                                                &url_value, nullptr, nullptr);
+  inspectable_web_contents_->CallClientFunction("DevToolsAPI", "appendedToURL",
+                                                base::Value(url));
   file_task_runner_->PostTask(
       FROM_HERE, base::BindOnce(&AppendToFile, it->second, content));
 }
@@ -3629,10 +3624,8 @@ void WebContents::DevToolsAppendToFile(const std::string& url,
 void WebContents::DevToolsRequestFileSystems() {
   auto file_system_paths = GetAddedFileSystemPaths(GetDevToolsWebContents());
   if (file_system_paths.empty()) {
-    base::ListValue empty_file_system_value;
     inspectable_web_contents_->CallClientFunction(
-        "DevToolsAPI.fileSystemsLoaded", &empty_file_system_value, nullptr,
-        nullptr);
+        "DevToolsAPI", "fileSystemsLoaded", base::Value(base::Value::List()));
     return;
   }
 
@@ -3648,12 +3641,12 @@ void WebContents::DevToolsRequestFileSystems() {
     file_systems.push_back(file_system);
   }
 
-  base::ListValue file_system_value;
+  base::Value::List file_system_value;
   for (const auto& file_system : file_systems)
-    file_system_value.Append(
-        base::Value::FromUniquePtrValue(CreateFileSystemValue(file_system)));
+    file_system_value.Append(CreateFileSystemValue(file_system));
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.fileSystemsLoaded", &file_system_value, nullptr, nullptr);
+      "DevToolsAPI", "fileSystemsLoaded",
+      base::Value(std::move(file_system_value)));
 }
 
 void WebContents::DevToolsAddFileSystem(
@@ -3679,14 +3672,15 @@ void WebContents::DevToolsAddFileSystem(
 
   FileSystem file_system = CreateFileSystemStruct(
       GetDevToolsWebContents(), file_system_id, path.AsUTF8Unsafe(), type);
-  std::unique_ptr<base::DictionaryValue> file_system_value(
-      CreateFileSystemValue(file_system));
+  base::Value::Dict file_system_value = CreateFileSystemValue(file_system);
 
   auto* pref_service = GetPrefService(GetDevToolsWebContents());
   DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
   update.Get()->SetKey(path.AsUTF8Unsafe(), base::Value(type));
+  std::string error = "";  // No error
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.fileSystemAdded", nullptr, file_system_value.get(), nullptr);
+      "DevToolsAPI", "fileSystemAdded", base::Value(error),
+      base::Value(std::move(file_system_value)));
 }
 
 void WebContents::DevToolsRemoveFileSystem(
@@ -3702,10 +3696,8 @@ void WebContents::DevToolsRemoveFileSystem(
   DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
   update.Get()->RemoveKey(path);
 
-  base::Value file_system_path_value(path);
-  inspectable_web_contents_->CallClientFunction("DevToolsAPI.fileSystemRemoved",
-                                                &file_system_path_value,
-                                                nullptr, nullptr);
+  inspectable_web_contents_->CallClientFunction(
+      "DevToolsAPI", "fileSystemRemoved", base::Value(path));
 }
 
 void WebContents::DevToolsIndexPath(
@@ -3781,13 +3773,13 @@ void WebContents::DevToolsSetEyeDropperActive(bool active) {
 }
 
 void WebContents::ColorPickedInEyeDropper(int r, int g, int b, int a) {
-  base::DictionaryValue color;
-  color.SetInteger("r", r);
-  color.SetInteger("g", g);
-  color.SetInteger("b", b);
-  color.SetInteger("a", a);
+  base::Value::Dict color;
+  color.Set("r", r);
+  color.Set("g", g);
+  color.Set("b", b);
+  color.Set("a", a);
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.eyeDropperPickedColor", &color, nullptr, nullptr);
+      "DevToolsAPI", "eyeDropperPickedColor", base::Value(std::move(color)));
 }
 
 #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
@@ -3808,48 +3800,37 @@ void WebContents::OnDevToolsIndexingWorkCalculated(
     int request_id,
     const std::string& file_system_path,
     int total_work) {
-  base::Value request_id_value(request_id);
-  base::Value file_system_path_value(file_system_path);
-  base::Value total_work_value(total_work);
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.indexingTotalWorkCalculated", &request_id_value,
-      &file_system_path_value, &total_work_value);
+      "DevToolsAPI", "indexingTotalWorkCalculated", base::Value(request_id),
+      base::Value(file_system_path), base::Value(total_work));
 }
 
 void WebContents::OnDevToolsIndexingWorked(int request_id,
                                            const std::string& file_system_path,
                                            int worked) {
-  base::Value request_id_value(request_id);
-  base::Value file_system_path_value(file_system_path);
-  base::Value worked_value(worked);
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.indexingWorked", &request_id_value, &file_system_path_value,
-      &worked_value);
+      "DevToolsAPI", "indexingWorked", base::Value(request_id),
+      base::Value(file_system_path), base::Value(worked));
 }
 
 void WebContents::OnDevToolsIndexingDone(int request_id,
                                          const std::string& file_system_path) {
   devtools_indexing_jobs_.erase(request_id);
-  base::Value request_id_value(request_id);
-  base::Value file_system_path_value(file_system_path);
-  inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.indexingDone", &request_id_value, &file_system_path_value,
-      nullptr);
+  inspectable_web_contents_->CallClientFunction("DevToolsAPI", "indexingDone",
+                                                base::Value(request_id),
+                                                base::Value(file_system_path));
 }
 
 void WebContents::OnDevToolsSearchCompleted(
     int request_id,
     const std::string& file_system_path,
     const std::vector<std::string>& file_paths) {
-  base::ListValue file_paths_value;
-  for (const auto& file_path : file_paths) {
+  base::Value::List file_paths_value;
+  for (const auto& file_path : file_paths)
     file_paths_value.Append(file_path);
-  }
-  base::Value request_id_value(request_id);
-  base::Value file_system_path_value(file_system_path);
   inspectable_web_contents_->CallClientFunction(
-      "DevToolsAPI.searchCompleted", &request_id_value, &file_system_path_value,
-      &file_paths_value);
+      "DevToolsAPI", "searchCompleted", base::Value(request_id),
+      base::Value(file_system_path), base::Value(std::move(file_paths_value)));
 }
 
 void WebContents::SetHtmlApiFullscreen(bool enter_fullscreen) {
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index 42eaf58a98c1e..d1c8e65426a68 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -271,8 +271,9 @@ class InspectableWebContents::NetworkResourceLoader
     base::Value id(stream_id_);
     base::Value encodedValue(encoded);
 
-    bindings_->CallClientFunction("DevToolsAPI.streamWrite", &id, &chunkValue,
-                                  &encodedValue);
+    bindings_->CallClientFunction("DevToolsAPI", "streamWrite", std::move(id),
+                                  std::move(chunkValue),
+                                  std::move(encodedValue));
     std::move(resume).Run();
   }
 
@@ -510,30 +511,29 @@ void InspectableWebContents::Reattach(DispatchCallback callback) {
 }
 
 void InspectableWebContents::CallClientFunction(
-    const std::string& function_name,
-    const base::Value* arg1,
-    const base::Value* arg2,
-    const base::Value* arg3) {
+    const std::string& object_name,
+    const std::string& method_name,
+    base::Value arg1,
+    base::Value arg2,
+    base::Value arg3,
+    base::OnceCallback<void(base::Value)> cb) {
   if (!GetDevToolsWebContents())
     return;
 
-  std::string javascript = function_name + "(";
-  if (arg1) {
-    std::string json;
-    base::JSONWriter::Write(*arg1, &json);
-    javascript.append(json);
-    if (arg2) {
-      base::JSONWriter::Write(*arg2, &json);
-      javascript.append(", ").append(json);
-      if (arg3) {
-        base::JSONWriter::Write(*arg3, &json);
-        javascript.append(", ").append(json);
+  base::Value::List arguments;
+  if (!arg1.is_none()) {
+    arguments.Append(std::move(arg1));
+    if (!arg2.is_none()) {
+      arguments.Append(std::move(arg2));
+      if (!arg3.is_none()) {
+        arguments.Append(std::move(arg3));
       }
     }
   }
-  javascript.append(");");
-  GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
-      base::UTF8ToUTF16(javascript), base::NullCallback());
+
+  GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScriptMethod(
+      base::ASCIIToUTF16(object_name), base::ASCIIToUTF16(method_name),
+      std::move(arguments), std::move(cb));
 }
 
 gfx::Rect InspectableWebContents::GetDevToolsBounds() const {
@@ -601,7 +601,7 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
   if (!registry)
     return;
 
-  base::ListValue results;
+  base::Value::List results;
   for (auto& extension : registry->enabled_extensions()) {
     auto devtools_page_url =
         extensions::chrome_manifest_urls::GetDevToolsPage(extension.get());
@@ -615,17 +615,17 @@ void InspectableWebContents::AddDevToolsExtensionsToClient() {
         web_contents_->GetPrimaryMainFrame()->GetProcess()->GetID(),
         url::Origin::Create(extension->url()));
 
-    auto extension_info = std::make_unique<base::DictionaryValue>();
-    extension_info->SetString("startPage", devtools_page_url.spec());
-    extension_info->SetString("name", extension->name());
-    extension_info->SetBoolean(
-        "exposeExperimentalAPIs",
-        extension->permissions_data()->HasAPIPermission(
-            extensions::mojom::APIPermissionID::kExperimental));
-    results.Append(base::Value::FromUniquePtrValue(std::move(extension_info)));
+    base::Value::Dict extension_info;
+    extension_info.Set("startPage", devtools_page_url.spec());
+    extension_info.Set("name", extension->name());
+    extension_info.Set("exposeExperimentalAPIs",
+                       extension->permissions_data()->HasAPIPermission(
+                           extensions::mojom::APIPermissionID::kExperimental));
+    results.Append(base::Value(std::move(extension_info)));
   }
 
-  CallClientFunction("DevToolsAPI.addExtensions", &results, NULL, NULL);
+  CallClientFunction("DevToolsAPI", "addExtensions",
+                     base::Value(std::move(results)));
 }
 #endif
 
@@ -943,22 +943,21 @@ void InspectableWebContents::DispatchProtocolMessage(
 
   base::StringPiece str_message(reinterpret_cast<const char*>(message.data()),
                                 message.size());
-  if (str_message.size() < kMaxMessageChunkSize) {
-    std::string param;
-    base::EscapeJSONString(str_message, true, &param);
-    std::u16string javascript =
-        base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + param + ");");
-    GetDevToolsWebContents()->GetPrimaryMainFrame()->ExecuteJavaScript(
-        javascript, base::NullCallback());
-    return;
-  }
-
-  base::Value total_size(static_cast<int>(str_message.length()));
-  for (size_t pos = 0; pos < str_message.length();
-       pos += kMaxMessageChunkSize) {
-    base::Value message_value(str_message.substr(pos, kMaxMessageChunkSize));
-    CallClientFunction("DevToolsAPI.dispatchMessageChunk", &message_value,
-                       pos ? nullptr : &total_size, nullptr);
+  if (str_message.length() < kMaxMessageChunkSize) {
+    CallClientFunction("DevToolsAPI", "dispatchMessage",
+                       base::Value(std::string(str_message)));
+  } else {
+    size_t total_size = str_message.length();
+    for (size_t pos = 0; pos < str_message.length();
+         pos += kMaxMessageChunkSize) {
+      base::StringPiece str_message_chunk =
+          str_message.substr(pos, kMaxMessageChunkSize);
+
+      CallClientFunction(
+          "DevToolsAPI", "dispatchMessageChunk",
+          base::Value(std::string(str_message_chunk)),
+          base::Value(base::NumberToString(pos ? 0 : total_size)));
+    }
   }
 }
 
@@ -1070,8 +1069,13 @@ void InspectableWebContents::DidFinishNavigation(
 
 void InspectableWebContents::SendMessageAck(int request_id,
                                             const base::Value* arg) {
-  base::Value id_value(request_id);
-  CallClientFunction("DevToolsAPI.embedderMessageAck", &id_value, arg, nullptr);
+  if (arg) {
+    CallClientFunction("DevToolsAPI", "embedderMessageAck",
+                       base::Value(request_id), arg->Clone());
+  } else {
+    CallClientFunction("DevToolsAPI", "embedderMessageAck",
+                       base::Value(request_id));
+  }
 }
 
 }  // namespace electron
diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
index 905d7cb372512..68548d0c3c427 100644
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -70,10 +70,13 @@ class InspectableWebContents
   bool IsDevToolsViewShowing();
   void AttachTo(scoped_refptr<content::DevToolsAgentHost>);
   void Detach();
-  void CallClientFunction(const std::string& function_name,
-                          const base::Value* arg1,
-                          const base::Value* arg2,
-                          const base::Value* arg3);
+  void CallClientFunction(
+      const std::string& object_name,
+      const std::string& method_name,
+      const base::Value arg1 = {},
+      const base::Value arg2 = {},
+      const base::Value arg3 = {},
+      base::OnceCallback<void(base::Value)> cb = base::NullCallback());
   void InspectElement(int x, int y);
 
   // Return the last position and size of devtools window.

From 0d4e417594dd54a75534d67388082f034868969c Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 29 Jun 2022 10:09:48 -0700
Subject: [PATCH 550/811] chore: modernize ListValue usage in permission
 manager (#34662)

---
 shell/browser/electron_permission_manager.cc  | 52 ++++++++-----------
 shell/browser/electron_permission_manager.h   |  7 ++-
 shell/browser/hid/electron_hid_delegate.cc    |  6 +--
 .../browser/web_contents_permission_helper.cc | 44 ++++++++--------
 .../browser/web_contents_permission_helper.h  |  4 +-
 5 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index 248d5c71d1008..74c523b54a3e6 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -137,8 +137,7 @@ void ElectronPermissionManager::RequestPermission(
     bool user_gesture,
     StatusCallback response_callback) {
   RequestPermissionWithDetails(permission, render_frame_host, requesting_origin,
-                               user_gesture, nullptr,
-                               std::move(response_callback));
+                               user_gesture, {}, std::move(response_callback));
 }
 
 void ElectronPermissionManager::RequestPermissionWithDetails(
@@ -146,11 +145,11 @@ void ElectronPermissionManager::RequestPermissionWithDetails(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool user_gesture,
-    const base::DictionaryValue* details,
+    base::Value::Dict details,
     StatusCallback response_callback) {
   RequestPermissionsWithDetails(
       std::vector<blink::PermissionType>(1, permission), render_frame_host,
-      user_gesture, details,
+      user_gesture, std::move(details),
       base::BindOnce(PermissionRequestResponseCallbackWrapper,
                      std::move(response_callback)));
 }
@@ -162,14 +161,14 @@ void ElectronPermissionManager::RequestPermissions(
     bool user_gesture,
     StatusesCallback response_callback) {
   RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
-                                nullptr, std::move(response_callback));
+                                {}, std::move(response_callback));
 }
 
 void ElectronPermissionManager::RequestPermissionsWithDetails(
     const std::vector<blink::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
     bool user_gesture,
-    const base::DictionaryValue* details,
+    base::Value::Dict details,
     StatusesCallback response_callback) {
   if (permissions.empty()) {
     std::move(response_callback).Run({});
@@ -204,13 +203,11 @@ void ElectronPermissionManager::RequestPermissionsWithDetails(
     const auto callback =
         base::BindRepeating(&ElectronPermissionManager::OnPermissionResponse,
                             base::Unretained(this), request_id, i);
-    auto mutable_details =
-        details == nullptr ? base::DictionaryValue() : details->Clone();
-    mutable_details.SetStringKey(
-        "requestingUrl", render_frame_host->GetLastCommittedURL().spec());
-    mutable_details.SetBoolKey("isMainFrame",
-                               render_frame_host->GetParent() == nullptr);
-    request_handler_.Run(web_contents, permission, callback, mutable_details);
+    details.Set("requestingUrl",
+                render_frame_host->GetLastCommittedURL().spec());
+    details.Set("isMainFrame", render_frame_host->GetParent() == nullptr);
+    request_handler_.Run(web_contents, permission, callback,
+                         base::Value(std::move(details)));
   }
 }
 
@@ -241,17 +238,17 @@ void ElectronPermissionManager::RequestPermissionsFromCurrentDocument(
     base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)>
         callback) {
   RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
-                                nullptr, std::move(callback));
+                                {}, std::move(callback));
 }
 
 blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
     blink::PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
-  base::DictionaryValue details;
-  details.SetString("embeddingOrigin", embedding_origin.spec());
-  bool granted = CheckPermissionWithDetails(permission, nullptr,
-                                            requesting_origin, &details);
+  base::Value::Dict details;
+  details.Set("embeddingOrigin", embedding_origin.spec());
+  bool granted = CheckPermissionWithDetails(permission, {}, requesting_origin,
+                                            std::move(details));
   return granted ? blink::mojom::PermissionStatus::GRANTED
                  : blink::mojom::PermissionStatus::DENIED;
 }
@@ -273,7 +270,7 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
     blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-    const base::DictionaryValue* details) const {
+    base::Value::Dict details) const {
   if (check_handler_.is_null()) {
     return true;
   }
@@ -281,27 +278,24 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
       render_frame_host
           ? content::WebContents::FromRenderFrameHost(render_frame_host)
           : nullptr;
-  auto mutable_details =
-      details == nullptr ? base::DictionaryValue() : details->Clone();
   if (render_frame_host) {
-    mutable_details.SetStringKey(
-        "requestingUrl", render_frame_host->GetLastCommittedURL().spec());
+    details.Set("requestingUrl",
+                render_frame_host->GetLastCommittedURL().spec());
   }
-  mutable_details.SetBoolKey(
-      "isMainFrame",
-      render_frame_host && render_frame_host->GetParent() == nullptr);
+  details.Set("isMainFrame",
+              render_frame_host && render_frame_host->GetParent() == nullptr);
   switch (permission) {
     case blink::PermissionType::AUDIO_CAPTURE:
-      mutable_details.SetStringKey("mediaType", "audio");
+      details.Set("mediaType", "audio");
       break;
     case blink::PermissionType::VIDEO_CAPTURE:
-      mutable_details.SetStringKey("mediaType", "video");
+      details.Set("mediaType", "video");
       break;
     default:
       break;
   }
   return check_handler_.Run(web_contents, permission, requesting_origin,
-                            mutable_details);
+                            base::Value(std::move(details)));
 }
 
 bool ElectronPermissionManager::CheckDevicePermission(
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index aacbd18c650fa..bf98621105b56 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -15,7 +15,6 @@
 #include "shell/browser/electron_browser_context.h"
 
 namespace base {
-class DictionaryValue;
 class Value;
 }  // namespace base
 
@@ -67,7 +66,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
                                     content::RenderFrameHost* render_frame_host,
                                     const GURL& requesting_origin,
                                     bool user_gesture,
-                                    const base::DictionaryValue* details,
+                                    base::Value::Dict details,
                                     StatusCallback callback);
   void RequestPermissions(const std::vector<blink::PermissionType>& permissions,
                           content::RenderFrameHost* render_frame_host,
@@ -78,7 +77,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       const std::vector<blink::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
       bool user_gesture,
-      const base::DictionaryValue* details,
+      base::Value::Dict details,
       StatusesCallback callback);
 
   blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
@@ -88,7 +87,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
   bool CheckPermissionWithDetails(blink::PermissionType permission,
                                   content::RenderFrameHost* render_frame_host,
                                   const GURL& requesting_origin,
-                                  const base::DictionaryValue* details) const;
+                                  base::Value::Dict details) const;
 
   bool CheckDevicePermission(blink::PermissionType permission,
                              const url::Origin& origin,
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index 13b36dd75bb12..abdf7a53efeb1 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -61,14 +61,14 @@ std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
 bool ElectronHidDelegate::CanRequestDevicePermission(
     content::BrowserContext* browser_context,
     const url::Origin& origin) {
-  base::DictionaryValue details;
-  details.SetString("securityOrigin", origin.GetURL().spec());
+  base::Value::Dict details;
+  details.Set("securityOrigin", origin.GetURL().spec());
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       browser_context->GetPermissionControllerDelegate());
   return permission_manager->CheckPermissionWithDetails(
       static_cast<blink::PermissionType>(
           WebContentsPermissionHelper::PermissionType::HID),
-      nullptr, origin.GetURL(), &details);
+      nullptr, origin.GetURL(), std::move(details));
 }
 
 bool ElectronHidDelegate::HasDevicePermission(
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 7e4548e9bb783..1d9ab4683859b 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -64,25 +64,25 @@ void WebContentsPermissionHelper::RequestPermission(
     blink::PermissionType permission,
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
-    const base::DictionaryValue* details) {
+    base::Value::Dict details) {
   auto* rfh = web_contents_->GetPrimaryMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
   auto origin = web_contents_->GetLastCommittedURL();
   permission_manager->RequestPermissionWithDetails(
-      permission, rfh, origin, false, details,
+      permission, rfh, origin, false, std::move(details),
       base::BindOnce(&OnPermissionResponse, std::move(callback)));
 }
 
 bool WebContentsPermissionHelper::CheckPermission(
     blink::PermissionType permission,
-    const base::DictionaryValue* details) const {
+    base::Value::Dict details) const {
   auto* rfh = web_contents_->GetPrimaryMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
   auto origin = web_contents_->GetLastCommittedURL();
   return permission_manager->CheckPermissionWithDetails(permission, rfh, origin,
-                                                        details);
+                                                        std::move(details));
 }
 
 void WebContentsPermissionHelper::RequestFullscreenPermission(
@@ -98,23 +98,23 @@ void WebContentsPermissionHelper::RequestMediaAccessPermission(
   auto callback = base::BindOnce(&MediaAccessAllowed, request,
                                  std::move(response_callback));
 
-  base::DictionaryValue details;
-  auto media_types = std::make_unique<base::ListValue>();
+  base::Value::Dict details;
+  base::Value::List media_types;
   if (request.audio_type ==
       blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
-    media_types->Append("audio");
+    media_types.Append("audio");
   }
   if (request.video_type ==
       blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
-    media_types->Append("video");
+    media_types.Append("video");
   }
-  details.SetList("mediaTypes", std::move(media_types));
-  details.SetString("securityOrigin", request.security_origin.spec());
+  details.Set("mediaTypes", std::move(media_types));
+  details.Set("securityOrigin", request.security_origin.spec());
 
   // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
   // are presented as same type in content_converter.h.
   RequestPermission(blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
-                    false, &details);
+                    false, std::move(details));
 }
 
 void WebContentsPermissionHelper::RequestWebNotificationPermission(
@@ -138,30 +138,32 @@ void WebContentsPermissionHelper::RequestOpenExternalPermission(
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
     const GURL& url) {
-  base::DictionaryValue details;
-  details.SetString("externalURL", url.spec());
+  base::Value::Dict details;
+  details.Set("externalURL", url.spec());
   RequestPermission(
       static_cast<blink::PermissionType>(PermissionType::OPEN_EXTERNAL),
-      std::move(callback), user_gesture, &details);
+      std::move(callback), user_gesture, std::move(details));
 }
 
 bool WebContentsPermissionHelper::CheckMediaAccessPermission(
     const GURL& security_origin,
     blink::mojom::MediaStreamType type) const {
-  base::DictionaryValue details;
-  details.SetString("securityOrigin", security_origin.spec());
-  details.SetString("mediaType", MediaStreamTypeToString(type));
+  base::Value::Dict details;
+  details.Set("securityOrigin", security_origin.spec());
+  details.Set("mediaType", MediaStreamTypeToString(type));
   // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
   // are presented as same type in content_converter.h.
-  return CheckPermission(blink::PermissionType::AUDIO_CAPTURE, &details);
+  return CheckPermission(blink::PermissionType::AUDIO_CAPTURE,
+                         std::move(details));
 }
 
 bool WebContentsPermissionHelper::CheckSerialAccessPermission(
     const url::Origin& embedding_origin) const {
-  base::DictionaryValue details;
-  details.SetString("securityOrigin", embedding_origin.GetURL().spec());
+  base::Value::Dict details;
+  details.Set("securityOrigin", embedding_origin.GetURL().spec());
   return CheckPermission(
-      static_cast<blink::PermissionType>(PermissionType::SERIAL), &details);
+      static_cast<blink::PermissionType>(PermissionType::SERIAL),
+      std::move(details));
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index cfd4fc4600dcc..2f0012837ffd5 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -59,10 +59,10 @@ class WebContentsPermissionHelper
   void RequestPermission(blink::PermissionType permission,
                          base::OnceCallback<void(bool)> callback,
                          bool user_gesture = false,
-                         const base::DictionaryValue* details = nullptr);
+                         base::Value::Dict details = {});
 
   bool CheckPermission(blink::PermissionType permission,
-                       const base::DictionaryValue* details) const;
+                       base::Value::Dict details) const;
 
   // TODO(clavin): refactor to use the WebContents provided by the
   // WebContentsUserData base class instead of storing a duplicate ref

From 5d120359f6f6adf730455189d099b0a63a0e5cc9 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 29 Jun 2022 12:55:47 -0700
Subject: [PATCH 551/811] chore: used nested namespaces (#34737)

---
 build/fuses/build.py                             | 16 ++++------------
 build/js2c.py                                    |  8 ++------
 shell/browser/api/electron_api_app.cc            |  8 ++------
 shell/browser/api/electron_api_app_mac.mm        |  8 ++------
 shell/browser/api/electron_api_app_mas.mm        |  8 ++------
 shell/browser/api/electron_api_auto_updater.cc   |  8 ++------
 shell/browser/api/electron_api_auto_updater.h    |  8 ++------
 shell/browser/api/electron_api_base_window.cc    |  8 ++------
 shell/browser/api/electron_api_base_window.h     |  8 ++------
 shell/browser/api/electron_api_browser_view.cc   |  8 ++------
 shell/browser/api/electron_api_browser_view.h    |  8 ++------
 shell/browser/api/electron_api_browser_window.cc |  8 ++------
 shell/browser/api/electron_api_browser_window.h  |  8 ++------
 .../api/electron_api_browser_window_mac.mm       |  8 ++------
 .../api/electron_api_browser_window_views.cc     |  8 ++------
 shell/browser/api/electron_api_cookies.cc        |  8 ++------
 shell/browser/api/electron_api_crash_reporter.cc | 12 ++----------
 shell/browser/api/electron_api_crash_reporter.h  | 12 ++----------
 .../browser/api/electron_api_data_pipe_holder.cc |  8 ++------
 .../browser/api/electron_api_data_pipe_holder.h  |  8 ++------
 shell/browser/api/electron_api_debugger.cc       |  8 ++------
 shell/browser/api/electron_api_debugger.h        |  8 ++------
 .../browser/api/electron_api_desktop_capturer.cc |  8 ++------
 .../browser/api/electron_api_desktop_capturer.h  |  8 ++------
 shell/browser/api/electron_api_download_item.cc  |  8 ++------
 shell/browser/api/electron_api_download_item.h   |  8 ++------
 .../browser/api/electron_api_global_shortcut.cc  |  8 ++------
 shell/browser/api/electron_api_global_shortcut.h |  8 ++------
 .../browser/api/electron_api_in_app_purchase.cc  |  8 ++------
 shell/browser/api/electron_api_in_app_purchase.h |  8 ++------
 shell/browser/api/electron_api_menu.cc           |  8 ++------
 shell/browser/api/electron_api_menu.h            |  8 ++------
 shell/browser/api/electron_api_menu_mac.h        |  8 ++------
 shell/browser/api/electron_api_menu_mac.mm       |  8 ++------
 shell/browser/api/electron_api_menu_views.cc     |  8 ++------
 shell/browser/api/electron_api_menu_views.h      |  8 ++------
 shell/browser/api/electron_api_native_theme.cc   |  8 ++------
 shell/browser/api/electron_api_native_theme.h    |  8 ++------
 .../browser/api/electron_api_native_theme_mac.mm |  8 ++------
 shell/browser/api/electron_api_notification.cc   |  8 ++------
 shell/browser/api/electron_api_notification.h    |  8 ++------
 shell/browser/api/electron_api_power_monitor.cc  |  8 ++------
 shell/browser/api/electron_api_power_monitor.h   |  8 ++------
 .../api/electron_api_power_monitor_mac.mm        |  8 ++------
 .../api/electron_api_power_save_blocker.cc       |  8 ++------
 .../api/electron_api_power_save_blocker.h        |  8 ++------
 shell/browser/api/electron_api_printing.cc       |  8 ++------
 shell/browser/api/electron_api_protocol.cc       |  6 ++----
 shell/browser/api/electron_api_safe_storage.cc   |  8 ++------
 shell/browser/api/electron_api_safe_storage.h    |  8 ++------
 shell/browser/api/electron_api_screen.cc         |  8 ++------
 shell/browser/api/electron_api_screen.h          |  8 ++------
 .../api/electron_api_service_worker_context.cc   |  8 ++------
 shell/browser/api/electron_api_session.cc        |  8 ++------
 .../api/electron_api_system_preferences.cc       |  8 ++------
 .../api/electron_api_system_preferences.h        |  8 ++------
 .../api/electron_api_system_preferences_mac.mm   |  8 ++------
 shell/browser/api/electron_api_tray.cc           |  8 ++------
 shell/browser/api/electron_api_tray.h            |  8 ++------
 shell/browser/api/electron_api_url_loader.cc     |  8 ++------
 shell/browser/api/electron_api_url_loader.h      |  8 ++------
 shell/browser/api/electron_api_view.cc           |  8 ++------
 shell/browser/api/electron_api_view.h            |  8 ++------
 shell/browser/api/electron_api_web_contents.cc   |  8 ++------
 .../api/electron_api_web_contents_impl.cc        |  8 ++------
 .../browser/api/electron_api_web_contents_mac.mm |  8 ++------
 .../api/electron_api_web_contents_view.cc        |  8 ++------
 .../browser/api/electron_api_web_contents_view.h |  8 ++------
 shell/browser/api/electron_api_web_frame_main.cc |  8 ++------
 shell/browser/api/electron_api_web_frame_main.h  |  8 ++------
 shell/browser/api/electron_api_web_request.cc    |  8 ++------
 shell/browser/api/electron_api_web_request.h     |  8 ++------
 shell/browser/api/frame_subscriber.cc            |  8 ++------
 shell/browser/api/frame_subscriber.h             |  8 ++------
 shell/browser/api/save_page_handler.cc           |  8 ++------
 shell/browser/api/save_page_handler.h            |  8 ++------
 shell/browser/api/ui_event.cc                    |  6 ++----
 shell/browser/api/ui_event.h                     |  6 ++----
 .../browser/api/views/electron_api_image_view.cc |  8 ++------
 .../browser/api/views/electron_api_image_view.h  |  8 ++------
 shell/browser/event_emitter_mixin.cc             |  8 ++------
 .../cryptotoken_private_api.cc                   |  7 ++-----
 .../cryptotoken_private_api.h                    |  6 ++----
 ...on_browser_context_keyed_service_factories.cc |  6 ++----
 ...ron_browser_context_keyed_service_factories.h |  6 ++----
 shell/browser/relauncher_linux.cc                |  8 ++------
 shell/browser/relauncher_mac.cc                  |  8 ++------
 shell/browser/relauncher_win.cc                  |  8 ++------
 shell/browser/ui/gtk/app_indicator_icon.cc       |  8 ++------
 shell/browser/ui/gtk/app_indicator_icon.h        |  8 ++------
 shell/browser/ui/gtk/app_indicator_icon_menu.cc  |  8 ++------
 shell/browser/ui/gtk/app_indicator_icon_menu.h   |  8 ++------
 shell/browser/ui/gtk/gtk_status_icon.cc          |  8 ++------
 shell/browser/ui/gtk/gtk_status_icon.h           |  7 ++-----
 shell/browser/ui/gtk/menu_util.cc                |  8 ++------
 shell/browser/ui/gtk/menu_util.h                 |  8 ++------
 shell/browser/ui/gtk/status_icon.cc              |  8 ++------
 shell/browser/ui/gtk/status_icon.h               |  8 ++------
 shell/browser/win/dark_mode.cc                   |  8 ++------
 shell/browser/win/dark_mode.h                    |  8 ++------
 shell/common/api/electron_api_clipboard.cc       |  8 ++------
 shell/common/api/electron_api_clipboard.h        |  8 ++------
 shell/common/api/electron_api_clipboard_mac.mm   |  8 ++------
 shell/common/api/electron_api_key_weak_map.h     |  8 ++------
 shell/common/api/electron_api_native_image.cc    |  8 ++------
 shell/common/api/electron_api_native_image.h     |  8 ++------
 .../common/api/electron_api_native_image_mac.mm  |  8 ++------
 .../common/api/electron_api_native_image_win.cc  |  8 ++------
 shell/common/crash_keys.cc                       |  8 ++------
 shell/common/crash_keys.h                        |  8 ++------
 shell/common/gin_helper/event_emitter.cc         |  8 ++------
 shell/common/gin_helper/event_emitter_caller.cc  |  8 ++------
 shell/common/node_util.cc                        |  8 ++------
 shell/common/node_util.h                         |  8 ++------
 shell/common/platform_util_internal.h            |  6 ++----
 shell/common/skia_util.cc                        |  8 ++------
 shell/common/skia_util.h                         |  8 ++------
 .../renderer/api/context_bridge/object_cache.cc  | 12 ++----------
 shell/renderer/api/context_bridge/object_cache.h | 12 ++----------
 shell/renderer/api/electron_api_context_bridge.h |  8 ++------
 .../api/electron_api_spell_check_client.cc       |  8 ++------
 .../api/electron_api_spell_check_client.h        |  8 ++------
 122 files changed, 246 insertions(+), 738 deletions(-)

diff --git a/build/fuses/build.py b/build/fuses/build.py
index c82e6cfba02af..f5c9b89417a60 100755
--- a/build/fuses/build.py
+++ b/build/fuses/build.py
@@ -19,17 +19,13 @@
 #define FUSE_EXPORT __attribute__((visibility("default")))
 #endif
 
-namespace electron {
-
-namespace fuses {
+namespace electron::fuses {
 
 extern const volatile char kFuseWire[];
 
 {getters}
 
-}  // namespace fuses
-
-}  // namespace electron
+}  // namespace electron::fuses
 
 #endif  // ELECTRON_FUSES_H_
 """
@@ -37,17 +33,13 @@
 TEMPLATE_CC = """
 #include "electron/fuses.h"
 
-namespace electron {
-
-namespace fuses {
+namespace electron::fuses {
 
 const volatile char kFuseWire[] = { /* sentinel */ {sentinel}, /* fuse_version */ {fuse_version}, /* fuse_wire_length */ {fuse_wire_length}, /* fuse_wire */ {initial_config}};
 
 {getters}
 
-}
-
-}
+}  // namespace electron:fuses
 """
 
 with open(os.path.join(dir_path, "fuses.json5"), 'r') as f:
diff --git a/build/js2c.py b/build/js2c.py
index 7024e7391d5bf..4abcdabb58141 100755
--- a/build/js2c.py
+++ b/build/js2c.py
@@ -8,9 +8,7 @@
 #include "node_native_module.h"
 #include "node_internals.h"
 
-namespace node {{
-
-namespace native_module {{
+namespace node::native_module {{
 
 {definitions}
 
@@ -18,9 +16,7 @@
   {initializers}
 }}
 
-}}  // namespace native_module
-
-}}  // namespace node
+}}  // namespace node::native_module
 """
 
 def main():
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index e4fc3989f73fd..c3f9bf1ed827c 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -453,9 +453,7 @@ struct Converter<net::SecureDnsMode> {
 };
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo App::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -1822,9 +1820,7 @@ const char* App::GetTypeName() {
   return "App";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_app_mac.mm b/shell/browser/api/electron_api_app_mac.mm
index e9756836fb83f..3a42f85f6259e 100644
--- a/shell/browser/api/electron_api_app_mac.mm
+++ b/shell/browser/api/electron_api_app_mac.mm
@@ -13,9 +13,7 @@
 #import <Cocoa/Cocoa.h>
 #import <sys/sysctl.h>
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
                          absl::optional<base::FilePath> custom_path) {
@@ -82,6 +80,4 @@
   return proc_translated == 1;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_app_mas.mm b/shell/browser/api/electron_api_app_mas.mm
index 56f023d441021..9c924939f1bec 100644
--- a/shell/browser/api/electron_api_app_mas.mm
+++ b/shell/browser/api/electron_api_app_mas.mm
@@ -10,9 +10,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 // Callback passed to js which will stop accessing the given bookmark.
 void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
@@ -64,6 +62,4 @@ void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
                              bookmarkUrl);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_auto_updater.cc b/shell/browser/api/electron_api_auto_updater.cc
index c8f2c4fece090..c214b5c4c2c7d 100644
--- a/shell/browser/api/electron_api_auto_updater.cc
+++ b/shell/browser/api/electron_api_auto_updater.cc
@@ -16,9 +16,7 @@
 #include "shell/common/gin_helper/object_template_builder.h"
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo AutoUpdater::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -134,9 +132,7 @@ const char* AutoUpdater::GetTypeName() {
   return "AutoUpdater";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_auto_updater.h b/shell/browser/api/electron_api_auto_updater.h
index 6cbb7440cff5a..e31310a5d9473 100644
--- a/shell/browser/api/electron_api_auto_updater.h
+++ b/shell/browser/api/electron_api_auto_updater.h
@@ -13,9 +13,7 @@
 #include "shell/browser/event_emitter_mixin.h"
 #include "shell/browser/window_list_observer.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class AutoUpdater : public gin::Wrappable<AutoUpdater>,
                     public gin_helper::EventEmitterMixin<AutoUpdater>,
@@ -60,8 +58,6 @@ class AutoUpdater : public gin::Wrappable<AutoUpdater>,
   void QuitAndInstall();
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_AUTO_UPDATER_H_
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
index 3291cf5e7506f..3f4e529023b53 100644
--- a/shell/browser/api/electron_api_base_window.cc
+++ b/shell/browser/api/electron_api_base_window.cc
@@ -58,9 +58,7 @@ struct Converter<electron::TaskbarHost::ThumbarButton> {
 }  // namespace gin
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -1323,9 +1321,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
       .SetProperty("id", &BaseWindow::GetID);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
index 9dfc40f84bf22..98fa9a5556a86 100644
--- a/shell/browser/api/electron_api_base_window.h
+++ b/shell/browser/api/electron_api_base_window.h
@@ -19,9 +19,7 @@
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/trackable_object.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class View;
 
@@ -282,8 +280,6 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   base::WeakPtrFactory<BaseWindow> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_BASE_WINDOW_H_
diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc
index 18bbdea9c23ed..eb0ac8e908959 100644
--- a/shell/browser/api/electron_api_browser_view.cc
+++ b/shell/browser/api/electron_api_browser_view.cc
@@ -67,9 +67,7 @@ int32_t GetNextId() {
 
 }  // namespace
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo BrowserView::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -200,9 +198,7 @@ v8::Local<v8::ObjectTemplate> BrowserView::FillObjectTemplate(
       .Build();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_browser_view.h b/shell/browser/api/electron_api_browser_view.h
index f635b0d8de817..6caacf41c5c79 100644
--- a/shell/browser/api/electron_api_browser_view.h
+++ b/shell/browser/api/electron_api_browser_view.h
@@ -28,9 +28,7 @@ namespace gin_helper {
 class Dictionary;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class WebContents;
 
@@ -90,8 +88,6 @@ class BrowserView : public gin::Wrappable<BrowserView>,
   int32_t id_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_BROWSER_VIEW_H_
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
index 67cf2f213c1e3..3d1ec969123c8 100644
--- a/shell/browser/api/electron_api_browser_window.cc
+++ b/shell/browser/api/electron_api_browser_window.cc
@@ -33,9 +33,7 @@
 #include "shell/browser/ui/views/win_frame_view.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 BrowserWindow::BrowserWindow(gin::Arguments* args,
                              const gin_helper::Dictionary& options)
@@ -607,9 +605,7 @@ v8::Local<v8::Value> BrowserWindow::From(v8::Isolate* isolate,
     return v8::Null(isolate);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_browser_window.h b/shell/browser/api/electron_api_browser_window.h
index 00bdf694e8ff3..91195053495ba 100644
--- a/shell/browser/api/electron_api_browser_window.h
+++ b/shell/browser/api/electron_api_browser_window.h
@@ -14,9 +14,7 @@
 #include "shell/browser/ui/drag_util.h"
 #include "shell/common/gin_helper/error_thrower.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class BrowserWindow : public BaseWindow,
                       public content::RenderWidgetHost::InputEventObserver,
@@ -133,8 +131,6 @@ class BrowserWindow : public BaseWindow,
   base::WeakPtrFactory<BrowserWindow> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_BROWSER_WINDOW_H_
diff --git a/shell/browser/api/electron_api_browser_window_mac.mm b/shell/browser/api/electron_api_browser_window_mac.mm
index 759f85096f4fa..23d1fa35405a8 100644
--- a/shell/browser/api/electron_api_browser_window_mac.mm
+++ b/shell/browser/api/electron_api_browser_window_mac.mm
@@ -15,9 +15,7 @@
 #include "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h"
 #include "shell/browser/ui/inspectable_web_contents_view.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void BrowserWindow::OverrideNSWindowContentView(
     InspectableWebContentsView* view) {
@@ -102,6 +100,4 @@
   [[webView window] setMovableByWindowBackground:YES];
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_browser_window_views.cc b/shell/browser/api/electron_api_browser_window_views.cc
index 9fdbf039f3e0d..e5b37aaf5fd5b 100644
--- a/shell/browser/api/electron_api_browser_window_views.cc
+++ b/shell/browser/api/electron_api_browser_window_views.cc
@@ -8,9 +8,7 @@
 #include "shell/browser/native_window_views.h"
 #include "ui/aura/window.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void BrowserWindow::UpdateDraggableRegions(
     const std::vector<mojom::DraggableRegionPtr>& regions) {
@@ -36,6 +34,4 @@ void BrowserWindow::UpdateDraggableRegions(
       ->UpdateDraggableRegions(draggable_regions_);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_cookies.cc b/shell/browser/api/electron_api_cookies.cc
index 5afc6c711f223..7970f87474253 100644
--- a/shell/browser/api/electron_api_cookies.cc
+++ b/shell/browser/api/electron_api_cookies.cc
@@ -91,9 +91,7 @@ struct Converter<net::CookieChangeCause> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -397,6 +395,4 @@ const char* Cookies::GetTypeName() {
   return "Cookies";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_crash_reporter.cc b/shell/browser/api/electron_api_crash_reporter.cc
index 984c412bb6b71..76fd7ef64d4a4 100644
--- a/shell/browser/api/electron_api_crash_reporter.cc
+++ b/shell/browser/api/electron_api_crash_reporter.cc
@@ -64,11 +64,7 @@ bool g_crash_reporter_initialized = false;
 
 }  // namespace
 
-namespace electron {
-
-namespace api {
-
-namespace crash_reporter {
+namespace electron::api::crash_reporter {
 
 #if defined(MAS_BUILD)
 namespace {
@@ -196,11 +192,7 @@ void Start(const std::string& submit_url,
 #endif
 }
 
-}  // namespace crash_reporter
-
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api::crash_reporter
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_crash_reporter.h b/shell/browser/api/electron_api_crash_reporter.h
index 598c343c03c69..8b96b8e929496 100644
--- a/shell/browser/api/electron_api_crash_reporter.h
+++ b/shell/browser/api/electron_api_crash_reporter.h
@@ -9,11 +9,7 @@
 #include <string>
 #include "base/files/file_path.h"
 
-namespace electron {
-
-namespace api {
-
-namespace crash_reporter {
+namespace electron::api::crash_reporter {
 
 bool IsCrashReporterEnabled();
 
@@ -32,10 +28,6 @@ void Start(const std::string& submit_url,
            const std::map<std::string, std::string>& extra,
            bool is_node_process);
 
-}  // namespace crash_reporter
-
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api::crash_reporter
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_CRASH_REPORTER_H_
diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
index 895b6b12b2008..f33f1d9b85b99 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -18,9 +18,7 @@
 
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -181,6 +179,4 @@ gin::Handle<DataPipeHolder> DataPipeHolder::From(v8::Isolate* isolate,
   return gin::Handle<DataPipeHolder>();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_data_pipe_holder.h b/shell/browser/api/electron_api_data_pipe_holder.h
index 535440d26838a..17b9dd244abcb 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.h
+++ b/shell/browser/api/electron_api_data_pipe_holder.h
@@ -13,9 +13,7 @@
 #include "services/network/public/cpp/data_element.h"
 #include "services/network/public/mojom/data_pipe_getter.mojom.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 // Retains reference to the data pipe.
 class DataPipeHolder : public gin::Wrappable<DataPipeHolder> {
@@ -49,8 +47,6 @@ class DataPipeHolder : public gin::Wrappable<DataPipeHolder> {
   mojo::Remote<network::mojom::DataPipeGetter> data_pipe_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_DATA_PIPE_HOLDER_H_
diff --git a/shell/browser/api/electron_api_debugger.cc b/shell/browser/api/electron_api_debugger.cc
index 69c8ea7bcebfa..fcd44205d75e1 100644
--- a/shell/browser/api/electron_api_debugger.cc
+++ b/shell/browser/api/electron_api_debugger.cc
@@ -20,9 +20,7 @@
 
 using content::DevToolsAgentHost;
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Debugger::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -206,6 +204,4 @@ const char* Debugger::GetTypeName() {
   return "Debugger";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_debugger.h b/shell/browser/api/electron_api_debugger.h
index 204cd42365ebf..dc4f3b7eec427 100644
--- a/shell/browser/api/electron_api_debugger.h
+++ b/shell/browser/api/electron_api_debugger.h
@@ -22,9 +22,7 @@ class DevToolsAgentHost;
 class WebContents;
 }  // namespace content
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Debugger : public gin::Wrappable<Debugger>,
                  public gin_helper::EventEmitterMixin<Debugger>,
@@ -74,8 +72,6 @@ class Debugger : public gin::Wrappable<Debugger>,
   int previous_request_id_ = 0;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_DEBUGGER_H_
diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc
index bea6a03547e58..60a7b31b231ef 100644
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -59,9 +59,7 @@ struct Converter<electron::api::DesktopCapturer::Source> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo DesktopCapturer::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -217,9 +215,7 @@ const char* DesktopCapturer::GetTypeName() {
   return "DesktopCapturer";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_desktop_capturer.h b/shell/browser/api/electron_api_desktop_capturer.h
index 85b0eaa191195..0d16711d28bdc 100644
--- a/shell/browser/api/electron_api_desktop_capturer.h
+++ b/shell/browser/api/electron_api_desktop_capturer.h
@@ -15,9 +15,7 @@
 #include "gin/wrappable.h"
 #include "shell/common/gin_helper/pinnable.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
                         public gin_helper::Pinnable<DesktopCapturer>,
@@ -77,8 +75,6 @@ class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
   base::WeakPtrFactory<DesktopCapturer> weak_ptr_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_DESKTOP_CAPTURER_H_
diff --git a/shell/browser/api/electron_api_download_item.cc b/shell/browser/api/electron_api_download_item.cc
index 6943d8effcced..68a502a028844 100644
--- a/shell/browser/api/electron_api_download_item.cc
+++ b/shell/browser/api/electron_api_download_item.cc
@@ -48,9 +48,7 @@ struct Converter<download::DownloadItem::DownloadState> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -301,6 +299,4 @@ gin::Handle<DownloadItem> DownloadItem::FromOrCreate(
   return handle;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_download_item.h b/shell/browser/api/electron_api_download_item.h
index 4ca867baf52f7..85e314d9c6ad0 100644
--- a/shell/browser/api/electron_api_download_item.h
+++ b/shell/browser/api/electron_api_download_item.h
@@ -18,9 +18,7 @@
 
 class GURL;
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class DownloadItem : public gin::Wrappable<DownloadItem>,
                      public gin_helper::Pinnable<DownloadItem>,
@@ -87,8 +85,6 @@ class DownloadItem : public gin::Wrappable<DownloadItem>,
   base::WeakPtrFactory<DownloadItem> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_DOWNLOAD_ITEM_H_
diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc
index 28a2b8413479e..b78f67e06657a 100644
--- a/shell/browser/api/electron_api_global_shortcut.cc
+++ b/shell/browser/api/electron_api_global_shortcut.cc
@@ -51,9 +51,7 @@ bool MapHasMediaKeys(
 
 }  // namespace
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo GlobalShortcut::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -182,9 +180,7 @@ const char* GlobalShortcut::GetTypeName() {
   return "GlobalShortcut";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_global_shortcut.h b/shell/browser/api/electron_api_global_shortcut.h
index 19a86fe2963d1..4f843a487c510 100644
--- a/shell/browser/api/electron_api_global_shortcut.h
+++ b/shell/browser/api/electron_api_global_shortcut.h
@@ -14,9 +14,7 @@
 #include "gin/wrappable.h"
 #include "ui/base/accelerators/accelerator.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
                        public gin::Wrappable<GlobalShortcut> {
@@ -56,8 +54,6 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
   AcceleratorCallbackMap accelerator_callback_map_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_GLOBAL_SHORTCUT_H_
diff --git a/shell/browser/api/electron_api_in_app_purchase.cc b/shell/browser/api/electron_api_in_app_purchase.cc
index ef80526286c67..8162688bc8b30 100644
--- a/shell/browser/api/electron_api_in_app_purchase.cc
+++ b/shell/browser/api/electron_api_in_app_purchase.cc
@@ -135,9 +135,7 @@ struct Converter<in_app_purchase::Product> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo InAppPurchase::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -211,9 +209,7 @@ void InAppPurchase::OnTransactionsUpdated(
 }
 #endif
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_in_app_purchase.h b/shell/browser/api/electron_api_in_app_purchase.h
index bd765bb178789..4b646410545d3 100644
--- a/shell/browser/api/electron_api_in_app_purchase.h
+++ b/shell/browser/api/electron_api_in_app_purchase.h
@@ -16,9 +16,7 @@
 #include "shell/browser/mac/in_app_purchase_product.h"
 #include "v8/include/v8.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class InAppPurchase : public gin::Wrappable<InAppPurchase>,
                       public gin_helper::EventEmitterMixin<InAppPurchase>,
@@ -51,8 +49,6 @@ class InAppPurchase : public gin::Wrappable<InAppPurchase>,
       const std::vector<in_app_purchase::Transaction>& transactions) override;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_IN_APP_PURCHASE_H_
diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc
index ff18a7e76b98b..3bea4fcca49a8 100644
--- a/shell/browser/api/electron_api_menu.cc
+++ b/shell/browser/api/electron_api_menu.cc
@@ -44,9 +44,7 @@ struct Converter<SharingItem> {
 
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Menu::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -301,9 +299,7 @@ v8::Local<v8::ObjectTemplate> Menu::FillObjectTemplate(
       .Build();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_menu.h b/shell/browser/api/electron_api_menu.h
index 09756a1a773a0..eb2275b2656ea 100644
--- a/shell/browser/api/electron_api_menu.h
+++ b/shell/browser/api/electron_api_menu.h
@@ -16,9 +16,7 @@
 #include "shell/common/gin_helper/constructible.h"
 #include "shell/common/gin_helper/pinnable.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Menu : public gin::Wrappable<Menu>,
              public gin_helper::EventEmitterMixin<Menu>,
@@ -123,9 +121,7 @@ class Menu : public gin::Wrappable<Menu>,
   bool WorksWhenHiddenAt(int index) const;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace gin {
 
diff --git a/shell/browser/api/electron_api_menu_mac.h b/shell/browser/api/electron_api_menu_mac.h
index f47276ea8d848..074f850604d69 100644
--- a/shell/browser/api/electron_api_menu_mac.h
+++ b/shell/browser/api/electron_api_menu_mac.h
@@ -13,9 +13,7 @@
 
 using base::scoped_nsobject;
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class MenuMac : public Menu {
  protected:
@@ -50,8 +48,6 @@ class MenuMac : public Menu {
   base::WeakPtrFactory<MenuMac> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_MENU_MAC_H_
diff --git a/shell/browser/api/electron_api_menu_mac.mm b/shell/browser/api/electron_api_menu_mac.mm
index c61a02dca5d42..f0086d03fbbbb 100644
--- a/shell/browser/api/electron_api_menu_mac.mm
+++ b/shell/browser/api/electron_api_menu_mac.mm
@@ -42,9 +42,7 @@
 
 }  // namespace
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 MenuMac::MenuMac(gin::Arguments* args) : Menu(args) {}
 
@@ -262,6 +260,4 @@
   return handle;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_menu_views.cc b/shell/browser/api/electron_api_menu_views.cc
index 447a6fbb96a58..908ae1bc925c1 100644
--- a/shell/browser/api/electron_api_menu_views.cc
+++ b/shell/browser/api/electron_api_menu_views.cc
@@ -13,9 +13,7 @@
 
 using views::MenuRunner;
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 MenuViews::MenuViews(gin::Arguments* args) : Menu(args) {}
 
@@ -91,6 +89,4 @@ gin::Handle<Menu> Menu::New(gin::Arguments* args) {
   return handle;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_menu_views.h b/shell/browser/api/electron_api_menu_views.h
index a0d40f9354a06..a89f9420e7c5d 100644
--- a/shell/browser/api/electron_api_menu_views.h
+++ b/shell/browser/api/electron_api_menu_views.h
@@ -13,9 +13,7 @@
 #include "ui/display/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class MenuViews : public Menu {
  public:
@@ -39,8 +37,6 @@ class MenuViews : public Menu {
   base::WeakPtrFactory<MenuViews> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_MENU_VIEWS_H_
diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc
index 4577ee28a77c9..b56e7a1277e74 100644
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -16,9 +16,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo NativeTheme::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -117,9 +115,7 @@ const char* NativeTheme::GetTypeName() {
   return "NativeTheme";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_native_theme.h b/shell/browser/api/electron_api_native_theme.h
index 5f26ab74d6ba9..3983360c98b4e 100644
--- a/shell/browser/api/electron_api_native_theme.h
+++ b/shell/browser/api/electron_api_native_theme.h
@@ -11,9 +11,7 @@
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_observer.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class NativeTheme : public gin::Wrappable<NativeTheme>,
                     public gin_helper::EventEmitterMixin<NativeTheme>,
@@ -57,9 +55,7 @@ class NativeTheme : public gin::Wrappable<NativeTheme>,
   ui::NativeTheme* web_theme_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace gin {
 
diff --git a/shell/browser/api/electron_api_native_theme_mac.mm b/shell/browser/api/electron_api_native_theme_mac.mm
index 2dab1ea61ae0b..fefdf341e2910 100644
--- a/shell/browser/api/electron_api_native_theme_mac.mm
+++ b/shell/browser/api/electron_api_native_theme_mac.mm
@@ -7,9 +7,7 @@
 #include "base/mac/sdk_forward_declarations.h"
 #include "shell/browser/mac/electron_application.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void NativeTheme::UpdateMacOSAppearanceForOverrideValue(
     ui::NativeTheme::ThemeSource override) {
@@ -32,6 +30,4 @@
   }
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_notification.cc b/shell/browser/api/electron_api_notification.cc
index cdf77d0c41269..6f77147c4659e 100644
--- a/shell/browser/api/electron_api_notification.cc
+++ b/shell/browser/api/electron_api_notification.cc
@@ -45,9 +45,7 @@ struct Converter<electron::NotificationAction> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Notification::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -284,9 +282,7 @@ v8::Local<v8::ObjectTemplate> Notification::FillObjectTemplate(
       .Build();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_notification.h b/shell/browser/api/electron_api_notification.h
index 8213c424ee64d..bbc35a9a52d9d 100644
--- a/shell/browser/api/electron_api_notification.h
+++ b/shell/browser/api/electron_api_notification.h
@@ -25,9 +25,7 @@ template <typename T>
 class Handle;
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Notification : public gin::Wrappable<Notification>,
                      public gin_helper::EventEmitterMixin<Notification>,
@@ -117,8 +115,6 @@ class Notification : public gin::Wrappable<Notification>,
   base::WeakPtr<electron::Notification> notification_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_NOTIFICATION_H_
diff --git a/shell/browser/api/electron_api_power_monitor.cc b/shell/browser/api/electron_api_power_monitor.cc
index 258fc1464f999..2f7ee06584ece 100644
--- a/shell/browser/api/electron_api_power_monitor.cc
+++ b/shell/browser/api/electron_api_power_monitor.cc
@@ -35,9 +35,7 @@ struct Converter<ui::IdleState> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo PowerMonitor::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -116,9 +114,7 @@ const char* PowerMonitor::GetTypeName() {
   return "PowerMonitor";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_power_monitor.h b/shell/browser/api/electron_api_power_monitor.h
index 26ee40cc3ccd0..7aab65e7f78e9 100644
--- a/shell/browser/api/electron_api_power_monitor.h
+++ b/shell/browser/api/electron_api_power_monitor.h
@@ -15,9 +15,7 @@
 #include "shell/browser/lib/power_observer_linux.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class PowerMonitor : public gin::Wrappable<PowerMonitor>,
                      public gin_helper::EventEmitterMixin<PowerMonitor>,
@@ -86,8 +84,6 @@ class PowerMonitor : public gin::Wrappable<PowerMonitor>,
 #endif
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_POWER_MONITOR_H_
diff --git a/shell/browser/api/electron_api_power_monitor_mac.mm b/shell/browser/api/electron_api_power_monitor_mac.mm
index 90ec3118d17c2..f7ba52967b0ac 100644
--- a/shell/browser/api/electron_api_power_monitor_mac.mm
+++ b/shell/browser/api/electron_api_power_monitor_mac.mm
@@ -108,9 +108,7 @@ - (void)onUserDidResignActive:(NSNotification*)notification {
 
 @end
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 static MacLockMonitor* g_lock_monitor = nil;
 
@@ -120,6 +118,4 @@ - (void)onUserDidResignActive:(NSNotification*)notification {
   [g_lock_monitor addEmitter:this];
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_power_save_blocker.cc b/shell/browser/api/electron_api_power_save_blocker.cc
index 22126be69e78f..0994cba7b6ea9 100644
--- a/shell/browser/api/electron_api_power_save_blocker.cc
+++ b/shell/browser/api/electron_api_power_save_blocker.cc
@@ -37,9 +37,7 @@ struct Converter<device::mojom::WakeLockType> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo PowerSaveBlocker::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -126,9 +124,7 @@ gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
       .SetMethod("isStarted", &PowerSaveBlocker::IsStarted);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_power_save_blocker.h b/shell/browser/api/electron_api_power_save_blocker.h
index 74a08f55e4413..1e55e5299ec7a 100644
--- a/shell/browser/api/electron_api_power_save_blocker.h
+++ b/shell/browser/api/electron_api_power_save_blocker.h
@@ -13,9 +13,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/device/public/mojom/wake_lock.mojom.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
  public:
@@ -56,8 +54,6 @@ class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
   mojo::Remote<device::mojom::WakeLock> wake_lock_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_POWER_SAVE_BLOCKER_H_
diff --git a/shell/browser/api/electron_api_printing.cc b/shell/browser/api/electron_api_printing.cc
index a8f3a035ba9e0..fcb8f907fea47 100644
--- a/shell/browser/api/electron_api_printing.cc
+++ b/shell/browser/api/electron_api_printing.cc
@@ -38,9 +38,7 @@ struct Converter<printing::PrinterBasicInfo> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 #if BUILDFLAG(ENABLE_PRINTING)
 printing::PrinterList GetPrinterList(v8::Isolate* isolate) {
@@ -89,9 +87,7 @@ v8::Local<v8::Promise> GetPrinterListAsync(v8::Isolate* isolate) {
 }
 #endif
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_protocol.cc b/shell/browser/api/electron_api_protocol.cc
index cd396e9662749..fabb5ec7859b3 100644
--- a/shell/browser/api/electron_api_protocol.cc
+++ b/shell/browser/api/electron_api_protocol.cc
@@ -78,8 +78,7 @@ struct Converter<CustomScheme> {
 
 }  // namespace gin
 
-namespace electron {
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Protocol::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -312,8 +311,7 @@ const char* Protocol::GetTypeName() {
   return "Protocol";
 }
 
-}  // namespace api
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_safe_storage.cc b/shell/browser/api/electron_api_safe_storage.cc
index d0e3a73bcdb0d..d667590132ee0 100644
--- a/shell/browser/api/electron_api_safe_storage.cc
+++ b/shell/browser/api/electron_api_safe_storage.cc
@@ -15,9 +15,7 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/platform_util.h"
 
-namespace electron {
-
-namespace safestorage {
+namespace electron::safestorage {
 
 static const char* kEncryptionVersionPrefixV10 = "v10";
 static const char* kEncryptionVersionPrefixV11 = "v11";
@@ -119,9 +117,7 @@ std::string DecryptString(v8::Isolate* isolate, v8::Local<v8::Value> buffer) {
   return plaintext;
 }
 
-}  // namespace safestorage
-
-}  // namespace electron
+}  // namespace electron::safestorage
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
diff --git a/shell/browser/api/electron_api_safe_storage.h b/shell/browser/api/electron_api_safe_storage.h
index d312769a3f53d..1ecde80f8cee4 100644
--- a/shell/browser/api/electron_api_safe_storage.h
+++ b/shell/browser/api/electron_api_safe_storage.h
@@ -7,9 +7,7 @@
 
 #include "base/dcheck_is_on.h"
 
-namespace electron {
-
-namespace safestorage {
+namespace electron::safestorage {
 
 // Used in a DCHECK to validate that our assumption that the network context
 // manager has initialized before app ready holds true. Only used in the
@@ -18,8 +16,6 @@ namespace safestorage {
 void SetElectronCryptoReady(bool ready);
 #endif
 
-}  // namespace safestorage
-
-}  // namespace electron
+}  // namespace electron::safestorage
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SAFE_STORAGE_H_
diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc
index 990657662b0b7..53ae9f6b378d4 100644
--- a/shell/browser/api/electron_api_screen.cc
+++ b/shell/browser/api/electron_api_screen.cc
@@ -24,9 +24,7 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Screen::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -166,9 +164,7 @@ const char* Screen::GetTypeName() {
   return "Screen";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_screen.h b/shell/browser/api/electron_api_screen.h
index a8121b9ce54cc..67c8fa7226dbe 100644
--- a/shell/browser/api/electron_api_screen.h
+++ b/shell/browser/api/electron_api_screen.h
@@ -19,9 +19,7 @@ class Rect;
 class Screen;
 }  // namespace gfx
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Screen : public gin::Wrappable<Screen>,
                public gin_helper::EventEmitterMixin<Screen>,
@@ -58,8 +56,6 @@ class Screen : public gin::Wrappable<Screen>,
   display::Screen* screen_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SCREEN_H_
diff --git a/shell/browser/api/electron_api_service_worker_context.cc b/shell/browser/api/electron_api_service_worker_context.cc
index f148dc7a59de8..402f900d384e5 100644
--- a/shell/browser/api/electron_api_service_worker_context.cc
+++ b/shell/browser/api/electron_api_service_worker_context.cc
@@ -21,9 +21,7 @@
 #include "shell/common/gin_helper/function_template_extensions.h"
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -162,6 +160,4 @@ const char* ServiceWorkerContext::GetTypeName() {
   return "ServiceWorkerContext";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index 22bf54c8f14c6..3d2a13be44d68 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -242,9 +242,7 @@ struct Converter<network::mojom::SSLConfigPtr> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -1255,9 +1253,7 @@ const char* Session::GetTypeName() {
   return "Session";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc
index 58df58f502e9a..e09503e344389 100644
--- a/shell/browser/api/electron_api_system_preferences.cc
+++ b/shell/browser/api/electron_api_system_preferences.cc
@@ -13,9 +13,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo SystemPreferences::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -117,9 +115,7 @@ const char* SystemPreferences::GetTypeName() {
   return "SystemPreferences";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index 24096cd05cad2..b3ef33f5ff44a 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -21,9 +21,7 @@
 #include "ui/gfx/sys_color_change_listener.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 #if BUILDFLAG(IS_MAC)
 enum class NotificationCenterKind {
@@ -168,8 +166,6 @@ class SystemPreferences
 #endif
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_SYSTEM_PREFERENCES_H_
diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm
index 371bf33af94ae..d8ef89fa4d98e 100644
--- a/shell/browser/api/electron_api_system_preferences_mac.mm
+++ b/shell/browser/api/electron_api_system_preferences_mac.mm
@@ -86,9 +86,7 @@ static bool FromV8(v8::Isolate* isolate,
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -657,6 +655,4 @@ AVMediaType ParseMediaType(const std::string& media_type) {
   }
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc
index dc57b2cbfe293..18d7a055e7de7 100644
--- a/shell/browser/api/electron_api_tray.cc
+++ b/shell/browser/api/electron_api_tray.cc
@@ -56,9 +56,7 @@ struct Converter<electron::TrayIcon::IconType> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 gin::WrapperInfo Tray::kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -422,9 +420,7 @@ v8::Local<v8::ObjectTemplate> Tray::FillObjectTemplate(
       .Build();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_tray.h b/shell/browser/api/electron_api_tray.h
index 8c4870b11ad89..64cc856df74bf 100644
--- a/shell/browser/api/electron_api_tray.h
+++ b/shell/browser/api/electron_api_tray.h
@@ -29,9 +29,7 @@ namespace gin_helper {
 class Dictionary;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Menu;
 
@@ -113,8 +111,6 @@ class Tray : public gin::Wrappable<Tray>,
   std::unique_ptr<TrayIcon> tray_icon_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_TRAY_H_
diff --git a/shell/browser/api/electron_api_url_loader.cc b/shell/browser/api/electron_api_url_loader.cc
index 9f13f4d4b7f46..3a2d329738966 100644
--- a/shell/browser/api/electron_api_url_loader.cc
+++ b/shell/browser/api/electron_api_url_loader.cc
@@ -70,9 +70,7 @@ struct Converter<network::mojom::CredentialsMode> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -614,6 +612,4 @@ const char* SimpleURLLoaderWrapper::GetTypeName() {
   return "SimpleURLLoaderWrapper";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_url_loader.h b/shell/browser/api/electron_api_url_loader.h
index 9ab4d389418fc..adf8de0be458d 100644
--- a/shell/browser/api/electron_api_url_loader.h
+++ b/shell/browser/api/electron_api_url_loader.h
@@ -33,9 +33,7 @@ class SimpleURLLoader;
 struct ResourceRequest;
 }  // namespace network
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 /** Wraps a SimpleURLLoader to make it usable from JavaScript */
 class SimpleURLLoaderWrapper
@@ -123,8 +121,6 @@ class SimpleURLLoaderWrapper
   base::WeakPtrFactory<SimpleURLLoaderWrapper> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_URL_LOADER_H_
diff --git a/shell/browser/api/electron_api_view.cc b/shell/browser/api/electron_api_view.cc
index e8e172b508094..861871fda68a2 100644
--- a/shell/browser/api/electron_api_view.cc
+++ b/shell/browser/api/electron_api_view.cc
@@ -8,9 +8,7 @@
 #include "shell/common/gin_helper/object_template_builder.h"
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 View::View(views::View* view) : view_(view) {
   view_->set_owned_by_client();
@@ -55,9 +53,7 @@ void View::BuildPrototype(v8::Isolate* isolate,
 #endif
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_view.h b/shell/browser/api/electron_api_view.h
index ed2e483de0e25..4c9b6df348290 100644
--- a/shell/browser/api/electron_api_view.h
+++ b/shell/browser/api/electron_api_view.h
@@ -12,9 +12,7 @@
 #include "shell/common/gin_helper/wrappable.h"
 #include "ui/views/view.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class View : public gin_helper::Wrappable<View> {
  public:
@@ -49,8 +47,6 @@ class View : public gin_helper::Wrappable<View> {
   views::View* view_ = nullptr;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_VIEW_H_
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 0c31c8b8702c3..5be62a176ef88 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -372,9 +372,7 @@ struct Converter<scoped_refptr<content::DevToolsAgentHost>> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -4145,9 +4143,7 @@ WebContents* WebContents::FromID(int32_t id) {
 // static
 gin::WrapperInfo WebContents::kWrapperInfo = {gin::kEmbedderNativeGin};
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_web_contents_impl.cc b/shell/browser/api/electron_api_web_contents_impl.cc
index b7433097df435..0460480976b59 100644
--- a/shell/browser/api/electron_api_web_contents_impl.cc
+++ b/shell/browser/api/electron_api_web_contents_impl.cc
@@ -17,9 +17,7 @@
 // have to isolate the usage of WebContentsImpl into a clean file to fix it:
 // error C2371: 'ssize_t': redefinition; different basic types
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void WebContents::DetachFromOuterFrame() {
   // See detach_webview_frame.patch on how to detach.
@@ -55,6 +53,4 @@ OffScreenRenderWidgetHostView* WebContents::GetOffScreenRenderWidgetHostView()
 }
 #endif
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_web_contents_mac.mm b/shell/browser/api/electron_api_web_contents_mac.mm
index f9f1af380b974..f6aa567482b45 100644
--- a/shell/browser/api/electron_api_web_contents_mac.mm
+++ b/shell/browser/api/electron_api_web_contents_mac.mm
@@ -15,9 +15,7 @@ @interface NSWindow (EventDispatchingWindow)
 - (void)redispatchKeyEvent:(NSEvent*)event;
 @end
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 bool WebContents::IsFocused() const {
   auto* view = web_contents()->GetRenderWidgetHostView();
@@ -81,6 +79,4 @@ - (void)redispatchKeyEvent:(NSEvent*)event;
   return false;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_web_contents_view.cc b/shell/browser/api/electron_api_web_contents_view.cc
index 8e9e281cc8bb9..7b74cb238cd08 100644
--- a/shell/browser/api/electron_api_web_contents_view.cc
+++ b/shell/browser/api/electron_api_web_contents_view.cc
@@ -19,9 +19,7 @@
 #include "shell/browser/ui/cocoa/delayed_native_view_host.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 WebContentsView::WebContentsView(v8::Isolate* isolate,
                                  gin::Handle<WebContents> web_contents)
@@ -105,9 +103,7 @@ void WebContentsView::BuildPrototype(
       .SetProperty("webContents", &WebContentsView::GetWebContents);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_web_contents_view.h b/shell/browser/api/electron_api_web_contents_view.h
index d1f39ff26ef5d..057e31ec18b8d 100644
--- a/shell/browser/api/electron_api_web_contents_view.h
+++ b/shell/browser/api/electron_api_web_contents_view.h
@@ -12,9 +12,7 @@ namespace gin_helper {
 class Dictionary;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class WebContents;
 
@@ -53,8 +51,6 @@ class WebContentsView : public View, public content::WebContentsObserver {
   api::WebContents* api_web_contents_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_WEB_CONTENTS_VIEW_H_
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index 42bae87cf1c58..1c98ed6376461 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -52,9 +52,7 @@ struct Converter<blink::mojom::PageVisibilityState> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 typedef std::unordered_map<int, WebFrameMain*> WebFrameMainIdMap;
 
@@ -391,9 +389,7 @@ const char* WebFrameMain::GetTypeName() {
   return "WebFrameMain";
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/electron_api_web_frame_main.h b/shell/browser/api/electron_api_web_frame_main.h
index b45264db59627..eb6138351f330 100644
--- a/shell/browser/api/electron_api_web_frame_main.h
+++ b/shell/browser/api/electron_api_web_frame_main.h
@@ -28,9 +28,7 @@ namespace gin {
 class Arguments;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class WebContents;
 
@@ -131,8 +129,6 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
   base::WeakPtrFactory<WebFrameMain> weak_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_WEB_FRAME_MAIN_H_
diff --git a/shell/browser/api/electron_api_web_request.cc b/shell/browser/api/electron_api_web_request.cc
index a538901a1c91d..7189168db0268 100644
--- a/shell/browser/api/electron_api_web_request.cc
+++ b/shell/browser/api/electron_api_web_request.cc
@@ -81,9 +81,7 @@ struct Converter<extensions::WebRequestResourceType> {
 
 }  // namespace gin
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -551,6 +549,4 @@ gin::Handle<WebRequest> WebRequest::From(
   return gin::CreateHandle(isolate, user_data->data);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/electron_api_web_request.h b/shell/browser/api/electron_api_web_request.h
index fb8bee6a3c6ed..10575efafc2c3 100644
--- a/shell/browser/api/electron_api_web_request.h
+++ b/shell/browser/api/electron_api_web_request.h
@@ -19,9 +19,7 @@ namespace content {
 class BrowserContext;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class WebRequest : public gin::Wrappable<WebRequest>, public WebRequestAPI {
  public:
@@ -151,8 +149,6 @@ class WebRequest : public gin::Wrappable<WebRequest>, public WebRequestAPI {
   content::BrowserContext* browser_context_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_WEB_REQUEST_H_
diff --git a/shell/browser/api/frame_subscriber.cc b/shell/browser/api/frame_subscriber.cc
index 1718525f27abe..03dd6c9ecaa32 100644
--- a/shell/browser/api/frame_subscriber.cc
+++ b/shell/browser/api/frame_subscriber.cc
@@ -17,9 +17,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 constexpr static int kMaxFrameRate = 30;
 
@@ -180,6 +178,4 @@ gfx::Size FrameSubscriber::GetRenderViewSize() const {
       gfx::ScaleSize(gfx::SizeF(size), view->GetDeviceScaleFactor()));
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/frame_subscriber.h b/shell/browser/api/frame_subscriber.h
index 0a6a003927622..00b512251e9cd 100644
--- a/shell/browser/api/frame_subscriber.h
+++ b/shell/browser/api/frame_subscriber.h
@@ -22,9 +22,7 @@ class Image;
 class Rect;
 }  // namespace gfx
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class WebContents;
 
@@ -77,8 +75,6 @@ class FrameSubscriber : public content::WebContentsObserver,
   base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_{this};
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_FRAME_SUBSCRIBER_H_
diff --git a/shell/browser/api/save_page_handler.cc b/shell/browser/api/save_page_handler.cc
index 5d45341192773..e6c451e3288b7 100644
--- a/shell/browser/api/save_page_handler.cc
+++ b/shell/browser/api/save_page_handler.cc
@@ -11,9 +11,7 @@
 #include "content/public/browser/web_contents.h"
 #include "shell/browser/electron_browser_context.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 SavePageHandler::SavePageHandler(content::WebContents* web_contents,
                                  gin_helper::Promise<void> promise)
@@ -65,6 +63,4 @@ void SavePageHandler::Destroy(download::DownloadItem* item) {
   delete this;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/save_page_handler.h b/shell/browser/api/save_page_handler.h
index 00202a0d5a3f8..d7468ed1a6ded 100644
--- a/shell/browser/api/save_page_handler.h
+++ b/shell/browser/api/save_page_handler.h
@@ -19,9 +19,7 @@ namespace content {
 class WebContents;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 // A self-destroyed class for handling save page request.
 class SavePageHandler : public content::DownloadManager::Observer,
@@ -48,8 +46,6 @@ class SavePageHandler : public content::DownloadManager::Observer,
   gin_helper::Promise<void> promise_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_SAVE_PAGE_HANDLER_H_
diff --git a/shell/browser/api/ui_event.cc b/shell/browser/api/ui_event.cc
index 5721db147010e..bb39b32657faf 100644
--- a/shell/browser/api/ui_event.cc
+++ b/shell/browser/api/ui_event.cc
@@ -9,8 +9,7 @@
 #include "ui/events/event_constants.h"
 #include "v8/include/v8.h"
 
-namespace electron {
-namespace api {
+namespace electron::api {
 
 constexpr int mouse_button_flags =
     (ui::EF_RIGHT_MOUSE_BUTTON | ui::EF_LEFT_MOUSE_BUTTON |
@@ -29,5 +28,4 @@ v8::Local<v8::Object> CreateEventFromFlags(int flags) {
       .Build();
 }
 
-}  // namespace api
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/browser/api/ui_event.h b/shell/browser/api/ui_event.h
index 0f0ca1eb8397c..11c8fb1a6b210 100644
--- a/shell/browser/api/ui_event.h
+++ b/shell/browser/api/ui_event.h
@@ -11,12 +11,10 @@ template <typename T>
 class Local;
 }  // namespace v8
 
-namespace electron {
-namespace api {
+namespace electron::api {
 
 v8::Local<v8::Object> CreateEventFromFlags(int flags);
 
-}  // namespace api
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_UI_EVENT_H_
diff --git a/shell/browser/api/views/electron_api_image_view.cc b/shell/browser/api/views/electron_api_image_view.cc
index 3e26fa70d17cf..1841f2007cbd4 100644
--- a/shell/browser/api/views/electron_api_image_view.cc
+++ b/shell/browser/api/views/electron_api_image_view.cc
@@ -10,9 +10,7 @@
 #include "shell/common/gin_helper/object_template_builder.h"
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 ImageView::ImageView() : View(new views::ImageView()) {
   view()->set_owned_by_client();
@@ -40,9 +38,7 @@ void ImageView::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("setImage", &ImageView::SetImage);
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/browser/api/views/electron_api_image_view.h b/shell/browser/api/views/electron_api_image_view.h
index 332caa21b23b5..58c3c2f28e55e 100644
--- a/shell/browser/api/views/electron_api_image_view.h
+++ b/shell/browser/api/views/electron_api_image_view.h
@@ -10,9 +10,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class ImageView : public View {
  public:
@@ -32,8 +30,6 @@ class ImageView : public View {
   }
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_BROWSER_API_VIEWS_ELECTRON_API_IMAGE_VIEW_H_
diff --git a/shell/browser/event_emitter_mixin.cc b/shell/browser/event_emitter_mixin.cc
index f13201c64a171..43e052a7715c8 100644
--- a/shell/browser/event_emitter_mixin.cc
+++ b/shell/browser/event_emitter_mixin.cc
@@ -7,9 +7,7 @@
 #include "gin/public/wrapper_info.h"
 #include "shell/browser/api/electron_api_event_emitter.h"
 
-namespace gin_helper {
-
-namespace internal {
+namespace gin_helper::internal {
 
 gin::WrapperInfo kWrapperInfo = {gin::kEmbedderNativeGin};
 
@@ -40,6 +38,4 @@ v8::Local<v8::FunctionTemplate> GetEventEmitterTemplate(v8::Isolate* isolate) {
   return tmpl;
 }
 
-}  // namespace internal
-
-}  // namespace gin_helper
+}  // namespace gin_helper::internal
diff --git a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
index adab99632f5c8..b25e082a93d60 100644
--- a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -39,9 +39,7 @@
 #include "device/fido/win/webauthn_api.h"
 #endif  // BUILDFLAG(IS_WIN)
 
-namespace extensions {
-
-namespace api {
+namespace extensions::api {
 
 namespace {
 
@@ -307,5 +305,4 @@ CryptotokenPrivateRecordSignRequestFunction::Run() {
   return RespondNow(NoArguments());
 }
 
-}  // namespace api
-}  // namespace extensions
+}  // namespace extensions::api
diff --git a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h
index 4b4dd509e137f..bbfe79338a6c8 100644
--- a/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h
+++ b/shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h
@@ -14,8 +14,7 @@ class PrefRegistrySyncable;
 
 // Implementations for chrome.cryptotokenPrivate API functions.
 
-namespace extensions {
-namespace api {
+namespace extensions::api {
 
 // void CryptotokenRegisterProfilePrefs(
 //     user_prefs::PrefRegistrySyncable* registry);
@@ -80,7 +79,6 @@ class CryptotokenPrivateRecordSignRequestFunction : public ExtensionFunction {
   ResponseAction Run() override;
 };
 
-}  // namespace api
-}  // namespace extensions
+}  // namespace extensions::api
 
 #endif  // ELECTRON_SHELL_BROWSER_EXTENSIONS_API_CRYPTOTOKEN_PRIVATE_CRYPTOTOKEN_PRIVATE_API_H_
diff --git a/shell/browser/extensions/electron_browser_context_keyed_service_factories.cc b/shell/browser/extensions/electron_browser_context_keyed_service_factories.cc
index 5b6213f260b40..7fcede792439a 100644
--- a/shell/browser/extensions/electron_browser_context_keyed_service_factories.cc
+++ b/shell/browser/extensions/electron_browser_context_keyed_service_factories.cc
@@ -7,8 +7,7 @@
 #include "extensions/browser/updater/update_service_factory.h"
 #include "shell/browser/extensions/electron_extension_system_factory.h"
 
-namespace extensions {
-namespace electron {
+namespace extensions::electron {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   // TODO(rockot): Remove this once UpdateService is supported across all
@@ -18,5 +17,4 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   ElectronExtensionSystemFactory::GetInstance();
 }
 
-}  // namespace electron
-}  // namespace extensions
+}  // namespace extensions::electron
diff --git a/shell/browser/extensions/electron_browser_context_keyed_service_factories.h b/shell/browser/extensions/electron_browser_context_keyed_service_factories.h
index 7e9707d9cac33..b173755a9c5db 100644
--- a/shell/browser/extensions/electron_browser_context_keyed_service_factories.h
+++ b/shell/browser/extensions/electron_browser_context_keyed_service_factories.h
@@ -5,14 +5,12 @@
 #ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
 #define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
 
-namespace extensions {
-namespace electron {
+namespace extensions::electron {
 
 // Ensures the existence of any BrowserContextKeyedServiceFactory provided by
 // the core extensions code.
 void EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
-}  // namespace electron
-}  // namespace extensions
+}  // namespace extensions::electron
 
 #endif  // ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
diff --git a/shell/browser/relauncher_linux.cc b/shell/browser/relauncher_linux.cc
index a776309117369..9268775768d34 100644
--- a/shell/browser/relauncher_linux.cc
+++ b/shell/browser/relauncher_linux.cc
@@ -15,9 +15,7 @@
 #include "base/process/launch.h"
 #include "base/synchronization/waitable_event.h"
 
-namespace relauncher {
-
-namespace internal {
+namespace relauncher::internal {
 
 // this is global to be visible to the sa_handler
 base::WaitableEvent parentWaiter;
@@ -68,6 +66,4 @@ int LaunchProgram(const StringVector& relauncher_args,
   return process.IsValid() ? 0 : 1;
 }
 
-}  // namespace internal
-
-}  // namespace relauncher
+}  // namespace relauncher::internal
diff --git a/shell/browser/relauncher_mac.cc b/shell/browser/relauncher_mac.cc
index 38294618d85f5..c46cec6aa5cde 100644
--- a/shell/browser/relauncher_mac.cc
+++ b/shell/browser/relauncher_mac.cc
@@ -16,9 +16,7 @@
 #include "base/process/launch.h"
 #include "base/strings/sys_string_conversions.h"
 
-namespace relauncher {
-
-namespace internal {
+namespace relauncher::internal {
 
 void RelauncherSynchronizeWithParent() {
   base::ScopedFD relauncher_sync_fd(kRelauncherSyncFD);
@@ -91,6 +89,4 @@ int LaunchProgram(const StringVector& relauncher_args,
   return process.IsValid() ? 0 : 1;
 }
 
-}  // namespace internal
-
-}  // namespace relauncher
+}  // namespace relauncher::internal
diff --git a/shell/browser/relauncher_win.cc b/shell/browser/relauncher_win.cc
index 0a3a254ec1195..c732e9f287cb2 100644
--- a/shell/browser/relauncher_win.cc
+++ b/shell/browser/relauncher_win.cc
@@ -14,9 +14,7 @@
 #include "sandbox/win/src/win_utils.h"
 #include "ui/base/win/shell.h"
 
-namespace relauncher {
-
-namespace internal {
+namespace relauncher::internal {
 
 namespace {
 
@@ -125,6 +123,4 @@ int LaunchProgram(const StringVector& relauncher_args,
   return process.IsValid() ? 0 : 1;
 }
 
-}  // namespace internal
-
-}  // namespace relauncher
+}  // namespace relauncher::internal
diff --git a/shell/browser/ui/gtk/app_indicator_icon.cc b/shell/browser/ui/gtk/app_indicator_icon.cc
index 4d45bbda91b79..602f2bf94ee72 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.cc
+++ b/shell/browser/ui/gtk/app_indicator_icon.cc
@@ -152,9 +152,7 @@ void DeleteTempDirectory(const base::FilePath& dir_path) {
 
 }  // namespace
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 AppIndicatorIcon::AppIndicatorIcon(std::string id,
                                    const gfx::ImageSkia& image,
@@ -375,6 +373,4 @@ void AppIndicatorIcon::OnClickActionReplacementMenuItemActivated() {
     delegate()->OnClick();
 }
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
diff --git a/shell/browser/ui/gtk/app_indicator_icon.h b/shell/browser/ui/gtk/app_indicator_icon.h
index 0e50b89148a3f..ab0f4d5634156 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.h
+++ b/shell/browser/ui/gtk/app_indicator_icon.h
@@ -28,9 +28,7 @@ namespace ui {
 class MenuModel;
 }
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 class AppIndicatorIconMenu;
 
@@ -111,8 +109,6 @@ class AppIndicatorIcon : public views::StatusIconLinux {
   base::WeakPtrFactory<AppIndicatorIcon> weak_factory_{this};
 };
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_GTK_APP_INDICATOR_ICON_H_
diff --git a/shell/browser/ui/gtk/app_indicator_icon_menu.cc b/shell/browser/ui/gtk/app_indicator_icon_menu.cc
index ea7c0f552f282..1d2cd04428e7e 100644
--- a/shell/browser/ui/gtk/app_indicator_icon_menu.cc
+++ b/shell/browser/ui/gtk/app_indicator_icon_menu.cc
@@ -11,9 +11,7 @@
 #include "shell/browser/ui/gtk/menu_util.h"
 #include "ui/base/models/menu_model.h"
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 AppIndicatorIconMenu::AppIndicatorIconMenu(ui::MenuModel* model)
     : menu_model_(model) {
@@ -115,6 +113,4 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
     ExecuteCommand(model, id);
 }
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
diff --git a/shell/browser/ui/gtk/app_indicator_icon_menu.h b/shell/browser/ui/gtk/app_indicator_icon_menu.h
index e4987eb69df30..cafcb3c601de1 100644
--- a/shell/browser/ui/gtk/app_indicator_icon_menu.h
+++ b/shell/browser/ui/gtk/app_indicator_icon_menu.h
@@ -15,9 +15,7 @@ namespace ui {
 class MenuModel;
 }
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 // The app indicator icon's menu.
 class AppIndicatorIconMenu {
@@ -70,8 +68,6 @@ class AppIndicatorIconMenu {
   bool block_activation_ = false;
 };
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_GTK_APP_INDICATOR_ICON_MENU_H_
diff --git a/shell/browser/ui/gtk/gtk_status_icon.cc b/shell/browser/ui/gtk/gtk_status_icon.cc
index ecad7d470c5e4..69843f30b8ac3 100644
--- a/shell/browser/ui/gtk/gtk_status_icon.cc
+++ b/shell/browser/ui/gtk/gtk_status_icon.cc
@@ -15,9 +15,7 @@
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 GtkStatusIcon::GtkStatusIcon(const gfx::ImageSkia& image,
                              const std::u16string& tool_tip) {
@@ -81,6 +79,4 @@ void GtkStatusIcon::OnContextMenuRequested(GtkStatusIcon* status_icon,
   }
 }
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
diff --git a/shell/browser/ui/gtk/gtk_status_icon.h b/shell/browser/ui/gtk/gtk_status_icon.h
index b8b67259c671a..22b0788026a13 100644
--- a/shell/browser/ui/gtk/gtk_status_icon.h
+++ b/shell/browser/ui/gtk/gtk_status_icon.h
@@ -21,9 +21,8 @@ namespace ui {
 class MenuModel;
 }
 
-namespace electron {
+namespace electron::gtkui {
 
-namespace gtkui {
 class AppIndicatorIconMenu;
 
 // Status icon implementation which uses the system tray X11 spec (via
@@ -58,8 +57,6 @@ class GtkStatusIcon : public views::StatusIconLinux {
   std::unique_ptr<AppIndicatorIconMenu> menu_;
 };
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_GTK_GTK_STATUS_ICON_H_
diff --git a/shell/browser/ui/gtk/menu_util.cc b/shell/browser/ui/gtk/menu_util.cc
index fb1c0e63e91ac..964099d690735 100644
--- a/shell/browser/ui/gtk/menu_util.cc
+++ b/shell/browser/ui/gtk/menu_util.cc
@@ -30,9 +30,7 @@
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 namespace {
 
@@ -330,6 +328,4 @@ void SetMenuItemInfo(GtkWidget* widget, void* block_activation_ptr) {
   }
 }
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
diff --git a/shell/browser/ui/gtk/menu_util.h b/shell/browser/ui/gtk/menu_util.h
index 6d46c49b3f7da..ee4042eea4534 100644
--- a/shell/browser/ui/gtk/menu_util.h
+++ b/shell/browser/ui/gtk/menu_util.h
@@ -15,9 +15,7 @@ namespace ui {
 class MenuModel;
 }
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 // Builds GtkImageMenuItems.
 GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image);
@@ -56,8 +54,6 @@ void BuildSubmenuFromModel(ui::MenuModel* model,
 // Sets the check mark, enabled/disabled state and dynamic labels on menu items.
 void SetMenuItemInfo(GtkWidget* widget, void* block_activation_ptr);
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_GTK_MENU_UTIL_H_
diff --git a/shell/browser/ui/gtk/status_icon.cc b/shell/browser/ui/gtk/status_icon.cc
index 975f2a2ef89a6..72eeeb81716a7 100644
--- a/shell/browser/ui/gtk/status_icon.cc
+++ b/shell/browser/ui/gtk/status_icon.cc
@@ -16,9 +16,7 @@
 #include "shell/browser/ui/gtk/app_indicator_icon.h"
 #include "shell/browser/ui/gtk/gtk_status_icon.h"
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 namespace {
 
@@ -55,6 +53,4 @@ std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
 #endif
 }
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
diff --git a/shell/browser/ui/gtk/status_icon.h b/shell/browser/ui/gtk/status_icon.h
index 10e17f2781f09..43203d2c780b7 100644
--- a/shell/browser/ui/gtk/status_icon.h
+++ b/shell/browser/ui/gtk/status_icon.h
@@ -15,9 +15,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/linux_ui/status_icon_linux.h"
 
-namespace electron {
-
-namespace gtkui {
+namespace electron::gtkui {
 
 bool IsStatusIconSupported();
 std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
@@ -25,8 +23,6 @@ std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
     const std::u16string& tool_tip,
     const char* id_prefix);
 
-}  // namespace gtkui
-
-}  // namespace electron
+}  // namespace electron::gtkui
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_GTK_STATUS_ICON_H_
diff --git a/shell/browser/win/dark_mode.cc b/shell/browser/win/dark_mode.cc
index 200ba8c1f13a5..559c572ddac62 100644
--- a/shell/browser/win/dark_mode.cc
+++ b/shell/browser/win/dark_mode.cc
@@ -40,9 +40,7 @@ HRESULT TrySetWindowTheme(HWND hWnd, bool dark) {
 
 }  // namespace
 
-namespace electron {
-
-namespace win {
+namespace electron::win {
 
 bool IsDarkModeSupported() {
   auto* os_info = base::win::OSInfo::GetInstance();
@@ -59,6 +57,4 @@ void SetDarkModeForWindow(HWND hWnd) {
   TrySetWindowTheme(hWnd, dark);
 }
 
-}  // namespace win
-
-}  // namespace electron
+}  // namespace electron::win
diff --git a/shell/browser/win/dark_mode.h b/shell/browser/win/dark_mode.h
index 12f6adb1dade9..8bd34a39e01fa 100644
--- a/shell/browser/win/dark_mode.h
+++ b/shell/browser/win/dark_mode.h
@@ -15,15 +15,11 @@
 
 #include "ui/native_theme/native_theme.h"
 
-namespace electron {
-
-namespace win {
+namespace electron::win {
 
 bool IsDarkModeSupported();
 void SetDarkModeForWindow(HWND hWnd);
 
-}  // namespace win
-
-}  // namespace electron
+}  // namespace electron::win
 
 #endif  // ELECTRON_SHELL_BROWSER_WIN_DARK_MODE_H_
diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc
index a130d0eb39a43..b7370b949378a 100644
--- a/shell/common/api/electron_api_clipboard.cc
+++ b/shell/common/api/electron_api_clipboard.cc
@@ -17,9 +17,7 @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/gfx/codec/png_codec.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 ui::ClipboardBuffer Clipboard::GetClipboardBuffer(gin_helper::Arguments* args) {
   std::string type;
@@ -260,9 +258,7 @@ void Clipboard::Clear(gin_helper::Arguments* args) {
   ui::Clipboard::GetForCurrentThread()->Clear(GetClipboardBuffer(args));
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/common/api/electron_api_clipboard.h b/shell/common/api/electron_api_clipboard.h
index 158e33bb3bab8..b0fa62c3b6470 100644
--- a/shell/common/api/electron_api_clipboard.h
+++ b/shell/common/api/electron_api_clipboard.h
@@ -17,9 +17,7 @@ class Arguments;
 class Dictionary;
 }  // namespace gin_helper
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class Clipboard {
  public:
@@ -67,8 +65,6 @@ class Clipboard {
                           gin_helper::Arguments* args);
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_COMMON_API_ELECTRON_API_CLIPBOARD_H_
diff --git a/shell/common/api/electron_api_clipboard_mac.mm b/shell/common/api/electron_api_clipboard_mac.mm
index 7f101c259bd26..5303b89af6ca7 100644
--- a/shell/common/api/electron_api_clipboard_mac.mm
+++ b/shell/common/api/electron_api_clipboard_mac.mm
@@ -6,9 +6,7 @@
 #include "shell/common/api/electron_api_clipboard.h"
 #include "ui/base/cocoa/find_pasteboard.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void Clipboard::WriteFindText(const std::u16string& text) {
   NSString* text_ns = base::SysUTF16ToNSString(text);
@@ -19,6 +17,4 @@
   return GetFindPboardText();
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/common/api/electron_api_key_weak_map.h b/shell/common/api/electron_api_key_weak_map.h
index f26fa29297ad8..2b9d1e92d5883 100644
--- a/shell/common/api/electron_api_key_weak_map.h
+++ b/shell/common/api/electron_api_key_weak_map.h
@@ -11,9 +11,7 @@
 #include "shell/common/gin_helper/wrappable.h"
 #include "shell/common/key_weak_map.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 template <typename K>
 class KeyWeakMap : public gin_helper::Wrappable<KeyWeakMap<K>> {
@@ -59,8 +57,6 @@ class KeyWeakMap : public gin_helper::Wrappable<KeyWeakMap<K>> {
   electron::KeyWeakMap<K> key_weak_map_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_COMMON_API_ELECTRON_API_KEY_WEAK_MAP_H_
diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index 2a2e598f93632..060c7022fc3cd 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -48,9 +48,7 @@
 #include "ui/gfx/icon_util.h"
 #endif
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -613,9 +611,7 @@ const char* NativeImage::GetTypeName() {
 // static
 gin::WrapperInfo NativeImage::kWrapperInfo = {gin::kEmbedderNativeGin};
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 namespace {
 
diff --git a/shell/common/api/electron_api_native_image.h b/shell/common/api/electron_api_native_image.h
index 9c417fa6d200c..16c4f8ec0fbd7 100644
--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -40,9 +40,7 @@ namespace gin {
 class Arguments;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class NativeImage : public gin::Wrappable<NativeImage> {
  public:
@@ -140,8 +138,6 @@ class NativeImage : public gin::Wrappable<NativeImage> {
   int32_t memory_usage_ = 0;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_COMMON_API_ELECTRON_API_NATIVE_IMAGE_H_
diff --git a/shell/common/api/electron_api_native_image_mac.mm b/shell/common/api/electron_api_native_image_mac.mm
index 12cbad9f3e3b3..a6ba907a0992a 100644
--- a/shell/common/api/electron_api_native_image_mac.mm
+++ b/shell/common/api/electron_api_native_image_mac.mm
@@ -23,9 +23,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 NSData* bufferFromNSImage(NSImage* image) {
   CGImageRef ref = [image CGImageForProposedRect:nil context:nil hints:nil];
@@ -183,6 +181,4 @@
   return [image_.AsNSImage() isTemplate];
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/common/api/electron_api_native_image_win.cc b/shell/common/api/electron_api_native_image_win.cc
index 3b971bee56d20..1cc998d3de53d 100644
--- a/shell/common/api/electron_api_native_image_win.cc
+++ b/shell/common/api/electron_api_native_image_win.cc
@@ -17,9 +17,7 @@
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_skia.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 // static
 v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
@@ -102,6 +100,4 @@ v8::Local<v8::Promise> NativeImage::CreateThumbnailFromPath(
   return handle;
 }
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/common/crash_keys.cc b/shell/common/crash_keys.cc
index 16e11125b21e5..d084adc257814 100644
--- a/shell/common/crash_keys.cc
+++ b/shell/common/crash_keys.cc
@@ -23,9 +23,7 @@
 #include "shell/common/process_util.h"
 #include "third_party/crashpad/crashpad/client/annotation.h"
 
-namespace electron {
-
-namespace crash_keys {
+namespace electron::crash_keys {
 
 namespace {
 
@@ -167,6 +165,4 @@ void SetPlatformCrashKey() {
 #endif
 }
 
-}  // namespace crash_keys
-
-}  // namespace electron
+}  // namespace electron::crash_keys
diff --git a/shell/common/crash_keys.h b/shell/common/crash_keys.h
index 70f731d29f38c..e3c89f895be63 100644
--- a/shell/common/crash_keys.h
+++ b/shell/common/crash_keys.h
@@ -12,9 +12,7 @@ namespace base {
 class CommandLine;
 }
 
-namespace electron {
-
-namespace crash_keys {
+namespace electron::crash_keys {
 
 void SetCrashKey(const std::string& key, const std::string& value);
 void ClearCrashKey(const std::string& key);
@@ -23,8 +21,6 @@ void GetCrashKeys(std::map<std::string, std::string>* keys);
 void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
 void SetPlatformCrashKey();
 
-}  // namespace crash_keys
-
-}  // namespace electron
+}  // namespace electron::crash_keys
 
 #endif  // ELECTRON_SHELL_COMMON_CRASH_KEYS_H_
diff --git a/shell/common/gin_helper/event_emitter.cc b/shell/common/gin_helper/event_emitter.cc
index 32a3e4b1b8183..5ebb9c93539b7 100644
--- a/shell/common/gin_helper/event_emitter.cc
+++ b/shell/common/gin_helper/event_emitter.cc
@@ -10,9 +10,7 @@
 #include "shell/common/gin_helper/dictionary.h"
 #include "shell/common/gin_helper/object_template_builder.h"
 
-namespace gin_helper {
-
-namespace internal {
+namespace gin_helper::internal {
 
 namespace {
 
@@ -75,6 +73,4 @@ v8::Local<v8::Object> CreateNativeEvent(
   return event;
 }
 
-}  // namespace internal
-
-}  // namespace gin_helper
+}  // namespace gin_helper::internal
diff --git a/shell/common/gin_helper/event_emitter_caller.cc b/shell/common/gin_helper/event_emitter_caller.cc
index 8676732d32402..be112f55fa5d1 100644
--- a/shell/common/gin_helper/event_emitter_caller.cc
+++ b/shell/common/gin_helper/event_emitter_caller.cc
@@ -8,9 +8,7 @@
 #include "shell/common/gin_helper/microtasks_scope.h"
 #include "shell/common/node_includes.h"
 
-namespace gin_helper {
-
-namespace internal {
+namespace gin_helper::internal {
 
 v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
                                         v8::Local<v8::Object> obj,
@@ -33,6 +31,4 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
   return v8::Boolean::New(isolate, false);
 }
 
-}  // namespace internal
-
-}  // namespace gin_helper
+}  // namespace gin_helper::internal
diff --git a/shell/common/node_util.cc b/shell/common/node_util.cc
index 09ae24a66ee89..7cee76b7c4fa8 100644
--- a/shell/common/node_util.cc
+++ b/shell/common/node_util.cc
@@ -7,9 +7,7 @@
 #include "base/logging.h"
 #include "shell/common/node_includes.h"
 
-namespace electron {
-
-namespace util {
+namespace electron::util {
 
 v8::MaybeLocal<v8::Value> CompileAndCall(
     v8::Local<v8::Context> context,
@@ -36,6 +34,4 @@ v8::MaybeLocal<v8::Value> CompileAndCall(
   return ret;
 }
 
-}  // namespace util
-
-}  // namespace electron
+}  // namespace electron::util
diff --git a/shell/common/node_util.h b/shell/common/node_util.h
index fd7db87a46937..e8cc05370c9af 100644
--- a/shell/common/node_util.h
+++ b/shell/common/node_util.h
@@ -13,9 +13,7 @@ namespace node {
 class Environment;
 }
 
-namespace electron {
-
-namespace util {
+namespace electron::util {
 
 // Run a script with JS source bundled inside the binary as if it's wrapped
 // in a function called with a null receiver and arguments specified in C++.
@@ -29,8 +27,6 @@ v8::MaybeLocal<v8::Value> CompileAndCall(
     std::vector<v8::Local<v8::Value>>* arguments,
     node::Environment* optional_env);
 
-}  // namespace util
-
-}  // namespace electron
+}  // namespace electron::util
 
 #endif  // ELECTRON_SHELL_COMMON_NODE_UTIL_H_
diff --git a/shell/common/platform_util_internal.h b/shell/common/platform_util_internal.h
index 9a3681bed5ae6..3eaa80a7828a6 100644
--- a/shell/common/platform_util_internal.h
+++ b/shell/common/platform_util_internal.h
@@ -13,14 +13,12 @@ namespace base {
 class FilePath;
 }
 
-namespace platform_util {
-namespace internal {
+namespace platform_util::internal {
 
 // Called by platform_util.cc on to invoke platform specific logic to move
 // |path| to trash using a suitable handler.
 bool PlatformTrashItem(const base::FilePath& path, std::string* error);
 
-}  // namespace internal
-}  // namespace platform_util
+}  // namespace platform_util::internal
 
 #endif  // ELECTRON_SHELL_COMMON_PLATFORM_UTIL_INTERNAL_H_
diff --git a/shell/common/skia_util.cc b/shell/common/skia_util.cc
index 21b47fc8c27f3..eeeccbac5cfc1 100644
--- a/shell/common/skia_util.cc
+++ b/shell/common/skia_util.cc
@@ -28,9 +28,7 @@
 #include "ui/gfx/icon_util.h"
 #endif
 
-namespace electron {
-
-namespace util {
+namespace electron::util {
 
 struct ScaleFactorPair {
   const char* name;
@@ -164,6 +162,4 @@ bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
 }
 #endif
 
-}  // namespace util
-
-}  // namespace electron
+}  // namespace electron::util
diff --git a/shell/common/skia_util.h b/shell/common/skia_util.h
index 76830d8443689..2fd4376595d68 100644
--- a/shell/common/skia_util.h
+++ b/shell/common/skia_util.h
@@ -13,9 +13,7 @@ namespace gfx {
 class ImageSkia;
 }
 
-namespace electron {
-
-namespace util {
+namespace electron::util {
 
 bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
                                    const base::FilePath& path);
@@ -41,8 +39,6 @@ bool AddImageSkiaRepFromPNG(gfx::ImageSkia* image,
 bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon);
 #endif
 
-}  // namespace util
-
-}  // namespace electron
+}  // namespace electron::util
 
 #endif  // ELECTRON_SHELL_COMMON_SKIA_UTIL_H_
diff --git a/shell/renderer/api/context_bridge/object_cache.cc b/shell/renderer/api/context_bridge/object_cache.cc
index 928124bab451a..47870fd95ec70 100644
--- a/shell/renderer/api/context_bridge/object_cache.cc
+++ b/shell/renderer/api/context_bridge/object_cache.cc
@@ -8,11 +8,7 @@
 
 #include "shell/common/api/object_life_monitor.h"
 
-namespace electron {
-
-namespace api {
-
-namespace context_bridge {
+namespace electron::api::context_bridge {
 
 ObjectCache::ObjectCache() = default;
 ObjectCache::~ObjectCache() = default;
@@ -50,8 +46,4 @@ v8::MaybeLocal<v8::Value> ObjectCache::GetCachedProxiedObject(
   return v8::MaybeLocal<v8::Value>();
 }
 
-}  // namespace context_bridge
-
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api::context_bridge
diff --git a/shell/renderer/api/context_bridge/object_cache.h b/shell/renderer/api/context_bridge/object_cache.h
index 4d6a2dbd2f95e..2039e061378eb 100644
--- a/shell/renderer/api/context_bridge/object_cache.h
+++ b/shell/renderer/api/context_bridge/object_cache.h
@@ -15,11 +15,7 @@
 #include "shell/renderer/electron_render_frame_observer.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 
-namespace electron {
-
-namespace api {
-
-namespace context_bridge {
+namespace electron::api::context_bridge {
 
 using ObjectCachePair = std::pair<v8::Local<v8::Value>, v8::Local<v8::Value>>;
 
@@ -38,10 +34,6 @@ class ObjectCache final {
   std::unordered_map<int, std::forward_list<ObjectCachePair>> proxy_map_;
 };
 
-}  // namespace context_bridge
-
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api::context_bridge
 
 #endif  // ELECTRON_SHELL_RENDERER_API_CONTEXT_BRIDGE_OBJECT_CACHE_H_
diff --git a/shell/renderer/api/electron_api_context_bridge.h b/shell/renderer/api/electron_api_context_bridge.h
index 86f793904ebb9..bc60d2356a92c 100644
--- a/shell/renderer/api/electron_api_context_bridge.h
+++ b/shell/renderer/api/electron_api_context_bridge.h
@@ -12,9 +12,7 @@ namespace gin_helper {
 class Arguments;
 }
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 void ProxyFunctionWrapper(const v8::FunctionCallbackInfo<v8::Value>& info);
 
@@ -51,8 +49,6 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
     bool support_dynamic_properties,
     int recursion_depth);
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_RENDERER_API_ELECTRON_API_CONTEXT_BRIDGE_H_
diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc
index 21374c965b3f3..12d2e207bf06c 100644
--- a/shell/renderer/api/electron_api_spell_check_client.cc
+++ b/shell/renderer/api/electron_api_spell_check_client.cc
@@ -22,9 +22,7 @@
 #include "third_party/blink/public/web/web_text_checking_result.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 namespace {
 
@@ -275,6 +273,4 @@ SpellCheckClient::SpellCheckScope::SpellCheckScope(
 
 SpellCheckClient::SpellCheckScope::~SpellCheckScope() = default;
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
diff --git a/shell/renderer/api/electron_api_spell_check_client.h b/shell/renderer/api/electron_api_spell_check_client.h
index d0b0a9b1956aa..bee731c1a68ec 100644
--- a/shell/renderer/api/electron_api_spell_check_client.h
+++ b/shell/renderer/api/electron_api_spell_check_client.h
@@ -23,9 +23,7 @@ struct WebTextCheckingResult;
 class WebTextCheckingCompletion;
 }  // namespace blink
 
-namespace electron {
-
-namespace api {
+namespace electron::api {
 
 class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
                          public blink::WebTextCheckClient,
@@ -109,8 +107,6 @@ class SpellCheckClient : public blink::WebSpellCheckPanelHostClient,
   v8::Global<v8::Function> spell_check_;
 };
 
-}  // namespace api
-
-}  // namespace electron
+}  // namespace electron::api
 
 #endif  // ELECTRON_SHELL_RENDERER_API_ELECTRON_API_SPELL_CHECK_CLIENT_H_

From c3920c5c02a6875b444a7c4017ba85145b658fec Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 06:02:00 -0700
Subject: [PATCH 552/811] Bump v21.0.0-nightly.20220630

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 45dd56b31f751..9f827e820d659 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220629
\ No newline at end of file
+21.0.0-nightly.20220630
\ No newline at end of file
diff --git a/package.json b/package.json
index 272abf0eda703..b7fe1ca4c63fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220629",
+  "version": "21.0.0-nightly.20220630",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d4904ad4b3a19..4afb213922356 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220629
- PRODUCTVERSION 21,0,0,20220629
+ FILEVERSION 21,0,0,20220630
+ PRODUCTVERSION 21,0,0,20220630
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c885f9063bda5032fe430bbee724f77b66ce034a Mon Sep 17 00:00:00 2001
From: Darshan Sen <raisinten@gmail.com>
Date: Thu, 30 Jun 2022 21:53:03 +0530
Subject: [PATCH 553/811] docs: document the removal of IA32 Linux support
 (#34787)

* docs: document the removal of IA32 Linux support

Chromium had dropped support for IA32 Linux, so the Chromium
102.0.4999.0 upgrade PR,
https://github.com/electron/electron/pull/33731, had introduced the commit,
https://github.com/electron/electron/pull/33731/commits/389ef0731efca802db2089486ad6d9a91cc02ba8,
to drop support for IA32 Linux but the change landed without an addition
to the documentation for the breaking changes, so this PR adds that.

Closes: https://github.com/electron/electron/issues/34783
Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=1194538
Signed-off-by: Darshan Sen <raisinten@gmail.com>

* Update docs/breaking-changes.md

Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
---
 docs/breaking-changes.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index 08136f49a514b..ad74ddcb1c200 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -98,7 +98,10 @@ is the origin that is checking for device permission.
 
 ## Planned Breaking API Changes (19.0)
 
-None
+### Removed: IA32 Linux binaries
+
+This is a result of Chromium 102.0.4999.0 dropping support for IA32 Linux.
+This concludes the [removal of support for IA32 Linux](#removed-ia32-linux-support).
 
 ## Planned Breaking API Changes (18.0)
 
@@ -1265,6 +1268,10 @@ not present, then the native module will fail to load on Windows, with an error
 message like `Cannot find module`. See the [native module
 guide](/docs/tutorial/using-native-node-modules.md) for more.
 
+### Removed: IA32 Linux support
+
+Electron 18 will no longer run on 32-bit Linux systems. See [discontinuing support for 32-bit Linux](https://www.electronjs.org/blog/linux-32bit-support) for more information.
+
 ## Breaking API Changes (3.0)
 
 The following list includes the breaking API changes in Electron 3.0.

From d359736e653c343160517ad5fb8ef3d874bb0f3c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 06:00:58 -0700
Subject: [PATCH 554/811] Bump v21.0.0-nightly.20220701

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9f827e820d659..3002ff9823325 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220630
\ No newline at end of file
+21.0.0-nightly.20220701
\ No newline at end of file
diff --git a/package.json b/package.json
index b7fe1ca4c63fe..31ff148c2a40f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220630",
+  "version": "21.0.0-nightly.20220701",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4afb213922356..626dd31101be5 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220630
- PRODUCTVERSION 21,0,0,20220630
+ FILEVERSION 21,0,0,20220701
+ PRODUCTVERSION 21,0,0,20220701
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1edf9d2ada2b5e7df2cd3c2e7e971b9db156e677 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 06:02:50 -0700
Subject: [PATCH 555/811] Bump v21.0.0-nightly.20220704

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 3002ff9823325..6447e4aa3f9ec 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220701
\ No newline at end of file
+21.0.0-nightly.20220704
\ No newline at end of file
diff --git a/package.json b/package.json
index 31ff148c2a40f..ee1cf6953861e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220701",
+  "version": "21.0.0-nightly.20220704",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 626dd31101be5..2c4f316c5623b 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220701
- PRODUCTVERSION 21,0,0,20220701
+ FILEVERSION 21,0,0,20220704
+ PRODUCTVERSION 21,0,0,20220704
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From d28ed0da20a26055f38341daa73c600e24fc4b0a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 06:01:17 -0700
Subject: [PATCH 556/811] Bump v21.0.0-nightly.20220705

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6447e4aa3f9ec..118f51b1b228f 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220704
\ No newline at end of file
+21.0.0-nightly.20220705
\ No newline at end of file
diff --git a/package.json b/package.json
index ee1cf6953861e..a8bc1ba4b573b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220704",
+  "version": "21.0.0-nightly.20220705",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2c4f316c5623b..125586262883f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220704
- PRODUCTVERSION 21,0,0,20220704
+ FILEVERSION 21,0,0,20220705
+ PRODUCTVERSION 21,0,0,20220705
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0ee7f14190e75d0e7b669661c81235a4a2bfadb4 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 5 Jul 2022 08:25:18 -0700
Subject: [PATCH 557/811] chore: modernize Value usage in converters (#34794)

* chore: modernize Value usage in converters

* Date is parsed as an empty object now
---
 filenames.gni                                 |   2 -
 shell/browser/api/electron_api_base_window.cc |   2 +-
 shell/browser/api/electron_api_base_window.h  |   2 +-
 .../api/electron_api_content_tracing.cc       |   5 +-
 shell/browser/api/electron_api_cookies.cc     |  47 +-
 shell/browser/api/electron_api_cookies.h      |   8 +-
 shell/browser/api/electron_api_debugger.cc    |  66 +--
 shell/browser/api/electron_api_debugger.h     |   2 +-
 shell/browser/api/electron_api_session.cc     |   4 +-
 shell/browser/api/electron_api_session.h      |   7 +-
 .../api/electron_api_system_preferences.h     |   6 +-
 .../electron_api_system_preferences_mac.mm    |  43 +-
 shell/browser/browser.h                       |   6 +-
 shell/browser/browser_linux.cc                |   4 +-
 shell/browser/browser_mac.mm                  |  15 +-
 shell/browser/browser_win.cc                  |   4 +-
 shell/browser/electron_browser_context.cc     |   6 +-
 shell/browser/electron_browser_context.h      |  10 +-
 shell/browser/native_window.cc                |   5 +-
 shell/browser/native_window.h                 |   2 +-
 shell/browser/native_window_observer.h        |   2 +-
 .../net/electron_url_loader_factory.cc        |   6 +-
 shell/browser/net/url_pipe_loader.cc          |  12 +-
 shell/browser/net/url_pipe_loader.h           |   4 +-
 shell/browser/ui/cocoa/electron_touch_bar.mm  |  45 +-
 shell/common/api/electron_api_native_image.cc |  21 +-
 shell/common/api/electron_api_native_image.h  |   2 +-
 .../gin_converters/extension_converter.cc     |   3 +-
 shell/common/gin_converters/net_converter.cc  |  10 +-
 .../common/gin_converters/value_converter.cc  |  59 +-
 shell/common/gin_converters/value_converter.h |  19 +-
 shell/common/v8_value_converter.cc            | 524 ------------------
 shell/common/v8_value_converter.h             |  78 ---
 spec-main/api-system-preferences-spec.ts      |   1 -
 34 files changed, 203 insertions(+), 829 deletions(-)
 delete mode 100644 shell/common/v8_value_converter.cc
 delete mode 100644 shell/common/v8_value_converter.h

diff --git a/filenames.gni b/filenames.gni
index 3ce306928a96f..912d11ac9a07a 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -643,8 +643,6 @@ filenames = {
     "shell/common/process_util.h",
     "shell/common/skia_util.cc",
     "shell/common/skia_util.h",
-    "shell/common/v8_value_converter.cc",
-    "shell/common/v8_value_converter.h",
     "shell/common/v8_value_serializer.cc",
     "shell/common/v8_value_serializer.h",
     "shell/common/world_ids.h",
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
index 3f4e529023b53..3a87a11d22f06 100644
--- a/shell/browser/api/electron_api_base_window.cc
+++ b/shell/browser/api/electron_api_base_window.cc
@@ -288,7 +288,7 @@ void BaseWindow::OnExecuteAppCommand(const std::string& command_name) {
 }
 
 void BaseWindow::OnTouchBarItemResult(const std::string& item_id,
-                                      const base::DictionaryValue& details) {
+                                      const base::Value::Dict& details) {
   Emit("-touch-bar-interaction", item_id, details);
 }
 
diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
index 98fa9a5556a86..482f510f4ed40 100644
--- a/shell/browser/api/electron_api_base_window.h
+++ b/shell/browser/api/electron_api_base_window.h
@@ -80,7 +80,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void OnWindowAlwaysOnTopChanged() override;
   void OnExecuteAppCommand(const std::string& command_name) override;
   void OnTouchBarItemResult(const std::string& item_id,
-                            const base::DictionaryValue& details) override;
+                            const base::Value::Dict& details) override;
   void OnNewWindowForTab() override;
   void OnSystemContextMenu(int x, int y, bool* prevent_default) override;
 #if BUILDFLAG(IS_WIN)
diff --git a/shell/browser/api/electron_api_content_tracing.cc b/shell/browser/api/electron_api_content_tracing.cc
index aa1047c403021..a1628bb7f37fa 100644
--- a/shell/browser/api/electron_api_content_tracing.cc
+++ b/shell/browser/api/electron_api_content_tracing.cc
@@ -42,9 +42,10 @@ struct Converter<base::trace_event::TraceConfig> {
       }
     }
 
-    base::DictionaryValue memory_dump_config;
+    base::Value::Dict memory_dump_config;
     if (ConvertFromV8(isolate, val, &memory_dump_config)) {
-      *out = base::trace_event::TraceConfig(memory_dump_config);
+      *out = base::trace_event::TraceConfig(
+          base::Value(std::move(memory_dump_config)));
       return true;
     }
 
diff --git a/shell/browser/api/electron_api_cookies.cc b/shell/browser/api/electron_api_cookies.cc
index 7970f87474253..e4cebe4fb572c 100644
--- a/shell/browser/api/electron_api_cookies.cc
+++ b/shell/browser/api/electron_api_cookies.cc
@@ -117,27 +117,27 @@ bool MatchesDomain(std::string filter, const std::string& domain) {
 }
 
 // Returns whether |cookie| matches |filter|.
-bool MatchesCookie(const base::Value& filter,
+bool MatchesCookie(const base::Value::Dict& filter,
                    const net::CanonicalCookie& cookie) {
   const std::string* str;
-  if ((str = filter.FindStringKey("name")) && *str != cookie.Name())
+  if ((str = filter.FindString("name")) && *str != cookie.Name())
     return false;
-  if ((str = filter.FindStringKey("path")) && *str != cookie.Path())
+  if ((str = filter.FindString("path")) && *str != cookie.Path())
     return false;
-  if ((str = filter.FindStringKey("domain")) &&
+  if ((str = filter.FindString("domain")) &&
       !MatchesDomain(*str, cookie.Domain()))
     return false;
-  absl::optional<bool> secure_filter = filter.FindBoolKey("secure");
+  absl::optional<bool> secure_filter = filter.FindBool("secure");
   if (secure_filter && *secure_filter == cookie.IsSecure())
     return false;
-  absl::optional<bool> session_filter = filter.FindBoolKey("session");
+  absl::optional<bool> session_filter = filter.FindBool("session");
   if (session_filter && *session_filter != !cookie.IsPersistent())
     return false;
   return true;
 }
 
 // Remove cookies from |list| not matching |filter|, and pass it to |callback|.
-void FilterCookies(const base::Value& filter,
+void FilterCookies(base::Value::Dict filter,
                    gin_helper::Promise<net::CookieList> promise,
                    const net::CookieList& cookies) {
   net::CookieList result;
@@ -149,11 +149,11 @@ void FilterCookies(const base::Value& filter,
 }
 
 void FilterCookieWithStatuses(
-    const base::Value& filter,
+    base::Value::Dict filter,
     gin_helper::Promise<net::CookieList> promise,
     const net::CookieAccessResultList& list,
     const net::CookieAccessResultList& excluded_list) {
-  FilterCookies(filter, std::move(promise),
+  FilterCookies(std::move(filter), std::move(promise),
                 net::cookie_util::StripAccessResults(list));
 }
 
@@ -231,7 +231,7 @@ v8::Local<v8::Promise> Cookies::Get(v8::Isolate* isolate,
   auto* storage_partition = browser_context_->GetDefaultStoragePartition();
   auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
 
-  base::DictionaryValue dict;
+  base::Value::Dict dict;
   gin::ConvertFromV8(isolate, filter.GetHandle(), &dict);
 
   std::string url;
@@ -280,31 +280,31 @@ v8::Local<v8::Promise> Cookies::Remove(v8::Isolate* isolate,
 }
 
 v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
-                                    const base::DictionaryValue& details) {
+                                    base::Value::Dict details) {
   gin_helper::Promise<void> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  const std::string* url_string = details.FindStringKey("url");
+  const std::string* url_string = details.FindString("url");
   if (!url_string) {
     promise.RejectWithErrorMessage("Missing required option 'url'");
     return handle;
   }
-  const std::string* name = details.FindStringKey("name");
-  const std::string* value = details.FindStringKey("value");
-  const std::string* domain = details.FindStringKey("domain");
-  const std::string* path = details.FindStringKey("path");
-  bool http_only = details.FindBoolKey("httpOnly").value_or(false);
-  const std::string* same_site_string = details.FindStringKey("sameSite");
+  const std::string* name = details.FindString("name");
+  const std::string* value = details.FindString("value");
+  const std::string* domain = details.FindString("domain");
+  const std::string* path = details.FindString("path");
+  bool http_only = details.FindBool("httpOnly").value_or(false);
+  const std::string* same_site_string = details.FindString("sameSite");
   net::CookieSameSite same_site;
   std::string error = StringToCookieSameSite(same_site_string, &same_site);
   if (!error.empty()) {
     promise.RejectWithErrorMessage(error);
     return handle;
   }
-  bool secure = details.FindBoolKey("secure").value_or(
+  bool secure = details.FindBool("secure").value_or(
       same_site == net::CookieSameSite::NO_RESTRICTION);
   bool same_party =
-      details.FindBoolKey("sameParty")
+      details.FindBool("sameParty")
           .value_or(secure && same_site != net::CookieSameSite::STRICT_MODE);
 
   GURL url(url_string ? *url_string : "");
@@ -317,10 +317,9 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
 
   auto canonical_cookie = net::CanonicalCookie::CreateSanitizedCookie(
       url, name ? *name : "", value ? *value : "", domain ? *domain : "",
-      path ? *path : "",
-      ParseTimeProperty(details.FindDoubleKey("creationDate")),
-      ParseTimeProperty(details.FindDoubleKey("expirationDate")),
-      ParseTimeProperty(details.FindDoubleKey("lastAccessDate")), secure,
+      path ? *path : "", ParseTimeProperty(details.FindDouble("creationDate")),
+      ParseTimeProperty(details.FindDouble("expirationDate")),
+      ParseTimeProperty(details.FindDouble("lastAccessDate")), secure,
       http_only, same_site, net::COOKIE_PRIORITY_DEFAULT, same_party,
       absl::nullopt);
   if (!canonical_cookie || !canonical_cookie->IsCanonical()) {
diff --git a/shell/browser/api/electron_api_cookies.h b/shell/browser/api/electron_api_cookies.h
index fbfa335ce9f8a..3b98c033afe6d 100644
--- a/shell/browser/api/electron_api_cookies.h
+++ b/shell/browser/api/electron_api_cookies.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback_list.h"
+#include "base/values.h"
 #include "gin/handle.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_change_dispatcher.h"
@@ -15,10 +16,6 @@
 #include "shell/common/gin_helper/promise.h"
 #include "shell/common/gin_helper/trackable_object.h"
 
-namespace base {
-class DictionaryValue;
-}
-
 namespace gin_helper {
 class Dictionary;
 }
@@ -51,8 +48,7 @@ class Cookies : public gin::Wrappable<Cookies>,
 
   v8::Local<v8::Promise> Get(v8::Isolate*,
                              const gin_helper::Dictionary& filter);
-  v8::Local<v8::Promise> Set(v8::Isolate*,
-                             const base::DictionaryValue& details);
+  v8::Local<v8::Promise> Set(v8::Isolate*, base::Value::Dict details);
   v8::Local<v8::Promise> Remove(v8::Isolate*,
                                 const GURL& url,
                                 const std::string& name);
diff --git a/shell/browser/api/electron_api_debugger.cc b/shell/browser/api/electron_api_debugger.cc
index fcd44205d75e1..e24c0dca3d658 100644
--- a/shell/browser/api/electron_api_debugger.cc
+++ b/shell/browser/api/electron_api_debugger.cc
@@ -45,44 +45,35 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
 
   base::StringPiece message_str(reinterpret_cast<const char*>(message.data()),
                                 message.size());
-  std::unique_ptr<base::Value> parsed_message =
-      base::JSONReader::ReadDeprecated(message_str,
-                                       base::JSON_REPLACE_INVALID_CHARACTERS);
+  absl::optional<base::Value> parsed_message = base::JSONReader::Read(
+      message_str, base::JSON_REPLACE_INVALID_CHARACTERS);
   if (!parsed_message || !parsed_message->is_dict())
     return;
-  auto* dict = static_cast<base::DictionaryValue*>(parsed_message.get());
-  int id;
-  if (!dict->GetInteger("id", &id)) {
-    std::string method;
-    if (!dict->GetString("method", &method))
+  base::Value::Dict& dict = parsed_message->GetDict();
+  absl::optional<int> id = dict.FindInt("id");
+  if (!id) {
+    std::string* method = dict.FindString("method");
+    if (!method)
       return;
-    std::string session_id;
-    dict->GetString("sessionId", &session_id);
-    base::DictionaryValue* params_value = nullptr;
-    base::DictionaryValue params;
-    if (dict->GetDictionary("params", &params_value))
-      params.Swap(params_value);
-    Emit("message", method, params, session_id);
+    std::string* session_id = dict.FindString("sessionId");
+    base::Value::Dict* params = dict.FindDict("params");
+    Emit("message", *method, params ? std::move(*params) : base::Value::Dict(),
+         session_id ? *session_id : "");
   } else {
-    auto it = pending_requests_.find(id);
+    auto it = pending_requests_.find(*id);
     if (it == pending_requests_.end())
       return;
 
-    gin_helper::Promise<base::DictionaryValue> promise = std::move(it->second);
+    gin_helper::Promise<base::Value::Dict> promise = std::move(it->second);
     pending_requests_.erase(it);
 
-    base::DictionaryValue* error = nullptr;
-    if (dict->GetDictionary("error", &error)) {
-      std::string message;
-      error->GetString("message", &message);
-      promise.RejectWithErrorMessage(message);
+    base::Value::Dict* error = dict.FindDict("error");
+    if (error) {
+      std::string* message = error->FindString("message");
+      promise.RejectWithErrorMessage(message ? *message : "");
     } else {
-      base::DictionaryValue* result_body = nullptr;
-      base::DictionaryValue result;
-      if (dict->GetDictionary("result", &result_body)) {
-        result.Swap(result_body);
-      }
-      promise.Resolve(result);
+      base::Value::Dict* result = dict.FindDict("result");
+      promise.Resolve(result ? std::move(*result) : base::Value::Dict());
     }
   }
 }
@@ -133,7 +124,7 @@ void Debugger::Detach() {
 
 v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  gin_helper::Promise<base::DictionaryValue> promise(isolate);
+  gin_helper::Promise<base::Value::Dict> promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   if (!agent_host_) {
@@ -147,7 +138,7 @@ v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
     return handle;
   }
 
-  base::DictionaryValue command_params;
+  base::Value::Dict command_params;
   args->GetNext(&command_params);
 
   std::string session_id;
@@ -156,22 +147,21 @@ v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
     return handle;
   }
 
-  base::DictionaryValue request;
+  base::Value::Dict request;
   int request_id = ++previous_request_id_;
   pending_requests_.emplace(request_id, std::move(promise));
-  request.SetInteger("id", request_id);
-  request.SetString("method", method);
-  if (!command_params.DictEmpty()) {
-    request.Set("params",
-                base::Value::ToUniquePtrValue(command_params.Clone()));
+  request.Set("id", request_id);
+  request.Set("method", method);
+  if (!command_params.empty()) {
+    request.Set("params", base::Value(std::move(command_params)));
   }
 
   if (!session_id.empty()) {
-    request.SetString("sessionId", session_id);
+    request.Set("sessionId", session_id);
   }
 
   std::string json_args;
-  base::JSONWriter::Write(request, &json_args);
+  base::JSONWriter::Write(base::Value(std::move(request)), &json_args);
   agent_host_->DispatchProtocolMessage(
       this, base::as_bytes(base::make_span(json_args)));
 
diff --git a/shell/browser/api/electron_api_debugger.h b/shell/browser/api/electron_api_debugger.h
index dc4f3b7eec427..e9388df8b25a2 100644
--- a/shell/browser/api/electron_api_debugger.h
+++ b/shell/browser/api/electron_api_debugger.h
@@ -57,7 +57,7 @@ class Debugger : public gin::Wrappable<Debugger>,
 
  private:
   using PendingRequestMap =
-      std::map<int, gin_helper::Promise<base::DictionaryValue>>;
+      std::map<int, gin_helper::Promise<base::Value::Dict>>;
 
   void Attach(gin::Arguments* args);
   bool IsAttached();
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index 3d2a13be44d68..c02eddd57fe3c 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -1160,7 +1160,7 @@ gin::Handle<Session> Session::CreateFrom(
 // static
 gin::Handle<Session> Session::FromPartition(v8::Isolate* isolate,
                                             const std::string& partition,
-                                            base::DictionaryValue options) {
+                                            base::Value::Dict options) {
   ElectronBrowserContext* browser_context;
   if (partition.empty()) {
     browser_context =
@@ -1265,7 +1265,7 @@ v8::Local<v8::Value> FromPartition(const std::string& partition,
     args->ThrowTypeError("Session can only be received when app is ready");
     return v8::Null(args->isolate());
   }
-  base::DictionaryValue options;
+  base::Value::Dict options;
   args->GetNext(&options);
   return Session::FromPartition(args->isolate(), partition, std::move(options))
       .ToV8();
diff --git a/shell/browser/api/electron_api_session.h b/shell/browser/api/electron_api_session.h
index e9b69380dfaf9..c5f21920dcc6e 100644
--- a/shell/browser/api/electron_api_session.h
+++ b/shell/browser/api/electron_api_session.h
@@ -75,10 +75,9 @@ class Session : public gin::Wrappable<Session>,
   static Session* FromBrowserContext(content::BrowserContext* context);
 
   // Gets the Session of |partition|.
-  static gin::Handle<Session> FromPartition(
-      v8::Isolate* isolate,
-      const std::string& partition,
-      base::DictionaryValue options = base::DictionaryValue());
+  static gin::Handle<Session> FromPartition(v8::Isolate* isolate,
+                                            const std::string& partition,
+                                            base::Value::Dict options = {});
 
   ElectronBrowserContext* browser_context() const { return browser_context_; }
 
diff --git a/shell/browser/api/electron_api_system_preferences.h b/shell/browser/api/electron_api_system_preferences.h
index b3ef33f5ff44a..b311e97fc6831 100644
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -72,18 +72,18 @@ class SystemPreferences
       void(const std::string&, base::Value, const std::string&)>;
 
   void PostNotification(const std::string& name,
-                        base::DictionaryValue user_info,
+                        base::Value::Dict user_info,
                         gin::Arguments* args);
   int SubscribeNotification(v8::Local<v8::Value> maybe_name,
                             const NotificationCallback& callback);
   void UnsubscribeNotification(int id);
   void PostLocalNotification(const std::string& name,
-                             base::DictionaryValue user_info);
+                             base::Value::Dict user_info);
   int SubscribeLocalNotification(v8::Local<v8::Value> maybe_name,
                                  const NotificationCallback& callback);
   void UnsubscribeLocalNotification(int request_id);
   void PostWorkspaceNotification(const std::string& name,
-                                 base::DictionaryValue user_info);
+                                 base::Value::Dict user_info);
   int SubscribeWorkspaceNotification(v8::Local<v8::Value> maybe_name,
                                      const NotificationCallback& callback);
   void UnsubscribeWorkspaceNotification(int request_id);
diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm
index d8ef89fa4d98e..bbd37e3c38e63 100644
--- a/shell/browser/api/electron_api_system_preferences_mac.mm
+++ b/shell/browser/api/electron_api_system_preferences_mac.mm
@@ -138,7 +138,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }  // namespace
 
 void SystemPreferences::PostNotification(const std::string& name,
-                                         base::DictionaryValue user_info,
+                                         base::Value::Dict user_info,
                                          gin::Arguments* args) {
   bool immediate = false;
   args->GetNext(&immediate);
@@ -148,7 +148,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
   [center
       postNotificationName:base::SysUTF8ToNSString(name)
                     object:nil
-                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())
+                  userInfo:DictionaryValueToNSDictionary(std::move(user_info))
         deliverImmediately:immediate];
 }
 
@@ -166,12 +166,12 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 void SystemPreferences::PostLocalNotification(const std::string& name,
-                                              base::DictionaryValue user_info) {
+                                              base::Value::Dict user_info) {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center
       postNotificationName:base::SysUTF8ToNSString(name)
                     object:nil
-                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
+                  userInfo:DictionaryValueToNSDictionary(std::move(user_info))];
 }
 
 int SystemPreferences::SubscribeLocalNotification(
@@ -186,15 +186,14 @@ AVMediaType ParseMediaType(const std::string& media_type) {
                             NotificationCenterKind::kNSNotificationCenter);
 }
 
-void SystemPreferences::PostWorkspaceNotification(
-    const std::string& name,
-    base::DictionaryValue user_info) {
+void SystemPreferences::PostWorkspaceNotification(const std::string& name,
+                                                  base::Value::Dict user_info) {
   NSNotificationCenter* center =
       [[NSWorkspace sharedWorkspace] notificationCenter];
   [center
       postNotificationName:base::SysUTF8ToNSString(name)
                     object:nil
-                  userInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
+                  userInfo:DictionaryValueToNSDictionary(std::move(user_info))];
 }
 
 int SystemPreferences::SubscribeWorkspaceNotification(
@@ -246,7 +245,7 @@ AVMediaType ParseMediaType(const std::string& media_type) {
                 } else {
                   copied_callback.Run(
                       base::SysNSStringToUTF8(notification.name),
-                      base::DictionaryValue(), object);
+                      base::Value(base::Value::Dict()), object);
                 }
               }];
   return request_id;
@@ -295,24 +294,24 @@ AVMediaType ParseMediaType(const std::string& media_type) {
 }
 
 void SystemPreferences::RegisterDefaults(gin::Arguments* args) {
-  base::DictionaryValue value;
+  base::Value::Dict value;
 
   if (!args->GetNext(&value)) {
     args->ThrowError();
-  } else {
-    @try {
-      NSDictionary* dict = DictionaryValueToNSDictionary(value.GetDict());
-      for (id key in dict) {
-        id value = [dict objectForKey:key];
-        if ([value isKindOfClass:[NSNull class]] || value == nil) {
-          args->ThrowError();
-          return;
-        }
+    return;
+  }
+  @try {
+    NSDictionary* dict = DictionaryValueToNSDictionary(std::move(value));
+    for (id key in dict) {
+      id value = [dict objectForKey:key];
+      if ([value isKindOfClass:[NSNull class]] || value == nil) {
+        args->ThrowError();
+        return;
       }
-      [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
-    } @catch (NSException* exception) {
-      args->ThrowError();
     }
+    [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
+  } @catch (NSException* exception) {
+    args->ThrowError();
   }
 }
 
diff --git a/shell/browser/browser.h b/shell/browser/browser.h
index aaae1b774f3fd..7fc47ef826dad 100644
--- a/shell/browser/browser.h
+++ b/shell/browser/browser.h
@@ -165,7 +165,7 @@ class Browser : public WindowListObserver {
 
   // Creates an activity and sets it as the one currently in use.
   void SetUserActivity(const std::string& type,
-                       base::DictionaryValue user_info,
+                       base::Value::Dict user_info,
                        gin::Arguments* args);
 
   // Returns the type name of the current user activity.
@@ -180,7 +180,7 @@ class Browser : public WindowListObserver {
 
   // Updates the current user activity
   void UpdateCurrentActivity(const std::string& type,
-                             base::DictionaryValue user_info);
+                             base::Value::Dict user_info);
 
   // Indicates that an user activity is about to be resumed.
   bool WillContinueUserActivity(const std::string& type);
@@ -231,7 +231,7 @@ class Browser : public WindowListObserver {
 #endif  // BUILDFLAG(IS_MAC)
 
   void ShowAboutPanel();
-  void SetAboutPanelOptions(base::DictionaryValue options);
+  void SetAboutPanelOptions(base::Value::Dict options);
 
 #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
   void ShowEmojiPanel();
diff --git a/shell/browser/browser_linux.cc b/shell/browser/browser_linux.cc
index 8b38c9ca67bf7..d7b7b96dfac6e 100644
--- a/shell/browser/browser_linux.cc
+++ b/shell/browser/browser_linux.cc
@@ -224,8 +224,8 @@ void Browser::ShowAboutPanel() {
   gtk_widget_destroy(dialogWidget);
 }
 
-void Browser::SetAboutPanelOptions(base::DictionaryValue options) {
-  about_panel_options_ = std::move(options);
+void Browser::SetAboutPanelOptions(base::Value::Dict options) {
+  about_panel_options_ = base::Value(std::move(options));
 }
 
 }  // namespace electron
diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index f155160f55fbe..ed35f421cea73 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -235,14 +235,14 @@
 }
 
 void Browser::SetUserActivity(const std::string& type,
-                              base::DictionaryValue user_info,
+                              base::Value::Dict user_info,
                               gin::Arguments* args) {
   std::string url_string;
   args->GetNext(&url_string);
 
   [[AtomApplication sharedApplication]
       setCurrentActivity:base::SysUTF8ToNSString(type)
-            withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())
+            withUserInfo:DictionaryValueToNSDictionary(std::move(user_info))
           withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
 }
 
@@ -261,10 +261,11 @@
 }
 
 void Browser::UpdateCurrentActivity(const std::string& type,
-                                    base::DictionaryValue user_info) {
+                                    base::Value::Dict user_info) {
   [[AtomApplication sharedApplication]
       updateCurrentActivity:base::SysUTF8ToNSString(type)
-               withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
+               withUserInfo:DictionaryValueToNSDictionary(
+                                std::move(user_info))];
 }
 
 bool Browser::WillContinueUserActivity(const std::string& type) {
@@ -511,11 +512,11 @@ void RemoveFromLoginItems() {
       orderFrontStandardAboutPanelWithOptions:options];
 }
 
-void Browser::SetAboutPanelOptions(base::DictionaryValue options) {
+void Browser::SetAboutPanelOptions(base::Value::Dict options) {
   about_panel_options_.DictClear();
 
-  for (const auto pair : options.DictItems()) {
-    std::string key = std::string(pair.first);
+  for (const auto pair : options) {
+    std::string key = pair.first;
     if (!key.empty() && pair.second.is_string()) {
       key[0] = base::ToUpperASCII(key[0]);
       auto val = std::make_unique<base::Value>(pair.second.Clone());
diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc
index ced835e59c1fc..43364d65080ef 100644
--- a/shell/browser/browser_win.cc
+++ b/shell/browser/browser_win.cc
@@ -851,8 +851,8 @@ void Browser::ShowAboutPanel() {
   electron::ShowMessageBoxSync(settings);
 }
 
-void Browser::SetAboutPanelOptions(base::DictionaryValue options) {
-  about_panel_options_ = std::move(options);
+void Browser::SetAboutPanelOptions(base::Value::Dict options) {
+  about_panel_options_ = base::Value(std::move(options));
 }
 
 }  // namespace electron
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index e2408f01e91d9..ff4ed57d35964 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -103,7 +103,7 @@ ElectronBrowserContext::browser_context_map() {
 
 ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
                                                bool in_memory,
-                                               base::DictionaryValue options)
+                                               base::Value::Dict options)
     : storage_policy_(base::MakeRefCounted<SpecialStoragePolicy>()),
       protocol_registry_(base::WrapUnique(new ProtocolRegistry)),
       in_memory_(in_memory),
@@ -111,7 +111,7 @@ ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
   // Read options.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   use_cache_ = !command_line->HasSwitch(switches::kDisableHttpCache);
-  if (auto use_cache_opt = options.FindBoolKey("cache")) {
+  if (auto use_cache_opt = options.FindBool("cache")) {
     use_cache_ = use_cache_opt.value();
   }
 
@@ -530,7 +530,7 @@ bool ElectronBrowserContext::CheckDevicePermission(
 ElectronBrowserContext* ElectronBrowserContext::From(
     const std::string& partition,
     bool in_memory,
-    base::DictionaryValue options) {
+    base::Value::Dict options) {
   PartitionKey key(partition, in_memory);
   ElectronBrowserContext* browser_context = browser_context_map()[key].get();
   if (browser_context) {
diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h
index 844df7f65e65b..baaa2ee4ee3a3 100644
--- a/shell/browser/electron_browser_context.h
+++ b/shell/browser/electron_browser_context.h
@@ -44,7 +44,6 @@ using DevicePermissionMap =
     std::map<blink::PermissionType,
              std::map<url::Origin, std::vector<std::unique_ptr<base::Value>>>>;
 
-class ElectronBrowserContext;
 class ElectronDownloadManagerDelegate;
 class ElectronPermissionManager;
 class CookieChangeNotifier;
@@ -82,10 +81,9 @@ class ElectronBrowserContext : public content::BrowserContext {
   // Get or create the BrowserContext according to its |partition| and
   // |in_memory|. The |options| will be passed to constructor when there is no
   // existing BrowserContext.
-  static ElectronBrowserContext* From(
-      const std::string& partition,
-      bool in_memory,
-      base::DictionaryValue options = base::DictionaryValue());
+  static ElectronBrowserContext* From(const std::string& partition,
+                                      bool in_memory,
+                                      base::Value::Dict options = {});
 
   static BrowserContextMap& browser_context_map();
 
@@ -177,7 +175,7 @@ class ElectronBrowserContext : public content::BrowserContext {
  private:
   ElectronBrowserContext(const std::string& partition,
                          bool in_memory,
-                         base::DictionaryValue options);
+                         base::Value::Dict options);
 
   // Initialize pref registry.
   void InitPrefs();
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 414cb2ec4e01a..897939991150a 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -658,9 +658,8 @@ void NativeWindow::NotifyWindowExecuteAppCommand(const std::string& command) {
     observer.OnExecuteAppCommand(command);
 }
 
-void NativeWindow::NotifyTouchBarItemInteraction(
-    const std::string& item_id,
-    const base::DictionaryValue& details) {
+void NativeWindow::NotifyTouchBarItemInteraction(const std::string& item_id,
+                                                 base::Value::Dict details) {
   for (NativeWindowObserver& observer : observers_)
     observer.OnTouchBarItemResult(item_id, details);
 }
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index 3170c1911c074..13de702f18863 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -304,7 +304,7 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowAlwaysOnTopChanged();
   void NotifyWindowExecuteAppCommand(const std::string& command);
   void NotifyTouchBarItemInteraction(const std::string& item_id,
-                                     const base::DictionaryValue& details);
+                                     base::Value::Dict details);
   void NotifyNewWindowForTab();
   void NotifyWindowSystemContextMenu(int x, int y, bool* prevent_default);
   void NotifyLayoutWindowControlsOverlay();
diff --git a/shell/browser/native_window_observer.h b/shell/browser/native_window_observer.h
index 64f06179ffede..6cbc941450642 100644
--- a/shell/browser/native_window_observer.h
+++ b/shell/browser/native_window_observer.h
@@ -93,7 +93,7 @@ class NativeWindowObserver : public base::CheckedObserver {
   virtual void OnWindowLeaveHtmlFullScreen() {}
   virtual void OnWindowAlwaysOnTopChanged() {}
   virtual void OnTouchBarItemResult(const std::string& item_id,
-                                    const base::DictionaryValue& details) {}
+                                    const base::Value::Dict& details) {}
   virtual void OnNewWindowForTab() {}
   virtual void OnSystemContextMenu(int x, int y, bool* prevent_default) {}
 
diff --git a/shell/browser/net/electron_url_loader_factory.cc b/shell/browser/net/electron_url_loader_factory.cc
index 02a93aae14bcb..b7418c82531cb 100644
--- a/shell/browser/net/electron_url_loader_factory.cc
+++ b/shell/browser/net/electron_url_loader_factory.cc
@@ -114,9 +114,9 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
   bool has_mime_type = dict.Get("mimeType", &head->mime_type);
   bool has_content_type = false;
 
-  base::DictionaryValue headers;
+  base::Value::Dict headers;
   if (dict.Get("headers", &headers)) {
-    for (const auto iter : headers.DictItems()) {
+    for (const auto iter : headers) {
       if (iter.second.is_string()) {
         // key, value
         head->headers->AddHeader(iter.first, iter.second.GetString());
@@ -513,7 +513,7 @@ void ElectronURLLoaderFactory::StartLoadingHttp(
   if (!dict.Get("method", &request->method))
     request->method = original_request.method;
 
-  base::DictionaryValue upload_data;
+  base::Value::Dict upload_data;
   if (request->method != net::HttpRequestHeaders::kGetMethod &&
       request->method != net::HttpRequestHeaders::kHeadMethod)
     dict.Get("uploadData", &upload_data);
diff --git a/shell/browser/net/url_pipe_loader.cc b/shell/browser/net/url_pipe_loader.cc
index 63895e6e3d03d..1729ded04a423 100644
--- a/shell/browser/net/url_pipe_loader.cc
+++ b/shell/browser/net/url_pipe_loader.cc
@@ -19,7 +19,7 @@ URLPipeLoader::URLPipeLoader(
     mojo::PendingReceiver<network::mojom::URLLoader> loader,
     mojo::PendingRemote<network::mojom::URLLoaderClient> client,
     const net::NetworkTrafficAnnotationTag& annotation,
-    base::DictionaryValue upload_data)
+    base::Value::Dict upload_data)
     : url_loader_(this, std::move(loader)), client_(std::move(client)) {
   url_loader_.set_disconnect_handler(base::BindOnce(
       &URLPipeLoader::NotifyComplete, base::Unretained(this), net::ERR_FAILED));
@@ -37,17 +37,17 @@ void URLPipeLoader::Start(
     scoped_refptr<network::SharedURLLoaderFactory> factory,
     std::unique_ptr<network::ResourceRequest> request,
     const net::NetworkTrafficAnnotationTag& annotation,
-    base::DictionaryValue upload_data) {
+    base::Value::Dict upload_data) {
   loader_ = network::SimpleURLLoader::Create(std::move(request), annotation);
   loader_->SetOnResponseStartedCallback(base::BindOnce(
       &URLPipeLoader::OnResponseStarted, weak_factory_.GetWeakPtr()));
 
   // TODO(zcbenz): The old protocol API only supports string as upload data,
   // we should seek to support more types in future.
-  std::string content_type, data;
-  if (upload_data.GetString("contentType", &content_type) &&
-      upload_data.GetString("data", &data))
-    loader_->AttachStringForUpload(data, content_type);
+  std::string* content_type = upload_data.FindString("contentType");
+  std::string* data = upload_data.FindString("data");
+  if (content_type && data)
+    loader_->AttachStringForUpload(*data, *content_type);
 
   loader_->DownloadAsStream(factory.get(), this);
 }
diff --git a/shell/browser/net/url_pipe_loader.h b/shell/browser/net/url_pipe_loader.h
index 09baa5f142619..e55a771ea1652 100644
--- a/shell/browser/net/url_pipe_loader.h
+++ b/shell/browser/net/url_pipe_loader.h
@@ -39,7 +39,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
                 mojo::PendingReceiver<network::mojom::URLLoader> loader,
                 mojo::PendingRemote<network::mojom::URLLoaderClient> client,
                 const net::NetworkTrafficAnnotationTag& annotation,
-                base::DictionaryValue upload_data);
+                base::Value::Dict upload_data);
 
   // disable copy
   URLPipeLoader(const URLPipeLoader&) = delete;
@@ -51,7 +51,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
   void Start(scoped_refptr<network::SharedURLLoaderFactory> factory,
              std::unique_ptr<network::ResourceRequest> request,
              const net::NetworkTrafficAnnotationTag& annotation,
-             base::DictionaryValue upload_data);
+             base::Value::Dict upload_data);
   void NotifyComplete(int result);
   void OnResponseStarted(const GURL& final_url,
                          const network::mojom::URLResponseHead& response_head);
diff --git a/shell/browser/ui/cocoa/electron_touch_bar.mm b/shell/browser/ui/cocoa/electron_touch_bar.mm
index 3272ebc652ed1..ae866e8629bbb 100644
--- a/shell/browser/ui/cocoa/electron_touch_bar.mm
+++ b/shell/browser/ui/cocoa/electron_touch_bar.mm
@@ -241,8 +241,7 @@ - (void)refreshTouchBarItem:(NSTouchBar*)touchBar
 - (void)buttonAction:(id)sender {
   NSString* item_id =
       [NSString stringWithFormat:@"%ld", ((NSButton*)sender).tag];
-  window_->NotifyTouchBarItemInteraction([item_id UTF8String],
-                                         base::DictionaryValue());
+  window_->NotifyTouchBarItemInteraction([item_id UTF8String], {});
 }
 
 - (void)colorPickerAction:(id)sender {
@@ -252,19 +251,20 @@ - (void)colorPickerAction:(id)sender {
   NSColor* color = ((NSColorPickerTouchBarItem*)sender).color;
   std::string hex_color =
       electron::ToRGBHex(skia::NSDeviceColorToSkColor(color));
-  base::DictionaryValue details;
-  details.SetString("color", hex_color);
-  window_->NotifyTouchBarItemInteraction([item_id UTF8String], details);
+  base::Value::Dict details;
+  details.Set("color", hex_color);
+  window_->NotifyTouchBarItemInteraction([item_id UTF8String],
+                                         std::move(details));
 }
 
 - (void)sliderAction:(id)sender {
   NSString* identifier = ((NSSliderTouchBarItem*)sender).identifier;
   NSString* item_id = [self idFromIdentifier:identifier
                                   withPrefix:SliderIdentifier];
-  base::DictionaryValue details;
-  details.SetInteger("value",
-                     [((NSSliderTouchBarItem*)sender).slider intValue]);
-  window_->NotifyTouchBarItemInteraction([item_id UTF8String], details);
+  base::Value::Dict details;
+  details.Set("value", [((NSSliderTouchBarItem*)sender).slider intValue]);
+  window_->NotifyTouchBarItemInteraction([item_id UTF8String],
+                                         std::move(details));
 }
 
 - (NSString*)idFromIdentifier:(NSString*)identifier
@@ -275,32 +275,33 @@ - (NSString*)idFromIdentifier:(NSString*)identifier
 - (void)segmentedControlAction:(id)sender {
   NSString* item_id =
       [NSString stringWithFormat:@"%ld", ((NSSegmentedControl*)sender).tag];
-  base::DictionaryValue details;
-  details.SetInteger("selectedIndex",
-                     ((NSSegmentedControl*)sender).selectedSegment);
-  details.SetBoolean(
+  base::Value::Dict details;
+  details.Set("selectedIndex",
+              static_cast<int>(((NSSegmentedControl*)sender).selectedSegment));
+  details.Set(
       "isSelected",
       [((NSSegmentedControl*)sender)
           isSelectedForSegment:((NSSegmentedControl*)sender).selectedSegment]);
-  window_->NotifyTouchBarItemInteraction([item_id UTF8String], details);
+  window_->NotifyTouchBarItemInteraction([item_id UTF8String],
+                                         std::move(details));
 }
 
 - (void)scrubber:(NSScrubber*)scrubber
     didSelectItemAtIndex:(NSInteger)selectedIndex {
-  base::DictionaryValue details;
-  details.SetInteger("selectedIndex", selectedIndex);
-  details.SetString("type", "select");
+  base::Value::Dict details;
+  details.Set("selectedIndex", static_cast<int>(selectedIndex));
+  details.Set("type", "select");
   window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String],
-                                         details);
+                                         std::move(details));
 }
 
 - (void)scrubber:(NSScrubber*)scrubber
     didHighlightItemAtIndex:(NSInteger)highlightedIndex {
-  base::DictionaryValue details;
-  details.SetInteger("highlightedIndex", highlightedIndex);
-  details.SetString("type", "highlight");
+  base::Value::Dict details;
+  details.Set("highlightedIndex", static_cast<int>(highlightedIndex));
+  details.Set("type", "highlight");
   window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String],
-                                         details);
+                                         std::move(details));
 }
 
 - (NSTouchBarItemIdentifier)identifierFromID:(const std::string&)item_id
diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc
index 060c7022fc3cd..dfb6b8cf1d883 100644
--- a/shell/common/api/electron_api_native_image.cc
+++ b/shell/common/api/electron_api_native_image.cc
@@ -329,24 +329,24 @@ float NativeImage::GetAspectRatio(const absl::optional<float> scale_factor) {
 }
 
 gin::Handle<NativeImage> NativeImage::Resize(gin::Arguments* args,
-                                             base::DictionaryValue options) {
+                                             base::Value::Dict options) {
   float scale_factor = GetScaleFactorFromOptions(args);
 
   gfx::Size size = GetSize(scale_factor);
-  int width = size.width();
-  int height = size.height();
-  bool width_set = options.GetInteger("width", &width);
-  bool height_set = options.GetInteger("height", &height);
+  absl::optional<int> new_width = options.FindInt("width");
+  absl::optional<int> new_height = options.FindInt("height");
+  int width = new_width.value_or(size.width());
+  int height = new_height.value_or(size.height());
   size.SetSize(width, height);
 
   if (width <= 0 && height <= 0) {
     return CreateEmpty(args->isolate());
-  } else if (width_set && !height_set) {
+  } else if (new_width && !new_height) {
     // Scale height to preserve original aspect ratio
     size.set_height(width);
     size =
         gfx::ScaleToRoundedSize(size, 1.f, 1.f / GetAspectRatio(scale_factor));
-  } else if (height_set && !width_set) {
+  } else if (new_height && !new_width) {
     // Scale width to preserve original aspect ratio
     size.set_width(height);
     size = gfx::ScaleToRoundedSize(size, GetAspectRatio(scale_factor), 1.f);
@@ -354,11 +354,10 @@ gin::Handle<NativeImage> NativeImage::Resize(gin::Arguments* args,
 
   skia::ImageOperations::ResizeMethod method =
       skia::ImageOperations::ResizeMethod::RESIZE_BEST;
-  std::string quality;
-  options.GetString("quality", &quality);
-  if (quality == "good")
+  std::string* quality = options.FindString("quality");
+  if (quality && *quality == "good")
     method = skia::ImageOperations::ResizeMethod::RESIZE_GOOD;
-  else if (quality == "better")
+  else if (quality && *quality == "better")
     method = skia::ImageOperations::ResizeMethod::RESIZE_BETTER;
 
   gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
diff --git a/shell/common/api/electron_api_native_image.h b/shell/common/api/electron_api_native_image.h
index 16c4f8ec0fbd7..3330765ff5d10 100644
--- a/shell/common/api/electron_api_native_image.h
+++ b/shell/common/api/electron_api_native_image.h
@@ -112,7 +112,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
   v8::Local<v8::Value> GetBitmap(gin::Arguments* args);
   v8::Local<v8::Value> GetNativeHandle(gin_helper::ErrorThrower thrower);
   gin::Handle<NativeImage> Resize(gin::Arguments* args,
-                                  base::DictionaryValue options);
+                                  base::Value::Dict options);
   gin::Handle<NativeImage> Crop(v8::Isolate* isolate, const gfx::Rect& rect);
   std::string ToDataURL(gin::Arguments* args);
   bool IsEmpty();
diff --git a/shell/common/gin_converters/extension_converter.cc b/shell/common/gin_converters/extension_converter.cc
index a81d6a81dc5b1..49e99e93905e4 100644
--- a/shell/common/gin_converters/extension_converter.cc
+++ b/shell/common/gin_converters/extension_converter.cc
@@ -22,7 +22,8 @@ v8::Local<v8::Value> Converter<const extensions::Extension*>::ToV8(
   dict.Set("path", extension->path());
   dict.Set("url", extension->url());
   dict.Set("version", extension->VersionString());
-  dict.Set("manifest", *(extension->manifest()->value()));
+  dict.Set("manifest",
+           *static_cast<const base::Value*>(extension->manifest()->value()));
 
   return gin::ConvertToV8(isolate, dict);
 }
diff --git a/shell/common/gin_converters/net_converter.cc b/shell/common/gin_converters/net_converter.cc
index 8b467d5509c23..687d7610a8be9 100644
--- a/shell/common/gin_converters/net_converter.cc
+++ b/shell/common/gin_converters/net_converter.cc
@@ -234,13 +234,13 @@ v8::Local<v8::Value> Converter<net::HttpRequestHeaders>::ToV8(
 bool Converter<net::HttpRequestHeaders>::FromV8(v8::Isolate* isolate,
                                                 v8::Local<v8::Value> val,
                                                 net::HttpRequestHeaders* out) {
-  base::DictionaryValue dict;
+  base::Value::Dict dict;
   if (!ConvertFromV8(isolate, val, &dict))
     return false;
-  for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
-    if (it.value().is_string()) {
-      std::string value = it.value().GetString();
-      out->SetHeader(it.key(), value);
+  for (const auto it : dict) {
+    if (it.second.is_string()) {
+      std::string value = it.second.GetString();
+      out->SetHeader(it.first, value);
     }
   }
   return true;
diff --git a/shell/common/gin_converters/value_converter.cc b/shell/common/gin_converters/value_converter.cc
index db89b6a63edf4..414d535db5ebd 100644
--- a/shell/common/gin_converters/value_converter.cc
+++ b/shell/common/gin_converters/value_converter.cc
@@ -7,38 +7,38 @@
 #include <memory>
 #include <utility>
 
-#include "base/values.h"
-#include "shell/common/v8_value_converter.h"
+#include "content/public/renderer/v8_value_converter.h"
 
 namespace gin {
 
-bool Converter<base::DictionaryValue>::FromV8(v8::Isolate* isolate,
-                                              v8::Local<v8::Value> val,
-                                              base::DictionaryValue* out) {
-  electron::V8ValueConverter converter;
-  std::unique_ptr<base::Value> value(
-      converter.FromV8Value(val, isolate->GetCurrentContext()));
+bool Converter<base::Value::Dict>::FromV8(v8::Isolate* isolate,
+                                          v8::Local<v8::Value> val,
+                                          base::Value::Dict* out) {
+  std::unique_ptr<base::Value> value =
+      content::V8ValueConverter::Create()->FromV8Value(
+          val, isolate->GetCurrentContext());
   if (value && value->is_dict()) {
-    out->Swap(static_cast<base::DictionaryValue*>(value.get()));
+    *out = std::move(value->GetDict());
     return true;
   } else {
     return false;
   }
 }
 
-v8::Local<v8::Value> Converter<base::DictionaryValue>::ToV8(
+v8::Local<v8::Value> Converter<base::Value::Dict>::ToV8(
     v8::Isolate* isolate,
-    const base::DictionaryValue& val) {
-  electron::V8ValueConverter converter;
-  return converter.ToV8Value(&val, isolate->GetCurrentContext());
+    const base::Value::Dict& val) {
+  base::Value value(val.Clone());
+  return content::V8ValueConverter::Create()->ToV8Value(
+      &value, isolate->GetCurrentContext());
 }
 
 bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
                                     v8::Local<v8::Value> val,
                                     base::Value* out) {
-  electron::V8ValueConverter converter;
-  std::unique_ptr<base::Value> value(
-      converter.FromV8Value(val, isolate->GetCurrentContext()));
+  std::unique_ptr<base::Value> value =
+      content::V8ValueConverter::Create()->FromV8Value(
+          val, isolate->GetCurrentContext());
   if (value) {
     *out = std::move(*value);
     return true;
@@ -49,29 +49,30 @@ bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
 
 v8::Local<v8::Value> Converter<base::Value>::ToV8(v8::Isolate* isolate,
                                                   const base::Value& val) {
-  electron::V8ValueConverter converter;
-  return converter.ToV8Value(&val, isolate->GetCurrentContext());
+  return content::V8ValueConverter::Create()->ToV8Value(
+      &val, isolate->GetCurrentContext());
 }
 
-bool Converter<base::ListValue>::FromV8(v8::Isolate* isolate,
-                                        v8::Local<v8::Value> val,
-                                        base::ListValue* out) {
-  electron::V8ValueConverter converter;
-  std::unique_ptr<base::Value> value(
-      converter.FromV8Value(val, isolate->GetCurrentContext()));
+bool Converter<base::Value::List>::FromV8(v8::Isolate* isolate,
+                                          v8::Local<v8::Value> val,
+                                          base::Value::List* out) {
+  std::unique_ptr<base::Value> value =
+      content::V8ValueConverter::Create()->FromV8Value(
+          val, isolate->GetCurrentContext());
   if (value && value->is_list()) {
-    out->Swap(static_cast<base::ListValue*>(value.get()));
+    *out = std::move(value->GetList());
     return true;
   } else {
     return false;
   }
 }
 
-v8::Local<v8::Value> Converter<base::ListValue>::ToV8(
+v8::Local<v8::Value> Converter<base::Value::List>::ToV8(
     v8::Isolate* isolate,
-    const base::ListValue& val) {
-  electron::V8ValueConverter converter;
-  return converter.ToV8Value(&val, isolate->GetCurrentContext());
+    const base::Value::List& val) {
+  base::Value value(val.Clone());
+  return content::V8ValueConverter::Create()->ToV8Value(
+      &value, isolate->GetCurrentContext());
 }
 
 }  // namespace gin
diff --git a/shell/common/gin_converters/value_converter.h b/shell/common/gin_converters/value_converter.h
index 16a79af43b9e0..a5c7996883d6b 100644
--- a/shell/common/gin_converters/value_converter.h
+++ b/shell/common/gin_converters/value_converter.h
@@ -5,23 +5,18 @@
 #ifndef ELECTRON_SHELL_COMMON_GIN_CONVERTERS_VALUE_CONVERTER_H_
 #define ELECTRON_SHELL_COMMON_GIN_CONVERTERS_VALUE_CONVERTER_H_
 
+#include "base/values.h"
 #include "gin/converter.h"
 
-namespace base {
-class DictionaryValue;
-class ListValue;
-class Value;
-}  // namespace base
-
 namespace gin {
 
 template <>
-struct Converter<base::DictionaryValue> {
+struct Converter<base::Value::Dict> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     base::DictionaryValue* out);
+                     base::Value::Dict* out);
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const base::DictionaryValue& val);
+                                   const base::Value::Dict& val);
 };
 
 template <>
@@ -34,12 +29,12 @@ struct Converter<base::Value> {
 };
 
 template <>
-struct Converter<base::ListValue> {
+struct Converter<base::Value::List> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     base::ListValue* out);
+                     base::Value::List* out);
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const base::ListValue& val);
+                                   const base::Value::List& val);
 };
 
 }  // namespace gin
diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc
deleted file mode 100644
index 971b16b07e330..0000000000000
--- a/shell/common/v8_value_converter.cc
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "shell/common/v8_value_converter.h"
-
-#include <iterator>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/logging.h"
-#include "base/values.h"
-#include "shell/common/gin_helper/dictionary.h"
-#include "shell/common/node_bindings.h"
-#include "shell/common/node_includes.h"
-
-namespace electron {
-
-namespace {
-
-const int kMaxRecursionDepth = 100;
-
-}  // namespace
-
-// The state of a call to FromV8Value.
-class V8ValueConverter::FromV8ValueState {
- public:
-  // Level scope which updates the current depth of some FromV8ValueState.
-  class Level {
-   public:
-    explicit Level(FromV8ValueState* state) : state_(state) {
-      state_->max_recursion_depth_--;
-    }
-    ~Level() { state_->max_recursion_depth_++; }
-
-   private:
-    FromV8ValueState* state_;
-  };
-
-  FromV8ValueState() : max_recursion_depth_(kMaxRecursionDepth) {}
-
-  // If |handle| is not in |unique_map_|, then add it to |unique_map_| and
-  // return true.
-  //
-  // Otherwise do nothing and return false. Here "A is unique" means that no
-  // other handle B in the map points to the same object as A. Note that A can
-  // be unique even if there already is another handle with the same identity
-  // hash (key) in the map, because two objects can have the same hash.
-  bool AddToUniquenessCheck(v8::Local<v8::Object> handle) {
-    int hash;
-    auto iter = GetIteratorInMap(handle, &hash);
-    if (iter != unique_map_.end())
-      return false;
-
-    unique_map_.insert(std::make_pair(hash, handle));
-    return true;
-  }
-
-  bool RemoveFromUniquenessCheck(v8::Local<v8::Object> handle) {
-    int unused_hash;
-    auto iter = GetIteratorInMap(handle, &unused_hash);
-    if (iter == unique_map_.end())
-      return false;
-    unique_map_.erase(iter);
-    return true;
-  }
-
-  bool HasReachedMaxRecursionDepth() { return max_recursion_depth_ < 0; }
-
- private:
-  using HashToHandleMap = std::multimap<int, v8::Local<v8::Object>>;
-  using Iterator = HashToHandleMap::const_iterator;
-
-  Iterator GetIteratorInMap(v8::Local<v8::Object> handle, int* hash) {
-    *hash = handle->GetIdentityHash();
-    // We only compare using == with handles to objects with the same identity
-    // hash. Different hash obviously means different objects, but two objects
-    // in a couple of thousands could have the same identity hash.
-    std::pair<Iterator, Iterator> range = unique_map_.equal_range(*hash);
-    for (auto it = range.first; it != range.second; ++it) {
-      // Operator == for handles actually compares the underlying objects.
-      if (it->second == handle)
-        return it;
-    }
-    // Not found.
-    return unique_map_.end();
-  }
-
-  HashToHandleMap unique_map_;
-
-  int max_recursion_depth_;
-};
-
-// A class to ensure that objects/arrays that are being converted by
-// this V8ValueConverterImpl do not have cycles.
-//
-// An example of cycle: var v = {}; v = {key: v};
-// Not an example of cycle: var v = {}; a = [v, v]; or w = {a: v, b: v};
-class V8ValueConverter::ScopedUniquenessGuard {
- public:
-  ScopedUniquenessGuard(V8ValueConverter::FromV8ValueState* state,
-                        v8::Local<v8::Object> value)
-      : state_(state),
-        value_(value),
-        is_valid_(state_->AddToUniquenessCheck(value_)) {}
-  ~ScopedUniquenessGuard() {
-    if (is_valid_) {
-      bool removed = state_->RemoveFromUniquenessCheck(value_);
-      DCHECK(removed);
-    }
-  }
-
-  // disable copy
-  ScopedUniquenessGuard(const ScopedUniquenessGuard&) = delete;
-  ScopedUniquenessGuard& operator=(const ScopedUniquenessGuard&) = delete;
-
-  bool is_valid() const { return is_valid_; }
-
- private:
-  typedef std::multimap<int, v8::Local<v8::Object>> HashToHandleMap;
-  V8ValueConverter::FromV8ValueState* state_;
-  v8::Local<v8::Object> value_;
-  bool is_valid_;
-};
-
-V8ValueConverter::V8ValueConverter() = default;
-
-void V8ValueConverter::SetRegExpAllowed(bool val) {
-  reg_exp_allowed_ = val;
-}
-
-void V8ValueConverter::SetFunctionAllowed(bool val) {
-  function_allowed_ = val;
-}
-
-void V8ValueConverter::SetStripNullFromObjects(bool val) {
-  strip_null_from_objects_ = val;
-}
-
-v8::Local<v8::Value> V8ValueConverter::ToV8Value(
-    const base::Value* value,
-    v8::Local<v8::Context> context) const {
-  v8::Context::Scope context_scope(context);
-  v8::EscapableHandleScope handle_scope(context->GetIsolate());
-  return handle_scope.Escape(ToV8ValueImpl(context->GetIsolate(), value));
-}
-
-std::unique_ptr<base::Value> V8ValueConverter::FromV8Value(
-    v8::Local<v8::Value> val,
-    v8::Local<v8::Context> context) const {
-  v8::Context::Scope context_scope(context);
-  v8::HandleScope handle_scope(context->GetIsolate());
-  FromV8ValueState state;
-  return FromV8ValueImpl(&state, val, context->GetIsolate());
-}
-
-v8::Local<v8::Value> V8ValueConverter::ToV8ValueImpl(
-    v8::Isolate* isolate,
-    const base::Value* value) const {
-  switch (value->type()) {
-    case base::Value::Type::NONE:
-      return v8::Null(isolate);
-
-    case base::Value::Type::BOOLEAN: {
-      bool val = value->GetBool();
-      return v8::Boolean::New(isolate, val);
-    }
-
-    case base::Value::Type::INTEGER: {
-      int val = value->GetInt();
-      return v8::Integer::New(isolate, val);
-    }
-
-    case base::Value::Type::DOUBLE: {
-      double val = value->GetDouble();
-      return v8::Number::New(isolate, val);
-    }
-
-    case base::Value::Type::STRING: {
-      std::string val = value->GetString();
-      return v8::String::NewFromUtf8(isolate, val.c_str(),
-                                     v8::NewStringType::kNormal, val.length())
-          .ToLocalChecked();
-    }
-
-    case base::Value::Type::LIST:
-      return ToV8Array(isolate, static_cast<const base::ListValue*>(value));
-
-    case base::Value::Type::DICTIONARY:
-      return ToV8Object(isolate,
-                        static_cast<const base::DictionaryValue*>(value));
-
-    case base::Value::Type::BINARY:
-      return ToArrayBuffer(isolate, static_cast<const base::Value*>(value));
-
-    default:
-      LOG(ERROR) << "Unexpected value type: " << value->type();
-      return v8::Null(isolate);
-  }
-}
-
-v8::Local<v8::Value> V8ValueConverter::ToV8Array(
-    v8::Isolate* isolate,
-    const base::ListValue* val) const {
-  v8::Local<v8::Array> result(
-      v8::Array::New(isolate, val->GetListDeprecated().size()));
-  auto context = isolate->GetCurrentContext();
-
-  for (size_t i = 0; i < val->GetListDeprecated().size(); ++i) {
-    const base::Value& child = val->GetListDeprecated()[i];
-
-    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &child);
-
-    v8::TryCatch try_catch(isolate);
-    result->Set(context, static_cast<uint32_t>(i), child_v8).Check();
-    if (try_catch.HasCaught())
-      LOG(ERROR) << "Setter for index " << i << " threw an exception.";
-  }
-
-  return result;
-}
-
-v8::Local<v8::Value> V8ValueConverter::ToV8Object(
-    v8::Isolate* isolate,
-    const base::DictionaryValue* val) const {
-  gin_helper::Dictionary result = gin::Dictionary::CreateEmpty(isolate);
-  result.SetHidden("simple", true);
-
-  for (base::DictionaryValue::Iterator iter(*val); !iter.IsAtEnd();
-       iter.Advance()) {
-    const std::string& key = iter.key();
-    v8::Local<v8::Value> child_v8 = ToV8ValueImpl(isolate, &iter.value());
-
-    v8::TryCatch try_catch(isolate);
-    result.Set(key, child_v8);
-    if (try_catch.HasCaught()) {
-      LOG(ERROR) << "Setter for property " << key.c_str() << " threw an "
-                 << "exception.";
-    }
-  }
-
-  return result.GetHandle();
-}
-
-v8::Local<v8::Value> V8ValueConverter::ToArrayBuffer(
-    v8::Isolate* isolate,
-    const base::Value* value) const {
-  const auto* data = reinterpret_cast<const char*>(value->GetBlob().data());
-  size_t length = value->GetBlob().size();
-
-  if (NodeBindings::IsInitialized()) {
-    return node::Buffer::Copy(isolate, data, length).ToLocalChecked();
-  }
-
-  if (length > node::Buffer::kMaxLength) {
-    return v8::Local<v8::Object>();
-  }
-  auto context = isolate->GetCurrentContext();
-  auto array_buffer = v8::ArrayBuffer::New(isolate, length);
-  std::shared_ptr<v8::BackingStore> backing_store =
-      array_buffer->GetBackingStore();
-  memcpy(backing_store->Data(), data, length);
-  // From this point, if something goes wrong(can't find Buffer class for
-  // example) we'll simply return a Uint8Array based on the created ArrayBuffer.
-  // This can happen if no preload script was specified to the renderer.
-  gin_helper::Dictionary global(isolate, context->Global());
-  v8::Local<v8::Value> buffer_value;
-
-  // Get the Buffer class stored as a hidden value in the global object. We'll
-  // use it return a browserified Buffer.
-  if (!global.GetHidden("Buffer", &buffer_value) ||
-      !buffer_value->IsFunction()) {
-    return v8::Uint8Array::New(array_buffer, 0, length);
-  }
-
-  gin::Dictionary buffer_class(
-      isolate,
-      buffer_value->ToObject(isolate->GetCurrentContext()).ToLocalChecked());
-  v8::Local<v8::Value> from_value;
-  if (!buffer_class.Get("from", &from_value) || !from_value->IsFunction()) {
-    return v8::Uint8Array::New(array_buffer, 0, length);
-  }
-
-  v8::Local<v8::Value> args[] = {array_buffer};
-  auto func = from_value.As<v8::Function>();
-  auto result = func->Call(context, v8::Null(isolate), std::size(args), args);
-  if (!result.IsEmpty()) {
-    return result.ToLocalChecked();
-  }
-
-  return v8::Uint8Array::New(array_buffer, 0, length);
-}
-
-std::unique_ptr<base::Value> V8ValueConverter::FromV8ValueImpl(
-    FromV8ValueState* state,
-    v8::Local<v8::Value> val,
-    v8::Isolate* isolate) const {
-  FromV8ValueState::Level state_level(state);
-  if (state->HasReachedMaxRecursionDepth())
-    return nullptr;
-
-  if (val->IsExternal())
-    return std::make_unique<base::Value>();
-
-  if (val->IsNull())
-    return std::make_unique<base::Value>();
-
-  auto context = isolate->GetCurrentContext();
-
-  if (val->IsBoolean())
-    return std::make_unique<base::Value>(val->ToBoolean(isolate)->Value());
-
-  if (val->IsInt32())
-    return std::make_unique<base::Value>(val.As<v8::Int32>()->Value());
-
-  if (val->IsNumber()) {
-    double val_as_double = val.As<v8::Number>()->Value();
-    if (!std::isfinite(val_as_double))
-      return nullptr;
-    return std::make_unique<base::Value>(val_as_double);
-  }
-
-  if (val->IsString()) {
-    v8::String::Utf8Value utf8(isolate, val);
-    return std::make_unique<base::Value>(std::string(*utf8, utf8.length()));
-  }
-
-  if (val->IsUndefined())
-    // JSON.stringify ignores undefined.
-    return nullptr;
-
-  if (val->IsDate()) {
-    v8::Date* date = v8::Date::Cast(*val);
-    v8::Local<v8::Value> toISOString =
-        date->Get(context, v8::String::NewFromUtf8(isolate, "toISOString",
-                                                   v8::NewStringType::kNormal)
-                               .ToLocalChecked())
-            .ToLocalChecked();
-    if (toISOString->IsFunction()) {
-      v8::MaybeLocal<v8::Value> result =
-          toISOString.As<v8::Function>()->Call(context, val, 0, nullptr);
-      if (!result.IsEmpty()) {
-        v8::String::Utf8Value utf8(isolate, result.ToLocalChecked());
-        return std::make_unique<base::Value>(std::string(*utf8, utf8.length()));
-      }
-    }
-  }
-
-  if (val->IsRegExp()) {
-    if (!reg_exp_allowed_)
-      // JSON.stringify converts to an object.
-      return FromV8Object(val.As<v8::Object>(), state, isolate);
-    return std::make_unique<base::Value>(*v8::String::Utf8Value(isolate, val));
-  }
-
-  // v8::Value doesn't have a ToArray() method for some reason.
-  if (val->IsArray())
-    return FromV8Array(val.As<v8::Array>(), state, isolate);
-
-  if (val->IsFunction()) {
-    if (!function_allowed_)
-      // JSON.stringify refuses to convert function(){}.
-      return nullptr;
-    return FromV8Object(val.As<v8::Object>(), state, isolate);
-  }
-
-  if (node::Buffer::HasInstance(val)) {
-    return FromNodeBuffer(val, state, isolate);
-  }
-
-  if (val->IsObject()) {
-    return FromV8Object(val.As<v8::Object>(), state, isolate);
-  }
-
-  LOG(ERROR) << "Unexpected v8 value type encountered.";
-  return nullptr;
-}
-
-std::unique_ptr<base::Value> V8ValueConverter::FromV8Array(
-    v8::Local<v8::Array> val,
-    FromV8ValueState* state,
-    v8::Isolate* isolate) const {
-  ScopedUniquenessGuard uniqueness_guard(state, val);
-  if (!uniqueness_guard.is_valid())
-    return std::make_unique<base::Value>();
-
-  std::unique_ptr<v8::Context::Scope> scope;
-  // If val was created in a different context than our current one, change to
-  // that context, but change back after val is converted.
-  if (!val->GetCreationContextChecked().IsEmpty() &&
-      val->GetCreationContextChecked() != isolate->GetCurrentContext())
-    scope =
-        std::make_unique<v8::Context::Scope>(val->GetCreationContextChecked());
-
-  std::unique_ptr<base::ListValue> result(new base::ListValue());
-
-  // Only fields with integer keys are carried over to the ListValue.
-  for (uint32_t i = 0; i < val->Length(); ++i) {
-    v8::TryCatch try_catch(isolate);
-    v8::Local<v8::Value> child_v8;
-    v8::MaybeLocal<v8::Value> maybe_child =
-        val->Get(isolate->GetCurrentContext(), i);
-    if (try_catch.HasCaught() || !maybe_child.ToLocal(&child_v8)) {
-      LOG(ERROR) << "Getter for index " << i << " threw an exception.";
-      child_v8 = v8::Null(isolate);
-    }
-
-    if (!val->HasRealIndexedProperty(isolate->GetCurrentContext(), i)
-             .FromMaybe(false)) {
-      result->Append(base::Value());
-      continue;
-    }
-
-    std::unique_ptr<base::Value> child =
-        FromV8ValueImpl(state, child_v8, isolate);
-    if (child) {
-      result->Append(base::Value::FromUniquePtrValue(std::move(child)));
-    } else {
-      // JSON.stringify puts null in places where values don't serialize, for
-      // example undefined and functions. Emulate that behavior.
-      result->Append(base::Value());
-    }
-  }
-  return std::move(result);
-}
-
-std::unique_ptr<base::Value> V8ValueConverter::FromNodeBuffer(
-    v8::Local<v8::Value> value,
-    FromV8ValueState* state,
-    v8::Isolate* isolate) const {
-  std::vector<char> buffer(
-      node::Buffer::Data(value),
-      node::Buffer::Data(value) + node::Buffer::Length(value));
-  return std::make_unique<base::Value>(std::move(buffer));
-}
-
-std::unique_ptr<base::Value> V8ValueConverter::FromV8Object(
-    v8::Local<v8::Object> val,
-    FromV8ValueState* state,
-    v8::Isolate* isolate) const {
-  ScopedUniquenessGuard uniqueness_guard(state, val);
-  if (!uniqueness_guard.is_valid())
-    return std::make_unique<base::Value>();
-
-  std::unique_ptr<v8::Context::Scope> scope;
-  // If val was created in a different context than our current one, change to
-  // that context, but change back after val is converted.
-  if (!val->GetCreationContextChecked().IsEmpty() &&
-      val->GetCreationContextChecked() != isolate->GetCurrentContext())
-    scope =
-        std::make_unique<v8::Context::Scope>(val->GetCreationContextChecked());
-
-  auto result = std::make_unique<base::DictionaryValue>();
-  v8::Local<v8::Array> property_names;
-  if (!val->GetOwnPropertyNames(isolate->GetCurrentContext())
-           .ToLocal(&property_names)) {
-    return std::move(result);
-  }
-
-  for (uint32_t i = 0; i < property_names->Length(); ++i) {
-    v8::Local<v8::Value> key =
-        property_names->Get(isolate->GetCurrentContext(), i).ToLocalChecked();
-
-    // Extend this test to cover more types as necessary and if sensible.
-    if (!key->IsString() && !key->IsNumber()) {
-      NOTREACHED() << "Key \"" << *v8::String::Utf8Value(isolate, key)
-                   << "\" "
-                      "is neither a string nor a number";
-      continue;
-    }
-
-    v8::String::Utf8Value name_utf8(isolate, key);
-
-    v8::TryCatch try_catch(isolate);
-    v8::Local<v8::Value> child_v8;
-    v8::MaybeLocal<v8::Value> maybe_child =
-        val->Get(isolate->GetCurrentContext(), key);
-    if (try_catch.HasCaught() || !maybe_child.ToLocal(&child_v8)) {
-      LOG(ERROR) << "Getter for property " << *name_utf8
-                 << " threw an exception.";
-      child_v8 = v8::Null(isolate);
-    }
-
-    std::unique_ptr<base::Value> child =
-        FromV8ValueImpl(state, child_v8, isolate);
-    if (!child)
-      // JSON.stringify skips properties whose values don't serialize, for
-      // example undefined and functions. Emulate that behavior.
-      continue;
-
-    // Strip null if asked (and since undefined is turned into null, undefined
-    // too). The use case for supporting this is JSON-schema support,
-    // specifically for extensions, where "optional" JSON properties may be
-    // represented as null, yet due to buggy legacy code elsewhere isn't
-    // treated as such (potentially causing crashes). For example, the
-    // "tabs.create" function takes an object as its first argument with an
-    // optional "windowId" property.
-    //
-    // Given just
-    //
-    //   tabs.create({})
-    //
-    // this will work as expected on code that only checks for the existence of
-    // a "windowId" property (such as that legacy code). However given
-    //
-    //   tabs.create({windowId: null})
-    //
-    // there *is* a "windowId" property, but since it should be an int, code
-    // on the browser which doesn't additionally check for null will fail.
-    // We can avoid all bugs related to this by stripping null.
-    if (strip_null_from_objects_ && child->is_none())
-      continue;
-
-    result->SetWithoutPathExpansion(std::string(*name_utf8, name_utf8.length()),
-                                    std::move(child));
-  }
-
-  return std::move(result);
-}
-
-}  // namespace electron
diff --git a/shell/common/v8_value_converter.h b/shell/common/v8_value_converter.h
deleted file mode 100644
index 5a1c5e21b90c0..0000000000000
--- a/shell/common/v8_value_converter.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ELECTRON_SHELL_COMMON_V8_VALUE_CONVERTER_H_
-#define ELECTRON_SHELL_COMMON_V8_VALUE_CONVERTER_H_
-
-#include <memory>
-
-#include "base/compiler_specific.h"
-#include "v8/include/v8.h"
-
-namespace base {
-class DictionaryValue;
-class ListValue;
-class Value;
-}  // namespace base
-
-namespace electron {
-
-class V8ValueConverter {
- public:
-  V8ValueConverter();
-
-  // disable copy
-  V8ValueConverter(const V8ValueConverter&) = delete;
-  V8ValueConverter& operator=(const V8ValueConverter&) = delete;
-
-  void SetRegExpAllowed(bool val);
-  void SetFunctionAllowed(bool val);
-  void SetStripNullFromObjects(bool val);
-  v8::Local<v8::Value> ToV8Value(const base::Value* value,
-                                 v8::Local<v8::Context> context) const;
-  std::unique_ptr<base::Value> FromV8Value(
-      v8::Local<v8::Value> value,
-      v8::Local<v8::Context> context) const;
-
- private:
-  class FromV8ValueState;
-  class ScopedUniquenessGuard;
-
-  v8::Local<v8::Value> ToV8ValueImpl(v8::Isolate* isolate,
-                                     const base::Value* value) const;
-  v8::Local<v8::Value> ToV8Array(v8::Isolate* isolate,
-                                 const base::ListValue* list) const;
-  v8::Local<v8::Value> ToV8Object(
-      v8::Isolate* isolate,
-      const base::DictionaryValue* dictionary) const;
-  v8::Local<v8::Value> ToArrayBuffer(v8::Isolate* isolate,
-                                     const base::Value* value) const;
-
-  std::unique_ptr<base::Value> FromV8ValueImpl(FromV8ValueState* state,
-                                               v8::Local<v8::Value> value,
-                                               v8::Isolate* isolate) const;
-  std::unique_ptr<base::Value> FromV8Array(v8::Local<v8::Array> array,
-                                           FromV8ValueState* state,
-                                           v8::Isolate* isolate) const;
-  std::unique_ptr<base::Value> FromNodeBuffer(v8::Local<v8::Value> value,
-                                              FromV8ValueState* state,
-                                              v8::Isolate* isolate) const;
-  std::unique_ptr<base::Value> FromV8Object(v8::Local<v8::Object> object,
-                                            FromV8ValueState* state,
-                                            v8::Isolate* isolate) const;
-
-  // If true, we will convert RegExp JavaScript objects to string.
-  bool reg_exp_allowed_ = false;
-
-  // If true, we will convert Function JavaScript objects to dictionaries.
-  bool function_allowed_ = false;
-
-  // If true, undefined and null values are ignored when converting v8 objects
-  // into Values.
-  bool strip_null_from_objects_ = false;
-};
-
-}  // namespace electron
-
-#endif  // ELECTRON_SHELL_COMMON_V8_VALUE_CONVERTER_H_
diff --git a/spec-main/api-system-preferences-spec.ts b/spec-main/api-system-preferences-spec.ts
index 38a16045ddb13..d050e40d816a0 100644
--- a/spec-main/api-system-preferences-spec.ts
+++ b/spec-main/api-system-preferences-spec.ts
@@ -46,7 +46,6 @@ describe('systemPreferences module', () => {
       const badDefaults = [
         1,
         null,
-        new Date(),
         { one: null }
       ];
 

From e5db178ab6ced4bd2fb315457dc1e3cabf9d379f Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 5 Jul 2022 08:28:22 -0700
Subject: [PATCH 558/811] feat: enable v8 sandboxed pointers (#34724)

* feat: enable v8 sandboxed pointers

* update breaking-changes.md

* update zero-fill patch

benchmarks showed the function call was slower
---
 build/args/all.gn                             |   4 -
 docs/breaking-changes.md                      |   7 +
 .../node/support_v8_sandboxed_pointers.patch  | 170 ++++--------------
 patches/v8/.patches                           |   1 -
 .../force_disable_v8_sandboxed_pointers.patch |  24 ---
 5 files changed, 41 insertions(+), 165 deletions(-)
 delete mode 100644 patches/v8/force_disable_v8_sandboxed_pointers.patch

diff --git a/build/args/all.gn b/build/args/all.gn
index 9a3fee65b82d2..f1de439d833fc 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -45,7 +45,3 @@ enable_cet_shadow_stack = false
 # V8 in the browser process.
 # Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
 is_cfi = false
-
-# TODO(nornagon): this is disabled until node.js's internals can be made
-# compatible with sandboxed pointers.
-v8_enable_sandboxed_pointers = false
diff --git a/docs/breaking-changes.md b/docs/breaking-changes.md
index ad74ddcb1c200..c6c511b32bb18 100644
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -14,6 +14,13 @@ This document uses the following convention to categorize breaking changes:
 
 ## Planned Breaking API Changes (20.0)
 
+### Behavior Changed: V8 Memory Cage enabled
+
+The V8 memory cage has been enabled, which has implications for native modules
+which wrap non-V8 memory with `ArrayBuffer` or `Buffer`. See the [blog post
+about the V8 memory cage](https://www.electronjs.org/blog/v8-memory-cage) for
+more details.
+
 ### API Changed: `webContents.printToPDF()`
 
 `webContents.printToPDF()` has been modified to conform to [`Page.printToPDF`](https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF) in the Chrome DevTools Protocol. This has been changes in order to
diff --git a/patches/node/support_v8_sandboxed_pointers.patch b/patches/node/support_v8_sandboxed_pointers.patch
index 08a61216abb4a..76c60ed36b339 100644
--- a/patches/node/support_v8_sandboxed_pointers.patch
+++ b/patches/node/support_v8_sandboxed_pointers.patch
@@ -6,84 +6,27 @@ Subject: support V8 sandboxed pointers
 This refactors several allocators to allocate within the V8 memory cage,
 allowing them to be compatible with the V8_SANDBOXED_POINTERS feature.
 
-diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index 4c459b58b5a048d9d8a4f15f4011e7cce68089f4..6fb4c8d4567aee5b313ad621ea42699a196f18c7 100644
---- a/lib/internal/bootstrap/pre_execution.js
-+++ b/lib/internal/bootstrap/pre_execution.js
-@@ -14,7 +14,6 @@ const {
-   getOptionValue,
-   getEmbedderOptions,
- } = require('internal/options');
--const { reconnectZeroFillToggle } = require('internal/buffer');
- const {
-   defineOperation,
-   emitExperimentalWarning,
-@@ -26,10 +25,6 @@ const { ERR_MANIFEST_ASSERT_INTEGRITY } = require('internal/errors').codes;
- const assert = require('internal/assert');
- 
- function prepareMainThreadExecution(expandArgv1 = false) {
--  // TODO(joyeecheung): this is also necessary for workers when they deserialize
--  // this toggle from the snapshot.
--  reconnectZeroFillToggle();
--
-   // Patch the process object with legacy properties and normalizations
-   patchProcessObject(expandArgv1);
-   setupTraceCategoryState();
-diff --git a/lib/internal/buffer.js b/lib/internal/buffer.js
-index bd38cf48a7fc6e8d61d8f11fa15c34aee182cbe3..1aa071cdc071dcdaf5c3b4bed0d3d76e5871731d 100644
---- a/lib/internal/buffer.js
-+++ b/lib/internal/buffer.js
-@@ -30,7 +30,7 @@ const {
-   hexWrite,
-   ucs2Write,
-   utf8Write,
--  getZeroFillToggle
-+  setZeroFillToggle
- } = internalBinding('buffer');
- const {
-   untransferable_object_private_symbol,
-@@ -1055,24 +1055,15 @@ function markAsUntransferable(obj) {
- // in C++.
- // |zeroFill| can be undefined when running inside an isolate where we
- // do not own the ArrayBuffer allocator.  Zero fill is always on in that case.
--let zeroFill = getZeroFillToggle();
- function createUnsafeBuffer(size) {
--  zeroFill[0] = 0;
-+  setZeroFillToggle(false);
-   try {
-     return new FastBuffer(size);
-   } finally {
--    zeroFill[0] = 1;
-+    setZeroFillToggle(true)
-   }
- }
- 
--// The connection between the JS land zero fill toggle and the
--// C++ one in the NodeArrayBufferAllocator gets lost if the toggle
--// is deserialized from the snapshot, because V8 owns the underlying
--// memory of this toggle. This resets the connection.
--function reconnectZeroFillToggle() {
--  zeroFill = getZeroFillToggle();
--}
--
- module.exports = {
-   FastBuffer,
-   addBufferPrototypeMethods,
-@@ -1080,5 +1071,4 @@ module.exports = {
-   createUnsafeBuffer,
-   readUInt16BE,
-   readUInt32BE,
--  reconnectZeroFillToggle
- };
 diff --git a/src/api/environment.cc b/src/api/environment.cc
-index 2abf5994405e8da2a04d1b23b75ccd3658398474..024d612a04d83583b397549589d994e32cf0107f 100644
+index 2abf5994405e8da2a04d1b23b75ccd3658398474..b06e8529bb8ca2fa6d7f0735531bbbf39da6af12 100644
 --- a/src/api/environment.cc
 +++ b/src/api/environment.cc
-@@ -83,16 +83,16 @@ MaybeLocal<Value> PrepareStackTraceCallback(Local<Context> context,
+@@ -80,19 +80,27 @@ MaybeLocal<Value> PrepareStackTraceCallback(Local<Context> context,
+   return result;
+ }
+ 
++NodeArrayBufferAllocator::NodeArrayBufferAllocator() {
++  zero_fill_field_ = static_cast<uint32_t*>(allocator_->Allocate(sizeof(*zero_fill_field_)));
++}
++
++NodeArrayBufferAllocator::~NodeArrayBufferAllocator() {
++  allocator_->Free(zero_fill_field_, sizeof(*zero_fill_field_));
++}
++
  void* NodeArrayBufferAllocator::Allocate(size_t size) {
    void* ret;
-   if (zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
+-  if (zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
 -    ret = UncheckedCalloc(size);
++  if (*zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
 +    ret = allocator_->Allocate(size);
    else
 -    ret = UncheckedMalloc(size);
@@ -99,7 +42,7 @@ index 2abf5994405e8da2a04d1b23b75ccd3658398474..024d612a04d83583b397549589d994e3
    if (LIKELY(ret != nullptr))
      total_mem_usage_.fetch_add(size, std::memory_order_relaxed);
    return ret;
-@@ -100,7 +100,7 @@ void* NodeArrayBufferAllocator::AllocateUninitialized(size_t size) {
+@@ -100,7 +108,7 @@ void* NodeArrayBufferAllocator::AllocateUninitialized(size_t size) {
  
  void* NodeArrayBufferAllocator::Reallocate(
      void* data, size_t old_size, size_t size) {
@@ -108,7 +51,7 @@ index 2abf5994405e8da2a04d1b23b75ccd3658398474..024d612a04d83583b397549589d994e3
    if (LIKELY(ret != nullptr) || UNLIKELY(size == 0))
      total_mem_usage_.fetch_add(size - old_size, std::memory_order_relaxed);
    return ret;
-@@ -108,7 +108,7 @@ void* NodeArrayBufferAllocator::Reallocate(
+@@ -108,7 +116,7 @@ void* NodeArrayBufferAllocator::Reallocate(
  
  void NodeArrayBufferAllocator::Free(void* data, size_t size) {
    total_mem_usage_.fetch_sub(size, std::memory_order_relaxed);
@@ -209,65 +152,6 @@ index c431159e6f77f8c86844bcadb86012b056d03372..9f57ac58d826cb0aae422ddca54e2136
  
    v8::Local<v8::ArrayBuffer> ToArrayBuffer(Environment* env);
  
-diff --git a/src/node_buffer.cc b/src/node_buffer.cc
-index 215bd8003aabe17e43ac780c723cfe971b437eae..eb00eb6f592e20f3c17a529f30b09673774eb1c1 100644
---- a/src/node_buffer.cc
-+++ b/src/node_buffer.cc
-@@ -1175,33 +1175,14 @@ void SetBufferPrototype(const FunctionCallbackInfo<Value>& args) {
-   env->set_buffer_prototype_object(proto);
- }
- 
--void GetZeroFillToggle(const FunctionCallbackInfo<Value>& args) {
-+void SetZeroFillToggle(const FunctionCallbackInfo<Value>& args) {
-   Environment* env = Environment::GetCurrent(args);
-   NodeArrayBufferAllocator* allocator = env->isolate_data()->node_allocator();
-   Local<ArrayBuffer> ab;
--  // It can be a nullptr when running inside an isolate where we
--  // do not own the ArrayBuffer allocator.
--  if (allocator == nullptr) {
--    // Create a dummy Uint32Array - the JS land can only toggle the C++ land
--    // setting when the allocator uses our toggle. With this the toggle in JS
--    // land results in no-ops.
--    ab = ArrayBuffer::New(env->isolate(), sizeof(uint32_t));
--  } else {
-+  if (allocator != nullptr) {
-     uint32_t* zero_fill_field = allocator->zero_fill_field();
--    std::unique_ptr<BackingStore> backing =
--        ArrayBuffer::NewBackingStore(zero_fill_field,
--                                     sizeof(*zero_fill_field),
--                                     [](void*, size_t, void*) {},
--                                     nullptr);
--    ab = ArrayBuffer::New(env->isolate(), std::move(backing));
-+    *zero_fill_field = args[0]->BooleanValue(env->isolate());
-   }
--
--  ab->SetPrivate(
--      env->context(),
--      env->untransferable_object_private_symbol(),
--      True(env->isolate())).Check();
--
--  args.GetReturnValue().Set(Uint32Array::New(ab, 0, 1));
- }
- 
- void DetachArrayBuffer(const FunctionCallbackInfo<Value>& args) {
-@@ -1310,7 +1291,7 @@ void Initialize(Local<Object> target,
-   env->SetMethod(target, "ucs2Write", StringWrite<UCS2>);
-   env->SetMethod(target, "utf8Write", StringWrite<UTF8>);
- 
--  env->SetMethod(target, "getZeroFillToggle", GetZeroFillToggle);
-+  env->SetMethod(target, "setZeroFillToggle", SetZeroFillToggle);
- }
- 
- }  // anonymous namespace
-@@ -1350,7 +1331,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
-   registry->Register(StringWrite<HEX>);
-   registry->Register(StringWrite<UCS2>);
-   registry->Register(StringWrite<UTF8>);
--  registry->Register(GetZeroFillToggle);
-+  registry->Register(SetZeroFillToggle);
- 
-   registry->Register(DetachArrayBuffer);
-   registry->Register(CopyArrayBuffer);
 diff --git a/src/node_i18n.cc b/src/node_i18n.cc
 index c537a247f55ff070da1988fc8b7309b5692b5c18..59bfb597849cd5a94800d6c83b238ef77245243e 100644
 --- a/src/node_i18n.cc
@@ -282,12 +166,26 @@ index c537a247f55ff070da1988fc8b7309b5692b5c18..59bfb597849cd5a94800d6c83b238ef7
      return ret;
  
 diff --git a/src/node_internals.h b/src/node_internals.h
-index d37be23cd63e82d4040777bd0e17ed449ec0b15b..0b66996f11c66800a7e21ee84fa101450b856227 100644
+index d37be23cd63e82d4040777bd0e17ed449ec0b15b..eb84760593ff5fb5aa6a8104e8714099f24a67a0 100644
 --- a/src/node_internals.h
 +++ b/src/node_internals.h
-@@ -118,6 +118,8 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator {
+@@ -97,7 +97,9 @@ bool InitializePrimordials(v8::Local<v8::Context> context);
+ 
+ class NodeArrayBufferAllocator : public ArrayBufferAllocator {
+  public:
+-  inline uint32_t* zero_fill_field() { return &zero_fill_field_; }
++  NodeArrayBufferAllocator();
++  ~NodeArrayBufferAllocator() override;
++  inline uint32_t* zero_fill_field() { return zero_fill_field_; }
+ 
+   void* Allocate(size_t size) override;  // Defined in src/node.cc
+   void* AllocateUninitialized(size_t size) override;
+@@ -116,8 +118,10 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator {
+   }
+ 
   private:
-   uint32_t zero_fill_field_ = 1;  // Boolean but exposed as uint32 to JS land.
+-  uint32_t zero_fill_field_ = 1;  // Boolean but exposed as uint32 to JS land.
++  uint32_t* zero_fill_field_ = nullptr;  // Boolean but exposed as uint32 to JS land.
    std::atomic<size_t> total_mem_usage_ {0};
 +
 +  std::unique_ptr<v8::ArrayBuffer::Allocator> allocator_{v8::ArrayBuffer::Allocator::NewDefaultAllocator()};
diff --git a/patches/v8/.patches b/patches/v8/.patches
index 9df51315c6cfe..0e16c5eabc6fe 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -10,4 +10,3 @@ revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
 chore_disable_is_execution_terminating_dcheck.patch
 build_remove_legacy_oom_error_callback.patch
-force_disable_v8_sandboxed_pointers.patch
diff --git a/patches/v8/force_disable_v8_sandboxed_pointers.patch b/patches/v8/force_disable_v8_sandboxed_pointers.patch
deleted file mode 100644
index ed88bbb205cb7..0000000000000
--- a/patches/v8/force_disable_v8_sandboxed_pointers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Rose <japthorp@slack-corp.com>
-Date: Thu, 23 Jun 2022 16:49:28 -0700
-Subject: force disable v8 sandboxed pointers
-
-temporarily, until we can fix node to be compatible
-
-diff --git a/BUILD.gn b/BUILD.gn
-index 71ee04624868f23a2e204b5ff1e973b45e2f1202..6aa33fdd3c767eb0045db918d2535fe35c98ca4b 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -506,9 +506,9 @@ if (v8_enable_sandbox == "") {
- }
- 
- # Enable sandboxed pointers when the sandbox is enabled.
--if (v8_enable_sandbox) {
--  v8_enable_sandboxed_pointers = true
--}
-+#if (v8_enable_sandbox) {
-+#  v8_enable_sandboxed_pointers = true
-+#}
- 
- # Enable all available sandbox features if sandbox future is enabled.
- if (v8_enable_sandbox_future) {

From 98cd16d336f512406eee3565be1cead86514db7b Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 5 Jul 2022 08:49:56 -0700
Subject: [PATCH 559/811] chore: fix typos (#34731)

---
 docs/api/environment-variables.md                   | 3 +--
 docs/tutorial/process-model.md                      | 2 +-
 lib/browser/api/auto-updater/squirrel-update-win.ts | 2 +-
 lib/browser/api/menu.ts                             | 2 +-
 script/lint.js                                      | 2 +-
 shell/browser/api/electron_api_web_contents.cc      | 2 +-
 shell/browser/native_window.cc                      | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/api/environment-variables.md b/docs/api/environment-variables.md
index 09b12e3124fb6..ba3d5cf99e6de 100644
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -139,8 +139,7 @@ green and non-draggable regions will be colored red to aid debugging.
 
 ### `ELECTRON_DEBUG_NOTIFICATIONS`
 
-Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common a
-tions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
+Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
 
 Sample output:
 
diff --git a/docs/tutorial/process-model.md b/docs/tutorial/process-model.md
index 2cb37099b513b..ea2ce8c5b271b 100644
--- a/docs/tutorial/process-model.md
+++ b/docs/tutorial/process-model.md
@@ -83,7 +83,7 @@ terminated as well.
 
 The main process also controls your application's lifecycle through Electron's
 [`app`][app] module. This module provides a large set of events and methods
-that you can use to add custom application behaviour (for instance, programatically
+that you can use to add custom application behaviour (for instance, programmatically
 quitting your application, modifying the application dock, or showing an About panel).
 
 As a practical example, the app shown in the [quick start guide][quick-start-lifecycle]
diff --git a/lib/browser/api/auto-updater/squirrel-update-win.ts b/lib/browser/api/auto-updater/squirrel-update-win.ts
index 82d867f4f8fc6..5d8a998b4e1c5 100644
--- a/lib/browser/api/auto-updater/squirrel-update-win.ts
+++ b/lib/browser/api/auto-updater/squirrel-update-win.ts
@@ -20,7 +20,7 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
 
   try {
     // Ensure we don't spawn multiple squirrel processes
-    // Process spawned, same args:        Attach events to alread running process
+    // Process spawned, same args:        Attach events to already running process
     // Process spawned, different args:   Return with error
     // No process spawned:                Spawn new process
     if (spawnedProcess && !isSameArgs(args)) {
diff --git a/lib/browser/api/menu.ts b/lib/browser/api/menu.ts
index cdd3b73452f33..1499ce7e42d7f 100644
--- a/lib/browser/api/menu.ts
+++ b/lib/browser/api/menu.ts
@@ -142,7 +142,7 @@ Menu.prototype.insert = function (pos, item) {
   if (item.icon) this.setIcon(pos, item.icon);
   if (item.role) this.setRole(pos, item.role);
 
-  // Make menu accessable to items.
+  // Make menu accessible to items.
   item.overrideReadOnlyProperty('menu', this);
 
   // Remember the items.
diff --git a/script/lint.js b/script/lint.js
index 8ee4f9b756133..fa5e3f7ba7808 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -30,7 +30,7 @@ function spawnAndCheckExitCode (cmd, args, opts) {
   opts = { stdio: 'inherit', ...opts };
   const { error, status, signal } = childProcess.spawnSync(cmd, args, opts);
   if (error) {
-    // the subsprocess failed or timed out
+    // the subprocess failed or timed out
     console.error(error);
     process.exit(1);
   }
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 5be62a176ef88..5bfe25f490411 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2170,7 +2170,7 @@ void WebContents::LoadURL(const GURL& url,
   params.transition_type = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
   params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
-  // Discord non-committed entries to ensure that we don't re-use a pending
+  // Discard non-committed entries to ensure that we don't re-use a pending
   // entry
   web_contents()->GetController().DiscardNonCommittedEntries();
   web_contents()->GetController().LoadURLWithParams(params);
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 897939991150a..67439e818700e 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -176,7 +176,7 @@ void NativeWindow::InitFromOptions(const gin_helper::Dictionary& options) {
 
   // By default the window has a default maximum size that prevents it
   // from being resized larger than the screen, so we should only set this
-  // if th user has passed in values.
+  // if the user has passed in values.
   if (have_max_height || have_max_width || !max_size.IsEmpty())
     size_constraints.set_maximum_size(gfx::Size(max_width, max_height));
 

From c4182752282db0b3c33750445802e2d65dad36db Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Tue, 5 Jul 2022 08:55:15 -0700
Subject: [PATCH 560/811] chore: update Discord invite links (#34730)

---
 README.md                                       | 2 +-
 docs/tutorial/examples.md                       | 4 ++--
 docs/tutorial/introduction.md                   | 2 +-
 docs/tutorial/tutorial-4-adding-features.md     | 2 +-
 docs/tutorial/tutorial-6-publishing-updating.md | 2 +-
 lib/browser/default-menu.ts                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index fcf0ab6216411..7bcb3e9253137 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
-[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/APGC3k5yaH)
+[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.gg/electronjs)
 
 :memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).
diff --git a/docs/tutorial/examples.md b/docs/tutorial/examples.md
index a2bea3c12f300..b88bbc028b221 100644
--- a/docs/tutorial/examples.md
+++ b/docs/tutorial/examples.md
@@ -50,7 +50,7 @@ guide!).
 
 You can find the full list of "How to?" in the sidebar. If there is
 something that you would like to do that is not documented, please join
-our [Discord server][] and let us know!
+our [Discord server][discord] and let us know!
 
-[discord server]: https://discord.com/invite/electron
+[discord]: https://discord.gg/electronjs
 [fiddle]: https://www.electronjs.org/fiddle
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index 8091434c01b0f..71ce1a67ec448 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -68,7 +68,7 @@ Are you getting stuck anywhere? Here are a few links to places to look:
 
 [api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
-[discord]: https://discord.com/invite/APGC3k5yaH
+[discord]: https://discord.gg/electronjs
 [examples]: examples.md
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues
diff --git a/docs/tutorial/tutorial-4-adding-features.md b/docs/tutorial/tutorial-4-adding-features.md
index b7c776c1dbd67..38be5b5f4ca0d 100644
--- a/docs/tutorial/tutorial-4-adding-features.md
+++ b/docs/tutorial/tutorial-4-adding-features.md
@@ -62,7 +62,7 @@ into end users' hands.
 
 <!-- Link labels -->
 
-[discord]: https://discord.com/invite/APGC3k5yaH
+[discord]: https://discord.gg/electronjs
 [github]: https://github.com/electron/electronjs.org-new/issues/new
 [how to]: ./examples.md
 [node-platform]: https://nodejs.org/api/process.html#process_process_platform
diff --git a/docs/tutorial/tutorial-6-publishing-updating.md b/docs/tutorial/tutorial-6-publishing-updating.md
index 65b89766d88f2..57df92d6f18f8 100644
--- a/docs/tutorial/tutorial-6-publishing-updating.md
+++ b/docs/tutorial/tutorial-6-publishing-updating.md
@@ -226,7 +226,7 @@ rest of our docs and happy developing! If you have questions, please stop by our
 
 [autoupdater]: ../api/auto-updater.md
 [code-signed]: ./code-signing.md
-[discord server]: https://discord.com/invite/APGC3k5yaH
+[discord server]: https://discord.gg/electronjs
 [electron fiddle]: https://electronjs.org/fiddle
 [fiddle-build]: https://github.com/electron/fiddle/blob/master/.github/workflows/build.yaml
 [fiddle-forge-config]: https://github.com/electron/fiddle/blob/master/forge.config.js
diff --git a/lib/browser/default-menu.ts b/lib/browser/default-menu.ts
index b91a7caea4d92..b37e3425b3364 100644
--- a/lib/browser/default-menu.ts
+++ b/lib/browser/default-menu.ts
@@ -31,7 +31,7 @@ export const setDefaultApplicationMenu = () => {
       {
         label: 'Community Discussions',
         click: async () => {
-          await shell.openExternal('https://discord.com/invite/APGC3k5yaH');
+          await shell.openExternal('https://discord.gg/electronjs');
         }
       },
       {

From 403bd39d05ff6528d5c827cbb263b5ee02eb41ab Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 5 Jul 2022 09:35:38 -0700
Subject: [PATCH 561/811] chore: modernize base::Value useage in asar/archive
 (#34796)

---
 shell/common/asar/archive.cc | 144 +++++++++++++++++------------------
 shell/common/asar/archive.h  |   7 +-
 2 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/shell/common/asar/archive.cc b/shell/common/asar/archive.cc
index 58b89d537549d..450eff88926e0 100644
--- a/shell/common/asar/archive.cc
+++ b/shell/common/asar/archive.cc
@@ -35,83 +35,75 @@ const char kSeparators[] = "\\/";
 const char kSeparators[] = "/";
 #endif
 
-bool GetNodeFromPath(std::string path,
-                     const base::DictionaryValue* root,
-                     const base::DictionaryValue** out);
+const base::Value::Dict* GetNodeFromPath(std::string path,
+                                         const base::Value::Dict& root);
 
 // Gets the "files" from "dir".
-bool GetFilesNode(const base::DictionaryValue* root,
-                  const base::DictionaryValue* dir,
-                  const base::DictionaryValue** out) {
+const base::Value::Dict* GetFilesNode(const base::Value::Dict& root,
+                                      const base::Value::Dict& dir) {
   // Test for symbol linked directory.
-  const std::string* link = dir->FindStringKey("link");
+  const std::string* link = dir.FindString("link");
   if (link != nullptr) {
-    const base::DictionaryValue* linked_node = nullptr;
-    if (!GetNodeFromPath(*link, root, &linked_node))
-      return false;
-    dir = linked_node;
+    const base::Value::Dict* linked_node = GetNodeFromPath(*link, root);
+    if (!linked_node)
+      return nullptr;
+    return linked_node->FindDict("files");
   }
 
-  return dir->GetDictionaryWithoutPathExpansion("files", out);
+  return dir.FindDict("files");
 }
 
 // Gets sub-file "name" from "dir".
-bool GetChildNode(const base::DictionaryValue* root,
-                  const std::string& name,
-                  const base::DictionaryValue* dir,
-                  const base::DictionaryValue** out) {
-  if (name.empty()) {
-    *out = root;
-    return true;
-  }
-
-  const base::DictionaryValue* files = nullptr;
-  return GetFilesNode(root, dir, &files) &&
-         files->GetDictionaryWithoutPathExpansion(name, out);
+const base::Value::Dict* GetChildNode(const base::Value::Dict& root,
+                                      const std::string& name,
+                                      const base::Value::Dict& dir) {
+  if (name.empty())
+    return &root;
+
+  const base::Value::Dict* files = GetFilesNode(root, dir);
+  return files ? files->FindDict(name) : nullptr;
 }
 
 // Gets the node of "path" from "root".
-bool GetNodeFromPath(std::string path,
-                     const base::DictionaryValue* root,
-                     const base::DictionaryValue** out) {
-  if (path.empty()) {
-    *out = root;
-    return true;
-  }
+const base::Value::Dict* GetNodeFromPath(std::string path,
+                                         const base::Value::Dict& root) {
+  if (path.empty())
+    return &root;
 
-  const base::DictionaryValue* dir = root;
+  const base::Value::Dict* dir = &root;
   for (size_t delimiter_position = path.find_first_of(kSeparators);
        delimiter_position != std::string::npos;
        delimiter_position = path.find_first_of(kSeparators)) {
-    const base::DictionaryValue* child = nullptr;
-    if (!GetChildNode(root, path.substr(0, delimiter_position), dir, &child))
-      return false;
+    const base::Value::Dict* child =
+        GetChildNode(root, path.substr(0, delimiter_position), *dir);
+    if (!child)
+      return nullptr;
 
     dir = child;
     path.erase(0, delimiter_position + 1);
   }
 
-  return GetChildNode(root, path, dir, out);
+  return GetChildNode(root, path, *dir);
 }
 
 bool FillFileInfoWithNode(Archive::FileInfo* info,
                           uint32_t header_size,
                           bool load_integrity,
-                          const base::DictionaryValue* node) {
-  if (auto size = node->FindIntKey("size")) {
-    info->size = static_cast<uint32_t>(size.value());
+                          const base::Value::Dict* node) {
+  if (absl::optional<int> size = node->FindInt("size")) {
+    info->size = static_cast<uint32_t>(*size);
   } else {
     return false;
   }
 
-  if (auto unpacked = node->FindBoolKey("unpacked")) {
-    info->unpacked = unpacked.value();
+  if (absl::optional<bool> unpacked = node->FindBool("unpacked")) {
+    info->unpacked = *unpacked;
     if (info->unpacked) {
       return true;
     }
   }
 
-  auto* offset = node->FindStringKey("offset");
+  const std::string* offset = node->FindString("offset");
   if (offset &&
       base::StringToUint64(base::StringPiece(*offset), &info->offset)) {
     info->offset += header_size;
@@ -119,26 +111,26 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
     return false;
   }
 
-  if (auto executable = node->FindBoolKey("executable")) {
-    info->executable = executable.value();
+  if (absl::optional<bool> executable = node->FindBool("executable")) {
+    info->executable = *executable;
   }
 
 #if BUILDFLAG(IS_MAC)
   if (load_integrity &&
       electron::fuses::IsEmbeddedAsarIntegrityValidationEnabled()) {
-    if (auto* integrity = node->FindDictKey("integrity")) {
-      auto* algorithm = integrity->FindStringKey("algorithm");
-      auto* hash = integrity->FindStringKey("hash");
-      auto block_size = integrity->FindIntKey("blockSize");
-      auto* blocks = integrity->FindListKey("blocks");
+    if (const base::Value::Dict* integrity = node->FindDict("integrity")) {
+      const std::string* algorithm = integrity->FindString("algorithm");
+      const std::string* hash = integrity->FindString("hash");
+      absl::optional<int> block_size = integrity->FindInt("blockSize");
+      const base::Value::List* blocks = integrity->FindList("blocks");
 
       if (algorithm && hash && block_size && block_size > 0 && blocks) {
         IntegrityPayload integrity_payload;
         integrity_payload.hash = *hash;
         integrity_payload.block_size =
             static_cast<uint32_t>(block_size.value());
-        for (auto& value : blocks->GetListDeprecated()) {
-          if (auto* block = value.GetIfString()) {
+        for (auto& value : *blocks) {
+          if (const std::string* block = value.GetIfString()) {
             integrity_payload.blocks.push_back(*block);
           } else {
             LOG(FATAL)
@@ -279,8 +271,7 @@ bool Archive::Init() {
   }
 
   header_size_ = 8 + size;
-  header_ = base::DictionaryValue::From(
-      base::Value::ToUniquePtrValue(std::move(*value)));
+  header_ = std::move(value->GetDict());
   return true;
 }
 
@@ -298,13 +289,14 @@ bool Archive::GetFileInfo(const base::FilePath& path, FileInfo* info) const {
   if (!header_)
     return false;
 
-  const base::DictionaryValue* node;
-  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
+  const base::Value::Dict* node =
+      GetNodeFromPath(path.AsUTF8Unsafe(), *header_);
+  if (!node)
     return false;
 
-  std::string link;
-  if (node->GetString("link", &link))
-    return GetFileInfo(base::FilePath::FromUTF8Unsafe(link), info);
+  const std::string* link = node->FindString("link");
+  if (link)
+    return GetFileInfo(base::FilePath::FromUTF8Unsafe(*link), info);
 
   return FillFileInfoWithNode(info, header_size_, header_validated_, node);
 }
@@ -313,17 +305,18 @@ bool Archive::Stat(const base::FilePath& path, Stats* stats) const {
   if (!header_)
     return false;
 
-  const base::DictionaryValue* node;
-  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
+  const base::Value::Dict* node =
+      GetNodeFromPath(path.AsUTF8Unsafe(), *header_);
+  if (!node)
     return false;
 
-  if (node->FindKey("link")) {
+  if (node->Find("link")) {
     stats->is_file = false;
     stats->is_link = true;
     return true;
   }
 
-  if (node->FindKey("files")) {
+  if (node->Find("files")) {
     stats->is_file = false;
     stats->is_directory = true;
     return true;
@@ -337,19 +330,17 @@ bool Archive::Readdir(const base::FilePath& path,
   if (!header_)
     return false;
 
-  const base::DictionaryValue* node;
-  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
+  const base::Value::Dict* node =
+      GetNodeFromPath(path.AsUTF8Unsafe(), *header_);
+  if (!node)
     return false;
 
-  const base::DictionaryValue* files_node;
-  if (!GetFilesNode(header_.get(), node, &files_node))
+  const base::Value::Dict* files_node = GetFilesNode(*header_, *node);
+  if (!files_node)
     return false;
 
-  base::DictionaryValue::Iterator iter(*files_node);
-  while (!iter.IsAtEnd()) {
-    files->push_back(base::FilePath::FromUTF8Unsafe(iter.key()));
-    iter.Advance();
-  }
+  for (const auto iter : *files_node)
+    files->push_back(base::FilePath::FromUTF8Unsafe(iter.first));
   return true;
 }
 
@@ -358,13 +349,14 @@ bool Archive::Realpath(const base::FilePath& path,
   if (!header_)
     return false;
 
-  const base::DictionaryValue* node;
-  if (!GetNodeFromPath(path.AsUTF8Unsafe(), header_.get(), &node))
+  const base::Value::Dict* node =
+      GetNodeFromPath(path.AsUTF8Unsafe(), *header_);
+  if (!node)
     return false;
 
-  std::string link;
-  if (node->GetString("link", &link)) {
-    *realpath = base::FilePath::FromUTF8Unsafe(link);
+  const std::string* link = node->FindString("link");
+  if (link) {
+    *realpath = base::FilePath::FromUTF8Unsafe(*link);
     return true;
   }
 
diff --git a/shell/common/asar/archive.h b/shell/common/asar/archive.h
index 51e75ec75b346..d420f3fa4a0fd 100644
--- a/shell/common/asar/archive.h
+++ b/shell/common/asar/archive.h
@@ -13,12 +13,9 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/synchronization/lock.h"
+#include "base/values.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-namespace base {
-class DictionaryValue;
-}
-
 namespace asar {
 
 class ScopedTemporaryFile;
@@ -104,7 +101,7 @@ class Archive {
   base::File file_;
   int fd_ = -1;
   uint32_t header_size_ = 0;
-  std::unique_ptr<base::DictionaryValue> header_;
+  absl::optional<base::Value::Dict> header_;
 
   // Cached external temporary files.
   base::Lock external_files_lock_;

From f7428baace8c4fa48ffa99196a925008284142b5 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Jul 2022 06:02:02 -0700
Subject: [PATCH 562/811] Bump v21.0.0-nightly.20220706

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 118f51b1b228f..7be9f1c790285 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220705
\ No newline at end of file
+21.0.0-nightly.20220706
\ No newline at end of file
diff --git a/package.json b/package.json
index a8bc1ba4b573b..f78cd8d2afc0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220705",
+  "version": "21.0.0-nightly.20220706",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 125586262883f..d870a824f5090 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220705
- PRODUCTVERSION 21,0,0,20220705
+ FILEVERSION 21,0,0,20220706
+ PRODUCTVERSION 21,0,0,20220706
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 47d8d4cc5c0b945d52cc7c4b21c6cfe749b3df57 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Jul 2022 06:01:40 -0700
Subject: [PATCH 563/811] Bump v21.0.0-nightly.20220707

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7be9f1c790285..848dc021c4480 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220706
\ No newline at end of file
+21.0.0-nightly.20220707
\ No newline at end of file
diff --git a/package.json b/package.json
index f78cd8d2afc0e..fe36e186c8ce5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220706",
+  "version": "21.0.0-nightly.20220707",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d870a824f5090..b360d973b5394 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220706
- PRODUCTVERSION 21,0,0,20220706
+ FILEVERSION 21,0,0,20220707
+ PRODUCTVERSION 21,0,0,20220707
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 7ec88584b50f74b3d596448976781e91ea052e47 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 7 Jul 2022 17:17:20 +0200
Subject: [PATCH 564/811] fix: WCO pressed background state updates (#34771)

---
 shell/browser/native_window_views_win.cc              | 11 ++++++++++-
 shell/browser/ui/views/win_caption_button_container.h |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index 52aedf38d62e2..9c0b54393958b 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -11,6 +11,7 @@
 #include "shell/browser/browser.h"
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/views/root_view.h"
+#include "shell/browser/ui/views/win_frame_view.h"
 #include "shell/common/electron_constants.h"
 #include "ui/display/display.h"
 #include "ui/display/win/screen_win.h"
@@ -421,7 +422,7 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
       }
       break;
     }
-    case SIZE_RESTORED:
+    case SIZE_RESTORED: {
       switch (last_window_state_) {
         case ui::SHOW_STATE_MAXIMIZED:
           last_window_state_ = ui::SHOW_STATE_NORMAL;
@@ -439,7 +440,15 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
         default:
           break;
       }
+      // If a given window was minimized/maximized and has since been
+      // restored, ensure the WCO buttons are set to normal state.
+      auto* ncv = widget()->non_client_view();
+      if (IsWindowControlsOverlayEnabled() && ncv) {
+        auto* frame_view = static_cast<WinFrameView*>(ncv->frame_view());
+        frame_view->caption_button_container()->ResetWindowControls();
+      }
       break;
+    }
   }
 }
 
diff --git a/shell/browser/ui/views/win_caption_button_container.h b/shell/browser/ui/views/win_caption_button_container.h
index d9a8fa7ca6f54..90c5973491c8e 100644
--- a/shell/browser/ui/views/win_caption_button_container.h
+++ b/shell/browser/ui/views/win_caption_button_container.h
@@ -46,6 +46,9 @@ class WinCaptionButtonContainer : public views::View,
   // time, and both are disabled in tablet UI mode.
   void UpdateButtons();
 
+  // Reset window button states to STATE_NORMAL.
+  void ResetWindowControls();
+
  private:
   // views::View:
   void AddedToWidget() override;
@@ -55,8 +58,6 @@ class WinCaptionButtonContainer : public views::View,
   void OnWidgetBoundsChanged(views::Widget* widget,
                              const gfx::Rect& new_bounds) override;
 
-  void ResetWindowControls();
-
   WinFrameView* const frame_view_;
   WinCaptionButton* const minimize_button_;
   WinCaptionButton* const maximize_button_;

From e83c3ec74442f0533e2d66c53fa84a075ebc20ae Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 7 Jul 2022 15:14:53 -0400
Subject: [PATCH 565/811] test: add first-party-set chromium tests (#34827)

test: add first-part-set chromium feature tests
---
 spec-main/chromium-spec.ts                    | 31 +++++++++++++++++++
 .../api/first-party-sets/base/main.js         | 20 ++++++++++++
 .../api/first-party-sets/base/package.json    |  4 +++
 .../api/first-party-sets/command-line/main.js | 12 +++++++
 .../command-line/package.json                 |  4 +++
 5 files changed, 71 insertions(+)
 create mode 100644 spec/fixtures/api/first-party-sets/base/main.js
 create mode 100644 spec/fixtures/api/first-party-sets/base/package.json
 create mode 100644 spec/fixtures/api/first-party-sets/command-line/main.js
 create mode 100644 spec/fixtures/api/first-party-sets/command-line/package.json

diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 06fa2e5154158..26d0afbca2bb9 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -495,6 +495,37 @@ describe('chromium features', () => {
     });
   });
 
+  describe('first party sets', () => {
+    const fps = [
+      'https://fps-member1.glitch.me',
+      'https://fps-member2.glitch.me',
+      'https://fps-member3.glitch.me'
+    ];
+
+    it('loads first party sets', async () => {
+      const appPath = path.join(fixturesPath, 'api', 'first-party-sets', 'base');
+      const fpsProcess = ChildProcess.spawn(process.execPath, [appPath]);
+
+      let output = '';
+      fpsProcess.stdout.on('data', data => { output += data; });
+      await emittedOnce(fpsProcess, 'exit');
+
+      expect(output).to.include(fps.join(','));
+    });
+
+    it('loads sets from the command line', async () => {
+      const appPath = path.join(fixturesPath, 'api', 'first-party-sets', 'command-line');
+      const args = [appPath, `--use-first-party-set=${fps}`];
+      const fpsProcess = ChildProcess.spawn(process.execPath, args);
+
+      let output = '';
+      fpsProcess.stdout.on('data', data => { output += data; });
+      await emittedOnce(fpsProcess, 'exit');
+
+      expect(output).to.include(fps.join(','));
+    });
+  });
+
   describe('loading jquery', () => {
     it('does not crash', (done) => {
       const w = new BrowserWindow({ show: false });
diff --git a/spec/fixtures/api/first-party-sets/base/main.js b/spec/fixtures/api/first-party-sets/base/main.js
new file mode 100644
index 0000000000000..68865b517607a
--- /dev/null
+++ b/spec/fixtures/api/first-party-sets/base/main.js
@@ -0,0 +1,20 @@
+const { app } = require('electron');
+
+const sets = [
+  'https://fps-member1.glitch.me',
+  'https://fps-member2.glitch.me',
+  'https://fps-member3.glitch.me'
+];
+
+app.commandLine.appendSwitch('use-first-party-set', sets.join(','));
+
+app.whenReady().then(function () {
+  const hasSwitch = app.commandLine.hasSwitch('use-first-party-set');
+  const value = app.commandLine.getSwitchValue('use-first-party-set');
+  if (hasSwitch) {
+    process.stdout.write(JSON.stringify(value));
+    process.stdout.end();
+  }
+
+  app.quit();
+});
diff --git a/spec/fixtures/api/first-party-sets/base/package.json b/spec/fixtures/api/first-party-sets/base/package.json
new file mode 100644
index 0000000000000..1766d06684600
--- /dev/null
+++ b/spec/fixtures/api/first-party-sets/base/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron-test-first-party-sets-base",
+  "main": "main.js"
+}
diff --git a/spec/fixtures/api/first-party-sets/command-line/main.js b/spec/fixtures/api/first-party-sets/command-line/main.js
new file mode 100644
index 0000000000000..8e2782f31dc0e
--- /dev/null
+++ b/spec/fixtures/api/first-party-sets/command-line/main.js
@@ -0,0 +1,12 @@
+const { app } = require('electron');
+
+app.whenReady().then(function () {
+  const hasSwitch = app.commandLine.hasSwitch('use-first-party-set');
+  const value = app.commandLine.getSwitchValue('use-first-party-set');
+  if (hasSwitch) {
+    process.stdout.write(JSON.stringify(value));
+    process.stdout.end();
+  }
+
+  app.quit();
+});
diff --git a/spec/fixtures/api/first-party-sets/command-line/package.json b/spec/fixtures/api/first-party-sets/command-line/package.json
new file mode 100644
index 0000000000000..c4b5839bdcc60
--- /dev/null
+++ b/spec/fixtures/api/first-party-sets/command-line/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "electron-test-first-party-sets-command-line",
+  "main": "main.js"
+}

From 1941c88442b61f3e83125f197becc83cf6975a9c Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 8 Jul 2022 08:33:42 +0200
Subject: [PATCH 566/811] fix: `setRepresentedFilename` with non-default
 `titlebarStyle` (#34834)

fix: setRepresentedFilename with non-default titlebarStyle
---
 shell/browser/native_window_mac.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 3e5ee77010281..721ed09c47e92 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -1150,6 +1150,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
 void NativeWindowMac::SetRepresentedFilename(const std::string& filename) {
   [window_ setRepresentedFilename:base::SysUTF8ToNSString(filename)];
+  if (buttons_proxy_)
+    [buttons_proxy_ redraw];
 }
 
 std::string NativeWindowMac::GetRepresentedFilename() {

From eba9d3fc79ce636bacffa6ebf5ed69e674b0a2e9 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Fri, 8 Jul 2022 01:06:06 -0700
Subject: [PATCH 567/811] fix: ensure v8 pointer compression + sandbox is
 enabled on 64bit native modules (#34844)

* fix: ensure v8 pointer compression + sandbox is enabled on 64bit native modules

* build: rely on config.gypi to enable pointer compression
---
 patches/node/.patches                         |  1 +
 ...pression_sandbox_is_enabled_on_64bit.patch | 49 +++++++++++++++++++
 script/generate-config-gypi.py                |  6 +--
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 2066849e25cbb..a175fc7472712 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -45,3 +45,4 @@ fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
 json_parse_errors_made_user-friendly.patch
 build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
 support_v8_sandboxed_pointers.patch
+build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
diff --git a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
new file mode 100644
index 0000000000000..2b9a5edf16daa
--- /dev/null
+++ b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Thu, 7 Jul 2022 14:42:49 -0700
+Subject: build: ensure v8 pointer compression + sandbox is enabled on 64bit
+
+Aligns common.gypi with the current build flag state of //v8.
+
+Specifically enables `V8_ENABLE_SANDBOX`, `V8_SANDBOXED_POINTERS`, `V8_COMPRESS_POINTERS` and `V8_COMPRESS_POINTERS_IN_SHARED_CAGE`.
+
+diff --git a/common.gypi b/common.gypi
+index 559b7f7c220cb98946285bb15d0d63e203bbcea4..b0cba989da8d9b5bd7e1050510bb09646622f88c 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -66,6 +66,8 @@
+     'v8_enable_pointer_compression%': 0,
+     'v8_enable_31bit_smis_on_64bit_arch%': 0,
+ 
++    'v8_enable_sandbox%': 0,
++
+     # Disable V8 untrusted code mitigations.
+     # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
+     'v8_untrusted_code_mitigations': 0,
+@@ -135,6 +137,9 @@
+         'v8_enable_pointer_compression': 0,
+         'v8_enable_31bit_smis_on_64bit_arch': 0,
+       }],
++      ['target_arch in "arm64 x64"', {
++        'v8_enable_sandbox': 1,
++      }],
+       ['target_arch in "ppc64 s390x"', {
+         'v8_enable_backtrace': 1,
+       }],
+@@ -395,9 +400,15 @@
+       ['v8_enable_pointer_compression == 1', {
+         'defines': [
+           'V8_COMPRESS_POINTERS',
+-          'V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE',
++          'V8_COMPRESS_POINTERS_IN_SHARED_CAGE',
+         ],
+       }],
++      ['v8_enable_sandbox == 1', {
++        'defines': [
++          'V8_ENABLE_SANDBOX',
++          'V8_SANDBOXED_POINTERS'
++        ]
++      }],
+       ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
+         'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
+       }],
diff --git a/script/generate-config-gypi.py b/script/generate-config-gypi.py
index b7885da41c87b..7a3ea6808b42a 100755
--- a/script/generate-config-gypi.py
+++ b/script/generate-config-gypi.py
@@ -14,9 +14,9 @@
 def run_node_configure(target_cpu):
   configure = os.path.join(NODE_DIR, 'configure.py')
   args = ['--dest-cpu', target_cpu]
-  # Enabled in Chromium's V8.
-  if target_cpu in ('arm64', 'x64'):
-    args += ['--experimental-enable-pointer-compression']
+  # Enabled in Chromium's V8, will be disabled on 32bit via
+  # common.gypi rules
+  args += ['--experimental-enable-pointer-compression']
 
   # Work around "No acceptable ASM compiler found" error on some System,
   # it breaks nothing since Electron does not use OpenSSL.

From 78848f8bfea4be6cc8d81fa4475655a2b3579d02 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 8 Jul 2022 06:01:44 -0700
Subject: [PATCH 568/811] Bump v21.0.0-nightly.20220708

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 848dc021c4480..fa6fed8debc07 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220707
\ No newline at end of file
+21.0.0-nightly.20220708
\ No newline at end of file
diff --git a/package.json b/package.json
index fe36e186c8ce5..7ff359479eb9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220707",
+  "version": "21.0.0-nightly.20220708",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b360d973b5394..e88fb9cec304f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220707
- PRODUCTVERSION 21,0,0,20220707
+ FILEVERSION 21,0,0,20220708
+ PRODUCTVERSION 21,0,0,20220708
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 459404f53690fed4e9785dffebcb625e2d04d428 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 11 Jul 2022 01:04:32 -0700
Subject: [PATCH 569/811] build: run CI tests on Xcode 13.3.0 (#34850)

* build: test disabling security

* build: install python2 during tests

* build: do not install python2 on arm64 runners

* attempt 2

* build: only allow 13.3.0 xcode
---
 .circleci/config/base.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index d74742fc20a59..b1545fc175f1d 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -53,14 +53,8 @@ executors:
         description: "macOS executor size"
         type: enum
         enum: ["macos.x86.medium.gen2", "large"]
-      xcode:
-        description: "xcode version"
-        default: 13.3.0
-        type: enum
-        enum: ["12.4.0", "13.3.0"]
-
     macos:
-      xcode: << parameters.xcode >>
+      xcode: 13.3.0
     resource_class: << parameters.size >>
 
   # Electron Runners
@@ -125,6 +119,9 @@ env-apple-silicon: &env-apple-silicon
   USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
+env-runner: &env-runner
+  IS_ELECTRON_RUNNER: 1
+
 env-arm64: &env-arm64
   GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
   MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
@@ -511,6 +508,7 @@ step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
     name: Import and trust self-signed codesigning cert on MacOS
     command: |
       if  [ "$TARGET_ARCH" != "arm64" ] && [ "`uname`" == "Darwin" ]; then
+        sudo security authorizationdb write com.apple.trust-settings.admin allow
         cd src/electron
         ./script/codesign/generate-identity.sh
       fi
@@ -1032,6 +1030,7 @@ steps-tests: &steps-tests
     - *step-setup-linux-for-headless-testing
     - *step-restore-brew-cache
     - *step-fix-known-hosts-linux
+    - install-python2-mac
     - *step-install-signing-cert-on-mac
 
     - run:
@@ -1130,7 +1129,7 @@ commands:
       - run:
           name: Install python2 on macos
           command: |
-            if [ "`uname`" == "Darwin" ]; then
+            if [ "`uname`" == "Darwin" ] && [ "$IS_ELECTRON_RUNNER" != "1" ]; then
               if [ ! -f "python-downloads/python-2.7.18-macosx10.9.pkg" ]; then
                 mkdir python-downloads
                 echo 'Downloading Python 2.7.18'
@@ -2044,7 +2043,6 @@ jobs:
   osx-testing-x64-tests:
     executor:
       name: macos
-      xcode: 12.4.0
       size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
@@ -2058,12 +2056,12 @@ jobs:
       <<: *env-mac-large
       <<: *env-stack-dumping
       <<: *env-apple-silicon
+      <<: *env-runner
     <<: *steps-tests
 
   mas-testing-x64-tests:
     executor:
       name: macos
-      xcode: 12.4.0
       size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
@@ -2077,6 +2075,7 @@ jobs:
       <<: *env-mac-large
       <<: *env-stack-dumping
       <<: *env-apple-silicon
+      <<: *env-runner
     <<: *steps-tests
 
 # List all workflows

From 2eb0e5dcab7e339bb2bff763d21c27181cc99d9a Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 11 Jul 2022 11:45:01 +0200
Subject: [PATCH 570/811] fix: safer check for WCO button updates (#34833)

---
 shell/browser/native_window_views.cc |  6 ++---
 spec-main/api-browser-window-spec.ts | 35 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index f33a3705cf031..ee690a03b8268 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -876,7 +876,7 @@ bool NativeWindowViews::IsMovable() {
 void NativeWindowViews::SetMinimizable(bool minimizable) {
 #if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
-  if (titlebar_overlay_enabled()) {
+  if (IsWindowControlsOverlayEnabled()) {
     auto* frame_view =
         static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
     frame_view->caption_button_container()->UpdateButtons();
@@ -896,7 +896,7 @@ bool NativeWindowViews::IsMinimizable() {
 void NativeWindowViews::SetMaximizable(bool maximizable) {
 #if BUILDFLAG(IS_WIN)
   FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
-  if (titlebar_overlay_enabled()) {
+  if (IsWindowControlsOverlayEnabled()) {
     auto* frame_view =
         static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
     frame_view->caption_button_container()->UpdateButtons();
@@ -936,7 +936,7 @@ void NativeWindowViews::SetClosable(bool closable) {
   } else {
     EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
   }
-  if (titlebar_overlay_enabled()) {
+  if (IsWindowControlsOverlayEnabled()) {
     auto* frame_view =
         static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
     frame_view->caption_button_container()->UpdateButtons();
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index aac15ffe468cd..0c003416aa2ee 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -2427,6 +2427,41 @@ describe('BrowserWindow module', () => {
     ifit(process.platform === 'darwin')('sets Window Control Overlay with hidden inset title bar', async () => {
       await testWindowsOverlay('hiddenInset');
     });
+
+    ifdescribe(process.platform === 'win32')('when an invalid titleBarStyle is initially set', () => {
+      let w: BrowserWindow;
+
+      beforeEach(() => {
+        w = new BrowserWindow({
+          show: false,
+          webPreferences: {
+            nodeIntegration: true,
+            contextIsolation: false
+          },
+          titleBarOverlay: {
+            color: '#0000f0',
+            symbolColor: '#ffffff'
+          },
+          titleBarStyle: 'hiddenInset'
+        });
+      });
+
+      afterEach(async () => {
+        await closeAllWindows();
+      });
+
+      it('does not crash changing minimizability ', () => {
+        expect(() => {
+          w.setMinimizable(false);
+        }).to.not.throw();
+      });
+
+      it('does not crash changing maximizability', () => {
+        expect(() => {
+          w.setMaximizable(false);
+        }).to.not.throw();
+      });
+    });
   });
 
   ifdescribe(['win32', 'darwin'].includes(process.platform))('"titleBarOverlay" option', () => {

From fa8e4a761071cc0b63b1d18747ae76c96ee88c4c Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Mon, 11 Jul 2022 03:25:17 -0700
Subject: [PATCH 571/811] build: use third_party DEPOT_TOOLS when running lint
 scripts (#34846)

Some folks (especially build_tools users) do not have a version of depot_tools on their path
---
 script/lint.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/lint.js b/script/lint.js
index fa5e3f7ba7808..dba460730776e 100755
--- a/script/lint.js
+++ b/script/lint.js
@@ -15,6 +15,11 @@ const ELECTRON_ROOT = path.normalize(path.dirname(__dirname));
 const SOURCE_ROOT = path.resolve(ELECTRON_ROOT, '..');
 const DEPOT_TOOLS = path.resolve(SOURCE_ROOT, 'third_party', 'depot_tools');
 
+// Augment the PATH for this script so that we can find executables
+// in the depot_tools folder even if folks do not have an instance of
+// DEPOT_TOOLS in their path already
+process.env.PATH = `${process.env.PATH}${path.delimiter}${DEPOT_TOOLS}`;
+
 const IGNORELIST = new Set([
   ['shell', 'browser', 'resources', 'win', 'resource.h'],
   ['shell', 'common', 'node_includes.h'],

From 2b862c18ba0a6afc6962cb9a063cea2a529d7837 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 11 Jul 2022 03:25:39 -0700
Subject: [PATCH 572/811] chore: improve run-clang-tidy.ts behavior when
 filenames < jobs (#34736)

---
 script/run-clang-tidy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/run-clang-tidy.ts b/script/run-clang-tidy.ts
index 86dba04f2e849..ba44b849c552c 100644
--- a/script/run-clang-tidy.ts
+++ b/script/run-clang-tidy.ts
@@ -173,7 +173,7 @@ async function runClangTidy (
   const worker = async () => {
     let filenames = chunkedFilenames.shift();
 
-    while (filenames) {
+    while (filenames?.length) {
       results.push(
         await spawnAsync(cmd, [...args, ...filenames], {}).then((result) => {
           console.log(result.stdout);

From 8f3fb8db09ac049894c8ab099979810899f9435b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 06:01:12 -0700
Subject: [PATCH 573/811] Bump v21.0.0-nightly.20220711

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index fa6fed8debc07..c8b04309ea458 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220708
\ No newline at end of file
+21.0.0-nightly.20220711
\ No newline at end of file
diff --git a/package.json b/package.json
index 7ff359479eb9d..8a8b7a1ad0ab0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220708",
+  "version": "21.0.0-nightly.20220711",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e88fb9cec304f..0169410608a3b 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220708
- PRODUCTVERSION 21,0,0,20220708
+ FILEVERSION 21,0,0,20220711
+ PRODUCTVERSION 21,0,0,20220711
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f63bba8ce24917f1c78a8804496fe0f5b461b0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20H=C4=83loiu?= <valentin.haloiu@gmail.com>
Date: Mon, 11 Jul 2022 21:26:18 +0300
Subject: [PATCH 574/811] fix: set Wayland application ID (#34855)

* refactor: extract XDG app ID logic into a method

* fix: set application ID on Wayland
---
 shell/browser/native_window_views.cc              |  3 +++
 .../notifications/linux/libnotify_notification.cc | 10 ++--------
 shell/common/platform_util.h                      |  4 ++++
 shell/common/platform_util_linux.cc               | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index ee690a03b8268..cb25379b7765a 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -51,6 +51,7 @@
 #include "shell/browser/ui/views/client_frame_view_linux.h"
 #include "shell/browser/ui/views/frameless_view.h"
 #include "shell/browser/ui/views/native_frame_view.h"
+#include "shell/common/platform_util.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/window/native_frame_view.h"
 
@@ -271,6 +272,8 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
   // Set WM_CLASS.
   params.wm_class_name = base::ToLowerASCII(name);
   params.wm_class_class = name;
+  // Set Wayland application ID.
+  params.wayland_app_id = platform_util::GetXdgAppId();
 
   auto* native_widget = new views::DesktopNativeWidgetAura(widget());
   params.native_widget = native_widget;
diff --git a/shell/browser/notifications/linux/libnotify_notification.cc b/shell/browser/notifications/linux/libnotify_notification.cc
index 07d7135788de1..3f7a2fa24f887 100644
--- a/shell/browser/notifications/linux/libnotify_notification.cc
+++ b/shell/browser/notifications/linux/libnotify_notification.cc
@@ -9,7 +9,6 @@
 
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
-#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "shell/browser/notifications/notification_delegate.h"
 #include "shell/browser/ui/gtk_util.h"
@@ -138,13 +137,8 @@ void LibnotifyNotification::Show(const NotificationOptions& options) {
 
   // Send the desktop name to identify the application
   // The desktop-entry is the part before the .desktop
-  std::string desktop_id;
-  if (platform_util::GetDesktopName(&desktop_id)) {
-    const std::string suffix{".desktop"};
-    if (base::EndsWith(desktop_id, suffix,
-                       base::CompareCase::INSENSITIVE_ASCII)) {
-      desktop_id.resize(desktop_id.size() - suffix.size());
-    }
+  std::string desktop_id = platform_util::GetXdgAppId();
+  if (!desktop_id.empty()) {
     libnotify_loader_.notify_notification_set_hint_string(
         notification_, "desktop-entry", desktop_id.c_str());
   }
diff --git a/shell/common/platform_util.h b/shell/common/platform_util.h
index ba8f9652dba29..085c7e3a7d926 100644
--- a/shell/common/platform_util.h
+++ b/shell/common/platform_util.h
@@ -56,6 +56,10 @@ bool SetLoginItemEnabled(bool enabled);
 // Returns a success flag.
 // Unlike libgtkui, does *not* use "chromium-browser.desktop" as a fallback.
 bool GetDesktopName(std::string* setme);
+
+// The XDG application ID must match the name of the desktop entry file without
+// the .desktop extension.
+std::string GetXdgAppId();
 #endif
 
 }  // namespace platform_util
diff --git a/shell/common/platform_util_linux.cc b/shell/common/platform_util_linux.cc
index ef8d8f8f0de01..2018c6d8864bf 100644
--- a/shell/common/platform_util_linux.cc
+++ b/shell/common/platform_util_linux.cc
@@ -20,6 +20,7 @@
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/dbus/thread_linux/dbus_thread_linux.h"
 #include "content/public/browser/browser_thread.h"
@@ -403,4 +404,18 @@ bool GetDesktopName(std::string* setme) {
   return base::Environment::Create()->GetVar("CHROME_DESKTOP", setme);
 }
 
+std::string GetXdgAppId() {
+  std::string desktop_file_name;
+  if (GetDesktopName(&desktop_file_name)) {
+    const std::string kDesktopExtension{".desktop"};
+    if (base::EndsWith(desktop_file_name, kDesktopExtension,
+                       base::CompareCase::INSENSITIVE_ASCII)) {
+      desktop_file_name.resize(desktop_file_name.size() -
+                               kDesktopExtension.size());
+    }
+  }
+
+  return desktop_file_name;
+}
+
 }  // namespace platform_util

From 4190ec248260c3e7673889f2ed77625f47812a4e Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 11 Jul 2022 16:28:09 -0700
Subject: [PATCH 575/811] feat: sandbox preloads by default (#32869)

---
 shell/browser/web_contents_preferences.cc  | 4 +---
 spec-main/fixtures/apps/libuv-hang/main.js | 3 ++-
 spec/webview-spec.js                       | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index d15e99c36d6d6..300bf05b8a1bf 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -316,9 +316,7 @@ bool WebContentsPreferences::IsSandboxed() const {
   if (sandbox_)
     return *sandbox_;
   bool sandbox_disabled_by_default =
-      node_integration_ || node_integration_in_worker_ || preload_path_ ||
-      !SessionPreferences::GetValidPreloads(web_contents_->GetBrowserContext())
-           .empty();
+      node_integration_ || node_integration_in_worker_;
   return !sandbox_disabled_by_default;
 }
 
diff --git a/spec-main/fixtures/apps/libuv-hang/main.js b/spec-main/fixtures/apps/libuv-hang/main.js
index 4ca4ef15d9024..3c9b9d0b6f26a 100644
--- a/spec-main/fixtures/apps/libuv-hang/main.js
+++ b/spec-main/fixtures/apps/libuv-hang/main.js
@@ -5,7 +5,8 @@ async function createWindow () {
   const mainWindow = new BrowserWindow({
     show: false,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      preload: path.join(__dirname, 'preload.js'),
+      sandbox: false
     }
   });
 
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index ff0f9c7964d68..9f53a7603e49b 100644
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -243,6 +243,7 @@ describe('<webview> tag', function () {
     it('preload script can require modules that still use "process" and "Buffer" when nodeintegration is off', async () => {
       const message = await startLoadingWebViewAndWaitForMessage(webview, {
         preload: `${fixtures}/module/preload-node-off-wrapper.js`,
+        webpreferences: 'sandbox=no',
         src: `file://${fixtures}/api/blank.html`
       });
 
@@ -288,6 +289,7 @@ describe('<webview> tag', function () {
     it('works without script tag in page', async () => {
       const message = await startLoadingWebViewAndWaitForMessage(webview, {
         preload: `${fixtures}/module/preload.js`,
+        webpreferences: 'sandbox=no',
         src: `file://${fixtures}pages/base-page.html`
       });
 
@@ -303,6 +305,7 @@ describe('<webview> tag', function () {
     it('resolves relative URLs', async () => {
       const message = await startLoadingWebViewAndWaitForMessage(webview, {
         preload: '../fixtures/module/preload.js',
+        webpreferences: 'sandbox=no',
         src: `file://${fixtures}/pages/e.html`
       });
 
@@ -390,6 +393,7 @@ describe('<webview> tag', function () {
       const message = await startLoadingWebViewAndWaitForMessage(webview, {
         disablewebsecurity: '',
         preload: `${fixtures}/module/preload.js`,
+        webpreferences: 'sandbox=no',
         src: `file://${fixtures}/pages/e.html`
       });
 

From 95019f0454ba5b3c61bdabec48d1756a1f16ecae Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 12 Jul 2022 09:13:40 +0200
Subject: [PATCH 576/811] fix: update Windows caption buttons to match Win11
 style (#34790)

---
 filenames.gni                                |   2 +
 shell/browser/ui/views/win_caption_button.cc |  62 +++-----
 shell/browser/ui/views/win_caption_button.h  |   7 +
 shell/browser/ui/views/win_icon_painter.cc   | 143 +++++++++++++++++++
 shell/browser/ui/views/win_icon_painter.h    |  64 +++++++++
 5 files changed, 236 insertions(+), 42 deletions(-)
 create mode 100644 shell/browser/ui/views/win_icon_painter.cc
 create mode 100644 shell/browser/ui/views/win_icon_painter.h

diff --git a/filenames.gni b/filenames.gni
index 912d11ac9a07a..9cdb0637abb60 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -85,6 +85,8 @@ filenames = {
     "shell/browser/ui/message_box_win.cc",
     "shell/browser/ui/tray_icon_win.cc",
     "shell/browser/ui/views/electron_views_delegate_win.cc",
+    "shell/browser/ui/views/win_icon_painter.cc",
+    "shell/browser/ui/views/win_icon_painter.h",
     "shell/browser/ui/views/win_frame_view.cc",
     "shell/browser/ui/views/win_frame_view.h",
     "shell/browser/ui/views/win_caption_button.cc",
diff --git a/shell/browser/ui/views/win_caption_button.cc b/shell/browser/ui/views/win_caption_button.cc
index 46280ee4b1583..9903fecd3146d 100644
--- a/shell/browser/ui/views/win_caption_button.cc
+++ b/shell/browser/ui/views/win_caption_button.cc
@@ -10,6 +10,7 @@
 
 #include "base/i18n/rtl.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/win/windows_version.h"
 #include "chrome/grit/theme_resources.h"
 #include "shell/browser/ui/views/win_frame_view.h"
 #include "shell/common/color_util.h"
@@ -28,6 +29,7 @@ WinCaptionButton::WinCaptionButton(PressedCallback callback,
                                    const std::u16string& accessible_name)
     : views::Button(std::move(callback)),
       frame_view_(frame_view),
+      icon_painter_(CreateIconPainter()),
       button_type_(button_type) {
   SetAnimateOnStateChange(true);
   // Not focusable by default, only for accessibility.
@@ -35,6 +37,15 @@ WinCaptionButton::WinCaptionButton(PressedCallback callback,
   SetAccessibleName(accessible_name);
 }
 
+WinCaptionButton::~WinCaptionButton() = default;
+
+std::unique_ptr<WinIconPainter> WinCaptionButton::CreateIconPainter() {
+  if (base::win::GetVersion() >= base::win::Version::WIN11) {
+    return std::make_unique<Win11IconPainter>();
+  }
+  return std::make_unique<WinIconPainter>();
+}
+
 gfx::Size WinCaptionButton::CalculatePreferredSize() const {
   // TODO(bsep): The sizes in this function are for 1x device scale and don't
   // match Windows button sizes at hidpi.
@@ -50,9 +61,10 @@ void WinCaptionButton::OnPaintBackground(gfx::Canvas* canvas) {
   const SkAlpha theme_alpha = SkColorGetA(bg_color);
 
   gfx::Rect bounds = GetContentsBounds();
-  bounds.Inset(gfx::Insets::TLBR(0, 0, 0, 0));
+  bounds.Inset(gfx::Insets::TLBR(0, GetBetweenButtonSpacing(), 0, 0));
 
-  canvas->FillRect(bounds, SkColorSetA(bg_color, theme_alpha));
+  if (theme_alpha > 0)
+    canvas->FillRect(bounds, SkColorSetA(bg_color, theme_alpha));
 
   SkColor base_color;
   SkAlpha hovered_alpha, pressed_alpha;
@@ -136,21 +148,6 @@ int WinCaptionButton::GetButtonDisplayOrderIndex() const {
   return button_display_order;
 }
 
-namespace {
-
-// Canvas::DrawRect's stroke can bleed out of |rect|'s bounds, so this draws a
-// rectangle inset such that the result is constrained to |rect|'s size.
-void DrawRect(gfx::Canvas* canvas,
-              const gfx::Rect& rect,
-              const cc::PaintFlags& flags) {
-  gfx::RectF rect_f(rect);
-  float stroke_half_width = flags.getStrokeWidth() / 2;
-  rect_f.Inset(gfx::InsetsF::VH(stroke_half_width, stroke_half_width));
-  canvas->DrawRect(rect_f, flags);
-}
-
-}  // namespace
-
 void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
   SkColor symbol_color = frame_view_->window()->overlay_symbol_color();
 
@@ -183,32 +180,21 @@ void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
 
   switch (button_type_) {
     case VIEW_ID_MINIMIZE_BUTTON: {
-      const int y = symbol_rect.CenterPoint().y();
-      const gfx::Point p1 = gfx::Point(symbol_rect.x(), y);
-      const gfx::Point p2 = gfx::Point(symbol_rect.right(), y);
-      canvas->DrawLine(p1, p2, flags);
+      icon_painter_->PaintMinimizeIcon(canvas, symbol_rect, flags);
       return;
     }
 
-    case VIEW_ID_MAXIMIZE_BUTTON:
-      DrawRect(canvas, symbol_rect, flags);
+    case VIEW_ID_MAXIMIZE_BUTTON: {
+      icon_painter_->PaintMaximizeIcon(canvas, symbol_rect, flags);
       return;
+    }
 
     case VIEW_ID_RESTORE_BUTTON: {
-      // Bottom left ("in front") square.
-      const int separation = std::floor(2 * scale);
-      symbol_rect.Inset(gfx::Insets::TLBR(0, separation, separation, 0));
-      DrawRect(canvas, symbol_rect, flags);
-
-      // Top right ("behind") square.
-      canvas->ClipRect(symbol_rect, SkClipOp::kDifference);
-      symbol_rect.Offset(separation, -separation);
-      DrawRect(canvas, symbol_rect, flags);
+      icon_painter_->PaintRestoreIcon(canvas, symbol_rect, flags);
       return;
     }
 
     case VIEW_ID_CLOSE_BUTTON: {
-      flags.setAntiAlias(true);
       // The close button's X is surrounded by a "halo" of transparent pixels.
       // When the X is white, the transparent pixels need to be a bit brighter
       // to be visible.
@@ -216,15 +202,7 @@ void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
           stroke_width * (symbol_color == SK_ColorWHITE ? 0.1f : 0.05f);
       flags.setStrokeWidth(stroke_width + stroke_halo);
 
-      // TODO(bsep): This sometimes draws misaligned at fractional device scales
-      // because the button's origin isn't necessarily aligned to pixels.
-      canvas->ClipRect(symbol_rect);
-      SkPath path;
-      path.moveTo(symbol_rect.x(), symbol_rect.y());
-      path.lineTo(symbol_rect.right(), symbol_rect.bottom());
-      path.moveTo(symbol_rect.right(), symbol_rect.y());
-      path.lineTo(symbol_rect.x(), symbol_rect.bottom());
-      canvas->DrawPath(path, flags);
+      icon_painter_->PaintCloseIcon(canvas, symbol_rect, flags);
       return;
     }
 
diff --git a/shell/browser/ui/views/win_caption_button.h b/shell/browser/ui/views/win_caption_button.h
index fafa3e414bcff..801474b5e3f4b 100644
--- a/shell/browser/ui/views/win_caption_button.h
+++ b/shell/browser/ui/views/win_caption_button.h
@@ -7,8 +7,11 @@
 #ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_CAPTION_BUTTON_H_
 #define ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_CAPTION_BUTTON_H_
 
+#include <memory>
+
 #include "chrome/browser/ui/frame/window_frame_util.h"
 #include "chrome/browser/ui/view_ids.h"
+#include "shell/browser/ui/views/win_icon_painter.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/button.h"
@@ -23,6 +26,8 @@ class WinCaptionButton : public views::Button {
                    WinFrameView* frame_view,
                    ViewID button_type,
                    const std::u16string& accessible_name);
+  ~WinCaptionButton() override;
+
   WinCaptionButton(const WinCaptionButton&) = delete;
   WinCaptionButton& operator=(const WinCaptionButton&) = delete;
 
@@ -35,6 +40,7 @@ class WinCaptionButton : public views::Button {
   void SetSize(gfx::Size size);
 
  private:
+  std::unique_ptr<WinIconPainter> CreateIconPainter();
   // Returns the amount we should visually reserve on the left (right in RTL)
   // for spacing between buttons. We do this instead of repositioning the
   // buttons to avoid the sliver of deadspace that would result.
@@ -53,6 +59,7 @@ class WinCaptionButton : public views::Button {
   void PaintSymbol(gfx::Canvas* canvas);
 
   WinFrameView* frame_view_;
+  std::unique_ptr<WinIconPainter> icon_painter_;
   ViewID button_type_;
 
   int base_width_ = WindowFrameUtil::kWindows10GlassCaptionButtonWidth;
diff --git a/shell/browser/ui/views/win_icon_painter.cc b/shell/browser/ui/views/win_icon_painter.cc
new file mode 100644
index 0000000000000..d61a7970c6705
--- /dev/null
+++ b/shell/browser/ui/views/win_icon_painter.cc
@@ -0,0 +1,143 @@
+// Copyright (c) 2022 Microsoft, Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/ui/views/win_icon_painter.h"
+
+#include "base/numerics/safe_conversions.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/skia_conversions.h"
+#include "ui/gfx/scoped_canvas.h"
+
+namespace {
+
+// Canvas::DrawRect's stroke can bleed out of |rect|'s bounds, so this draws a
+// rectangle inset such that the result is constrained to |rect|'s size.
+void DrawRect(gfx::Canvas* canvas,
+              const gfx::Rect& rect,
+              const cc::PaintFlags& flags) {
+  gfx::RectF rect_f(rect);
+  float stroke_half_width = flags.getStrokeWidth() / 2;
+  rect_f.Inset(stroke_half_width);
+  canvas->DrawRect(rect_f, flags);
+}
+
+void DrawRoundRect(gfx::Canvas* canvas,
+                   const gfx::Rect& rect,
+                   int radius,
+                   const cc::PaintFlags& flags) {
+  gfx::RectF rect_f(rect);
+  float stroke_half_width = flags.getStrokeWidth() / 2;
+  rect_f.Inset(stroke_half_width);
+  canvas->DrawRoundRect(rect_f, radius, flags);
+}
+
+// Draws a path containing the top and right edges of a rounded rectangle.
+void DrawRoundRectEdges(gfx::Canvas* canvas,
+                        const gfx::Rect& rect,
+                        float radius,
+                        const cc::PaintFlags& flags) {
+  gfx::RectF symbol_rect_f(rect);
+  float stroke_half_width = flags.getStrokeWidth() / 2;
+  symbol_rect_f.Inset(stroke_half_width);
+  SkPath path;
+  path.moveTo(symbol_rect_f.x(), symbol_rect_f.y());
+  path.arcTo(symbol_rect_f.right(), symbol_rect_f.y(), symbol_rect_f.right(),
+             symbol_rect_f.y() + radius, radius);
+  path.lineTo(symbol_rect_f.right(), symbol_rect_f.bottom());
+  canvas->DrawPath(path, flags);
+}
+
+}  // namespace
+
+namespace electron {
+
+WinIconPainter::WinIconPainter() = default;
+WinIconPainter::~WinIconPainter() = default;
+
+void WinIconPainter::PaintMinimizeIcon(gfx::Canvas* canvas,
+                                       const gfx::Rect& symbol_rect,
+                                       const cc::PaintFlags& flags) {
+  const int y = symbol_rect.CenterPoint().y();
+  const gfx::Point p1 = gfx::Point(symbol_rect.x(), y);
+  const gfx::Point p2 = gfx::Point(symbol_rect.right(), y);
+  canvas->DrawLine(p1, p2, flags);
+}
+
+void WinIconPainter::PaintMaximizeIcon(gfx::Canvas* canvas,
+                                       const gfx::Rect& symbol_rect,
+                                       const cc::PaintFlags& flags) {
+  DrawRect(canvas, symbol_rect, flags);
+}
+
+void WinIconPainter::PaintRestoreIcon(gfx::Canvas* canvas,
+                                      const gfx::Rect& symbol_rect,
+                                      const cc::PaintFlags& flags) {
+  const int separation = std::floor(2 * canvas->image_scale());
+  gfx::Rect icon_rect = symbol_rect;
+  icon_rect.Inset(gfx::Insets::TLBR(separation, 0, 0, separation));
+
+  // Bottom left ("in front") square.
+  DrawRect(canvas, icon_rect, flags);
+
+  // Top right ("behind") square.
+  canvas->ClipRect(icon_rect, SkClipOp::kDifference);
+  icon_rect.Offset(separation, -separation);
+  DrawRect(canvas, icon_rect, flags);
+}
+
+void WinIconPainter::PaintCloseIcon(gfx::Canvas* canvas,
+                                    const gfx::Rect& symbol_rect,
+                                    const cc::PaintFlags& flags) {
+  // TODO(bsep): This sometimes draws misaligned at fractional device scales
+  // because the button's origin isn't necessarily aligned to pixels.
+  cc::PaintFlags paint_flags = flags;
+  paint_flags.setAntiAlias(true);
+
+  canvas->ClipRect(symbol_rect);
+  SkPath path;
+  path.moveTo(symbol_rect.x(), symbol_rect.y());
+  path.lineTo(symbol_rect.right(), symbol_rect.bottom());
+  path.moveTo(symbol_rect.right(), symbol_rect.y());
+  path.lineTo(symbol_rect.x(), symbol_rect.bottom());
+  canvas->DrawPath(path, flags);
+}
+
+Win11IconPainter::Win11IconPainter() = default;
+Win11IconPainter::~Win11IconPainter() = default;
+
+void Win11IconPainter::PaintMaximizeIcon(gfx::Canvas* canvas,
+                                         const gfx::Rect& symbol_rect,
+                                         const cc::PaintFlags& flags) {
+  cc::PaintFlags paint_flags = flags;
+  paint_flags.setAntiAlias(true);
+
+  const float corner_radius = 2 * canvas->image_scale();
+  DrawRoundRect(canvas, symbol_rect, corner_radius, flags);
+}
+
+void Win11IconPainter::PaintRestoreIcon(gfx::Canvas* canvas,
+                                        const gfx::Rect& symbol_rect,
+                                        const cc::PaintFlags& flags) {
+  const int separation = std::floor(2 * canvas->image_scale());
+  gfx::Rect icon_rect = symbol_rect;
+  icon_rect.Inset(gfx::Insets::TLBR(separation, 0, 0, separation));
+
+  cc::PaintFlags paint_flags = flags;
+  paint_flags.setAntiAlias(true);
+
+  // Bottom left ("in front") rounded square.
+  const float bottom_rect_radius = 1 * canvas->image_scale();
+  DrawRoundRect(canvas, icon_rect, bottom_rect_radius, flags);
+
+  // Top right ("behind") top+right edges of rounded square (2.5x).
+  icon_rect.Offset(separation, -separation);
+  // Apply inset to left+bottom edges since we don't draw arcs for those edges
+  constexpr int top_rect_inset = 1;
+  icon_rect.Inset(gfx::Insets::TLBR(0, top_rect_inset, top_rect_inset, 0));
+
+  const float top_rect_radius = 2.5f * canvas->image_scale();
+  DrawRoundRectEdges(canvas, icon_rect, top_rect_radius, flags);
+}
+}  // namespace electron
diff --git a/shell/browser/ui/views/win_icon_painter.h b/shell/browser/ui/views/win_icon_painter.h
new file mode 100644
index 0000000000000..d3c85be296a0b
--- /dev/null
+++ b/shell/browser/ui/views/win_icon_painter.h
@@ -0,0 +1,64 @@
+// Copyright (c) 2022 Microsoft, Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_ICON_PAINTER_H_
+#define ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_ICON_PAINTER_H_
+
+#include "base/memory/raw_ptr.h"
+#include "ui/gfx/canvas.h"
+
+namespace electron {
+
+class WinIconPainter {
+ public:
+  WinIconPainter();
+  virtual ~WinIconPainter();
+
+  WinIconPainter(const WinIconPainter&) = delete;
+  WinIconPainter& operator=(const WinIconPainter&) = delete;
+
+ public:
+  // Paints the minimize icon for the button
+  virtual void PaintMinimizeIcon(gfx::Canvas* canvas,
+                                 const gfx::Rect& symbol_rect,
+                                 const cc::PaintFlags& flags);
+
+  // Paints the maximize icon for the button
+  virtual void PaintMaximizeIcon(gfx::Canvas* canvas,
+                                 const gfx::Rect& symbol_rect,
+                                 const cc::PaintFlags& flags);
+
+  // Paints the restore icon for the button
+  virtual void PaintRestoreIcon(gfx::Canvas* canvas,
+                                const gfx::Rect& symbol_rect,
+                                const cc::PaintFlags& flags);
+
+  // Paints the close icon for the button
+  virtual void PaintCloseIcon(gfx::Canvas* canvas,
+                              const gfx::Rect& symbol_rect,
+                              const cc::PaintFlags& flags);
+};
+
+class Win11IconPainter : public WinIconPainter {
+ public:
+  Win11IconPainter();
+  ~Win11IconPainter() override;
+
+  Win11IconPainter(const Win11IconPainter&) = delete;
+  Win11IconPainter& operator=(const Win11IconPainter&) = delete;
+
+ public:
+  // Paints the maximize icon for the button
+  void PaintMaximizeIcon(gfx::Canvas* canvas,
+                         const gfx::Rect& symbol_rect,
+                         const cc::PaintFlags& flags) override;
+
+  // Paints the restore icon for the button
+  void PaintRestoreIcon(gfx::Canvas* canvas,
+                        const gfx::Rect& symbol_rect,
+                        const cc::PaintFlags& flags) override;
+};
+}  // namespace electron
+
+#endif  // ELECTRON_SHELL_BROWSER_UI_VIEWS_WIN_ICON_PAINTER_H_

From 511ff8bc8daf4f976654744d6018f3aa45c40f1f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 12 Jul 2022 00:48:51 -0700
Subject: [PATCH 577/811] fix: ensure that requestMediaKeySystemAccess resolves
 (#34886)

When widevine was disabled at the build level we never dealt with the callback passed into GetSupportedKeySystems.  This was ok until requests became marked pending in https://chromium-review.googlesource.com/c/chromium/src/+/3430502 until the callback was called.  This resulted in a promise never resolving / rejecting and certain media websites (E.g. spotify) hanging on load waiting for a signal that would never arrive.
---
 shell/app/electron_content_client.cc   | 13 +++++++------
 shell/renderer/renderer_client_base.cc |  7 +++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/shell/app/electron_content_client.cc b/shell/app/electron_content_client.cc
index b755232a2b53b..a63aebdddad5e 100644
--- a/shell/app/electron_content_client.cc
+++ b/shell/app/electron_content_client.cc
@@ -22,17 +22,18 @@
 #include "ppapi/buildflags/buildflags.h"
 #include "shell/common/electron_paths.h"
 #include "shell/common/options_switches.h"
+#include "third_party/widevine/cdm/buildflags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_constants.h"
 // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // NOLINT(build/include_directory)
 
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if BUILDFLAG(ENABLE_WIDEVINE)
 #include "base/native_library.h"
 #include "content/public/common/cdm_info.h"
 #include "media/base/video_codecs.h"
-#endif  // defined(WIDEVINE_CDM_AVAILABLE)
+#endif  // BUILDFLAG(ENABLE_WIDEVINE)
 
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
 #include "chrome/common/pdf_util.h"
@@ -58,7 +59,7 @@ enum class WidevineCdmFileCheck {
   kNotFound,
 };
 
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if BUILDFLAG(ENABLE_WIDEVINE)
 bool IsWidevineAvailable(
     base::FilePath* cdm_path,
     std::vector<media::VideoCodec>* codecs_supported,
@@ -102,7 +103,7 @@ bool IsWidevineAvailable(
 
   return false;
 }
-#endif  // defined(WIDEVINE_CDM_AVAILABLE)
+#endif  // BUILDFLAG(ENABLE_WIDEVINE)
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
@@ -227,7 +228,7 @@ void ElectronContentClient::AddContentDecryptionModules(
     std::vector<content::CdmInfo>* cdms,
     std::vector<media::CdmHostFilePath>* cdm_host_file_paths) {
   if (cdms) {
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if BUILDFLAG(ENABLE_WIDEVINE)
     base::FilePath cdm_path;
     std::vector<media::VideoCodec> video_codecs_supported;
     base::flat_set<media::CdmSessionType> session_types_supported;
@@ -252,7 +253,7 @@ void ElectronContentClient::AddContentDecryptionModules(
           kWidevineCdmDisplayName, kWidevineCdmGuid, version, cdm_path,
           kWidevineCdmFileSystemId, capability, kWidevineKeySystem, false));
     }
-#endif  // defined(WIDEVINE_CDM_AVAILABLE)
+#endif  // BUILDFLAG(ENABLE_WIDEVINE)
   }
 }
 
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index c1e177049230d..a7ce97370f066 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -47,6 +47,7 @@
 #include "third_party/blink/public/web/web_view.h"
 #include "third_party/blink/renderer/platform/media/multi_buffer_data_source.h"  // nogncheck
 #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"  // nogncheck
+#include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(IS_MAC)
 #include "base/strings/sys_string_conversions.h"
@@ -56,7 +57,7 @@
 #include <shlobj.h>
 #endif
 
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if BUILDFLAG(ENABLE_WIDEVINE)
 #include "chrome/renderer/media/chrome_key_systems.h"  // nogncheck
 #endif
 
@@ -377,8 +378,10 @@ bool RendererClientBase::OverrideCreatePlugin(
 
 void RendererClientBase::GetSupportedKeySystems(
     media::GetSupportedKeySystemsCB cb) {
-#if defined(WIDEVINE_CDM_AVAILABLE)
+#if BUILDFLAG(ENABLE_WIDEVINE)
   GetChromeKeySystems(std::move(cb));
+#else
+  std::move(cb).Run({});
 #endif
 }
 

From 5314ae53427ad69dd9ad43dfd26a09b9edc799c7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 06:01:28 -0700
Subject: [PATCH 578/811] Bump v21.0.0-nightly.20220712

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c8b04309ea458..5a0433e61cd15 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220711
\ No newline at end of file
+21.0.0-nightly.20220712
\ No newline at end of file
diff --git a/package.json b/package.json
index 8a8b7a1ad0ab0..30df1779f0a08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220711",
+  "version": "21.0.0-nightly.20220712",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 0169410608a3b..7f600c4c6c522 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220711
- PRODUCTVERSION 21,0,0,20220711
+ FILEVERSION 21,0,0,20220712
+ PRODUCTVERSION 21,0,0,20220712
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From afd08c9450f5ad9b067b5f6dbf9b9243307d00b2 Mon Sep 17 00:00:00 2001
From: Joan Xie <joan.xie12@gmail.com>
Date: Tue, 12 Jul 2022 08:38:49 -0700
Subject: [PATCH 579/811] feat: Enable APNS registration + notification
 delivery in macOS apps (#33574)

---
 docs/api/push-notifications.md                | 48 ++++++++++++
 filenames.auto.gni                            |  2 +
 filenames.gni                                 |  3 +
 lib/browser/api/module-list.ts                |  1 +
 lib/browser/api/push-notifications.ts         |  3 +
 .../api/electron_api_push_notifications.cc    | 77 +++++++++++++++++++
 .../api/electron_api_push_notifications.h     | 64 +++++++++++++++
 .../electron_api_push_notifications_mac.mm    | 62 +++++++++++++++
 .../mac/electron_application_delegate.mm      | 40 ++++++++++
 shell/common/node_bindings.cc                 |  1 +
 typings/internal-ambient.d.ts                 |  1 +
 11 files changed, 302 insertions(+)
 create mode 100644 docs/api/push-notifications.md
 create mode 100644 lib/browser/api/push-notifications.ts
 create mode 100644 shell/browser/api/electron_api_push_notifications.cc
 create mode 100644 shell/browser/api/electron_api_push_notifications.h
 create mode 100644 shell/browser/api/electron_api_push_notifications_mac.mm

diff --git a/docs/api/push-notifications.md b/docs/api/push-notifications.md
new file mode 100644
index 0000000000000..cad396bc03d56
--- /dev/null
+++ b/docs/api/push-notifications.md
@@ -0,0 +1,48 @@
+# pushNotifications
+
+Process: [Main](../glossary.md#main-process)
+
+> Register for and receive notifications from remote push notification services
+
+For example, when registering for push notifications via Apple push notification services (APNS):
+
+```javascript
+const { pushNotifications, Notification } = require('electron')
+
+pushNotifications.registerForAPNSNotifications().then((token) => {
+  // forward token to your remote notification server
+})
+
+pushNotifications.on('received-apns-notification', (event, userInfo) => {
+  // generate a new Notification object with the relevant userInfo fields
+})
+```
+
+## Events
+
+The `pushNotification` module emits the following events:
+
+#### Event: 'received-apns-notification' _macOS_
+
+Returns:
+
+* `userInfo` Record<String, any>
+
+Emitted when the app receives a remote notification while running.
+See: https://developer.apple.com/documentation/appkit/nsapplicationdelegate/1428430-application?language=objc
+
+## Methods
+
+The `pushNotification` module has the following methods:
+
+### `pushNotifications.registerForAPNSNotifications()` _macOS_
+
+Returns `Promise<string>`
+
+Registers the app with Apple Push Notification service (APNS) to receive [Badge, Sound, and Alert](https://developer.apple.com/documentation/appkit/sremotenotificationtype?language=objc) notifications. If registration is successful, the promise will be resolved with the APNS device token. Otherwise, the promise will be rejected with an error message.
+See: https://developer.apple.com/documentation/appkit/nsapplication/1428476-registerforremotenotificationtyp?language=objc
+
+### `pushNotifications.unregisterForAPNSNotifications()` _macOS_
+
+Unregisters the app from notifications received from APNS.
+See: https://developer.apple.com/documentation/appkit/nsapplication/1428747-unregisterforremotenotifications?language=objc
diff --git a/filenames.auto.gni b/filenames.auto.gni
index 82a36d7a46360..2b865962a3885 100644
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -40,6 +40,7 @@ auto_filenames = {
     "docs/api/power-save-blocker.md",
     "docs/api/process.md",
     "docs/api/protocol.md",
+    "docs/api/push-notifications.md",
     "docs/api/safe-storage.md",
     "docs/api/screen.md",
     "docs/api/service-workers.md",
@@ -212,6 +213,7 @@ auto_filenames = {
     "lib/browser/api/power-monitor.ts",
     "lib/browser/api/power-save-blocker.ts",
     "lib/browser/api/protocol.ts",
+    "lib/browser/api/push-notifications.ts",
     "lib/browser/api/safe-storage.ts",
     "lib/browser/api/screen.ts",
     "lib/browser/api/session.ts",
diff --git a/filenames.gni b/filenames.gni
index 9cdb0637abb60..5b9d3cc721dbb 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -128,6 +128,7 @@ filenames = {
     "shell/browser/api/electron_api_menu_mac.mm",
     "shell/browser/api/electron_api_native_theme_mac.mm",
     "shell/browser/api/electron_api_power_monitor_mac.mm",
+    "shell/browser/api/electron_api_push_notifications_mac.mm",
     "shell/browser/api/electron_api_system_preferences_mac.mm",
     "shell/browser/api/electron_api_web_contents_mac.mm",
     "shell/browser/auto_updater_mac.mm",
@@ -295,6 +296,8 @@ filenames = {
     "shell/browser/api/electron_api_printing.cc",
     "shell/browser/api/electron_api_protocol.cc",
     "shell/browser/api/electron_api_protocol.h",
+    "shell/browser/api/electron_api_push_notifications.cc",
+    "shell/browser/api/electron_api_push_notifications.h",
     "shell/browser/api/electron_api_safe_storage.cc",
     "shell/browser/api/electron_api_safe_storage.h",
     "shell/browser/api/electron_api_screen.cc",
diff --git a/lib/browser/api/module-list.ts b/lib/browser/api/module-list.ts
index b9e3340cd2955..be516aec2885a 100644
--- a/lib/browser/api/module-list.ts
+++ b/lib/browser/api/module-list.ts
@@ -22,6 +22,7 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'Notification', loader: () => require('./notification') },
   { name: 'powerMonitor', loader: () => require('./power-monitor') },
   { name: 'powerSaveBlocker', loader: () => require('./power-save-blocker') },
+  { name: 'pushNotifications', loader: () => require('./push-notifications') },
   { name: 'protocol', loader: () => require('./protocol') },
   { name: 'safeStorage', loader: () => require('./safe-storage') },
   { name: 'screen', loader: () => require('./screen') },
diff --git a/lib/browser/api/push-notifications.ts b/lib/browser/api/push-notifications.ts
new file mode 100644
index 0000000000000..346ae93c6b0da
--- /dev/null
+++ b/lib/browser/api/push-notifications.ts
@@ -0,0 +1,3 @@
+const { pushNotifications } = process._linkedBinding('electron_browser_push_notifications');
+
+export default pushNotifications;
diff --git a/shell/browser/api/electron_api_push_notifications.cc b/shell/browser/api/electron_api_push_notifications.cc
new file mode 100644
index 0000000000000..bb0cb13d0f1d7
--- /dev/null
+++ b/shell/browser/api/electron_api_push_notifications.cc
@@ -0,0 +1,77 @@
+// Copyright (c) 2022 Asana, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/api/electron_api_push_notifications.h"
+
+#include <string>
+
+#include "shell/common/gin_converters/value_converter.h"
+#include "shell/common/gin_helper/dictionary.h"
+#include "shell/common/node_includes.h"
+
+namespace electron {
+
+namespace api {
+
+PushNotifications* g_push_notifications = nullptr;
+
+gin::WrapperInfo PushNotifications::kWrapperInfo = {gin::kEmbedderNativeGin};
+
+PushNotifications::PushNotifications() = default;
+
+PushNotifications::~PushNotifications() {
+  g_push_notifications = nullptr;
+}
+
+// static
+PushNotifications* PushNotifications::Get() {
+  if (!g_push_notifications)
+    g_push_notifications = new PushNotifications();
+  return g_push_notifications;
+}
+
+// static
+gin::Handle<PushNotifications> PushNotifications::Create(v8::Isolate* isolate) {
+  return gin::CreateHandle(isolate, PushNotifications::Get());
+}
+
+// static
+gin::ObjectTemplateBuilder PushNotifications::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  auto builder = gin_helper::EventEmitterMixin<
+      PushNotifications>::GetObjectTemplateBuilder(isolate);
+#if BUILDFLAG(IS_MAC)
+  builder
+      .SetMethod("registerForAPNSNotifications",
+                 &PushNotifications::RegisterForAPNSNotifications)
+      .SetMethod("unregisterForAPNSNotifications",
+                 &PushNotifications::UnregisterForAPNSNotifications);
+#endif
+  return builder;
+}
+
+const char* PushNotifications::GetTypeName() {
+  return "PushNotifications";
+}
+
+}  // namespace api
+
+}  // namespace electron
+
+namespace {
+
+void Initialize(v8::Local<v8::Object> exports,
+                v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context,
+                void* priv) {
+  v8::Isolate* isolate = context->GetIsolate();
+  gin::Dictionary dict(isolate, exports);
+  dict.Set("pushNotifications",
+           electron::api::PushNotifications::Create(isolate));
+}
+
+}  // namespace
+
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_push_notifications,
+                                 Initialize)
diff --git a/shell/browser/api/electron_api_push_notifications.h b/shell/browser/api/electron_api_push_notifications.h
new file mode 100644
index 0000000000000..f818afdd109d4
--- /dev/null
+++ b/shell/browser/api/electron_api_push_notifications.h
@@ -0,0 +1,64 @@
+// Copyright (c) 2016 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ELECTRON_SHELL_BROWSER_API_ELECTRON_API_PUSH_NOTIFICATIONS_H_
+#define ELECTRON_SHELL_BROWSER_API_ELECTRON_API_PUSH_NOTIFICATIONS_H_
+
+#include <string>
+
+#include <vector>
+#include "gin/handle.h"
+#include "gin/wrappable.h"
+#include "shell/browser/browser_observer.h"
+#include "shell/browser/electron_browser_client.h"
+#include "shell/browser/event_emitter_mixin.h"
+#include "shell/common/gin_helper/promise.h"
+
+namespace electron {
+
+namespace api {
+
+class PushNotifications
+    : public ElectronBrowserClient::Delegate,
+      public gin::Wrappable<PushNotifications>,
+      public gin_helper::EventEmitterMixin<PushNotifications>,
+      public BrowserObserver {
+ public:
+  static PushNotifications* Get();
+  static gin::Handle<PushNotifications> Create(v8::Isolate* isolate);
+
+  // gin::Wrappable
+  static gin::WrapperInfo kWrapperInfo;
+  gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+      v8::Isolate* isolate) override;
+  const char* GetTypeName() override;
+
+  // disable copy
+  PushNotifications(const PushNotifications&) = delete;
+  PushNotifications& operator=(const PushNotifications&) = delete;
+
+#if BUILDFLAG(IS_MAC)
+  void OnDidReceiveAPNSNotification(const base::DictionaryValue& user_info);
+  void ResolveAPNSPromiseSetWithToken(const std::string& token_string);
+  void RejectAPNSPromiseSetWithError(const std::string& error_message);
+#endif
+
+ private:
+  PushNotifications();
+  ~PushNotifications() override;
+  // This set maintains all the promises that should be fulfilled
+  // once macOS registers, or fails to register, for APNS
+  std::vector<gin_helper::Promise<std::string>> apns_promise_set_;
+
+#if BUILDFLAG(IS_MAC)
+  v8::Local<v8::Promise> RegisterForAPNSNotifications(v8::Isolate* isolate);
+  void UnregisterForAPNSNotifications();
+#endif
+};
+
+}  // namespace api
+
+}  // namespace electron
+
+#endif  // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_PUSH_NOTIFICATIONS_H_
diff --git a/shell/browser/api/electron_api_push_notifications_mac.mm b/shell/browser/api/electron_api_push_notifications_mac.mm
new file mode 100644
index 0000000000000..c52511625a704
--- /dev/null
+++ b/shell/browser/api/electron_api_push_notifications_mac.mm
@@ -0,0 +1,62 @@
+// Copyright (c) 2022 Asana, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/api/electron_api_push_notifications.h"
+
+#include <string>
+
+#include <utility>
+#include <vector>
+#import "shell/browser/mac/electron_application.h"
+#include "shell/common/gin_converters/value_converter.h"
+#include "shell/common/gin_helper/promise.h"
+
+namespace electron {
+
+namespace api {
+
+v8::Local<v8::Promise> PushNotifications::RegisterForAPNSNotifications(
+    v8::Isolate* isolate) {
+  gin_helper::Promise<std::string> promise(isolate);
+  v8::Local<v8::Promise> handle = promise.GetHandle();
+
+  [[AtomApplication sharedApplication]
+      registerForRemoteNotificationTypes:NSRemoteNotificationTypeBadge |
+                                         NSRemoteNotificationTypeAlert |
+                                         NSRemoteNotificationTypeSound];
+
+  PushNotifications::apns_promise_set_.emplace_back(std::move(promise));
+  return handle;
+}
+
+void PushNotifications::ResolveAPNSPromiseSetWithToken(
+    const std::string& token_string) {
+  std::vector<gin_helper::Promise<std::string>> promises =
+      std::move(PushNotifications::apns_promise_set_);
+  for (auto& promise : promises) {
+    promise.Resolve(token_string);
+  }
+}
+
+void PushNotifications::RejectAPNSPromiseSetWithError(
+    const std::string& error_message) {
+  std::vector<gin_helper::Promise<std::string>> promises =
+      std::move(PushNotifications::apns_promise_set_);
+  for (auto& promise : promises) {
+    promise.RejectWithErrorMessage(error_message);
+  }
+}
+
+void PushNotifications::UnregisterForAPNSNotifications() {
+  [[AtomApplication sharedApplication] unregisterForRemoteNotifications];
+}
+
+void PushNotifications::OnDidReceiveAPNSNotification(
+    const base::DictionaryValue& user_info) {
+  Emit("received-apns-notification", user_info);
+}
+
+}  // namespace api
+
+}  // namespace electron
diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm
index d065eb75e4213..013f51137e4bf 100644
--- a/shell/browser/mac/electron_application_delegate.mm
+++ b/shell/browser/mac/electron_application_delegate.mm
@@ -13,6 +13,7 @@
 #include "base/mac/scoped_objc_class_swizzler.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
+#include "shell/browser/api/electron_api_push_notifications.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/mac/dict_util.h"
 #import "shell/browser/mac/electron_application.h"
@@ -157,4 +158,43 @@ - (IBAction)newWindowForTab:(id)sender {
   electron::Browser::Get()->NewWindowForTab();
 }
 
+- (void)application:(NSApplication*)application
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken {
+  // https://stackoverflow.com/a/16411517
+  const char* token_data = static_cast<const char*>([deviceToken bytes]);
+  NSMutableString* token_string = [NSMutableString string];
+  for (NSUInteger i = 0; i < [deviceToken length]; i++) {
+    [token_string appendFormat:@"%02.2hhX", token_data[i]];
+  }
+  // Resolve outstanding APNS promises created during registration attempts
+  electron::api::PushNotifications* push_notifications =
+      electron::api::PushNotifications::Get();
+  if (push_notifications) {
+    push_notifications->ResolveAPNSPromiseSetWithToken(
+        base::SysNSStringToUTF8(token_string));
+  }
+}
+
+- (void)application:(NSApplication*)application
+    didFailToRegisterForRemoteNotificationsWithError:(NSError*)error {
+  std::string error_message(base::SysNSStringToUTF8(
+      [NSString stringWithFormat:@"%ld %@ %@", [error code], [error domain],
+                                 [error userInfo]]));
+  electron::api::PushNotifications* push_notifications =
+      electron::api::PushNotifications::Get();
+  if (push_notifications) {
+    push_notifications->RejectAPNSPromiseSetWithError(error_message);
+  }
+}
+
+- (void)application:(NSApplication*)application
+    didReceiveRemoteNotification:(NSDictionary*)userInfo {
+  electron::api::PushNotifications* push_notifications =
+      electron::api::PushNotifications::Get();
+  if (push_notifications) {
+    electron::api::PushNotifications::Get()->OnDidReceiveAPNSNotification(
+        electron::NSDictionaryToDictionaryValue(userInfo));
+  }
+}
+
 @end
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index b0c6558e20556..71a2f54eb5c65 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -62,6 +62,7 @@
   V(electron_browser_power_save_blocker) \
   V(electron_browser_protocol)           \
   V(electron_browser_printing)           \
+  V(electron_browser_push_notifications) \
   V(electron_browser_safe_storage)       \
   V(electron_browser_session)            \
   V(electron_browser_screen)             \
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 207c4162789ab..950d848f50cb2 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -225,6 +225,7 @@ declare namespace NodeJS {
     }
     _linkedBinding(name: 'electron_browser_power_monitor'): PowerMonitorBinding;
     _linkedBinding(name: 'electron_browser_power_save_blocker'): { powerSaveBlocker: Electron.PowerSaveBlocker };
+    _linkedBinding(name: 'electron_browser_push_notifications'): { pushNotifications: Electron.PushNotifications };
     _linkedBinding(name: 'electron_browser_safe_storage'): { safeStorage: Electron.SafeStorage };
     _linkedBinding(name: 'electron_browser_session'): typeof Electron.Session;
     _linkedBinding(name: 'electron_browser_screen'): { createScreen(): Electron.Screen };

From 62aeb74d7c8ec49b7c47915d4befee8dba3e8c14 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 13 Jul 2022 12:22:17 +0200
Subject: [PATCH 580/811] fix: `base::DictionaryValue` usage in APNS notifs
 (#34897)

---
 shell/browser/api/electron_api_push_notifications.h      | 2 +-
 shell/browser/api/electron_api_push_notifications_mac.mm | 2 +-
 shell/browser/mac/electron_application_delegate.mm       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/browser/api/electron_api_push_notifications.h b/shell/browser/api/electron_api_push_notifications.h
index f818afdd109d4..f0f46b5e574ee 100644
--- a/shell/browser/api/electron_api_push_notifications.h
+++ b/shell/browser/api/electron_api_push_notifications.h
@@ -39,7 +39,7 @@ class PushNotifications
   PushNotifications& operator=(const PushNotifications&) = delete;
 
 #if BUILDFLAG(IS_MAC)
-  void OnDidReceiveAPNSNotification(const base::DictionaryValue& user_info);
+  void OnDidReceiveAPNSNotification(const base::Value::Dict& user_info);
   void ResolveAPNSPromiseSetWithToken(const std::string& token_string);
   void RejectAPNSPromiseSetWithError(const std::string& error_message);
 #endif
diff --git a/shell/browser/api/electron_api_push_notifications_mac.mm b/shell/browser/api/electron_api_push_notifications_mac.mm
index c52511625a704..6838293937a8f 100644
--- a/shell/browser/api/electron_api_push_notifications_mac.mm
+++ b/shell/browser/api/electron_api_push_notifications_mac.mm
@@ -53,7 +53,7 @@
 }
 
 void PushNotifications::OnDidReceiveAPNSNotification(
-    const base::DictionaryValue& user_info) {
+    const base::Value::Dict& user_info) {
   Emit("received-apns-notification", user_info);
 }
 
diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm
index 013f51137e4bf..7dc351f4cc654 100644
--- a/shell/browser/mac/electron_application_delegate.mm
+++ b/shell/browser/mac/electron_application_delegate.mm
@@ -193,7 +193,7 @@ - (void)application:(NSApplication*)application
       electron::api::PushNotifications::Get();
   if (push_notifications) {
     electron::api::PushNotifications::Get()->OnDidReceiveAPNSNotification(
-        electron::NSDictionaryToDictionaryValue(userInfo));
+        electron::NSDictionaryToValue(userInfo));
   }
 }
 

From 07d168343ade5e0b665a6a812c269a0785a45249 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 13 Jul 2022 12:23:24 +0200
Subject: [PATCH 581/811] fix: enable `deviceName` validation on Linux (#34872)

---
 .../browser/api/electron_api_web_contents.cc  | 58 +++++++++----------
 shell/browser/api/electron_api_web_contents.h | 11 ++--
 spec-main/api-web-contents-spec.ts            | 10 ++--
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 5bfe25f490411..ce94fda7c1a9a 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -419,21 +419,34 @@ bool IsDeviceNameValid(const std::u16string& device_name) {
   bool printer_exists = new_printer != nullptr;
   PMRelease(new_printer);
   return printer_exists;
-#elif BUILDFLAG(IS_WIN)
-  printing::ScopedPrinterHandle printer;
-  return printer.OpenPrinterWithName(base::as_wcstr(device_name));
 #else
-  return true;
+  scoped_refptr<printing::PrintBackend> print_backend =
+      printing::PrintBackend::CreateInstance(
+          g_browser_process->GetApplicationLocale());
+  return print_backend->IsValidPrinter(base::UTF16ToUTF8(device_name));
 #endif
 }
 
-std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
+// This function returns a validated device name.
+// If the user passed one to webContents.print(), we check that it's valid and
+// return it or fail if the network doesn't recognize it. If the user didn't
+// pass a device name, we first try to return the system default printer. If one
+// isn't set, then pull all the printers and use the first one or fail if none
+// exist.
+std::pair<std::string, std::u16string> GetDeviceNameToUse(
+    const std::u16string& device_name) {
 #if BUILDFLAG(IS_WIN)
   // Blocking is needed here because Windows printer drivers are oftentimes
   // not thread-safe and have to be accessed on the UI thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 #endif
 
+  if (!device_name.empty()) {
+    if (!IsDeviceNameValid(device_name))
+      return std::make_pair("Invalid deviceName provided", std::u16string());
+    return std::make_pair(std::string(), device_name);
+  }
+
   scoped_refptr<printing::PrintBackend> print_backend =
       printing::PrintBackend::CreateInstance(
           g_browser_process->GetApplicationLocale());
@@ -446,14 +459,16 @@ std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
   if (code != printing::mojom::ResultCode::kSuccess)
     LOG(ERROR) << "Failed to get default printer name";
 
-  // Check for existing printers and pick the first one should it exist.
   if (printer_name.empty()) {
     printing::PrinterList printers;
     if (print_backend->EnumeratePrinters(printers) !=
         printing::mojom::ResultCode::kSuccess)
       return std::make_pair("Failed to enumerate printers", std::u16string());
-    if (!printers.empty())
-      printer_name = printers.front().printer_name;
+    if (printers.empty())
+      return std::make_pair("No printers available on the network",
+                            std::u16string());
+
+    printer_name = printers.front().printer_name;
   }
 
   return std::make_pair(std::string(), base::UTF8ToUTF16(printer_name));
@@ -2579,12 +2594,11 @@ bool WebContents::IsCurrentlyAudible() {
 }
 
 #if BUILDFLAG(ENABLE_PRINTING)
-void WebContents::OnGetDefaultPrinter(
+void WebContents::OnGetDeviceNameToUse(
     base::Value::Dict print_settings,
     printing::CompletionCallback print_callback,
-    std::u16string device_name,
     bool silent,
-    // <error, default_printer>
+    // <error, device_name>
     std::pair<std::string, std::u16string> info) {
   // The content::WebContents might be already deleted at this point, and the
   // PrintViewManagerElectron class does not do null check.
@@ -2601,16 +2615,7 @@ void WebContents::OnGetDefaultPrinter(
   }
 
   // If the user has passed a deviceName use it, otherwise use default printer.
-  std::u16string printer_name = device_name.empty() ? info.second : device_name;
-
-  // If there are no valid printers available on the network, we bail.
-  if (printer_name.empty() || !IsDeviceNameValid(printer_name)) {
-    if (print_callback)
-      std::move(print_callback).Run(false, "no valid printers available");
-    return;
-  }
-
-  print_settings.Set(printing::kSettingDeviceName, printer_name);
+  print_settings.Set(printing::kSettingDeviceName, info.second);
 
   auto* print_view_manager =
       PrintViewManagerElectron::FromWebContents(web_contents());
@@ -2700,11 +2705,6 @@ void WebContents::Print(gin::Arguments* args) {
   // Printer device name as opened by the OS.
   std::u16string device_name;
   options.Get("deviceName", &device_name);
-  if (!device_name.empty() && !IsDeviceNameValid(device_name)) {
-    gin_helper::ErrorThrower(args->isolate())
-        .ThrowError("webContents.print(): Invalid deviceName provided.");
-    return;
-  }
 
   int scale_factor = 100;
   options.Get("scaleFactor", &scale_factor);
@@ -2794,10 +2794,10 @@ void WebContents::Print(gin::Arguments* args) {
   }
 
   print_task_runner_->PostTaskAndReplyWithResult(
-      FROM_HERE, base::BindOnce(&GetDefaultPrinterAsync),
-      base::BindOnce(&WebContents::OnGetDefaultPrinter,
+      FROM_HERE, base::BindOnce(&GetDeviceNameToUse, device_name),
+      base::BindOnce(&WebContents::OnGetDeviceNameToUse,
                      weak_factory_.GetWeakPtr(), std::move(settings),
-                     std::move(callback), device_name, silent));
+                     std::move(callback), silent));
 }
 
 // Partially duplicated and modified from
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 1090adca3da25..7ccc525f56096 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -216,12 +216,11 @@ class WebContents : public ExclusiveAccessContext,
   void HandleNewRenderFrame(content::RenderFrameHost* render_frame_host);
 
 #if BUILDFLAG(ENABLE_PRINTING)
-  void OnGetDefaultPrinter(base::Value::Dict print_settings,
-                           printing::CompletionCallback print_callback,
-                           std::u16string device_name,
-                           bool silent,
-                           // <error, default_printer_name>
-                           std::pair<std::string, std::u16string> info);
+  void OnGetDeviceNameToUse(base::Value::Dict print_settings,
+                            printing::CompletionCallback print_callback,
+                            bool silent,
+                            // <error, device_name>
+                            std::pair<std::string, std::u16string> info);
   void Print(gin::Arguments* args);
   // Print current page as PDF.
   v8::Local<v8::Promise> PrintToPDF(const base::Value& settings);
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 55626f4189ed2..0152f9d158ed9 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -179,10 +179,12 @@ describe('webContents module', () => {
       }).to.throw('webContents.print(): Invalid optional callback provided.');
     });
 
-    ifit(process.platform !== 'linux')('throws when an invalid deviceName is passed', () => {
-      expect(() => {
-        w.webContents.print({ deviceName: 'i-am-a-nonexistent-printer' }, () => {});
-      }).to.throw('webContents.print(): Invalid deviceName provided.');
+    it('fails when an invalid deviceName is passed', (done) => {
+      w.webContents.print({ deviceName: 'i-am-a-nonexistent-printer' }, (success, reason) => {
+        expect(success).to.equal(false);
+        expect(reason).to.match(/Invalid deviceName provided/);
+        done();
+      });
     });
 
     it('throws when an invalid pageSize is passed', () => {

From 46e5c537c87d8f81e468448629c36995329f824b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 06:01:20 -0700
Subject: [PATCH 582/811] Bump v21.0.0-nightly.20220713

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 5a0433e61cd15..dbd21d769462d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220712
\ No newline at end of file
+21.0.0-nightly.20220713
\ No newline at end of file
diff --git a/package.json b/package.json
index 30df1779f0a08..c725b6a1cbbd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220712",
+  "version": "21.0.0-nightly.20220713",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 7f600c4c6c522..389bdd60adc14 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220712
- PRODUCTVERSION 21,0,0,20220712
+ FILEVERSION 21,0,0,20220713
+ PRODUCTVERSION 21,0,0,20220713
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 440c575aa6c47a2258824945fa5442c5a89cfe0f Mon Sep 17 00:00:00 2001
From: Gellert Hegyi <gellert.hegyi@around.co>
Date: Wed, 13 Jul 2022 20:59:57 +0200
Subject: [PATCH 583/811] fix: alwaysOnTop browser window option for X11 Linux
 (#34766)

fix: alwaysontop browser window option for x11
---
 shell/browser/native_window_views.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index cb25379b7765a..8b00fec300e15 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -498,6 +498,13 @@ void NativeWindowViews::Show() {
   if (global_menu_bar_)
     global_menu_bar_->OnWindowMapped();
 #endif
+
+#if defined(USE_OZONE_PLATFORM_X11)
+  // On X11, setting Z order before showing the window doesn't take effect,
+  // so we have to call it again.
+  if (IsX11())
+    widget()->SetZOrderLevel(widget()->GetZOrderLevel());
+#endif
 }
 
 void NativeWindowViews::ShowInactive() {

From d32e6cc2523b371b9a706775492c196582e1b17e Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 17:26:16 -0400
Subject: [PATCH 584/811] chore: bump chromium to 105.0.5173.0 (main) (#34770)

* chore: bump chromium in DEPS to 105.0.5147.0

* chore: update chromium/can_create_window.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3642216

fix minor code shear in patch

* chore: update chromium/port_autofill_colors_to_the_color_pipeline.patch

Xref: chromium/port_autofill_colors_to_the_color_pipeline.patch

fix minor code shear in patch

* chore: remove chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3727368

Removing upstreamed patch

* chore: update patches

* chore: update patches

* chore: add new enum kOffscreenDocument to switch statement

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3722498

* chore: add stub for new parent virtual method OnNewCropVersion()

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3717305

* chore: remove download_schedule arg from DownloadTargetCallback invocation

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3711096

Clean up DownloadLater flags and prefs

* chore: add stub for new parent virtual method OnNewCropVersion()

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3717305

* chore: use base::List for extensions::Event

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3718366

Remove Event constructor overloads that take vector<base::Value>

* refactor: replace ClearStorageDataOptions.origin with .storage_key

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3702946

Refactor ClearData to take StorageKey

* chore: bump chromium in DEPS to 105.0.5149.0

* chore: update patches

* refactor: migrate InspectableWebContents to base::Value::List

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3726326

Migrate DevToolsEmbedderMessageDispatcher to base::Value::List.

* refactor: update electron_api_clipboard_mac Clipboard::ReadFindText()

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3721398

Mac: Remove unused FindPasteboard C++ interface

* chore: bump chromium in DEPS to 105.0.5151.0

* chore: fix code shear in chromium/build_do_not_depend_on_packed_resource_integrity.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3714995

Move Cart DB proto to //components/commerce

* Revert "chore: fix code shear in chromium/build_do_not_depend_on_packed_resource_integrity.patch"

This reverts commit f8de4605eb3d35152b186646fefd8e88d1df836b.

* chore: fix code shear in chromium/build_do_not_depend_on_packed_resource_integrity.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3714995

Move Cart DB proto to //components/commerce

* chore: update patches

* chore: update ElectronAccessibilityUIMessageHandler to use base::Value::List

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3733367

Convert /chrome/browser/accessibility away from WebUI::RegisterDeprecatedMessageCallback

* chore: bump chromium in DEPS to 105.0.5153.0

* chore: bump chromium in DEPS to 105.0.5155.0

* chore: bump chromium in DEPS to 105.0.5157.0

* chore: bump chromium in DEPS to 105.0.5159.0

* chore: update patches

* chore: update CL reference

* Replace ContentMainDelegate::InvokedIn with a variant

https://chromium-review.googlesource.com/c/chromium/src/+/3705957

* Switch devtools_frontend.mojom to mojom.DictValue.

https://chromium-review.googlesource.com/c/chromium/src/+/3726425

* webhid: Bind HID service with service workers

https://chromium-review.googlesource.com/c/chromium/src/+/3680562

* chore: fix lint

* Don't fire load-complete AX notification on macOS for unfocused windows

https://chromium-review.googlesource.com/c/chromium/src/+/3695403

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5165.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5167.0

* chore: bump chromium in DEPS to 105.0.5169.0

* chore: bump chromium in DEPS to 105.0.5171.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5173.0

* chore: update patches

* 3743346: Stop generating unsupported policies on macOS

https://chromium-review.googlesource.com/c/chromium/src/+/3743346

* 3727612: [Bluetooth][Win] Refactor pairing prompt code

https://chromium-review.googlesource.com/c/chromium/src/+/3727612

* 3737325: system-extensions: Move IsEnabled() out of SystemExtensionsProvider.

https://chromium-review.googlesource.com/c/chromium/src/+/3737325

* 3748635: Remove RenderView from the public API.

https://chromium-review.googlesource.com/c/chromium/src/+/3748635

* fixup: 3743346: Stop generating unsupported policies on macOS

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 DEPS                                          |   2 +-
 chromium_src/BUILD.gn                         |  13 +-
 patches/chromium/.patches                     |   1 -
 ...client_precreatemessageloop_callback.patch |   6 +-
 .../add_didinstallconditionalfeatures.patch   |  12 +-
 ..._scheduler_throttling_per_renderview.patch |  30 +-
 patches/chromium/blink_local_frame.patch      |   2 +-
 ..._node_processes_as_browser_processes.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  21 +-
 ...bcxx_abi_unstable_false_for_electron.patch |  29 +-
 patches/chromium/can_create_window.patch      |  42 +-
 ...screationoverridden_with_full_params.patch |  16 +-
 patches/chromium/command-ismediakey.patch     |  22 +-
 ...allow_disabling_compression_on_linux.patch |   2 +-
 .../crash_allow_setting_more_options.patch    |   2 +-
 patches/chromium/disable-redraw-lock.patch    |   4 +-
 .../disable_color_correct_rendering.patch     |  10 +-
 .../disable_compositor_recycling.patch        |   4 +-
 patches/chromium/disable_hidden.patch         |   6 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |  25 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |   4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   2 +-
 ...locator_for_usage_outside_of_the_gin.patch |   4 +-
 ...xpose_setuseragent_on_networkcontext.patch |  14 +-
 .../extend_apply_webpreferences.patch         |   4 +-
 ...d_data_parameter_to_processsingleton.patch |  16 +-
 .../feat_add_onclose_to_messageport.patch     |   4 +-
 ...dd_set_theme_source_to_allow_apps_to.patch |   8 +-
 ..._registry_to_multibuffer_data_source.patch |   2 +-
 ...to_add_observers_on_created_hunspell.patch |   6 +-
 ...screen_rendering_with_viz_compositor.patch |  20 +-
 ..._raw_response_headers_from_urlloader.patch |  26 +-
 ...uest_webcontents_to_enter_fullscreen.patch |   4 +-
 .../fix_aspect_ratio_with_max_size.patch      |  10 +-
 ...ntcapturercount_in_web_contents_impl.patch |   6 +-
 ...out_profile_refs_in_accessibility_ui.patch |  24 +-
 ..._properly_honor_printing_page_ranges.patch |   4 +-
 patches/chromium/frame_host_manager.patch     |   6 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |   4 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 ...tform_electron_can_call_x11_property.patch |   4 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...reate_a_console_if_logging_to_stderr.patch |   4 +-
 ...as_avoid_usage_of_private_macos_apis.patch |   8 +-
 .../mas_disable_remote_accessibility.patch    |  66 +-
 patches/chromium/mas_no_private_api.patch     |   8 +-
 ...emote_certificate_verification_logic.patch |  24 +-
 .../chromium/notification_provenance.patch    |   8 +-
 ...utofill_colors_to_the_color_pipeline.patch |  16 +-
 ..._doubleforkandexec_with_forkandspawn.patch | 641 ------------------
 patches/chromium/printing.patch               |  36 +-
 patches/chromium/process_singleton.patch      |  18 +-
 ...r_changes_to_the_webcontentsobserver.patch |   8 +-
 .../render_widget_host_view_base.patch        |  10 +-
 .../render_widget_host_view_mac.patch         |   2 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   4 +-
 patches/chromium/web_contents.patch           |   8 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  12 +-
 ...feat_add_hook_to_notify_script_ready.patch |   8 +-
 patches/v8/build_gn.patch                     |   8 +-
 ...ild_remove_legacy_oom_error_callback.patch |  12 +-
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...ed_attribute_for_older_msvc_versions.patch |   2 +-
 ..._terminating_exception_in_microtasks.patch |   8 +-
 ...workaround_an_undefined_symbol_error.patch |   4 +-
 shell/app/electron_main_delegate.cc           |   3 +-
 shell/browser/api/electron_api_session.cc     |  10 +-
 .../browser/api/electron_api_web_contents.cc  |   1 +
 shell/browser/api/frame_subscriber.cc         |   2 +
 shell/browser/api/frame_subscriber.h          |   1 +
 .../bluetooth/electron_bluetooth_delegate.cc  |  17 +-
 .../bluetooth/electron_bluetooth_delegate.h   |  10 +-
 shell/browser/electron_browser_client.cc      |   1 +
 shell/browser/electron_browser_client.h       |   1 +
 .../electron_download_manager_delegate.cc     |  10 +-
 .../electron_extensions_browser_client.cc     |  13 +-
 shell/browser/hid/electron_hid_delegate.cc    |  18 +
 shell/browser/hid/electron_hid_delegate.h     |   1 +
 shell/browser/osr/osr_video_consumer.cc       |   2 +
 shell/browser/osr/osr_video_consumer.h        |   1 +
 shell/browser/ui/inspectable_web_contents.cc  |  25 +-
 shell/browser/ui/inspectable_web_contents.h   |   2 +-
 shell/browser/ui/webui/accessibility_ui.cc    |  36 +-
 shell/browser/ui/webui/accessibility_ui.h     |   2 +-
 .../common/api/electron_api_clipboard_mac.mm  |   2 +-
 shell/renderer/api/electron_api_web_frame.cc  |   1 -
 shell/renderer/electron_autofill_agent.cc     |   1 -
 .../electron_render_frame_observer.cc         |   1 -
 shell/renderer/renderer_client_base.cc        |   1 -
 97 files changed, 475 insertions(+), 1071 deletions(-)
 delete mode 100644 patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch

diff --git a/DEPS b/DEPS
index aa7afdb3214cd..263fae42a7b34 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '105.0.5129.0',
+    '105.0.5173.0',
   'node_version':
     'v16.15.1',
   'nan_version':
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index ffd4dacca88e2..bfd971e576a85 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -388,14 +388,19 @@ source_set("chrome_spellchecker") {
       "//chrome/browser/spellchecker/spellcheck_factory.h",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
       "//chrome/browser/spellchecker/spellcheck_service.cc",
       "//chrome/browser/spellchecker/spellcheck_service.h",
     ]
 
+    if (!is_mac) {
+      sources += [
+        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
+        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
+        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
+        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
+      ]
+    }
+
     if (has_spellcheck_panel) {
       sources += [
         "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index e0cb53f32a2a8..1d5849b4368a6 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -111,5 +111,4 @@ build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
 fix_allow_guest_webcontents_to_enter_fullscreen.patch
-posix_replace_doubleforkandexec_with_forkandspawn.patch
 disable_freezing_flags_after_init_in_node.patch
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 65e54de741e2d..9cb88ba5ded9f 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index b017e2bf97a4a15cb7af384d9b4e54aa729a997c..fc59b7040bf68e90fbbe516b5321a519a5e77b2a 100644
+index ff57e2a67ccc37be912ba3fca9df4b9e28898c6e..0045b3c1b89728e3950929b49e15bbc67a826c02 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
@@ -24,8 +24,8 @@ index b017e2bf97a4a15cb7af384d9b4e54aa729a997c..fc59b7040bf68e90fbbe516b5321a519
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -344,7 +348,6 @@ int GpuMain(MainFunctionParams parameters) {
-   ChildProcess gpu_process(io_thread_priority);
+@@ -337,7 +341,6 @@ int GpuMain(MainFunctionParams parameters) {
+   ChildProcess gpu_process(io_thread_type);
    DCHECK(base::ThreadPoolInstance::Get()->WasStarted());
  
 -  auto* client = GetContentClient()->gpu();
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 91312aeb13cb3..324d264d1abd3 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ed
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index f479e7ce6ceb21e67f72dd29589dfda180e438b0..23dcc6507ed9151f657689904bf90d3b2e8ae3d3 100644
+index eaf9a9483d89cd47bef63ff7f2868c0174a3c3bb..19bd5ef930bc094b315d2562c0f4917e78f63bad 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4474,6 +4474,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4397,6 +4397,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index f479e7ce6ceb21e67f72dd29589dfda180e438b0..23dcc6507ed9151f657689904bf90d3b
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index ac30039d95f1f4c73067df58d8af63190b352030..c674c87797fc8ea057f5b94aabbb53b92bded031 100644
+index feca00f2e36d1c02be5e56e787ea8f67eab45df6..9a4c57ddb3aebff2365ea7563803b169c7787c5e 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -609,6 +609,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -605,6 +605,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -123,10 +123,10 @@ index c95ef4a4a3f9d40e0e4bedf6fc42225190626c42..36cc932782437b9f5d301416f5a4e8f4
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index d1e2d799602ce3b671e7e33afc57923fcc066f00..64dc35a4ba05521dc55b69d2413010ae47b10152 100644
+index 6b4142bf7f85c64af6f845613568679276c7e698..21462bb2196b353c32cf05d0c53635ac77673567 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -352,6 +352,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -359,6 +359,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 6b6c839e9dffa..688159b6c492e 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -48,18 +48,18 @@ index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index 99978b33c294ebe37192baccb29f0a34a25aed17..ef6e9ae24979538b8746aca898d1f302827491d8 100644
+index 2f073474d8be6d8051606b0f07272969d3936f28..7f9ec06a10b4cba254737fabdc38dddf86137ad7 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
-@@ -151,6 +151,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
-   static WindowOpenDisposition NavigationPolicyToDisposition(
-       blink::WebNavigationPolicy policy);
+@@ -147,6 +147,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient {
+                   bool was_created_by_renderer,
+                   scoped_refptr<base::SingleThreadTaskRunner> task_runner);
  
 +  void OnSetSchedulerThrottling(bool allowed);
 +
-   // ---------------------------------------------------------------------------
-   // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
-   // it in the same order in the .cc file as it was in the header.
+   static WindowOpenDisposition NavigationPolicyToDisposition(
+       blink::WebNavigationPolicy policy);
+ 
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
 index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319b1a5ec28 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
@@ -73,10 +73,10 @@ index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de372dd5be 100644
+index 99f0ceb45972df14813b72300e6a59710f13597f..f5e15865bf0bad73d9505698e788c1e954f46c2c 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -364,6 +364,7 @@ class WebView {
+@@ -361,6 +361,7 @@ class WebView {
    // Scheduling -----------------------------------------------------------
  
    virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index deeeab3e6ead93cb3be26f4b40caeeef8bfaafa5..98c257b43cf198481bcaa8f080add28e60e7d9a2 100644
+index 96d329c005ad74f2409c42d2ef8e62b28a18174d..3e28873ed5181756ab62e14ca9c2c4b27b4378f1 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3732,6 +3732,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3723,6 +3723,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index deeeab3e6ead93cb3be26f4b40caeeef8bfaafa5..98c257b43cf198481bcaa8f080add28e
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3743,7 +3750,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3734,7 +3741,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index deeeab3e6ead93cb3be26f4b40caeeef8bfaafa5..98c257b43cf198481bcaa8f080add28e
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 2f8e971ab224b36c6e464eb7524dd3d4c6b76f8c..4a9664d0ce5de431d9638e4145a21091cea78fd1 100644
+index 6a36275fdd7ac12f91a40b60284b73fc93679749..f264c5ee5c2c38d4ccf15877accfdc31c48ec9f9 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -418,6 +418,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -417,6 +417,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 2f8e971ab224b36c6e464eb7524dd3d4c6b76f8c..4a9664d0ce5de431d9638e4145a21091
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -865,6 +866,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -864,6 +865,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index 5521df73eb7fd..d70c093f57788 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -49,7 +49,7 @@ index 80f4314d205f4cbf0d92a331062f8a01a46d6917..2e5c15fc2cf5d0db8d26c1eeb759f6d2
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 9d8a9be49ed025439b9323fe4805191db1be6e6b..9c618930625dfd7ca44c2d5c1ca25db4d9f36052 100644
+index 4730c853097462638d3bc41b7c905874ab3dc29a..18615761121f83262da362b10b8022f80809ea07 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
diff --git a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
index 810480a1b56d5..f10afcbb1f251 100644
--- a/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
+++ b/patches/chromium/breakpad_treat_node_processes_as_browser_processes.patch
@@ -10,7 +10,7 @@ breakpad independently, as a "browser" process. This patches
 crash annotation.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index b1f8fd4494e7f5deac078023c2e0240d701e1f13..a372e9bb12f9cec6235fe529d73b6e0009328038 100644
+index 1fa85302da7a64abc42fd9558ddbcaf68b387517..62d15f57e4c5a0a24aa730e8979fb1e9537fecd3 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -719,8 +719,13 @@ bool CrashDone(const MinidumpDescriptor& minidump,
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index b87359449662a..9fee1e07d8327 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -33,10 +33,10 @@ index 672bc56194e1ad8b03acd639c17b7f7e67a5dba0..59ba25815e511af5ca6aca5467cc91d5
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 46197c5a6423f3278b75549d601421d2b5e139d6..b02779a76a238fd713796597bec8a82897e88f51 100644
+index fdc5d388f80dcae2f1dd8a05d7d24ed5e59250b5..4570ad0308083a62e56a5fa9c91866f9216eed5f 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4544,7 +4544,7 @@ static_library("browser") {
+@@ -4582,7 +4582,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 46197c5a6423f3278b75549d601421d2b5e139d6..b02779a76a238fd713796597bec8a828
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 5d7cfeb42574b15ddac55c797000bca490274a6f..8b967ef76faa8190d0064f3fa78a661f451228e1 100644
+index 5584fa001cf9bb0fab31cc6de053a536d18c4492..6541358b2a5d41f94c1e2d5a9d57ce20661f61a7 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5915,7 +5915,6 @@ test("unit_tests") {
+@@ -5953,7 +5953,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 5d7cfeb42574b15ddac55c797000bca490274a6f..8b967ef76faa8190d0064f3fa78a661f
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -5939,6 +5938,10 @@ test("unit_tests") {
+@@ -5977,6 +5976,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,15 +68,16 @@ index 5d7cfeb42574b15ddac55c797000bca490274a6f..8b967ef76faa8190d0064f3fa78a661f
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6826,7 +6829,6 @@ test("unit_tests") {
+@@ -6867,7 +6870,7 @@ test("unit_tests") {
      }
  
      deps += [
 -      "//chrome:packed_resources_integrity_hash",
-       "//chrome/browser:cart_db_content_proto",
-       "//chrome/browser:coupon_db_content_proto",
-       "//chrome/browser/autofill_assistant/password_change/proto:proto",
-@@ -6937,6 +6939,10 @@ test("unit_tests") {
++    # "//chrome:packed_resources_integrity_hash",
+       "//chrome/browser/ash/system_web_apps/test_support",
+       "//chrome/browser/enterprise/connectors/analysis:features",
+       "//chrome/browser/media/router:test_support",
+@@ -6982,6 +6985,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
index 056be0692568f..2e6dc709deca9 100644
--- a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
+++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
@@ -6,18 +6,23 @@ Subject: build: make libcxx_abi_unstable false for electron
 https://nornagon.medium.com/a-libc-odyssey-973e51649063
 
 diff --git a/build/config/c++/BUILD.gn b/build/config/c++/BUILD.gn
-index 2e5843b9f0a5d39d8dbfea0ae5d2ebb413c0ac7d..f4c901e9980ad068a2903482f712bfa8b1310057 100644
+index 09324583a2f98621fe328ec9f0178736dabe6d2b..d57c2c16ea3475c3ad77e81bdb9700ec2f64976a 100644
 --- a/build/config/c++/BUILD.gn
 +++ b/build/config/c++/BUILD.gn
-@@ -9,6 +9,11 @@ assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
- 
- libcxx_abi_unstable = true
- 
-+if (is_electron_build) {
-+  # This breaks native node modules
-+  libcxx_abi_unstable = false
-+}
+@@ -29,10 +29,12 @@ config("runtime_library") {
+   #    on Windows, the increase is great enough that we go above the 4GB size
+   #    limit for PDBs (https://crbug.com/1327710#c5). To fix this, we set
+   #    _LIBCPP_ABI_NAMESPACE to a shorter value.
+-  defines += [
+-    "_LIBCPP_ABI_NAMESPACE=Cr",
+-    "_LIBCPP_ABI_VERSION=2",
+-  ]
++  defines += [ "_LIBCPP_ABI_NAMESPACE=Cr" ]
 +
- # TODO(xiaohuic): https://crbug/917533 Crashes on internal ChromeOS build.
- # Do unconditionally once the underlying problem is fixed.
- if (is_chromeos_ash && is_chrome_branded) {
++  if (!is_electron_build) {
++    # This breaks native node modules
++    defines += [ "_LIBCPP_ABI_VERSION=2" ]
++  }
+ 
+   if (!libcxx_is_shared) {
+     # Don't leak any symbols on a static build.
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index ef7bb00517d6e..d148c0eb9c8c8 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 381bb7d6b1ec2f321dcab9a217aa57e5b2c21925..bdf2fa0461840d6059b4a7d6660a356be5c38ba0 100644
+index 59ad3749cee7f8892884033d7507def1314aec75..187b94d207570a77f058915b9e5b581c777adc5a 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7127,6 +7127,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7221,6 +7221,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 381bb7d6b1ec2f321dcab9a217aa57e5b2c21925..bdf2fa0461840d6059b4a7d6660a356b
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 1470df421f254725be1a55be5756e47988798035..1c69625326df08b85ec77d01b588fc3a8ce58553 100644
+index 2cd68060a6d73b12190692f5973224e4816630bb..c9f744c73f95ad6e63077fbfad2e0c935e6c44c1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3949,6 +3949,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3983,6 +3983,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 1470df421f254725be1a55be5756e47988798035..1c69625326df08b85ec77d01b588fc3a
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3993,12 +4001,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4027,12 +4035,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,13 +53,13 @@ index 1470df421f254725be1a55be5756e47988798035..1c69625326df08b85ec77d01b588fc3a
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index 3aafb44665ed475084355144663a3c7395a009d5..d32b572673e24f14c60b27e8a1fab683b7aa3e8e 100644
+index ac5575971f18588c25438a7285e1c25037c14b1b..af3c7dbb09de31e4079406cb5e18b5ffcc6e867c 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -575,6 +575,10 @@ struct CreateNewWindowParams {
+@@ -579,6 +579,10 @@ struct CreateNewWindowParams {
  
-   // Governs how downloads are handled if `target_url` results in a download.
-   blink.mojom.NavigationDownloadPolicy download_policy;
+   // Additional parameters for creating picture-in-picture windows.
+   blink.mojom.PictureInPictureWindowOptions? pip_options;
 +
 +  // Extra fields added by Electron.
 +  string raw_features;
@@ -68,10 +68,10 @@ index 3aafb44665ed475084355144663a3c7395a009d5..d32b572673e24f14c60b27e8a1fab683
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 9a593698d9e3aebe21cb7e74e0e5603adde30f87..c57b933d2950a69c92d47057b83d96a66416bc1b 100644
+index 3101f5faa5d87f10e0859e8a09c6ebb2678eb478..39682dddf0ec449f0bc34124bf3de6f8c216fdf9 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -604,6 +604,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -605,6 +605,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 9a593698d9e3aebe21cb7e74e0e5603adde30f87..c57b933d2950a69c92d47057b83d96a6
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 58755b9dca27ddd4d75cf08ecdc47c6d9d9da724..2f786efe35ebdff7061118a14247859ed30eeb2a 100644
+index 0d79069d5a54a1a8907e459beb0235b2a78e1fa6..cfe1fc63e293cb2bcafb6c9e6778ee39ef266e89 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -165,6 +165,7 @@ class NetworkService;
+@@ -164,6 +164,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -150,10 +150,10 @@ index 348dcde05d71e7d16e4c7bb1d8d9f8718070e669..5a9cc64d6e0d9d01f5dc133c7fcab341
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 9b42426f878a741290c89fb6b641b6c44423aa6f..d0c99c26116f6affc801ac59657b89c2ae159a0c 100644
+index 11eaa6b307811b0b327c60ca8ee343331ed18b1b..87f35d4477fef2d6f5ee58455c10e1780a090ef9 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -308,6 +308,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -315,6 +315,10 @@ WebView* RenderViewImpl::CreateView(
        /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
        creator->IsAdSubframe());
  
@@ -165,10 +165,10 @@ index 9b42426f878a741290c89fb6b641b6c44423aa6f..d0c99c26116f6affc801ac59657b89c2
    // moved on send.
    bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 2e7c332565ebe33b00ab7fff96a6a8dfc61422a6..0ab061f51d1d0c93f23bfcf5ba051172cea37eb8 100644
+index e757a73ad55c997357bc26015423b69aaa3e895e..089b9e92b0b156fcdcf4b391c24b988a22e312c7 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -438,6 +438,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -178,10 +178,10 @@ index 2e7c332565ebe33b00ab7fff96a6a8dfc61422a6..0ab061f51d1d0c93f23bfcf5ba051172
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
-index 00e2a8c21d4f0ef00c942498251fa44065da63c0..0fc4b092fa276063e05f990bf920fecd60c6d26c 100644
+index 4805dd035772fcaea60a1a91eb9911d5c0ce93a9..3b752ea509149f04fd6d10f6977bd29791f6a5d6 100644
 --- a/content/web_test/browser/web_test_content_browser_client.h
 +++ b/content/web_test/browser/web_test_content_browser_client.h
-@@ -80,6 +80,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
+@@ -81,6 +81,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
                         const std::string& frame_name,
                         WindowOpenDisposition disposition,
                         const blink::mojom::WindowFeatures& features,
@@ -212,10 +212,10 @@ index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index fd6118fd28df7ea3f86f7fff6ed7ae7b0517777b..a1cb624589a302340d152a1389adac26d5c6d6ee 100644
+index 6633a96d4eafce752b6a1dace29390203d7c4ac0..cb340f174618bd1c38e4216d85eb57f293f3367c 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2101,6 +2101,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2100,6 +2100,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, entered_window);
  
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index fa12e080d2e2f..aea8f9f1c17c5 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,7 +108,7 @@ index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c48
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 458af711eda586adbc4efc515da6a21e62879cfc..221ec7acca678060f0f152d4fee32d3378875bc1 100644
+index ce86697e47437832cd0d9692e44a19885f3b7174..62f3371827343fb30d3202f78af70968f169d9f2 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
 @@ -1794,12 +1794,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -127,10 +127,10 @@ index 458af711eda586adbc4efc515da6a21e62879cfc..221ec7acca678060f0f152d4fee32d33
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 87859f4741386c967a0568273a2fd16ad26c4a96..8265417dcf7397b2eb37e997547d1e8cfd977509 100644
+index 64eeec32ac70f32b71cd30f7d1adb1f12fa6fa46..8ebf50854a4fdf2cdc9b7f90844456c12902cb4b 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -839,8 +839,7 @@ class Browser : public TabStripModelObserver,
+@@ -843,8 +843,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 686fc99becf068106cc9fb372d2dce1e8d8c5114..eb94d05bf03d04b508123675c31957b8d22ee13a 100644
+index a06d49c3ed7d809ddd3ab43f1cc4e3044a6b14d2..1ebb4970ef9c440c5c2584785397696c7ebc14ce 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3882,8 +3882,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3909,8 +3909,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -316,10 +316,10 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index aef9d1a79fcea0e73541cf8257b498e167c9dfeb..1f0c4209d1c6be31e1abd6bcfcaf181fd2d4858c 100644
+index 9fa230c1cd95f71690f5beef7b77c9759215e3e0..f0160abfd4980d323c8e3def86df7bdf3a137dc3 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-@@ -402,8 +402,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
+@@ -403,8 +403,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -344,7 +344,7 @@ index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec48
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
-index 5b804b3ad089154424eda6eb58edbb24baf67794..7f055a37080f40dede16dfa7b7ad6b3c31c5282d 100644
+index b9e21613a8ae3409477d659b0e12181e4db015c3..9d454bd8f8bde3624dd28f8effc0b7fc8a2b4f41 100644
 --- a/fuchsia_web/webengine/browser/frame_impl.cc
 +++ b/fuchsia_web/webengine/browser/frame_impl.cc
 @@ -412,8 +412,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch
index 275b2e7299f2c..b52c74a4d8775 100644
--- a/patches/chromium/command-ismediakey.patch
+++ b/patches/chromium/command-ismediakey.patch
@@ -52,10 +52,10 @@ index ed2ac20679a9357c9493224ec5e08837c7860d6e..7f9a97e11395e5521e100694cd37bcd9
    NotifyKeyPressed(ui::Accelerator(key_code, modifiers));
  }
 diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.h b/chrome/browser/extensions/global_shortcut_listener_ozone.h
-index eb3f3431a3774c3a05afd4c7350f3801e9c8c684..b8970ef9ddb69d6a9fc6d106293e760535b6f4b3 100644
+index a2cec20e0ba434afa5e15bf60327c6a6f9b551f9..f58796ff2050883879225a22ed0b3f0c1aacf824 100644
 --- a/chrome/browser/extensions/global_shortcut_listener_ozone.h
 +++ b/chrome/browser/extensions/global_shortcut_listener_ozone.h
-@@ -45,7 +45,8 @@ class GlobalShortcutListenerOzone
+@@ -46,7 +46,8 @@ class GlobalShortcutListenerOzone
    void OnKeyPressed(ui::KeyboardCode key_code,
                      bool is_alt_down,
                      bool is_ctrl_down,
@@ -117,10 +117,10 @@ index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc
  
  }  // namespace ui
 diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
-index 0bed8d1e2e2ed4a8cfc9d51ec3d68ac75bd9ff82..6914758849ca485f0f882d0b4a9ded9b02b197a8 100644
+index 87a53282aa3afa3fe8469272d8b1ee37dcadf845..55c36da933165c8f86dd2ab440733f4b20bee378 100644
 --- a/ui/base/accelerators/media_keys_listener_mac.mm
 +++ b/ui/base/accelerators/media_keys_listener_mac.mm
-@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
+@@ -34,6 +34,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
      case NX_KEYTYPE_NEXT:
      case NX_KEYTYPE_FAST:
        return VKEY_MEDIA_NEXT_TRACK;
@@ -133,7 +133,7 @@ index 0bed8d1e2e2ed4a8cfc9d51ec3d68ac75bd9ff82..6914758849ca485f0f882d0b4a9ded9b
    }
    return VKEY_UNKNOWN;
  }
-@@ -192,7 +198,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
+@@ -194,7 +200,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
    int key_code = (data1 & 0xFFFF0000) >> 16;
    if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
        key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&
@@ -226,10 +226,10 @@ index 898e15a25c99ad25221c41594803521565ff4432..664337941023e800c9605f987d0e1d65
  
  }  // namespace ui
 diff --git a/ui/base/x/x11_global_shortcut_listener.h b/ui/base/x/x11_global_shortcut_listener.h
-index 9e472d76423a748cbf6257c6656d8fd69853dd93..404a294b9cf3dd6744ece0b5c1e611bbab207e78 100644
+index bfb82e38a9ccc7459ccb427d512df821517a328b..7f1d5876a51fa53e539b2bab8d2f020f26d39ceb 100644
 --- a/ui/base/x/x11_global_shortcut_listener.h
 +++ b/ui/base/x/x11_global_shortcut_listener.h
-@@ -40,18 +40,21 @@ class COMPONENT_EXPORT(UI_BASE_X) XGlobalShortcutListener
+@@ -41,18 +41,21 @@ class COMPONENT_EXPORT(UI_BASE_X) XGlobalShortcutListener
    virtual void OnKeyPressed(KeyboardCode key_code,
                              bool is_alt_down,
                              bool is_ctrl_down,
@@ -254,7 +254,7 @@ index 9e472d76423a748cbf6257c6656d8fd69853dd93..404a294b9cf3dd6744ece0b5c1e611bb
  
   private:
    // Due to how system key grabbing works on X11, we have to be a bit greedy and
-@@ -60,7 +63,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XGlobalShortcutListener
+@@ -61,7 +64,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XGlobalShortcutListener
    // and filter the incoming events against that registry before notifying the
    // observer.  This tuple describes the meaningful parts of the event; booleans
    // 1, 2, and 3 hold states of Alt, Control, and Shift keys, respectively.
@@ -333,10 +333,10 @@ index 0f1980abdcaf30e23f580b937ecb2c422bf2a357..112967622cb8a6263c7a88dd8d09f48f
  
  }  // namespace ui
 diff --git a/ui/ozone/public/platform_global_shortcut_listener.h b/ui/ozone/public/platform_global_shortcut_listener.h
-index a5b539d4e7461c4ca9faa08fef086fc28a4ebd3a..f3aacc605f07807a5b83b496bd8a87933981d4f3 100644
+index 5b6ceb2e23d306e446cad5a6b6e7adf37334410a..d4fbca17a11bd52deaf746e052eeeb12d8a4594e 100644
 --- a/ui/ozone/public/platform_global_shortcut_listener.h
 +++ b/ui/ozone/public/platform_global_shortcut_listener.h
-@@ -19,7 +19,8 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformGlobalShortcutListenerDelegate {
+@@ -20,7 +20,8 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformGlobalShortcutListenerDelegate {
    virtual void OnKeyPressed(KeyboardCode key_code,
                              bool is_alt_down,
                              bool is_ctrl_down,
@@ -346,7 +346,7 @@ index a5b539d4e7461c4ca9faa08fef086fc28a4ebd3a..f3aacc605f07807a5b83b496bd8a8793
    // Called back when the platform implementation is destroyed.
    virtual void OnPlatformListenerDestroyed() = 0;
  
-@@ -51,11 +52,13 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformGlobalShortcutListener {
+@@ -52,11 +53,13 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformGlobalShortcutListener {
    virtual bool RegisterAccelerator(KeyboardCode key_code,
                                     bool is_alt_down,
                                     bool is_ctrl_down,
diff --git a/patches/chromium/crash_allow_disabling_compression_on_linux.patch b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
index b64fe0220c598..d61b71b8cfd92 100644
--- a/patches/chromium/crash_allow_disabling_compression_on_linux.patch
+++ b/patches/chromium/crash_allow_disabling_compression_on_linux.patch
@@ -13,7 +13,7 @@ Ultimately we should remove the option to disable compression, and
 subsequently remove this patch.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index a372e9bb12f9cec6235fe529d73b6e0009328038..58f6f559265d0da5e6ca4c711df4b1dbf3d40e38 100644
+index 62d15f57e4c5a0a24aa730e8979fb1e9537fecd3..77fd14f5e9a4330364da4e7e5ee089c9196b4939 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -111,6 +111,8 @@ void SetUploadURL(const std::string& url) {
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index 33cc2b52a8a15..b9e607f84e898 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -9,7 +9,7 @@ rate-limiting, compression and global annotations.
 This should be upstreamed.
 
 diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
-index 3c28019ae3d1d8fd43e5e027fa3abe6786658885..b1f8fd4494e7f5deac078023c2e0240d701e1f13 100644
+index 6aa864db880408bf7021ac58673f4d8d489426b4..1fa85302da7a64abc42fd9558ddbcaf68b387517 100644
 --- a/components/crash/core/app/breakpad_linux.cc
 +++ b/components/crash/core/app/breakpad_linux.cc
 @@ -113,6 +113,7 @@ void SetUploadURL(const std::string& url) {
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index de0f40a292a83..0e7e6f5795476 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 2d21f2e408004fbaf6a19980ad5daf47493aec65..c6a0ac1c5dd98a41392bd170bb0ada7418f17453 100644
+index 1e6326a2f36f5a7e55e5193b69c36f870c1d00e7..2f51474d46544915b75185fc362aebf8b83164b0 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -51,7 +51,7 @@ index 2d21f2e408004fbaf6a19980ad5daf47493aec65..c6a0ac1c5dd98a41392bd170bb0ada74
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 73337f6b14516f93500705606c89e4c7b5a55f35..6badb272496a630031592372c1a766a9d70bb26a 100644
+index 65bf924561934d445e201aa2753ec7a3e32b6a6b..e4805643c6994404a1443fe89f0348a19310023b 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -207,6 +207,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 8ef3fa1c1b34a..28137ca9aa91c 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 691496d0ca6fce79c26b9da7322856b3bf06332f..4aadafbba17578cfa26a111eecd0cfaad676326d 100644
+index 65c468c4b882829fba7ab679c0fec3f637e96522..ca98a6e3992126b564d28e9d4429cd9a69cf7eed 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1853,6 +1853,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1857,6 +1857,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -80,7 +80,7 @@ index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd3
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index d3375aa2370158888d35e064b9613cd696d4b45b..a7a33cfd499925c23a26a6dacc5add3d4c462d78 100644
+index 4be758a498c1e5b17fd8eea6c5a7719e4252723a..e166e96b4b23725ad8735ab87afd3660ed22de50 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -92,7 +92,7 @@ index d3375aa2370158888d35e064b9613cd696d4b45b..a7a33cfd499925c23a26a6dacc5add3d
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index e186644f7592f7d0e827b7d8af6c31951738f6f5..5e8df8f92729ba851fe7ba8557e309a32899df93 100644
+index ece0f7a284fc87f879d21e754b0b050236081d61..68277794cf54100592f36f0c95985b2911074c52 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -199,6 +199,7 @@
@@ -103,7 +103,7 @@ index e186644f7592f7d0e827b7d8af6c31951738f6f5..5e8df8f92729ba851fe7ba8557e309a3
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3173,6 +3174,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3195,6 +3196,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 3e685e539e743..1104e02c2682e 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 19396ba065ebab86903e2d52dc72d22de9d6bc89..fdb09a51829db40f4bcba71e76cd0dcef16a47ad 100644
+index fc7c4474aaa74000b901b93b26bb46d7a7dc07a3..9444d5411cf7caffb3cf180089ca5468c2303803 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -511,7 +511,11 @@
+@@ -514,7 +514,11 @@
      return;
  
    host()->WasHidden();
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 2b6fcf3fa406d..980679fa1db0b 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index e3a14e47ac328261f48bcd137961a6e794d4f5af..205921ae492bf30c16869cdd7ed9605d7fdbd452 100644
+index 4b4a91a3fb6156ced046b414c131bc348f15b79f..852118f2599087c971ee6475f670a1f0e9d64bd3 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,7 +20,7 @@ index e3a14e47ac328261f48bcd137961a6e794d4f5af..205921ae492bf30c16869cdd7ed9605d
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index e617a4496a5f8cfa7ca1904fea8b0c3c0ffa14f9..e5d0edc222755a20019dd1e4042b87abe3ae39d8 100644
+index f63c1aa3007fa532af250e6f222ab588d949dccc..6183ee520b48e09958f320c1091a80ce947f21b7 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -881,6 +881,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -34,7 +34,7 @@ index e617a4496a5f8cfa7ca1904fea8b0c3c0ffa14f9..e5d0edc222755a20019dd1e4042b87ab
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index f20f35ae49d50f19bd4355defe1dfd3a20462c21..b8801f1a939aab5ea6c8db87d357c3d27c946e3c 100644
+index f709beca890c426c9355297c6a741d5a8c887fdb..8050e3b8d603e48323002475680d76dfa059e20e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index 219559b32e276..a5b8d7b4381d2 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index 8779affce72baa97eebc68779fd3be08ba4505f8..3d2d03366a6e7776d0bd589c32c09b8bbed01b64 100644
+index b88a9d695e2e743cdd9446e8e3c3ca38a914630a..a35f8b3118632d503c5750d59e847580cbb47a9f 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1196,6 +1196,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1195,6 +1195,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index 8779affce72baa97eebc68779fd3be08ba4505f8..3d2d03366a6e7776d0bd589c32c09b8b
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1246,6 +1247,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1245,6 +1246,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index c7d8872892bbe..2e26a11244292 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -3,7 +3,8 @@ From: John Kleinschmidt <jkleinsc@electronjs.org>
 Date: Wed, 16 Jun 2021 11:30:28 -0400
 Subject: Don't run PCScan functions if PCScan is disabled
 
-PCScan should not be invoked if PCScan is disabled.  Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
+PCScan should not be invoked if PCScan is disabled.
+Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2965109.
 
 diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
 index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944fae3694f 100644
@@ -19,7 +20,7 @@ index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944
      using PCScan = internal::PCScan;
      const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index fb5df2ee7c40e93bf2ebf625b14d08044006534b..67aecdd1d70ff58eb5b1b8b67990a7448a3b1ba4 100644
+index 418efcb3c08c67e86ae3a0728f37c5a4b9e56e06..f5c3a127c4ac535773f087f8ee2306ab0433fbe6 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
 @@ -44,6 +44,7 @@
@@ -36,20 +37,20 @@ index fb5df2ee7c40e93bf2ebf625b14d08044006534b..67aecdd1d70ff58eb5b1b8b67990a744
  #if !BUILDFLAG(IS_NACL)
 -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
-     internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
+     partition_alloc::internal::PCScan::NotifyThreadCreated(
+         partition_alloc::internal::GetStackPointer());
  #endif
- 
-@@ -103,7 +104,7 @@ void* ThreadFunc(void* params) {
+@@ -104,7 +105,7 @@ void* ThreadFunc(void* params) {
        PlatformThread::CurrentHandle().platform_handle(),
        PlatformThread::CurrentId());
  
 -#if !BUILDFLAG(IS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if !BUILDFLAG(IS_NACL) && BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
-   internal::PCScan::NotifyThreadDestroyed();
+   partition_alloc::internal::PCScan::NotifyThreadDestroyed();
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 5d01f8802e2144b9bb94d05b154bc5f5fa378b40..a872defd1c92f2ea590e5da1ecf34a6800dd4484 100644
+index 3327d353cd887d027cf1d9b483ebf6e6aaaef169..dab0d2cf3e87fc082f72f40d1d622efd390885d1 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -30,6 +30,7 @@
@@ -60,21 +61,21 @@ index 5d01f8802e2144b9bb94d05b154bc5f5fa378b40..a872defd1c92f2ea590e5da1ecf34a68
  #include "base/allocator/partition_allocator/starscan/pcscan.h"
  #include "base/allocator/partition_allocator/starscan/stack/stack.h"
  #endif
-@@ -113,7 +114,7 @@ DWORD __stdcall ThreadFunc(void* params) {
+@@ -115,7 +116,7 @@ DWORD __stdcall ThreadFunc(void* params) {
                                  FALSE,
                                  DUPLICATE_SAME_ACCESS);
  
 -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
-   internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
+   partition_alloc::internal::PCScan::NotifyThreadCreated(
+       partition_alloc::internal::GetStackPointer());
  #endif
- 
-@@ -133,7 +134,7 @@ DWORD __stdcall ThreadFunc(void* params) {
+@@ -136,7 +137,7 @@ DWORD __stdcall ThreadFunc(void* params) {
                                                     PlatformThread::CurrentId());
    }
  
 -#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 +#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
-   internal::PCScan::NotifyThreadDestroyed();
+   partition_alloc::internal::PCScan::NotifyThreadDestroyed();
  #endif
  
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 9e23e3f582a8f..6f739d8b35bfb 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 23dcc6507ed9151f657689904bf90d3b2e8ae3d3..5c81b7882dda7d9815555b43158140f894dbbd03 100644
+index 19bd5ef930bc094b315d2562c0f4917e78f63bad..bb1c66173df927499f1f28039f2255e3d6c28c96 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2369,7 +2369,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2287,7 +2287,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index c42efd45fb14b..4a0fa298d2719 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -19,7 +19,7 @@ index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index c6a0ac1c5dd98a41392bd170bb0ada7418f17453..738a56e976a510fcdb44020193cc79522bae0855 100644
+index 2f51474d46544915b75185fc362aebf8b83164b0..c893bc030b266539f65d31bdc40ba0ba31b70986 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -1001,8 +1001,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index 3c54bc5d8c658..8f885d9d4f187 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -9,7 +9,7 @@ correctly tagged with MAP_JIT we need to use gins page allocator instead
 of the default V8 allocator.  This probably can't be usptreamed.
 
 diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h
-index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509647b714c 100644
+index 2f2e0d67c7141e5daad2d50031c71a542677e108..c53bd76fcd3703cb483949d5ec53f24f482317e5 100644
 --- a/gin/public/v8_platform.h
 +++ b/gin/public/v8_platform.h
 @@ -30,6 +30,7 @@ class GIN_EXPORT V8Platform : public v8::Platform {
@@ -21,7 +21,7 @@ index c9b535eb083c250f4f874d8e6bd0c29ea9f3a10f..f220b8669507a4aea616b0dfbabda509
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 03cbb536f9a5a3f9aaf8fe2a5baac1d62e398e3a..2f4cf65a7b75e1dfe6c2b6e472040b2a0617b912 100644
+index 9e79f7e411a3242e3e7662933389e05b94a4818c..05e3156571ac0dc9ff71464b8e73d74db96496a0 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
 @@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index f9c1139dff817..ee5737d525899 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 7dc2ce4577594d16930fd97ad3370e28765a0327..68bd003bee2d85536f97569df8cdc9b7875c3086 100644
+index 61030982c4391dd1b4b508042628e7f006047158..c4f422553185d416a6abfd4647b219060705d0ad 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1400,6 +1400,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1406,6 +1406,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,10 +51,10 @@ index 7dc2ce4577594d16930fd97ad3370e28765a0327..68bd003bee2d85536f97569df8cdc9b7
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 9d86b641760c82f145d17a4e70813cd13fad9d9c..ac38bfa5d84b838ec3bcf6cbc244868105480c98 100644
+index d88d9d2bc4b95464ca9a8cacec33361f12d25ea4..74415ce53dc6d0b3e39dbe27ae9e225b281c8820 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -297,6 +297,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -296,6 +296,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
@@ -63,10 +63,10 @@ index 9d86b641760c82f145d17a4e70813cd13fad9d9c..ac38bfa5d84b838ec3bcf6cbc2448681
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index e180a77e7727acb093e12a2879c3cfb3b3771a6f..f440504f5d26b86ebe3e2a17a6374e16004f5b8b 100644
+index 118c6469c038e5b53eb76f76abf60f5df15a94d1..9f364ccfd22e736330a2ce9879495fa072373997 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1098,6 +1098,9 @@ interface NetworkContext {
+@@ -1102,6 +1102,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,7 +77,7 @@ index e180a77e7727acb093e12a2879c3cfb3b3771a6f..f440504f5d26b86ebe3e2a17a6374e16
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index e1598a296f2f54061b7b408cc707d6727b51156f..b51f25bec1f8a79765c5b27326973da00c571f86 100644
+index b23f4227a6819d1b6b894262f5dda39841b5dd2b..3b8761ddb1d2111cb5b4df0f2448742adeb8f0c8 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index ea5cbf6672a20..8af2374fb4170 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 98c257b43cf198481bcaa8f080add28e60e7d9a2..d94a06f92bbdda28f4307dcc6a06dc2c381f274b 100644
+index 3e28873ed5181756ab62e14ca9c2c4b27b4378f1..831b6bab8e491fc0750ecf05b3ef0f105a5478f4 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -161,6 +161,7 @@
@@ -23,7 +23,7 @@ index 98c257b43cf198481bcaa8f080add28e60e7d9a2..d94a06f92bbdda28f4307dcc6a06dc2c
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1790,6 +1791,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1781,6 +1782,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
index ae14136ebb6ad..d78049c092ce3 100644
--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
@@ -65,10 +65,10 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..55a2a78ce166a65cd11b26e0aa31968f
  #if BUILDFLAG(IS_WIN)
    bool EscapeVirtualization(const base::FilePath& user_data_dir);
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508263d4ed3 100644
+index 2de07460462632680f9b16a019744527dcee5125..f7e7edd645f212750704d45a2967f584fab81b35 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
-@@ -606,6 +606,7 @@ class ProcessSingleton::LinuxWatcher
+@@ -607,6 +607,7 @@ class ProcessSingleton::LinuxWatcher
    // |reader| is for sending back ACK message.
    void HandleMessage(const std::string& current_dir,
                       const std::vector<std::string>& argv,
@@ -76,7 +76,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
                       SocketReader* reader);
  
   private:
-@@ -660,13 +661,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
+@@ -661,13 +662,16 @@ void ProcessSingleton::LinuxWatcher::StartListening(int socket) {
  }
  
  void ProcessSingleton::LinuxWatcher::HandleMessage(
@@ -95,7 +95,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
      // Send back "ACK" message to prevent the client process from starting up.
      reader->FinishWithACK(kACKToken, std::size(kACKToken) - 1);
    } else {
-@@ -714,7 +718,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -715,7 +719,8 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
      }
    }
  
@@ -105,7 +105,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
    const size_t kMinMessageLength = std::size(kStartToken) + 4;
    if (bytes_read_ < kMinMessageLength) {
      buf_[bytes_read_] = 0;
-@@ -744,10 +749,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
+@@ -745,10 +750,28 @@ void ProcessSingleton::LinuxWatcher::SocketReader::
    tokens.erase(tokens.begin());
    tokens.erase(tokens.begin());
  
@@ -135,7 +135,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
    fd_watch_controller_.reset();
  
    // LinuxWatcher::HandleMessage() is in charge of destroying this SocketReader
-@@ -776,8 +799,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
+@@ -777,8 +800,10 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
  //
  ProcessSingleton::ProcessSingleton(
      const base::FilePath& user_data_dir,
@@ -146,7 +146,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
        current_pid_(base::GetCurrentProcId()),
        watcher_(new LinuxWatcher(this)) {
    socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
-@@ -896,7 +921,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -897,7 +922,8 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
               sizeof(socket_timeout));
  
    // Found another process, prepare our command line
@@ -156,7 +156,7 @@ index 9d6ef0e143bdaf4a5043ebbb57d282d72d847433..fbc571666232742c9941ea07fea81508
    std::string to_send(kStartToken);
    to_send.push_back(kTokenDelimiter);
  
-@@ -906,11 +932,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
+@@ -907,11 +933,21 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
    to_send.append(current_dir.value());
  
    const std::vector<std::string>& argv = cmd_line.argv();
diff --git a/patches/chromium/feat_add_onclose_to_messageport.patch b/patches/chromium/feat_add_onclose_to_messageport.patch
index 61f192d132639..70559ec9c26f6 100644
--- a/patches/chromium/feat_add_onclose_to_messageport.patch
+++ b/patches/chromium/feat_add_onclose_to_messageport.patch
@@ -10,10 +10,10 @@ get this standardised, but in lieu of that, this makes MessagePort a
 whole bunch more useful!
 
 diff --git a/third_party/blink/renderer/core/messaging/message_port.cc b/third_party/blink/renderer/core/messaging/message_port.cc
-index b72ede668172bd8202b1d52736e4eb4ffe84d619..7ec7e3883925b50b064682e8976d09b18222d637 100644
+index 747ce956e2622e1bb881cf281365419743ef933f..43196369af48b7393919d2624451aa3528ed1c0a 100644
 --- a/third_party/blink/renderer/core/messaging/message_port.cc
 +++ b/third_party/blink/renderer/core/messaging/message_port.cc
-@@ -166,6 +166,7 @@ void MessagePort::close() {
+@@ -167,6 +167,7 @@ void MessagePort::close() {
      Entangle(pipe.TakePort0());
    }
    closed_ = true;
diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
index 8b78ba638e7d5..275f12dd363ba 100644
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@@ -13,7 +13,7 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.
 
 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index 3f596e0d24ccf7586e2e20d219b73300ee3f56a0..0eb957667b591d1215b60f83141d8431079c1f45 100644
+index 5dd898d8db8e6db8278f00d5caa5ab1a0d7f0fc0..90b80c3252a6134ba43f0496a7128cdbf21ce39b 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
 @@ -124,6 +124,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
@@ -26,10 +26,10 @@ index 3f596e0d24ccf7586e2e20d219b73300ee3f56a0..0eb957667b591d1215b60f83141d8431
  }
  
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index 3b9c8841ac65471141307025394464a90b02daa9..dba57a6af6a3ce8dc258a747d721fbc9d50b0ebf 100644
+index eefc078dffa1751b7ee812a90a1da5cc91606de0..14e68fab3ad52e60e36c57b7a66393f01ea1c8b6 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -392,6 +392,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -393,6 +393,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
            custom_theme,
        bool use_custom_frame = true) const;
  
@@ -53,7 +53,7 @@ index 3b9c8841ac65471141307025394464a90b02daa9..dba57a6af6a3ce8dc258a747d721fbc9
    // Returns a shared instance of the native theme that should be used for web
    // rendering. Do not use it in a normal application context (i.e. browser).
    // The returned object should not be deleted by the caller. This function is
-@@ -557,6 +574,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -566,6 +583,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
    bool forced_colors_ = false;
    PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
    PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
diff --git a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
index 529cee547296b..6df94a6111ad2 100644
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -13,7 +13,7 @@ other protocols to register their streaming behavior. MultibufferDataSource::Ass
 then refers to the list so that it can correctly determine the data source's settings.
 
 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-index 58256037e0a2485a9f8de9f4086550f39e865b2d..30cf2ee44f6e0629e664fcf2072ad14ca186f947 100644
+index 2879fec717b0b2bba66c599a063079b7ca8ce4b2..4bea0a1be7be5aa8c93a7a4d3cff0dc0ad1c2cd0 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 @@ -10,8 +10,10 @@
diff --git a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
index a8d36d481d1db..d191cb136ea35 100644
--- a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+++ b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
@@ -7,10 +7,10 @@ Subject: feat: allow embedders to add observers on created hunspell
 This patch is used by Electron to implement spellchecker events.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index fb1ce87c18a72deb815b78b2f989fe0a8ebaf0bc..417e89f3ba808d9e599d391d57df0e481afb5522 100644
+index db3c802746235c0dcfe7fe19ca4315ee77c96743..e9a7dfb8f3a4271d35ef1d33d2dd346c23d65b47 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.cc
 +++ b/chrome/browser/spellchecker/spellcheck_service.cc
-@@ -468,6 +468,9 @@ void SpellcheckService::LoadDictionaries() {
+@@ -467,6 +467,9 @@ void SpellcheckService::LoadDictionaries() {
          std::make_unique<SpellcheckHunspellDictionary>(
              dictionary, platform_spellcheck_language, context_, this));
      hunspell_dictionaries_.back()->AddObserver(this);
@@ -20,7 +20,7 @@ index fb1ce87c18a72deb815b78b2f989fe0a8ebaf0bc..417e89f3ba808d9e599d391d57df0e48
      hunspell_dictionaries_.back()->Load();
    }
  
-@@ -520,6 +523,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
+@@ -519,6 +522,20 @@ bool SpellcheckService::IsSpellcheckEnabled() const {
           (!hunspell_dictionaries_.empty() || enable_if_uninitialized);
  }
  
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 18812a84eb3df..61987a15de836 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index d6cce8a676b93a67fa1a5e64d2b189c9dfa616a5..10f4ace6027c32b57f5d070026ecd9565c40b62f 100644
+index 267af5f85d4036e144ad9829922dcd3ac62b8a31..a658a43a12f5597a7bea094471191d040fc3d6c2 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -134,6 +134,8 @@ viz_component("service") {
@@ -108,7 +108,7 @@ index 2e9453c18f2f6623d31b477aa856152ddacc3e23..93b6080135c08bc9d4cf7020f4fcb15c
  
  }  // namespace viz
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-index 3aaccca596c0287f56841131fc6a5878281593fc..f0fc2e11ddbb7ded1964a815f79e5a1858ac25d2 100644
+index c019d729f29440e44d9dd47ff62d3f8fa1ee19a8..8f589394b12cff75df9708310c5f891664674c28 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
 @@ -23,12 +23,14 @@
@@ -136,16 +136,16 @@ index 3aaccca596c0287f56841131fc6a5878281593fc..f0fc2e11ddbb7ded1964a815f79e5a18
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (surface_handle == gpu::kNullSurfaceHandle)
      return std::make_unique<OutputSurfaceUnified>();
-@@ -101,7 +104,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+@@ -97,7 +100,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  
    if (!gpu_compositing) {
-     output_surface = std::make_unique<SoftwareOutputSurface>(
+     return std::make_unique<SoftwareOutputSurface>(
 -        CreateSoftwareOutputDeviceForPlatform(surface_handle, display_client));
 +        CreateSoftwareOutputDeviceForPlatform(surface_handle, display_client, offscreen));
    } else {
      DCHECK(gpu_dependency);
-     {
-@@ -139,10 +142,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
+ 
+@@ -137,10 +140,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
  std::unique_ptr<SoftwareOutputDevice>
  OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
      gpu::SurfaceHandle surface_handle,
@@ -212,10 +212,10 @@ index 33e12349a951ef533b964d1158f8fa124623e946..fc04bcaffefc277dd1d0cdd766168de0
          IOSurfaceCreateMachPort(current_paint_buffer_->io_surface));
      client_->SoftwareDeviceUpdatedCALayerParams(ca_layer_params);
 diff --git a/components/viz/service/display_embedder/software_output_device_mac.h b/components/viz/service/display_embedder/software_output_device_mac.h
-index a480befb5d8db36e7e281d5033aeef0bea83d220..4e54acc897d08c87bccc3b44f68634e2873cb132 100644
+index 16a4e74e11775b694dfeeb82b475c628b86174b1..f8099e165da6c8253016abc92ea3021056e37c85 100644
 --- a/components/viz/service/display_embedder/software_output_device_mac.h
 +++ b/components/viz/service/display_embedder/software_output_device_mac.h
-@@ -59,6 +59,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputDeviceMac : public SoftwareOutputDevice {
+@@ -60,6 +60,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputDeviceMac : public SoftwareOutputDevice {
    void UpdateAndCopyBufferDamage(Buffer* previous_paint_buffer,
                                   const SkRegion& new_damage_rect);
  
@@ -572,7 +572,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index 68332e455e2d44efac75253179f3b78d7ce0717a..0ec6343dd574078d381155238ddc2f1d0abb5323 100644
+index e0345f5903a48013930767bee713c177a704970a..2881a4fee66f16e6367724a727abe4643a965a24 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -83,6 +83,7 @@ class DisplayPrivate;
@@ -610,7 +610,7 @@ index 68332e455e2d44efac75253179f3b78d7ce0717a..0ec6343dd574078d381155238ddc2f1d
    // Sets the root of the layer tree drawn by this Compositor. The root layer
    // must have no parent. The compositor's root layer is reset if the root layer
    // is destroyed. NULL can be passed to reset the root layer, in which case the
-@@ -479,6 +493,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
+@@ -482,6 +496,8 @@ class COMPOSITOR_EXPORT Compositor : public base::PowerSuspendObserver,
  
    std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args_;
  
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index b5421f51314c2..7efba47601775 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -17,7 +17,7 @@ headers, moving forward we should find a way in upstream to provide
 access to these headers for loader clients created on the browser process.
 
 diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
-index a15e3c4bed344364f9c43e3f0b5c494d58dff789..24e3b291f8c25de2a0b82184fd731538b6586f86 100644
+index c8e468f41930dc8e31533e086d72743e12d134f1..5b54e21568019b108d92c28086b8d73db98fc704 100644
 --- a/services/network/public/cpp/resource_request.cc
 +++ b/services/network/public/cpp/resource_request.cc
 @@ -233,6 +233,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
@@ -29,7 +29,7 @@ index a15e3c4bed344364f9c43e3f0b5c494d58dff789..24e3b291f8c25de2a0b82184fd731538
           upgrade_if_insecure == request.upgrade_if_insecure &&
           is_revalidating == request.is_revalidating &&
 diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
-index 2ff43cc1ef683707001bf22c9b030bf6e7223e0f..cfaf9170666f04407adb5738ce6723900d234735 100644
+index 9af8605aaab177daf89524680cb88455fcb48d04..9c851c96588342b245b24fed51d9241f8da7ffcc 100644
 --- a/services/network/public/cpp/resource_request.h
 +++ b/services/network/public/cpp/resource_request.h
 @@ -158,6 +158,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
@@ -41,7 +41,7 @@ index 2ff43cc1ef683707001bf22c9b030bf6e7223e0f..cfaf9170666f04407adb5738ce672390
    bool upgrade_if_insecure = false;
    bool is_revalidating = false;
 diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
-index 4f2740ebf2dc4bee423cdbb72cae128f28a03f12..d3f531429598b3666aaba655356155c470e8b645 100644
+index 10295a165e2131b7cd5bff996f36f2214db7a125..2d1bb21bf5813125397a93d368de031b11bb4bbb 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.cc
 +++ b/services/network/public/cpp/url_request_mojom_traits.cc
 @@ -209,6 +209,7 @@ bool StructTraits<
@@ -53,7 +53,7 @@ index 4f2740ebf2dc4bee423cdbb72cae128f28a03f12..d3f531429598b3666aaba655356155c4
    out->upgrade_if_insecure = data.upgrade_if_insecure();
    out->is_revalidating = data.is_revalidating();
 diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
-index 069768e7ca727fc2ad8f5379900ad4a959a87f4f..3e6bc18564e2a3cdbac9af686636f75d64082464 100644
+index b4f785570ffab62087ef9be3d18cecb6c747fa38..f6ff5ebc9808e230ed358203c5d0024c676bcd85 100644
 --- a/services/network/public/cpp/url_request_mojom_traits.h
 +++ b/services/network/public/cpp/url_request_mojom_traits.h
 @@ -269,6 +269,9 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@@ -67,7 +67,7 @@ index 069768e7ca727fc2ad8f5379900ad4a959a87f4f..3e6bc18564e2a3cdbac9af686636f75d
      return request.previews_state;
    }
 diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
-index ef3e8e68621402db5a97977f49ac74c438b0a563..aa1c1bcf7ca30adde4c25ed9bd8ed8a70eb919e0 100644
+index 05cc03e830d2805d6d572a38e2606de0f346b6bd..75b8da2f1141dffa34d01e84e339b791fdd60664 100644
 --- a/services/network/public/mojom/url_request.mojom
 +++ b/services/network/public/mojom/url_request.mojom
 @@ -312,6 +312,9 @@ struct URLRequest {
@@ -81,7 +81,7 @@ index ef3e8e68621402db5a97977f49ac74c438b0a563..aa1c1bcf7ca30adde4c25ed9bd8ed8a7
    // browser decide.
    // Note: this is an enum of type PreviewsState.
 diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
-index 5a0cc45fb7b695bef46e475232adb70893299b96..156073daca8c69e05b478e8365b812321af1bf19 100644
+index 3d2bcc3e81eb42f645fa4e8b1425cb5c54cfd3a1..4cdbe0e38609abfd0b0b5856deb8b2dd5c91ead8 100644
 --- a/services/network/public/mojom/url_response_head.mojom
 +++ b/services/network/public/mojom/url_response_head.mojom
 @@ -8,6 +8,7 @@ import "mojo/public/mojom/base/time.mojom";
@@ -92,7 +92,7 @@ index 5a0cc45fb7b695bef46e475232adb70893299b96..156073daca8c69e05b478e8365b81232
  import "services/network/public/mojom/ip_endpoint.mojom";
  import "services/network/public/mojom/load_timing_info.mojom";
  import "services/network/public/mojom/network_param.mojom";
-@@ -29,6 +30,9 @@ struct URLResponseHead {
+@@ -28,6 +29,9 @@ struct URLResponseHead {
    // The response headers or NULL if the URL type does not support headers.
    HttpResponseHeaders headers;
  
@@ -103,10 +103,10 @@ index 5a0cc45fb7b695bef46e475232adb70893299b96..156073daca8c69e05b478e8365b81232
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index c1f5c1e8c4eab221ac4e2de312ade85fa41ab803..152c69b657a3fe549dd2ce7e6e9b9c4019554bdf 100644
+index 04ed3a3391b82751d0014027caf37c402a8f068a..7140c4ced6265c388a4015350b1da5d487a02569 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -605,6 +605,7 @@ URLLoader::URLLoader(
+@@ -603,6 +603,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index c1f5c1e8c4eab221ac4e2de312ade85fa41ab803..152c69b657a3fe549dd2ce7e6e9b9c40
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -799,7 +800,7 @@ URLLoader::URLLoader(
+@@ -794,7 +795,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index c1f5c1e8c4eab221ac4e2de312ade85fa41ab803..152c69b657a3fe549dd2ce7e6e9b9c40
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1531,6 +1532,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1536,6 +1537,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
@@ -144,10 +144,10 @@ index c1f5c1e8c4eab221ac4e2de312ade85fa41ab803..152c69b657a3fe549dd2ce7e6e9b9c40
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 6bddb19e692f274afd077bd58145fcb68d59c4a2..08b95c71575e31e5b4d87e4d95ea7d7c8d318d29 100644
+index 158eaacb1bf69afad16107491851dab750df9606..eff061c729bed4b8f3b41699f66d087416b08f47 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
-@@ -522,6 +522,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
+@@ -518,6 +518,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
    std::unique_ptr<ResourceScheduler::ScheduledResourceRequest>
        resource_scheduler_request_handle_;
  
diff --git a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
index b154b4ba47d35..ed93dd0e68f24 100644
--- a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
+++ b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
@@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
 This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 035aa45845d56d0a8edaa693689bb27e6cd3b158..26cfaa4c20794649dcbd5610796031a0f966e3c0 100644
+index 5f200acb893f6c6b4ffb7c5a6ca010dde8a245e9..c3a5751233c48255408db41c10118ffde72f51d6 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3413,7 +3413,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -3440,7 +3440,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame, options));
    DCHECK(requesting_frame->IsActive());
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index e863e3c246aef..2ad1da6657694 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 738a56e976a510fcdb44020193cc79522bae0855..7c7952755317a8069becfff58ca5ec89e2266ce4 100644
+index c893bc030b266539f65d31bdc40ba0ba31b70986..b1e8daf5e79cd838c87e01da0e764e12421747db 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3661,6 +3661,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3696,6 +3696,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
@@ -33,6 +33,6 @@ index 738a56e976a510fcdb44020193cc79522bae0855..7c7952755317a8069becfff58ca5ec89
 +    if (max_window_size.height())
 +      max_window_size.Enlarge(0, rect.bottom - rect.top);
 +  }
-   gfx::SizeRectToAspectRatio(GetWindowResizeEdge(param), aspect_ratio_.value(),
-                              min_window_size, max_window_size, window_rect);
- }
+ 
+   absl::optional<gfx::Size> max_size_param;
+   if (!max_window_size.IsEmpty())
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 33c6a648fb0fa..9eff513345501 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,7 +8,7 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index a44f6d7364ad26965e84a432ae376fa922af5fec..7279dc98acdece8658fbc7e2b343f53299234741 100644
+index df53d0d8371b2f7bbd04ffe6c2d1c171ae457bc8..688883c80d5005b58c39d66c520726bcc62eeac1 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -1823,7 +1823,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -21,10 +21,10 @@ index a44f6d7364ad26965e84a432ae376fa922af5fec..7279dc98acdece8658fbc7e2b343f532
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index a99435a0a9c1c4e26a53d513f180a07f8308cbc9..273bf488259f7a85b01182edae2d609c32a55ba0 100644
+index 922048fbc03f7222e42e3640b46d3d5e1b2391ba..f2bdadbfaae703006f4888e3dd899a20bac84090 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -672,6 +672,10 @@ class WebContents : public PageNavigator,
+@@ -667,6 +667,10 @@ class WebContents : public PageNavigator,
        bool stay_awake,
        bool is_activity = true) = 0;
  
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index 64fa426f75151..e10ef4f219dd3 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,7 +7,7 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8299fe9e8 100644
+index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f21e88f30 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
 @@ -22,7 +22,10 @@
@@ -60,9 +60,9 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
 +  bool show_internal = true;
    data.SetStringKey(kInternal, show_internal ? kOn : kOff);
  
-   std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
-@@ -272,12 +279,12 @@ void HandleAccessibilityRequestCallback(
-   data.Set(kPagesField, std::move(rvh_list));
+   std::unique_ptr<base::ListValue> page_list(new base::ListValue());
+@@ -274,12 +281,12 @@ void HandleAccessibilityRequestCallback(
+   data.Set(kPagesField, std::move(page_list));
  
    std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
 -#if !BUILDFLAG(IS_ANDROID)
@@ -76,7 +76,7 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
    data.Set(kBrowsersField, std::move(browser_list));
  
    std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
-@@ -494,8 +501,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(const base::ListValue* args) {
+@@ -497,8 +504,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(
  
    AllowJavascript();
    if (flag_name_str == kInternal) {
@@ -87,7 +87,7 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
      return;
    }
  
-@@ -602,10 +611,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -605,10 +614,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -101,7 +101,7 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
    result->SetStringKey(kTreeField, accessibility_contents);
    FireWebUIListener(request_type, *(result.get()));
  }
-@@ -630,6 +641,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -633,6 +644,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -109,7 +109,7 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
    for (Browser* browser : *BrowserList::GetInstance()) {
      if (browser->session_id().id() == session_id) {
        std::unique_ptr<base::DictionaryValue> result(
-@@ -644,6 +656,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -647,6 +659,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
        return;
      }
    }
@@ -117,7 +117,7 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
  #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
    std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-@@ -760,5 +773,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+@@ -763,5 +776,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  // static
  void AccessibilityUIMessageHandler::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -126,10 +126,10 @@ index 82794034de0fccde58d04acbe6a799ba5cd57619..505376836fb93df7ebececab0e4f8fe8
 +#endif
  }
 diff --git a/chrome/browser/accessibility/accessibility_ui.h b/chrome/browser/accessibility/accessibility_ui.h
-index 0f73d3883093f6e49427ac6fe6428e97282a1e03..9041c90d13b07b03cc96e8a03a3821ef54a69a7d 100644
+index 6bc5891205fc94377040d9195b0ee15a47a90382..16a25b6a5670a74cf260210b06bc9892431cd760 100644
 --- a/chrome/browser/accessibility/accessibility_ui.h
 +++ b/chrome/browser/accessibility/accessibility_ui.h
-@@ -26,6 +26,8 @@ struct AXEventNotificationDetails;
+@@ -25,6 +25,8 @@ struct AXEventNotificationDetails;
  class WebContents;
  }  // namespace content
  
@@ -138,7 +138,7 @@ index 0f73d3883093f6e49427ac6fe6428e97282a1e03..9041c90d13b07b03cc96e8a03a3821ef
  namespace user_prefs {
  class PrefRegistrySyncable;
  }  // namespace user_prefs
-@@ -67,6 +69,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
+@@ -66,6 +68,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
    static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
  
   private:
diff --git a/patches/chromium/fix_properly_honor_printing_page_ranges.patch b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
index 6d21c86fbadcf..df7e887c60b17 100644
--- a/patches/chromium/fix_properly_honor_printing_page_ranges.patch
+++ b/patches/chromium/fix_properly_honor_printing_page_ranges.patch
@@ -100,10 +100,10 @@ index b7ba6ba4446963b08bce9fe416379169bd880378..7c621ea7a60725d08ee9ade68b65fd5b
    } else {
      // No need to bother, we don't know how many pages are available.
 diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
-index 8ff9cf6dec605d5f56f0325fb3a03826b425970c..20d06930e81ad4b2b1ee789599ba84c6ff83682d 100644
+index db23b214107c2b4a137e623e183ca08b409959fb..3f10aa71ad6fe698392228dd4b8a73eae7b1dbc6 100644
 --- a/ui/gtk/printing/print_dialog_gtk.cc
 +++ b/ui/gtk/printing/print_dialog_gtk.cc
-@@ -242,6 +242,24 @@ void PrintDialogGtk::UpdateSettings(
+@@ -243,6 +243,24 @@ void PrintDialogGtk::UpdateSettings(
  
    gtk_print_settings_set_n_copies(gtk_settings_, settings->copies());
    gtk_print_settings_set_collate(gtk_settings_, settings->collate());
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index afee9f92509fa..fd346c08904ef 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 398358851f4ec3d1373091c352fe864b8901f08b..0fadcf6eb5aa9e7e6ca32ec252f1722ab87b6be9 100644
+index acfea574749cce9c9babac12593679c1c2c3b1af..0d44d3b022042dbcbb9f188adb90074c752741b8 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3203,6 +3203,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3177,6 +3177,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,7 +20,7 @@ index 398358851f4ec3d1373091c352fe864b8901f08b..0fadcf6eb5aa9e7e6ca32ec252f1722a
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 2f786efe35ebdff7061118a14247859ed30eeb2a..6453286e79ac9edb6566c7db605ef2e3bfa7feb5 100644
+index cfe1fc63e293cb2bcafb6c9e6778ee39ef266e89..bbbdd32152f904d10e040ccf80dd1d1406b3d7a1 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index 8fbc394f99fbe..3cfbeec908477 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -40,10 +40,10 @@ index 0a01900683c73778565f9059b293bbe863d2d070..cd4e58f73e7d5bd0f9f41b1ec6303166
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 88b4436d618d8b110ead2b739f1249232698f218..20376095d83cfaf838992cb720f369c98ba816d1 100644
+index 54e4a915263eaf1cb6a2854c61b26d0269a49228..567f9e42a931975770f8ce63ce9b0ba80f8f234c 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1235,6 +1235,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1237,6 +1237,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 1148b8f694dd3..0e01d9d17a48c 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 626187e49ef53b5d74aa91dcf14821672a8f62b5..86f0e29fab782e5ebcf5977739dc6b72cf3c6b0a 100644
+index 1c50dbb9503e755ebbad2ea6d66484331862b72f..b9188ede8a4dc45bb5c573bc2cd8642c9256de36 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -959,6 +959,11 @@
+@@ -967,6 +967,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index 6924ea290af6c..1d054623e40a4 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index 52c52a8425fb2940d77cc6a0f73414aff3b32ec6..6432c01da49b89ef9d5c1123dd7f191b48184032 100644
+index a4edf639f8fe7170ce15f80e6e429d035fd5d7f7..7bf86bfde863b05c4727f09b24f556f2073d928a 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 22458236851b3..1bef249bf39cf 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 32a309a31994453c413b5bf78991fc1a1b0ec60b..b42d000283d52b72a7b85428e68b06a2a52d2a57 100755
+index 68b47d4f483b064d7be5a19552cddfe3f2b12bb2..d3191ad5984dcad633cbab5da45824871961d212 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -302,6 +302,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
index 3342d70593fd8..cbfe9c8f66bbb 100644
--- a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
+++ b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
@@ -9,10 +9,10 @@ at rutime. It would be best if eventually all usages of this property were
 replaced with clean ozone native implementations.
 
 diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
-index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f9f704b5e 100644
+index 7ffb9d707407210e566c8f2bd2f89cf7f31690c9..06bb59fe5e855d0a339e738cf12c566afcf376ac 100644
 --- a/ui/ozone/platform/x11/ozone_platform_x11.cc
 +++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -200,6 +200,7 @@ class OzonePlatformX11 : public OzonePlatform,
+@@ -199,6 +199,7 @@ class OzonePlatformX11 : public OzonePlatform,
        properties->supports_vulkan_swap_chain = true;
        properties->uses_external_vulkan_image_factory = true;
        properties->skia_can_fall_back_to_x11 = true;
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index 25236e534c2f9..63c91afd53a98 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 892ed9c63346595376ea89bd8161bd66bb43459a..328f8b800c36544f7906536416ac61dc87cc45d3 100644
+index 88e46d8d05c0b5732468568b84b3283d2f4a934e..f19e32fd33ff0ce8f44ecec76e4583273f43b231 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -253,11 +253,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
index def44cb73a8ec..f54ca7b264d4c 100644
--- a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
+++ b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -9,10 +9,10 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index bb2d3e991195877264fca46abd224d3a6ffd17e8..fc4f271f54235d2d8d823fdb0d95e3c76243390f 100644
+index b54d534b4d408c30341b20409fec75d3a66ca519..d0a00518d06bbb0da228662924b2ab9e568ef940 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -387,8 +387,12 @@ RunContentProcess(ContentMainParams params,
+@@ -386,8 +386,12 @@ RunContentProcess(ContentMainParams params,
  
  #if BUILDFLAG(IS_WIN)
      // Route stdio to parent console (if any) or create one.
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 39aae9ea0f7b5..56b21c48e776f 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -39,7 +39,7 @@ index dd14c8cfa32ab0bb2e92f192c54a494c4f5b4fb7..2c6f0b336c97bc23995e9fe8cdc7f72a
  
  }  // namespace base
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46caa725c507 100644
+index bb1cb98f246f120f566fab65565f49a6468b82b4..929188b8d0e39f171679067347d4f83632364cc7 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
 @@ -30,12 +30,6 @@
@@ -55,7 +55,7 @@ index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46ca
  #endif
  }  // extern "C"
  
-@@ -316,8 +310,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+@@ -317,8 +311,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -65,7 +65,7 @@ index 61641e1ad8a47a4910918ff61523a23854745b81..d4a3e2282256f5a43235b40b4c9f46ca
    return ns_val;
  }
  
-@@ -388,9 +381,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+@@ -389,9 +382,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  
@@ -142,7 +142,7 @@ index e12c36384ddc05554ed362bba2c0a8b418634f0a..1c740410de70ee5a888ee7cf406dfa3b
    std::vector<char*> argv_cstr;
    argv_cstr.reserve(argv.size() + 1);
 diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-index 0e842caf7b6487d94978c7b68fb5b222e330581f..5eafcd163ee1a05203a5eb76592a449f5a84e71f 100644
+index de981fa288c19ca46a8172e99bc25df36ff29d50..45e5648826c60f6ba6332776e7579a62165b0e8d 100644
 --- a/media/audio/mac/audio_low_latency_input_mac.cc
 +++ b/media/audio/mac/audio_low_latency_input_mac.cc
 @@ -34,19 +34,23 @@
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index a6599f5be1646..2e62681443353 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,10 +44,10 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index aa6a1a667af13a76ef299681367b31a8668d7425..949fdc533703862d02a19f08dcd26a56e7845d4a 100644
+index 34721e51d0ebe3a99751bba88b0afe026a910cc6..3a415dd6daf655c31ceb6fd6d307dc6e96c9aced 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -580,10 +580,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -582,10 +582,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -86,11 +86,41 @@ index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4
  };
  }
  
+diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
+index f61b04b02673e9a73f9c23823017a56b65b47dee..297b5c5584e9221adf11515c015fd7f413d29aab 100644
+--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
++++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
+@@ -21,7 +21,9 @@
+ #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
+ #include "ui/accessibility/ax_role_properties.h"
+ #include "ui/accessibility/platform/ax_private_webkit_constants_mac.h"
++#ifndef MAS_BUILD
+ #include "ui/base/cocoa/remote_accessibility_api.h"
++#endif
+ 
+ namespace {
+ 
+@@ -609,6 +611,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+   if ([NSApp isActive])
+     return window == [NSApp accessibilityFocusedWindow];
+ 
++#ifndef MAS_BUILD
+   // TODO(accessibility): We need a solution to the problem described below.
+   // If the window is NSAccessibilityRemoteUIElement, there are some challenges:
+   // 1. NSApp is the browser which spawned the PWA, and what it considers the
+@@ -636,6 +639,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+   // from within the app shim content.
+   if ([window isKindOfClass:[NSAccessibilityRemoteUIElement class]])
+     return true;
++#endif
+ 
+   return false;
+ }
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index 71369b69fe03409ec0eb7fe071b1d49524748fec..9ce1e4a7efce6b39306baceac953db23e8d14240 100644
+index a27ce05f20a8d645688c5bb920d36e76901e2b37..cb4238fe7d5f2d182c742532cf467880db7b309e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
-@@ -49,7 +49,9 @@ class ScopedPasswordInputEnabler;
+@@ -51,7 +51,9 @@ class ScopedPasswordInputEnabler;
  
  @protocol RenderWidgetHostViewMacDelegate;
  
@@ -100,7 +130,7 @@ index 71369b69fe03409ec0eb7fe071b1d49524748fec..9ce1e4a7efce6b39306baceac953db23
  @class RenderWidgetHostViewCocoa;
  
  namespace content {
-@@ -661,10 +663,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -665,10 +667,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
    // EnsureSurfaceSynchronizedForWebTest().
    uint32_t latest_capture_sequence_number_ = 0u;
  
@@ -114,7 +144,7 @@ index 71369b69fe03409ec0eb7fe071b1d49524748fec..9ce1e4a7efce6b39306baceac953db23
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22de9d6bc89 100644
+index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7a7dc07a3 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -258,8 +258,10 @@
@@ -128,7 +158,7 @@ index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22d
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1548,8 +1550,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1555,8 +1557,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -139,7 +169,7 @@ index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22d
    return [GetInProcessNSView() window];
  }
  
-@@ -1593,9 +1597,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1600,9 +1604,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -151,7 +181,7 @@ index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22d
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2090,12 +2096,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2097,12 +2103,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -167,10 +197,10 @@ index c3aff789a9e540eace8c6e952c617c89ff8e26ab..19396ba065ebab86903e2d52dc72d22d
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 9de91819e2658a58b8b7a8c90fd97544e22964f0..ade6c4085720e16843faf63f43688f28057a34dc 100644
+index 7fc550eb16288cc5f4152362504a621abbaec3da..6be133c45a9b8c774b9f6e1e2de492c43bac33d3 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
-@@ -337,6 +337,13 @@ component("base") {
+@@ -341,6 +341,13 @@ component("base") {
      sources += [ "resource/resource_bundle_lacros.cc" ]
    }
  
@@ -205,10 +235,10 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index 1ca8dab6cec9f4160f557d034deda9f3b98b9459..e6d3656c0a66d94cdbdb0141e7e44439e84aa8dd 100644
+index fc847f1ae010e4e0d69836f16d83515b8a92073a..a4bebe5078ace6c49cb34912813bbaf76b43b00c 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-@@ -31,7 +31,9 @@
+@@ -32,7 +32,9 @@
  #include "ui/views/window/dialog_observer.h"
  
  @class NativeWidgetMacNSWindow;
@@ -218,7 +248,7 @@ index 1ca8dab6cec9f4160f557d034deda9f3b98b9459..e6d3656c0a66d94cdbdb0141e7e44439
  @class NSView;
  
  namespace remote_cocoa {
-@@ -445,11 +447,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -447,11 +449,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -233,10 +263,10 @@ index 1ca8dab6cec9f4160f557d034deda9f3b98b9459..e6d3656c0a66d94cdbdb0141e7e44439
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index e0a337647572929882c8dc4fdb6c1bcad54071df..2a18cbed5933419e2f8c830376bfee6ab1db9a9f 100644
+index 0ca869c22670d057362132b30c704876e1d4d850..839a6777ebd596f41467fd90c725eea374bf9a0a 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -294,14 +294,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -295,14 +295,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -259,7 +289,7 @@ index e0a337647572929882c8dc4fdb6c1bcad54071df..2a18cbed5933419e2f8c830376bfee6a
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1257,6 +1265,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1261,6 +1269,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -267,7 +297,7 @@ index e0a337647572929882c8dc4fdb6c1bcad54071df..2a18cbed5933419e2f8c830376bfee6a
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1264,14 +1273,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1268,14 +1277,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index d6eb624fba6d6..d97162e9a4bcf 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -166,7 +166,7 @@ index 69e60d498941c34cfac9e79c7517765bf93849f5..b998ad7cf01c21e93c57e1283cfdcb1e
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index bf0142f0089d14e8fef22afe3d1d3916b7dccefd..cee63f36c1a802eacf878a119ab1904cf5b56d51 100644
+index 2a9cf9620bcc4453a24d48037f0092b6f270806a..6182aac37a7153b9a193565253fe77f9b72db55f 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -176,6 +176,12 @@ source_set("audio") {
@@ -196,10 +196,10 @@ index eb0aff29b2f4fd2b035ef96186fd58d976876b05..8a68a8885ec42715c9b9dab0f04d1b90
  }
  
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 3cce5f20af78f4456466df64fe0d040b5dba5fa8..1814ebbca91007b242a4e4ef359896594c23616a 100644
+index 025078e112683380b484b7c47f786862f4e48a74..11c81ec36a9793afab0da8578f85378f9ce3a446 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
-@@ -129,8 +129,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
+@@ -130,8 +130,8 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
  
    bool Watch() override {
      CheckOnCorrectSequence();
@@ -209,7 +209,7 @@ index 3cce5f20af78f4456466df64fe0d040b5dba5fa8..1814ebbca91007b242a4e4ef35989659
      if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged,
                                                     base::Unretained(this)))) {
        LOG(ERROR) << "DNS config watch failed to start.";
-@@ -147,6 +147,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
+@@ -148,6 +148,7 @@ class DnsConfigServicePosix::Watcher : public DnsConfigService::Watcher {
        success = false;
      }
  #endif  // !BUILDFLAG(IS_IOS)
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index ab99d0e9c103b..8af5607e3924d 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28765a0327 100644
+index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f006047158 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -128,6 +128,11 @@
+@@ -129,6 +129,11 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "url/gurl.h"
  
@@ -22,7 +22,7 @@ index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -436,6 +441,91 @@ bool GetFullDataFilePath(
+@@ -437,6 +442,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -114,7 +114,7 @@ index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -742,6 +832,13 @@ void NetworkContext::SetClient(
+@@ -739,6 +829,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,9 +128,9 @@ index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2295,6 +2392,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2303,6 +2400,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
-     cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
+     cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
  #endif  // BUILDFLAG(IS_CHROMEOS)
 +    auto remote_cert_verifier = std::make_unique<RemoteCertVerifier>(std::move(cert_verifier));
 +    remote_cert_verifier_ = remote_cert_verifier.get();
@@ -139,10 +139,10 @@ index 872f6c27997242ce8d5fe8db155dd60516f03b5b..7dc2ce4577594d16930fd97ad3370e28
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 4da0446b68ff11f65df809f04209a0e0daf12015..9d86b641760c82f145d17a4e70813cd13fad9d9c 100644
+index 34b3e31549ee37b58eee4c11c54bd34af73af263..d88d9d2bc4b95464ca9a8cacec33361f12d25ea4 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -106,6 +106,7 @@ class URLMatcher;
+@@ -105,6 +105,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
@@ -150,7 +150,7 @@ index 4da0446b68ff11f65df809f04209a0e0daf12015..9d86b641760c82f145d17a4e70813cd1
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -237,6 +238,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -236,6 +237,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,7 +159,7 @@ index 4da0446b68ff11f65df809f04209a0e0daf12015..9d86b641760c82f145d17a4e70813cd1
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -824,6 +827,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -821,6 +824,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -169,7 +169,7 @@ index 4da0446b68ff11f65df809f04209a0e0daf12015..9d86b641760c82f145d17a4e70813cd1
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 9428fe1432ee5cae0d0f812dd48878861d31e09c..e180a77e7727acb093e12a2879c3cfb3b3771a6f 100644
+index 0a376689aeb81f85372ce163d9e199ada2cdcde2..118c6469c038e5b53eb76f76abf60f5df15a94d1 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
 @@ -283,6 +283,17 @@ struct NetworkContextFilePaths {
@@ -190,7 +190,7 @@ index 9428fe1432ee5cae0d0f812dd48878861d31e09c..e180a77e7727acb093e12a2879c3cfb3
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -844,6 +855,9 @@ interface NetworkContext {
+@@ -848,6 +859,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index d835fbd379677..5978e72355e83 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -31,7 +31,7 @@ index b0e64049d411305d58802fd290bb0480e9b36fee..4afcf3b7a5b841409b0e1c4c2f32fd48
        const GURL& origin,
        const GURL& document_url,
 diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
-index 0c59d3cec404bc28acd112329ebd8332cfae96a4..62f06f55ec122597af442561fb688c0f6654be6e 100644
+index c969a5d35eac7b071b46d6a8106072e571f177a5..033618eda6e1e5b90a6e9b655e38f27bf051380a 100644
 --- a/content/browser/notifications/blink_notification_service_impl.cc
 +++ b/content/browser/notifications/blink_notification_service_impl.cc
 @@ -83,11 +83,13 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
@@ -133,10 +133,10 @@ index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5d
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 6a94b868e963d98c09d130c70b7c7740c6b544e3..654d7d77b2a7ea8e1819288bb49084e435072ba9 100644
+index db1e97364a68fdc987274f2a7a940d9d63ac111e..8b236cbd54011bc0008d56ca4213920e478f7a90 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2055,8 +2055,9 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2059,8 +2059,9 @@ void RenderProcessHostImpl::CreateNotificationService(
    // For workers:
    if (render_frame_id == MSG_ROUTING_NONE) {
      storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -148,7 +148,7 @@ index 6a94b868e963d98c09d130c70b7c7740c6b544e3..654d7d77b2a7ea8e1819288bb49084e4
      return;
    }
  
-@@ -2064,7 +2065,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2068,7 +2069,7 @@ void RenderProcessHostImpl::CreateNotificationService(
    RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
    CHECK(rfh);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index 52c431446b661..143f6b40db3d9 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,13 +8,13 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index b981338d714f66d14dd120cfc1185b97902c45b2..dbe2e0ce2bb9a2122c608ffcea923b650e4eccde 100644
+index 989f4dc6d156aef77dadf111f12c403196e5342b..9fd2b3484016df7a622aaadf094028c4966394e6 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
-@@ -128,6 +128,16 @@
-   E_CPONLY(kColorOverlayScrollbarStrokeHoveredDark) \
+@@ -129,6 +129,16 @@
    E_CPONLY(kColorOverlayScrollbarStrokeHoveredLight) \
    E_CPONLY(kColorProgressBar) \
+   E_CPONLY(kColorProgressBarPaused) \
 +  E_CPONLY(kColorPwaSecurityChipForeground) \
 +  E_CPONLY(kColorPwaSecurityChipForegroundDangerous) \
 +  E_CPONLY(kColorPwaSecurityChipForegroundPolicyCert) \
@@ -28,7 +28,7 @@ index b981338d714f66d14dd120cfc1185b97902c45b2..dbe2e0ce2bb9a2122c608ffcea923b65
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -180,6 +190,7 @@
+@@ -182,6 +192,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@@ -37,12 +37,12 @@ index b981338d714f66d14dd120cfc1185b97902c45b2..dbe2e0ce2bb9a2122c608ffcea923b65
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
-index 8b5b8c6321aaf668ad90870a0567c1a97d268323..8296b2c017f1774c1a38d931add2b7cac4f57dfe 100644
+index 6e97a162f3a823090115fdcb47828c6e0b10ad06..5fcb8cb147aa1356853cb0ed1f3731456c434946 100644
 --- a/ui/color/ui_color_mixer.cc
 +++ b/ui/color/ui_color_mixer.cc
-@@ -149,6 +149,17 @@ void AddUiColorMixer(ColorProvider* provider,
-       SetAlpha(GetColorWithMaxContrast(kColorOverlayScrollbarFillHoveredLight),
+@@ -150,6 +150,17 @@ void AddUiColorMixer(ColorProvider* provider,
                 gfx::kGoogleGreyAlpha500);
+   mixer[kColorProgressBarPaused] = {kColorDisabledForeground};
    mixer[kColorProgressBar] = {kColorAccent};
 +  mixer[kColorResultsTableNormalBackground] = {SK_ColorWHITE};
 +  mixer[kColorResultsTableHoveredBackground] =
@@ -58,7 +58,7 @@ index 8b5b8c6321aaf668ad90870a0567c1a97d268323..8296b2c017f1774c1a38d931add2b7ca
    mixer[kColorSeparator] = {kColorMidground};
    mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
    mixer[kColorShadowValueAmbientShadowElevationThree] =
-@@ -228,6 +239,7 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -230,6 +241,7 @@ void AddUiColorMixer(ColorProvider* provider,
    mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
    mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
        kColorTreeNodeForegroundSelectedFocused};
diff --git a/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch b/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
deleted file mode 100644
index 9bad1bda3874e..0000000000000
--- a/patches/chromium/posix_replace_doubleforkandexec_with_forkandspawn.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Darshan Sen <raisinten@gmail.com>
-Date: Fri, 17 Jun 2022 13:19:32 +0530
-Subject: posix: Replace DoubleForkAndExec() with ForkAndSpawn()
-
-The DoubleForkAndExec() function was taking over 622 milliseconds to run
-on macOS 11 (BigSur) on Intel i5-1038NG7. I did some debugging by adding
-some custom traces and found that the fork() syscall is the bottleneck
-here, i.e., the first fork() takes around 359 milliseconds and the
-nested fork() takes around 263 milliseconds. Replacing the nested fork()
-and exec() with posix_spawn() reduces the time consumption to 257
-milliseconds!
-
-See https://github.com/libuv/libuv/pull/3064 to know why fork() is so
-slow on macOS and why posix_spawn() is a better replacement.
-
-Another point to note is that even base::LaunchProcess() from Chromium
-calls posix_spawnp() on macOS -
-https://source.chromium.org/chromium/chromium/src/+/8f8d82dea0fa8f11f57c74dbb65126f8daba58f7:base/process/launch_mac.cc;l=295-296
-
-Change-Id: I25c6ee9629a1ae5d0c32b361b56a1ce0b4b0fd26
-Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3641386
-Reviewed-by: Mark Mentovai <mark@chromium.org>
-Commit-Queue: Mark Mentovai <mark@chromium.org>
-
-diff --git a/third_party/crashpad/crashpad/AUTHORS b/third_party/crashpad/crashpad/AUTHORS
-index 8dcac3238870920d374b86033d05d77ebde351e9..02103924332eddbd158c04f8a395bb4a247e8bd9 100644
---- a/third_party/crashpad/crashpad/AUTHORS
-+++ b/third_party/crashpad/crashpad/AUTHORS
-@@ -12,3 +12,4 @@ Opera Software ASA
- Vewd Software AS
- LG Electronics, Inc.
- MIPS Technologies, Inc.
-+Darshan Sen <raisinten@gmail.com>
-diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-index 295ec1615d83984835e238e349029b8755611f52..94c1cb02efe328ab45bc30fc7db8992872ed6b08 100644
---- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-@@ -45,7 +45,7 @@
- #include "util/linux/socket.h"
- #include "util/misc/address_sanitizer.h"
- #include "util/misc/from_pointer_cast.h"
--#include "util/posix/double_fork_and_exec.h"
-+#include "util/posix/fork_and_spawn.h"
- #include "util/posix/scoped_mmap.h"
- #include "util/posix/signals.h"
- 
-@@ -459,7 +459,7 @@ bool CrashpadClient::StartHandler(
- 
-   argv.push_back(FormatArgumentInt("initial-client-fd", handler_sock.get()));
-   argv.push_back("--shared-client-connection");
--  if (!DoubleForkAndExec(argv, nullptr, handler_sock.get(), false, nullptr)) {
-+  if (!ForkAndSpawn(argv, nullptr, handler_sock.get(), false, nullptr)) {
-     return false;
-   }
- 
-@@ -614,7 +614,7 @@ bool CrashpadClient::StartJavaHandlerForClient(
-     int socket) {
-   std::vector<std::string> argv = BuildAppProcessArgs(
-       class_name, database, metrics_dir, url, annotations, arguments, socket);
--  return DoubleForkAndExec(argv, env, socket, false, nullptr);
-+  return ForkAndSpawn(argv, env, socket, false, nullptr);
- }
- 
- bool CrashpadClient::StartHandlerWithLinkerAtCrash(
-@@ -663,7 +663,7 @@ bool CrashpadClient::StartHandlerWithLinkerForClient(
-                                   annotations,
-                                   arguments,
-                                   socket);
--  return DoubleForkAndExec(argv, env, socket, false, nullptr);
-+  return ForkAndSpawn(argv, env, socket, false, nullptr);
- }
- 
- #endif
-@@ -697,7 +697,7 @@ bool CrashpadClient::StartHandlerForClient(
- 
-   argv.push_back(FormatArgumentInt("initial-client-fd", socket));
- 
--  return DoubleForkAndExec(argv, nullptr, socket, true, nullptr);
-+  return ForkAndSpawn(argv, nullptr, socket, true, nullptr);
- }
- 
- // static
-diff --git a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
-index 39e35678ecdd036f8c8ae27c973c27102b77da96..84385f2569f2bd00ca8aed0aa332fb450b2de1d3 100644
---- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
-+++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
-@@ -36,7 +36,7 @@
- #include "util/mach/notify_server.h"
- #include "util/misc/clock.h"
- #include "util/misc/implicit_cast.h"
--#include "util/posix/double_fork_and_exec.h"
-+#include "util/posix/fork_and_spawn.h"
- 
- namespace crashpad {
- 
-@@ -343,7 +343,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface {
-     // this parent process, which was probably using the exception server now
-     // being restarted. The handler can’t monitor itself for its own crashes via
-     // this interface.
--    if (!DoubleForkAndExec(
-+    if (!ForkAndSpawn(
-             argv,
-             nullptr,
-             server_write_fd.get(),
-diff --git a/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc b/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
-index 9e58d94aa499fdb7271a78ea21a1dcc1b12e3a52..3caa3b987b35be575558a312026cf6f19485c418 100644
---- a/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
-+++ b/third_party/crashpad/crashpad/handler/linux/cros_crash_report_exception_handler.cc
-@@ -29,7 +29,7 @@
- #include "util/linux/ptrace_client.h"
- #include "util/misc/metrics.h"
- #include "util/misc/uuid.h"
--#include "util/posix/double_fork_and_exec.h"
-+#include "util/posix/fork_and_spawn.h"
- 
- namespace crashpad {
- 
-@@ -266,12 +266,11 @@ bool CrosCrashReportExceptionHandler::HandleExceptionWithConnection(
-     argv.push_back("--always_allow_feedback");
-   }
- 
--  if (!DoubleForkAndExec(argv,
--                         nullptr /* envp */,
--                         file_writer.fd() /* preserve_fd */,
--                         false /* use_path */,
--                         nullptr /* child_function */)) {
--    LOG(ERROR) << "DoubleForkAndExec failed";
-+  if (!ForkAndSpawn(argv,
-+                    nullptr /* envp */,
-+                    file_writer.fd() /* preserve_fd */,
-+                    false /* use_path */,
-+                    nullptr /* child_function */)) {
-     Metrics::ExceptionCaptureResult(
-         Metrics::CaptureResult::kFinishedWritingCrashReportFailed);
-     return false;
-diff --git a/third_party/crashpad/crashpad/util/BUILD.gn b/third_party/crashpad/crashpad/util/BUILD.gn
-index b8daef48b460ce2771a9f5502ee48d5efffc4039..8d4329e6b56062a1ef48a8607ddf52c31d251883 100644
---- a/third_party/crashpad/crashpad/util/BUILD.gn
-+++ b/third_party/crashpad/crashpad/util/BUILD.gn
-@@ -296,10 +296,10 @@ crashpad_static_library("util") {
-       sources += [
-         "posix/close_multiple.cc",
-         "posix/close_multiple.h",
--        "posix/double_fork_and_exec.cc",
--        "posix/double_fork_and_exec.h",
-         "posix/drop_privileges.cc",
-         "posix/drop_privileges.h",
-+        "posix/fork_and_spawn.cc",
-+        "posix/fork_and_spawn.h",
-         "posix/process_info.h",
- 
-         # These map signals to and from strings. While Fuchsia defines some of
-diff --git a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc b/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc
-deleted file mode 100644
-index 1960430954d3f6459dce688493db5c42047567b0..0000000000000000000000000000000000000000
---- a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.cc
-+++ /dev/null
-@@ -1,166 +0,0 @@
--// Copyright 2017 The Crashpad Authors. All rights reserved.
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//     http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#include "util/posix/double_fork_and_exec.h"
--
--#include <stdlib.h>
--#include <string.h>
--#include <sys/wait.h>
--#include <unistd.h>
--
--#include "base/check_op.h"
--#include "base/logging.h"
--#include "base/posix/eintr_wrapper.h"
--#include "base/strings/stringprintf.h"
--#include "util/posix/close_multiple.h"
--
--namespace crashpad {
--
--bool DoubleForkAndExec(const std::vector<std::string>& argv,
--                       const std::vector<std::string>* envp,
--                       int preserve_fd,
--                       bool use_path,
--                       void (*child_function)()) {
--  DCHECK(!envp || !use_path);
--
--  // argv_c contains const char* pointers and is terminated by nullptr. This is
--  // suitable for passing to execv(). Although argv_c is not used in the parent
--  // process, it must be built in the parent process because it’s unsafe to do
--  // so in the child or grandchild process.
--  std::vector<const char*> argv_c;
--  argv_c.reserve(argv.size() + 1);
--  for (const std::string& argument : argv) {
--    argv_c.push_back(argument.c_str());
--  }
--  argv_c.push_back(nullptr);
--
--  std::vector<const char*> envp_c;
--  if (envp) {
--    envp_c.reserve(envp->size() + 1);
--    for (const std::string& variable : *envp) {
--      envp_c.push_back(variable.c_str());
--    }
--    envp_c.push_back(nullptr);
--  }
--
--  // Double-fork(). The three processes involved are parent, child, and
--  // grandchild. The grandchild will call execv(). The child exits immediately
--  // after spawning the grandchild, so the grandchild becomes an orphan and its
--  // parent process ID becomes 1. This relieves the parent and child of the
--  // responsibility to reap the grandchild with waitpid() or similar. The
--  // grandchild is expected to outlive the parent process, so the parent
--  // shouldn’t be concerned with reaping it. This approach means that accidental
--  // early termination of the handler process will not result in a zombie
--  // process.
--  pid_t pid = fork();
--  if (pid < 0) {
--    PLOG(ERROR) << "fork";
--    return false;
--  }
--
--  if (pid == 0) {
--    // Child process.
--
--    if (child_function) {
--      child_function();
--    }
--
--    // Call setsid(), creating a new process group and a new session, both led
--    // by this process. The new process group has no controlling terminal. This
--    // disconnects it from signals generated by the parent process’ terminal.
--    //
--    // setsid() is done in the child instead of the grandchild so that the
--    // grandchild will not be a session leader. If it were a session leader, an
--    // accidental open() of a terminal device without O_NOCTTY would make that
--    // terminal the controlling terminal.
--    //
--    // It’s not desirable for the grandchild to have a controlling terminal. The
--    // grandchild manages its own lifetime, such as by monitoring clients on its
--    // own and exiting when it loses all clients and when it deems it
--    // appropraite to do so. It may serve clients in different process groups or
--    // sessions than its original client, and receiving signals intended for its
--    // original client’s process group could be harmful in that case.
--    PCHECK(setsid() != -1) << "setsid";
--
--    pid = fork();
--    if (pid < 0) {
--      PLOG(FATAL) << "fork";
--    }
--
--    if (pid > 0) {
--      // Child process.
--
--      // _exit() instead of exit(), because fork() was called.
--      _exit(EXIT_SUCCESS);
--    }
--
--    // Grandchild process.
--
--    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
--
--    // &argv_c[0] is a pointer to a pointer to const char data, but because of
--    // how C (not C++) works, execvp() wants a pointer to a const pointer to
--    // char data. It modifies neither the data nor the pointers, so the
--    // const_cast is safe.
--    char* const* argv_for_execv = const_cast<char* const*>(&argv_c[0]);
--
--    if (envp) {
--      // This cast is safe for the same reason that the argv_for_execv cast is.
--      char* const* envp_for_execv = const_cast<char* const*>(&envp_c[0]);
--      execve(argv_for_execv[0], argv_for_execv, envp_for_execv);
--      PLOG(FATAL) << "execve " << argv_for_execv[0];
--    }
--
--    if (use_path) {
--      execvp(argv_for_execv[0], argv_for_execv);
--      PLOG(FATAL) << "execvp " << argv_for_execv[0];
--    }
--
--    execv(argv_for_execv[0], argv_for_execv);
--    PLOG(FATAL) << "execv " << argv_for_execv[0];
--  }
--
--  // waitpid() for the child, so that it does not become a zombie process. The
--  // child normally exits quickly.
--  //
--  // Failures from this point on may result in the accumulation of a zombie, but
--  // should not be considered fatal. Log only warnings, but don’t treat these
--  // failures as a failure of the function overall.
--  int status;
--  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
--  if (wait_pid == -1) {
--    PLOG(WARNING) << "waitpid";
--    return true;
--  }
--  DCHECK_EQ(wait_pid, pid);
--
--  if (WIFSIGNALED(status)) {
--    int sig = WTERMSIG(status);
--    LOG(WARNING) << base::StringPrintf(
--        "intermediate process terminated by signal %d (%s)%s",
--        sig,
--        strsignal(sig),
--        WCOREDUMP(status) ? " (core dumped)" : "");
--  } else if (!WIFEXITED(status)) {
--    LOG(WARNING) << base::StringPrintf(
--        "intermediate process: unknown termination 0x%x", status);
--  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
--    LOG(WARNING) << "intermediate process exited with code "
--                 << WEXITSTATUS(status);
--  }
--
--  return true;
--}
--
--}  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc
-new file mode 100644
-index 0000000000000000000000000000000000000000..c6a95bbfdcba45995b0034789c8bdb4423a25642
---- /dev/null
-+++ b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.cc
-@@ -0,0 +1,235 @@
-+// Copyright 2017 The Crashpad Authors. All rights reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+//     http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#include "util/posix/fork_and_spawn.h"
-+
-+#include <errno.h>
-+#include <spawn.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
-+
-+#include "base/check.h"
-+#include "base/check_op.h"
-+#include "base/logging.h"
-+#include "base/posix/eintr_wrapper.h"
-+#include "base/strings/stringprintf.h"
-+#include "build/build_config.h"
-+#include "util/posix/close_multiple.h"
-+
-+extern char** environ;
-+
-+namespace crashpad {
-+
-+namespace {
-+
-+#if BUILDFLAG(IS_APPLE)
-+
-+class PosixSpawnAttr {
-+ public:
-+  PosixSpawnAttr() {
-+    PCHECK((errno = posix_spawnattr_init(&attr_)) == 0)
-+        << "posix_spawnattr_init";
-+  }
-+
-+  PosixSpawnAttr(const PosixSpawnAttr&) = delete;
-+  PosixSpawnAttr& operator=(const PosixSpawnAttr&) = delete;
-+
-+  ~PosixSpawnAttr() {
-+    PCHECK((errno = posix_spawnattr_destroy(&attr_)) == 0)
-+        << "posix_spawnattr_destroy";
-+  }
-+
-+  void SetFlags(short flags) {
-+    PCHECK((errno = posix_spawnattr_setflags(&attr_, flags)) == 0)
-+        << "posix_spawnattr_setflags";
-+  }
-+
-+  const posix_spawnattr_t* Get() const { return &attr_; }
-+
-+ private:
-+  posix_spawnattr_t attr_;
-+};
-+
-+class PosixSpawnFileActions {
-+ public:
-+  PosixSpawnFileActions() {
-+    PCHECK((errno = posix_spawn_file_actions_init(&file_actions_)) == 0)
-+        << "posix_spawn_file_actions_init";
-+  }
-+
-+  PosixSpawnFileActions(const PosixSpawnFileActions&) = delete;
-+  PosixSpawnFileActions& operator=(const PosixSpawnFileActions&) = delete;
-+
-+  ~PosixSpawnFileActions() {
-+    PCHECK((errno = posix_spawn_file_actions_destroy(&file_actions_)) == 0)
-+        << "posix_spawn_file_actions_destroy";
-+  }
-+
-+  void AddInheritedFileDescriptor(int fd) {
-+    PCHECK((errno = posix_spawn_file_actions_addinherit_np(&file_actions_,
-+                                                           fd)) == 0)
-+        << "posix_spawn_file_actions_addinherit_np";
-+  }
-+
-+  const posix_spawn_file_actions_t* Get() const { return &file_actions_; }
-+
-+ private:
-+  posix_spawn_file_actions_t file_actions_;
-+};
-+
-+#endif
-+
-+}  // namespace
-+
-+bool ForkAndSpawn(const std::vector<std::string>& argv,
-+                  const std::vector<std::string>* envp,
-+                  int preserve_fd,
-+                  bool use_path,
-+                  void (*child_function)()) {
-+  // argv_c contains const char* pointers and is terminated by nullptr. This is
-+  // suitable for passing to posix_spawn() or posix_spawnp(). Although argv_c is
-+  // not used in the parent process, it must be built in the parent process
-+  // because it’s unsafe to do so in the child.
-+  std::vector<const char*> argv_c;
-+  argv_c.reserve(argv.size() + 1);
-+  for (const std::string& argument : argv) {
-+    argv_c.push_back(argument.c_str());
-+  }
-+  argv_c.push_back(nullptr);
-+
-+  std::vector<const char*> envp_c;
-+  if (envp) {
-+    envp_c.reserve(envp->size() + 1);
-+    for (const std::string& variable : *envp) {
-+      envp_c.push_back(variable.c_str());
-+    }
-+    envp_c.push_back(nullptr);
-+  }
-+
-+  // The three processes involved are parent, child, and grandchild. The child
-+  // exits immediately after spawning the grandchild, so the grandchild becomes
-+  // an orphan and its parent process ID becomes 1. This relieves the parent and
-+  // child of the responsibility to reap the grandchild with waitpid() or
-+  // similar. The grandchild is expected to outlive the parent process, so the
-+  // parent shouldn’t be concerned with reaping it. This approach means that
-+  // accidental early termination of the handler process will not result in a
-+  // zombie process.
-+  pid_t pid = fork();
-+  if (pid < 0) {
-+    PLOG(ERROR) << "fork";
-+    return false;
-+  }
-+
-+  if (pid == 0) {
-+    // Child process.
-+
-+    if (child_function) {
-+      child_function();
-+    }
-+
-+    // Call setsid(), creating a new process group and a new session, both led
-+    // by this process. The new process group has no controlling terminal. This
-+    // disconnects it from signals generated by the parent process’ terminal.
-+    //
-+    // setsid() is done in the child instead of the grandchild so that the
-+    // grandchild will not be a session leader. If it were a session leader, an
-+    // accidental open() of a terminal device without O_NOCTTY would make that
-+    // terminal the controlling terminal.
-+    //
-+    // It’s not desirable for the grandchild to have a controlling terminal. The
-+    // grandchild manages its own lifetime, such as by monitoring clients on its
-+    // own and exiting when it loses all clients and when it deems it
-+    // appropraite to do so. It may serve clients in different process groups or
-+    // sessions than its original client, and receiving signals intended for its
-+    // original client’s process group could be harmful in that case.
-+    PCHECK(setsid() != -1) << "setsid";
-+
-+    // &argv_c[0] is a pointer to a pointer to const char data, but because of
-+    // how C (not C++) works, posix_spawn() and posix_spawnp() want a pointer to
-+    // a const pointer to char data. They modifies neither the data nor the
-+    // pointers, so the const_cast is safe.
-+    char* const* argv_for_spawn = const_cast<char* const*>(argv_c.data());
-+
-+    // This cast is safe for the same reason that the argv_for_spawn cast is.
-+    char* const* envp_for_spawn =
-+        envp ? const_cast<char* const*>(envp_c.data()) : environ;
-+
-+#if BUILDFLAG(IS_APPLE)
-+    PosixSpawnAttr attr;
-+    attr.SetFlags(POSIX_SPAWN_CLOEXEC_DEFAULT);
-+
-+    PosixSpawnFileActions file_actions;
-+    for (int fd = 0; fd <= STDERR_FILENO; ++fd) {
-+      file_actions.AddInheritedFileDescriptor(fd);
-+    }
-+    file_actions.AddInheritedFileDescriptor(preserve_fd);
-+
-+    const posix_spawnattr_t* attr_p = attr.Get();
-+    const posix_spawn_file_actions_t* file_actions_p = file_actions.Get();
-+#else
-+    CloseMultipleNowOrOnExec(STDERR_FILENO + 1, preserve_fd);
-+
-+    const posix_spawnattr_t* attr_p = nullptr;
-+    const posix_spawn_file_actions_t* file_actions_p = nullptr;
-+#endif
-+
-+    auto posix_spawn_fp = use_path ? posix_spawnp : posix_spawn;
-+    if ((errno = posix_spawn_fp(&pid,
-+                                argv_for_spawn[0],
-+                                file_actions_p,
-+                                attr_p,
-+                                argv_for_spawn,
-+                                envp_for_spawn)) != 0) {
-+      PLOG(FATAL) << (use_path ? "posix_spawnp" : "posix_spawn");
-+    }
-+
-+    // _exit() instead of exit(), because fork() was called.
-+    _exit(EXIT_SUCCESS);
-+  }
-+
-+  // waitpid() for the child, so that it does not become a zombie process. The
-+  // child normally exits quickly.
-+  //
-+  // Failures from this point on may result in the accumulation of a zombie, but
-+  // should not be considered fatal. Log only warnings, but don’t treat these
-+  // failures as a failure of the function overall.
-+  int status;
-+  pid_t wait_pid = HANDLE_EINTR(waitpid(pid, &status, 0));
-+  if (wait_pid == -1) {
-+    PLOG(WARNING) << "waitpid";
-+    return true;
-+  }
-+  DCHECK_EQ(wait_pid, pid);
-+
-+  if (WIFSIGNALED(status)) {
-+    int sig = WTERMSIG(status);
-+    LOG(WARNING) << base::StringPrintf(
-+        "intermediate process terminated by signal %d (%s)%s",
-+        sig,
-+        strsignal(sig),
-+        WCOREDUMP(status) ? " (core dumped)" : "");
-+  } else if (!WIFEXITED(status)) {
-+    LOG(WARNING) << base::StringPrintf(
-+        "intermediate process: unknown termination 0x%x", status);
-+  } else if (WEXITSTATUS(status) != EXIT_SUCCESS) {
-+    LOG(WARNING) << "intermediate process exited with code "
-+                 << WEXITSTATUS(status);
-+  }
-+
-+  return true;
-+}
-+
-+}  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
-similarity index 76%
-rename from third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h
-rename to third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
-index 02fc0f28f196b447132a2dcfaebdaaa5a916a38a..fc55aa3a37652e4ba18c66db90124abd9cad2e51 100644
---- a/third_party/crashpad/crashpad/util/posix/double_fork_and_exec.h
-+++ b/third_party/crashpad/crashpad/util/posix/fork_and_spawn.h
-@@ -12,8 +12,8 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
--#ifndef CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
--#define CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
-+#ifndef CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_
-+#define CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_
- 
- #include <string>
- #include <vector>
-@@ -23,7 +23,7 @@ namespace crashpad {
- //! \brief Executes a (grand-)child process.
- //!
- //! The grandchild process will be started through the
--//! double-`fork()`-and-`execv()` pattern. This allows the grandchild to fully
-+//! `fork()`-and-`posix_spawn()` pattern. This allows the grandchild to fully
- //! disassociate from the parent. The grandchild will not be a member of the
- //! parent’s process group or session and will not have a controlling terminal,
- //! providing isolation from signals not intended for it. The grandchild’s
-@@ -37,7 +37,7 @@ namespace crashpad {
- //! \param[in] argv The argument vector to start the grandchild process with.
- //!     `argv[0]` is used as the path to the executable.
- //! \param[in] envp A vector of environment variables of the form `var=value` to
--//!     be passed to `execve()`. If this value is `nullptr`, the current
-+//!     be passed to `posix_spawn()`. If this value is `nullptr`, the current
- //!     environment is used.
- //! \param[in] preserve_fd A file descriptor to be inherited by the grandchild
- //!     process. This file descriptor is inherited in addition to the three file
-@@ -45,16 +45,13 @@ namespace crashpad {
- //!     if no additional file descriptors are to be inherited.
- //! \param[in] use_path Whether to consult the `PATH` environment variable when
- //!     requested to start an executable at a non-absolute path. If `false`,
--//!     `execv()`, which does not consult `PATH`, will be used. If `true`,
--//!     `execvp()`, which does consult `PATH`, will be used.
-+//!     `posix_spawn()`, which does not consult `PATH`, will be used. If `true`,
-+//!     `posix_spawnp()`, which does consult `PATH`, will be used.
- //! \param[in] child_function If not `nullptr`, this function will be called in
--//!     the intermediate child process, prior to the second `fork()`. Take note
-+//!     the intermediate child process, prior to the `posix_spawn()`. Take note
- //!     that this function will run in the context of a forked process, and must
- //!     be safe for that purpose.
- //!
--//! Setting both \a envp to a value other than `nullptr` and \a use_path to
--//! `true` is not currently supported.
--//!
- //! \return `true` on success, and `false` on failure with a message logged.
- //!     Only failures that occur in the parent process that indicate a definite
- //!     failure to start the the grandchild are reported in the return value.
-@@ -63,12 +60,12 @@ namespace crashpad {
- //!     terminating. The caller assumes the responsibility for detecting such
- //!     failures, for example, by observing a failure to perform a successful
- //!     handshake with the grandchild process.
--bool DoubleForkAndExec(const std::vector<std::string>& argv,
--                       const std::vector<std::string>* envp,
--                       int preserve_fd,
--                       bool use_path,
--                       void (*child_function)());
-+bool ForkAndSpawn(const std::vector<std::string>& argv,
-+                  const std::vector<std::string>* envp,
-+                  int preserve_fd,
-+                  bool use_path,
-+                  void (*child_function)());
- 
- }  // namespace crashpad
- 
--#endif  // CRASHPAD_UTIL_POSIX_DOUBLE_FORK_AND_EXEC_H_
-+#endif  // CRASHPAD_UTIL_POSIX_FORK_AND_SPAWN_H_
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index ae77976658d6f..460fb3b6d5bc5 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index a7a198ddd0f33bc0786b59e5027c72662d2c24ed..dfc5ba7e101ef8521bcb4d1ecdf68f1957b347e9 100644
+index 861191e82aa304be0a71dcd356d31767540450ef..1f86538121bfc753b3587d9edaf1553726542af9 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -970,7 +970,6 @@ if (is_win) {
+@@ -974,7 +974,6 @@ if (is_win) {
        "//media:media_unittests",
        "//media/midi:midi_unittests",
        "//net:net_unittests",
@@ -22,7 +22,7 @@ index a7a198ddd0f33bc0786b59e5027c72662d2c24ed..dfc5ba7e101ef8521bcb4d1ecdf68f19
        "//sql:sql_unittests",
        "//third_party/breakpad:symupload($host_toolchain)",
        "//ui/base:ui_base_unittests",
-@@ -979,6 +978,10 @@ if (is_win) {
+@@ -983,6 +982,10 @@ if (is_win) {
        "//ui/views:views_unittests",
        "//url:url_unittests",
      ]
@@ -136,7 +136,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index e665eb42fad5f47b1643315d2cdcdf2eb66b069d..21451d9ae0cbb647cafe0e9ae47f067068aef1b7 100644
+index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d89882163c93ce89 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -406,7 +406,7 @@ index e665eb42fad5f47b1643315d2cdcdf2eb66b069d..21451d9ae0cbb647cafe0e9ae47f0670
      return true;
  
    if (!cookie) {
-@@ -1067,7 +1110,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1069,7 +1112,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -523,7 +523,7 @@ index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d18
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804fe5039b8 100644
+index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7da7d5c9e 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -581,7 +581,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -2051,7 +2056,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2052,7 +2057,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -591,7 +591,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -2066,7 +2072,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2067,7 +2073,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -602,7 +602,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -2074,7 +2082,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2075,7 +2083,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -611,7 +611,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -2093,8 +2101,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2094,8 +2102,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -628,7 +628,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2327,36 +2342,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2328,36 +2343,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -693,7 +693,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2481,7 +2512,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2482,7 +2513,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -703,7 +703,7 @@ index 66ac411e4a70610cbf457e0bbbb0439a6e0f7c59..125fc9057ef5f2e01faa2e4db6ca6804
              std::move(quit_closure).Run();
            },
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43fa22d81b5 100644
+index c2bf286ef1741b53022adf420809a87c3bb53cfd..f8b38d09abd3253bfd38b874ebdad753c3f8c4db 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -255,7 +255,7 @@ class PrintRenderFrameHelper
@@ -744,10 +744,10 @@ index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43f
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 87c464f6a565b0ef4930c87b5e32329c55d0c223..26af5b09600e4e064b098bac884c4d941e88e3fc 100644
+index 9b8fe6eecdc7093ba43a324f37bbe380e43dc0c0..88164f568c27dc6bad4cedfd83bd2abeae956c5c 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2758,8 +2758,9 @@ source_set("browser") {
+@@ -2756,8 +2756,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  
@@ -816,10 +816,10 @@ index 58fcf619add5093bd99fd9c561e8686b060a01c6..76db2a2438cef84fcb6dfd4a67d2e171
    bool skip_system_calls() const {
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
 diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
-index 35d1091e0c555d00ac1fc5ac878fa2a6e09e718b..07411f07e69a645ba388348f01237f7d38755818 100644
+index 2a1a5aaf18d43a68b13783d55279e481bd91c2e5..156c6ca844d97376268baa57dcf220561a63fa04 100644
 --- a/sandbox/policy/mac/sandbox_mac.mm
 +++ b/sandbox/policy/mac/sandbox_mac.mm
-@@ -21,7 +21,6 @@
+@@ -22,7 +22,6 @@
  #include "sandbox/policy/mac/nacl_loader.sb.h"
  #include "sandbox/policy/mac/network.sb.h"
  #include "sandbox/policy/mac/ppapi.sb.h"
@@ -827,7 +827,7 @@ index 35d1091e0c555d00ac1fc5ac878fa2a6e09e718b..07411f07e69a645ba388348f01237f7d
  #include "sandbox/policy/mac/print_compositor.sb.h"
  #include "sandbox/policy/mac/renderer.sb.h"
  #include "sandbox/policy/mac/screen_ai.sb.h"
-@@ -29,6 +28,10 @@
+@@ -30,6 +29,10 @@
  #include "sandbox/policy/mac/utility.sb.h"
  #include "sandbox/policy/mojom/sandbox.mojom.h"
  
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index a44f1930965f3..e77c36ab6114a 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -75,7 +75,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d72d847433 100644
+index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527dcee5125 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -54,6 +54,7 @@
@@ -86,7 +86,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  #include <type_traits>
  
  #include "base/base_paths.h"
-@@ -96,9 +97,11 @@
+@@ -97,9 +98,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -98,7 +98,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  
  using content::BrowserThread;
  
-@@ -342,6 +345,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
+@@ -343,6 +346,9 @@ bool SymlinkPath(const base::FilePath& target, const base::FilePath& path) {
  bool DisplayProfileInUseError(const base::FilePath& lock_path,
                                const std::string& hostname,
                                int pid) {
@@ -108,7 +108,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
    std::u16string error = l10n_util::GetStringFUTF16(
        IDS_PROFILE_IN_USE_POSIX, base::NumberToString16(pid),
        base::ASCIIToUTF16(hostname));
-@@ -361,6 +367,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
+@@ -362,6 +368,7 @@ bool DisplayProfileInUseError(const base::FilePath& lock_path,
  
    NOTREACHED();
    return false;
@@ -116,7 +116,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  }
  
  bool IsChromeProcess(pid_t pid) {
-@@ -401,6 +408,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
+@@ -402,6 +409,21 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
    return (cookie == ReadLink(path));
  }
  
@@ -138,7 +138,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -768,6 +790,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -769,6 +791,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -149,7 +149,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -932,6 +958,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -933,6 +959,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -170,7 +170,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1031,14 +1071,32 @@ bool ProcessSingleton::Create() {
+@@ -1032,14 +1072,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -208,7 +208,7 @@ index 3bf385781635bf6e7ccf97abdca43befd29e8e95..9d6ef0e143bdaf4a5043ebbb57d282d7
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1081,10 +1139,13 @@ bool ProcessSingleton::Create() {
+@@ -1082,10 +1140,13 @@ bool ProcessSingleton::Create() {
    if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index dc0896803f661..35d277bc7a7a9 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,7 +30,7 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 205921ae492bf30c16869cdd7ed9605d7fdbd452..51a720da21417c1e83570770959a44d90f172d66 100644
+index 852118f2599087c971ee6475f670a1f0e9d64bd3..ed0e6cff036e76aa266306e5cb4202568ab5b952 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,10 +43,10 @@ index 205921ae492bf30c16869cdd7ed9605d7fdbd452..51a720da21417c1e83570770959a44d9
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 1c69625326df08b85ec77d01b588fc3a8ce58553..686fc99becf068106cc9fb372d2dce1e8d8c5114 100644
+index c9f744c73f95ad6e63077fbfad2e0c935e6c44c1..a06d49c3ed7d809ddd3ab43f1cc4e3044a6b14d2 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4537,6 +4537,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4571,6 +4571,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,7 +59,7 @@ index 1c69625326df08b85ec77d01b588fc3a8ce58553..686fc99becf068106cc9fb372d2dce1e
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 9af9ea4e10a51572e726309e619fb31cb5a928ee..a44f6d7364ad26965e84a432ae376fa922af5fec 100644
+index 2ee5a7a78baba5974f99cd98d1ef378b6de2bcd7..df53d0d8371b2f7bbd04ffe6c2d1c171ae457bc8 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
 @@ -957,6 +957,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index f7f2e7210be36..b748495a963c0 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index 1bb9760fee301bebb5e940d6786999cfbf52656f..0b4b9fb7d64ca1615d5a03e86f421b8f282ed27a 100644
+index eefdd87f1f85ac62079e97f1a7736234952d419c..f2b1959f7650ecd98ed2db870d1c723a78f6e1c1 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -699,6 +699,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -703,6 +703,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index 1bb9760fee301bebb5e940d6786999cfbf52656f..0b4b9fb7d64ca1615d5a03e86f421b8f
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 2f7dabc3317f7b1a609e6b67795036696a6420d0..a300f9b497f206086d9bba01b0ea3948a1b6413a 100644
+index 912a21280fdd53e03cb92404b424f0b26740460a..98dda64426a1489cd44e90a211a6c4f94f62afb7 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
@@ -50,7 +50,7 @@ index 2f7dabc3317f7b1a609e6b67795036696a6420d0..a300f9b497f206086d9bba01b0ea3948
  class WebCursor;
  class WebContentsAccessibility;
  class DelegatedFrameHost;
-@@ -145,6 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -146,6 +150,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
        const gfx::Rect& keyboard_rect) override {}
    bool IsHTMLFormPopup() const override;
  
@@ -60,7 +60,7 @@ index 2f7dabc3317f7b1a609e6b67795036696a6420d0..a300f9b497f206086d9bba01b0ea3948
    // This only needs to be overridden by RenderWidgetHostViewBase subclasses
    // that handle content embedded within other RenderWidgetHostViews.
    gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -299,6 +306,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -300,6 +307,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                     const ui::LatencyInfo& latency);
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index bfcb6e2bb6da5..71fbcccf77efd 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 6e4656b8f6dd76e4e13e066a87de4ec893063a46..2232f86b1c91700cdc371adbfdd7beed99d26418 100644
+index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39fe14086e 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index a5704c0b5bb82..db1be0f2a4649 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index ab74207b348f211ee78de1384c9c75f7682926fe..ff475b3978b215cdbe921c620661070309bc5f5d 100644
+index 2f86fff71f36353f1fc3d8024f16dbb4921a1db8..db9d0406637bca783f5a9f0beecbbaaac6d1c1cf 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1283,7 +1283,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1279,7 +1279,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index f56ee04810871..0ebb265485662 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 654d7d77b2a7ea8e1819288bb49084e435072ba9..e186644f7592f7d0e827b7d8af6c31951738f6f5 100644
+index 8b236cbd54011bc0008d56ca4213920e478f7a90..ece0f7a284fc87f879d21e754b0b050236081d61 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1748,9 +1748,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1752,9 +1752,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index 360dd0395bc2e..bb2a2c91cd389 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index eb94d05bf03d04b508123675c31957b8d22ee13a..035aa45845d56d0a8edaa693689bb27e6cd3b158 100644
+index 1ebb4970ef9c440c5c2584785397696c7ebc14ce..5f200acb893f6c6b4ffb7c5a6ca010dde8a245e9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3032,6 +3032,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3059,6 +3059,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index eb94d05bf03d04b508123675c31957b8d22ee13a..035aa45845d56d0a8edaa693689bb27e
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3042,6 +3049,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3069,6 +3076,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,7 +35,7 @@ index eb94d05bf03d04b508123675c31957b8d22ee13a..035aa45845d56d0a8edaa693689bb27e
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 92a075098c41f118a4114424715eb61f212b43b7..a99435a0a9c1c4e26a53d513f180a07f8308cbc9 100644
+index f1b8dee6699c02884372aa05279d2d23274efdfd..922048fbc03f7222e42e3640b46d3d5e1b2391ba 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -93,10 +93,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index a476327757682..1ff868607e31f 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index bdf2fa0461840d6059b4a7d6660a356be5c38ba0..867b0efca67ce1d4198c2312a6ddc6a784784913 100644
+index 187b94d207570a77f058915b9e5b581c777adc5a..55b56c4b18bba342db29bc493e07b27aee1f586a 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6421,6 +6421,15 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6509,6 +6509,15 @@ void RenderFrameHostImpl::EnterFullscreen(
      notified_instances.insert(parent_site_instance);
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 9cb4db7e26b71..efef6124f4d55 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -26,7 +26,7 @@ index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index d4e55604b9a8485bb9088a272abca4a6d4e7494d..e842f73029cd7a7a2bdfd7b7d7483a6ecca8527c 100644
+index a5f2807bfa3bd2515aac5fb2090780720a860314..0533dbcdb64af9ebf3f3dcec36038fe76136a15a 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
 @@ -909,6 +909,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
@@ -43,7 +43,7 @@ index d4e55604b9a8485bb9088a272abca4a6d4e7494d..e842f73029cd7a7a2bdfd7b7d7483a6e
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 0d484ebcc48d5b230ba94a07745e14f4cf706702..0387f4de1e181200ecd7323d2cea2fa854de62c0 100644
+index 40146f89d1d946674025c51896fed23a9782b4fb..af85bef23dbc259ba4554aaa28cf3c06a80ea437 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -191,6 +191,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -55,10 +55,10 @@ index 0d484ebcc48d5b230ba94a07745e14f4cf706702..0387f4de1e181200ecd7323d2cea2fa8
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 00a10e9d00f0aad692fd87b9ea51085ef3fbfd1f..f346dfc768dca2f616e6e3197a98a8c896516568 100644
+index a9ba1b0ec765ee51b1341afe81210e87d2c93c82..2970cb32f408fa812cc006f3c70ec5c55115781b 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -676,6 +676,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -675,6 +675,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -67,10 +67,10 @@ index 00a10e9d00f0aad692fd87b9ea51085ef3fbfd1f..f346dfc768dca2f616e6e3197a98a8c8
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index 265e4bed408747b5b22d2e930bc64fb2cb2c3b25..892b3e58443f1a82a6a41c6d52df7d2d701b377d 100644
+index ef06596ca9597496809064a4b5a5388caf2dac5a..aa045c3bebc0653449d99dd6e507ac76952ebf8c 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -734,6 +734,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -735,6 +735,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
      nested_runner_->QuitNow();
    }
  
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index fe77a9ab717ab..f816b1d0f401b 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -35,7 +35,7 @@ index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index e842f73029cd7a7a2bdfd7b7d7483a6ecca8527c..21b9c228654222263e4ec5b028f098e417ee45fc 100644
+index 0533dbcdb64af9ebf3f3dcec36038fe76136a15a..6f4019347855650cb2203f59c5568e2a029639a1 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
 @@ -921,6 +921,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
@@ -52,7 +52,7 @@ index e842f73029cd7a7a2bdfd7b7d7483a6ecca8527c..21b9c228654222263e4ec5b028f098e4
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 0387f4de1e181200ecd7323d2cea2fa854de62c0..d1da5a8cd5c7967e5ace9050110314f9ea5d605d 100644
+index af85bef23dbc259ba4554aaa28cf3c06a80ea437..d6368cee4c3a87882bac1d1d63df8698dd96b0fa 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
 @@ -191,6 +191,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,10 +65,10 @@ index 0387f4de1e181200ecd7323d2cea2fa854de62c0..d1da5a8cd5c7967e5ace9050110314f9
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index f346dfc768dca2f616e6e3197a98a8c896516568..bcf4ac6bce4f83a7fe97621a8c9b49e6684fed95 100644
+index 2970cb32f408fa812cc006f3c70ec5c55115781b..808234569ff2fc80945b2707020197302e20d856 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -676,6 +676,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -675,6 +675,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index adab060b9821c..47cea967e99d9 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 41dab6bec85e6898bb8bf78c6287178aa55a7e74..f5879e1361b127f1213e6abe649d7e82c45b43ce 100644
+index c51da9f12ecab41256bf0cdb7a0170e99302dc35..a0154b94bf390b639e1144bc3eb6041631b29716 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -620,7 +620,7 @@ config("internal_config") {
+@@ -626,7 +626,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index 41dab6bec85e6898bb8bf78c6287178aa55a7e74..f5879e1361b127f1213e6abe649d7e82
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5948,7 +5948,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5986,7 +5986,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index 41dab6bec85e6898bb8bf78c6287178aa55a7e74..f5879e1361b127f1213e6abe649d7e82
  
      deps = [
        ":v8_libbase",
-@@ -5986,6 +5986,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -6024,6 +6024,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/build_remove_legacy_oom_error_callback.patch b/patches/v8/build_remove_legacy_oom_error_callback.patch
index 561e783936029..989e15f01b4b0 100644
--- a/patches/v8/build_remove_legacy_oom_error_callback.patch
+++ b/patches/v8/build_remove_legacy_oom_error_callback.patch
@@ -69,7 +69,7 @@ index b54c7388603b4582356f6741c9a36f2835aa1928..b9533b78046228705e2038396eebf23b
    void SetOOMErrorHandler(OOMErrorCallback that);
  
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332f8778136 100644
+index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a0b9ae99a 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
 @@ -167,13 +167,6 @@
@@ -115,7 +115,7 @@ index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332
    } else {
      // TODO(wfh): Remove this fallback once Blink is setting OOM handler. See
      // crbug.com/614440.
-@@ -6121,11 +6106,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
+@@ -6141,11 +6126,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
    g_oom_error_callback = oom_error_callback;
  }
  
@@ -127,7 +127,7 @@ index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332
  void v8::V8::SetEntropySource(EntropySource entropy_source) {
    base::RandomNumberGenerator::SetEntropySource(entropy_source);
  }
-@@ -8633,8 +8613,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
+@@ -8654,8 +8634,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
  #endif
    if (params.oom_error_callback) {
      v8_isolate->SetOOMErrorHandler(params.oom_error_callback);
@@ -136,7 +136,7 @@ index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332
    }
  #if __clang__
  #pragma clang diagnostic pop
-@@ -9376,8 +9354,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
+@@ -9397,8 +9375,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
  
  CALLBACK_SETTER(FatalErrorHandler, FatalErrorCallback, exception_behavior)
  CALLBACK_SETTER(OOMErrorHandler, OOMErrorCallback, oom_behavior)
@@ -146,10 +146,10 @@ index 7d8d8b699d2b10e026617ea9716ac913a2d44aea..95f77280c471d250eec7da2c7cd64332
                  ModifyCodeGenerationFromStringsCallback2,
                  modify_code_gen_callback2)
 diff --git a/src/execution/isolate.h b/src/execution/isolate.h
-index aed822d0779f3e7dac3c37b84b3aea277a5d57ea..ca9fd39138efb3196072b509ca9f5f9bae85c626 100644
+index 00494e347438e92b509ec67f4d77688e091d348b..8c151c8674fdb5d4b3af3de88e97e70239fa8ed7 100644
 --- a/src/execution/isolate.h
 +++ b/src/execution/isolate.h
-@@ -489,16 +489,9 @@ V8_EXPORT_PRIVATE void FreeCurrentEmbeddedBlob();
+@@ -487,16 +487,9 @@ V8_EXPORT_PRIVATE void FreeCurrentEmbeddedBlob();
  
  using DebugObjectCache = std::vector<Handle<HeapObject>>;
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 9a9c02bce0af1..d7b2329787ca3 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 8cb7a34b1a48956737e9964151db80308479dcc9..7d8d8b699d2b10e026617ea9716ac913a2d44aea 100644
+index fb22f212024d84555e5a5acdfc70ffa6259b9846..82ed3b8c44b62d67fc7e897423ca1c1999befb7f 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9125,7 +9125,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9146,7 +9146,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index 8cb7a34b1a48956737e9964151db80308479dcc9..7d8d8b699d2b10e026617ea9716ac913
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index a581b318b8cd729370a027fe6b2135dea42a7e78..8f6a2164fbf8016a57742e6048e7f99c5af86d0d 100644
+index df03810a6fea9ee45a9e8dfb8845f8e6eebbcc08..e2a2fdf77d434c504547d7589f67c556f1f2ae2c 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6211,9 +6211,9 @@ void Heap::TearDown() {
+@@ -6195,9 +6195,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index ededb3c9c6d51..873945550cda7 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 1859c2bc4fa262aa4a7f28a5d36d222fc195de2e..71ee04624868f23a2e204b5ff1e973b45e2f1202 100644
+index 12df5c4fb41f5e710dfeac145d69d6a28e53c064..012e1755e11afed5cb154240cce4c6996790aa57 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -620,6 +620,10 @@ config("internal_config") {
+@@ -626,6 +626,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index 6e46db75295f4..fe13e37d5a64e 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 104a524dc45433b15f30529ecb4815210e72d90d..f3e234be7e3d63afb2c4560fe4d243dfa81e12a6 100644
+index 647fbb52bf1faaad92ef1b4537d6226344cb27b2..86b1123804058f1ecca5bd7076f5108cd1f28912 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -925,7 +925,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -929,7 +929,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 05a232bf5d8fb..00c560abdb606 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index f5879e1361b127f1213e6abe649d7e82c45b43ce..1859c2bc4fa262aa4a7f28a5d36d222fc195de2e 100644
+index a0154b94bf390b639e1144bc3eb6041631b29716..12df5c4fb41f5e710dfeac145d69d6a28e53c064 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5960,7 +5960,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5998,7 +5998,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index b3c635d8135de..8b7b4daa28561 100644
--- a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -6,7 +6,7 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 0e5bb1558d096d152fd9388f081c5c9d150a3c7a..6aa16106c088c0a7e590c62eb3d06e0418cb5ebc 100644
+index 714d8a6f057ae98d8809a55e83c323c805170e8d..66ee2bd73b47231c17795ad0b23e558216878cae 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index 94b427ba183b9..fa5ea09a847ee 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,10 +18,10 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index 8b7cc072de2745002ebb715b606cf5f6f735a5f7..89162633cabc2d3f22e2fb4dd76321994e8fe66b 100644
+index 2d2ac48555bdec0b96acd0cd8aafb47e71d4a53c..81d6204d3efd0f55105ec48ee6627293b2ffe5fc 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
-@@ -6142,12 +6142,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+@@ -6156,12 +6156,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    StoreFullTaggedNoWriteBarrier(pending_message, message);
  }
  
@@ -35,10 +35,10 @@ index 8b7cc072de2745002ebb715b606cf5f6f735a5f7..89162633cabc2d3f22e2fb4dd7632199
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index a8dda45985e8e74b1b7c0200779fe8a3844617b0..c017dafaeff050045b4cf4d2a76a474b7b0a2c27 100644
+index 79844e15dff8bcc9da7df17e3b76677c8cd5f87c..7efd34e45a3e263d86f1f3cef54b24c68424a8d4 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -2528,7 +2528,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+@@ -2532,7 +2532,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
  
    TNode<HeapObject> GetPendingMessage();
    void SetPendingMessage(TNode<HeapObject> message);
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index 164c824a19d6c..e25c92d651333 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,10 +12,10 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index 52c5d32227029a24d9576967f27e7a8554edd66b..35c5cbe4ce68539ed29e6b365651e6b2c678d457 100644
+index 818af524388b1aba51e984b7ff7f7b856d1e590b..7ba8a0e9bc11a65e72e66aebd87e19359ba5594e 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
-@@ -3629,6 +3629,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
+@@ -3630,6 +3630,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
         ImmMoveWide(static_cast<int>(imm)) | ShiftMoveWide(shift));
  }
  
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 8179c7b6234a1..897f8a698a4b7 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -41,6 +41,7 @@
 #include "shell/renderer/electron_renderer_client.h"
 #include "shell/renderer/electron_sandboxed_renderer_client.h"
 #include "shell/utility/electron_content_utility_client.h"
+#include "third_party/abseil-cpp/absl/types/variant.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 
@@ -461,7 +462,7 @@ ElectronMainDelegate::RunProcess(
 }
 
 bool ElectronMainDelegate::ShouldCreateFeatureList(InvokedIn invoked_in) {
-  return invoked_in == InvokedIn::kChildProcess;
+  return absl::holds_alternative<InvokedInChildProcess>(invoked_in);
 }
 
 bool ElectronMainDelegate::ShouldLockSchemeRegistry() {
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index c02eddd57fe3c..3b691b06bdbc3 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -72,6 +72,7 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/options_switches.h"
 #include "shell/common/process_util.h"
+#include "third_party/blink/public/common/storage_key/storage_key.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
@@ -115,7 +116,7 @@ PreconnectRequest::PreconnectRequest(
 namespace {
 
 struct ClearStorageDataOptions {
-  GURL origin;
+  blink::StorageKey storage_key;
   uint32_t storage_types = StoragePartition::REMOVE_DATA_MASK_ALL;
   uint32_t quota_types = StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
 };
@@ -170,7 +171,8 @@ struct Converter<ClearStorageDataOptions> {
     gin_helper::Dictionary options;
     if (!ConvertFromV8(isolate, val, &options))
       return false;
-    options.Get("origin", &out->origin);
+    if (GURL storage_origin; options.Get("origin", &storage_origin))
+      out->storage_key = blink::StorageKey(url::Origin::Create(storage_origin));
     std::vector<std::string> types;
     if (options.Get("storages", &types))
       out->storage_types = GetStorageMask(types);
@@ -464,8 +466,8 @@ v8::Local<v8::Promise> Session::ClearStorageData(gin::Arguments* args) {
   }
 
   storage_partition->ClearData(
-      options.storage_types, options.quota_types, options.origin, base::Time(),
-      base::Time::Max(),
+      options.storage_types, options.quota_types, options.storage_key,
+      base::Time(), base::Time::Max(),
       base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
                      std::move(promise)));
   return handle;
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index ce94fda7c1a9a..8a6feece589e5 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -637,6 +637,7 @@ WebContents::Type GetTypeFromViewType(extensions::mojom::ViewType view_type) {
     case extensions::mojom::ViewType::kBackgroundContents:
     case extensions::mojom::ViewType::kExtensionGuest:
     case extensions::mojom::ViewType::kTabContents:
+    case extensions::mojom::ViewType::kOffscreenDocument:
     case extensions::mojom::ViewType::kInvalid:
       return WebContents::Type::kRemote;
   }
diff --git a/shell/browser/api/frame_subscriber.cc b/shell/browser/api/frame_subscriber.cc
index 03dd6c9ecaa32..a3a42a72e58da 100644
--- a/shell/browser/api/frame_subscriber.cc
+++ b/shell/browser/api/frame_subscriber.cc
@@ -143,6 +143,8 @@ void FrameSubscriber::OnFrameCaptured(
   Done(content_rect, bitmap);
 }
 
+void FrameSubscriber::OnNewCropVersion(uint32_t crop_version) {}
+
 void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}
 
 void FrameSubscriber::OnStopped() {}
diff --git a/shell/browser/api/frame_subscriber.h b/shell/browser/api/frame_subscriber.h
index 00b512251e9cd..a8d86cb0a3794 100644
--- a/shell/browser/api/frame_subscriber.h
+++ b/shell/browser/api/frame_subscriber.h
@@ -57,6 +57,7 @@ class FrameSubscriber : public content::WebContentsObserver,
       const gfx::Rect& content_rect,
       mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
           callbacks) override;
+  void OnNewCropVersion(uint32_t crop_version) override;
   void OnFrameWithEmptyRegionCapture() override;
   void OnStopped() override;
   void OnLog(const std::string& message) override;
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
index 70fc5c6d84775..98330a4787bc7 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
@@ -47,14 +47,6 @@ ElectronBluetoothDelegate::ShowBluetoothScanningPrompt(
   return nullptr;
 }
 
-void ElectronBluetoothDelegate::ShowDeviceCredentialsPrompt(
-    content::RenderFrameHost* frame,
-    const std::u16string& device_identifier,
-    CredentialsCallback callback) {
-  // TODO(jkleinsc) implement this
-  std::move(callback).Run(DeviceCredentialsPromptResult::kCancelled, u"");
-}
-
 WebBluetoothDeviceId ElectronBluetoothDelegate::GetWebBluetoothDeviceId(
     RenderFrameHost* frame,
     const std::string& device_address) {
@@ -138,11 +130,14 @@ ElectronBluetoothDelegate::GetPermittedDevices(
   return permitted_devices;
 }
 
-void ElectronBluetoothDelegate::ShowDevicePairConfirmPrompt(
-    RenderFrameHost* frame,
+void ElectronBluetoothDelegate::ShowDevicePairPrompt(
+    content::RenderFrameHost* frame,
     const std::u16string& device_identifier,
-    PairConfirmCallback callback) {
+    PairPromptCallback callback,
+    PairingKind pairing_kind) {
   NOTIMPLEMENTED();
+  std::move(callback).Run(BluetoothDelegate::PairPromptResult(
+      BluetoothDelegate::PairPromptStatus::kCancelled));
 }
 
 }  // namespace electron
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h
index 39918dc2bfbc3..48d07dfb6f8b7 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.h
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h
@@ -52,12 +52,10 @@ class ElectronBluetoothDelegate : public content::BluetoothDelegate {
       content::RenderFrameHost* frame,
       const content::BluetoothScanningPrompt::EventHandler& event_handler)
       override;
-  void ShowDeviceCredentialsPrompt(content::RenderFrameHost* frame,
-                                   const std::u16string& device_identifier,
-                                   CredentialsCallback callback) override;
-  void ShowDevicePairConfirmPrompt(content::RenderFrameHost* frame,
-                                   const std::u16string& device_identifier,
-                                   PairConfirmCallback callback) override;
+  void ShowDevicePairPrompt(content::RenderFrameHost* frame,
+                            const std::u16string& device_identifier,
+                            PairPromptCallback callback,
+                            PairingKind pairing_kind) override;
   blink::WebBluetoothDeviceId GetWebBluetoothDeviceId(
       content::RenderFrameHost* frame,
       const std::string& device_address) override;
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index d3b5f7902fdba..0eb3bcc1388f2 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1820,6 +1820,7 @@ void BindBadgeServiceForServiceWorker(
 }
 
 void ElectronBrowserClient::RegisterBrowserInterfaceBindersForServiceWorker(
+    content::BrowserContext* browser_context,
     mojo::BinderMapWithContext<const content::ServiceWorkerVersionBaseInfo&>*
         map) {
   map->Add<blink::mojom::BadgeService>(
diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h
index ed2447b4312e2..597eb58360ef9 100644
--- a/shell/browser/electron_browser_client.h
+++ b/shell/browser/electron_browser_client.h
@@ -82,6 +82,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
       content::RenderFrameHost* render_frame_host,
       mojo::BinderMapWithContext<content::RenderFrameHost*>* map) override;
   void RegisterBrowserInterfaceBindersForServiceWorker(
+      content::BrowserContext* browser_context,
       mojo::BinderMapWithContext<const content::ServiceWorkerVersionBaseInfo&>*
           map) override;
 #if BUILDFLAG(IS_LINUX)
diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index 917a3a466e9cd..813a6dce4ea3c 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -144,8 +144,7 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
         path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         item->GetMixedContentStatus(), path, base::FilePath(),
-        std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
-        download::DOWNLOAD_INTERRUPT_REASON_NONE);
+        std::string() /*mime_type*/, download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
 }
 
@@ -185,8 +184,7 @@ void ElectronDownloadManagerDelegate::OnDownloadSaveDialogDone(
       .Run(path, download::DownloadItem::TARGET_DISPOSITION_PROMPT,
            download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
            item->GetMixedContentStatus(), path, base::FilePath(),
-           std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
-           interrupt_reason);
+           std::string() /*mime_type*/, interrupt_reason);
 }
 
 void ElectronDownloadManagerDelegate::Shutdown() {
@@ -206,8 +204,7 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN,
         download->GetForcedFilePath(), base::FilePath(),
-        std::string() /*mime_type*/, absl::nullopt /*download_schedule*/,
-        download::DOWNLOAD_INTERRUPT_REASON_NONE);
+        std::string() /*mime_type*/, download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
 
@@ -220,7 +217,6 @@ bool ElectronDownloadManagerDelegate::DetermineDownloadTarget(
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN, save_path,
         base::FilePath(), std::string() /*mime_type*/,
-        absl::nullopt /*download_schedule*/,
         download::DOWNLOAD_INTERRUPT_REASON_NONE);
     return true;
   }
diff --git a/shell/browser/extensions/electron_extensions_browser_client.cc b/shell/browser/extensions/electron_extensions_browser_client.cc
index f286f25a9a5f6..bf1fc1da6e87e 100644
--- a/shell/browser/extensions/electron_extensions_browser_client.cc
+++ b/shell/browser/extensions/electron_extensions_browser_client.cc
@@ -310,15 +310,12 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
     return;
   }
 
-  std::vector<base::Value> event_args(args.size());
-  std::transform(args.begin(), args.end(), event_args.begin(),
-                 [](const base::Value& arg) { return arg.Clone(); });
   auto event = std::make_unique<extensions::Event>(histogram_value, event_name,
-                                                   std::move(event_args));
-  auto& context_map = ElectronBrowserContext::browser_context_map();
-  for (auto const& entry : context_map) {
-    if (entry.second) {
-      extensions::EventRouter::Get(entry.second.get())
+                                                   args.Clone());
+  for (auto const& [key, browser_context] :
+       ElectronBrowserContext::browser_context_map()) {
+    if (browser_context) {
+      extensions::EventRouter::Get(browser_context.get())
           ->BroadcastEvent(std::move(event));
     }
   }
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index abdf7a53efeb1..6c67490e75893 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "chrome/common/chrome_features.h"
 #include "content/public/browser/web_contents.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
 #include "shell/browser/electron_permission_manager.h"
@@ -17,6 +18,10 @@
 #include "shell/browser/web_contents_permission_helper.h"
 #include "third_party/blink/public/common/permissions/permission_utils.h"
 
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+#include "extensions/common/constants.h"
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+
 namespace {
 
 electron::HidChooserContext* GetChooserContext(
@@ -119,6 +124,19 @@ bool ElectronHidDelegate::IsFidoAllowedForOrigin(
       switches::kDisableHidBlocklist);
 }
 
+bool ElectronHidDelegate::IsServiceWorkerAllowedForOrigin(
+    const url::Origin& origin) {
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  // WebHID is only available on extension service workers with feature flag
+  // enabled for now.
+  if (base::FeatureList::IsEnabled(
+          features::kEnableWebHidOnExtensionServiceWorker) &&
+      origin.scheme() == extensions::kExtensionScheme)
+    return true;
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+  return false;
+}
+
 void ElectronHidDelegate::OnDeviceAdded(
     const device::mojom::HidDeviceInfo& device_info) {
   for (auto& observer : observer_list_)
diff --git a/shell/browser/hid/electron_hid_delegate.h b/shell/browser/hid/electron_hid_delegate.h
index 2fc81abd3c172..91c1dccfcde2c 100644
--- a/shell/browser/hid/electron_hid_delegate.h
+++ b/shell/browser/hid/electron_hid_delegate.h
@@ -52,6 +52,7 @@ class ElectronHidDelegate : public content::HidDelegate,
       const std::string& guid) override;
   bool IsFidoAllowedForOrigin(content::BrowserContext* browser_context,
                               const url::Origin& origin) override;
+  bool IsServiceWorkerAllowedForOrigin(const url::Origin& origin) override;
 
   // HidChooserContext::DeviceObserver:
   void OnDeviceAdded(const device::mojom::HidDeviceInfo&) override;
diff --git a/shell/browser/osr/osr_video_consumer.cc b/shell/browser/osr/osr_video_consumer.cc
index a8240681f814e..169e04c2b28cb 100644
--- a/shell/browser/osr/osr_video_consumer.cc
+++ b/shell/browser/osr/osr_video_consumer.cc
@@ -136,6 +136,8 @@ void OffScreenVideoConsumer::OnFrameCaptured(
   callback_.Run(*update_rect, bitmap);
 }
 
+void OffScreenVideoConsumer::OnNewCropVersion(uint32_t crop_version) {}
+
 void OffScreenVideoConsumer::OnFrameWithEmptyRegionCapture() {}
 
 void OffScreenVideoConsumer::OnStopped() {}
diff --git a/shell/browser/osr/osr_video_consumer.h b/shell/browser/osr/osr_video_consumer.h
index ee6bf0aafd419..5427eb1251609 100644
--- a/shell/browser/osr/osr_video_consumer.h
+++ b/shell/browser/osr/osr_video_consumer.h
@@ -43,6 +43,7 @@ class OffScreenVideoConsumer : public viz::mojom::FrameSinkVideoConsumer {
       const gfx::Rect& content_rect,
       mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
           callbacks) override;
+  void OnNewCropVersion(uint32_t crop_version) override;
   void OnFrameWithEmptyRegionCapture() override;
   void OnStopped() override;
   void OnLog(const std::string& message) override;
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
index d1c8e65426a68..16bf86cb016e7 100644
--- a/shell/browser/ui/inspectable_web_contents.cc
+++ b/shell/browser/ui/inspectable_web_contents.cc
@@ -903,32 +903,25 @@ void InspectableWebContents::RegisterExtensionsAPI(const std::string& origin,
 }
 
 void InspectableWebContents::HandleMessageFromDevToolsFrontend(
-    base::Value message) {
+    base::Value::Dict message) {
   // TODO(alexeykuzmin): Should we expect it to exist?
   if (!embedder_message_dispatcher_) {
     return;
   }
 
-  const std::string* method = nullptr;
-  base::Value* params = nullptr;
-
-  if (message.is_dict()) {
-    method = message.FindStringKey(kFrontendHostMethod);
-    params = message.FindKey(kFrontendHostParams);
-  }
+  const std::string* method = message.FindString(kFrontendHostMethod);
+  base::Value* params = message.Find(kFrontendHostParams);
 
   if (!method || (params && !params->is_list())) {
     LOG(ERROR) << "Invalid message was sent to embedder: " << message;
     return;
   }
-  base::Value empty_params(base::Value::Type::LIST);
-  if (!params) {
-    params = &empty_params;
-  }
-  int id = message.FindIntKey(kFrontendHostId).value_or(0);
-  std::vector<base::Value> params_list;
-  if (params)
-    params_list = std::move(*params).TakeListDeprecated();
+
+  const base::Value::List no_params;
+  const base::Value::List& params_list =
+      params != nullptr && params->is_list() ? params->GetList() : no_params;
+
+  const int id = message.FindInt(kFrontendHostId).value_or(0);
   embedder_message_dispatcher_->Dispatch(
       base::BindRepeating(&InspectableWebContents::SendMessageAck,
                           weak_factory_.GetWeakPtr(), id),
diff --git a/shell/browser/ui/inspectable_web_contents.h b/shell/browser/ui/inspectable_web_contents.h
index 68548d0c3c427..b283c48ff6137 100644
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -170,7 +170,7 @@ class InspectableWebContents
                      const std::string& trigger) override {}
 
   // content::DevToolsFrontendHostDelegate:
-  void HandleMessageFromDevToolsFrontend(base::Value message);
+  void HandleMessageFromDevToolsFrontend(base::Value::Dict message);
 
   // content::DevToolsAgentHostClient:
   void DispatchProtocolMessage(content::DevToolsAgentHost* agent_host,
diff --git a/shell/browser/ui/webui/accessibility_ui.cc b/shell/browser/ui/webui/accessibility_ui.cc
index 07dcb52162c45..608899531ea9e 100644
--- a/shell/browser/ui/webui/accessibility_ui.cc
+++ b/shell/browser/ui/webui/accessibility_ui.cc
@@ -332,34 +332,32 @@ ElectronAccessibilityUIMessageHandler::ElectronAccessibilityUIMessageHandler() =
     default;
 
 void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
-    const base::ListValue* args) {
-  const base::DictionaryValue* data;
-  CHECK(args->GetDictionary(0, &data));
+    const base::Value::List& args) {
+  const base::Value::Dict& data = args.front().GetDict();
 
-  int window_id = *data->FindIntPath(kSessionIdField);
-  const std::string* request_type_p = data->FindStringPath(kRequestTypeField);
+  const int window_id = *data.FindInt(kSessionIdField);
+  const std::string* const request_type_p = data.FindString(kRequestTypeField);
   CHECK(IsValidJSValue(request_type_p));
   std::string request_type = *request_type_p;
   CHECK(request_type == kShowOrRefreshTree || request_type == kCopyTree);
   request_type = "accessibility." + request_type;
 
-  const std::string* allow_p = data->FindStringPath("filters.allow");
+  const std::string* const allow_p =
+      data.FindStringByDottedPath("filters.allow");
   CHECK(IsValidJSValue(allow_p));
-  std::string allow = *allow_p;
-  const std::string* allow_empty_p = data->FindStringPath("filters.allowEmpty");
+  const std::string* const allow_empty_p =
+      data.FindStringByDottedPath("filters.allowEmpty");
   CHECK(IsValidJSValue(allow_empty_p));
-  std::string allow_empty = *allow_empty_p;
-  const std::string* deny_p = data->FindStringPath("filters.deny");
+  const std::string* const deny_p = data.FindStringByDottedPath("filters.deny");
   CHECK(IsValidJSValue(deny_p));
-  std::string deny = *deny_p;
 
   AllowJavascript();
 
   std::vector<ui::AXPropertyFilter> property_filters;
-  AddPropertyFilters(&property_filters, allow, ui::AXPropertyFilter::ALLOW);
-  AddPropertyFilters(&property_filters, allow_empty,
+  AddPropertyFilters(&property_filters, *allow_p, ui::AXPropertyFilter::ALLOW);
+  AddPropertyFilters(&property_filters, *allow_empty_p,
                      ui::AXPropertyFilter::ALLOW_EMPTY);
-  AddPropertyFilters(&property_filters, deny, ui::AXPropertyFilter::DENY);
+  AddPropertyFilters(&property_filters, *deny_p, ui::AXPropertyFilter::DENY);
 
   for (auto* window : electron::WindowList::GetWindows()) {
     if (window->window_id() == window_id) {
@@ -385,25 +383,25 @@ void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
 void ElectronAccessibilityUIMessageHandler::RegisterMessages() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  web_ui()->RegisterDeprecatedMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "toggleAccessibility",
       base::BindRepeating(&AccessibilityUIMessageHandler::ToggleAccessibility,
                           base::Unretained(this)));
-  web_ui()->RegisterDeprecatedMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "setGlobalFlag",
       base::BindRepeating(&AccessibilityUIMessageHandler::SetGlobalFlag,
                           base::Unretained(this)));
-  web_ui()->RegisterDeprecatedMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "requestWebContentsTree",
       base::BindRepeating(
           &AccessibilityUIMessageHandler::RequestWebContentsTree,
           base::Unretained(this)));
-  web_ui()->RegisterDeprecatedMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "requestNativeUITree",
       base::BindRepeating(
           &ElectronAccessibilityUIMessageHandler::RequestNativeUITree,
           base::Unretained(this)));
-  web_ui()->RegisterDeprecatedMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "requestAccessibilityEvents",
       base::BindRepeating(
           &AccessibilityUIMessageHandler::RequestAccessibilityEvents,
diff --git a/shell/browser/ui/webui/accessibility_ui.h b/shell/browser/ui/webui/accessibility_ui.h
index 8d8dd02721ea8..a9796934a50e2 100644
--- a/shell/browser/ui/webui/accessibility_ui.h
+++ b/shell/browser/ui/webui/accessibility_ui.h
@@ -32,7 +32,7 @@ class ElectronAccessibilityUIMessageHandler
   void RegisterMessages() final;
 
  private:
-  void RequestNativeUITree(const base::ListValue* args);
+  void RequestNativeUITree(const base::Value::List& args);
 };
 
 #endif  // ELECTRON_SHELL_BROWSER_UI_WEBUI_ACCESSIBILITY_UI_H_
diff --git a/shell/common/api/electron_api_clipboard_mac.mm b/shell/common/api/electron_api_clipboard_mac.mm
index 5303b89af6ca7..5607885c4c5e6 100644
--- a/shell/common/api/electron_api_clipboard_mac.mm
+++ b/shell/common/api/electron_api_clipboard_mac.mm
@@ -14,7 +14,7 @@
 }
 
 std::u16string Clipboard::ReadFindText() {
-  return GetFindPboardText();
+  return base::SysNSStringToUTF16([[FindPasteboard sharedInstance] findText]);
 }
 
 }  // namespace electron::api
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 6a7a0c2387cd2..12e8cc1018e86 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -15,7 +15,6 @@
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_visitor.h"
-#include "content/public/renderer/render_view.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
diff --git a/shell/renderer/electron_autofill_agent.cc b/shell/renderer/electron_autofill_agent.cc
index ff3ae3deceb56..115f602c77660 100644
--- a/shell/renderer/electron_autofill_agent.cc
+++ b/shell/renderer/electron_autofill_agent.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
 #include "third_party/blink/public/common/input/web_keyboard_event.h"
 #include "third_party/blink/public/platform/web_string.h"
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index f3ef770262484..5c4f0d248fcdd 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -11,7 +11,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index a7ce97370f066..b57b46cc8c580 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -18,7 +18,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/render_view.h"
 #include "electron/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 #include "shell/browser/api/electron_api_protocol.h"

From 9a5d759ea30724d2d3fd4872ddec54232a5e551a Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 14 Jul 2022 01:46:41 -0700
Subject: [PATCH 585/811] fix: ensure that v8 sandbox isnt enabled for arm
 (#34914)

---
 ...pression_sandbox_is_enabled_on_64bit.patch | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
index 2b9a5edf16daa..a38e4f9dec637 100644
--- a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
+++ b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
@@ -8,29 +8,26 @@ Aligns common.gypi with the current build flag state of //v8.
 Specifically enables `V8_ENABLE_SANDBOX`, `V8_SANDBOXED_POINTERS`, `V8_COMPRESS_POINTERS` and `V8_COMPRESS_POINTERS_IN_SHARED_CAGE`.
 
 diff --git a/common.gypi b/common.gypi
-index 559b7f7c220cb98946285bb15d0d63e203bbcea4..b0cba989da8d9b5bd7e1050510bb09646622f88c 100644
+index 559b7f7c220cb98946285bb15d0d63e203bbcea4..ea87c9f56ef83e6b0edddb9a467a21eb4ea3907b 100644
 --- a/common.gypi
 +++ b/common.gypi
-@@ -66,6 +66,8 @@
+@@ -65,6 +65,7 @@
+     # node-gyp to build addons.
      'v8_enable_pointer_compression%': 0,
      'v8_enable_31bit_smis_on_64bit_arch%': 0,
- 
 +    'v8_enable_sandbox%': 0,
-+
+ 
      # Disable V8 untrusted code mitigations.
      # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
-     'v8_untrusted_code_mitigations': 0,
-@@ -135,6 +137,9 @@
+@@ -134,6 +135,7 @@
+       ['target_arch in "arm ia32 mips mipsel ppc"', {
          'v8_enable_pointer_compression': 0,
          'v8_enable_31bit_smis_on_64bit_arch': 0,
++        'v8_enable_sandbox': 0,
        }],
-+      ['target_arch in "arm64 x64"', {
-+        'v8_enable_sandbox': 1,
-+      }],
        ['target_arch in "ppc64 s390x"', {
          'v8_enable_backtrace': 1,
-       }],
-@@ -395,9 +400,15 @@
+@@ -395,9 +397,15 @@
        ['v8_enable_pointer_compression == 1', {
          'defines': [
            'V8_COMPRESS_POINTERS',
@@ -47,3 +44,15 @@ index 559b7f7c220cb98946285bb15d0d63e203bbcea4..b0cba989da8d9b5bd7e1050510bb0964
        ['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', {
          'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
        }],
+diff --git a/configure.py b/configure.py
+index 95b31769cb5756578d66193716c638f504bd44aa..fe741d15da821396883dd72b4e0a42c7758bd557 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1433,6 +1433,7 @@ def configure_v8(o):
+   o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
+   o['variables']['v8_enable_pointer_compression'] = 1 if options.enable_pointer_compression else 0
+   o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
++  o['variables']['v8_enable_sandbox'] = 1 if options.enable_pointer_compression else 0
+   o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
+   o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
+   o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)

From e9f42b4ad44b39bc86aeebd0d768ee47d8847ec4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 06:03:36 -0700
Subject: [PATCH 586/811] Bump v21.0.0-nightly.20220714

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dbd21d769462d..96efc12e48120 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220713
\ No newline at end of file
+21.0.0-nightly.20220714
\ No newline at end of file
diff --git a/package.json b/package.json
index c725b6a1cbbd8..2b3d88df386ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220713",
+  "version": "21.0.0-nightly.20220714",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 389bdd60adc14..9e031ab3195ec 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220713
- PRODUCTVERSION 21,0,0,20220713
+ FILEVERSION 21,0,0,20220714
+ PRODUCTVERSION 21,0,0,20220714
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 0cb39b5bb528a24ab3f129622d8576ca5caaa4f5 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:12:33 -0700
Subject: [PATCH 587/811] Revert "Bump v21.0.0-nightly.20220714"

This reverts commit e9f42b4ad44b39bc86aeebd0d768ee47d8847ec4.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 96efc12e48120..dbd21d769462d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220714
\ No newline at end of file
+21.0.0-nightly.20220713
\ No newline at end of file
diff --git a/package.json b/package.json
index 2b3d88df386ac..c725b6a1cbbd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220714",
+  "version": "21.0.0-nightly.20220713",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 9e031ab3195ec..389bdd60adc14 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220714
- PRODUCTVERSION 21,0,0,20220714
+ FILEVERSION 21,0,0,20220713
+ PRODUCTVERSION 21,0,0,20220713
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 4bec26cd0cb9336f4e75e3b15ae3b239dee6abbc Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 06:01:14 -0700
Subject: [PATCH 588/811] Bump v21.0.0-nightly.20220715

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dbd21d769462d..8020e29170eff 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220713
\ No newline at end of file
+21.0.0-nightly.20220715
\ No newline at end of file
diff --git a/package.json b/package.json
index c725b6a1cbbd8..be7004caf984d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220713",
+  "version": "21.0.0-nightly.20220715",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 389bdd60adc14..1227af1ae28a2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220713
- PRODUCTVERSION 21,0,0,20220713
+ FILEVERSION 21,0,0,20220715
+ PRODUCTVERSION 21,0,0,20220715
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 2afb284456630be96573257c07b0eb4ecb3f04a2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 07:32:25 -0700
Subject: [PATCH 589/811] Revert "Bump v21.0.0-nightly.20220715"

This reverts commit 4bec26cd0cb9336f4e75e3b15ae3b239dee6abbc.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 8020e29170eff..dbd21d769462d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220715
\ No newline at end of file
+21.0.0-nightly.20220713
\ No newline at end of file
diff --git a/package.json b/package.json
index be7004caf984d..c725b6a1cbbd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220715",
+  "version": "21.0.0-nightly.20220713",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1227af1ae28a2..389bdd60adc14 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220715
- PRODUCTVERSION 21,0,0,20220715
+ FILEVERSION 21,0,0,20220713
+ PRODUCTVERSION 21,0,0,20220713
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 574da5a9a1d8f5c77a957e772e34a06c9cf1d3b0 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Fri, 15 Jul 2022 15:12:01 -0700
Subject: [PATCH 590/811] chore: cherry-pick 5e227bebf193 from v8 (#34931)

* chore: cherry-pick 5e227bebf193 from v8

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/v8/.patches                       |  1 +
 patches/v8/cherry-pick-5e227bebf193.patch | 72 +++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 patches/v8/cherry-pick-5e227bebf193.patch

diff --git a/patches/v8/.patches b/patches/v8/.patches
index 0e16c5eabc6fe..ea88a8670a84c 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -10,3 +10,4 @@ revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
 chore_disable_is_execution_terminating_dcheck.patch
 build_remove_legacy_oom_error_callback.patch
+cherry-pick-5e227bebf193.patch
diff --git a/patches/v8/cherry-pick-5e227bebf193.patch b/patches/v8/cherry-pick-5e227bebf193.patch
new file mode 100644
index 0000000000000..31e47fac5dcf5
--- /dev/null
+++ b/patches/v8/cherry-pick-5e227bebf193.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Noordhuis <info@bnoordhuis.nl>
+Date: Sat, 9 Jul 2022 14:05:56 +0200
+Subject: Fix undefined symbol linker error
+
+Assembler::CheckBuffer() was defined inline in a header file but without
+inline linkage, causing an undefined symbol link error on arm64 macOS.
+
+Fixes: https://github.com/nodejs/node-v8/issues/233
+Bug: v8:13055
+Change-Id: Ifb638705e95de72b2e8d472e7092e88d77cf8ba8
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3749583
+Auto-Submit: Ben Noordhuis <info@bnoordhuis.nl>
+Reviewed-by: Leszek Swirski <leszeks@chromium.org>
+Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+Commit-Queue: Leszek Swirski <leszeks@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#81749}
+
+diff --git a/src/codegen/arm64/assembler-arm64-inl.h b/src/codegen/arm64/assembler-arm64-inl.h
+index da4201b28307a71e988b50e26fc8854fdcc510d4..60deb07b65b5acaaa1e8762cc57730f366f483d2 100644
+--- a/src/codegen/arm64/assembler-arm64-inl.h
++++ b/src/codegen/arm64/assembler-arm64-inl.h
+@@ -1066,21 +1066,6 @@ const Register& Assembler::AppropriateZeroRegFor(const CPURegister& reg) const {
+   return reg.Is64Bits() ? xzr : wzr;
+ }
+ 
+-inline void Assembler::CheckBufferSpace() {
+-  DCHECK_LT(pc_, buffer_start_ + buffer_->size());
+-  if (V8_UNLIKELY(buffer_space() < kGap)) {
+-    GrowBuffer();
+-  }
+-}
+-
+-V8_INLINE void Assembler::CheckBuffer() {
+-  CheckBufferSpace();
+-  if (pc_offset() >= next_veneer_pool_check_) {
+-    CheckVeneerPool(false, true);
+-  }
+-  constpool_.MaybeCheck();
+-}
+-
+ EnsureSpace::EnsureSpace(Assembler* assembler) : block_pools_scope_(assembler) {
+   assembler->CheckBufferSpace();
+ }
+diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
+index 703e4bba9381c57849882e7cb2cdeb751064dd2a..dceda86275d3ef0bfc2b5bea9d8f04957b2e721c 100644
+--- a/src/codegen/arm64/assembler-arm64.h
++++ b/src/codegen/arm64/assembler-arm64.h
+@@ -2625,8 +2625,21 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+   }
+ 
+   void GrowBuffer();
+-  V8_INLINE void CheckBufferSpace();
+-  void CheckBuffer();
++
++  void CheckBufferSpace() {
++    DCHECK_LT(pc_, buffer_start_ + buffer_->size());
++    if (V8_UNLIKELY(buffer_space() < kGap)) {
++      GrowBuffer();
++    }
++  }
++
++  void CheckBuffer() {
++    CheckBufferSpace();
++    if (pc_offset() >= next_veneer_pool_check_) {
++      CheckVeneerPool(false, true);
++    }
++    constpool_.MaybeCheck();
++  }
+ 
+   // Emission of the veneer pools may be blocked in some code sequences.
+   int veneer_pool_blocked_nesting_;  // Block emission if this is not zero.

From 9d23a624c1e7c6ca4273d727cf4423d52d1a5de4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 15:12:54 -0700
Subject: [PATCH 591/811] Bump v21.0.0-nightly.20220715

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index dbd21d769462d..8020e29170eff 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220713
\ No newline at end of file
+21.0.0-nightly.20220715
\ No newline at end of file
diff --git a/package.json b/package.json
index c725b6a1cbbd8..be7004caf984d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220713",
+  "version": "21.0.0-nightly.20220715",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 389bdd60adc14..1227af1ae28a2 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220713
- PRODUCTVERSION 21,0,0,20220713
+ FILEVERSION 21,0,0,20220715
+ PRODUCTVERSION 21,0,0,20220715
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f1746c81c66d6857e8b857a6eaedee8cc123c942 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Fri, 15 Jul 2022 16:57:29 -0700
Subject: [PATCH 592/811] fix: do not define _LIBCPP_ABI_NAMESPACE=Cr for all
 native modules (#34932)

This define is only needed when linking against Chromiums libc++ which we currently
do not ship / expose the symbols of.  We probably should make those symbols visible and
actually ensure that electron-rebuild et. al link against our libc++ instead of the system libc++
but for now this fixes compilation issues on macOS where the default system clang links to the system libc++
which does not (obviously) use the Chromium ABI namespace.

For our nan tests which do link against Chromiums libc++ we define the ABI namespace in the spec runner.
---
 patches/node/.patches                         |  1 -
 ...mespace_as_cr_to_align_with_chromium.patch | 21 -------------------
 ...pression_sandbox_is_enabled_on_64bit.patch |  4 ++--
 script/nan-spec-runner.js                     |  1 +
 4 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index a175fc7472712..17a4ed067136a 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -43,6 +43,5 @@ macos_avoid_posix_spawnp_cwd_bug_3597.patch
 src_update_importmoduledynamically.patch
 fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
 json_parse_errors_made_user-friendly.patch
-build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
 support_v8_sandboxed_pointers.patch
 build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
diff --git a/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch b/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
deleted file mode 100644
index 1c47ff5336b9d..0000000000000
--- a/patches/node/build_define_libcpp_abi_namespace_as_cr_to_align_with_chromium.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@salesforce.com>
-Date: Mon, 6 Jun 2022 14:46:40 -0700
-Subject: build: define _LIBCPP_ABI_NAMESPACE as Cr to align with chromium
-
-Without this define native modules will be built trying to link to _LIBCPP_ABI_NAMESPACE which is the default name, chromium overrides this to Cr for PDB size reasons but they override it on all platforms.  Setting this define allows native modules to actually work. This should not be upstreamed as it is Electron specific.
-
-Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3655638
-
-diff --git a/common.gypi b/common.gypi
-index bdfe81d11cc50f492c93fe48f6946765b6fb5238..559b7f7c220cb98946285bb15d0d63e203bbcea4 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -288,6 +288,7 @@
-       'V8_DEPRECATION_WARNINGS',
-       'V8_IMMINENT_DEPRECATION_WARNINGS',
-       '_GLIBCXX_USE_CXX11_ABI=1',
-+      '_LIBCPP_ABI_NAMESPACE=Cr',
-     ],
- 
-     # Forcibly disable -Werror.  We support a wide range of compilers, it's
diff --git a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
index a38e4f9dec637..622e1cc6d2de3 100644
--- a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
+++ b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
@@ -8,7 +8,7 @@ Aligns common.gypi with the current build flag state of //v8.
 Specifically enables `V8_ENABLE_SANDBOX`, `V8_SANDBOXED_POINTERS`, `V8_COMPRESS_POINTERS` and `V8_COMPRESS_POINTERS_IN_SHARED_CAGE`.
 
 diff --git a/common.gypi b/common.gypi
-index 559b7f7c220cb98946285bb15d0d63e203bbcea4..ea87c9f56ef83e6b0edddb9a467a21eb4ea3907b 100644
+index bdfe81d11cc50f492c93fe48f6946765b6fb5238..ca08deeb19f5fe9ee399ad809b24579fdaa10036 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -65,6 +65,7 @@
@@ -27,7 +27,7 @@ index 559b7f7c220cb98946285bb15d0d63e203bbcea4..ea87c9f56ef83e6b0edddb9a467a21eb
        }],
        ['target_arch in "ppc64 s390x"', {
          'v8_enable_backtrace': 1,
-@@ -395,9 +397,15 @@
+@@ -394,9 +396,15 @@
        ['v8_enable_pointer_compression == 1', {
          'defines': [
            'V8_COMPRESS_POINTERS',
diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
index 8f14c6ef9bae7..04c8459a085f3 100644
--- a/script/nan-spec-runner.js
+++ b/script/nan-spec-runner.js
@@ -63,6 +63,7 @@ async function main () {
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++', 'trunk', 'include')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++abi', 'trunk', 'include')}"`,
     '-fPIC',
+    '-D_LIBCPP_ABI_NAMESPACE=Cr',
     ...platformFlags
   ].join(' ');
 

From c4cde78818fb7a67c0aa715927f40cab2d3817fa Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 06:01:46 -0700
Subject: [PATCH 593/811] Bump v21.0.0-nightly.20220718

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 8020e29170eff..8f5eda4c50301 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220715
\ No newline at end of file
+21.0.0-nightly.20220718
\ No newline at end of file
diff --git a/package.json b/package.json
index be7004caf984d..fe99e6c83a8da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220715",
+  "version": "21.0.0-nightly.20220718",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1227af1ae28a2..be04712a36d81 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220715
- PRODUCTVERSION 21,0,0,20220715
+ FILEVERSION 21,0,0,20220718
+ PRODUCTVERSION 21,0,0,20220718
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 8a0df1f487449e25ccc9a2bc13e7160fe82bc61d Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Tue, 19 Jul 2022 04:20:16 -0400
Subject: [PATCH 594/811] ci: wait longer for goma to be ready (#34956)

---
 .circleci/config/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index b1545fc175f1d..2f4d58e751e7f 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -346,7 +346,7 @@ step-wait-for-goma: &step-wait-for-goma
           sleep 5
       done
       echo "Goma ready"
-    no_output_timeout: 2m
+    no_output_timeout: 5m
 
 step-restore-brew-cache: &step-restore-brew-cache
   restore_cache:

From 57b02e153de798edb2fc415e19792e64f191a349 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 19 Jul 2022 11:45:10 +0200
Subject: [PATCH 595/811] fix: potential hang on print settings failure
 (#34892)

---
 patches/chromium/printing.patch | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index 460fb3b6d5bc5..a602cca1f0089 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -78,7 +78,7 @@ index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dc
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index d9ae000f1348529ab849349d7562dbb04fe9fd16..cf66978761f5dda2f8958234d62c3cf11ae4cf9c 100644
+index d9ae000f1348529ab849349d7562dbb04fe9fd16..fcfeffd86bd897467b12bf1aba4aaac09986cfd9 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -97,7 +97,7 @@ index d9ae000f1348529ab849349d7562dbb04fe9fd16..cf66978761f5dda2f8958234d62c3cf1
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -222,16 +222,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
+@@ -222,16 +222,19 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -111,12 +111,10 @@ index d9ae000f1348529ab849349d7562dbb04fe9fd16..cf66978761f5dda2f8958234d62c3cf1
 -    result = printing_context_->UpdatePrintSettings(std::move(new_settings));
 +    // Reset settings from previous print job
 +    printing_context_->ResetSettings();
-+    mojom::ResultCode get_default_result = printing_context_->UseDefaultSettings();
-+    if (get_default_result == mojom::ResultCode::kSuccess) {
-+      mojom::ResultCode update_result =
-+              printing_context_->UpdatePrintSettings(std::move(new_settings));
-+      GetSettingsDone(std::move(callback), update_result);
-+    }
++    mojom::ResultCode result_code = printing_context_->UseDefaultSettings();
++    if (result_code == mojom::ResultCode::kSuccess)
++      result_code = printing_context_->UpdatePrintSettings(std::move(new_settings));
++    GetSettingsDone(std::move(callback), result_code);
    }
 -  GetSettingsDone(std::move(callback), result);
  }

From 38848c5bf77b2fa62b3dddecfe1aecba8d4ae48f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 19 Jul 2022 12:14:21 +0200
Subject: [PATCH 596/811] test: optionally validate disabled Node.js specs
 (#34899)

---
 script/node-disabled-tests.json |  6 ++----
 script/node-spec-runner.js      | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/script/node-disabled-tests.json b/script/node-disabled-tests.json
index 8870c8fe8492e..1cec1b9e230f1 100644
--- a/script/node-disabled-tests.json
+++ b/script/node-disabled-tests.json
@@ -13,7 +13,6 @@
   "parallel/test-crypto-des3-wrap",
   "parallel/test-crypto-dh-stateless",
   "parallel/test-crypto-ecb",
-  "parallel/test-crypto-engine",
   "parallel/test-crypto-fips",
   "parallel/test-crypto-keygen",
   "parallel/test-crypto-keygen-deprecation",
@@ -21,7 +20,7 @@
   "parallel/test-crypto-padding-aes256",
   "parallel/test-crypto-secure-heap",
   "parallel/test-fs-utimes-y2K38",
-  "parallel/test-heapsnapshot-near-heap-limit-worker.js",
+  "parallel/test-heapsnapshot-near-heap-limit-worker",
   "parallel/test-http2-clean-output",
   "parallel/test-https-agent-session-reuse",
   "parallel/test-https-options-boolean-check",
@@ -96,7 +95,6 @@
   "parallel/test-trace-events-fs-sync",
   "parallel/test-trace-events-metadata",
   "parallel/test-trace-events-none",
-  "parallel/test-trace-events-perf",
   "parallel/test-trace-events-process-exit",
   "parallel/test-trace-events-promises",
   "parallel/test-trace-events-v8",
@@ -125,7 +123,7 @@
   "report/test-report-writereport",
   "sequential/test-cpu-prof-kill",
   "sequential/test-diagnostic-dir-cpu-prof",
-  "sequential/test-cpu-prof-drained.js",
+  "sequential/test-cpu-prof-drained",
   "sequential/test-tls-connect",
   "wpt/test-webcrypto"
 ]
diff --git a/script/node-spec-runner.js b/script/node-spec-runner.js
index 3454843c86540..570a4d00dfe3e 100644
--- a/script/node-spec-runner.js
+++ b/script/node-spec-runner.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 
 const args = require('minimist')(process.argv.slice(2), {
-  boolean: ['default'],
+  boolean: ['default', 'validateDisabled'],
   string: ['jUnitDir']
 });
 
@@ -43,8 +43,7 @@ const getCustomOptions = () => {
     customOptions = customOptions.concat(extra);
   }
 
-  // We need this unilaterally or Node.js will try
-  // to run from out/Release/node.
+  // Necessary or Node.js will try to run from out/Release/node.
   customOptions = customOptions.concat([
     '--shell',
     utils.getAbsoluteElectronExec()
@@ -54,6 +53,22 @@ const getCustomOptions = () => {
 };
 
 async function main () {
+  // Optionally validate that all disabled specs still exist.
+  if (args.validateDisabled) {
+    const missing = [];
+    for (const test of DISABLED_TESTS) {
+      const testName = test.endsWith('.js') ? test : `${test}.js`;
+      if (!fs.existsSync(path.join(NODE_DIR, 'test', testName))) {
+        missing.push(test);
+      }
+    }
+
+    if (missing.length > 0) {
+      console.error(`Found ${missing.length} missing disabled specs: \n${missing.join('\n')}`);
+      process.exit(1);
+    }
+  }
+
   const options = args.default ? defaultOptions : getCustomOptions();
 
   const testChild = cp.spawn('python3', options, {

From eb8c9452cb38b6bd32bdc92724cc1fb42a3d43dc Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 19 Jul 2022 12:31:49 +0200
Subject: [PATCH 597/811] fix: crash on `BrowserWindow.setEnabled()` (#34904)

fix: crash on BrowserWindow.setEnabled()
---
 shell/browser/native_window_mac.mm   | 19 +++++++++++++++----
 spec-main/api-browser-window-spec.ts |  8 ++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index 721ed09c47e92..f535844af4712 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -484,7 +484,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   // [window_ performClose:nil], the window won't close properly
   // even after the user has ended the sheet.
   // Ensure it's closed before calling [window_ performClose:nil].
-  SetEnabled(true);
+  if ([window_ attachedSheet])
+    [window_ endSheet:[window_ attachedSheet]];
 
   [window_ performClose:nil];
 
@@ -554,7 +555,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   // If a sheet is attached to the window when we call [window_ orderOut:nil],
   // the sheet won't be able to show again on the same window.
   // Ensure it's closed before calling [window_ orderOut:nil].
-  SetEnabled(true);
+  if ([window_ attachedSheet])
+    [window_ endSheet:[window_ attachedSheet]];
 
   if (is_modal() && parent()) {
     [window_ orderOut:nil];
@@ -593,9 +595,18 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
 void NativeWindowMac::SetEnabled(bool enable) {
   if (!enable) {
-    [window_ beginSheet:window_
+    NSRect frame = [window_ frame];
+    NSWindow* window =
+        [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, frame.size.width,
+                                                         frame.size.height)
+                                    styleMask:NSWindowStyleMaskTitled
+                                      backing:NSBackingStoreBuffered
+                                        defer:NO];
+    [window setAlphaValue:0.5];
+
+    [window_ beginSheet:window
         completionHandler:^(NSModalResponse returnCode) {
-          NSLog(@"modal enabled");
+          NSLog(@"main window disabled");
           return;
         }];
   } else if ([window_ attachedSheet]) {
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 0c003416aa2ee..993c6ed2c3800 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4331,6 +4331,14 @@ describe('BrowserWindow module', () => {
         await createTwo();
       });
 
+      ifit(process.platform !== 'darwin')('can disable and enable a window', () => {
+        const w = new BrowserWindow({ show: false });
+        w.setEnabled(false);
+        expect(w.isEnabled()).to.be.false('w.isEnabled()');
+        w.setEnabled(true);
+        expect(w.isEnabled()).to.be.true('!w.isEnabled()');
+      });
+
       ifit(process.platform !== 'darwin')('disables parent window', () => {
         const w = new BrowserWindow({ show: false });
         const c = new BrowserWindow({ show: false, parent: w, modal: true });

From 05d4966251580cd4ae95479ccbbfdd5e8a70702f Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 19 Jul 2022 14:46:08 +0200
Subject: [PATCH 598/811] fix: delegate to `PrintViewManagerBase` on failed
 print (#34893)

fix: delegate to PrintViewManagerBase on failed print
---
 shell/browser/printing/print_view_manager_electron.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/shell/browser/printing/print_view_manager_electron.cc b/shell/browser/printing/print_view_manager_electron.cc
index 866f439f5aec4..369b97fbd049e 100644
--- a/shell/browser/printing/print_view_manager_electron.cc
+++ b/shell/browser/printing/print_view_manager_electron.cc
@@ -163,12 +163,23 @@ void PrintViewManagerElectron::ScriptedPrint(
 }
 
 void PrintViewManagerElectron::ShowInvalidPrinterSettingsError() {
+  if (headless_jobs_.size() == 0) {
+    PrintViewManagerBase::ShowInvalidPrinterSettingsError();
+    return;
+  }
+
   ReleaseJob(INVALID_PRINTER_SETTINGS);
 }
 
 void PrintViewManagerElectron::PrintingFailed(
     int32_t cookie,
     printing::mojom::PrintFailureReason reason) {
+  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(), cookie);
+  if (entry == headless_jobs_.end()) {
+    PrintViewManagerBase::PrintingFailed(cookie, reason);
+    return;
+  }
+
   ReleaseJob(reason == printing::mojom::PrintFailureReason::kInvalidPageRange
                  ? PAGE_COUNT_EXCEEDED
                  : PRINTING_FAILED);

From ba25714e16386c1bdc517066ba67eb965120c709 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 06:01:27 -0700
Subject: [PATCH 599/811] Bump v21.0.0-nightly.20220719

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 8f5eda4c50301..06abe267f1c14 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220718
\ No newline at end of file
+21.0.0-nightly.20220719
\ No newline at end of file
diff --git a/package.json b/package.json
index fe99e6c83a8da..b429ed901b9e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220718",
+  "version": "21.0.0-nightly.20220719",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index be04712a36d81..11e3b14c478a7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220718
- PRODUCTVERSION 21,0,0,20220718
+ FILEVERSION 21,0,0,20220719
+ PRODUCTVERSION 21,0,0,20220719
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 60b6e74e3fda131add79009ccae2e48e6a460620 Mon Sep 17 00:00:00 2001
From: Alexander Petrov <zowers+github@zowers.net>
Date: Tue, 19 Jul 2022 18:18:04 +0200
Subject: [PATCH 600/811] fix: merge crash annotations instead of overwriting
 (#34795)

ElectronCrashReporterClient::GetProcessSimpleAnnotations() merges
annotations provided as argument with global_annotations_,
preserving useful information.
---
 shell/app/electron_crash_reporter_client.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell/app/electron_crash_reporter_client.cc b/shell/app/electron_crash_reporter_client.cc
index 245c55c90a13a..237c90c16f33a 100644
--- a/shell/app/electron_crash_reporter_client.cc
+++ b/shell/app/electron_crash_reporter_client.cc
@@ -190,7 +190,9 @@ bool ElectronCrashReporterClient::GetShouldCompressUploads() {
 
 void ElectronCrashReporterClient::GetProcessSimpleAnnotations(
     std::map<std::string, std::string>* annotations) {
-  *annotations = global_annotations_;
+  for (auto&& pair : global_annotations_) {
+    (*annotations)[pair.first] = pair.second;
+  }
   (*annotations)["prod"] = ELECTRON_PRODUCT_NAME;
   (*annotations)["ver"] = ELECTRON_VERSION_STRING;
 }

From 3c7d446fad5da5ea15e0795cbe1870a242efd1f4 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 20 Jul 2022 01:09:14 -0700
Subject: [PATCH 601/811] refactor: unduplicate MediaStreamDevicesController
 (#34895)

* refactor: unduplicate MediaStreamDevicesController

* restore old logic for GUM_* request types

* lint

* gn format

* add test for unsupported getDisplayMedia

* simplify + comment
---
 BUILD.gn                                      |   1 +
 filenames.gni                                 |   2 -
 patches/chromium/.patches                     |   1 +
 ...ecks_in_mediastreamdevicescontroller.patch |  88 +++++++
 .../media/media_capture_devices_dispatcher.cc |  95 -------
 .../media/media_capture_devices_dispatcher.h  |  45 +---
 .../media/media_stream_devices_controller.cc  | 234 ------------------
 .../media/media_stream_devices_controller.h   |  49 ----
 .../browser/web_contents_permission_helper.cc | 100 +++++++-
 spec-main/chromium-spec.ts                    |   8 +
 10 files changed, 196 insertions(+), 427 deletions(-)
 create mode 100644 patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 delete mode 100644 shell/browser/media/media_stream_devices_controller.cc
 delete mode 100644 shell/browser/media/media_stream_devices_controller.h

diff --git a/BUILD.gn b/BUILD.gn
index b33a93c72a054..407bdedffccaf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -390,6 +390,7 @@ source_set("electron_lib") {
     "//components/user_prefs",
     "//components/viz/host",
     "//components/viz/service",
+    "//components/webrtc",
     "//content/public/browser",
     "//content/public/child",
     "//content/public/gpu",
diff --git a/filenames.gni b/filenames.gni
index 5b9d3cc721dbb..df58773b49c74 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -415,8 +415,6 @@ filenames = {
     "shell/browser/media/media_capture_devices_dispatcher.h",
     "shell/browser/media/media_device_id_salt.cc",
     "shell/browser/media/media_device_id_salt.h",
-    "shell/browser/media/media_stream_devices_controller.cc",
-    "shell/browser/media/media_stream_devices_controller.h",
     "shell/browser/microtasks_runner.cc",
     "shell/browser/microtasks_runner.h",
     "shell/browser/native_browser_view.cc",
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 1d5849b4368a6..0e6fdb164db03 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -112,3 +112,4 @@ custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
 fix_allow_guest_webcontents_to_enter_fullscreen.patch
 disable_freezing_flags_after_init_in_node.patch
+short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
diff --git a/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
new file mode 100644
index 0000000000000..82c2e5920e0f2
--- /dev/null
+++ b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
@@ -0,0 +1,88 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Rose <japthorp@slack-corp.com>
+Date: Tue, 12 Jul 2022 16:51:43 -0700
+Subject: short-circuit permissions checks in MediaStreamDevicesController
+
+The //components/permissions architecture is complicated and not that
+widely used in Chromium, and mostly oriented around showing permissions
+UI and/or remembering per-site permissions, which we're not interested
+in.
+
+Since we do a permissions check prior to invoking the
+MediaStreamDevicesController, and don't (yet) provide the ability to set
+granular permissions (e.g. allow video but not audio), just
+short-circuit all the permissions checks in MSDC for now to allow us to
+unduplicate this code.
+
+diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
+index 353ed84da62b954a90c8d0a886495c0822f30429..1a1162ba960419a4de5eb2839ebc3debadca86d5 100644
+--- a/components/webrtc/media_stream_devices_controller.cc
++++ b/components/webrtc/media_stream_devices_controller.cc
+@@ -93,11 +93,14 @@ void MediaStreamDevicesController::RequestPermissions(
+ 
+   std::vector<blink::PermissionType> permission_types;
+ 
++#if 0
+   permissions::PermissionManager* permission_manager =
+       permissions::PermissionsClient::Get()->GetPermissionManager(
+           web_contents->GetBrowserContext());
++#endif
+ 
+   if (controller->ShouldRequestAudio()) {
++#if 0
+     permissions::PermissionResult permission_status =
+         permission_manager->GetPermissionStatusForCurrentDocument(
+             ContentSettingsType::MEDIASTREAM_MIC, rfh);
+@@ -109,10 +112,12 @@ void MediaStreamDevicesController::RequestPermissions(
+           permissions::PermissionStatusSource::FEATURE_POLICY);
+       return;
+     }
++#endif
+ 
+     permission_types.push_back(blink::PermissionType::AUDIO_CAPTURE);
+   }
+   if (controller->ShouldRequestVideo()) {
++#if 0
+     permissions::PermissionResult permission_status =
+         permission_manager->GetPermissionStatusForCurrentDocument(
+             ContentSettingsType::MEDIASTREAM_CAMERA, rfh);
+@@ -124,6 +129,7 @@ void MediaStreamDevicesController::RequestPermissions(
+           permissions::PermissionStatusSource::FEATURE_POLICY);
+       return;
+     }
++#endif
+ 
+     permission_types.push_back(blink::PermissionType::VIDEO_CAPTURE);
+ 
+@@ -135,6 +141,7 @@ void MediaStreamDevicesController::RequestPermissions(
+     // pan-tilt-zoom permission and there are suitable PTZ capable devices
+     // available.
+     if (request.request_pan_tilt_zoom_permission && has_pan_tilt_zoom_camera) {
++#if 0
+       permission_status =
+           permission_manager->GetPermissionStatusForCurrentDocument(
+               ContentSettingsType::CAMERA_PAN_TILT_ZOOM, rfh);
+@@ -144,6 +151,7 @@ void MediaStreamDevicesController::RequestPermissions(
+         controller->RunCallback(/*blocked_by_permissions_policy=*/false);
+         return;
+       }
++#endif
+ 
+       permission_types.push_back(blink::PermissionType::CAMERA_PAN_TILT_ZOOM);
+     }
+@@ -425,6 +433,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+   if (rfh->GetLastCommittedOrigin().GetURL() != request_.security_origin) {
+     return false;
+   }
++#if 0
+   permissions::PermissionResult result =
+       permissions::PermissionsClient::Get()
+           ->GetPermissionManager(web_contents_->GetBrowserContext())
+@@ -433,6 +442,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+     DCHECK_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+     return true;
+   }
++#endif
+   return false;
+ }
+ 
diff --git a/shell/browser/media/media_capture_devices_dispatcher.cc b/shell/browser/media/media_capture_devices_dispatcher.cc
index 33ad8ebe0d6b1..3ebafc583510a 100644
--- a/shell/browser/media/media_capture_devices_dispatcher.cc
+++ b/shell/browser/media/media_capture_devices_dispatcher.cc
@@ -12,23 +12,6 @@ using content::BrowserThread;
 
 namespace electron {
 
-namespace {
-
-// Finds a device in |devices| that has |device_id|, or NULL if not found.
-const blink::MediaStreamDevice* FindDeviceWithId(
-    const blink::MediaStreamDevices& devices,
-    const std::string& device_id) {
-  auto iter = devices.begin();
-  for (; iter != devices.end(); ++iter) {
-    if (iter->id == device_id) {
-      return &(*iter);
-    }
-  }
-  return nullptr;
-}
-
-}  // namespace
-
 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
   return base::Singleton<MediaCaptureDevicesDispatcher>::get();
 }
@@ -41,84 +24,6 @@ MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher() {
 
 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() = default;
 
-const blink::MediaStreamDevices&
-MediaCaptureDevicesDispatcher::GetAudioCaptureDevices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (is_device_enumeration_disabled_)
-    return test_audio_devices_;
-  return content::MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices();
-}
-
-const blink::MediaStreamDevices&
-MediaCaptureDevicesDispatcher::GetVideoCaptureDevices() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (is_device_enumeration_disabled_)
-    return test_video_devices_;
-  return content::MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
-}
-
-void MediaCaptureDevicesDispatcher::GetDefaultDevices(
-    bool audio,
-    bool video,
-    blink::mojom::StreamDevices& devices) {  // NOLINT(runtime/references)
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(audio || video);
-
-  if (audio) {
-    const blink::MediaStreamDevice* device = GetFirstAvailableAudioDevice();
-    if (device)
-      devices.audio_device = *device;
-  }
-
-  if (video) {
-    const blink::MediaStreamDevice* device = GetFirstAvailableVideoDevice();
-    if (device)
-      devices.video_device = *device;
-  }
-}
-
-const blink::MediaStreamDevice*
-MediaCaptureDevicesDispatcher::GetRequestedAudioDevice(
-    const std::string& requested_audio_device_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const blink::MediaStreamDevices& audio_devices = GetAudioCaptureDevices();
-  const blink::MediaStreamDevice* const device =
-      FindDeviceWithId(audio_devices, requested_audio_device_id);
-  return device;
-}
-
-const blink::MediaStreamDevice*
-MediaCaptureDevicesDispatcher::GetFirstAvailableAudioDevice() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const blink::MediaStreamDevices& audio_devices = GetAudioCaptureDevices();
-  if (audio_devices.empty())
-    return nullptr;
-  return &(*audio_devices.begin());
-}
-
-const blink::MediaStreamDevice*
-MediaCaptureDevicesDispatcher::GetRequestedVideoDevice(
-    const std::string& requested_video_device_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const blink::MediaStreamDevices& video_devices = GetVideoCaptureDevices();
-  const blink::MediaStreamDevice* const device =
-      FindDeviceWithId(video_devices, requested_video_device_id);
-  return device;
-}
-
-const blink::MediaStreamDevice*
-MediaCaptureDevicesDispatcher::GetFirstAvailableVideoDevice() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  const blink::MediaStreamDevices& video_devices = GetVideoCaptureDevices();
-  if (video_devices.empty())
-    return nullptr;
-  return &(*video_devices.begin());
-}
-
-void MediaCaptureDevicesDispatcher::DisableDeviceEnumerationForTesting() {
-  is_device_enumeration_disabled_ = true;
-}
-
 void MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged() {}
 
 void MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged() {}
diff --git a/shell/browser/media/media_capture_devices_dispatcher.h b/shell/browser/media/media_capture_devices_dispatcher.h
index 6b9dd746c633e..cb513230aa5d8 100644
--- a/shell/browser/media/media_capture_devices_dispatcher.h
+++ b/shell/browser/media/media_capture_devices_dispatcher.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/memory/singleton.h"
+#include "components/webrtc/media_stream_device_enumerator_impl.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/media_stream_request.h"
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
@@ -17,41 +18,12 @@ namespace electron {
 
 // This singleton is used to receive updates about media events from the content
 // layer.
-class MediaCaptureDevicesDispatcher : public content::MediaObserver {
+class MediaCaptureDevicesDispatcher
+    : public content::MediaObserver,
+      public webrtc::MediaStreamDeviceEnumeratorImpl {
  public:
   static MediaCaptureDevicesDispatcher* GetInstance();
 
-  // Methods for observers. Called on UI thread.
-  const blink::MediaStreamDevices& GetAudioCaptureDevices();
-  const blink::MediaStreamDevices& GetVideoCaptureDevices();
-
-  // Helper to get the default devices which can be used by the media request.
-  // Uses the first available devices if the default devices are not available.
-  // If the return list is empty, it means there is no available device on the
-  // OS.
-  // Called on the UI thread.
-  void GetDefaultDevices(
-      bool audio,
-      bool video,
-      blink::mojom::StreamDevices& devices);  // NOLINT(runtime/references)
-
-  // Helpers for picking particular requested devices, identified by raw id.
-  // If the device requested is not available it will return NULL.
-  const blink::MediaStreamDevice* GetRequestedAudioDevice(
-      const std::string& requested_audio_device_id);
-  const blink::MediaStreamDevice* GetRequestedVideoDevice(
-      const std::string& requested_video_device_id);
-
-  // Returns the first available audio or video device, or NULL if no devices
-  // are available.
-  const blink::MediaStreamDevice* GetFirstAvailableAudioDevice();
-  const blink::MediaStreamDevice* GetFirstAvailableVideoDevice();
-
-  // Unittests that do not require actual device enumeration should call this
-  // API on the singleton. It is safe to call this multiple times on the
-  // singleton.
-  void DisableDeviceEnumerationForTesting();
-
   // Overridden from content::MediaObserver:
   void OnAudioCaptureDevicesChanged() override;
   void OnVideoCaptureDevicesChanged() override;
@@ -79,15 +51,6 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
 
   MediaCaptureDevicesDispatcher();
   ~MediaCaptureDevicesDispatcher() override;
-
-  // Only for testing, a list of cached audio capture devices.
-  blink::MediaStreamDevices test_audio_devices_;
-
-  // Only for testing, a list of cached video capture devices.
-  blink::MediaStreamDevices test_video_devices_;
-
-  // Flag used by unittests to disable device enumeration.
-  bool is_device_enumeration_disabled_ = false;
 };
 
 }  // namespace electron
diff --git a/shell/browser/media/media_stream_devices_controller.cc b/shell/browser/media/media_stream_devices_controller.cc
deleted file mode 100644
index c7594bfdd0bc9..0000000000000
--- a/shell/browser/media/media_stream_devices_controller.cc
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE-CHROMIUM file.
-
-#include "shell/browser/media/media_stream_devices_controller.h"
-
-#include <memory>
-#include <utility>
-
-#include "content/public/browser/desktop_media_id.h"
-#include "content/public/browser/media_stream_request.h"
-#include "shell/browser/media/media_capture_devices_dispatcher.h"
-
-namespace electron {
-
-namespace {
-
-bool HasAnyAvailableDevice() {
-  const blink::MediaStreamDevices& audio_devices =
-      MediaCaptureDevicesDispatcher::GetInstance()->GetAudioCaptureDevices();
-  const blink::MediaStreamDevices& video_devices =
-      MediaCaptureDevicesDispatcher::GetInstance()->GetVideoCaptureDevices();
-
-  return !audio_devices.empty() || !video_devices.empty();
-}
-
-}  // namespace
-
-MediaStreamDevicesController::MediaStreamDevicesController(
-    const content::MediaStreamRequest& request,
-    content::MediaResponseCallback callback)
-    : request_(request),
-      callback_(std::move(callback)),
-      // For MEDIA_OPEN_DEVICE requests (Pepper) we always request both webcam
-      // and microphone to avoid popping two infobars.
-      microphone_requested_(
-          request.audio_type ==
-              blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE ||
-          request.request_type == blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
-      webcam_requested_(
-          request.video_type ==
-              blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE ||
-          request.request_type == blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY) {}
-
-MediaStreamDevicesController::~MediaStreamDevicesController() {
-  if (!callback_.is_null()) {
-    std::move(callback_).Run(
-        blink::mojom::StreamDevicesSet(),
-        blink::mojom::MediaStreamRequestResult::FAILED_DUE_TO_SHUTDOWN,
-        std::unique_ptr<content::MediaStreamUI>());
-  }
-}
-
-bool MediaStreamDevicesController::TakeAction() {
-  // Do special handling of desktop screen cast.
-  if (request_.audio_type ==
-          blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE ||
-      request_.video_type ==
-          blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE ||
-      request_.audio_type ==
-          blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE ||
-      request_.video_type ==
-          blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
-    HandleUserMediaRequest();
-    return true;
-  }
-
-  // Deny the request if there is no device attached to the OS.
-  if (!HasAnyAvailableDevice()) {
-    Deny(blink::mojom::MediaStreamRequestResult::NO_HARDWARE);
-    return true;
-  }
-
-  Accept();
-  return true;
-}
-
-void MediaStreamDevicesController::Accept() {
-  // Get the default devices for the request.
-  blink::mojom::StreamDevicesSetPtr stream_devices_set =
-      blink::mojom::StreamDevicesSet::New();
-  stream_devices_set->stream_devices.emplace_back(
-      blink::mojom::StreamDevices::New());
-  blink::mojom::StreamDevices& stream_devices =
-      *stream_devices_set->stream_devices[0];
-
-  if (microphone_requested_ || webcam_requested_) {
-    switch (request_.request_type) {
-      case blink::MEDIA_OPEN_DEVICE_PEPPER_ONLY: {
-        const blink::MediaStreamDevice* device = nullptr;
-        // For open device request pick the desired device or fall back to the
-        // first available of the given type.
-        if (request_.audio_type ==
-            blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
-          device =
-              MediaCaptureDevicesDispatcher::GetInstance()
-                  ->GetRequestedAudioDevice(request_.requested_audio_device_id);
-          // TODO(wjia): Confirm this is the intended behavior.
-          if (!device) {
-            device = MediaCaptureDevicesDispatcher::GetInstance()
-                         ->GetFirstAvailableAudioDevice();
-          }
-          if (device)
-            stream_devices.audio_device = *device;
-        } else if (request_.video_type ==
-                   blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
-          // Pepper API opens only one device at a time.
-          device =
-              MediaCaptureDevicesDispatcher::GetInstance()
-                  ->GetRequestedVideoDevice(request_.requested_video_device_id);
-          // TODO(wjia): Confirm this is the intended behavior.
-          if (!device) {
-            device = MediaCaptureDevicesDispatcher::GetInstance()
-                         ->GetFirstAvailableVideoDevice();
-          }
-          if (device)
-            stream_devices.video_device = *device;
-        }
-        break;
-      }
-      case blink::MEDIA_GENERATE_STREAM: {
-        bool needs_audio_device = microphone_requested_;
-        bool needs_video_device = webcam_requested_;
-
-        // Get the exact audio or video device if an id is specified.
-        if (!request_.requested_audio_device_id.empty()) {
-          const blink::MediaStreamDevice* audio_device =
-              MediaCaptureDevicesDispatcher::GetInstance()
-                  ->GetRequestedAudioDevice(request_.requested_audio_device_id);
-          if (audio_device) {
-            stream_devices.audio_device = *audio_device;
-            needs_audio_device = false;
-          }
-        }
-        if (!request_.requested_video_device_id.empty()) {
-          const blink::MediaStreamDevice* video_device =
-              MediaCaptureDevicesDispatcher::GetInstance()
-                  ->GetRequestedVideoDevice(request_.requested_video_device_id);
-          if (video_device) {
-            stream_devices.video_device = *video_device;
-            needs_video_device = false;
-          }
-        }
-
-        // If either or both audio and video devices were requested but not
-        // specified by id, get the default devices.
-        if (needs_audio_device || needs_video_device) {
-          MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
-              needs_audio_device, needs_video_device, stream_devices);
-        }
-        break;
-      }
-      case blink::MEDIA_DEVICE_ACCESS: {
-        // Get the default devices for the request.
-        MediaCaptureDevicesDispatcher::GetInstance()->GetDefaultDevices(
-            microphone_requested_, webcam_requested_, stream_devices);
-        break;
-      }
-      case blink::MEDIA_DEVICE_UPDATE: {
-        NOTREACHED();
-        break;
-      }
-      case blink::MEDIA_GET_OPEN_DEVICE: {
-        // Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do
-        // not need to get permissions for blink::mojom::StreamDevices as those
-        // are controlled by the original context.
-        NOTREACHED();
-        break;
-      }
-    }
-  }
-
-  std::move(callback_).Run(*stream_devices_set,
-                           blink::mojom::MediaStreamRequestResult::OK,
-                           std::unique_ptr<content::MediaStreamUI>());
-}
-
-void MediaStreamDevicesController::Deny(
-    blink::mojom::MediaStreamRequestResult result) {
-  std::move(callback_).Run(blink::mojom::StreamDevicesSet(), result,
-                           std::unique_ptr<content::MediaStreamUI>());
-}
-
-void MediaStreamDevicesController::HandleUserMediaRequest() {
-  blink::mojom::StreamDevicesSetPtr stream_devices_set =
-      blink::mojom::StreamDevicesSet::New();
-  stream_devices_set->stream_devices.emplace_back(
-      blink::mojom::StreamDevices::New());
-  blink::mojom::StreamDevices& devices = *stream_devices_set->stream_devices[0];
-
-  if (request_.audio_type ==
-      blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
-    devices.audio_device = blink::MediaStreamDevice(
-        blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE, "", "");
-  }
-  if (request_.video_type ==
-      blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
-    devices.video_device = blink::MediaStreamDevice(
-        blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE, "", "");
-  }
-  if (request_.audio_type ==
-      blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE) {
-    devices.audio_device = blink::MediaStreamDevice(
-        blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE, "loopback",
-        "System Audio");
-  }
-  if (request_.video_type ==
-      blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
-    content::DesktopMediaID screen_id;
-    // If the device id wasn't specified then this is a screen capture request
-    // (i.e. chooseDesktopMedia() API wasn't used to generate device id).
-    if (request_.requested_video_device_id.empty()) {
-      screen_id = content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
-                                          -1 /* kFullDesktopScreenId */);
-    } else {
-      screen_id =
-          content::DesktopMediaID::Parse(request_.requested_video_device_id);
-    }
-
-    devices.video_device = blink::MediaStreamDevice(
-        blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE,
-        screen_id.ToString(), "Screen");
-  }
-
-  bool empty =
-      !devices.audio_device.has_value() && !devices.video_device.has_value();
-  std::move(callback_).Run(
-      *stream_devices_set,
-      empty ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
-            : blink::mojom::MediaStreamRequestResult::OK,
-      std::unique_ptr<content::MediaStreamUI>());
-}
-
-}  // namespace electron
diff --git a/shell/browser/media/media_stream_devices_controller.h b/shell/browser/media/media_stream_devices_controller.h
deleted file mode 100644
index 780d38e7cb4eb..0000000000000
--- a/shell/browser/media/media_stream_devices_controller.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE-CHROMIUM file.
-
-#ifndef ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
-#define ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
-
-#include "content/public/browser/web_contents_delegate.h"
-#include "third_party/blink/public/common/mediastream/media_stream_request.h"
-
-namespace electron {
-
-class MediaStreamDevicesController {
- public:
-  MediaStreamDevicesController(const content::MediaStreamRequest& request,
-                               content::MediaResponseCallback callback);
-
-  virtual ~MediaStreamDevicesController();
-
-  // disable copy
-  MediaStreamDevicesController(const MediaStreamDevicesController&) = delete;
-  MediaStreamDevicesController& operator=(const MediaStreamDevicesController&) =
-      delete;
-
-  // Accept or deny the request based on the default policy.
-  bool TakeAction();
-
-  // Explicitly accept or deny the request.
-  void Accept();
-  void Deny(blink::mojom::MediaStreamRequestResult result);
-
- private:
-  // Handle the request of desktop or tab screen cast.
-  void HandleUserMediaRequest();
-
-  // The original request for access to devices.
-  const content::MediaStreamRequest request_;
-
-  // The callback that needs to be Run to notify WebRTC of whether access to
-  // audio/video devices was granted or not.
-  content::MediaResponseCallback callback_;
-
-  bool microphone_requested_;
-  bool webcam_requested_;
-};
-
-}  // namespace electron
-
-#endif  // ELECTRON_SHELL_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 1d9ab4683859b..49dcfc1a1c6cd 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -12,7 +12,10 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "shell/browser/electron_permission_manager.h"
-#include "shell/browser/media/media_stream_devices_controller.h"
+// #include "shell/browser/media/media_stream_devices_controller.h"
+#include "components/content_settings/core/common/content_settings.h"
+#include "components/webrtc/media_stream_devices_controller.h"
+#include "shell/browser/media/media_capture_devices_dispatcher.h"
 
 namespace {
 
@@ -33,14 +36,99 @@ namespace electron {
 
 namespace {
 
+// Handles requests for legacy-style `navigator.getUserMedia(...)` calls.
+// This includes desktop capture through the chromeMediaSource /
+// chromeMediaSourceId constraints.
+void HandleUserMediaRequest(const content::MediaStreamRequest& request,
+                            content::MediaResponseCallback callback) {
+  blink::mojom::StreamDevicesSetPtr stream_devices_set =
+      blink::mojom::StreamDevicesSet::New();
+  stream_devices_set->stream_devices.emplace_back(
+      blink::mojom::StreamDevices::New());
+  blink::mojom::StreamDevices& devices = *stream_devices_set->stream_devices[0];
+
+  if (request.audio_type ==
+      blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
+    devices.audio_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE, "", "");
+  }
+  if (request.video_type ==
+      blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
+    devices.video_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE, "", "");
+  }
+  if (request.audio_type ==
+      blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE) {
+    devices.audio_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE, "loopback",
+        "System Audio");
+  }
+  if (request.video_type ==
+      blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
+    content::DesktopMediaID screen_id;
+    // If the device id wasn't specified then this is a screen capture request
+    // (i.e. chooseDesktopMedia() API wasn't used to generate device id).
+    if (request.requested_video_device_id.empty()) {
+      screen_id = content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
+                                          -1 /* kFullDesktopScreenId */);
+    } else {
+      screen_id =
+          content::DesktopMediaID::Parse(request.requested_video_device_id);
+    }
+
+    devices.video_device = blink::MediaStreamDevice(
+        blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE,
+        screen_id.ToString(), "Screen");
+  }
+
+  bool empty =
+      !devices.audio_device.has_value() && !devices.video_device.has_value();
+  std::move(callback).Run(
+      *stream_devices_set,
+      empty ? blink::mojom::MediaStreamRequestResult::NO_HARDWARE
+            : blink::mojom::MediaStreamRequestResult::OK,
+      nullptr);
+}
+
+void OnMediaStreamRequestResponse(
+    content::MediaResponseCallback callback,
+    const blink::mojom::StreamDevicesSet& stream_devices_set,
+    blink::mojom::MediaStreamRequestResult result,
+    bool blocked_by_permissions_policy,
+    ContentSetting audio_setting,
+    ContentSetting video_setting) {
+  std::move(callback).Run(stream_devices_set, result, nullptr);
+}
+
 void MediaAccessAllowed(const content::MediaStreamRequest& request,
                         content::MediaResponseCallback callback,
                         bool allowed) {
-  MediaStreamDevicesController controller(request, std::move(callback));
-  if (allowed)
-    controller.TakeAction();
-  else
-    controller.Deny(blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED);
+  if (allowed) {
+    if (request.video_type ==
+            blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE ||
+        request.audio_type ==
+            blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE ||
+        request.video_type ==
+            blink::mojom::MediaStreamType::GUM_TAB_VIDEO_CAPTURE ||
+        request.audio_type ==
+            blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE)
+      HandleUserMediaRequest(request, std::move(callback));
+    else if (request.video_type ==
+                 blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE ||
+             request.audio_type ==
+                 blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE)
+      webrtc::MediaStreamDevicesController::RequestPermissions(
+          request, MediaCaptureDevicesDispatcher::GetInstance(),
+          base::BindOnce(&OnMediaStreamRequestResponse, std::move(callback)));
+    else
+      std::move(callback).Run(
+          blink::mojom::StreamDevicesSet(),
+          blink::mojom::MediaStreamRequestResult::NOT_SUPPORTED, nullptr);
+  } else {
+    std::move(callback).Run(
+        blink::mojom::StreamDevicesSet(),
+        blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED, nullptr);
+  }
 }
 
 void OnPermissionResponse(base::OnceCallback<void(bool)> callback,
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 26d0afbca2bb9..cac88b927f1ad 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1037,6 +1037,14 @@ describe('chromium features', () => {
         }).then((stream) => stream.getVideoTracks())`);
       expect(labels.some((l: any) => l)).to.be.true();
     });
+
+    it('fails with "not supported" for getDisplayMedia', async () => {
+      const w = new BrowserWindow({ show: false });
+      w.loadFile(path.join(fixturesPath, 'pages', 'blank.html'));
+      const { ok, err } = await w.webContents.executeJavaScript('navigator.mediaDevices.getDisplayMedia({video: true}).then(s => ({ok: true}), e => ({ok: false, err: e.message}))');
+      expect(ok).to.be.false();
+      expect(err).to.equal('Not supported');
+    });
   });
 
   describe('window.opener access', () => {

From 1b96a3aa1d81837fa08b018bbb97c5917d1d8f45 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 20 Jul 2022 11:14:54 +0200
Subject: [PATCH 602/811] build: consolidate gn templates (#34918)

---
 build/asar.gni                              | 37 +++++++------------
 build/node.gni                              | 21 -----------
 patches/node/build_add_gn_build_files.patch | 39 +++++++++++++++++++--
 3 files changed, 50 insertions(+), 47 deletions(-)
 delete mode 100644 build/node.gni

diff --git a/build/asar.gni b/build/asar.gni
index 3e11845bd59bb..b8b290da2c670 100644
--- a/build/asar.gni
+++ b/build/asar.gni
@@ -1,33 +1,22 @@
-import("node.gni")
+template("node_action") {
+  assert(defined(invoker.script), "Need script path to run")
+  assert(defined(invoker.args), "Need script arguments")
 
-# TODO(MarshallOfSound): Move to electron/node, this is the only place it is used now
-# Run an action with a given working directory. Behaves identically to the
-# action() target type, with the exception that it changes directory before
-# running the script.
-#
-# Parameters:
-#   cwd [required]: Directory to change to before running the script.
-template("chdir_action") {
   action(target_name) {
     forward_variables_from(invoker,
-                           "*",
                            [
-                             "script",
-                             "args",
+                             "deps",
+                             "public_deps",
+                             "sources",
+                             "inputs",
+                             "outputs",
                            ])
-    assert(defined(cwd), "Need cwd in $target_name")
-    script = "//electron/build/run-in-dir.py"
-    if (defined(sources)) {
-      sources += [ invoker.script ]
-    } else {
-      assert(defined(inputs))
-      inputs += [ invoker.script ]
+    if (!defined(inputs)) {
+      inputs = []
     }
-    args = [
-      rebase_path(cwd),
-      rebase_path(invoker.script),
-    ]
-    args += invoker.args
+    inputs += [ invoker.script ]
+    script = "//electron/build/run-node.py"
+    args = [ rebase_path(invoker.script) ] + invoker.args
   }
 }
 
diff --git a/build/node.gni b/build/node.gni
deleted file mode 100644
index 6d7882d34620e..0000000000000
--- a/build/node.gni
+++ /dev/null
@@ -1,21 +0,0 @@
-template("node_action") {
-  assert(defined(invoker.script), "Need script path to run")
-  assert(defined(invoker.args), "Need script arguments")
-
-  action(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "deps",
-                             "public_deps",
-                             "sources",
-                             "inputs",
-                             "outputs",
-                           ])
-    if (!defined(inputs)) {
-      inputs = []
-    }
-    inputs += [ invoker.script ]
-    script = "//electron/build/run-node.py"
-    args = [ rebase_path(invoker.script) ] + invoker.args
-  }
-}
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index 69142b12e0d62..778d72eb5e98f 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -7,12 +7,12 @@ This adds GN build files for Node, so we don't have to build with GYP.
 
 diff --git a/BUILD.gn b/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..4afca42d22ee702af50da92aa08c1de897891424
+index 0000000000000000000000000000000000000000..9e34a074cfa7dec61c4e11821ba5f1969f393dfb
 --- /dev/null
 +++ b/BUILD.gn
 @@ -0,0 +1,403 @@
-+import("//electron/build/asar.gni")
 +import("//v8/gni/v8.gni")
++import("node.gni")
 +
 +declare_args() {
 +  # Enable the V8 inspector protocol for use with node.
@@ -1593,6 +1593,41 @@ index 0000000000000000000000000000000000000000..a2cfdffcd7308b73c5c302ebc4b946c6
 +    "//v8/include/v8.h"
 +  ]
 +}
+diff --git a/node.gni b/node.gni
+new file mode 100644
+index 0000000000000000000000000000000000000000..9b1a4048a4a64c36d88de0bbe1a548c906aaa22c
+--- /dev/null
++++ b/node.gni
+@@ -0,0 +1,29 @@
++# Run an action with a given working directory. Behaves identically to the
++# action() target type, with the exception that it changes directory before
++# running the script.
++#
++# Parameters:
++#   cwd [required]: Directory to change to before running the script.
++template("chdir_action") {
++  action(target_name) {
++    forward_variables_from(invoker,
++                           "*",
++                           [
++                             "script",
++                             "args",
++                           ])
++    assert(defined(cwd), "Need cwd in $target_name")
++    script = "//electron/build/run-in-dir.py"
++    if (defined(sources)) {
++      sources += [ invoker.script ]
++    } else {
++      assert(defined(inputs))
++      inputs += [ invoker.script ]
++    }
++    args = [
++      rebase_path(cwd),
++      rebase_path(invoker.script),
++    ]
++    args += invoker.args
++  }
++}
 diff --git a/src/inspector/BUILD.gn b/src/inspector/BUILD.gn
 new file mode 100644
 index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb3048361d9d591

From 9e0a3c44dd9dd55367f5c7b7fceb11460e1e6e40 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 13:03:34 +0200
Subject: [PATCH 603/811] chore: bump chromium to 105.0.5187.0 (main) (#34921)

* chore: bump chromium in DEPS to 105.0.5179.0

* chore: update patches

* 3758224: Reland^2 "[flags] Enable freezing of flags"

https://chromium-review.googlesource.com/c/v8/v8/+/3758224

* chore: bump chromium in DEPS to 105.0.5181.0

* chore: update patches

* chore: bump chromium in DEPS to 105.0.5183.0

* chore: bump chromium in DEPS to 105.0.5185.0

* chore: bump chromium in DEPS to 105.0.5187.0

* chore: update patches

* 3723298: Pass RemoteFrame mojo channels through its creation messages.

https://chromium-review.googlesource.com/c/chromium/src/+/3723298

* 3737382: [Code Heath] Replace base::{ListValue,DictionaryValue} in skia et al

https://chromium-review.googlesource.com/c/chromium/src/+/3737382

* Pass RemoteFrame mojo channels through its creation messages.

 https://chromium-review.googlesource.com/c/chromium/src/+/3723298

* Changed PrintRenderFrame.PrintWithParams mojo interface to use callback.

https://chromium-review.googlesource.com/c/chromium/src/+/3761203

* 3738183: [CSP] Add support for `DisableWasmEval`

https://chromium-review.googlesource.com/c/chromium/src/+/3738183

* 3740498: Move LinuxUI from //ui/views/linux_ui to //ui/linux

https://chromium-review.googlesource.com/c/chromium/src/+/3740498

* 3558277: Moves subsystem and semantics to enum class

https://chromium-review.googlesource.com/c/chromium/src/+/3558277

* chore: fix broken steps-electron-gn-check

* 3749583: [arm64] Fix undefined symbol linker error

https://chromium-review.googlesource.com/c/v8/v8/+/3749583

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .circleci/config/base.yml                     | 14 +++-
 BUILD.gn                                      |  3 +-
 DEPS                                          |  2 +-
 ...client_precreatemessageloop_callback.patch |  2 +-
 .../add_didinstallconditionalfeatures.patch   | 20 ++---
 ..._scheduler_throttling_per_renderview.patch | 14 ++--
 ..._secondary_label_via_simplemenumodel.patch |  4 +-
 patches/chromium/blink_file_path.patch        |  4 +-
 patches/chromium/blink_local_frame.patch      |  8 +-
 ..._depend_on_packed_resource_integrity.patch | 20 ++---
 patches/chromium/can_create_window.patch      | 34 ++++----
 ...screationoverridden_with_full_params.patch | 10 +--
 .../crash_allow_setting_more_options.patch    | 14 ++--
 patches/chromium/dcheck.patch                 | 14 ----
 patches/chromium/disable-redraw-lock.patch    |  2 +-
 .../disable_color_correct_rendering.patch     | 14 ++--
 ...le_freezing_flags_after_init_in_node.patch |  6 +-
 patches/chromium/disable_hidden.patch         |  4 +-
 ...ythreadcreated_if_pcscan_is_disabled.patch |  2 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |  4 +-
 .../chromium/enable_reset_aspect_ratio.patch  |  2 +-
 ...locator_for_usage_outside_of_the_gin.patch |  2 +-
 ...xpose_setuseragent_on_networkcontext.patch |  6 +-
 .../extend_apply_webpreferences.patch         |  2 +-
 ...screen_rendering_with_viz_compositor.patch |  2 +-
 ..._raw_response_headers_from_urlloader.patch |  6 +-
 ...uest_webcontents_to_enter_fullscreen.patch |  4 +-
 .../fix_aspect_ratio_with_max_size.patch      |  4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |  4 +-
 ...ntcapturercount_in_web_contents_impl.patch |  8 +-
 patches/chromium/frame_host_manager.patch     |  8 +-
 .../chromium/gritsettings_resource_ids.patch  |  4 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |  2 +-
 ...as_avoid_usage_of_private_macos_apis.patch |  4 +-
 .../mas_disable_remote_accessibility.patch    |  2 +-
 .../chromium/mas_disable_remote_layer.patch   |  8 +-
 ...emote_certificate_verification_logic.patch | 14 ++--
 .../chromium/notification_provenance.patch    |  6 +-
 patches/chromium/printing.patch               | 60 +++++++-------
 ...r_changes_to_the_webcontentsobserver.patch | 10 +--
 .../render_widget_host_view_base.patch        |  4 +-
 patches/chromium/resource_file_conflict.patch |  6 +-
 patches/chromium/scroll_bounce_flag.patch     |  4 +-
 .../support_mixed_sandbox_with_zygote.patch   |  4 +-
 ...andboxed_ppapi_processes_skip_zygote.patch |  2 +-
 patches/chromium/web_contents.patch           | 12 +--
 patches/chromium/webview_fullscreen.patch     | 12 +--
 .../worker_context_will_destroy.patch         | 12 +--
 ...feat_add_hook_to_notify_script_ready.patch | 16 ++--
 patches/v8/.patches                           |  1 -
 patches/v8/build_gn.patch                     |  8 +-
 ...ild_remove_legacy_oom_error_callback.patch | 22 ++---
 patches/v8/cherry-pick-5e227bebf193.patch     | 72 -----------------
 patches/v8/dcheck.patch                       |  6 +-
 ...export_private_v8_symbols_on_windows.patch |  4 +-
 patches/v8/expose_mksnapshot.patch            |  4 +-
 ...ed_attribute_for_older_msvc_versions.patch |  2 +-
 ..._terminating_exception_in_microtasks.patch |  8 +-
 ...workaround_an_undefined_symbol_error.patch |  6 +-
 .../browser/api/electron_api_web_contents.cc  |  4 +-
 shell/browser/electron_browser_client.cc      |  4 +-
 shell/browser/electron_browser_main_parts.cc  |  8 +-
 shell/browser/javascript_environment.cc       |  1 +
 .../printing/print_view_manager_electron.cc   | 80 ++++++++-----------
 .../printing/print_view_manager_electron.h    |  9 +--
 ...electron_desktop_window_tree_host_linux.cc |  2 +-
 .../electron_desktop_window_tree_host_linux.h | 12 +--
 shell/browser/ui/gtk/app_indicator_icon.h     |  6 +-
 shell/browser/ui/gtk/gtk_status_icon.h        |  6 +-
 shell/browser/ui/gtk/status_icon.cc           |  2 +-
 shell/browser/ui/gtk/status_icon.h            |  4 +-
 shell/browser/ui/tray_icon_gtk.h              |  8 +-
 .../ui/views/client_frame_view_linux.cc       | 53 ++++++++----
 .../ui/views/client_frame_view_linux.h        | 26 +++---
 .../ui/views/electron_views_delegate.cc       |  2 +-
 shell/browser/web_view_guest_delegate.cc      |  5 +-
 .../common/gin_converters/value_converter.cc  |  6 +-
 spec-main/chromium-spec.ts                    |  2 +-
 78 files changed, 366 insertions(+), 432 deletions(-)
 delete mode 100644 patches/v8/cherry-pick-5e227bebf193.patch

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 2f4d58e751e7f..61ee7d31ddf65 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -1006,9 +1006,17 @@ steps-electron-gn-check: &steps-electron-gn-check
     - *step-generate-deps-hash
     - *step-touch-sync-done
     - maybe-restore-portaled-src-cache
-    - *step-wait-for-goma
-    - *step-gn-gen-default
-    - *step-gn-check
+    - run:
+        name: Ensure src checkout worked
+        command: |
+          if [ ! -d "src/third_party/blink" ]; then
+            echo src cache was not restored for an unknown reason
+            exit 1
+          fi
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
 
 steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-change
   steps:
diff --git a/BUILD.gn b/BUILD.gn
index 407bdedffccaf..ec385d1e8c8df 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -566,8 +566,9 @@ source_set("electron_lib") {
       "//ui/base/ime/linux",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
+      "//ui/linux:linux_ui",
+      "//ui/linux:linux_ui_factory",
       "//ui/views/controls/webview",
-      "//ui/views/linux_ui:linux_ui_factory",
       "//ui/wm",
     ]
     if (ozone_platform_x11) {
diff --git a/DEPS b/DEPS
index 263fae42a7b34..110026e134caf 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '105.0.5173.0',
+    '105.0.5187.0',
   'node_version':
     'v16.15.1',
   'nan_version':
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 9cb88ba5ded9f..1b789c2492f9b 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index ff57e2a67ccc37be912ba3fca9df4b9e28898c6e..0045b3c1b89728e3950929b49e15bbc67a826c02 100644
+index b692a49b71661b8394c1126250fb150653aece97..c087c0f99a15edd3a9c776a68c76b2cf46257123 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 324d264d1abd3..9db40d62e73bf 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ed
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index eaf9a9483d89cd47bef63ff7f2868c0174a3c3bb..19bd5ef930bc094b315d2562c0f4917e78f63bad 100644
+index 4a69ce45890fd9ab730eef460396ab495b7a332a..3e186230715aaf840959a93038167749e3735a08 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4397,6 +4397,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4435,6 +4435,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index eaf9a9483d89cd47bef63ff7f2868c0174a3c3bb..19bd5ef930bc094b315d2562c0f4917e
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index feca00f2e36d1c02be5e56e787ea8f67eab45df6..9a4c57ddb3aebff2365ea7563803b169c7787c5e 100644
+index 351a3a257a3eca98c4a2caf724714cbc788b5d72..73dbb5a289411ea32f06cb1ea50ef98153923101 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -605,6 +605,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -606,6 +606,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index feca00f2e36d1c02be5e56e787ea8f67eab45df6..9a4c57ddb3aebff2365ea7563803b169
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 9e2dc9b2ea07a1f9bdfd92284f73dd1977ea1437..18c07f44196e83cf16cace6863e3db368a86ce0d 100644
+index acb427e4a6688f14f4a6ceaec8bf3988525c5e08..35623174f16399d5fff637a07554e43c55f902d1 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -605,6 +605,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -606,6 +606,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -67,10 +67,10 @@ index 9e2dc9b2ea07a1f9bdfd92284f73dd1977ea1437..18c07f44196e83cf16cace6863e3db36
    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
                                          int32_t world_id) {}
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b094153778e18b 100644
+index c8af53d40eaa1dd3a0067948a8cda80d1599cee3..4de918ee52efa7ec27a21aa2f57616d31dfd07d1 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-@@ -207,6 +207,7 @@ void LocalWindowProxy::Initialize() {
+@@ -209,6 +209,7 @@ void LocalWindowProxy::Initialize() {
    }
  
    InstallConditionalFeatures();
@@ -123,10 +123,10 @@ index c95ef4a4a3f9d40e0e4bedf6fc42225190626c42..36cc932782437b9f5d301416f5a4e8f4
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index 6b4142bf7f85c64af6f845613568679276c7e698..21462bb2196b353c32cf05d0c53635ac77673567 100644
+index d44adfd65bd9a71996cdd323a5220d2dcaa09de2..1011a318a7d79186abe556d03f78badc725c802a 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -359,6 +359,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -366,6 +366,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 688159b6c492e..79081580812fe 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 1f6d9be10432416f591a616805494b5d78975df1..e73f70c62ac2e69c918bdf39bd53f74a47066f4e 100644
+index 261e1dda1e128e22d15f3454f9012265db45bd74..98b130f0791d1ca2d59ef62151df7e60f3f40831 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -665,6 +665,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -666,6 +666,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -73,7 +73,7 @@ index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 99f0ceb45972df14813b72300e6a59710f13597f..f5e15865bf0bad73d9505698e788c1e954f46c2c 100644
+index b01562ebe042bd23e7b5184aa28bb42f98f81ecb..5392b5ac0f95eab7fef3c59fd2e9b2dc2cfb7342 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
 @@ -361,6 +361,7 @@ class WebView {
@@ -85,10 +85,10 @@ index 99f0ceb45972df14813b72300e6a59710f13597f..f5e15865bf0bad73d9505698e788c1e9
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 96d329c005ad74f2409c42d2ef8e62b28a18174d..3e28873ed5181756ab62e14ca9c2c4b27b4378f1 100644
+index 390e47422a0a106d0e5746c0af0611d420af8025..9151815e6bf33a3a6980f8337f578dc90e458696 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3723,6 +3723,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3742,6 +3742,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 96d329c005ad74f2409c42d2ef8e62b28a18174d..3e28873ed5181756ab62e14ca9c2c4b2
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3734,7 +3741,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3753,7 +3760,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,7 +113,7 @@ index 96d329c005ad74f2409c42d2ef8e62b28a18174d..3e28873ed5181756ab62e14ca9c2c4b2
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 6a36275fdd7ac12f91a40b60284b73fc93679749..f264c5ee5c2c38d4ccf15877accfdc31c48ec9f9 100644
+index ce3a483a4c06dc56a8a71d32d4d4a7077d524c2e..1cab34e52858808bceb52556c7ad0bbaa7584225 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
 @@ -417,6 +417,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
index 1b4e797564bb2..3a1665ce876f7 100644
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
 
 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index a787411f89e2d95e2fa636a7cc6723bdd227e563..f8c67d10957c26fbcd21fa1fe05507efd78f1c29 100644
+index 20a3b1efcb52be5e10dc184df620ec8102f2aff3..dfebc65b2ce180e4cd175ab8d09ad7e16f6b8df5 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
 @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
@@ -47,7 +47,7 @@ index a787411f89e2d95e2fa636a7cc6723bdd227e563..f8c67d10957c26fbcd21fa1fe05507ef
    return items_[ValidateItemIndex(index)].minor_text;
  }
 diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
-index bd2ebaf9f84946c708eba13c18869afadd2fdbb0..880d6f12ad188c5f8abf037b3b8d27fcf1fc2cb6 100644
+index eadda341710f3a2e35f0e5c6aeb65a0dcc7bf0dd..2a7cbfa33702b9a5b89d1e69d5e8d0af83735bd7 100644
 --- a/ui/base/models/simple_menu_model.h
 +++ b/ui/base/models/simple_menu_model.h
 @@ -49,6 +49,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
diff --git a/patches/chromium/blink_file_path.patch b/patches/chromium/blink_file_path.patch
index ace4aa5924cca..8185b75732fb6 100644
--- a/patches/chromium/blink_file_path.patch
+++ b/patches/chromium/blink_file_path.patch
@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
 documentation at https://electronjs.org/docs/api/file-object
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 72d6b7e109779c9785130ebb0e1e23202c5bc68d..e12c4acfd87f1d698d7c8c8459e7231ee03789fd 100644
+index c061962bec620d2da0e217d8f55b7db57d120f97..59d9946ecfb7d68b41f539ce7c29c7398e00e9b2 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
-@@ -212,6 +212,9 @@ class CORE_EXPORT File final : public Blob {
+@@ -211,6 +211,9 @@ class CORE_EXPORT File final : public Blob {
    }
    const String& name() const { return name_; }
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index d70c093f57788..a6d6dfc7533ef 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 80f4314d205f4cbf0d92a331062f8a01a46d6917..2e5c15fc2cf5d0db8d26c1eeb759f6d2837e0656 100644
+index 1ced95928589b38d76df1c460df7712e8e8c1611..2977ba7ce2f6a102f04bd9ad591fc583fd836051 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -124,14 +124,6 @@ bool Frame::Detach(FrameDetachType type) {
  
    DCHECK(!IsDetached());
  
@@ -33,7 +33,7 @@ index 80f4314d205f4cbf0d92a331062f8a01a46d6917..2e5c15fc2cf5d0db8d26c1eeb759f6d2
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -154,6 +146,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -155,6 +147,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,7 +49,7 @@ index 80f4314d205f4cbf0d92a331062f8a01a46d6917..2e5c15fc2cf5d0db8d26c1eeb759f6d2
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 4730c853097462638d3bc41b7c905874ab3dc29a..18615761121f83262da362b10b8022f80809ea07 100644
+index 5fccf35dfef38989bd68c69cfc35ac5d716ec165..dc45af36b30091b98cb37c927abd9a294c27bb71 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 9fee1e07d8327..9b872d4b44337 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 672bc56194e1ad8b03acd639c17b7f7e67a5dba0..59ba25815e511af5ca6aca5467cc91d5cc3c6bf1 100644
+index a9e0afc645b8bd543590e80b55a7461381373187..3d2e799541e26f5e421e20ccaff65020687314c2 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index 672bc56194e1ad8b03acd639c17b7f7e67a5dba0..59ba25815e511af5ca6aca5467cc91d5
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index fdc5d388f80dcae2f1dd8a05d7d24ed5e59250b5..4570ad0308083a62e56a5fa9c91866f9216eed5f 100644
+index 244373ba428ada917929c5161eb2c75ef1ccf8d3..556a613a6697eeea6b15894449fec884b97ec8b5 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4582,7 +4582,7 @@ static_library("browser") {
+@@ -4574,7 +4574,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,18 +46,18 @@ index fdc5d388f80dcae2f1dd8a05d7d24ed5e59250b5..4570ad0308083a62e56a5fa9c91866f9
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 5584fa001cf9bb0fab31cc6de053a536d18c4492..6541358b2a5d41f94c1e2d5a9d57ce20661f61a7 100644
+index 8c1a1b9c39a4ba00784ef91aaa81bf2453ac13e6..95e2f70445568d95351e8b1b5da71dc8e85e46cd 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5953,7 +5953,6 @@ test("unit_tests") {
+@@ -5963,7 +5963,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
 -      "//chrome:packed_resources_integrity",
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
-       "//chrome/browser:chrome_process_finder",
-@@ -5977,6 +5976,10 @@ test("unit_tests") {
+       "//chrome/app:crash_reporter_client_win_unit_tests",
+@@ -5988,6 +5987,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,16 +68,16 @@ index 5584fa001cf9bb0fab31cc6de053a536d18c4492..6541358b2a5d41f94c1e2d5a9d57ce20
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6867,7 +6870,7 @@ test("unit_tests") {
+@@ -6879,7 +6882,7 @@ test("unit_tests") {
      }
  
      deps += [
 -      "//chrome:packed_resources_integrity_hash",
 +    # "//chrome:packed_resources_integrity_hash",
-       "//chrome/browser/ash/system_web_apps/test_support",
        "//chrome/browser/enterprise/connectors/analysis:features",
        "//chrome/browser/media/router:test_support",
-@@ -6982,6 +6985,10 @@ test("unit_tests") {
+       "//chrome/browser/media/router/discovery:discovery",
+@@ -6993,6 +6996,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index d148c0eb9c8c8..f29b6178fa7ff 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 59ad3749cee7f8892884033d7507def1314aec75..187b94d207570a77f058915b9e5b581c777adc5a 100644
+index bdfc0719057218afeb61fec8f4e75298c3baa54c..9c6f51f1667d9bf1b430a83747faebf633a324c7 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7221,6 +7221,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7283,6 +7283,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 59ad3749cee7f8892884033d7507def1314aec75..187b94d207570a77f058915b9e5b581c
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2cd68060a6d73b12190692f5973224e4816630bb..c9f744c73f95ad6e63077fbfad2e0c935e6c44c1 100644
+index 860e52ddb3db1ccc38a7ef6e11acc0da67c98ac5..14bc2c9e77b7db69d03c00314fe55806d2a9e38c 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3983,6 +3983,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3990,6 +3990,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 2cd68060a6d73b12190692f5973224e4816630bb..c9f744c73f95ad6e63077fbfad2e0c93
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -4027,12 +4035,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4034,12 +4042,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,10 +53,10 @@ index 2cd68060a6d73b12190692f5973224e4816630bb..c9f744c73f95ad6e63077fbfad2e0c93
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index ac5575971f18588c25438a7285e1c25037c14b1b..af3c7dbb09de31e4079406cb5e18b5ffcc6e867c 100644
+index cc492885ec8ae5577c6e8702dc30749331332103..c852b894f976304e6b20908a6e66ccd698887604 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -579,6 +579,10 @@ struct CreateNewWindowParams {
+@@ -587,6 +587,10 @@ struct CreateNewWindowParams {
  
    // Additional parameters for creating picture-in-picture windows.
    blink.mojom.PictureInPictureWindowOptions? pip_options;
@@ -68,10 +68,10 @@ index ac5575971f18588c25438a7285e1c25037c14b1b..af3c7dbb09de31e4079406cb5e18b5ff
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 3101f5faa5d87f10e0859e8a09c6ebb2678eb478..39682dddf0ec449f0bc34124bf3de6f8c216fdf9 100644
+index 15620fd7b5d95eb031641e0eeb6d4c2ec74071d2..8f75315f0d4ba45314be5d2d88a417b44ba2c254 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -605,6 +605,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 3101f5faa5d87f10e0859e8a09c6ebb2678eb478..39682dddf0ec449f0bc34124bf3de6f8
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 0d79069d5a54a1a8907e459beb0235b2a78e1fa6..cfe1fc63e293cb2bcafb6c9e6778ee39ef266e89 100644
+index cadbd44a85b6117cd001c1dec120d18520ff2855..e0bfafe859b600ac5033f78d1eb5823ddda956c4 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -164,6 +164,7 @@ class NetworkService;
+@@ -165,6 +165,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index 0d79069d5a54a1a8907e459beb0235b2a78e1fa6..cfe1fc63e293cb2bcafb6c9e6778ee39
  }  // namespace network
  
  namespace sandbox {
-@@ -977,6 +978,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -993,6 +994,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -124,7 +124,7 @@ index ef3889063b562a37fbd945fe30db0d776ecaee7a..99e8449e9c515dd70ed88546a71f83ae
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 348dcde05d71e7d16e4c7bb1d8d9f8718070e669..5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db 100644
+index b088cb301003359fefad0ea9ca42b96f0cf3de6c..eec7bf18d17e85bde8017d4c8e7f064987b4d4d3 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,7 +150,7 @@ index 348dcde05d71e7d16e4c7bb1d8d9f8718070e669..5a9cc64d6e0d9d01f5dc133c7fcab341
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 11eaa6b307811b0b327c60ca8ee343331ed18b1b..87f35d4477fef2d6f5ee58455c10e1780a090ef9 100644
+index 913b3647c4632b580fa1551f4ebfeaca6f9fe17e..9cc6a793a1ec3e53db1ef31aec37c569695b197e 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -315,6 +315,10 @@ WebView* RenderViewImpl::CreateView(
@@ -165,7 +165,7 @@ index 11eaa6b307811b0b327c60ca8ee343331ed18b1b..87f35d4477fef2d6f5ee58455c10e178
    // moved on send.
    bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index e757a73ad55c997357bc26015423b69aaa3e895e..089b9e92b0b156fcdcf4b391c24b988a22e312c7 100644
+index d6dd69c53b66a89ea63927319d7b385f91921ea2..71748596f4d05de73263ed11b122d75a38b49616 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
 @@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -212,10 +212,10 @@ index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 6633a96d4eafce752b6a1dace29390203d7c4ac0..cb340f174618bd1c38e4216d85eb57f293f3367c 100644
+index ec10f16c6e6c5507ad2fb0afe306a744885eb58e..3f7a069c3f1b8412074864eb99bf47469a699837 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2100,6 +2100,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2084,6 +2084,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, entered_window);
  
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index aea8f9f1c17c5..674924efd4bbe 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c48
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index ce86697e47437832cd0d9692e44a19885f3b7174..62f3371827343fb30d3202f78af70968f169d9f2 100644
+index fd22d62a1346ee0f7c10659681e9a0e44535b44a..d51973a4ffdd2ea448fc3e8fab7cf3a47e867c7a 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1794,12 +1794,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1798,12 +1798,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index a06d49c3ed7d809ddd3ab43f1cc4e3044a6b14d2..1ebb4970ef9c440c5c2584785397696c7ebc14ce 100644
+index ad3f25362279d889e800cee3fd20240cc6d176a9..9b532970afe951f7c12629903baa39f2b8de1a5e 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3909,8 +3909,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3916,8 +3916,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -274,7 +274,7 @@ index 99e8449e9c515dd70ed88546a71f83ae139178fe..4f395474d3e0e1bf7a594fe3fa3e4cb5
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 5a9cc64d6e0d9d01f5dc133c7fcab34101bc32db..166e506f1afbcb1a3a661479d489e71d8d8ff552 100644
+index eec7bf18d17e85bde8017d4c8e7f064987b4d4d3..d5457e3a2ae96305cbd215f0340295339c7838e5 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index b9e607f84e898..f4516dfd22cd5 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -21,10 +21,10 @@ index 6aa864db880408bf7021ac58673f4d8d489426b4..1fa85302da7a64abc42fd9558ddbcaf6
  uint64_t g_process_start_time = 0;
  pid_t g_pid = 0;
 diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
-index 82b7f241e26184240260d0b6287ded159681e15b..abbb267f6a40de0cdf4d09700f9dd444a575fbdf 100644
+index 463f92a6e547006a46119f52203482dd6695a84a..34e6f087613d76947ae463fda2b107fad6ec14e9 100644
 --- a/components/crash/core/app/crash_reporter_client.cc
 +++ b/components/crash/core/app/crash_reporter_client.cc
-@@ -141,6 +141,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
+@@ -145,6 +145,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
    return false;
  }
  
@@ -43,7 +43,7 @@ index 82b7f241e26184240260d0b6287ded159681e15b..abbb267f6a40de0cdf4d09700f9dd444
  unsigned int CrashReporterClient::GetCrashDumpPercentage() {
    return 100;
 diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
-index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4353e2487 100644
+index 2532e99f00b39777cd9640c76704f7430d39502e..323e039e4591a4099b187f7a0097b4ee8be11a9f 100644
 --- a/components/crash/core/app/crash_reporter_client.h
 +++ b/components/crash/core/app/crash_reporter_client.h
 @@ -5,6 +5,7 @@
@@ -54,7 +54,7 @@ index 24e53fa62c2c4a11494ad3d43f0c5a806930fcdd..9b691baa6cc90cc3f9ada307c43f44c4
  #include <string>
  
  #include "build/build_config.h"
-@@ -146,6 +147,19 @@ class CrashReporterClient {
+@@ -151,6 +152,19 @@ class CrashReporterClient {
    // that case, |breakpad_enabled| is set to the value enforced by policies.
    virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled);
  
@@ -128,10 +128,10 @@ index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a5
          arguments.push_back("--monitor-self");
        }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index 80f33dc5e2f2ed330e0726a5735b247ea8e99fd7..b96bf703f6b691886d6e4d5cd6d775945a8995e1 100644
+index ad401a7711ceff58abacb99a03fda258fccd12a0..de04f4df602e3a0b20af045111faf8a7bf8e9e28 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
-@@ -90,6 +90,7 @@ bool PlatformCrashpadInitialization(
+@@ -91,6 +91,7 @@ bool PlatformCrashpadInitialization(
  
      std::map<std::string, std::string> process_annotations;
      GetPlatformCrashpadAnnotations(&process_annotations);
@@ -139,7 +139,7 @@ index 80f33dc5e2f2ed330e0726a5735b247ea8e99fd7..b96bf703f6b691886d6e4d5cd6d77594
  
      std::string url = crash_reporter_client->GetUploadUrl();
  
-@@ -128,6 +129,13 @@ bool PlatformCrashpadInitialization(
+@@ -129,6 +130,13 @@ bool PlatformCrashpadInitialization(
  
      std::vector<std::string> arguments(start_arguments);
  
diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch
index ccc3ddcd8566f..a7f845049f8af 100644
--- a/patches/chromium/dcheck.patch
+++ b/patches/chromium/dcheck.patch
@@ -16,20 +16,6 @@ example, the checks might be disabled for a whole build target, but actually
 only one or two specific checks fail. Then it's better to simply comment out the
 failing checks and allow the rest of the target to have them enabled.
 
-diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-index 21e7b1cbada3856a7d91040c259be80ae95df07e..b19206ba58725f949403469a3e1d221b12833581 100644
---- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-+++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.cc
-@@ -542,8 +542,7 @@ void MobileFriendlinessChecker::NotifyInvalidatePaint(
-                                ->GetPageScaleConstraintsSet()
-                                .FinalConstraints()
-                                .initial_scale;
--    DCHECK_GT(initial_scale, 0);
--
-+    // DCHECK_GT(initial_scale, 0);
-     double actual_font_size =
-         style.FontSize() * initial_scale / viewport_scalar;
-     double area = text->PhysicalAreaSize();
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
 index fe8d191217e24b08d36339dbf047beaeb6bd6538..870db0552544e3e89d9498c22ec3db81b46df741 100644
 --- a/ui/base/clipboard/clipboard_win.cc
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 0e7e6f5795476..1cf28eb0621d3 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 1e6326a2f36f5a7e55e5193b69c36f870c1d00e7..2f51474d46544915b75185fc362aebf8b83164b0 100644
+index 1208238fbfb501e1776e8c3ba414a8c9ef23bc59..81f59c4476cd07930fc302ecbf0377a11bfee888 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 28137ca9aa91c..6f925b949bc91 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 65c468c4b882829fba7ab679c0fec3f637e96522..ca98a6e3992126b564d28e9d4429cd9a69cf7eed 100644
+index 6a148c3173f8f5653b945ed9b6ffcbf48d76d511..b30c2e686ff9b64691142ff893225c60cedeaebd 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1857,6 +1857,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1864,6 +1864,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -80,7 +80,7 @@ index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd3
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 4be758a498c1e5b17fd8eea6c5a7719e4252723a..e166e96b4b23725ad8735ab87afd3660ed22de50 100644
+index 9b29ab96d6e7dd7160502ee2252843bdeeab84c9..a9889d625dac9148dd8bbc2853c4e09f6546bd0d 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -92,7 +92,7 @@ index 4be758a498c1e5b17fd8eea6c5a7719e4252723a..e166e96b4b23725ad8735ab87afd3660
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index ece0f7a284fc87f879d21e754b0b050236081d61..68277794cf54100592f36f0c95985b2911074c52 100644
+index 3f0a3b2133f0d48054f33df28b93a9ee40d7ed78..801bf4b1090a8f0de922fdac6c4145c27a154460 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -199,6 +199,7 @@
@@ -103,7 +103,7 @@ index ece0f7a284fc87f879d21e754b0b050236081d61..68277794cf54100592f36f0c95985b29
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3195,6 +3196,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3185,6 +3186,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -166,7 +166,7 @@ index 4f3b9b181b1998e0ebbd95955feeec28a5d6bcb7..00f2a213cded1985b3131fabf3560937
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index e030f01e72d18ef08d04ffbc72a5abb9a7b485c5..25155263bede8a465eb3f3bc2960f173c8f14935 100644
+index 8bdb9fafc4c5e59d6d6aad323ca2547ecc1b4069..069ed9744dca4fb208daaaf76d4618706c65b84e 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
 @@ -20,6 +20,7 @@
@@ -192,7 +192,7 @@ index e030f01e72d18ef08d04ffbc72a5abb9a7b485c5..25155263bede8a465eb3f3bc2960f173
    // Allow but ignore invalid color spaces.
    if (!color_space.IsValid())
      return true;
-@@ -311,6 +320,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
+@@ -312,6 +321,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
      DCHECK_EQ(kIOReturnSuccess, r);
    }
  
diff --git a/patches/chromium/disable_freezing_flags_after_init_in_node.patch b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
index 908c926de71b6..0a4782f3fd4a5 100644
--- a/patches/chromium/disable_freezing_flags_after_init_in_node.patch
+++ b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
@@ -15,7 +15,7 @@ at some point be an API to "unfreeze" the flags, or we may be able to refactor
 node initialization to not update flags after V8 initialization.
 
 diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
-index 02b4f803369202a81f2d54f3b35aef04be13dfa2..76dd21fc8e97c1a2836ae5a5a11b56334a656fe2 100644
+index 02b4f803369202a81f2d54f3b35aef04be13dfa2..04a8d29ba210313076eacf5074ed86402160c0c3 100644
 --- a/content/renderer/render_process_impl.cc
 +++ b/content/renderer/render_process_impl.cc
 @@ -222,7 +222,8 @@ RenderProcessImpl::RenderProcessImpl()
@@ -23,8 +23,8 @@ index 02b4f803369202a81f2d54f3b35aef04be13dfa2..76dd21fc8e97c1a2836ae5a5a11b5633
                          "--no-wasm-dynamic-tiering");
  
 -  v8::V8::SetFlagsFromString("--freeze-flags-after-init");
-+  // This conflicts with node in the renderer.
-+  //v8::V8::SetFlagsFromString("--freeze-flags-after-init");
++  // Freezing flags after init conflicts with node in the renderer.
++  v8::V8::SetFlagsFromString("--no-freeze-flags-after-init");
  
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
    if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 980679fa1db0b..c0a58fa2a1c4d 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 4b4a91a3fb6156ced046b414c131bc348f15b79f..852118f2599087c971ee6475f670a1f0e9d64bd3 100644
+index 3c934fe49b745d79d502311af02c4b2409f87742..5647890d0f62bcd5b1d1b2e6adc511b262a83b7f 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,7 +20,7 @@ index 4b4a91a3fb6156ced046b414c131bc348f15b79f..852118f2599087c971ee6475f670a1f0
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index f63c1aa3007fa532af250e6f222ab588d949dccc..6183ee520b48e09958f320c1091a80ce947f21b7 100644
+index 4c568e15eaf82231004e89590dfe2e28e6ba0ac0..2ba5e20d961494995c11ac2a40d2c78b8b3d7de0 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -881,6 +881,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index 2e26a11244292..d800d93049955 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -20,7 +20,7 @@ index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944
      using PCScan = internal::PCScan;
      const auto invocation_mode = flags & PurgeFlags::kAggressiveReclaim
 diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
-index 418efcb3c08c67e86ae3a0728f37c5a4b9e56e06..f5c3a127c4ac535773f087f8ee2306ab0433fbe6 100644
+index 714232b0c2707d6c256e634ff784c18322bf0a85..48c8d0051c427954fe7265fee9cd0c6b5f473984 100644
 --- a/base/threading/platform_thread_posix.cc
 +++ b/base/threading/platform_thread_posix.cc
 @@ -44,6 +44,7 @@
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
index 6f739d8b35bfb..f6fb27f797122 100644
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
 Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
 
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 19bd5ef930bc094b315d2562c0f4917e78f63bad..bb1c66173df927499f1f28039f2255e3d6c28c96 100644
+index 3e186230715aaf840959a93038167749e3735a08..4c2dbe2b7629c94a16620988ae96fb10da39e0b8 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -2287,7 +2287,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
+@@ -2294,7 +2294,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
  }
  
  const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index 4a0fa298d2719..5ecf357e66296 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -19,7 +19,7 @@ index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 2f51474d46544915b75185fc362aebf8b83164b0..c893bc030b266539f65d31bdc40ba0ba31b70986 100644
+index 81f59c4476cd07930fc302ecbf0377a11bfee888..70e33b49e77240248c629fb18c5d3ca57ea32d66 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -1001,8 +1001,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
diff --git a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
index 8f885d9d4f187..d7180a32d1724 100644
--- a/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
+++ b/patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
@@ -21,7 +21,7 @@ index 2f2e0d67c7141e5daad2d50031c71a542677e108..c53bd76fcd3703cb483949d5ec53f24f
    v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
  #endif
 diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
-index 9e79f7e411a3242e3e7662933389e05b94a4818c..05e3156571ac0dc9ff71464b8e73d74db96496a0 100644
+index b02ab8b6ac701d948daac73bd89bc1fc6533d60c..36c096b4c053eae9326c8ccb7ed6aea07b68c3e5 100644
 --- a/gin/v8_platform.cc
 +++ b/gin/v8_platform.cc
 @@ -367,6 +367,10 @@ PageAllocator* V8Platform::GetPageAllocator() {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index ee5737d525899..4b9312ed4d48d 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 61030982c4391dd1b4b508042628e7f006047158..c4f422553185d416a6abfd4647b219060705d0ad 100644
+index d53e403bda407bb46f59395ebcbb39cd9495875b..4850469bb2bd96c87b0aa936c654f7bd58b7b17f 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1406,6 +1406,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1410,6 +1410,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,7 +51,7 @@ index 61030982c4391dd1b4b508042628e7f006047158..c4f422553185d416a6abfd4647b21906
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index d88d9d2bc4b95464ca9a8cacec33361f12d25ea4..74415ce53dc6d0b3e39dbe27ae9e225b281c8820 100644
+index 614ba5b278f8bed722072ca07399b247ddb971be..21024709a79dc2bb838492090ce1365450427430 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -296,6 +296,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index 8af2374fb4170..c48ce3e718343 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 3e28873ed5181756ab62e14ca9c2c4b27b4378f1..831b6bab8e491fc0750ecf05b3ef0f105a5478f4 100644
+index 9151815e6bf33a3a6980f8337f578dc90e458696..664b8c2b0a3eb5da577a6ac9d70cafff4702a622 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -161,6 +161,7 @@
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 61987a15de836..58c3b92a3edbe 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -572,7 +572,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549
 +  Draw(gfx.mojom.Rect damage_rect) => ();
  };
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index e0345f5903a48013930767bee713c177a704970a..2881a4fee66f16e6367724a727abe4643a965a24 100644
+index 5dee5932ce9cacc68af498ef2312fd58cd285e15..d8f977154e5f0c0456ee03ddf67f94b0e7ab475d 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -83,6 +83,7 @@ class DisplayPrivate;
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 7efba47601775..0771278f2d6df 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -103,7 +103,7 @@ index 3d2bcc3e81eb42f645fa4e8b1425cb5c54cfd3a1..4cdbe0e38609abfd0b0b5856deb8b2dd
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 04ed3a3391b82751d0014027caf37c402a8f068a..7140c4ced6265c388a4015350b1da5d487a02569 100644
+index 6805b5f3976f60e0cc72634f71bcb21879ffbde1..4d60c127bec00859ed523ca652336239ab71ae00 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -603,6 +603,7 @@ URLLoader::URLLoader(
@@ -114,7 +114,7 @@ index 04ed3a3391b82751d0014027caf37c402a8f068a..7140c4ced6265c388a4015350b1da5d4
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -794,7 +795,7 @@ URLLoader::URLLoader(
+@@ -792,7 +793,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 04ed3a3391b82751d0014027caf37c402a8f068a..7140c4ced6265c388a4015350b1da5d4
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1536,6 +1537,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1541,6 +1542,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
diff --git a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
index ed93dd0e68f24..4931611c59b59 100644
--- a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
+++ b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
@@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
 This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 5f200acb893f6c6b4ffb7c5a6ca010dde8a245e9..c3a5751233c48255408db41c10118ffde72f51d6 100644
+index 6f01f3eb8df96320700448e4583e4a4a0b3d2beb..e3c9f87e651be09fd40f1f51b3f9ba6fb18a770b 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3440,7 +3440,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -3447,7 +3447,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame, options));
    DCHECK(requesting_frame->IsActive());
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 2ad1da6657694..1fedb8674bcc3 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index c893bc030b266539f65d31bdc40ba0ba31b70986..b1e8daf5e79cd838c87e01da0e764e12421747db 100644
+index 70e33b49e77240248c629fb18c5d3ca57ea32d66..3b546cf67089e6677fc668b4d1d6c0863282dff5 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3696,6 +3696,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3694,6 +3694,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index a687e2edd98ac..1c0ed1e2fd326 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,7 +13,7 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
-index a22dd8209fd9c67e9c3637fee61bca5524ee51da..6e3c8da273aa4d24c32200f3d67210eb08ee3dad 100644
+index 96d6028af1408c34f98ee638b8b8d41e8dc8b2ee..6e3c8da273aa4d24c32200f3d67210eb08ee3dad 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.ts
 +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
 @@ -860,26 +860,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
@@ -60,7 +60,7 @@ index a22dd8209fd9c67e9c3637fee61bca5524ee51da..6e3c8da273aa4d24c32200f3d67210eb
 -        {
 -          type: 'saveFile',
 -          accepts: [{description: '*.pdf', extensions: ['pdf']}],
--          suggestedName: fileName
+-          suggestedName: fileName,
 -        },
 -        (entry?: FileSystemFileEntry) => {
 -          if (chrome.runtime.lastError) {
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index 9eff513345501..abdc12fa40bfd 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index df53d0d8371b2f7bbd04ffe6c2d1c171ae457bc8..688883c80d5005b58c39d66c520726bcc62eeac1 100644
+index 53435224b5e331bbe24119752c1a44a8d58bfa88..de1a5b60474ce872eba03dfb8931b9b566fd6cee 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1823,7 +1823,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1828,7 +1828,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,10 +21,10 @@ index df53d0d8371b2f7bbd04ffe6c2d1c171ae457bc8..688883c80d5005b58c39d66c520726bc
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 922048fbc03f7222e42e3640b46d3d5e1b2391ba..f2bdadbfaae703006f4888e3dd899a20bac84090 100644
+index a3ae580ea073024882bd860abf914bbf7c0ed54d..85ae2b5ba31926d21ffb52ab31fca6a66ad6d5ec 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -667,6 +667,10 @@ class WebContents : public PageNavigator,
+@@ -669,6 +669,10 @@ class WebContents : public PageNavigator,
        bool stay_awake,
        bool is_activity = true) = 0;
  
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index fd346c08904ef..641d82a1db3ff 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index acfea574749cce9c9babac12593679c1c2c3b1af..0d44d3b022042dbcbb9f188adb90074c752741b8 100644
+index a64114d9eeb56b3dc0389415d44a842d3cda12fb..6c3b36f36e375a626f9fc2a59935c5ac851a128c 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3177,6 +3177,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3184,6 +3184,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index acfea574749cce9c9babac12593679c1c2c3b1af..0d44d3b022042dbcbb9f188adb90074c
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index cfe1fc63e293cb2bcafb6c9e6778ee39ef266e89..bbbdd32152f904d10e040ccf80dd1d1406b3d7a1 100644
+index e0bfafe859b600ac5033f78d1eb5823ddda956c4..e2b0937007413b158ac28e48352acd3ab68e6dd0 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -272,6 +272,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 0e01d9d17a48c..6394ab0ab0cc6 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 1c50dbb9503e755ebbad2ea6d66484331862b72f..b9188ede8a4dc45bb5c573bc2cd8642c9256de36 100644
+index 9a8d321de570ee1a0669aa6022e34f8ff604694f..abcdba63bcbd0b9e323bf482cc292360d30be8fe 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -967,6 +967,11 @@
+@@ -971,6 +971,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 1bef249bf39cf..1cd1f286df670 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 68b47d4f483b064d7be5a19552cddfe3f2b12bb2..d3191ad5984dcad633cbab5da45824871961d212 100755
+index 194ce0ca751da8677df74489a04e143276264fbe..9df287e5a9d122f26730480d54a1bbfd47e8d95e 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -302,6 +302,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 56b21c48e776f..07ee9fd2c36f0 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -39,7 +39,7 @@ index dd14c8cfa32ab0bb2e92f192c54a494c4f5b4fb7..2c6f0b336c97bc23995e9fe8cdc7f72a
  
  }  // namespace base
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index bb1cb98f246f120f566fab65565f49a6468b82b4..929188b8d0e39f171679067347d4f83632364cc7 100644
+index cee826cf8ca533778c716fd2592e625e93fe7efb..adfec0021ae00b3a9ccc792695a51a182626fee5 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
 @@ -30,12 +30,6 @@
@@ -76,7 +76,7 @@ index bb1cb98f246f120f566fab65565f49a6468b82b4..929188b8d0e39f171679067347d4f836
    if ([ns_val isKindOfClass:[NSFont class]]) {
      return (CTFontRef)(cf_val);
 diff --git a/base/process/launch_mac.cc b/base/process/launch_mac.cc
-index e12c36384ddc05554ed362bba2c0a8b418634f0a..1c740410de70ee5a888ee7cf406dfa3bccc28c9b 100644
+index bf33d321197226a74d4f26731108ad8b0b8c72a0..349dc2cdde63e32daf06f1ccc0d29e7ce8b2ac46 100644
 --- a/base/process/launch_mac.cc
 +++ b/base/process/launch_mac.cc
 @@ -19,14 +19,19 @@
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 2e62681443353..51317f699d640 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -197,7 +197,7 @@ index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 7fc550eb16288cc5f4152362504a621abbaec3da..6be133c45a9b8c774b9f6e1e2de492c43bac33d3 100644
+index a922dc6ce99ed32ede8812a63a836f72691bece3..9e4ef4235c49eeb7cd34f05ae2d75169d787fa55 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -341,6 +341,13 @@ component("base") {
diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch
index 87a806ed62c58..b31cf0975df7c 100644
--- a/patches/chromium/mas_disable_remote_layer.patch
+++ b/patches/chromium/mas_disable_remote_layer.patch
@@ -50,7 +50,7 @@ index 506ff3c2b9a14a725d13e3933bc281d05c0b6b13..9726e2d34d6d123ad3e62d843d21b755
  
    gfx::Size pixel_size_;
 diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
-index 3378b9a6d411b853fe64e02812c329f68cbbd2ad..7b2f0b3dc28ff71ae84fe63aa9ea80c2aab75969 100644
+index 27b0c985b119095bd92ac021db10731a917dfa0c..83bd23a7ed0a5870f226442a6335b26de7676206 100644
 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
 @@ -60,6 +60,7 @@
@@ -79,7 +79,7 @@ index 3378b9a6d411b853fe64e02812c329f68cbbd2ad..7b2f0b3dc28ff71ae84fe63aa9ea80c2
      } else {
        IOSurfaceRef io_surface =
            ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
-@@ -378,6 +382,7 @@
+@@ -379,6 +383,7 @@
    ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
        use_remote_layer_api_, allow_av_sample_buffer_display_layer);
  
@@ -87,7 +87,7 @@ index 3378b9a6d411b853fe64e02812c329f68cbbd2ad..7b2f0b3dc28ff71ae84fe63aa9ea80c2
    // Create the CAContext to send this to the GPU process, and the layer for
    // the context.
    if (use_remote_layer_api_) {
-@@ -386,6 +391,7 @@
+@@ -387,6 +392,7 @@
                                                     options:@{}] retain]);
      [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
    }
@@ -95,7 +95,7 @@ index 3378b9a6d411b853fe64e02812c329f68cbbd2ad..7b2f0b3dc28ff71ae84fe63aa9ea80c2
  }
  
  ImageTransportSurfaceOverlayMacEGL::~ImageTransportSurfaceOverlayMacEGL() {
-@@ -464,7 +470,9 @@
+@@ -465,7 +471,9 @@
                           "GLImpl", static_cast<int>(gl::GetGLImplementation()),
                           "width", pixel_size_.width());
      if (use_remote_layer_api_) {
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 8af5607e3924d..331914f8c122b 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f006047158 100644
+index 2aaf6fb9cca420cde28635d7628c1b7830570f5a..d53e403bda407bb46f59395ebcbb39cd9495875b 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -129,6 +129,11 @@
+@@ -130,6 +130,11 @@
  #include "third_party/abseil-cpp/absl/types/optional.h"
  #include "url/gurl.h"
  
@@ -22,7 +22,7 @@ index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f0
  #if BUILDFLAG(IS_CT_SUPPORTED)
  #include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
  #include "components/certificate_transparency/chrome_require_ct_delegate.h"
-@@ -437,6 +442,91 @@ bool GetFullDataFilePath(
+@@ -438,6 +443,91 @@ bool GetFullDataFilePath(
  
  }  // namespace
  
@@ -114,7 +114,7 @@ index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f0
  constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
  
  NetworkContext::PendingCertVerify::PendingCertVerify() = default;
-@@ -739,6 +829,13 @@ void NetworkContext::SetClient(
+@@ -743,6 +833,13 @@ void NetworkContext::SetClient(
    client_.Bind(std::move(client));
  }
  
@@ -128,7 +128,7 @@ index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f0
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2303,6 +2400,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2304,6 +2401,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,10 +139,10 @@ index c2824b6bcfab1c13d0e44ca96fc05c97b4a13a6e..61030982c4391dd1b4b508042628e7f0
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 34b3e31549ee37b58eee4c11c54bd34af73af263..d88d9d2bc4b95464ca9a8cacec33361f12d25ea4 100644
+index 97039f97082b79e4b7bd5cdb4a5b28023dc70e47..614ba5b278f8bed722072ca07399b247ddb971be 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -105,6 +105,7 @@ class URLMatcher;
+@@ -104,6 +104,7 @@ class URLMatcher;
  
  namespace network {
  class CertVerifierWithTrustAnchors;
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 5978e72355e83..90182fe6604c9 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -133,10 +133,10 @@ index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5d
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index db1e97364a68fdc987274f2a7a940d9d63ac111e..8b236cbd54011bc0008d56ca4213920e478f7a90 100644
+index 4b40e3faa498b6c86b381f6efae9d04e48a85c0f..5499f85fa578511d5817ecd9be2f33cf56e2db4b 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2059,8 +2059,9 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2069,8 +2069,9 @@ void RenderProcessHostImpl::CreateNotificationService(
    // For workers:
    if (render_frame_id == MSG_ROUTING_NONE) {
      storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -148,7 +148,7 @@ index db1e97364a68fdc987274f2a7a940d9d63ac111e..8b236cbd54011bc0008d56ca4213920e
      return;
    }
  
-@@ -2068,7 +2069,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2078,7 +2079,7 @@ void RenderProcessHostImpl::CreateNotificationService(
    RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
    CHECK(rfh);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index a602cca1f0089..fa69a6ac0c84f 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 861191e82aa304be0a71dcd356d31767540450ef..1f86538121bfc753b3587d9edaf1553726542af9 100644
+index a3cf0a49943f53608f783f439917c256ec5b9040..d52cc220107218e53290d21ce1c52a7f855385b4 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -974,7 +974,6 @@ if (is_win) {
+@@ -973,7 +973,6 @@ if (is_win) {
        "//media:media_unittests",
        "//media/midi:midi_unittests",
        "//net:net_unittests",
@@ -22,7 +22,7 @@ index 861191e82aa304be0a71dcd356d31767540450ef..1f86538121bfc753b3587d9edaf15537
        "//sql:sql_unittests",
        "//third_party/breakpad:symupload($host_toolchain)",
        "//ui/base:ui_base_unittests",
-@@ -983,6 +982,10 @@ if (is_win) {
+@@ -982,6 +981,10 @@ if (is_win) {
        "//ui/views:views_unittests",
        "//url:url_unittests",
      ]
@@ -473,7 +473,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-index b2bd74f28f70bc601ec47820030ad965b19cf068..027e4c0b78d44b69504d248755bf7f25ff423361 100644
+index f3c3f85edb19489d079dc93411be64828ae581e2..ff303dcbc034cd8f1530fe1543729e98d3035826 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 @@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
@@ -483,10 +483,10 @@ index b2bd74f28f70bc601ec47820030ad965b19cf068..027e4c0b78d44b69504d248755bf7f25
 -void FakePrintRenderFrame::PrintRequestedPages() {}
 +void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value::Dict /*settings*/) {}
  
- void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params) {
-   NOTREACHED();
+ void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params,
+                                            PrintWithParamsCallback callback) {
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-index 42f9f296e6ef65a934167c2d4773e504020378bc..3ac69d39e4eb380f97cb779be1e9ad8706ce8243 100644
+index 0e788384809f9f7218c6483822ffea08f86b4f79..c6f08845cb292ff406db5560c9a744dc7ab1c712 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 @@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
@@ -495,14 +495,14 @@ index 42f9f296e6ef65a934167c2d4773e504020378bc..3ac69d39e4eb380f97cb779be1e9ad87
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
 +  void PrintRequestedPages(bool silent, ::base::Value::Dict settings) override;
-   void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
+   void PrintWithParams(mojom::PrintPagesParamsPtr params,
+                        PrintWithParamsCallback callback) override;
    void PrintForSystemDialog() override;
-   void SetPrintPreviewUI(
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d183ce10c0f 100644
+index 95d9f19082978772297cff1bcd9c5f73db50bd62..96fe7fbb54fe0908e2153d901c130b6a5c621522 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
-@@ -280,7 +280,7 @@ enum PrintFailureReason {
+@@ -285,7 +285,7 @@ union PrintWithParamsResult {
  interface PrintRenderFrame {
    // Tells the RenderFrame to switch the CSS to print media type, render every
    // requested page, and then switch back the CSS to display media type.
@@ -511,7 +511,7 @@ index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d18
  
    // Requests the frame to be printed with specified parameters. This is used
    // to programmatically produce PDF by request from the browser (e.g. over
-@@ -362,7 +362,7 @@ interface PrintManagerHost {
+@@ -368,7 +368,7 @@ interface PrintManagerHost {
    // Request the print settings from the user. This step is about showing
    // UI to the user to select the final print settings.
    [Sync]
@@ -521,7 +521,7 @@ index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d18
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7da7d5c9e 100644
+index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991aeed63e6d7 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -560,7 +560,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1391,7 +1393,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1402,7 +1404,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -570,7 +570,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1440,6 +1443,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
+@@ -1451,6 +1454,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -579,7 +579,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -2052,7 +2057,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2063,7 +2068,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -589,7 +589,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -2067,7 +2073,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2078,7 +2084,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -600,7 +600,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -2075,7 +2083,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2086,7 +2094,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -609,7 +609,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -2094,8 +2102,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2105,8 +2113,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -626,7 +626,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2328,36 +2343,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2364,36 +2379,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -691,7 +691,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2482,7 +2513,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2518,7 +2549,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -701,7 +701,7 @@ index bb0a934fb658256370fe29c6dbc9f72e992a9a5c..da7161c51e94f285d2ad6c9f0e2edba7
              std::move(quit_closure).Run();
            },
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index c2bf286ef1741b53022adf420809a87c3bb53cfd..f8b38d09abd3253bfd38b874ebdad753c3f8c4db 100644
+index 66026548181a897c161d7202646f33fd8847ccb8..113a8165b5db6294087773e5a4b2f0035f4c8f5d 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -255,7 +255,7 @@ class PrintRenderFrameHelper
@@ -710,10 +710,10 @@ index c2bf286ef1741b53022adf420809a87c3bb53cfd..f8b38d09abd3253bfd38b874ebdad753
    // printing::mojom::PrintRenderFrame:
 -  void PrintRequestedPages() override;
 +  void PrintRequestedPages(bool silent, base::Value::Dict settings) override;
-   void PrintWithParams(mojom::PrintPagesParamsPtr params) override;
+   void PrintWithParams(mojom::PrintPagesParamsPtr params,
+                        PrintWithParamsCallback callback) override;
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-   void PrintForSystemDialog() override;
-@@ -327,7 +327,9 @@ class PrintRenderFrameHelper
+@@ -328,7 +328,9 @@ class PrintRenderFrameHelper
    // WARNING: |this| may be gone after this method returns.
    void Print(blink::WebLocalFrame* frame,
               const blink::WebNode& node,
@@ -724,7 +724,7 @@ index c2bf286ef1741b53022adf420809a87c3bb53cfd..f8b38d09abd3253bfd38b874ebdad753
  
    // Notification when printing is done - signal tear-down/free resources.
    void DidFinishPrinting(PrintingResult result);
-@@ -336,12 +338,14 @@ class PrintRenderFrameHelper
+@@ -337,12 +339,14 @@ class PrintRenderFrameHelper
  
    // Initialize print page settings with default settings.
    // Used only for native printing workflow.
@@ -742,10 +742,10 @@ index c2bf286ef1741b53022adf420809a87c3bb53cfd..f8b38d09abd3253bfd38b874ebdad753
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 9b8fe6eecdc7093ba43a324f37bbe380e43dc0c0..88164f568c27dc6bad4cedfd83bd2abeae956c5c 100644
+index 56e3651f7e79957e444ec82b534a07dff9ef7415..43f2d487947eaf77171d918cc5072aee4291290b 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2756,8 +2756,9 @@ source_set("browser") {
+@@ -2766,8 +2766,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  
@@ -758,7 +758,7 @@ index 9b8fe6eecdc7093ba43a324f37bbe380e43dc0c0..88164f568c27dc6bad4cedfd83bd2abe
      if (is_chromeos) {
        sources += [
 diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
-index 5f6847dcc9aa6970d7c8c4831f2be160c0aa15ad..4bd1f7e3b4c50a319043c8041a9ecf4fa8a99ac1 100644
+index e3c1b29138f175836424bcfe917cd00bd081b34c..7d8b6f06c5d1a7ea9a5ed86c5c612e8df08f2659 100644
 --- a/content/browser/utility_sandbox_delegate_win.cc
 +++ b/content/browser/utility_sandbox_delegate_win.cc
 @@ -95,6 +95,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetPolicy* policy) {
@@ -778,7 +778,7 @@ index 5f6847dcc9aa6970d7c8c4831f2be160c0aa15ad..4bd1f7e3b4c50a319043c8041a9ecf4f
  
  bool UtilitySandboxedProcessLauncherDelegate::GetAppContainerId(
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 93db1a80a360702a36f2d3113c9a83105bf7fffe..c3e012ec8d9a1c19434240d27553e486c0729d43 100644
+index 56ee836445c53c5cde3947fca19d8576d2684f6f..454e26baa8b3688c2af98081085aa5378ff0554b 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
 @@ -128,7 +128,6 @@ void PrintingContext::UsePdfSettings() {
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 35d277bc7a7a9..8a829b1be7f4c 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,7 +30,7 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 852118f2599087c971ee6475f670a1f0e9d64bd3..ed0e6cff036e76aa266306e5cb4202568ab5b952 100644
+index 5647890d0f62bcd5b1d1b2e6adc511b262a83b7f..9a818c66d76d50e9ba678e7a8e57381315eacf88 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,10 +43,10 @@ index 852118f2599087c971ee6475f670a1f0e9d64bd3..ed0e6cff036e76aa266306e5cb420256
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index c9f744c73f95ad6e63077fbfad2e0c935e6c44c1..a06d49c3ed7d809ddd3ab43f1cc4e3044a6b14d2 100644
+index 14bc2c9e77b7db69d03c00314fe55806d2a9e38c..ad3f25362279d889e800cee3fd20240cc6d176a9 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4571,6 +4571,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4587,6 +4587,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index c9f744c73f95ad6e63077fbfad2e0c935e6c44c1..a06d49c3ed7d809ddd3ab43f1cc4e304
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 2ee5a7a78baba5974f99cd98d1ef378b6de2bcd7..df53d0d8371b2f7bbd04ffe6c2d1c171ae457bc8 100644
+index a636e3c31860f67b01c178fd580df466266481ed..53435224b5e331bbe24119752c1a44a8d58bfa88 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -957,6 +957,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -962,6 +962,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index b748495a963c0..334712e8f5286 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -24,7 +24,7 @@ index eefdd87f1f85ac62079e97f1a7736234952d419c..f2b1959f7650ecd98ed2db870d1c723a
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 912a21280fdd53e03cb92404b424f0b26740460a..98dda64426a1489cd44e90a211a6c4f94f62afb7 100644
+index 4174581cda568c887e34c2e2b29edf5ef6e2a092..770599358ca8badf180e249410ba71016d60ab99 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
@@ -60,7 +60,7 @@ index 912a21280fdd53e03cb92404b424f0b26740460a..98dda64426a1489cd44e90a211a6c4f9
    // This only needs to be overridden by RenderWidgetHostViewBase subclasses
    // that handle content embedded within other RenderWidgetHostViews.
    gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -300,6 +307,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -308,6 +315,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                     const ui::LatencyInfo& latency);
  
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 83075078e1b42..c0b985cf6b960 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 06e3385d4f148eb23f9ddf560afb563897846609..672bc56194e1ad8b03acd639c17b7f7e67a5dba0 100644
+index f42cc96b606f07f66a9d4dfacbdcd5b8cb157d21..a9e0afc645b8bd543590e80b55a7461381373187 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1539,7 +1539,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1546,7 +1546,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 06e3385d4f148eb23f9ddf560afb563897846609..672bc56194e1ad8b03acd639c17b7f7e
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1568,6 +1568,12 @@ if (!is_android) {
+@@ -1575,6 +1575,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index db1be0f2a4649..1047a3423e7df 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 2f86fff71f36353f1fc3d8024f16dbb4921a1db8..db9d0406637bca783f5a9f0beecbbaaac6d1c1cf 100644
+index 028c190ad21eb1899c61295695931bd2353518a5..9e74a54266460fc51e6b3492c842cda3c0b88538 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1279,7 +1279,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1255,7 +1255,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index 0ebb265485662..ee020bad0e1f1 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 8b236cbd54011bc0008d56ca4213920e478f7a90..ece0f7a284fc87f879d21e754b0b050236081d61 100644
+index 5499f85fa578511d5817ecd9be2f33cf56e2db4b..3f0a3b2133f0d48054f33df28b93a9ee40d7ed78 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1752,9 +1752,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1762,9 +1762,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
index 7e9b3c98af489..f0a87b75ca482 100644
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.
 
 diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-index b0279116fef365106926dd3b5e4cd5f0670c70ae..0b9e71de7a94d8b19b3534e8b8b9a5d56193567b 100644
+index 6e1d72902ec3e4a479304ff39b8b537d23f5cdf3..b7b198b159d250eca1498206ec29cc0270071f2a 100644
 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 @@ -8,6 +8,7 @@
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index bb2a2c91cd389..a8d925dde904d 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 1ebb4970ef9c440c5c2584785397696c7ebc14ce..5f200acb893f6c6b4ffb7c5a6ca010dde8a245e9 100644
+index 9b532970afe951f7c12629903baa39f2b8de1a5e..6f01f3eb8df96320700448e4583e4a4a0b3d2beb 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3059,6 +3059,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3066,6 +3066,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 1ebb4970ef9c440c5c2584785397696c7ebc14ce..5f200acb893f6c6b4ffb7c5a6ca010dd
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3069,6 +3076,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3076,6 +3083,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,10 +35,10 @@ index 1ebb4970ef9c440c5c2584785397696c7ebc14ce..5f200acb893f6c6b4ffb7c5a6ca010dd
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index f1b8dee6699c02884372aa05279d2d23274efdfd..922048fbc03f7222e42e3640b46d3d5e1b2391ba 100644
+index 5c710ded76711125c8e2de8e2c9bce7569548732..a3ae580ea073024882bd860abf914bbf7c0ed54d 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -93,10 +93,13 @@ class BrowserContext;
+@@ -94,10 +94,13 @@ class BrowserContext;
  class BrowserPluginGuestDelegate;
  class RenderFrameHost;
  class RenderViewHost;
@@ -52,7 +52,7 @@ index f1b8dee6699c02884372aa05279d2d23274efdfd..922048fbc03f7222e42e3640b46d3d5e
  class WebUI;
  struct DropData;
  struct MHTMLGenerationParams;
-@@ -234,6 +237,10 @@ class WebContents : public PageNavigator,
+@@ -236,6 +239,10 @@ class WebContents : public PageNavigator,
      network::mojom::WebSandboxFlags starting_sandbox_flags =
          network::mojom::WebSandboxFlags::kNone;
  
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 1ff868607e31f..2e374e7e83645 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,11 +14,11 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 187b94d207570a77f058915b9e5b581c777adc5a..55b56c4b18bba342db29bc493e07b27aee1f586a 100644
+index 9c6f51f1667d9bf1b430a83747faebf633a324c7..edc7111e2a61c917ec987264ddfbc4ee55f33730 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6509,6 +6509,15 @@ void RenderFrameHostImpl::EnterFullscreen(
-     notified_instances.insert(parent_site_instance);
+@@ -6565,6 +6565,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+     }
    }
  
 +  // Entering fullscreen from webview should also notify its outer frame.
@@ -26,8 +26,10 @@ index 187b94d207570a77f058915b9e5b581c777adc5a..55b56c4b18bba342db29bc493e07b27a
 +    RenderFrameProxyHost* outer_proxy =
 +        frame_tree_node()->render_manager()->GetProxyToOuterDelegate();
 +    DCHECK(outer_proxy);
-+    outer_proxy->GetAssociatedRemoteFrame()->WillEnterFullscreen(
-+        options.Clone());
++    if (outer_proxy->is_render_frame_proxy_live()) {
++      outer_proxy->GetAssociatedRemoteFrame()->WillEnterFullscreen(
++          options.Clone());
++    }
 +  }
 +
    // Focus the window if another frame may have delegated the capability.
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index efef6124f4d55..994967d5e1d8a 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -26,10 +26,10 @@ index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index a5f2807bfa3bd2515aac5fb2090780720a860314..0533dbcdb64af9ebf3f3dcec36038fe76136a15a 100644
+index e6ed59bb367c2ec8997867d847d79304b5e78be4..f2401245c4feb507966a47c82c66d956802d5ede 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -909,6 +909,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -873,6 +873,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index a5f2807bfa3bd2515aac5fb2090780720a860314..0533dbcdb64af9ebf3f3dcec36038fe7
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 40146f89d1d946674025c51896fed23a9782b4fb..af85bef23dbc259ba4554aaa28cf3c06a80ea437 100644
+index 62370f36f8b19c409e65c3d19a7536a50c7f3d0c..ad67b32366ee276d4a9917e17ce335c3ec507a48 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -191,6 +191,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -183,6 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -55,10 +55,10 @@ index 40146f89d1d946674025c51896fed23a9782b4fb..af85bef23dbc259ba4554aaa28cf3c06
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index a9ba1b0ec765ee51b1341afe81210e87d2c93c82..2970cb32f408fa812cc006f3c70ec5c55115781b 100644
+index b3845ea3620684e3a89f9c2a99fb9c8505f942e2..d7fed3409f1846d9655aa2b4adc89768af8ba22f 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -675,6 +675,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -638,6 +638,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index f816b1d0f401b..33c10c2fd8b05 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -35,10 +35,10 @@ index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 0533dbcdb64af9ebf3f3dcec36038fe76136a15a..6f4019347855650cb2203f59c5568e2a029639a1 100644
+index f2401245c4feb507966a47c82c66d956802d5ede..916fc0110338224c21bc6cc29536a152659e9569 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -921,6 +921,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -885,6 +885,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index 0533dbcdb64af9ebf3f3dcec36038fe76136a15a..6f4019347855650cb2203f59c5568e2a
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index af85bef23dbc259ba4554aaa28cf3c06a80ea437..d6368cee4c3a87882bac1d1d63df8698dd96b0fa 100644
+index ad67b32366ee276d4a9917e17ce335c3ec507a48..62bc2b9122733d397093fdba0b2315cb0993cb48 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -191,6 +191,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -183,6 +183,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -65,10 +65,10 @@ index af85bef23dbc259ba4554aaa28cf3c06a80ea437..d6368cee4c3a87882bac1d1d63df8698
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index 2970cb32f408fa812cc006f3c70ec5c55115781b..808234569ff2fc80945b2707020197302e20d856 100644
+index d7fed3409f1846d9655aa2b4adc89768af8ba22f..169916298918d19f23f4e4dce5a306e94d640226 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -675,6 +675,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -638,6 +638,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -78,10 +78,10 @@ index 2970cb32f408fa812cc006f3c70ec5c55115781b..808234569ff2fc80945b270702019730
    virtual bool AllowScriptExtensionForServiceWorker(
        const WebSecurityOrigin& script_origin) {
 diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
-index 03288c7b1897ee2c18b80677ee5837246d36568a..fc10bbf3d92c7f88c734d8ecfb20dbc4b72ae200 100644
+index ae3d2a664a9bd758d495f90f237f4f0ae768aef9..b56470ef35862f1b1b2af69bc48d842d2aa4ba7c 100644
 --- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
-@@ -257,6 +257,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
+@@ -262,6 +262,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
    V8PerContextData* per_context_data = script_state_->PerContextData();
    std::ignore =
        per_context_data->ConstructorForType(global_scope_->GetWrapperTypeInfo());
diff --git a/patches/v8/.patches b/patches/v8/.patches
index ea88a8670a84c..0e16c5eabc6fe 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -10,4 +10,3 @@ revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
 chore_disable_is_execution_terminating_dcheck.patch
 build_remove_legacy_oom_error_callback.patch
-cherry-pick-5e227bebf193.patch
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 47cea967e99d9..23d717ab96d75 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c51da9f12ecab41256bf0cdb7a0170e99302dc35..a0154b94bf390b639e1144bc3eb6041631b29716 100644
+index c918081b31fdf15efd325ae9d688f6c4f59aded1..3820a03365e58a05f2df16195ed6061f1c451a05 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -626,7 +626,7 @@ config("internal_config") {
+@@ -636,7 +636,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index c51da9f12ecab41256bf0cdb7a0170e99302dc35..a0154b94bf390b639e1144bc3eb60416
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5986,7 +5986,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -5999,7 +5999,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
@@ -30,7 +30,7 @@ index c51da9f12ecab41256bf0cdb7a0170e99302dc35..a0154b94bf390b639e1144bc3eb60416
  
      deps = [
        ":v8_libbase",
-@@ -6024,6 +6024,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -6037,6 +6037,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
  
      configs = [ ":internal_config" ]
  
diff --git a/patches/v8/build_remove_legacy_oom_error_callback.patch b/patches/v8/build_remove_legacy_oom_error_callback.patch
index 989e15f01b4b0..0fa0b7bbd422d 100644
--- a/patches/v8/build_remove_legacy_oom_error_callback.patch
+++ b/patches/v8/build_remove_legacy_oom_error_callback.patch
@@ -30,10 +30,10 @@ index b39921dea0415362d1a30159f3fac0e345e2313e..810fc4edaf69565959148d3c1ec662f0
    bool is_heap_oom = false;
    const char* detail = nullptr;
 diff --git a/include/v8-initialization.h b/include/v8-initialization.h
-index 5cadd1788926a7b305ba4d05792b9efa6183d73e..c01c337317afb088927cae0239542281a89d1bb1 100644
+index 66adf98c17998dd81178e515db01ef43daae14d7..224ae0dc6b34b4724192a1b0547be110f796a9b2 100644
 --- a/include/v8-initialization.h
 +++ b/include/v8-initialization.h
-@@ -286,9 +286,6 @@ class V8_EXPORT V8 {
+@@ -284,9 +284,6 @@ class V8_EXPORT V8 {
     */
    static void SetFatalMemoryErrorCallback(OOMErrorCallback callback);
  
@@ -69,10 +69,10 @@ index b54c7388603b4582356f6741c9a36f2835aa1928..b9533b78046228705e2038396eebf23b
    void SetOOMErrorHandler(OOMErrorCallback that);
  
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a0b9ae99a 100644
+index 9fafa6b0089aabf55984b68cff85e353fe50ce52..9472ad8f4f776f98d398113b22a6a710596b3cde 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -167,13 +167,6 @@
+@@ -171,13 +171,6 @@
  
  namespace v8 {
  
@@ -86,7 +86,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
  static OOMErrorCallback g_oom_error_callback = nullptr;
  
  static ScriptOrigin GetScriptOriginForScript(i::Isolate* i_isolate,
-@@ -231,9 +224,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
+@@ -235,9 +228,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
      // Give the embedder a chance to handle the condition. If it doesn't,
      // just crash.
      if (g_oom_error_callback) g_oom_error_callback(location, details);
@@ -96,7 +96,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
      FATAL("Fatal process out of memory: %s", location);
      UNREACHABLE();
    }
-@@ -309,9 +299,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
+@@ -313,9 +303,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
    }
    Utils::ReportOOMFailure(i_isolate, location, details);
    if (g_oom_error_callback) g_oom_error_callback(location, details);
@@ -106,7 +106,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
    // If the fatal error handler returns, we stop execution.
    FATAL("API fatal error handler returned after process out of memory");
  }
-@@ -343,8 +330,6 @@ void Utils::ReportOOMFailure(i::Isolate* i_isolate, const char* location,
+@@ -347,8 +334,6 @@ void Utils::ReportOOMFailure(i::Isolate* i_isolate, const char* location,
                               const OOMDetails& details) {
    if (auto oom_callback = i_isolate->oom_behavior()) {
      oom_callback(location, details);
@@ -115,7 +115,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
    } else {
      // TODO(wfh): Remove this fallback once Blink is setting OOM handler. See
      // crbug.com/614440.
-@@ -6141,11 +6126,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
+@@ -6175,11 +6160,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
    g_oom_error_callback = oom_error_callback;
  }
  
@@ -127,7 +127,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
  void v8::V8::SetEntropySource(EntropySource entropy_source) {
    base::RandomNumberGenerator::SetEntropySource(entropy_source);
  }
-@@ -8654,8 +8634,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
+@@ -8702,8 +8682,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
  #endif
    if (params.oom_error_callback) {
      v8_isolate->SetOOMErrorHandler(params.oom_error_callback);
@@ -136,7 +136,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
    }
  #if __clang__
  #pragma clang diagnostic pop
-@@ -9397,8 +9375,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
+@@ -9445,8 +9423,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
  
  CALLBACK_SETTER(FatalErrorHandler, FatalErrorCallback, exception_behavior)
  CALLBACK_SETTER(OOMErrorHandler, OOMErrorCallback, oom_behavior)
@@ -146,7 +146,7 @@ index 82ed3b8c44b62d67fc7e897423ca1c1999befb7f..dcae2f80cba468c1a98e589fd68ce60a
                  ModifyCodeGenerationFromStringsCallback2,
                  modify_code_gen_callback2)
 diff --git a/src/execution/isolate.h b/src/execution/isolate.h
-index 00494e347438e92b509ec67f4d77688e091d348b..8c151c8674fdb5d4b3af3de88e97e70239fa8ed7 100644
+index 13100146bdc981480a08156b54649b8f995789ae..9a117c4220704ed512b117aa2f50c3791f8e9189 100644
 --- a/src/execution/isolate.h
 +++ b/src/execution/isolate.h
 @@ -487,16 +487,9 @@ V8_EXPORT_PRIVATE void FreeCurrentEmbeddedBlob();
diff --git a/patches/v8/cherry-pick-5e227bebf193.patch b/patches/v8/cherry-pick-5e227bebf193.patch
deleted file mode 100644
index 31e47fac5dcf5..0000000000000
--- a/patches/v8/cherry-pick-5e227bebf193.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-Date: Sat, 9 Jul 2022 14:05:56 +0200
-Subject: Fix undefined symbol linker error
-
-Assembler::CheckBuffer() was defined inline in a header file but without
-inline linkage, causing an undefined symbol link error on arm64 macOS.
-
-Fixes: https://github.com/nodejs/node-v8/issues/233
-Bug: v8:13055
-Change-Id: Ifb638705e95de72b2e8d472e7092e88d77cf8ba8
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3749583
-Auto-Submit: Ben Noordhuis <info@bnoordhuis.nl>
-Reviewed-by: Leszek Swirski <leszeks@chromium.org>
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Commit-Queue: Leszek Swirski <leszeks@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#81749}
-
-diff --git a/src/codegen/arm64/assembler-arm64-inl.h b/src/codegen/arm64/assembler-arm64-inl.h
-index da4201b28307a71e988b50e26fc8854fdcc510d4..60deb07b65b5acaaa1e8762cc57730f366f483d2 100644
---- a/src/codegen/arm64/assembler-arm64-inl.h
-+++ b/src/codegen/arm64/assembler-arm64-inl.h
-@@ -1066,21 +1066,6 @@ const Register& Assembler::AppropriateZeroRegFor(const CPURegister& reg) const {
-   return reg.Is64Bits() ? xzr : wzr;
- }
- 
--inline void Assembler::CheckBufferSpace() {
--  DCHECK_LT(pc_, buffer_start_ + buffer_->size());
--  if (V8_UNLIKELY(buffer_space() < kGap)) {
--    GrowBuffer();
--  }
--}
--
--V8_INLINE void Assembler::CheckBuffer() {
--  CheckBufferSpace();
--  if (pc_offset() >= next_veneer_pool_check_) {
--    CheckVeneerPool(false, true);
--  }
--  constpool_.MaybeCheck();
--}
--
- EnsureSpace::EnsureSpace(Assembler* assembler) : block_pools_scope_(assembler) {
-   assembler->CheckBufferSpace();
- }
-diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
-index 703e4bba9381c57849882e7cb2cdeb751064dd2a..dceda86275d3ef0bfc2b5bea9d8f04957b2e721c 100644
---- a/src/codegen/arm64/assembler-arm64.h
-+++ b/src/codegen/arm64/assembler-arm64.h
-@@ -2625,8 +2625,21 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
-   }
- 
-   void GrowBuffer();
--  V8_INLINE void CheckBufferSpace();
--  void CheckBuffer();
-+
-+  void CheckBufferSpace() {
-+    DCHECK_LT(pc_, buffer_start_ + buffer_->size());
-+    if (V8_UNLIKELY(buffer_space() < kGap)) {
-+      GrowBuffer();
-+    }
-+  }
-+
-+  void CheckBuffer() {
-+    CheckBufferSpace();
-+    if (pc_offset() >= next_veneer_pool_check_) {
-+      CheckVeneerPool(false, true);
-+    }
-+    constpool_.MaybeCheck();
-+  }
- 
-   // Emission of the veneer pools may be blocked in some code sequences.
-   int veneer_pool_blocked_nesting_;  // Block emission if this is not zero.
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index d7b2329787ca3..3dd20921716bf 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index fb22f212024d84555e5a5acdfc70ffa6259b9846..82ed3b8c44b62d67fc7e897423ca1c1999befb7f 100644
+index bbab4c72ac93fe7a5bba5de531e66be0775244ca..9fafa6b0089aabf55984b68cff85e353fe50ce52 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9146,7 +9146,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9194,7 +9194,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,7 +19,7 @@ index fb22f212024d84555e5a5acdfc70ffa6259b9846..82ed3b8c44b62d67fc7e897423ca1c19
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index df03810a6fea9ee45a9e8dfb8845f8e6eebbcc08..e2a2fdf77d434c504547d7589f67c556f1f2ae2c 100644
+index 5ed434303b6be71dc99abd7600f4ef489f763419..7e2952b9b14f915df72573d6be0813401da0cafb 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
 @@ -6195,9 +6195,9 @@ void Heap::TearDown() {
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 873945550cda7..9c6435bc65f6d 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 12df5c4fb41f5e710dfeac145d69d6a28e53c064..012e1755e11afed5cb154240cce4c6996790aa57 100644
+index b6a232081301a74ffbffb98311fc29c4015fc9f9..f5d605043e7f43324fd0bdf74f1decf634143cb0 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -626,6 +626,10 @@ config("internal_config") {
+@@ -636,6 +636,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 00c560abdb606..823df35e5a67e 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index a0154b94bf390b639e1144bc3eb6041631b29716..12df5c4fb41f5e710dfeac145d69d6a28e53c064 100644
+index 3820a03365e58a05f2df16195ed6061f1c451a05..b6a232081301a74ffbffb98311fc29c4015fc9f9 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -5998,7 +5998,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6011,7 +6011,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index 8b7b4daa28561..e39d8853848c3 100644
--- a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -6,7 +6,7 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 714d8a6f057ae98d8809a55e83c323c805170e8d..66ee2bd73b47231c17795ad0b23e558216878cae 100644
+index 6213da2ef434fff934b298eada084647d7a6ddc4..754743b0c82e2ccf9a330d18785f8cb59df80869 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
 @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index fa5ea09a847ee..f4802be8f6e88 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,10 +18,10 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index 2d2ac48555bdec0b96acd0cd8aafb47e71d4a53c..81d6204d3efd0f55105ec48ee6627293b2ffe5fc 100644
+index a984d2ce736a2c9a46eb7cc46eb03fc062f508d2..6bda9bc5878b1ee344eac9f9c4420db09a307792 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
-@@ -6156,12 +6156,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+@@ -6123,12 +6123,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    StoreFullTaggedNoWriteBarrier(pending_message, message);
  }
  
@@ -35,10 +35,10 @@ index 2d2ac48555bdec0b96acd0cd8aafb47e71d4a53c..81d6204d3efd0f55105ec48ee6627293
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index 79844e15dff8bcc9da7df17e3b76677c8cd5f87c..7efd34e45a3e263d86f1f3cef54b24c68424a8d4 100644
+index 9633ba5333c4f1c37e706f655fe37c59c4993b86..6022d5d5063bc6c4db1c15e1ffaaf4d5420c0a01 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -2532,7 +2532,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+@@ -2518,7 +2518,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
  
    TNode<HeapObject> GetPendingMessage();
    void SetPendingMessage(TNode<HeapObject> message);
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index e25c92d651333..39c674b87d709 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -39,10 +39,10 @@ index 818af524388b1aba51e984b7ff7f7b856d1e590b..7ba8a0e9bc11a65e72e66aebd87e1935
                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
 diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
-index f12e1ef130451afa1cb334a4ba07bdb2588ccc24..703e4bba9381c57849882e7cb2cdeb751064dd2a 100644
+index e3d8eb27dea2d241933bcb597bef35b46fcd2a09..0a752245ec25c80d5ed34b1a858fa43cc0d6dd40 100644
 --- a/src/codegen/arm64/assembler-arm64.h
 +++ b/src/codegen/arm64/assembler-arm64.h
-@@ -2119,11 +2119,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2120,11 +2120,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
      return rm.code() << Rm_offset;
    }
  
@@ -55,7 +55,7 @@ index f12e1ef130451afa1cb334a4ba07bdb2588ccc24..703e4bba9381c57849882e7cb2cdeb75
  
    static Instr Ra(CPURegister ra) {
      DCHECK_NE(ra.code(), kSPRegInternalCode);
-@@ -2147,15 +2143,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
+@@ -2148,15 +2144,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
  
    // These encoding functions allow the stack pointer to be encoded, and
    // disallow the zero register.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 8a6feece589e5..c444deba46a80 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -150,7 +150,7 @@
 #endif
 
 #if BUILDFLAG(IS_LINUX)
-#include "ui/views/linux_ui/linux_ui.h"
+#include "ui/linux/linux_ui.h"
 #endif
 
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -395,7 +395,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
   if (system_value)
     return *system_value;
 #elif BUILDFLAG(IS_LINUX)
-  if (auto* linux_ui = views::LinuxUI::instance())
+  if (auto* linux_ui = ui::LinuxUi::instance())
     return linux_ui->GetCursorBlinkInterval();
 #elif BUILDFLAG(IS_WIN)
   const auto system_msec = ::GetCaretBlinkTime();
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 0eb3bcc1388f2..ca46535c69055 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1541,8 +1541,8 @@ bool ElectronBrowserClient::PreSpawnChild(sandbox::TargetPolicy* policy,
                                           ChildSpawnFlags flags) {
   // Allow crashpad to communicate via named pipe.
   sandbox::ResultCode result = policy->AddRule(
-      sandbox::TargetPolicy::SUBSYS_FILES,
-      sandbox::TargetPolicy::FILES_ALLOW_ANY, L"\\??\\pipe\\crashpad_*");
+      sandbox::SubSystem::kFiles, sandbox::Semantics::kFilesAllowAny,
+      L"\\??\\pipe\\crashpad_*");
   if (result != sandbox::SBOX_ALL_OK)
     return false;
   return true;
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 8ffd3e4a3089f..a8891a0a782da 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -76,9 +76,9 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gtk/gtk_compat.h"  // nogncheck
 #include "ui/gtk/gtk_util.h"    // nogncheck
+#include "ui/linux/linux_ui.h"
+#include "ui/linux/linux_ui_factory.h"
 #include "ui/ozone/public/ozone_platform.h"
-#include "ui/views/linux_ui/linux_ui.h"
-#include "ui/views/linux_ui/linux_ui_factory.h"
 #endif
 
 #if BUILDFLAG(IS_WIN)
@@ -366,7 +366,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
 
 void ElectronBrowserMainParts::ToolkitInitialized() {
 #if BUILDFLAG(IS_LINUX)
-  auto linux_ui = CreateLinuxUi();
+  auto linux_ui = ui::CreateLinuxUi();
   DCHECK(ui::LinuxInputMethodContextFactory::instance());
 
   // Try loading gtk symbols used by Electron.
@@ -388,7 +388,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
   // here returns a NativeThemeGtk, which monitors GTK settings.
   dark_theme_observer_ = std::make_unique<DarkThemeObserver>();
   linux_ui->GetNativeTheme(nullptr)->AddObserver(dark_theme_observer_.get());
-  views::LinuxUI::SetInstance(std::move(linux_ui));
+  ui::LinuxUi::SetInstance(std::move(linux_ui));
 
   // Cursor theme changes are tracked by LinuxUI (via a CursorThemeManager
   // implementation). Start observing them once it's initialized.
diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc
index 02fe3d272567f..2acd06cbbafa1 100644
--- a/shell/browser/javascript_environment.cc
+++ b/shell/browser/javascript_environment.cc
@@ -253,6 +253,7 @@ v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
   // --js-flags.
   std::string js_flags =
       cmd->GetSwitchValueASCII(blink::switches::kJavaScriptFlags);
+  js_flags.append(" --no-freeze-flags-after-init");
   if (!js_flags.empty())
     v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
 
diff --git a/shell/browser/printing/print_view_manager_electron.cc b/shell/browser/printing/print_view_manager_electron.cc
index 369b97fbd049e..ccfb4d0f44ffe 100644
--- a/shell/browser/printing/print_view_manager_electron.cc
+++ b/shell/browser/printing/print_view_manager_electron.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/bind.h"
 #include "build/build_config.h"
 #include "components/printing/browser/print_to_pdf/pdf_print_utils.h"
 #include "printing/mojom/print.mojom.h"
@@ -133,7 +134,39 @@ void PrintViewManagerElectron::PrintToPdf(
   headless_jobs_.emplace_back(cookie);
   callback_ = std::move(callback);
 
-  GetPrintRenderFrame(rfh)->PrintWithParams(std::move(print_pages_params));
+  // There is no need for a weak pointer here since the mojo proxy is held
+  // in the base class. If we're gone, mojo will discard the callback.
+  GetPrintRenderFrame(rfh)->PrintWithParams(
+      std::move(print_pages_params),
+      base::BindOnce(&PrintViewManagerElectron::OnDidPrintWithParams,
+                     base::Unretained(this)));
+}
+
+void PrintViewManagerElectron::OnDidPrintWithParams(
+    printing::mojom::PrintWithParamsResultPtr result) {
+  if (result->is_failure_reason()) {
+    switch (result->get_failure_reason()) {
+      case printing::mojom::PrintFailureReason::kGeneralFailure:
+        ReleaseJob(PRINTING_FAILED);
+        return;
+      case printing::mojom::PrintFailureReason::kInvalidPageRange:
+        ReleaseJob(PAGE_COUNT_EXCEEDED);
+        return;
+    }
+  }
+
+  auto& content = *result->get_params()->content;
+  if (!content.metafile_data_region.IsValid()) {
+    ReleaseJob(INVALID_MEMORY_HANDLE);
+    return;
+  }
+  base::ReadOnlySharedMemoryMapping map = content.metafile_data_region.Map();
+  if (!map.IsValid()) {
+    ReleaseJob(METAFILE_MAP_ERROR);
+    return;
+  }
+  data_ = std::string(static_cast<const char*>(map.memory()), map.size());
+  ReleaseJob(PRINT_SUCCESS);
 }
 
 void PrintViewManagerElectron::GetDefaultPrintSettings(
@@ -171,20 +204,6 @@ void PrintViewManagerElectron::ShowInvalidPrinterSettingsError() {
   ReleaseJob(INVALID_PRINTER_SETTINGS);
 }
 
-void PrintViewManagerElectron::PrintingFailed(
-    int32_t cookie,
-    printing::mojom::PrintFailureReason reason) {
-  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(), cookie);
-  if (entry == headless_jobs_.end()) {
-    PrintViewManagerBase::PrintingFailed(cookie, reason);
-    return;
-  }
-
-  ReleaseJob(reason == printing::mojom::PrintFailureReason::kInvalidPageRange
-                 ? PAGE_COUNT_EXCEEDED
-                 : PRINTING_FAILED);
-}
-
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 void PrintViewManagerElectron::UpdatePrintSettings(
     int32_t cookie,
@@ -245,37 +264,6 @@ void PrintViewManagerElectron::DidGetPrintedPagesCount(int32_t cookie,
   }
 }
 
-void PrintViewManagerElectron::DidPrintDocument(
-    printing::mojom::DidPrintDocumentParamsPtr params,
-    DidPrintDocumentCallback callback) {
-  auto entry = std::find(headless_jobs_.begin(), headless_jobs_.end(),
-                         params->document_cookie);
-  if (entry == headless_jobs_.end()) {
-    PrintViewManagerBase::DidPrintDocument(std::move(params),
-                                           std::move(callback));
-    return;
-  }
-
-  auto& content = *params->content;
-  if (!content.metafile_data_region.IsValid()) {
-    ReleaseJob(INVALID_MEMORY_HANDLE);
-    std::move(callback).Run(false);
-    return;
-  }
-
-  base::ReadOnlySharedMemoryMapping map = content.metafile_data_region.Map();
-  if (!map.IsValid()) {
-    ReleaseJob(METAFILE_MAP_ERROR);
-    std::move(callback).Run(false);
-    return;
-  }
-
-  data_ = std::string(static_cast<const char*>(map.memory()), map.size());
-  headless_jobs_.erase(entry);
-  std::move(callback).Run(true);
-  ReleaseJob(PRINT_SUCCESS);
-}
-
 void PrintViewManagerElectron::Reset() {
   printing_rfh_ = nullptr;
   callback_.Reset();
diff --git a/shell/browser/printing/print_view_manager_electron.h b/shell/browser/printing/print_view_manager_electron.h
index 197b3c77adfa4..bf244a522ac2b 100644
--- a/shell/browser/printing/print_view_manager_electron.h
+++ b/shell/browser/printing/print_view_manager_electron.h
@@ -61,23 +61,22 @@ class PrintViewManagerElectron
                   PrintToPDFCallback callback);
 
  private:
-  explicit PrintViewManagerElectron(content::WebContents* web_contents);
   friend class content::WebContentsUserData<PrintViewManagerElectron>;
 
+  explicit PrintViewManagerElectron(content::WebContents* web_contents);
+
+  void OnDidPrintWithParams(printing::mojom::PrintWithParamsResultPtr result);
+
   // WebContentsObserver overrides (via PrintManager):
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
 
   // printing::mojom::PrintManagerHost:
-  void DidPrintDocument(printing::mojom::DidPrintDocumentParamsPtr params,
-                        DidPrintDocumentCallback callback) override;
   void DidGetPrintedPagesCount(int32_t cookie, uint32_t number_pages) override;
   void GetDefaultPrintSettings(
       GetDefaultPrintSettingsCallback callback) override;
   void ScriptedPrint(printing::mojom::ScriptedPrintParamsPtr params,
                      ScriptedPrintCallback callback) override;
   void ShowInvalidPrinterSettingsError() override;
-  void PrintingFailed(int32_t cookie,
-                      printing::mojom::PrintFailureReason reason) override;
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
   void UpdatePrintSettings(int32_t cookie,
                            base::Value::Dict job_settings,
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
index 17b85784c0de8..0ab1f292619c3 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.cc
@@ -16,8 +16,8 @@
 #include "shell/browser/ui/views/client_frame_view_linux.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/skia_conversions.h"
+#include "ui/linux/linux_ui.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 #include "ui/views/window/non_client_view.h"
diff --git a/shell/browser/ui/electron_desktop_window_tree_host_linux.h b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
index e9bb28adb97dc..6a6130b4489b6 100644
--- a/shell/browser/ui/electron_desktop_window_tree_host_linux.h
+++ b/shell/browser/ui/electron_desktop_window_tree_host_linux.h
@@ -13,9 +13,9 @@
 #include "shell/browser/native_window_views.h"
 #include "shell/browser/ui/views/client_frame_view_linux.h"
 #include "third_party/skia/include/core/SkRRect.h"
+#include "ui/linux/device_scale_factor_observer.h"
 #include "ui/native_theme/native_theme_observer.h"
 #include "ui/platform_window/platform_window.h"
-#include "ui/views/linux_ui/device_scale_factor_observer.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
 
 namespace electron {
@@ -23,7 +23,7 @@ namespace electron {
 class ElectronDesktopWindowTreeHostLinux
     : public views::DesktopWindowTreeHostLinux,
       public ui::NativeThemeObserver,
-      public views::DeviceScaleFactorObserver {
+      public ui::DeviceScaleFactorObserver {
  public:
   ElectronDesktopWindowTreeHostLinux(
       NativeWindowViews* native_window_view,
@@ -62,10 +62,10 @@ class ElectronDesktopWindowTreeHostLinux
 
   base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver>
       theme_observation_{this};
-  base::ScopedObservation<views::LinuxUI,
-                          views::DeviceScaleFactorObserver,
-                          &views::LinuxUI::AddDeviceScaleFactorObserver,
-                          &views::LinuxUI::RemoveDeviceScaleFactorObserver>
+  base::ScopedObservation<ui::LinuxUi,
+                          ui::DeviceScaleFactorObserver,
+                          &ui::LinuxUi::AddDeviceScaleFactorObserver,
+                          &ui::LinuxUi::RemoveDeviceScaleFactorObserver>
       scale_observation_{this};
   ui::PlatformWindowState window_state_ = ui::PlatformWindowState::kUnknown;
 };
diff --git a/shell/browser/ui/gtk/app_indicator_icon.h b/shell/browser/ui/gtk/app_indicator_icon.h
index ab0f4d5634156..8695545d9b4d9 100644
--- a/shell/browser/ui/gtk/app_indicator_icon.h
+++ b/shell/browser/ui/gtk/app_indicator_icon.h
@@ -13,7 +13,7 @@
 #include "base/nix/xdg_util.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "ui/base/glib/glib_signal.h"
-#include "ui/views/linux_ui/status_icon_linux.h"
+#include "ui/linux/status_icon_linux.h"
 
 typedef struct _AppIndicator AppIndicator;
 typedef struct _GtkWidget GtkWidget;
@@ -33,7 +33,7 @@ namespace electron::gtkui {
 class AppIndicatorIconMenu;
 
 // Status icon implementation which uses libappindicator.
-class AppIndicatorIcon : public views::StatusIconLinux {
+class AppIndicatorIcon : public ui::StatusIconLinux {
  public:
   // The id uniquely identifies the new status icon from other chrome status
   // icons.
@@ -49,7 +49,7 @@ class AppIndicatorIcon : public views::StatusIconLinux {
   // Indicates whether libappindicator so could be opened.
   static bool CouldOpen();
 
-  // Overridden from views::StatusIconLinux:
+  // Overridden from ui::StatusIconLinux:
   void SetIcon(const gfx::ImageSkia& image) override;
   void SetToolTip(const std::u16string& tool_tip) override;
   void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
diff --git a/shell/browser/ui/gtk/gtk_status_icon.h b/shell/browser/ui/gtk/gtk_status_icon.h
index 22b0788026a13..7d7163cea96bd 100644
--- a/shell/browser/ui/gtk/gtk_status_icon.h
+++ b/shell/browser/ui/gtk/gtk_status_icon.h
@@ -9,7 +9,7 @@
 
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/glib/glib_signal.h"
-#include "ui/views/linux_ui/status_icon_linux.h"
+#include "ui/linux/status_icon_linux.h"
 
 typedef struct _GtkStatusIcon GtkStatusIcon;
 
@@ -27,7 +27,7 @@ class AppIndicatorIconMenu;
 
 // Status icon implementation which uses the system tray X11 spec (via
 // GtkStatusIcon).
-class GtkStatusIcon : public views::StatusIconLinux {
+class GtkStatusIcon : public ui::StatusIconLinux {
  public:
   GtkStatusIcon(const gfx::ImageSkia& image, const std::u16string& tool_tip);
   ~GtkStatusIcon() override;
@@ -36,7 +36,7 @@ class GtkStatusIcon : public views::StatusIconLinux {
   GtkStatusIcon(const GtkStatusIcon&) = delete;
   GtkStatusIcon& operator=(const GtkStatusIcon&) = delete;
 
-  // Overridden from views::StatusIconLinux:
+  // Overridden from ui::StatusIconLinux:
   void SetIcon(const gfx::ImageSkia& image) override;
   void SetToolTip(const std::u16string& tool_tip) override;
   void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
diff --git a/shell/browser/ui/gtk/status_icon.cc b/shell/browser/ui/gtk/status_icon.cc
index 72eeeb81716a7..dea4a7f952794 100644
--- a/shell/browser/ui/gtk/status_icon.cc
+++ b/shell/browser/ui/gtk/status_icon.cc
@@ -33,7 +33,7 @@ bool IsStatusIconSupported() {
 #endif
 }
 
-std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
+std::unique_ptr<ui::StatusIconLinux> CreateLinuxStatusIcon(
     const gfx::ImageSkia& image,
     const std::u16string& tool_tip,
     const char* id_prefix) {
diff --git a/shell/browser/ui/gtk/status_icon.h b/shell/browser/ui/gtk/status_icon.h
index 43203d2c780b7..df80d03157e04 100644
--- a/shell/browser/ui/gtk/status_icon.h
+++ b/shell/browser/ui/gtk/status_icon.h
@@ -13,12 +13,12 @@
 
 #include "base/strings/string_util.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/views/linux_ui/status_icon_linux.h"
+#include "ui/linux/status_icon_linux.h"
 
 namespace electron::gtkui {
 
 bool IsStatusIconSupported();
-std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
+std::unique_ptr<ui::StatusIconLinux> CreateLinuxStatusIcon(
     const gfx::ImageSkia& image,
     const std::u16string& tool_tip,
     const char* id_prefix);
diff --git a/shell/browser/ui/tray_icon_gtk.h b/shell/browser/ui/tray_icon_gtk.h
index c01621aed24a1..7da8890d6b702 100644
--- a/shell/browser/ui/tray_icon_gtk.h
+++ b/shell/browser/ui/tray_icon_gtk.h
@@ -9,11 +9,11 @@
 #include <string>
 
 #include "shell/browser/ui/tray_icon.h"
-#include "ui/views/linux_ui/status_icon_linux.h"
+#include "ui/linux/status_icon_linux.h"
 
 namespace electron {
 
-class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
+class TrayIconGtk : public TrayIcon, public ui::StatusIconLinux::Delegate {
  public:
   TrayIconGtk();
   ~TrayIconGtk() override;
@@ -23,7 +23,7 @@ class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
   void SetToolTip(const std::string& tool_tip) override;
   void SetContextMenu(ElectronMenuModel* menu_model) override;
 
-  // views::StatusIconLinux::Delegate
+  // ui::StatusIconLinux::Delegate
   void OnClick() override;
   bool HasClickAction() override;
   // The following four methods are only used by StatusIconLinuxDbus, which we
@@ -34,7 +34,7 @@ class TrayIconGtk : public TrayIcon, public views::StatusIconLinux::Delegate {
   void OnImplInitializationFailed() override;
 
  private:
-  std::unique_ptr<views::StatusIconLinux> icon_;
+  std::unique_ptr<ui::StatusIconLinux> icon_;
   gfx::ImageSkia image_;
   std::u16string tool_tip_;
   ui::MenuModel* menu_model_;
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
index 2a085d04d6af5..011764e864f96 100644
--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -23,11 +23,11 @@
 #include "ui/gfx/text_constants.h"
 #include "ui/gtk/gtk_compat.h"  // nogncheck
 #include "ui/gtk/gtk_util.h"    // nogncheck
+#include "ui/linux/linux_ui.h"
+#include "ui/linux/nav_button_provider.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/linux_ui/linux_ui.h"
-#include "ui/views/linux_ui/nav_button_provider.h"
 #include "ui/views/style/typography.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/frame_buttons.h"
@@ -41,6 +41,25 @@ namespace {
 constexpr int kResizeOutsideBorderSize = 10;
 constexpr int kResizeInsideBoundsSize = 5;
 
+ui::NavButtonProvider::ButtonState ButtonStateToNavButtonProviderState(
+    views::Button::ButtonState state) {
+  switch (state) {
+    case views::Button::STATE_NORMAL:
+      return ui::NavButtonProvider::ButtonState::kNormal;
+    case views::Button::STATE_HOVERED:
+      return ui::NavButtonProvider::ButtonState::kHovered;
+    case views::Button::STATE_PRESSED:
+      return ui::NavButtonProvider::ButtonState::kPressed;
+    case views::Button::STATE_DISABLED:
+      return ui::NavButtonProvider::ButtonState::kDisabled;
+
+    case views::Button::STATE_COUNT:
+    default:
+      NOTREACHED();
+      return ui::NavButtonProvider::ButtonState::kNormal;
+  }
+}
+
 }  // namespace
 
 // static
@@ -48,19 +67,18 @@ const char ClientFrameViewLinux::kViewClassName[] = "ClientFrameView";
 
 ClientFrameViewLinux::ClientFrameViewLinux()
     : theme_(ui::NativeTheme::GetInstanceForNativeUi()),
-      nav_button_provider_(
-          views::LinuxUI::instance()->CreateNavButtonProvider()),
+      nav_button_provider_(ui::LinuxUi::instance()->CreateNavButtonProvider()),
       nav_buttons_{
-          NavButton{views::NavButtonProvider::FrameButtonDisplayType::kClose,
+          NavButton{ui::NavButtonProvider::FrameButtonDisplayType::kClose,
                     views::FrameButton::kClose, &views::Widget::Close,
                     IDS_APP_ACCNAME_CLOSE, HTCLOSE},
-          NavButton{views::NavButtonProvider::FrameButtonDisplayType::kMaximize,
+          NavButton{ui::NavButtonProvider::FrameButtonDisplayType::kMaximize,
                     views::FrameButton::kMaximize, &views::Widget::Maximize,
                     IDS_APP_ACCNAME_MAXIMIZE, HTMAXBUTTON},
-          NavButton{views::NavButtonProvider::FrameButtonDisplayType::kRestore,
+          NavButton{ui::NavButtonProvider::FrameButtonDisplayType::kRestore,
                     views::FrameButton::kMaximize, &views::Widget::Restore,
                     IDS_APP_ACCNAME_RESTORE, HTMAXBUTTON},
-          NavButton{views::NavButtonProvider::FrameButtonDisplayType::kMinimize,
+          NavButton{ui::NavButtonProvider::FrameButtonDisplayType::kMinimize,
                     views::FrameButton::kMinimize, &views::Widget::Minimize,
                     IDS_APP_ACCNAME_MINIMIZE, HTMINBUTTON},
       },
@@ -85,14 +103,14 @@ ClientFrameViewLinux::ClientFrameViewLinux()
 
   native_theme_observer_.Observe(theme_);
 
-  if (views::LinuxUI* ui = views::LinuxUI::instance()) {
+  if (ui::LinuxUi* ui = ui::LinuxUi::instance()) {
     ui->AddWindowButtonOrderObserver(this);
     OnWindowButtonOrderingChange();
   }
 }
 
 ClientFrameViewLinux::~ClientFrameViewLinux() {
-  if (views::LinuxUI* ui = views::LinuxUI::instance())
+  if (ui::LinuxUi* ui = ui::LinuxUi::instance())
     ui->RemoveWindowButtonOrderObserver(this);
   theme_->RemoveObserver(this);
 }
@@ -112,7 +130,7 @@ void ClientFrameViewLinux::Init(NativeWindowViews* window,
           window->GetAcceleratedWidget()));
   host_supports_client_frame_shadow_ = tree_host->SupportsClientFrameShadow();
 
-  frame_provider_ = views::LinuxUI::instance()->GetWindowFrameProvider(
+  frame_provider_ = ui::LinuxUi::instance()->GetWindowFrameProvider(
       !host_supports_client_frame_shadow_);
 
   UpdateWindowTitle();
@@ -326,11 +344,11 @@ void ClientFrameViewLinux::UpdateThemeValues() {
   SchedulePaint();
 }
 
-views::NavButtonProvider::FrameButtonDisplayType
+ui::NavButtonProvider::FrameButtonDisplayType
 ClientFrameViewLinux::GetButtonTypeToSkip() const {
   return frame_->IsMaximized()
-             ? views::NavButtonProvider::FrameButtonDisplayType::kMaximize
-             : views::NavButtonProvider::FrameButtonDisplayType::kRestore;
+             ? ui::NavButtonProvider::FrameButtonDisplayType::kMaximize
+             : ui::NavButtonProvider::FrameButtonDisplayType::kRestore;
 }
 
 void ClientFrameViewLinux::UpdateButtonImages() {
@@ -338,7 +356,7 @@ void ClientFrameViewLinux::UpdateButtonImages() {
                                      frame_->IsMaximized(),
                                      ShouldPaintAsActive());
 
-  views::NavButtonProvider::FrameButtonDisplayType skip_type =
+  ui::NavButtonProvider::FrameButtonDisplayType skip_type =
       GetButtonTypeToSkip();
 
   for (NavButton& button : nav_buttons_) {
@@ -351,7 +369,8 @@ void ClientFrameViewLinux::UpdateButtonImages() {
       views::Button::ButtonState state =
           static_cast<views::Button::ButtonState>(state_id);
       button.button->SetImage(
-          state, nav_button_provider_->GetImage(button.type, state));
+          state, nav_button_provider_->GetImage(
+                     button.type, ButtonStateToNavButtonProviderState(state)));
     }
   }
 }
@@ -369,7 +388,7 @@ void ClientFrameViewLinux::LayoutButtons() {
 void ClientFrameViewLinux::LayoutButtonsOnSide(
     ButtonSide side,
     gfx::Rect* remaining_content_bounds) {
-  views::NavButtonProvider::FrameButtonDisplayType skip_type =
+  ui::NavButtonProvider::FrameButtonDisplayType skip_type =
       GetButtonTypeToSkip();
 
   std::vector<views::FrameButton> frame_buttons;
diff --git a/shell/browser/ui/views/client_frame_view_linux.h b/shell/browser/ui/views/client_frame_view_linux.h
index b9bf50d8f7aa7..c76512465e023 100644
--- a/shell/browser/ui/views/client_frame_view_linux.h
+++ b/shell/browser/ui/views/client_frame_view_linux.h
@@ -11,14 +11,14 @@
 
 #include "base/scoped_observation.h"
 #include "shell/browser/ui/views/frameless_view.h"
+#include "ui/linux/linux_ui.h"
+#include "ui/linux/nav_button_provider.h"
+#include "ui/linux/window_button_order_observer.h"
+#include "ui/linux/window_frame_provider.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_observer.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/linux_ui/linux_ui.h"
-#include "ui/views/linux_ui/nav_button_provider.h"
-#include "ui/views/linux_ui/window_button_order_observer.h"
-#include "ui/views/linux_ui/window_frame_provider.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/frame_buttons.h"
 
@@ -26,7 +26,7 @@ namespace electron {
 
 class ClientFrameViewLinux : public FramelessView,
                              public ui::NativeThemeObserver,
-                             public views::WindowButtonOrderObserver {
+                             public ui::WindowButtonOrderObserver {
  public:
   static const char kViewClassName[];
   ClientFrameViewLinux();
@@ -71,7 +71,7 @@ class ClientFrameViewLinux : public FramelessView,
   static constexpr int kNavButtonCount = 4;
 
   struct NavButton {
-    views::NavButtonProvider::FrameButtonDisplayType type;
+    ui::NavButtonProvider::FrameButtonDisplayType type;
     views::FrameButton frame_button;
     void (views::Widget::*callback)();
     int accessibility_id;
@@ -98,7 +98,7 @@ class ClientFrameViewLinux : public FramelessView,
 
   enum class ButtonSide { kLeading, kTrailing };
 
-  views::NavButtonProvider::FrameButtonDisplayType GetButtonTypeToSkip() const;
+  ui::NavButtonProvider::FrameButtonDisplayType GetButtonTypeToSkip() const;
   void UpdateButtonImages();
   void LayoutButtons();
   void LayoutButtonsOnSide(ButtonSide side,
@@ -115,7 +115,7 @@ class ClientFrameViewLinux : public FramelessView,
 
   views::Label* title_;
 
-  std::unique_ptr<views::NavButtonProvider> nav_button_provider_;
+  std::unique_ptr<ui::NavButtonProvider> nav_button_provider_;
   std::array<NavButton, kNavButtonCount> nav_buttons_;
 
   std::vector<views::FrameButton> leading_frame_buttons_;
@@ -123,14 +123,14 @@ class ClientFrameViewLinux : public FramelessView,
 
   bool host_supports_client_frame_shadow_ = false;
 
-  views::WindowFrameProvider* frame_provider_;
+  ui::WindowFrameProvider* frame_provider_;
 
   base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver>
       native_theme_observer_{this};
-  base::ScopedObservation<views::LinuxUI,
-                          views::WindowButtonOrderObserver,
-                          &views::LinuxUI::AddWindowButtonOrderObserver,
-                          &views::LinuxUI::RemoveWindowButtonOrderObserver>
+  base::ScopedObservation<ui::LinuxUi,
+                          ui::WindowButtonOrderObserver,
+                          &ui::LinuxUi::AddWindowButtonOrderObserver,
+                          &ui::LinuxUi::RemoveWindowButtonOrderObserver>
       window_button_order_observer_{this};
 
   base::CallbackListSubscription paint_as_active_changed_subscription_;
diff --git a/shell/browser/ui/views/electron_views_delegate.cc b/shell/browser/ui/views/electron_views_delegate.cc
index 6f7859f2246fc..3510b896fc3c1 100644
--- a/shell/browser/ui/views/electron_views_delegate.cc
+++ b/shell/browser/ui/views/electron_views_delegate.cc
@@ -12,7 +12,7 @@
 #if BUILDFLAG(IS_LINUX)
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
-#include "ui/views/linux_ui/linux_ui.h"
+#include "ui/linux/linux_ui.h"
 #endif
 
 namespace {
diff --git a/shell/browser/web_view_guest_delegate.cc b/shell/browser/web_view_guest_delegate.cc
index 884c4be1ab871..465e25e5e554a 100644
--- a/shell/browser/web_view_guest_delegate.cc
+++ b/shell/browser/web_view_guest_delegate.cc
@@ -49,7 +49,10 @@ void WebViewGuestDelegate::AttachToIframe(
   // frame |embedder_frame| hosts the inner WebContents.
   embedder_web_contents_->AttachInnerWebContents(
       base::WrapUnique<content::WebContents>(guest_web_contents),
-      embedder_frame, false);
+      embedder_frame,
+      /*remote_frame=*/mojo::NullAssociatedRemote(),
+      /*remote_frame_host_receiver=*/mojo::NullAssociatedReceiver(),
+      /*is_full_page=*/false);
 
   ResetZoomController();
 
diff --git a/shell/common/gin_converters/value_converter.cc b/shell/common/gin_converters/value_converter.cc
index 414d535db5ebd..8510f50a0efec 100644
--- a/shell/common/gin_converters/value_converter.cc
+++ b/shell/common/gin_converters/value_converter.cc
@@ -30,7 +30,7 @@ v8::Local<v8::Value> Converter<base::Value::Dict>::ToV8(
     const base::Value::Dict& val) {
   base::Value value(val.Clone());
   return content::V8ValueConverter::Create()->ToV8Value(
-      &value, isolate->GetCurrentContext());
+      value, isolate->GetCurrentContext());
 }
 
 bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
@@ -50,7 +50,7 @@ bool Converter<base::Value>::FromV8(v8::Isolate* isolate,
 v8::Local<v8::Value> Converter<base::Value>::ToV8(v8::Isolate* isolate,
                                                   const base::Value& val) {
   return content::V8ValueConverter::Create()->ToV8Value(
-      &val, isolate->GetCurrentContext());
+      val, isolate->GetCurrentContext());
 }
 
 bool Converter<base::Value::List>::FromV8(v8::Isolate* isolate,
@@ -72,7 +72,7 @@ v8::Local<v8::Value> Converter<base::Value::List>::ToV8(
     const base::Value::List& val) {
   base::Value value(val.Clone());
   return content::V8ValueConverter::Create()->ToV8Value(
-      &value, isolate->GetCurrentContext());
+      value, isolate->GetCurrentContext());
 }
 
 }  // namespace gin
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index cac88b927f1ad..c1e831d590379 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -345,7 +345,7 @@ describe('web security', () => {
 
     it('wasm codegen is disallowed by default', async () => {
       const r = await loadWasm('');
-      expect(r).to.equal('WebAssembly.instantiate(): Wasm code generation disallowed by embedder');
+      expect(r).to.equal('WebAssembly.instantiate(): Refused to compile or instantiate WebAssembly module because \'unsafe-eval\' is not an allowed source of script in the following Content Security Policy directive: "script-src \'self\' \'unsafe-inline\'"');
     });
 
     it('wasm codegen is allowed with "wasm-unsafe-eval" csp', async () => {

From cffcd0d47a6bec4fbb1c02aa17b2d07724ad6d7b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 06:01:09 -0700
Subject: [PATCH 604/811] Bump v21.0.0-nightly.20220720

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 06abe267f1c14..d3434d0a0d285 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220719
\ No newline at end of file
+21.0.0-nightly.20220720
\ No newline at end of file
diff --git a/package.json b/package.json
index b429ed901b9e3..5ad09863cc96f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220719",
+  "version": "21.0.0-nightly.20220720",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 11e3b14c478a7..7c2f4e4877d9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220719
- PRODUCTVERSION 21,0,0,20220719
+ FILEVERSION 21,0,0,20220720
+ PRODUCTVERSION 21,0,0,20220720
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6dc1218c372dadbea06faa209fb6c2042652cdf3 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 07:14:04 -0700
Subject: [PATCH 605/811] Revert "Bump v21.0.0-nightly.20220720"

This reverts commit cffcd0d47a6bec4fbb1c02aa17b2d07724ad6d7b.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d3434d0a0d285..06abe267f1c14 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220720
\ No newline at end of file
+21.0.0-nightly.20220719
\ No newline at end of file
diff --git a/package.json b/package.json
index 5ad09863cc96f..b429ed901b9e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220720",
+  "version": "21.0.0-nightly.20220719",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 7c2f4e4877d9f..11e3b14c478a7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220720
- PRODUCTVERSION 21,0,0,20220720
+ FILEVERSION 21,0,0,20220719
+ PRODUCTVERSION 21,0,0,20220719
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From be7f90481de6581401bb5f03ab18d2f89b1daef1 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Wed, 20 Jul 2022 08:00:31 -0700
Subject: [PATCH 606/811] build: update mediastreamdevicescontroller.patch
 (#34995)

---
 ...permissions_checks_in_mediastreamdevicescontroller.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
index 82c2e5920e0f2..82cc6601cc08a 100644
--- a/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
+++ b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
@@ -15,7 +15,7 @@ short-circuit all the permissions checks in MSDC for now to allow us to
 unduplicate this code.
 
 diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
-index 353ed84da62b954a90c8d0a886495c0822f30429..1a1162ba960419a4de5eb2839ebc3debadca86d5 100644
+index 13bbeaac938b27446d5b62eb92ca761487db5fef..4cfe57a6356bbc2492f59957a0dfcf63052b7ee8 100644
 --- a/components/webrtc/media_stream_devices_controller.cc
 +++ b/components/webrtc/media_stream_devices_controller.cc
 @@ -93,11 +93,14 @@ void MediaStreamDevicesController::RequestPermissions(
@@ -70,7 +70,7 @@ index 353ed84da62b954a90c8d0a886495c0822f30429..1a1162ba960419a4de5eb2839ebc3deb
  
        permission_types.push_back(blink::PermissionType::CAMERA_PAN_TILT_ZOOM);
      }
-@@ -425,6 +433,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+@@ -417,6 +425,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
    if (rfh->GetLastCommittedOrigin().GetURL() != request_.security_origin) {
      return false;
    }
@@ -78,7 +78,7 @@ index 353ed84da62b954a90c8d0a886495c0822f30429..1a1162ba960419a4de5eb2839ebc3deb
    permissions::PermissionResult result =
        permissions::PermissionsClient::Get()
            ->GetPermissionManager(web_contents_->GetBrowserContext())
-@@ -433,6 +442,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+@@ -425,6 +434,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
      DCHECK_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
      return true;
    }

From 9f0e7126c422c12333544de0a20f954addd13061 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Jul 2022 08:02:19 -0700
Subject: [PATCH 607/811] Bump v21.0.0-nightly.20220720

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 06abe267f1c14..d3434d0a0d285 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220719
\ No newline at end of file
+21.0.0-nightly.20220720
\ No newline at end of file
diff --git a/package.json b/package.json
index b429ed901b9e3..5ad09863cc96f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220719",
+  "version": "21.0.0-nightly.20220720",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 11e3b14c478a7..7c2f4e4877d9f 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220719
- PRODUCTVERSION 21,0,0,20220719
+ FILEVERSION 21,0,0,20220720
+ PRODUCTVERSION 21,0,0,20220720
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 67eda4bcc81754a973a4455cd6db5ac624f4bfa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20H=C4=83loiu?= <valentin.haloiu@gmail.com>
Date: Thu, 21 Jul 2022 11:37:54 +0300
Subject: [PATCH 608/811] fix: add support for --ozone-platform-hint flag on
 Linux (#34937)

---
 filenames.gni                                 |   1 +
 shell/browser/electron_browser_main_parts.cc  |   1 +
 shell/browser/electron_browser_main_parts.h   |   4 +
 .../electron_browser_main_parts_linux.cc      | 134 ++++++++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 shell/browser/electron_browser_main_parts_linux.cc

diff --git a/filenames.gni b/filenames.gni
index df58773b49c74..9fda05b41f983 100644
--- a/filenames.gni
+++ b/filenames.gni
@@ -23,6 +23,7 @@ filenames = {
 
   lib_sources_linux = [
     "shell/browser/browser_linux.cc",
+    "shell/browser/electron_browser_main_parts_linux.cc",
     "shell/browser/lib/power_observer_linux.cc",
     "shell/browser/lib/power_observer_linux.h",
     "shell/browser/linux/unity_service.cc",
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index a8891a0a782da..13bd28b53443c 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -217,6 +217,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() {
   HandleSIGCHLD();
 #endif
 #if BUILDFLAG(IS_LINUX)
+  DetectOzonePlatform();
   ui::OzonePlatform::PreEarlyInitialization();
 #endif
 #if BUILDFLAG(IS_MAC)
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index 95ced64ed7c9e..3c45ed29bfbb7 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -122,6 +122,10 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 #endif
 
+#if BUILDFLAG(IS_LINUX)
+  void DetectOzonePlatform();
+#endif
+
 #if BUILDFLAG(IS_MAC)
   void FreeAppDelegate();
   void RegisterURLHandler();
diff --git a/shell/browser/electron_browser_main_parts_linux.cc b/shell/browser/electron_browser_main_parts_linux.cc
new file mode 100644
index 0000000000000..919cc085a2755
--- /dev/null
+++ b/shell/browser/electron_browser_main_parts_linux.cc
@@ -0,0 +1,134 @@
+// Copyright (c) 2022 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/electron_browser_main_parts.h"
+
+#include "base/command_line.h"
+#include "base/environment.h"
+#include "ui/ozone/public/ozone_switches.h"
+
+#if BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/nix/xdg_util.h"
+#include "base/threading/thread_restrictions.h"
+#endif
+
+#if BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+
+constexpr char kPlatformWayland[] = "wayland";
+
+bool HasWaylandDisplay(base::Environment* env) {
+  std::string wayland_display;
+  const bool has_wayland_display =
+      env->GetVar("WAYLAND_DISPLAY", &wayland_display) &&
+      !wayland_display.empty();
+  if (has_wayland_display)
+    return true;
+
+  std::string xdg_runtime_dir;
+  const bool has_xdg_runtime_dir =
+      env->GetVar("XDG_RUNTIME_DIR", &xdg_runtime_dir) &&
+      !xdg_runtime_dir.empty();
+  if (has_xdg_runtime_dir) {
+    auto wayland_server_pipe =
+        base::FilePath(xdg_runtime_dir).Append("wayland-0");
+    // Normally, this should happen exactly once, at the startup of the main
+    // process.
+    base::ScopedAllowBlocking allow_blocking;
+    return base::PathExists(wayland_server_pipe);
+  }
+
+  return false;
+}
+
+#endif  // BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+constexpr char kPlatformX11[] = "x11";
+#endif
+
+namespace electron {
+
+namespace {
+
+// Evaluates the environment and returns the effective platform name for the
+// given |ozone_platform_hint|.
+// For the "auto" value, returns "wayland" if the XDG session type is "wayland",
+// "x11" otherwise.
+// For the "wayland" value, checks if the Wayland server is available, and
+// returns "x11" if it is not.
+// See https://crbug.com/1246928.
+std::string MaybeFixPlatformName(const std::string& ozone_platform_hint) {
+#if BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+  // Wayland is selected if both conditions below are true:
+  // 1. The user selected either 'wayland' or 'auto'.
+  // 2. The XDG session type is 'wayland', OR the user has selected 'wayland'
+  //    explicitly and a Wayland server is running.
+  // Otherwise, fall back to X11.
+  if (ozone_platform_hint == kPlatformWayland ||
+      ozone_platform_hint == "auto") {
+    auto env(base::Environment::Create());
+
+    std::string xdg_session_type;
+    const bool has_xdg_session_type =
+        env->GetVar(base::nix::kXdgSessionTypeEnvVar, &xdg_session_type) &&
+        !xdg_session_type.empty();
+
+    if ((has_xdg_session_type && xdg_session_type == "wayland") ||
+        (ozone_platform_hint == kPlatformWayland &&
+         HasWaylandDisplay(env.get()))) {
+      return kPlatformWayland;
+    }
+  }
+#endif  // BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+  if (ozone_platform_hint == kPlatformX11) {
+    return kPlatformX11;
+  }
+#if BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+  if (ozone_platform_hint == kPlatformWayland ||
+      ozone_platform_hint == "auto") {
+    // We are here if:
+    // - The binary has both X11 and Wayland backends.
+    // - The user wanted Wayland but that did not work, otherwise it would have
+    //   been returned above.
+    if (ozone_platform_hint == kPlatformWayland) {
+      LOG(WARNING) << "No Wayland server is available. Falling back to X11.";
+    } else {
+      LOG(WARNING) << "This is not a Wayland session.  Falling back to X11. "
+                      "If you need to run Chrome on Wayland using some "
+                      "embedded compositor, e. g., Weston, please specify "
+                      "Wayland as your preferred Ozone platform, or use "
+                      "--ozone-platform=wayland.";
+    }
+    return kPlatformX11;
+  }
+#endif  // BUILDFLAG(OZONE_PLATFORM_WAYLAND)
+#endif  // BUILDFLAG(OZONE_PLATFORM_X11)
+
+  return ozone_platform_hint;
+}
+
+}  // namespace
+
+void ElectronBrowserMainParts::DetectOzonePlatform() {
+  auto* const command_line = base::CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch(switches::kOzonePlatform)) {
+    const auto ozone_platform_hint =
+        command_line->GetSwitchValueASCII(switches::kOzonePlatformHint);
+    if (!ozone_platform_hint.empty()) {
+      command_line->AppendSwitchASCII(
+          switches::kOzonePlatform, MaybeFixPlatformName(ozone_platform_hint));
+    }
+  }
+
+  auto env = base::Environment::Create();
+  std::string desktop_startup_id;
+  if (env->GetVar("DESKTOP_STARTUP_ID", &desktop_startup_id))
+    command_line->AppendSwitchASCII("desktop-startup-id", desktop_startup_id);
+}
+
+}  // namespace electron

From 7ae3025fd504c49c70d02d8f25f6c21a8bfa4bd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 11:15:00 +0200
Subject: [PATCH 609/811] build(deps): bump terser from 4.6.7 to 4.8.1 (#34987)

Bumps [terser](https://github.com/terser/terser) from 4.6.7 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8919a86531ea0..88ae9c5a8583d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1466,7 +1466,12 @@ buffer-equal-constant-time@1.0.1:
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
-buffer-from@^1.0.0, buffer-from@^1.1.0:
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer-from@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
@@ -1865,9 +1870,9 @@ combined-stream@^1.0.8:
     delayed-stream "~1.0.0"
 
 commander@^2.20.0, commander@^2.9.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^4.1.0:
   version "4.1.1"
@@ -7071,18 +7076,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.12:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+source-map-support@^0.5.6, source-map-support@~0.5.12:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7499,9 +7496,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2:
-  version "4.6.7"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"
-  integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"

From d4e97483aa3880ed29f46603b19bac9d80d7e653 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Thu, 21 Jul 2022 11:29:31 +0200
Subject: [PATCH 610/811] refactor: only create webContents after
 'will-attach-webview' (#32941)

---
 lib/browser/guest-view-manager.ts             | 81 +++++--------------
 lib/common/ipc-messages.ts                    |  1 -
 lib/renderer/web-view/guest-view-internal.ts  |  7 --
 lib/renderer/web-view/web-view-element.ts     |  3 +-
 lib/renderer/web-view/web-view-impl.ts        |  2 +-
 .../api/electron_api_web_view_manager.cc      |  4 -
 shell/browser/web_contents_preferences.cc     |  4 -
 shell/browser/web_contents_preferences.h      |  2 -
 typings/internal-electron.d.ts                |  1 -
 9 files changed, 21 insertions(+), 84 deletions(-)

diff --git a/lib/browser/guest-view-manager.ts b/lib/browser/guest-view-manager.ts
index c9c4585de28e4..2d88a0a017ea7 100644
--- a/lib/browser/guest-view-manager.ts
+++ b/lib/browser/guest-view-manager.ts
@@ -7,7 +7,7 @@ import { webViewEvents } from '@electron/internal/browser/web-view-events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 interface GuestInstance {
-  elementInstanceId?: number;
+  elementInstanceId: number;
   visibilityState?: VisibilityState;
   embedder: Electron.WebContents;
   guest: Electron.WebContents;
@@ -46,6 +46,7 @@ function makeWebPreferences (embedder: Electron.WebContents, params: Record<stri
     webSecurity: !params.disablewebsecurity,
     enableBlinkFeatures: params.blinkfeatures,
     disableBlinkFeatures: params.disableblinkfeatures,
+    partition: params.partition,
     ...parsedWebPreferences
   };
 
@@ -87,14 +88,26 @@ function makeLoadURLOptions (params: Record<string, any>) {
 
 // Create a new guest instance.
 const createGuest = function (embedder: Electron.WebContents, embedderFrameId: number, elementInstanceId: number, params: Record<string, any>) {
+  const webPreferences = makeWebPreferences(embedder, params);
+  const event = eventBinding.createWithSender(embedder);
+
+  const { instanceId } = params;
+
+  embedder.emit('will-attach-webview', event, webPreferences, params);
+  if (event.defaultPrevented) {
+    return -1;
+  }
+
   // eslint-disable-next-line no-undef
   const guest = (webContents as typeof ElectronInternal.WebContents).create({
+    ...webPreferences,
     type: 'webview',
-    partition: params.partition,
     embedder
   });
+
   const guestInstanceId = guest.id;
   guestInstances.set(guestInstanceId, {
+    elementInstanceId,
     guest,
     embedder
   });
@@ -108,11 +121,8 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
 
   // Init guest web view after attached.
   guest.once('did-attach' as any, function (this: Electron.WebContents, event: Electron.Event) {
-    const params = this.attachParams!;
-    delete this.attachParams;
-
     const previouslyAttached = this.viewInstanceId != null;
-    this.viewInstanceId = params.instanceId;
+    this.viewInstanceId = instanceId;
 
     // Only load URL and set size on first attach
     if (previouslyAttached) {
@@ -120,7 +130,7 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
     }
 
     if (params.src) {
-      this.loadURL(params.src, params.opts);
+      this.loadURL(params.src, makeLoadURLOptions(params));
     }
     embedder.emit('did-attach-webview', event, guest);
   });
@@ -173,78 +183,25 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
     }
   });
 
-  if (attachGuest(embedder, embedderFrameId, elementInstanceId, guestInstanceId, params)) {
-    return guestInstanceId;
-  }
-
-  return -1;
-};
-
-// Attach the guest to an element of embedder.
-const attachGuest = function (embedder: Electron.WebContents, embedderFrameId: number, elementInstanceId: number, guestInstanceId: number, params: Record<string, any>) {
   // Destroy the old guest when attaching.
   const key = `${embedder.id}-${elementInstanceId}`;
   const oldGuestInstanceId = embedderElementsMap.get(key);
   if (oldGuestInstanceId != null) {
-    // Reattachment to the same guest is just a no-op.
-    if (oldGuestInstanceId === guestInstanceId) {
-      return false;
-    }
-
     const oldGuestInstance = guestInstances.get(oldGuestInstanceId);
     if (oldGuestInstance) {
       oldGuestInstance.guest.detachFromOuterFrame();
     }
   }
 
-  const guestInstance = guestInstances.get(guestInstanceId);
-  // If this isn't a valid guest instance then do nothing.
-  if (!guestInstance) {
-    console.error(new Error(`Guest attach failed: Invalid guestInstanceId ${guestInstanceId}`));
-    return false;
-  }
-  const { guest } = guestInstance;
-  if (guest.hostWebContents !== embedder) {
-    console.error(new Error(`Guest attach failed: Access denied to guestInstanceId ${guestInstanceId}`));
-    return false;
-  }
-
-  const { instanceId } = params;
-
-  // If this guest is already attached to an element then remove it
-  if (guestInstance.elementInstanceId) {
-    const oldKey = `${guestInstance.embedder.id}-${guestInstance.elementInstanceId}`;
-    embedderElementsMap.delete(oldKey);
-
-    // Remove guest from embedder if moving across web views
-    if (guest.viewInstanceId !== instanceId) {
-      webViewManager.removeGuest(guestInstance.embedder, guestInstanceId);
-      guestInstance.embedder._sendInternal(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${guest.viewInstanceId}`);
-    }
-  }
-
-  const webPreferences = makeWebPreferences(embedder, params);
-
-  const event = eventBinding.createWithSender(embedder);
-  embedder.emit('will-attach-webview', event, webPreferences, params);
-  if (event.defaultPrevented) {
-    if (guest.viewInstanceId == null) guest.viewInstanceId = instanceId;
-    guest.destroy();
-    return false;
-  }
-
-  guest.attachParams = { instanceId, src: params.src, opts: makeLoadURLOptions(params) };
   embedderElementsMap.set(key, guestInstanceId);
-
   guest.setEmbedder(embedder);
-  guestInstance.embedder = embedder;
-  guestInstance.elementInstanceId = elementInstanceId;
 
   watchEmbedder(embedder);
 
   webViewManager.addGuest(guestInstanceId, embedder, guest, webPreferences);
   guest.attachToIframe(embedder, embedderFrameId);
-  return true;
+
+  return guestInstanceId;
 };
 
 // Remove an guest-embedder relationship.
diff --git a/lib/common/ipc-messages.ts b/lib/common/ipc-messages.ts
index c6a881c3c0a23..3a85d592691c9 100644
--- a/lib/common/ipc-messages.ts
+++ b/lib/common/ipc-messages.ts
@@ -9,7 +9,6 @@ export const enum IPC_MESSAGES {
 
   GUEST_INSTANCE_VISIBILITY_CHANGE = 'GUEST_INSTANCE_VISIBILITY_CHANGE',
 
-  GUEST_VIEW_INTERNAL_DESTROY_GUEST = 'GUEST_VIEW_INTERNAL_DESTROY_GUEST',
   GUEST_VIEW_INTERNAL_DISPATCH_EVENT = 'GUEST_VIEW_INTERNAL_DISPATCH_EVENT',
 
   GUEST_VIEW_MANAGER_CREATE_AND_ATTACH_GUEST = 'GUEST_VIEW_MANAGER_CREATE_AND_ATTACH_GUEST',
diff --git a/lib/renderer/web-view/guest-view-internal.ts b/lib/renderer/web-view/guest-view-internal.ts
index 97b1ae6fea396..893a6e2305b8c 100644
--- a/lib/renderer/web-view/guest-view-internal.ts
+++ b/lib/renderer/web-view/guest-view-internal.ts
@@ -6,22 +6,15 @@ const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_fr
 
 export interface GuestViewDelegate {
   dispatchEvent (eventName: string, props: Record<string, any>): void;
-  reset(): void;
 }
 
 export function registerEvents (viewInstanceId: number, delegate: GuestViewDelegate) {
-  ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`, function () {
-    delegate.reset();
-    delegate.dispatchEvent('destroyed', {});
-  });
-
   ipcRendererInternal.on(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`, function (event, eventName, props) {
     delegate.dispatchEvent(eventName, props);
   });
 }
 
 export function deregisterEvents (viewInstanceId: number) {
-  ipcRendererInternal.removeAllListeners(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DESTROY_GUEST}-${viewInstanceId}`);
   ipcRendererInternal.removeAllListeners(`${IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT}-${viewInstanceId}`);
 }
 
diff --git a/lib/renderer/web-view/web-view-element.ts b/lib/renderer/web-view/web-view-element.ts
index 84ac5a9ba79c4..ee290ce09b0fc 100644
--- a/lib/renderer/web-view/web-view-element.ts
+++ b/lib/renderer/web-view/web-view-element.ts
@@ -55,8 +55,7 @@ const defineWebViewElement = (hooks: WebViewImplHooks) => {
       }
       if (!internal.elementAttached) {
         hooks.guestViewInternal.registerEvents(internal.viewInstanceId, {
-          dispatchEvent: internal.dispatchEvent.bind(internal),
-          reset: internal.reset.bind(internal)
+          dispatchEvent: internal.dispatchEvent.bind(internal)
         });
         internal.elementAttached = true;
         (internal.attributes.get(WEB_VIEW_CONSTANTS.ATTRIBUTE_SRC) as SrcAttribute).parse();
diff --git a/lib/renderer/web-view/web-view-impl.ts b/lib/renderer/web-view/web-view-impl.ts
index 691b477e1bdb2..f3cad33534539 100644
--- a/lib/renderer/web-view/web-view-impl.ts
+++ b/lib/renderer/web-view/web-view-impl.ts
@@ -191,7 +191,7 @@ export class WebViewImpl {
 
   attachGuestInstance (guestInstanceId: number) {
     if (guestInstanceId === -1) {
-      // Do nothing
+      this.dispatchEvent('destroyed');
       return;
     }
 
diff --git a/shell/browser/api/electron_api_web_view_manager.cc b/shell/browser/api/electron_api_web_view_manager.cc
index 7758c59cd5fd6..2bf03616b711c 100644
--- a/shell/browser/api/electron_api_web_view_manager.cc
+++ b/shell/browser/api/electron_api_web_view_manager.cc
@@ -28,10 +28,6 @@ void AddGuest(int guest_instance_id,
     electron::WebContentsZoomController::FromWebContents(guest_web_contents)
         ->SetDefaultZoomFactor(zoom_factor);
   }
-
-  WebContentsPreferences::From(guest_web_contents)->Merge(options);
-  // Trigger re-calculation of webkit prefs.
-  guest_web_contents->NotifyPreferencesChanged();
 }
 
 void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc
index 300bf05b8a1bf..14069bfdde30e 100644
--- a/shell/browser/web_contents_preferences.cc
+++ b/shell/browser/web_contents_preferences.cc
@@ -176,11 +176,7 @@ void WebContentsPreferences::Clear() {
 void WebContentsPreferences::SetFromDictionary(
     const gin_helper::Dictionary& web_preferences) {
   Clear();
-  Merge(web_preferences);
-}
 
-void WebContentsPreferences::Merge(
-    const gin_helper::Dictionary& web_preferences) {
   web_preferences.Get(options::kPlugins, &plugins_);
   web_preferences.Get(options::kExperimentalFeatures, &experimental_features_);
   web_preferences.Get(options::kNodeIntegration, &node_integration_);
diff --git a/shell/browser/web_contents_preferences.h b/shell/browser/web_contents_preferences.h
index 091778899c0ac..eac4f7e51eeb7 100644
--- a/shell/browser/web_contents_preferences.h
+++ b/shell/browser/web_contents_preferences.h
@@ -40,8 +40,6 @@ class WebContentsPreferences
   WebContentsPreferences(const WebContentsPreferences&) = delete;
   WebContentsPreferences& operator=(const WebContentsPreferences&) = delete;
 
-  void Merge(const gin_helper::Dictionary& new_web_preferences);
-
   void SetFromDictionary(const gin_helper::Dictionary& new_web_preferences);
 
   // Append command parameters according to preferences.
diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts
index 891966d8e3e44..2d286f23d5cc8 100644
--- a/typings/internal-electron.d.ts
+++ b/typings/internal-electron.d.ts
@@ -81,7 +81,6 @@ declare namespace Electron {
     attachToIframe(embedderWebContents: Electron.WebContents, embedderFrameId: number): void;
     detachFromOuterFrame(): void;
     setEmbedder(embedder: Electron.WebContents): void;
-    attachParams?: { instanceId: number; src: string, opts: LoadURLOptions };
     viewInstanceId: number;
   }
 

From 1ed191114acb4182baef715729906ed7bfc02fa3 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 21 Jul 2022 12:46:15 +0200
Subject: [PATCH 611/811] fix: clean up callback handling in
 `webContents.print()` (#34894)

* refactor: clean up callback handling in webContents.print()

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/printing.patch | 144 ++++++++++++++++++++++----------
 1 file changed, 99 insertions(+), 45 deletions(-)

diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index fa69a6ac0c84f..f056759708d26 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -134,7 +134,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d89882163c93ce89 100644
+index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851ac8b8df85 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -146,7 +146,22 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  #include "chrome/common/pref_names.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/prefs/pref_service.h"
-@@ -87,6 +85,8 @@ using PrintSettingsCallback =
+@@ -83,10 +81,23 @@ namespace printing {
+ 
+ namespace {
+ 
++std::string PrintReasonFromPrintStatus(PrintViewManager::PrintStatus status) {
++  if (status == PrintViewManager::PrintStatus::kInvalid) {
++    return "Invalid printer settings";
++  } else if (status == PrintViewManager::PrintStatus::kCanceled) {
++    return "Print job canceled";
++  } else if (status == PrintViewManager::PrintStatus::kFailed) {
++    return "Print job failed";
++  }
++  return "";
++}
++
+ using PrintSettingsCallback =
      base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
  
  void ShowWarningMessageBox(const std::u16string& message) {
@@ -155,7 +170,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -95,6 +95,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -95,6 +106,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -163,7 +178,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  }
  
  void OnDidGetDefaultPrintSettings(
-@@ -144,7 +145,9 @@ void OnDidUpdatePrintSettings(
+@@ -144,7 +156,9 @@ void OnDidUpdatePrintSettings(
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -174,7 +189,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -172,6 +175,7 @@ void OnDidScriptedPrint(
+@@ -172,6 +186,7 @@ void OnDidScriptedPrint(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -182,7 +197,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -181,7 +185,8 @@ void OnDidScriptedPrint(
+@@ -181,7 +196,8 @@ void OnDidScriptedPrint(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -192,7 +207,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -196,12 +201,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -196,12 +212,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -207,7 +222,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -209,7 +216,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -209,7 +227,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -219,7 +234,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -237,6 +247,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -237,6 +258,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -229,7 +244,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
    enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -405,7 +418,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -405,7 +429,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -239,7 +254,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -420,8 +434,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -420,8 +445,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -252,7 +267,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  }
  
  void PrintViewManagerBase::UpdatePrintingEnabled() {
-@@ -429,8 +446,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
+@@ -429,8 +457,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
    // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
    web_contents()->GetPrimaryMainFrame()->ForEachRenderFrameHost(
        base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
@@ -262,7 +277,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -546,11 +562,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -546,11 +573,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -277,7 +292,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -588,18 +607,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -588,18 +618,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -299,7 +314,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -609,6 +630,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -609,6 +641,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -307,7 +322,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -640,14 +662,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -640,14 +673,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -324,7 +339,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
      return;
    }
  #endif
-@@ -685,7 +707,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -685,7 +718,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -332,19 +347,19 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  #endif
  
    ReleasePrinterQuery();
-@@ -700,6 +721,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -700,6 +732,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
 +  if (!callback_.is_null()) {
-+    std::string cb_str = "Invalid printer settings";
-+    std::move(callback_).Run(printing_succeeded_, cb_str);
++    printing_status_ = PrintStatus::kInvalid;
++    TerminatePrintJob(true);
 +  }
 +
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -710,10 +736,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -710,10 +747,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -357,19 +372,30 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -773,6 +801,11 @@ void PrintViewManagerBase::OnJobDone() {
-   ReleasePrintJob();
- }
- 
-+void PrintViewManagerBase::UserInitCanceled() {
-+  printing_canceled_ = true;
+@@ -769,7 +808,12 @@ void PrintViewManagerBase::OnJobDone() {
+   // Printing is done, we don't need it anymore.
+   // print_job_->is_job_pending() may still be true, depending on the order
+   // of object registration.
+-  printing_succeeded_ = true;
++  printing_status_ = PrintStatus::kSucceeded;
 +  ReleasePrintJob();
 +}
 +
- void PrintViewManagerBase::OnFailed() {
-   TerminatePrintJob(true);
++void PrintViewManagerBase::UserInitCanceled() {
++  printing_status_ = PrintStatus::kCanceled;
+   ReleasePrintJob();
  }
-@@ -831,7 +864,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+ 
+@@ -783,7 +827,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
+ 
+   // Is the document already complete?
+   if (print_job_->document() && print_job_->document()->IsComplete()) {
+-    printing_succeeded_ = true;
++    printing_status_ = PrintStatus::kSucceeded;
+     return true;
+   }
+ 
+@@ -831,7 +875,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current `print_job_`.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -381,21 +407,37 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    if (!weak_this)
      return false;
  
-@@ -912,6 +948,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -852,7 +899,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+ #endif
+   print_job_->AddObserver(*this);
+ 
+-  printing_succeeded_ = false;
++  printing_status_ = PrintStatus::kFailed;
+   return true;
+ }
+ 
+@@ -912,6 +959,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
    }
  #endif
  
 +  if (!callback_.is_null()) {
-+    std::string cb_str = "";
-+    if (!printing_succeeded_)
-+      cb_str = printing_canceled_ ? "canceled" : "failed";
-+    std::move(callback_).Run(printing_succeeded_, cb_str);
++    bool success = printing_status_ == PrintStatus::kSucceeded;
++    std::move(callback_).Run(success, PrintReasonFromPrintStatus(printing_status_));
 +  }
 +
    if (!print_job_)
      return;
  
-@@ -961,7 +1004,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -919,7 +971,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
+     // printing_rfh_ should only ever point to a RenderFrameHost with a live
+     // RenderFrame.
+     DCHECK(rfh->IsRenderFrameLive());
+-    GetPrintRenderFrame(rfh)->PrintingDone(printing_succeeded_);
++    GetPrintRenderFrame(rfh)->PrintingDone(printing_status_ == PrintStatus::kSucceeded);
+   }
+ 
+   print_job_->RemoveObserver(*this);
+@@ -961,7 +1013,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -404,7 +446,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
      return true;
  
    if (!cookie) {
-@@ -1069,7 +1112,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1069,7 +1121,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -414,7 +456,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..e6201cbf8d1ed64b1b53ed43d8988216
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0de6669400 100644
+index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde990e10e1 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
 @@ -41,6 +41,8 @@ namespace printing {
@@ -446,7 +488,22 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -241,7 +247,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -120,6 +126,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+   void AddObserver(Observer& observer);
+   void RemoveObserver(Observer& observer);
+ 
++  enum class PrintStatus {
++    kSucceeded,
++    kCanceled,
++    kFailed,
++    kInvalid,
++    kUnknown
++  };
++
+  protected:
+   explicit PrintViewManagerBase(content::WebContents* web_contents);
+ 
+@@ -241,7 +255,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -456,7 +513,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -314,9 +321,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -314,8 +329,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -464,14 +521,11 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
 +  CompletionCallback callback_;
 +
    // Indication of success of the print job.
-   bool printing_succeeded_ = false;
+-  bool printing_succeeded_ = false;
++  PrintStatus printing_status_ = PrintStatus::kUnknown;
  
-+  // Indication of whether the print job was manually canceled
-+  bool printing_canceled_ = false;
-+
    // Set while running an inner message loop inside RenderAllMissingPagesNow().
    // This means we are _blocking_ until all the necessary pages have been
-   // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 index f3c3f85edb19489d079dc93411be64828ae581e2..ff303dcbc034cd8f1530fe1543729e98d3035826 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc

From fec4cca8d48e07a0e76b7e3de2e01cfe1c33d04b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:01:19 -0700
Subject: [PATCH 612/811] Bump v21.0.0-nightly.20220721

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d3434d0a0d285..7d0b2b4f2e598 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220720
\ No newline at end of file
+21.0.0-nightly.20220721
\ No newline at end of file
diff --git a/package.json b/package.json
index 5ad09863cc96f..f31bf41ffb9bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220720",
+  "version": "21.0.0-nightly.20220721",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 7c2f4e4877d9f..975dcfc84f1c0 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220720
- PRODUCTVERSION 21,0,0,20220720
+ FILEVERSION 21,0,0,20220721
+ PRODUCTVERSION 21,0,0,20220721
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 3c63f075bd35333b80f78c462cdba1440b3fec55 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Thu, 21 Jul 2022 10:25:54 -0700
Subject: [PATCH 613/811] chore: remove unused WebContents._sendToFrameInternal
 (#35010)

---
 lib/browser/api/web-contents.ts | 7 -------
 typings/internal-electron.d.ts  | 1 -
 2 files changed, 8 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 594c2fc28e653..6433bed4df568 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -124,13 +124,6 @@ WebContents.prototype.sendToFrame = function (frameId, channel, ...args) {
   return true;
 };
 
-WebContents.prototype._sendToFrameInternal = function (frameId, channel, ...args) {
-  const frame = getWebFrame(this, frameId);
-  if (!frame) return false;
-  frame._sendInternal(channel, ...args);
-  return true;
-};
-
 // Following methods are mapped to webFrame.
 const webFrameMethods = [
   'insertCSS',
diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts
index 2d286f23d5cc8..7789f297e55e4 100644
--- a/typings/internal-electron.d.ts
+++ b/typings/internal-electron.d.ts
@@ -66,7 +66,6 @@ declare namespace Electron {
     _callWindowOpenHandler(event: any, details: Electron.HandlerDetails): {browserWindowConstructorOptions: Electron.BrowserWindowConstructorOptions | null, outlivesOpener: boolean};
     _setNextChildWebPreferences(prefs: Partial<Electron.BrowserWindowConstructorOptions['webPreferences']> & Pick<Electron.BrowserWindowConstructorOptions, 'backgroundColor'>): void;
     _send(internal: boolean, channel: string, args: any): boolean;
-    _sendToFrameInternal(frameId: number | [number, number], channel: string, ...args: any[]): boolean;
     _sendInternal(channel: string, ...args: any[]): void;
     _printToPDF(options: any): Promise<Buffer>;
     _print(options: any, callback?: (success: boolean, failureReason: string) => void): void;

From dd82a26e956617cd8bef0aa19613b3fd581a6db7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 06:01:06 -0700
Subject: [PATCH 614/811] Bump v21.0.0-nightly.20220722

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7d0b2b4f2e598..e58a6291ea673 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220721
\ No newline at end of file
+21.0.0-nightly.20220722
\ No newline at end of file
diff --git a/package.json b/package.json
index f31bf41ffb9bc..b4fd0f292b8d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220721",
+  "version": "21.0.0-nightly.20220722",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 975dcfc84f1c0..3453470290fe7 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220721
- PRODUCTVERSION 21,0,0,20220721
+ FILEVERSION 21,0,0,20220722
+ PRODUCTVERSION 21,0,0,20220722
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 08dd38d9be8fde5ec44e60ad8a2da9af3c37afeb Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Sun, 24 Jul 2022 23:25:42 -0700
Subject: [PATCH 615/811] docs: update build dependencies for Fedora (#35024)

---
 docs/development/build-instructions-linux.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md
index 7663773e511b4..8bfd6349a511a 100644
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -47,10 +47,10 @@ $ sudo yum install clang dbus-devel gtk3-devel libnotify-devel \
 On Fedora, install the following libraries:
 
 ```sh
-$ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
-                   libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
+$ sudo dnf install clang dbus-devel gperf gtk3-devel \
+                   libnotify-devel libgnome-keyring-devel libcap-devel \
                    cups-devel libXtst-devel alsa-lib-devel libXrandr-devel \
-                   nss-devel python-dbusmock openjdk-8-jre
+                   nss-devel python-dbusmock
 ```
 
 On Arch Linux / Manjaro, install the following libraries:

From 57c265198efac773b5bcf4598bda5e31a20fdba2 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 25 Jul 2022 09:46:14 +0200
Subject: [PATCH 616/811] refactor: use Get/SetID from views:View in Button
 (#35022)

---
 shell/browser/ui/views/menu_bar.cc      | 4 ++--
 shell/browser/ui/views/menu_delegate.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index 8e72000d131b1..b8d254ee665a6 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -193,7 +193,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& event) {
   SubmenuButton* source = nullptr;
   for (auto* child : children()) {
     auto* button = static_cast<SubmenuButton*>(child);
-    if (button->tag() == id) {
+    if (button->GetID() == id) {
       source = button;
       break;
     }
@@ -226,7 +226,7 @@ void MenuBar::RebuildChildren() {
     auto* button = new SubmenuButton(
         base::BindRepeating(&MenuBar::ButtonPressed, base::Unretained(this), i),
         menu_model_->GetLabelAt(i), background_color_);
-    button->set_tag(i);
+    button->SetID(i);
     AddChildView(button);
   }
   UpdateViewColors();
diff --git a/shell/browser/ui/views/menu_delegate.cc b/shell/browser/ui/views/menu_delegate.cc
index c6effd2707aaf..e6f4c49b57f88 100644
--- a/shell/browser/ui/views/menu_delegate.cc
+++ b/shell/browser/ui/views/menu_delegate.cc
@@ -34,7 +34,7 @@ void MenuDelegate::RunMenu(ElectronMenuModel* model,
     hold_first_switch_ = true;
   }
 
-  id_ = button->tag();
+  id_ = button->GetID();
   adapter_ = std::make_unique<MenuModelAdapter>(model);
 
   auto* item = new views::MenuItemView(this);
@@ -127,7 +127,7 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
   views::MenuButton* button;
   ElectronMenuModel* model;
   if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
-      button->tag() != id_) {
+      button->GetID() != id_) {
     bool switch_in_progress = !!button_to_open_;
     // Always update target to open.
     button_to_open_ = button;

From 49302e4a2f8b32ff22b4092ffe401e35d19882b6 Mon Sep 17 00:00:00 2001
From: Mike Lee <17537040+leemun1@users.noreply.github.com>
Date: Mon, 25 Jul 2022 05:22:06 -0400
Subject: [PATCH 617/811] docs: Add missing link to tutorial page (#35035)

Add missing link to tutorial page
---
 docs/tutorial/introduction.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index 71ce1a67ec448..14089d9a3a678 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -66,6 +66,7 @@ Are you getting stuck anywhere? Here are a few links to places to look:
 
 <!-- Links -->
 
+[tutorial]: tutorial-1-prerequisites.md
 [api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
 [discord]: https://discord.gg/electronjs

From aeba6ca973c8ed8a8b75cceb4e0dde33f3595850 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Jul 2022 06:01:47 -0700
Subject: [PATCH 618/811] Bump v21.0.0-nightly.20220725

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index e58a6291ea673..7a659c8a9502d 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220722
\ No newline at end of file
+21.0.0-nightly.20220725
\ No newline at end of file
diff --git a/package.json b/package.json
index b4fd0f292b8d6..4f77087ca05e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220722",
+  "version": "21.0.0-nightly.20220725",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3453470290fe7..d70dd54e8727b 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220722
- PRODUCTVERSION 21,0,0,20220722
+ FILEVERSION 21,0,0,20220725
+ PRODUCTVERSION 21,0,0,20220725
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 648c9934c01c12ea082a18fdf690c37e3112ce12 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 25 Jul 2022 10:50:19 -0400
Subject: [PATCH 619/811] fix: properly fire serial-port-added and
 serial-port-removed events (#34958)

Based on 2309652: [webhid] Notify chooser context observers on shutdown | https://chromium-review.googlesource.com/c/chromium/src/+/2309652
---
 .../serial/electron_serial_delegate.cc        | 33 ++++++++++++++++---
 .../browser/serial/electron_serial_delegate.h | 18 +++++++++-
 .../browser/serial/serial_chooser_context.cc  | 14 ++++----
 shell/browser/serial/serial_chooser_context.h | 10 +++---
 .../serial/serial_chooser_controller.cc       | 10 +++---
 .../serial/serial_chooser_controller.h        |  7 ++++
 6 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc
index 1c4d534ba38e0..98a5a3f803a7a 100644
--- a/shell/browser/serial/electron_serial_delegate.cc
+++ b/shell/browser/serial/electron_serial_delegate.cc
@@ -71,15 +71,15 @@ device::mojom::SerialPortManager* ElectronSerialDelegate::GetPortManager(
 
 void ElectronSerialDelegate::AddObserver(content::RenderFrameHost* frame,
                                          Observer* observer) {
-  return GetChooserContext(frame)->AddPortObserver(observer);
+  observer_list_.AddObserver(observer);
+  auto* chooser_context = GetChooserContext(frame);
+  if (!port_observation_.IsObserving())
+    port_observation_.Observe(chooser_context);
 }
 
 void ElectronSerialDelegate::RemoveObserver(content::RenderFrameHost* frame,
                                             Observer* observer) {
-  SerialChooserContext* serial_chooser_context = GetChooserContext(frame);
-  if (serial_chooser_context) {
-    return serial_chooser_context->RemovePortObserver(observer);
-  }
+  observer_list_.RemoveObserver(observer);
 }
 
 void ElectronSerialDelegate::RevokePortPermissionWebInitiated(
@@ -120,4 +120,27 @@ void ElectronSerialDelegate::DeleteControllerForFrame(
   controller_map_.erase(render_frame_host);
 }
 
+// SerialChooserContext::PortObserver:
+void ElectronSerialDelegate::OnPortAdded(
+    const device::mojom::SerialPortInfo& port) {
+  for (auto& observer : observer_list_)
+    observer.OnPortAdded(port);
+}
+
+void ElectronSerialDelegate::OnPortRemoved(
+    const device::mojom::SerialPortInfo& port) {
+  for (auto& observer : observer_list_)
+    observer.OnPortRemoved(port);
+}
+
+void ElectronSerialDelegate::OnPortManagerConnectionError() {
+  port_observation_.Reset();
+  for (auto& observer : observer_list_)
+    observer.OnPortManagerConnectionError();
+}
+
+void ElectronSerialDelegate::OnSerialChooserContextShutdown() {
+  port_observation_.Reset();
+}
+
 }  // namespace electron
diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h
index 1153bcd8ad297..5876d7e511041 100644
--- a/shell/browser/serial/electron_serial_delegate.h
+++ b/shell/browser/serial/electron_serial_delegate.h
@@ -11,13 +11,15 @@
 
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/serial_delegate.h"
+#include "shell/browser/serial/serial_chooser_context.h"
 #include "shell/browser/serial/serial_chooser_controller.h"
 
 namespace electron {
 
 class SerialChooserController;
 
-class ElectronSerialDelegate : public content::SerialDelegate {
+class ElectronSerialDelegate : public content::SerialDelegate,
+                               public SerialChooserContext::PortObserver {
  public:
   ElectronSerialDelegate();
   ~ElectronSerialDelegate() override;
@@ -48,6 +50,13 @@ class ElectronSerialDelegate : public content::SerialDelegate {
 
   void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);
 
+  // SerialChooserContext::PortObserver:
+  void OnPortAdded(const device::mojom::SerialPortInfo& port) override;
+  void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
+  void OnPortManagerConnectionError() override;
+  void OnPermissionRevoked(const url::Origin& origin) override {}
+  void OnSerialChooserContextShutdown() override;
+
  private:
   SerialChooserController* ControllerForFrame(
       content::RenderFrameHost* render_frame_host);
@@ -56,6 +65,13 @@ class ElectronSerialDelegate : public content::SerialDelegate {
       std::vector<blink::mojom::SerialPortFilterPtr> filters,
       content::SerialChooser::Callback callback);
 
+  base::ScopedObservation<SerialChooserContext,
+                          SerialChooserContext::PortObserver,
+                          &SerialChooserContext::AddPortObserver,
+                          &SerialChooserContext::RemovePortObserver>
+      port_observation_{this};
+  base::ObserverList<content::SerialDelegate::Observer> observer_list_;
+
   std::unordered_map<content::RenderFrameHost*,
                      std::unique_ptr<SerialChooserController>>
       controller_map_;
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
index 356547f81a55f..57798ccf5692f 100644
--- a/shell/browser/serial/serial_chooser_context.cc
+++ b/shell/browser/serial/serial_chooser_context.cc
@@ -90,11 +90,13 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
 SerialChooserContext::SerialChooserContext(ElectronBrowserContext* context)
     : browser_context_(context) {}
 
-SerialChooserContext::~SerialChooserContext() = default;
-
-void SerialChooserContext::OnPermissionRevoked(const url::Origin& origin) {
-  for (auto& observer : port_observer_list_)
-    observer.OnPermissionRevoked(origin);
+SerialChooserContext::~SerialChooserContext() {
+  // Notify observers that the chooser context is about to be destroyed.
+  // Observers must remove themselves from the observer lists.
+  for (auto& observer : port_observer_list_) {
+    observer.OnSerialChooserContextShutdown();
+    DCHECK(!port_observer_list_.HasObserver(&observer));
+  }
 }
 
 void SerialChooserContext::GrantPortPermission(
@@ -127,8 +129,6 @@ void SerialChooserContext::RevokePortPermissionWebInitiated(
   auto it = port_info_.find(token);
   if (it == port_info_.end())
     return;
-
-  return OnPermissionRevoked(origin);
 }
 
 // static
diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h
index a0426c8b8f0c4..2424ed1e64f19 100644
--- a/shell/browser/serial/serial_chooser_context.h
+++ b/shell/browser/serial/serial_chooser_context.h
@@ -46,7 +46,12 @@ extern const char kUsbDriverKey[];
 class SerialChooserContext : public KeyedService,
                              public device::mojom::SerialPortManagerClient {
  public:
-  using PortObserver = content::SerialDelegate::Observer;
+  class PortObserver : public content::SerialDelegate::Observer {
+   public:
+    // Called when the SerialChooserContext is shutting down. Observers must
+    // remove themselves before returning.
+    virtual void OnSerialChooserContextShutdown() = 0;
+  };
 
   explicit SerialChooserContext(ElectronBrowserContext* context);
   ~SerialChooserContext() override;
@@ -55,9 +60,6 @@ class SerialChooserContext : public KeyedService,
   SerialChooserContext(const SerialChooserContext&) = delete;
   SerialChooserContext& operator=(const SerialChooserContext&) = delete;
 
-  // ObjectPermissionContextBase::PermissionObserver:
-  void OnPermissionRevoked(const url::Origin& origin);
-
   // Serial-specific interface for granting and checking permissions.
   void GrantPortPermission(const url::Origin& origin,
                            const device::mojom::SerialPortInfo& port,
diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc
index f14811e65d1bc..017d951d4c01b 100644
--- a/shell/browser/serial/serial_chooser_controller.cc
+++ b/shell/browser/serial/serial_chooser_controller.cc
@@ -77,13 +77,11 @@ SerialChooserController::SerialChooserController(
   DCHECK(chooser_context_);
   chooser_context_->GetPortManager()->GetDevices(base::BindOnce(
       &SerialChooserController::OnGetDevices, weak_factory_.GetWeakPtr()));
+  observation_.Observe(chooser_context_.get());
 }
 
 SerialChooserController::~SerialChooserController() {
   RunCallback(/*port=*/nullptr);
-  if (chooser_context_) {
-    chooser_context_->RemovePortObserver(this);
-  }
 }
 
 api::Session* SerialChooserController::GetSession() {
@@ -117,7 +115,11 @@ void SerialChooserController::OnPortRemoved(
 }
 
 void SerialChooserController::OnPortManagerConnectionError() {
-  // TODO(nornagon/jkleinsc): report event
+  observation_.Reset();
+}
+
+void SerialChooserController::OnSerialChooserContextShutdown() {
+  observation_.Reset();
 }
 
 void SerialChooserController::OnDeviceChosen(const std::string& port_id) {
diff --git a/shell/browser/serial/serial_chooser_controller.h b/shell/browser/serial/serial_chooser_controller.h
index 5635ea8bed743..761065763fbdb 100644
--- a/shell/browser/serial/serial_chooser_controller.h
+++ b/shell/browser/serial/serial_chooser_controller.h
@@ -48,6 +48,7 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
   void OnPortRemoved(const device::mojom::SerialPortInfo& port) override;
   void OnPortManagerConnectionError() override;
   void OnPermissionRevoked(const url::Origin& origin) override {}
+  void OnSerialChooserContextShutdown() override;
 
  private:
   api::Session* GetSession();
@@ -62,6 +63,12 @@ class SerialChooserController final : public SerialChooserContext::PortObserver,
 
   base::WeakPtr<SerialChooserContext> chooser_context_;
 
+  base::ScopedObservation<SerialChooserContext,
+                          SerialChooserContext::PortObserver,
+                          &SerialChooserContext::AddPortObserver,
+                          &SerialChooserContext::RemovePortObserver>
+      observation_{this};
+
   std::vector<device::mojom::SerialPortInfoPtr> ports_;
 
   base::WeakPtr<ElectronSerialDelegate> serial_delegate_;

From 2c51a81e853be2cf01560a9e9c24bd83a0918798 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Mon, 25 Jul 2022 17:06:52 -0400
Subject: [PATCH 620/811] chore: bump node to v16.16.0 (main) (#34853)

* chore: bump node in DEPS to v16.16.0

* chore: update patches

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                                          | 2 +-
 patches/node/build_add_gn_build_files.patch                   | 2 +-
 ...e_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index 110026e134caf..a0ce155d6a56e 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
   'chromium_version':
     '105.0.5187.0',
   'node_version':
-    'v16.15.1',
+    'v16.16.0',
   'nan_version':
     '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index 778d72eb5e98f..61e2003bd275c 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -1834,7 +1834,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
 +  args = rebase_path(inputs + outputs, root_build_dir)
 +}
 diff --git a/src/node_version.h b/src/node_version.h
-index 39f6406dd2b52e16a2be5c00c554da30a806ead9..36117c5b36c65f0a8a9bb9c421bc74b82f2b1f3a 100644
+index 0f1a9b52cccba1e54150494a7ee5b28961a8d59d..bb68b2dfef4a693d8a1d0fe056fe696254d12d09 100644
 --- a/src/node_version.h
 +++ b/src/node_version.h
 @@ -89,7 +89,10 @@
diff --git a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
index 622e1cc6d2de3..b21f8958be5d3 100644
--- a/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
+++ b/patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
@@ -45,10 +45,10 @@ index bdfe81d11cc50f492c93fe48f6946765b6fb5238..ca08deeb19f5fe9ee399ad809b24579f
          'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'],
        }],
 diff --git a/configure.py b/configure.py
-index 95b31769cb5756578d66193716c638f504bd44aa..fe741d15da821396883dd72b4e0a42c7758bd557 100755
+index fed2688c792486e5f86509eea0dd6d45f749a99d..426afed7cd0a3a403d4b753af0b25f55024d0f71 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -1433,6 +1433,7 @@ def configure_v8(o):
+@@ -1439,6 +1439,7 @@ def configure_v8(o):
    o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
    o['variables']['v8_enable_pointer_compression'] = 1 if options.enable_pointer_compression else 0
    o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0

From ad1bbc198b2e9387c5317b90466b77172f27ab56 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 00:37:37 -0700
Subject: [PATCH 621/811] test: migrate clipboard spec to spec-main (#35059)

---
 .../api-clipboard-spec.ts                     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
 rename spec/api-clipboard-spec.js => spec-main/api-clipboard-spec.ts (92%)

diff --git a/spec/api-clipboard-spec.js b/spec-main/api-clipboard-spec.ts
similarity index 92%
rename from spec/api-clipboard-spec.js
rename to spec-main/api-clipboard-spec.ts
index fb08eb768f6da..604c8d03bfa4e 100644
--- a/spec/api-clipboard-spec.js
+++ b/spec-main/api-clipboard-spec.ts
@@ -1,9 +1,8 @@
-const { expect } = require('chai');
-const path = require('path');
-const { Buffer } = require('buffer');
-const { ifdescribe, ifit } = require('./spec-helpers');
-
-const { clipboard, nativeImage } = require('electron');
+import { expect } from 'chai';
+import * as path from 'path';
+import { Buffer } from 'buffer';
+import { ifdescribe, ifit } from './spec-helpers';
+import { clipboard, nativeImage } from 'electron/common';
 
 // FIXME(zcbenz): Clipboard tests are failing on WOA.
 ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard module', () => {
@@ -13,7 +12,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
     it('returns NativeImage instance', () => {
       const p = path.join(fixtures, 'assets', 'logo.png');
       const i = nativeImage.createFromPath(p);
-      clipboard.writeImage(p);
+      clipboard.writeImage(i);
       const readImage = clipboard.readImage();
       expect(readImage.toDataURL()).to.equal(i.toDataURL());
     });
@@ -67,7 +66,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
       const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';
 
       expect(() => {
-        const result = clipboard.read(type);
+        clipboard.read(type);
       }).to.not.throw();
     });
     it('can read data written with writeBuffer', () => {
@@ -91,7 +90,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
         html: '<b>Hi</b>',
         rtf: '{\\rtf1\\utf8 text}',
         bookmark: 'a title',
-        image: p
+        image: i
       });
 
       expect(clipboard.readText()).to.equal(text);
@@ -126,7 +125,7 @@ ifdescribe(process.platform !== 'win32' || process.arch !== 'arm64')('clipboard
 
     it('throws an error when a non-Buffer is specified', () => {
       expect(() => {
-        clipboard.writeBuffer('public/utf8-plain-text', 'hello');
+        clipboard.writeBuffer('public/utf8-plain-text', 'hello' as any);
       }).to.throw(/buffer must be a node Buffer/);
     });
 

From dd68fae081c8cf9850b485ddc594ba6d68eda504 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 00:57:01 -0700
Subject: [PATCH 622/811] test: migrate nativeImage specs to main (#35062)

* test: move nativeImage specs to main

* simplify test
---
 docs/api/native-image.md                      |  22 +-
 .../api-native-image-spec.ts                  | 218 ++++++------------
 2 files changed, 86 insertions(+), 154 deletions(-)
 rename spec/api-native-image-spec.js => spec-main/api-native-image-spec.ts (76%)

diff --git a/docs/api/native-image.md b/docs/api/native-image.md
index a4d969d094e27..0ad349bb081a4 100644
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -149,7 +149,7 @@ console.log(image)
 * `options` Object
   * `width` Integer
   * `height` Integer
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `NativeImage`
 
@@ -162,7 +162,7 @@ pixel data returned by `toBitmap()`. The specific format is platform-dependent.
 * `options` Object (optional)
   * `width` Integer (optional) - Required for bitmap buffers.
   * `height` Integer (optional) - Required for bitmap buffers.
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `NativeImage`
 
@@ -225,7 +225,7 @@ The following methods are available on instances of the `NativeImage` class:
 #### `image.toPNG([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains the image's `PNG` encoded data.
 
@@ -238,7 +238,7 @@ Returns `Buffer` - A [Buffer][buffer] that contains the image's `JPEG` encoded d
 #### `image.toBitmap([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains a copy of the image's raw bitmap pixel
 data.
@@ -246,14 +246,14 @@ data.
 #### `image.toDataURL([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `string` - The data URL of the image.
 
 #### `image.getBitmap([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Double (optional) - Defaults to 1.0.
+  * `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains the image's raw bitmap pixel data.
 
@@ -276,7 +276,7 @@ Returns `boolean` - Whether the image is empty.
 
 #### `image.getSize([scaleFactor])`
 
-* `scaleFactor` Double (optional) - Defaults to 1.0.
+* `scaleFactor` Number (optional) - Defaults to 1.0.
 
 Returns [`Size`](structures/size.md).
 
@@ -317,20 +317,20 @@ will be preserved in the resized image.
 
 #### `image.getAspectRatio([scaleFactor])`
 
-* `scaleFactor` Double (optional) - Defaults to 1.0.
+* `scaleFactor` Number (optional) - Defaults to 1.0.
 
-Returns `Float` - The image's aspect ratio.
+Returns `Number` - The image's aspect ratio.
 
 If `scaleFactor` is passed, this will return the aspect ratio corresponding to the image representation most closely matching the passed value.
 
 #### `image.getScaleFactors()`
 
-Returns `Float[]` - An array of all scale factors corresponding to representations for a given nativeImage.
+Returns `Number[]` - An array of all scale factors corresponding to representations for a given nativeImage.
 
 #### `image.addRepresentation(options)`
 
 * `options` Object
-  * `scaleFactor` Double - The scale factor to add the image representation for.
+  * `scaleFactor` Number (optional) - The scale factor to add the image representation for.
   * `width` Integer (optional) - Defaults to 0. Required if a bitmap buffer
     is specified as `buffer`.
   * `height` Integer (optional) - Defaults to 0. Required if a bitmap buffer
diff --git a/spec/api-native-image-spec.js b/spec-main/api-native-image-spec.ts
similarity index 76%
rename from spec/api-native-image-spec.js
rename to spec-main/api-native-image-spec.ts
index 715655f15fd2a..57b09ec8f6e0e 100644
--- a/spec/api-native-image-spec.js
+++ b/spec-main/api-native-image-spec.ts
@@ -1,119 +1,53 @@
-'use strict';
-
-const { expect } = require('chai');
-const { nativeImage } = require('electron');
-const { ifdescribe, ifit } = require('./spec-helpers');
-const path = require('path');
+import { expect } from 'chai';
+import { nativeImage } from 'electron/common';
+import { ifdescribe, ifit } from './spec-helpers';
+import * as path from 'path';
 
 describe('nativeImage module', () => {
-  const ImageFormat = {
-    PNG: 'png',
-    JPEG: 'jpeg'
-  };
-
-  const images = [
-    {
-      filename: 'logo.png',
-      format: ImageFormat.PNG,
-      hasAlphaChannel: true,
-      hasDataUrl: false,
-      width: 538,
-      height: 190
-    },
-    {
-      dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYlWNgAAIAAAUAAdafFs0AAAAASUVORK5CYII=',
-      filename: '1x1.png',
-      format: ImageFormat.PNG,
-      hasAlphaChannel: true,
-      hasDataUrl: true,
-      height: 1,
-      width: 1
-    },
-    {
-      dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAFklEQVQYlWP8//8/AwMDEwMDAwMDAwAkBgMBBMzldwAAAABJRU5ErkJggg==',
-      filename: '2x2.jpg',
-      format: ImageFormat.JPEG,
-      hasAlphaChannel: false,
-      hasDataUrl: true,
-      height: 2,
-      width: 2
-    },
-    {
-      dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAADCAYAAABWKLW/AAAADElEQVQYlWNgIAoAAAAnAAGZWEMnAAAAAElFTkSuQmCC',
-      filename: '3x3.png',
-      format: ImageFormat.PNG,
-      hasAlphaChannel: true,
-      hasDataUrl: true,
-      height: 3,
-      width: 3
-    }
-  ];
+  const fixturesPath = path.join(__dirname, '..', 'spec', 'fixtures');
 
-  /**
-   * @param {?string} filename
-   * @returns {?string} Full path.
-   */
-  const getImagePathFromFilename = (filename) => {
-    return (filename === null) ? null
-      : path.join(__dirname, 'fixtures', 'assets', filename);
+  const imageLogo = {
+    path: path.join(fixturesPath, 'assets', 'logo.png'),
+    width: 538,
+    height: 190
   };
-
-  /**
-   * @param {!Object} image
-   * @param {Object} filters
-   * @returns {boolean}
-   */
-  const imageMatchesTheFilters = (image, filters = null) => {
-    if (filters === null) {
-      return true;
-    }
-
-    return Object.entries(filters)
-      .every(([key, value]) => image[key] === value);
+  const image1x1 = {
+    dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYlWNgAAIAAAUAAdafFs0AAAAASUVORK5CYII=',
+    path: path.join(fixturesPath, 'assets', '1x1.png'),
+    height: 1,
+    width: 1
   };
-
-  /**
-   * @param {!Object} filters
-   * @returns {!Array} A matching images list.
-   */
-  const getImages = (filters) => {
-    const matchingImages = images
-      .filter(i => imageMatchesTheFilters(i, filters));
-
-    // Add `.path` property to every image.
-    matchingImages
-      .forEach(i => { i.path = getImagePathFromFilename(i.filename); });
-
-    return matchingImages;
+  const image2x2 = {
+    dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAFklEQVQYlWP8//8/AwMDEwMDAwMDAwAkBgMBBMzldwAAAABJRU5ErkJggg==',
+    path: path.join(fixturesPath, 'assets', '2x2.jpg'),
+    height: 2,
+    width: 2
   };
-
-  /**
-   * @param {!Object} filters
-   * @returns {Object} A matching image if any.
-   */
-  const getImage = (filters) => {
-    const matchingImages = getImages(filters);
-
-    let matchingImage = null;
-    if (matchingImages.length > 0) {
-      matchingImage = matchingImages[0];
-    }
-
-    return matchingImage;
+  const image3x3 = {
+    dataUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAADCAYAAABWKLW/AAAADElEQVQYlWNgIAoAAAAnAAGZWEMnAAAAAElFTkSuQmCC',
+    path: path.join(fixturesPath, 'assets', '3x3.png'),
+    height: 3,
+    width: 3
   };
 
+  const dataUrlImages = [
+    image1x1,
+    image2x2,
+    image3x3
+  ];
+
   ifdescribe(process.platform === 'darwin')('isMacTemplateImage state', () => {
     describe('with properties', () => {
       it('correctly recognizes a template image', () => {
-        const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+        const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
         expect(image.isMacTemplateImage).to.be.false();
 
-        const templateImage = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo_Template.png'));
+        const templateImage = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo_Template.png'));
         expect(templateImage.isMacTemplateImage).to.be.true();
       });
 
       it('sets a template image', function () {
-        const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+        const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
         expect(image.isMacTemplateImage).to.be.false();
 
         image.isMacTemplateImage = true;
@@ -123,15 +57,15 @@ describe('nativeImage module', () => {
 
     describe('with functions', () => {
       it('correctly recognizes a template image', () => {
-        const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+        const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
         expect(image.isTemplateImage()).to.be.false();
 
-        const templateImage = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo_Template.png'));
+        const templateImage = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo_Template.png'));
         expect(templateImage.isTemplateImage()).to.be.true();
       });
 
       it('sets a template image', function () {
-        const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+        const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
         expect(image.isTemplateImage()).to.be.false();
 
         image.setTemplateImage(true);
@@ -168,7 +102,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns an image created from the given buffer', () => {
-      const imageA = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const imageA = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
 
       const imageB = nativeImage.createFromBitmap(imageA.toBitmap(), imageA.getSize());
       expect(imageB.getSize()).to.deep.equal({ width: 538, height: 190 });
@@ -178,10 +112,10 @@ describe('nativeImage module', () => {
     });
 
     it('throws on invalid arguments', () => {
-      expect(() => nativeImage.createFromBitmap(null, {})).to.throw('buffer must be a node Buffer');
-      expect(() => nativeImage.createFromBitmap([12, 14, 124, 12], {})).to.throw('buffer must be a node Buffer');
-      expect(() => nativeImage.createFromBitmap(Buffer.from([]), {})).to.throw('width is required');
-      expect(() => nativeImage.createFromBitmap(Buffer.from([]), { width: 1 })).to.throw('height is required');
+      expect(() => nativeImage.createFromBitmap(null as any, {} as any)).to.throw('buffer must be a node Buffer');
+      expect(() => nativeImage.createFromBitmap([12, 14, 124, 12] as any, {} as any)).to.throw('buffer must be a node Buffer');
+      expect(() => nativeImage.createFromBitmap(Buffer.from([]), {} as any)).to.throw('width is required');
+      expect(() => nativeImage.createFromBitmap(Buffer.from([]), { width: 1 } as any)).to.throw('height is required');
       expect(() => nativeImage.createFromBitmap(Buffer.from([]), { width: 1, height: 1 })).to.throw('invalid buffer size');
     });
   });
@@ -197,7 +131,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns an image created from the given buffer', () => {
-      const imageA = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const imageA = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
 
       const imageB = nativeImage.createFromBuffer(imageA.toPNG());
       expect(imageB.getSize()).to.deep.equal({ width: 538, height: 190 });
@@ -231,8 +165,8 @@ describe('nativeImage module', () => {
     });
 
     it('throws on invalid arguments', () => {
-      expect(() => nativeImage.createFromBuffer(null)).to.throw('buffer must be a node Buffer');
-      expect(() => nativeImage.createFromBuffer([12, 14, 124, 12])).to.throw('buffer must be a node Buffer');
+      expect(() => nativeImage.createFromBuffer(null as any)).to.throw('buffer must be a node Buffer');
+      expect(() => nativeImage.createFromBuffer([12, 14, 124, 12] as any)).to.throw('buffer must be a node Buffer');
     });
   });
 
@@ -242,15 +176,14 @@ describe('nativeImage module', () => {
     });
 
     it('returns an image created from the given string', () => {
-      const imagesData = getImages({ hasDataUrl: true });
-      for (const imageData of imagesData) {
+      for (const imageData of dataUrlImages) {
         const imageFromPath = nativeImage.createFromPath(imageData.path);
-        const imageFromDataUrl = nativeImage.createFromDataURL(imageData.dataUrl);
+        const imageFromDataUrl = nativeImage.createFromDataURL(imageData.dataUrl!);
 
         expect(imageFromDataUrl.isEmpty()).to.be.false();
         expect(imageFromDataUrl.getSize()).to.deep.equal(imageFromPath.getSize());
         expect(imageFromDataUrl.toBitmap()).to.satisfy(
-          bitmap => imageFromPath.toBitmap().equals(bitmap));
+          (bitmap: any) => imageFromPath.toBitmap().equals(bitmap));
         expect(imageFromDataUrl.toDataURL()).to.equal(imageFromPath.toDataURL());
       }
     });
@@ -258,9 +191,8 @@ describe('nativeImage module', () => {
 
   describe('toDataURL()', () => {
     it('returns a PNG data URL', () => {
-      const imagesData = getImages({ hasDataUrl: true });
-      for (const imageData of imagesData) {
-        const imageFromPath = nativeImage.createFromPath(imageData.path);
+      for (const imageData of dataUrlImages) {
+        const imageFromPath = nativeImage.createFromPath(imageData.path!);
 
         const scaleFactors = [1.0, 2.0];
         for (const scaleFactor of scaleFactors) {
@@ -270,7 +202,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns a data URL at 1x scale factor by default', () => {
-      const imageData = getImage({ filename: 'logo.png' });
+      const imageData = imageLogo;
       const image = nativeImage.createFromPath(imageData.path);
 
       const imageOne = nativeImage.createFromBuffer(image.toPNG(), {
@@ -289,7 +221,7 @@ describe('nativeImage module', () => {
     });
 
     it('supports a scale factor', () => {
-      const imageData = getImage({ filename: 'logo.png' });
+      const imageData = imageLogo;
       const image = nativeImage.createFromPath(imageData.path);
       const expectedSize = { width: imageData.width, height: imageData.height };
 
@@ -305,7 +237,7 @@ describe('nativeImage module', () => {
 
   describe('toPNG()', () => {
     it('returns a buffer at 1x scale factor by default', () => {
-      const imageData = getImage({ filename: 'logo.png' });
+      const imageData = imageLogo;
       const imageA = nativeImage.createFromPath(imageData.path);
 
       const imageB = nativeImage.createFromBuffer(imageA.toPNG(), {
@@ -324,7 +256,7 @@ describe('nativeImage module', () => {
     });
 
     it('supports a scale factor', () => {
-      const imageData = getImage({ filename: 'logo.png' });
+      const imageData = imageLogo;
       const image = nativeImage.createFromPath(imageData.path);
 
       const imageFromBufferOne = nativeImage.createFromBuffer(
@@ -349,28 +281,28 @@ describe('nativeImage module', () => {
     });
 
     it('loads images from paths relative to the current working directory', () => {
-      const imagePath = path.relative('.', path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const imagePath = path.relative('.', path.join(fixturesPath, 'assets', 'logo.png'));
       const image = nativeImage.createFromPath(imagePath);
       expect(image.isEmpty()).to.be.false();
       expect(image.getSize()).to.deep.equal({ width: 538, height: 190 });
     });
 
     it('loads images from paths with `.` segments', () => {
-      const imagePath = `${path.join(__dirname, 'fixtures')}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`;
+      const imagePath = `${path.join(fixturesPath)}${path.sep}.${path.sep}${path.join('assets', 'logo.png')}`;
       const image = nativeImage.createFromPath(imagePath);
       expect(image.isEmpty()).to.be.false();
       expect(image.getSize()).to.deep.equal({ width: 538, height: 190 });
     });
 
     it('loads images from paths with `..` segments', () => {
-      const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
+      const imagePath = `${path.join(fixturesPath, 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
       const image = nativeImage.createFromPath(imagePath);
       expect(image.isEmpty()).to.be.false();
       expect(image.getSize()).to.deep.equal({ width: 538, height: 190 });
     });
 
     ifit(process.platform === 'darwin')('Gets an NSImage pointer on macOS', function () {
-      const imagePath = `${path.join(__dirname, 'fixtures', 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
+      const imagePath = `${path.join(fixturesPath, 'api')}${path.sep}..${path.sep}${path.join('assets', 'logo.png')}`;
       const image = nativeImage.createFromPath(imagePath);
       const nsimage = image.getNativeHandle();
 
@@ -382,7 +314,7 @@ describe('nativeImage module', () => {
     });
 
     ifit(process.platform === 'win32')('loads images from .ico files on Windows', function () {
-      const imagePath = path.join(__dirname, 'fixtures', 'assets', 'icon.ico');
+      const imagePath = path.join(fixturesPath, 'assets', 'icon.ico');
       const image = nativeImage.createFromPath(imagePath);
       expect(image.isEmpty()).to.be.false();
       expect(image.getSize()).to.deep.equal({ width: 256, height: 256 });
@@ -413,7 +345,7 @@ describe('nativeImage module', () => {
 
   describe('resize(options)', () => {
     it('returns a resized image', () => {
-      const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
       for (const [resizeTo, expectedSize] of new Map([
         [{}, { width: 538, height: 190 }],
         [{ width: 269 }, { width: 269, height: 95 }],
@@ -436,7 +368,7 @@ describe('nativeImage module', () => {
     });
 
     it('supports a quality option', () => {
-      const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
       const good = image.resize({ width: 100, height: 100, quality: 'good' });
       const better = image.resize({ width: 100, height: 100, quality: 'better' });
       const best = image.resize({ width: 100, height: 100, quality: 'best' });
@@ -453,7 +385,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns an empty image when the bounds are invalid', () => {
-      const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
       expect(image.crop({ width: 0, height: 0, x: 0, y: 0 }).isEmpty()).to.be.true();
       expect(image.crop({ width: -1, height: 10, x: 0, y: 0 }).isEmpty()).to.be.true();
       expect(image.crop({ width: 10, height: -35, x: 0, y: 0 }).isEmpty()).to.be.true();
@@ -461,7 +393,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns a cropped image', () => {
-      const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
       const cropA = image.crop({ width: 25, height: 64, x: 0, y: 0 });
       const cropB = image.crop({ width: 25, height: 64, x: 30, y: 40 });
       expect(cropA.getSize()).to.deep.equal({ width: 25, height: 64 });
@@ -470,7 +402,7 @@ describe('nativeImage module', () => {
     });
 
     it('toBitmap() returns a buffer of the right size', () => {
-      const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
+      const image = nativeImage.createFromPath(path.join(fixturesPath, 'assets', 'logo.png'));
       const crop = image.crop({ width: 25, height: 64, x: 0, y: 0 });
       expect(crop.toBitmap().length).to.equal(25 * 64 * 4);
     });
@@ -482,7 +414,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns an aspect ratio of an image', () => {
-      const imageData = getImage({ filename: 'logo.png' });
+      const imageData = imageLogo;
       // imageData.width / imageData.height = 2.831578947368421
       const expectedAspectRatio = 2.8315789699554443;
 
@@ -510,7 +442,7 @@ describe('nativeImage module', () => {
     });
 
     it('returns native image given valid params', async () => {
-      const goodPath = path.join(__dirname, 'fixtures', 'assets', 'logo.png');
+      const goodPath = path.join(fixturesPath, 'assets', 'logo.png');
       const goodSize = { width: 100, height: 100 };
       const result = await nativeImage.createThumbnailFromPath(goodPath, goodSize);
       expect(result.isEmpty()).to.equal(false);
@@ -533,7 +465,7 @@ describe('nativeImage module', () => {
     it('supports adding a buffer representation for a scale factor', () => {
       const image = nativeImage.createEmpty();
 
-      const imageDataOne = getImage({ width: 1, height: 1 });
+      const imageDataOne = image1x1;
       image.addRepresentation({
         scaleFactor: 1.0,
         buffer: nativeImage.createFromPath(imageDataOne.path).toPNG()
@@ -541,7 +473,7 @@ describe('nativeImage module', () => {
 
       expect(image.getScaleFactors()).to.deep.equal([1]);
 
-      const imageDataTwo = getImage({ width: 2, height: 2 });
+      const imageDataTwo = image2x2;
       image.addRepresentation({
         scaleFactor: 2.0,
         buffer: nativeImage.createFromPath(imageDataTwo.path).toPNG()
@@ -549,7 +481,7 @@ describe('nativeImage module', () => {
 
       expect(image.getScaleFactors()).to.deep.equal([1, 2]);
 
-      const imageDataThree = getImage({ width: 3, height: 3 });
+      const imageDataThree = image3x3;
       image.addRepresentation({
         scaleFactor: 3.0,
         buffer: nativeImage.createFromPath(imageDataThree.path).toPNG()
@@ -559,7 +491,7 @@ describe('nativeImage module', () => {
 
       image.addRepresentation({
         scaleFactor: 4.0,
-        buffer: 'invalid'
+        buffer: 'invalid' as any
       });
 
       // this one failed, so it shouldn't show up in the scale factors
@@ -577,19 +509,19 @@ describe('nativeImage module', () => {
     it('supports adding a data URL representation for a scale factor', () => {
       const image = nativeImage.createEmpty();
 
-      const imageDataOne = getImage({ width: 1, height: 1 });
+      const imageDataOne = image1x1;
       image.addRepresentation({
         scaleFactor: 1.0,
         dataURL: imageDataOne.dataUrl
       });
 
-      const imageDataTwo = getImage({ width: 2, height: 2 });
+      const imageDataTwo = image2x2;
       image.addRepresentation({
         scaleFactor: 2.0,
         dataURL: imageDataTwo.dataUrl
       });
 
-      const imageDataThree = getImage({ width: 3, height: 3 });
+      const imageDataThree = image3x3;
       image.addRepresentation({
         scaleFactor: 3.0,
         dataURL: imageDataThree.dataUrl
@@ -610,16 +542,16 @@ describe('nativeImage module', () => {
     });
 
     it('supports adding a representation to an existing image', () => {
-      const imageDataOne = getImage({ width: 1, height: 1 });
+      const imageDataOne = image1x1;
       const image = nativeImage.createFromPath(imageDataOne.path);
 
-      const imageDataTwo = getImage({ width: 2, height: 2 });
+      const imageDataTwo = image2x2;
       image.addRepresentation({
         scaleFactor: 2.0,
         dataURL: imageDataTwo.dataUrl
       });
 
-      const imageDataThree = getImage({ width: 3, height: 3 });
+      const imageDataThree = image3x3;
       image.addRepresentation({
         scaleFactor: 2.0,
         dataURL: imageDataThree.dataUrl

From aa40652456649125bdcd4cbab7936e0f77c17eb9 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 00:57:12 -0700
Subject: [PATCH 623/811] test: remove unused spec/expect-helpers (#35055)

---
 spec/chromium-spec.js  |  1 -
 spec/expect-helpers.js | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 spec/expect-helpers.js

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index 6e92dc6c7e0e7..2b213f45937cd 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -7,7 +7,6 @@ const url = require('url');
 const ChildProcess = require('child_process');
 const { ipcRenderer } = require('electron');
 const { emittedOnce, waitForEvent } = require('./events-helpers');
-const { resolveGetters } = require('./expect-helpers');
 const { ifit, ifdescribe, delay } = require('./spec-helpers');
 const features = process._linkedBinding('electron_common_features');
 
diff --git a/spec/expect-helpers.js b/spec/expect-helpers.js
deleted file mode 100644
index 18d72d1ec66b8..0000000000000
--- a/spec/expect-helpers.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function resolveSingleObjectGetters (object) {
-  if (object && typeof object === 'object') {
-    const newObject = {};
-    for (const key in object) { // eslint-disable-line guard-for-in
-      newObject[key] = resolveGetters(object[key])[0];
-    }
-    return newObject;
-  }
-  return object;
-}
-
-function resolveGetters (...args) {
-  return args.map(resolveSingleObjectGetters);
-}
-
-module.exports = {
-  resolveGetters
-};

From cabfb8507d02365bea0cb473c5c93e2027b6d5c4 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 01:12:04 -0700
Subject: [PATCH 624/811] test: remove references to robotjs (#35064)

---
 spec-main/api-global-shortcut-spec.ts | 18 +--------
 spec-main/api-web-contents-spec.ts    | 57 +--------------------------
 spec/package.json                     |  3 --
 3 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/spec-main/api-global-shortcut-spec.ts b/spec-main/api-global-shortcut-spec.ts
index 689ea56bbb363..36d5191e5642f 100644
--- a/spec-main/api-global-shortcut-spec.ts
+++ b/spec-main/api-global-shortcut-spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { globalShortcut, BrowserWindow } from 'electron/main';
+import { globalShortcut } from 'electron/main';
 import { ifdescribe } from './spec-helpers';
 
 ifdescribe(process.platform !== 'win32')('globalShortcut module', () => {
@@ -55,20 +55,4 @@ ifdescribe(process.platform !== 'win32')('globalShortcut module', () => {
 
     globalShortcut.unregisterAll();
   });
-
-  it('successfully registers and calls the callback for media keys', function (done) {
-    let robotjs;
-    try {
-      robotjs = require('robotjs');
-    } catch (err) {
-      this.skip();
-    }
-
-    globalShortcut.register('MediaPlayPause', () => done());
-
-    const w = new BrowserWindow({ show: false });
-    w.loadURL('about:blank');
-
-    robotjs.keyTap('audio_play');
-  });
 });
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 0152f9d158ed9..8f4df42e2348f 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -4,10 +4,9 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as http from 'http';
 import { BrowserWindow, ipcMain, webContents, session, WebContents, app, BrowserView } from 'electron/main';
-import { clipboard } from 'electron/common';
 import { emittedOnce } from './events-helpers';
 import { closeAllWindows } from './window-helpers';
-import { ifdescribe, ifit, delay, defer } from './spec-helpers';
+import { ifdescribe, delay, defer } from './spec-helpers';
 
 const pdfjs = require('pdfjs-dist');
 const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
@@ -1906,60 +1905,6 @@ describe('webContents module', () => {
     });
   });
 
-  describe('devtools window', () => {
-    let hasRobotJS = false;
-    try {
-      // We have other tests that check if native modules work, if we fail to require
-      // robotjs let's skip this test to avoid false negatives
-      require('robotjs');
-      hasRobotJS = true;
-    } catch (err) { /* no-op */ }
-
-    afterEach(closeAllWindows);
-
-    // NB. on macOS, this requires that you grant your terminal the ability to
-    // control your computer. Open System Preferences > Security & Privacy >
-    // Privacy > Accessibility and grant your terminal the permission to control
-    // your computer.
-    ifit(hasRobotJS)('can receive and handle menu events', async () => {
-      const w = new BrowserWindow({ show: true, webPreferences: { nodeIntegration: true } });
-      w.loadFile(path.join(fixturesPath, 'pages', 'key-events.html'));
-
-      // Ensure the devtools are loaded
-      w.webContents.closeDevTools();
-      const opened = emittedOnce(w.webContents, 'devtools-opened');
-      w.webContents.openDevTools();
-      await opened;
-      await emittedOnce(w.webContents.devToolsWebContents!, 'did-finish-load');
-      w.webContents.devToolsWebContents!.focus();
-
-      // Focus an input field
-      await w.webContents.devToolsWebContents!.executeJavaScript(`
-        const input = document.createElement('input')
-        document.body.innerHTML = ''
-        document.body.appendChild(input)
-        input.focus()
-      `);
-
-      // Write something to the clipboard
-      clipboard.writeText('test value');
-
-      const pasted = w.webContents.devToolsWebContents!.executeJavaScript(`new Promise(resolve => {
-        document.querySelector('input').addEventListener('paste', (e) => {
-          resolve(e.target.value)
-        })
-      })`);
-
-      // Fake a paste request using robotjs to emulate a REAL keyboard paste event
-      require('robotjs').keyTap('v', process.platform === 'darwin' ? ['command'] : ['control']);
-
-      const val = await pasted;
-
-      // Once we're done expect the paste to have been successful
-      expect(val).to.equal('test value', 'value should eventually become the pasted value');
-    });
-  });
-
   describe('Shared Workers', () => {
     afterEach(closeAllWindows);
 
diff --git a/spec/package.json b/spec/package.json
index 38ccc292934a1..d14f50aac78e2 100644
--- a/spec/package.json
+++ b/spec/package.json
@@ -3,9 +3,6 @@
   "productName": "Electron Test",
   "main": "static/main.js",
   "version": "0.1.0",
-  "scripts": {
-    "postinstall": "node ../script/run-if-exists.js node_modules/robotjs node-gyp rebuild"
-  },
   "devDependencies": {
     "basic-auth": "^2.0.1",
     "chai": "^4.2.0",

From 667408204138a837ff823b708dc7d43e6d2712b7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 26 Jul 2022 06:01:07 -0700
Subject: [PATCH 625/811] Bump v21.0.0-nightly.20220726

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7a659c8a9502d..0c8e3b1b47a97 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220725
\ No newline at end of file
+21.0.0-nightly.20220726
\ No newline at end of file
diff --git a/package.json b/package.json
index 4f77087ca05e4..a7ef000f01cf7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220725",
+  "version": "21.0.0-nightly.20220726",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index d70dd54e8727b..6feff27acb183 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220725
- PRODUCTVERSION 21,0,0,20220725
+ FILEVERSION 21,0,0,20220726
+ PRODUCTVERSION 21,0,0,20220726
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c842f63383d8d9500a850e3470972de74ff0809f Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 09:31:26 -0700
Subject: [PATCH 626/811] test: migrate process module specs to spec-main
 (#35056)

---
 spec-main/api-process-spec.ts | 124 ++++++++++++++++++++++++++++++++++
 spec/api-process-spec.js      | 124 ----------------------------------
 2 files changed, 124 insertions(+), 124 deletions(-)
 create mode 100644 spec-main/api-process-spec.ts
 delete mode 100644 spec/api-process-spec.js

diff --git a/spec-main/api-process-spec.ts b/spec-main/api-process-spec.ts
new file mode 100644
index 0000000000000..cb0fe9bede55e
--- /dev/null
+++ b/spec-main/api-process-spec.ts
@@ -0,0 +1,124 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { expect } from 'chai';
+import { BrowserWindow } from 'electron';
+import { defer, ifdescribe } from './spec-helpers';
+import { app } from 'electron/main';
+import { closeAllWindows } from './window-helpers';
+
+describe('renderer process module', () => {
+  let w: BrowserWindow;
+  before(async () => {
+    w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+    await w.loadURL('about:blank');
+  });
+  after(closeAllWindows);
+
+  describe('process.getCreationTime()', () => {
+    it('returns a creation time', async () => {
+      const creationTime = await w.webContents.executeJavaScript('process.getCreationTime()');
+      expect(creationTime).to.be.a('number').and.be.at.least(0);
+    });
+  });
+
+  describe('process.getCPUUsage()', () => {
+    it('returns a cpu usage object', async () => {
+      const cpuUsage = await w.webContents.executeJavaScript('process.getCPUUsage()');
+      expect(cpuUsage.percentCPUUsage).to.be.a('number');
+      expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number');
+    });
+  });
+
+  ifdescribe(process.platform !== 'darwin')('process.getIOCounters()', () => {
+    it('returns an io counters object', async () => {
+      const ioCounters = await w.webContents.executeJavaScript('process.getIOCounters()');
+      expect(ioCounters.readOperationCount).to.be.a('number');
+      expect(ioCounters.writeOperationCount).to.be.a('number');
+      expect(ioCounters.otherOperationCount).to.be.a('number');
+      expect(ioCounters.readTransferCount).to.be.a('number');
+      expect(ioCounters.writeTransferCount).to.be.a('number');
+      expect(ioCounters.otherTransferCount).to.be.a('number');
+    });
+  });
+
+  describe('process.getBlinkMemoryInfo()', () => {
+    it('returns blink memory information object', async () => {
+      const heapStats = await w.webContents.executeJavaScript('process.getBlinkMemoryInfo()');
+      expect(heapStats.allocated).to.be.a('number');
+      expect(heapStats.total).to.be.a('number');
+    });
+  });
+
+  describe('process.getProcessMemoryInfo()', () => {
+    it('resolves promise successfully with valid data', async () => {
+      const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()');
+      expect(memoryInfo).to.be.an('object');
+      if (process.platform === 'linux' || process.platform === 'win32') {
+        expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
+      }
+      expect(memoryInfo.private).to.be.a('number').greaterThan(0);
+      // Shared bytes can be zero
+      expect(memoryInfo.shared).to.be.a('number').greaterThan(-1);
+    });
+  });
+
+  describe('process.getSystemMemoryInfo()', () => {
+    it('returns system memory info object', async () => {
+      const systemMemoryInfo = await w.webContents.executeJavaScript('process.getSystemMemoryInfo()');
+      expect(systemMemoryInfo.free).to.be.a('number');
+      expect(systemMemoryInfo.total).to.be.a('number');
+    });
+  });
+
+  describe('process.getSystemVersion()', () => {
+    it('returns a string', async () => {
+      const systemVersion = await w.webContents.executeJavaScript('process.getSystemVersion()');
+      expect(systemVersion).to.be.a('string');
+    });
+  });
+
+  describe('process.getHeapStatistics()', () => {
+    it('returns heap statistics object', async () => {
+      const heapStats = await w.webContents.executeJavaScript('process.getHeapStatistics()');
+      expect(heapStats.totalHeapSize).to.be.a('number');
+      expect(heapStats.totalHeapSizeExecutable).to.be.a('number');
+      expect(heapStats.totalPhysicalSize).to.be.a('number');
+      expect(heapStats.totalAvailableSize).to.be.a('number');
+      expect(heapStats.usedHeapSize).to.be.a('number');
+      expect(heapStats.heapSizeLimit).to.be.a('number');
+      expect(heapStats.mallocedMemory).to.be.a('number');
+      expect(heapStats.peakMallocedMemory).to.be.a('number');
+      expect(heapStats.doesZapGarbage).to.be.a('boolean');
+    });
+  });
+
+  describe('process.takeHeapSnapshot()', () => {
+    it('returns true on success', async () => {
+      const filePath = path.join(app.getPath('temp'), 'test.heapsnapshot');
+      defer(() => {
+        try {
+          fs.unlinkSync(filePath);
+        } catch (e) {
+          // ignore error
+        }
+      });
+
+      const success = await w.webContents.executeJavaScript(`process.takeHeapSnapshot(${JSON.stringify(filePath)})`);
+      expect(success).to.be.true();
+      const stats = fs.statSync(filePath);
+      expect(stats.size).not.to.be.equal(0);
+    });
+
+    it('returns false on failure', async () => {
+      const success = await w.webContents.executeJavaScript('process.takeHeapSnapshot("")');
+      expect(success).to.be.false();
+    });
+  });
+
+  describe('process.contextId', () => {
+    it('is a string', async () => {
+      const contextId = await w.webContents.executeJavaScript('process.contextId');
+      expect(contextId).to.be.a('string');
+    });
+  });
+});
diff --git a/spec/api-process-spec.js b/spec/api-process-spec.js
deleted file mode 100644
index 8029107413227..0000000000000
--- a/spec/api-process-spec.js
+++ /dev/null
@@ -1,124 +0,0 @@
-const { ipcRenderer } = require('electron');
-const fs = require('fs');
-const path = require('path');
-
-const { expect } = require('chai');
-
-describe('process module', () => {
-  describe('process.getCreationTime()', () => {
-    it('returns a creation time', () => {
-      const creationTime = process.getCreationTime();
-      expect(creationTime).to.be.a('number').and.be.at.least(0);
-    });
-  });
-
-  describe('process.getCPUUsage()', () => {
-    it('returns a cpu usage object', () => {
-      const cpuUsage = process.getCPUUsage();
-      expect(cpuUsage.percentCPUUsage).to.be.a('number');
-      expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number');
-    });
-  });
-
-  describe('process.getIOCounters()', () => {
-    before(function () {
-      if (process.platform === 'darwin') {
-        this.skip();
-      }
-    });
-
-    it('returns an io counters object', () => {
-      const ioCounters = process.getIOCounters();
-      expect(ioCounters.readOperationCount).to.be.a('number');
-      expect(ioCounters.writeOperationCount).to.be.a('number');
-      expect(ioCounters.otherOperationCount).to.be.a('number');
-      expect(ioCounters.readTransferCount).to.be.a('number');
-      expect(ioCounters.writeTransferCount).to.be.a('number');
-      expect(ioCounters.otherTransferCount).to.be.a('number');
-    });
-  });
-
-  describe('process.getBlinkMemoryInfo()', () => {
-    it('returns blink memory information object', () => {
-      const heapStats = process.getBlinkMemoryInfo();
-      expect(heapStats.allocated).to.be.a('number');
-      expect(heapStats.total).to.be.a('number');
-    });
-  });
-
-  describe('process.getProcessMemoryInfo()', async () => {
-    it('resolves promise successfully with valid data', async () => {
-      const memoryInfo = await process.getProcessMemoryInfo();
-      expect(memoryInfo).to.be.an('object');
-      if (process.platform === 'linux' || process.platform === 'windows') {
-        expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
-      }
-      expect(memoryInfo.private).to.be.a('number').greaterThan(0);
-      // Shared bytes can be zero
-      expect(memoryInfo.shared).to.be.a('number').greaterThan(-1);
-    });
-  });
-
-  describe('process.getSystemMemoryInfo()', () => {
-    it('returns system memory info object', () => {
-      const systemMemoryInfo = process.getSystemMemoryInfo();
-      expect(systemMemoryInfo.free).to.be.a('number');
-      expect(systemMemoryInfo.total).to.be.a('number');
-    });
-  });
-
-  describe('process.getSystemVersion()', () => {
-    it('returns a string', () => {
-      expect(process.getSystemVersion()).to.be.a('string');
-    });
-  });
-
-  describe('process.getHeapStatistics()', () => {
-    it('returns heap statistics object', () => {
-      const heapStats = process.getHeapStatistics();
-      expect(heapStats.totalHeapSize).to.be.a('number');
-      expect(heapStats.totalHeapSizeExecutable).to.be.a('number');
-      expect(heapStats.totalPhysicalSize).to.be.a('number');
-      expect(heapStats.totalAvailableSize).to.be.a('number');
-      expect(heapStats.usedHeapSize).to.be.a('number');
-      expect(heapStats.heapSizeLimit).to.be.a('number');
-      expect(heapStats.mallocedMemory).to.be.a('number');
-      expect(heapStats.peakMallocedMemory).to.be.a('number');
-      expect(heapStats.doesZapGarbage).to.be.a('boolean');
-    });
-  });
-
-  describe('process.takeHeapSnapshot()', () => {
-    it('returns true on success', async () => {
-      const filePath = path.join(await ipcRenderer.invoke('get-temp-dir'), 'test.heapsnapshot');
-
-      const cleanup = () => {
-        try {
-          fs.unlinkSync(filePath);
-        } catch (e) {
-          // ignore error
-        }
-      };
-
-      try {
-        const success = process.takeHeapSnapshot(filePath);
-        expect(success).to.be.true();
-        const stats = fs.statSync(filePath);
-        expect(stats.size).not.to.be.equal(0);
-      } finally {
-        cleanup();
-      }
-    });
-
-    it('returns false on failure', () => {
-      const success = process.takeHeapSnapshot('');
-      expect(success).to.be.false();
-    });
-  });
-
-  describe('process.contextId', () => {
-    it('is a string', () => {
-      expect(process.contextId).to.be.a('string');
-    });
-  });
-});

From 0be73d18ef7386584fac964794c2f5a3dcc48f01 Mon Sep 17 00:00:00 2001
From: Devin Foley <dfoley@figma.com>
Date: Tue, 26 Jul 2022 09:35:10 -0700
Subject: [PATCH 627/811] fix: Make disable_color_correct_rendering patch work
 again (#35050)

Fix disable_color_correct_rendering patch.
---
 .../disable_color_correct_rendering.patch     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 6f925b949bc91..0a0817bf3cc3c 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,14 +20,15 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 6a148c3173f8f5653b945ed9b6ffcbf48d76d511..b30c2e686ff9b64691142ff893225c60cedeaebd 100644
+index 6a148c3173f8f5653b945ed9b6ffcbf48d76d511..3809ffe0f487e60539db58980b3232030ce8d4f8 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1864,6 +1864,9 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1864,6 +1864,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
 +  if (!settings_.enable_color_correct_rendering) {
++    params.color_space = gfx::ColorSpace();
 +    return params;
 +  }
  
@@ -112,7 +113,7 @@ index 3f0a3b2133f0d48054f33df28b93a9ee40d7ed78..801bf4b1090a8f0de922fdac6c4145c2
      sandbox::policy::switches::kDisableSeccompFilterSandbox,
      sandbox::policy::switches::kNoSandbox,
 diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
-index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..b4ddafdd126edd16172f00448bbbd56eaf509b1f 100644
+index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..35b0bb908245330fbdc5205caa3299bf6fd8f7b4 100644
 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 +++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
 @@ -4,6 +4,7 @@
@@ -131,7 +132,18 @@ index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..b4ddafdd126edd16172f00448bbbd56e
  
  namespace blink {
  
-@@ -118,6 +120,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
+@@ -19,6 +21,10 @@ namespace blink {
+ // Level 4 specification.
+ gfx::ColorSpace PredefinedColorSpaceToGfxColorSpace(
+     PredefinedColorSpace color_space) {
++  auto* cmd_line = base::CommandLine::ForCurrentProcess();
++  if (cmd_line->HasSwitch(switches::kDisableColorCorrectRendering)) {
++    return gfx::ColorSpace();
++  }
+   switch (color_space) {
+     case PredefinedColorSpace::kSRGB:
+       return gfx::ColorSpace::CreateSRGB();
+@@ -118,6 +124,11 @@ uint8_t CanvasColorParams::BytesPerPixel() const {
  }
  
  gfx::ColorSpace CanvasColorParams::GetStorageGfxColorSpace() const {

From 77e1a046ec6e9af2ee3b97599840e077caf821c7 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 09:37:11 -0700
Subject: [PATCH 628/811] test: move chromium spec config to its own folder
 (#35063)

---
 {spec => spec-chromium}/BUILD.gn                 | 0
 {spec => spec-chromium}/configs/browsertests.yml | 0
 {spec => spec-chromium}/configs/unittests.yml    | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {spec => spec-chromium}/BUILD.gn (100%)
 rename {spec => spec-chromium}/configs/browsertests.yml (100%)
 rename {spec => spec-chromium}/configs/unittests.yml (100%)

diff --git a/spec/BUILD.gn b/spec-chromium/BUILD.gn
similarity index 100%
rename from spec/BUILD.gn
rename to spec-chromium/BUILD.gn
diff --git a/spec/configs/browsertests.yml b/spec-chromium/configs/browsertests.yml
similarity index 100%
rename from spec/configs/browsertests.yml
rename to spec-chromium/configs/browsertests.yml
diff --git a/spec/configs/unittests.yml b/spec-chromium/configs/unittests.yml
similarity index 100%
rename from spec/configs/unittests.yml
rename to spec-chromium/configs/unittests.yml

From 182ab9ad7646ccf42b25e539990f8cb0c40f68b5 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Tue, 26 Jul 2022 13:28:59 -0400
Subject: [PATCH 629/811] test: remove duplicate test that is causing hang in
 Windows (#35071)

---
 spec/chromium-spec.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index 2b213f45937cd..154dffaff8eb9 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -62,14 +62,6 @@ describe('chromium feature', () => {
   });
 
   describe('window.open', () => {
-    it('accepts "nodeIntegration" as feature', async () => {
-      const message = waitForEvent(window, 'message');
-      const b = window.open(`file://${fixtures}/pages/window-opener-node.html`, '', 'nodeIntegration=no,show=no');
-      const event = await message;
-      b.close();
-      expect(event.data.isProcessGlobalUndefined).to.be.true();
-    });
-
     it('inherit options of parent window', async () => {
       const message = waitForEvent(window, 'message');
       const b = window.open(`file://${fixtures}/pages/window-open-size.html`, '', 'show=no');

From b42fd1ddca873b7354e39558935eba517fe1706e Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 26 Jul 2022 19:30:15 +0200
Subject: [PATCH 630/811] fix: handle WCO pressed state when going maximized ->
 minimized (#35070)

---
 shell/browser/native_window_views.h      |  1 +
 shell/browser/native_window_views_win.cc | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h
index 5454aafaec053..6672e3c2c7fcf 100644
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -225,6 +225,7 @@ class NativeWindowViews : public NativeWindow,
 
 #if BUILDFLAG(IS_WIN)
   void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
+  void ResetWindowControls();
   void SetForwardMouseMessages(bool forward);
   static LRESULT CALLBACK SubclassProc(HWND hwnd,
                                        UINT msg,
diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index 9c0b54393958b..dc6f089d06bf6 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -415,6 +415,7 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
           last_window_state_ != ui::SHOW_STATE_MAXIMIZED) {
         last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
         NotifyWindowMaximize();
+        ResetWindowControls();
       } else if (w_param == SIZE_MINIMIZED &&
                  last_window_state_ != ui::SHOW_STATE_MINIMIZED) {
         last_window_state_ = ui::SHOW_STATE_MINIMIZED;
@@ -440,18 +441,23 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
         default:
           break;
       }
-      // If a given window was minimized/maximized and has since been
-      // restored, ensure the WCO buttons are set to normal state.
-      auto* ncv = widget()->non_client_view();
-      if (IsWindowControlsOverlayEnabled() && ncv) {
-        auto* frame_view = static_cast<WinFrameView*>(ncv->frame_view());
-        frame_view->caption_button_container()->ResetWindowControls();
-      }
+      ResetWindowControls();
       break;
     }
   }
 }
 
+void NativeWindowViews::ResetWindowControls() {
+  // If a given window was minimized and has since been
+  // unminimized (restored/maximized), ensure the WCO buttons
+  // are reset to their default unpressed state.
+  auto* ncv = widget()->non_client_view();
+  if (IsWindowControlsOverlayEnabled() && ncv) {
+    auto* frame_view = static_cast<WinFrameView*>(ncv->frame_view());
+    frame_view->caption_button_container()->ResetWindowControls();
+  }
+}
+
 void NativeWindowViews::SetForwardMouseMessages(bool forward) {
   if (forward && !forwarding_mouse_messages_) {
     forwarding_mouse_messages_ = true;

From 6d9e8b65bc94dea8fc47f4e03c1833263c3622e9 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 26 Jul 2022 15:42:50 -0700
Subject: [PATCH 631/811] test: add process module tests for main process
 (#35057)

---
 spec-main/api-process-spec.ts | 283 +++++++++++++++++++++++-----------
 1 file changed, 195 insertions(+), 88 deletions(-)

diff --git a/spec-main/api-process-spec.ts b/spec-main/api-process-spec.ts
index cb0fe9bede55e..163839349d70a 100644
--- a/spec-main/api-process-spec.ts
+++ b/spec-main/api-process-spec.ts
@@ -6,119 +6,226 @@ import { defer, ifdescribe } from './spec-helpers';
 import { app } from 'electron/main';
 import { closeAllWindows } from './window-helpers';
 
-describe('renderer process module', () => {
-  let w: BrowserWindow;
-  before(async () => {
-    w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
-    await w.loadURL('about:blank');
-  });
-  after(closeAllWindows);
+describe('process module', () => {
+  describe('renderer process', () => {
+    let w: BrowserWindow;
+    before(async () => {
+      w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      await w.loadURL('about:blank');
+    });
+    after(closeAllWindows);
 
-  describe('process.getCreationTime()', () => {
-    it('returns a creation time', async () => {
-      const creationTime = await w.webContents.executeJavaScript('process.getCreationTime()');
-      expect(creationTime).to.be.a('number').and.be.at.least(0);
+    describe('process.getCreationTime()', () => {
+      it('returns a creation time', async () => {
+        const creationTime = await w.webContents.executeJavaScript('process.getCreationTime()');
+        expect(creationTime).to.be.a('number').and.be.at.least(0);
+      });
     });
-  });
 
-  describe('process.getCPUUsage()', () => {
-    it('returns a cpu usage object', async () => {
-      const cpuUsage = await w.webContents.executeJavaScript('process.getCPUUsage()');
-      expect(cpuUsage.percentCPUUsage).to.be.a('number');
-      expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number');
+    describe('process.getCPUUsage()', () => {
+      it('returns a cpu usage object', async () => {
+        const cpuUsage = await w.webContents.executeJavaScript('process.getCPUUsage()');
+        expect(cpuUsage.percentCPUUsage).to.be.a('number');
+        expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number');
+      });
     });
-  });
 
-  ifdescribe(process.platform !== 'darwin')('process.getIOCounters()', () => {
-    it('returns an io counters object', async () => {
-      const ioCounters = await w.webContents.executeJavaScript('process.getIOCounters()');
-      expect(ioCounters.readOperationCount).to.be.a('number');
-      expect(ioCounters.writeOperationCount).to.be.a('number');
-      expect(ioCounters.otherOperationCount).to.be.a('number');
-      expect(ioCounters.readTransferCount).to.be.a('number');
-      expect(ioCounters.writeTransferCount).to.be.a('number');
-      expect(ioCounters.otherTransferCount).to.be.a('number');
+    ifdescribe(process.platform !== 'darwin')('process.getIOCounters()', () => {
+      it('returns an io counters object', async () => {
+        const ioCounters = await w.webContents.executeJavaScript('process.getIOCounters()');
+        expect(ioCounters.readOperationCount).to.be.a('number');
+        expect(ioCounters.writeOperationCount).to.be.a('number');
+        expect(ioCounters.otherOperationCount).to.be.a('number');
+        expect(ioCounters.readTransferCount).to.be.a('number');
+        expect(ioCounters.writeTransferCount).to.be.a('number');
+        expect(ioCounters.otherTransferCount).to.be.a('number');
+      });
     });
-  });
 
-  describe('process.getBlinkMemoryInfo()', () => {
-    it('returns blink memory information object', async () => {
-      const heapStats = await w.webContents.executeJavaScript('process.getBlinkMemoryInfo()');
-      expect(heapStats.allocated).to.be.a('number');
-      expect(heapStats.total).to.be.a('number');
+    describe('process.getBlinkMemoryInfo()', () => {
+      it('returns blink memory information object', async () => {
+        const heapStats = await w.webContents.executeJavaScript('process.getBlinkMemoryInfo()');
+        expect(heapStats.allocated).to.be.a('number');
+        expect(heapStats.total).to.be.a('number');
+      });
     });
-  });
 
-  describe('process.getProcessMemoryInfo()', () => {
-    it('resolves promise successfully with valid data', async () => {
-      const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()');
-      expect(memoryInfo).to.be.an('object');
-      if (process.platform === 'linux' || process.platform === 'win32') {
-        expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
-      }
-      expect(memoryInfo.private).to.be.a('number').greaterThan(0);
-      // Shared bytes can be zero
-      expect(memoryInfo.shared).to.be.a('number').greaterThan(-1);
+    describe('process.getProcessMemoryInfo()', () => {
+      it('resolves promise successfully with valid data', async () => {
+        const memoryInfo = await w.webContents.executeJavaScript('process.getProcessMemoryInfo()');
+        expect(memoryInfo).to.be.an('object');
+        if (process.platform === 'linux' || process.platform === 'win32') {
+          expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
+        }
+        expect(memoryInfo.private).to.be.a('number').greaterThan(0);
+        // Shared bytes can be zero
+        expect(memoryInfo.shared).to.be.a('number').greaterThan(-1);
+      });
     });
-  });
 
-  describe('process.getSystemMemoryInfo()', () => {
-    it('returns system memory info object', async () => {
-      const systemMemoryInfo = await w.webContents.executeJavaScript('process.getSystemMemoryInfo()');
-      expect(systemMemoryInfo.free).to.be.a('number');
-      expect(systemMemoryInfo.total).to.be.a('number');
+    describe('process.getSystemMemoryInfo()', () => {
+      it('returns system memory info object', async () => {
+        const systemMemoryInfo = await w.webContents.executeJavaScript('process.getSystemMemoryInfo()');
+        expect(systemMemoryInfo.free).to.be.a('number');
+        expect(systemMemoryInfo.total).to.be.a('number');
+      });
     });
-  });
 
-  describe('process.getSystemVersion()', () => {
-    it('returns a string', async () => {
-      const systemVersion = await w.webContents.executeJavaScript('process.getSystemVersion()');
-      expect(systemVersion).to.be.a('string');
+    describe('process.getSystemVersion()', () => {
+      it('returns a string', async () => {
+        const systemVersion = await w.webContents.executeJavaScript('process.getSystemVersion()');
+        expect(systemVersion).to.be.a('string');
+      });
+    });
+
+    describe('process.getHeapStatistics()', () => {
+      it('returns heap statistics object', async () => {
+        const heapStats = await w.webContents.executeJavaScript('process.getHeapStatistics()');
+        expect(heapStats.totalHeapSize).to.be.a('number');
+        expect(heapStats.totalHeapSizeExecutable).to.be.a('number');
+        expect(heapStats.totalPhysicalSize).to.be.a('number');
+        expect(heapStats.totalAvailableSize).to.be.a('number');
+        expect(heapStats.usedHeapSize).to.be.a('number');
+        expect(heapStats.heapSizeLimit).to.be.a('number');
+        expect(heapStats.mallocedMemory).to.be.a('number');
+        expect(heapStats.peakMallocedMemory).to.be.a('number');
+        expect(heapStats.doesZapGarbage).to.be.a('boolean');
+      });
+    });
+
+    describe('process.takeHeapSnapshot()', () => {
+      it('returns true on success', async () => {
+        const filePath = path.join(app.getPath('temp'), 'test.heapsnapshot');
+        defer(() => {
+          try {
+            fs.unlinkSync(filePath);
+          } catch (e) {
+            // ignore error
+          }
+        });
+
+        const success = await w.webContents.executeJavaScript(`process.takeHeapSnapshot(${JSON.stringify(filePath)})`);
+        expect(success).to.be.true();
+        const stats = fs.statSync(filePath);
+        expect(stats.size).not.to.be.equal(0);
+      });
+
+      it('returns false on failure', async () => {
+        const success = await w.webContents.executeJavaScript('process.takeHeapSnapshot("")');
+        expect(success).to.be.false();
+      });
     });
-  });
 
-  describe('process.getHeapStatistics()', () => {
-    it('returns heap statistics object', async () => {
-      const heapStats = await w.webContents.executeJavaScript('process.getHeapStatistics()');
-      expect(heapStats.totalHeapSize).to.be.a('number');
-      expect(heapStats.totalHeapSizeExecutable).to.be.a('number');
-      expect(heapStats.totalPhysicalSize).to.be.a('number');
-      expect(heapStats.totalAvailableSize).to.be.a('number');
-      expect(heapStats.usedHeapSize).to.be.a('number');
-      expect(heapStats.heapSizeLimit).to.be.a('number');
-      expect(heapStats.mallocedMemory).to.be.a('number');
-      expect(heapStats.peakMallocedMemory).to.be.a('number');
-      expect(heapStats.doesZapGarbage).to.be.a('boolean');
+    describe('process.contextId', () => {
+      it('is a string', async () => {
+        const contextId = await w.webContents.executeJavaScript('process.contextId');
+        expect(contextId).to.be.a('string');
+      });
     });
   });
 
-  describe('process.takeHeapSnapshot()', () => {
-    it('returns true on success', async () => {
-      const filePath = path.join(app.getPath('temp'), 'test.heapsnapshot');
-      defer(() => {
-        try {
-          fs.unlinkSync(filePath);
-        } catch (e) {
-          // ignore error
+  describe('main process', () => {
+    describe('process.getCreationTime()', () => {
+      it('returns a creation time', () => {
+        const creationTime = process.getCreationTime();
+        expect(creationTime).to.be.a('number').and.be.at.least(0);
+      });
+    });
+
+    describe('process.getCPUUsage()', () => {
+      it('returns a cpu usage object', () => {
+        const cpuUsage = process.getCPUUsage();
+        expect(cpuUsage.percentCPUUsage).to.be.a('number');
+        expect(cpuUsage.idleWakeupsPerSecond).to.be.a('number');
+      });
+    });
+
+    ifdescribe(process.platform !== 'darwin')('process.getIOCounters()', () => {
+      it('returns an io counters object', () => {
+        const ioCounters = process.getIOCounters();
+        expect(ioCounters.readOperationCount).to.be.a('number');
+        expect(ioCounters.writeOperationCount).to.be.a('number');
+        expect(ioCounters.otherOperationCount).to.be.a('number');
+        expect(ioCounters.readTransferCount).to.be.a('number');
+        expect(ioCounters.writeTransferCount).to.be.a('number');
+        expect(ioCounters.otherTransferCount).to.be.a('number');
+      });
+    });
+
+    describe('process.getBlinkMemoryInfo()', () => {
+      it('returns blink memory information object', () => {
+        const heapStats = process.getBlinkMemoryInfo();
+        expect(heapStats.allocated).to.be.a('number');
+        expect(heapStats.total).to.be.a('number');
+      });
+    });
+
+    describe('process.getProcessMemoryInfo()', () => {
+      it('resolves promise successfully with valid data', async () => {
+        const memoryInfo = await process.getProcessMemoryInfo();
+        expect(memoryInfo).to.be.an('object');
+        if (process.platform === 'linux' || process.platform === 'win32') {
+          expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0);
         }
+        expect(memoryInfo.private).to.be.a('number').greaterThan(0);
+        // Shared bytes can be zero
+        expect(memoryInfo.shared).to.be.a('number').greaterThan(-1);
       });
+    });
 
-      const success = await w.webContents.executeJavaScript(`process.takeHeapSnapshot(${JSON.stringify(filePath)})`);
-      expect(success).to.be.true();
-      const stats = fs.statSync(filePath);
-      expect(stats.size).not.to.be.equal(0);
+    describe('process.getSystemMemoryInfo()', () => {
+      it('returns system memory info object', () => {
+        const systemMemoryInfo = process.getSystemMemoryInfo();
+        expect(systemMemoryInfo.free).to.be.a('number');
+        expect(systemMemoryInfo.total).to.be.a('number');
+      });
     });
 
-    it('returns false on failure', async () => {
-      const success = await w.webContents.executeJavaScript('process.takeHeapSnapshot("")');
-      expect(success).to.be.false();
+    describe('process.getSystemVersion()', () => {
+      it('returns a string', () => {
+        const systemVersion = process.getSystemVersion();
+        expect(systemVersion).to.be.a('string');
+      });
     });
-  });
 
-  describe('process.contextId', () => {
-    it('is a string', async () => {
-      const contextId = await w.webContents.executeJavaScript('process.contextId');
-      expect(contextId).to.be.a('string');
+    describe('process.getHeapStatistics()', () => {
+      it('returns heap statistics object', async () => {
+        const heapStats = process.getHeapStatistics();
+        expect(heapStats.totalHeapSize).to.be.a('number');
+        expect(heapStats.totalHeapSizeExecutable).to.be.a('number');
+        expect(heapStats.totalPhysicalSize).to.be.a('number');
+        expect(heapStats.totalAvailableSize).to.be.a('number');
+        expect(heapStats.usedHeapSize).to.be.a('number');
+        expect(heapStats.heapSizeLimit).to.be.a('number');
+        expect(heapStats.mallocedMemory).to.be.a('number');
+        expect(heapStats.peakMallocedMemory).to.be.a('number');
+        expect(heapStats.doesZapGarbage).to.be.a('boolean');
+      });
+    });
+
+    describe('process.takeHeapSnapshot()', () => {
+      // TODO(nornagon): this seems to take a really long time when run in the
+      // main process, for unknown reasons.
+      it.skip('returns true on success', () => {
+        const filePath = path.join(app.getPath('temp'), 'test.heapsnapshot');
+        defer(() => {
+          try {
+            fs.unlinkSync(filePath);
+          } catch (e) {
+            // ignore error
+          }
+        });
+
+        const success = process.takeHeapSnapshot(filePath);
+        expect(success).to.be.true();
+        const stats = fs.statSync(filePath);
+        expect(stats.size).not.to.be.equal(0);
+      });
+
+      it('returns false on failure', async () => {
+        const success = process.takeHeapSnapshot('');
+        expect(success).to.be.false();
+      });
     });
   });
 });

From 9416091180e18c1ba1f625f86505332a018d9049 Mon Sep 17 00:00:00 2001
From: Ian German Mesner <mesner@gmail.com>
Date: Tue, 26 Jul 2022 20:02:06 -0400
Subject: [PATCH 632/811] fix: allow setsize to be called within a move or
 resize for preventDefault (#34843)

fix: #34599 allow setsize to be called within a move or resize for preventDefault
---
 shell/browser/native_window_views.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 8b00fec300e15..c73ea669fd0ed 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -729,7 +729,6 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
 #if BUILDFLAG(IS_WIN)
   if (is_moving_ || is_resizing_) {
     pending_bounds_change_ = bounds;
-    return;
   }
 #endif
 

From ff804e3a748c72f4812af8ccf3b1d7442a468f4a Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 26 Jul 2022 21:33:07 -0700
Subject: [PATCH 633/811] fix: use win_clang_x64 binary for x86 extract symbols
 (#35078)

fix: use win_clang_x64 for x86 extract symbols
---
 appveyor.yml                       |  9 +++------
 build/extract_symbols.gni          |  6 +++++-
 script/release/release.js          |  5 ++---
 script/release/uploaders/upload.py | 14 ++++++--------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 04cdb20e35447..80ee94d49d314 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -170,19 +170,16 @@ build_script:
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
-  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
+      if ($env:GN_CONFIG -eq 'release') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        if ($env:TARGET_ARCH -ne 'ia32') {
-          python electron\script\zip-symbols.py
-          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
-        }
+        python electron\script\zip-symbols.py
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
diff --git a/build/extract_symbols.gni b/build/extract_symbols.gni
index e3fa2a30f4ca0..2f98aa466ba15 100644
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -24,7 +24,11 @@ template("extract_symbols") {
     assert(defined(invoker.binary), "Need binary to dump")
     assert(defined(invoker.symbol_dir), "Need directory for symbol output")
 
-    dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
+    if (host_os == "win" && target_cpu == "x86") {
+      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
+    } else {
+      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
+    }
     dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                        "/dump_syms$_host_executable_suffix"
 
diff --git a/script/release/release.js b/script/release/release.js
index e89d7ba920245..c3c8d6363b120 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -128,9 +128,8 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
-    // TODO(vertedinde) Symbol generation on 32-bit Windows is temporarily disabled due to CI failures
-    // `electron-${version}-win32-ia32-pdb.zip`,
-    // `electron-${version}-win32-ia32-symbols.zip`,
+    `electron-${version}-win32-ia32-pdb.zip`,
+    `electron-${version}-win32-ia32-symbols.zip`,
     `electron-${version}-win32-ia32.zip`,
     `electron-${version}-win32-x64-pdb.zip`,
     `electron-${version}-win32-x64-symbols.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index caaa726d55d8a..5845b88ede1b4 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -76,10 +76,9 @@ def main():
   shutil.copy2(os.path.join(OUT_DIR, 'dist.zip'), electron_zip)
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
-    if (get_target_arch() != 'ia32' or PLATFORM != 'win32'):
-      symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-      shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
-      upload_electron(release, symbols_zip, args)
+    symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
+    upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     if get_platform_key() == 'darwin' and get_target_arch() == 'x64':
       api_path = os.path.join(ELECTRON_DIR, 'electron-api.json')
@@ -96,10 +95,9 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snapshot_zip)
     upload_electron(release, dsym_snapshot_zip, args)    
   elif PLATFORM == 'win32':
-    if get_target_arch() != 'ia32':
-      pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
-      shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
-      upload_electron(release, pdb_zip, args)
+    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+    upload_electron(release, pdb_zip, args)
   elif PLATFORM == 'linux':
     debug_zip = os.path.join(OUT_DIR, DEBUG_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'debug.zip'), debug_zip)

From 62001dc6cbfd78a82d2fca849ca5eb0504cd0b71 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Tue, 26 Jul 2022 23:44:44 -0500
Subject: [PATCH 634/811] fix: crash on startup in X11 (#35075)

Fixes #34996.
---
 shell/browser/electron_browser_main_parts.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 13bd28b53443c..b422d930769f8 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -278,12 +278,6 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
 }
 
 int ElectronBrowserMainParts::PreCreateThreads() {
-#if defined(USE_AURA)
-  if (!display::Screen::GetScreen()) {
-    screen_ = views::CreateDesktopScreen();
-  }
-#endif
-
   if (!views::LayoutProvider::Get())
     layout_provider_ = std::make_unique<views::LayoutProvider>();
 
@@ -314,6 +308,14 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   // Load resources bundle according to locale.
   std::string loaded_locale = LoadResourceBundle(locale);
 
+#if defined(USE_AURA)
+  // NB: must be called _after_ locale resource bundle is loaded,
+  // because ui lib makes use of it in X11
+  if (!display::Screen::GetScreen()) {
+    screen_ = views::CreateDesktopScreen();
+  }
+#endif
+
   // Initialize the app locale.
   std::string app_locale = l10n_util::GetApplicationLocale(loaded_locale);
   ElectronBrowserClient::SetApplicationLocale(app_locale);

From 7c2ed98214093af33a7e428143b3ffaa5cc7915b Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 27 Jul 2022 02:10:04 -0700
Subject: [PATCH 635/811] test: migrate more chromium specs to main (#35081)

---
 spec-main/chromium-spec.ts             | 192 ++++++++++++++++++++++++-
 spec/chromium-spec.js                  | 192 -------------------------
 spec/fixtures/pages/shared_worker.html |   2 +-
 spec/fixtures/pages/worker.html        |   2 +-
 4 files changed, 187 insertions(+), 201 deletions(-)

diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index c1e831d590379..cf241bccbc719 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -13,6 +13,7 @@ import { promisify } from 'util';
 import { ifit, ifdescribe, defer, delay } from './spec-helpers';
 import { AddressInfo } from 'net';
 import { PipeTransport } from './pipe-transport';
+import * as ws from 'ws';
 
 const features = process._linkedBinding('electron_common_features');
 
@@ -678,13 +679,7 @@ describe('chromium features', () => {
     });
   });
 
-  describe('navigator.geolocation', () => {
-    before(function () {
-      if (!features.isFakeLocationProviderEnabled()) {
-        return this.skip();
-      }
-    });
-
+  ifdescribe(features.isFakeLocationProviderEnabled())('navigator.geolocation', () => {
     it('returns error when permission is denied', async () => {
       const w = new BrowserWindow({
         show: false,
@@ -706,6 +701,17 @@ describe('chromium features', () => {
       const [, channel] = await message;
       expect(channel).to.equal('success', 'unexpected response from geolocation api');
     });
+
+    it('returns position when permission is granted', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const position = await w.webContents.executeJavaScript(`new Promise((resolve, reject) =>
+        navigator.geolocation.getCurrentPosition(
+          x => resolve({coords: x.coords, timestamp: x.timestamp}),
+          reject))`);
+      expect(position).to.have.property('coords');
+      expect(position).to.have.property('timestamp');
+    });
   });
 
   describe('web workers', () => {
@@ -726,6 +732,68 @@ describe('chromium features', () => {
       const [code] = await emittedOnce(appProcess, 'exit');
       expect(code).to.equal(0);
     });
+
+    it('Worker can work', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const data = await w.webContents.executeJavaScript(`
+        const worker = new Worker('../workers/worker.js');
+        const message = 'ping';
+        const eventPromise = new Promise((resolve) => { worker.onmessage = resolve; });
+        worker.postMessage(message);
+        eventPromise.then(t => t.data)
+      `);
+      expect(data).to.equal('ping');
+    });
+
+    it('Worker has no node integration by default', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const data = await w.webContents.executeJavaScript(`
+        const worker = new Worker('../workers/worker_node.js');
+        new Promise((resolve) => { worker.onmessage = e => resolve(e.data); })
+      `);
+      expect(data).to.equal('undefined undefined undefined undefined');
+    });
+
+    it('Worker has node integration with nodeIntegrationInWorker', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, nodeIntegrationInWorker: true, contextIsolation: false } });
+      w.loadURL(`file://${fixturesPath}/pages/worker.html`);
+      const [, data] = await emittedOnce(ipcMain, 'worker-result');
+      expect(data).to.equal('object function object function');
+    });
+
+    describe('SharedWorker', () => {
+      it('can work', async () => {
+        const w = new BrowserWindow({ show: false });
+        await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+        const data = await w.webContents.executeJavaScript(`
+          const worker = new SharedWorker('../workers/shared_worker.js');
+          const message = 'ping';
+          const eventPromise = new Promise((resolve) => { worker.port.onmessage = e => resolve(e.data); });
+          worker.port.postMessage(message);
+          eventPromise
+        `);
+        expect(data).to.equal('ping');
+      });
+
+      it('has no node integration by default', async () => {
+        const w = new BrowserWindow({ show: false });
+        await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+        const data = await w.webContents.executeJavaScript(`
+          const worker = new SharedWorker('../workers/shared_worker_node.js');
+          new Promise((resolve) => { worker.port.onmessage = e => resolve(e.data); })
+        `);
+        expect(data).to.equal('undefined undefined undefined undefined');
+      });
+
+      it('has node integration with nodeIntegrationInWorker', async () => {
+        const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, nodeIntegrationInWorker: true, contextIsolation: false } });
+        w.loadURL(`file://${fixturesPath}/pages/shared_worker.html`);
+        const [, data] = await emittedOnce(ipcMain, 'worker-result');
+        expect(data).to.equal('object function object function');
+      });
+    });
   });
 
   describe('form submit', () => {
@@ -1613,6 +1681,116 @@ describe('chromium features', () => {
       });
     });
   });
+
+  describe('Badging API', () => {
+    it('does not crash', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      await w.webContents.executeJavaScript('navigator.setAppBadge(42)');
+      await w.webContents.executeJavaScript('navigator.setAppBadge()');
+      await w.webContents.executeJavaScript('navigator.clearAppBadge()');
+    });
+  });
+
+  describe('navigator.webkitGetUserMedia', () => {
+    it('calls its callbacks', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      await w.webContents.executeJavaScript(`new Promise((resolve) => {
+        navigator.webkitGetUserMedia({
+          audio: true,
+          video: false
+        }, () => resolve(),
+        () => resolve());
+      })`);
+    });
+  });
+
+  describe('navigator.language', () => {
+    it('should not be empty', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL('about:blank');
+      expect(await w.webContents.executeJavaScript('navigator.language')).to.not.equal('');
+    });
+  });
+
+  describe('heap snapshot', () => {
+    it('does not crash', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      await w.webContents.executeJavaScript('process._linkedBinding(\'electron_common_v8_util\').takeHeapSnapshot()');
+    });
+  });
+
+  ifdescribe(process.platform !== 'win32' && process.platform !== 'linux')('webgl', () => {
+    it('can be gotten as context in canvas', async () => {
+      const w = new BrowserWindow({ show: false });
+      w.loadURL('about:blank');
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const canWebglContextBeCreated = await w.webContents.executeJavaScript(`
+        document.createElement('canvas').getContext('webgl') != null;
+      `);
+      expect(canWebglContextBeCreated).to.be.true();
+    });
+  });
+
+  describe('iframe', () => {
+    it('does not have node integration', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const result = await w.webContents.executeJavaScript(`
+        const iframe = document.createElement('iframe')
+        iframe.src = './set-global.html';
+        document.body.appendChild(iframe);
+        new Promise(resolve => iframe.onload = e => resolve(iframe.contentWindow.test))
+      `);
+      expect(result).to.equal('undefined undefined undefined');
+    });
+  });
+
+  describe('websockets', () => {
+    it('has user agent', async () => {
+      const server = http.createServer();
+      await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
+      const port = (server.address() as AddressInfo).port;
+      const wss = new ws.Server({ server: server });
+      const finished = new Promise<string | undefined>((resolve, reject) => {
+        wss.on('error', reject);
+        wss.on('connection', (ws, upgradeReq) => {
+          resolve(upgradeReq.headers['user-agent']);
+        });
+      });
+      const w = new BrowserWindow({ show: false });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript(`
+        new WebSocket('ws://127.0.0.1:${port}');
+      `);
+      expect(await finished).to.include('Electron');
+    });
+  });
+
+  describe('fetch', () => {
+    it('does not crash', async () => {
+      const server = http.createServer((req, res) => {
+        res.end('test');
+      });
+      defer(() => server.close());
+      await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
+      const port = (server.address() as AddressInfo).port;
+      const w = new BrowserWindow({ show: false });
+      w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+      const x = await w.webContents.executeJavaScript(`
+        fetch('http://127.0.0.1:${port}').then((res) => res.body.getReader())
+          .then((reader) => {
+            return reader.read().then((r) => {
+              reader.cancel();
+              return r.value;
+            });
+          })
+      `);
+      expect(x).to.deep.equal(new Uint8Array([116, 101, 115, 116]));
+    });
+  });
 });
 
 describe('font fallback', () => {
diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index 154dffaff8eb9..0ae511ac5985f 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -2,7 +2,6 @@ const { expect } = require('chai');
 const fs = require('fs');
 const http = require('http');
 const path = require('path');
-const ws = require('ws');
 const url = require('url');
 const ChildProcess = require('child_process');
 const { ipcRenderer } = require('electron');
@@ -16,51 +15,6 @@ const features = process._linkedBinding('electron_common_features');
 describe('chromium feature', () => {
   const fixtures = path.resolve(__dirname, 'fixtures');
 
-  describe('Badging API', () => {
-    it('does not crash', () => {
-      expect(() => {
-        navigator.setAppBadge(42);
-      }).to.not.throw();
-      expect(() => {
-        // setAppBadge with no argument should show dot
-        navigator.setAppBadge();
-      }).to.not.throw();
-      expect(() => {
-        navigator.clearAppBadge();
-      }).to.not.throw();
-    });
-  });
-
-  describe('heap snapshot', () => {
-    it('does not crash', function () {
-      process._linkedBinding('electron_common_v8_util').takeHeapSnapshot();
-    });
-  });
-
-  describe('navigator.webkitGetUserMedia', () => {
-    it('calls its callbacks', (done) => {
-      navigator.webkitGetUserMedia({
-        audio: true,
-        video: false
-      }, () => done(),
-      () => done());
-    });
-  });
-
-  describe('navigator.language', () => {
-    it('should not be empty', () => {
-      expect(navigator.language).to.not.equal('');
-    });
-  });
-
-  ifdescribe(features.isFakeLocationProviderEnabled())('navigator.geolocation', () => {
-    it('returns position when permission is granted', async () => {
-      const position = await new Promise((resolve, reject) => navigator.geolocation.getCurrentPosition(resolve, reject));
-      expect(position).to.have.a.property('coords');
-      expect(position).to.have.a.property('timestamp');
-    });
-  });
-
   describe('window.open', () => {
     it('inherit options of parent window', async () => {
       const message = waitForEvent(window, 'message');
@@ -208,105 +162,6 @@ describe('chromium feature', () => {
     });
   });
 
-  describe('webgl', () => {
-    before(function () {
-      if (process.platform === 'win32') {
-        this.skip();
-      }
-    });
-
-    it('can be get as context in canvas', () => {
-      if (process.platform === 'linux') {
-        // FIXME(alexeykuzmin): Skip the test.
-        // this.skip()
-        return;
-      }
-
-      const webgl = document.createElement('canvas').getContext('webgl');
-      expect(webgl).to.not.be.null();
-    });
-  });
-
-  describe('web workers', () => {
-    it('Worker can work', async () => {
-      const worker = new Worker('../fixtures/workers/worker.js');
-      const message = 'ping';
-      const eventPromise = new Promise((resolve) => { worker.onmessage = resolve; });
-      worker.postMessage(message);
-      const event = await eventPromise;
-      worker.terminate();
-      expect(event.data).to.equal(message);
-    });
-
-    it('Worker has no node integration by default', async () => {
-      const worker = new Worker('../fixtures/workers/worker_node.js');
-      const event = await new Promise((resolve) => { worker.onmessage = resolve; });
-      worker.terminate();
-      expect(event.data).to.equal('undefined undefined undefined undefined');
-    });
-
-    it('Worker has node integration with nodeIntegrationInWorker', async () => {
-      const webview = new WebView();
-      const eventPromise = waitForEvent(webview, 'ipc-message');
-      webview.src = `file://${fixtures}/pages/worker.html`;
-      webview.setAttribute('webpreferences', 'nodeIntegration, nodeIntegrationInWorker, contextIsolation=no');
-      document.body.appendChild(webview);
-      const event = await eventPromise;
-      webview.remove();
-      expect(event.channel).to.equal('object function object function');
-    });
-
-    describe('SharedWorker', () => {
-      it('can work', async () => {
-        const worker = new SharedWorker('../fixtures/workers/shared_worker.js');
-        const message = 'ping';
-        const eventPromise = new Promise((resolve) => { worker.port.onmessage = resolve; });
-        worker.port.postMessage(message);
-        const event = await eventPromise;
-        expect(event.data).to.equal(message);
-      });
-
-      it('has no node integration by default', async () => {
-        const worker = new SharedWorker('../fixtures/workers/shared_worker_node.js');
-        const event = await new Promise((resolve) => { worker.port.onmessage = resolve; });
-        expect(event.data).to.equal('undefined undefined undefined undefined');
-      });
-
-      it('has node integration with nodeIntegrationInWorker', async () => {
-        const webview = new WebView();
-        webview.addEventListener('console-message', (e) => {
-          console.log(e);
-        });
-        const eventPromise = waitForEvent(webview, 'ipc-message');
-        webview.src = `file://${fixtures}/pages/shared_worker.html`;
-        webview.setAttribute('webpreferences', 'nodeIntegration, nodeIntegrationInWorker, contextIsolation=no');
-        document.body.appendChild(webview);
-        const event = await eventPromise;
-        webview.remove();
-        expect(event.channel).to.equal('object function object function');
-      });
-    });
-  });
-
-  describe('iframe', () => {
-    let iframe = null;
-
-    beforeEach(() => {
-      iframe = document.createElement('iframe');
-    });
-
-    afterEach(() => {
-      document.body.removeChild(iframe);
-    });
-
-    it('does not have node integration', async () => {
-      iframe.src = `file://${fixtures}/pages/set-global.html`;
-      document.body.appendChild(iframe);
-      await waitForEvent(iframe, 'load');
-      expect(iframe.contentWindow.test).to.equal('undefined undefined undefined');
-    });
-  });
-
   describe('storage', () => {
     describe('DOM storage quota increase', () => {
       ['localStorage', 'sessionStorage'].forEach((storageName) => {
@@ -357,34 +212,6 @@ describe('chromium feature', () => {
     });
   });
 
-  describe('websockets', () => {
-    let wss = null;
-    let server = null;
-    const WebSocketServer = ws.Server;
-
-    afterEach(() => {
-      wss.close();
-      server.close();
-    });
-
-    it('has user agent', (done) => {
-      server = http.createServer();
-      server.listen(0, '127.0.0.1', () => {
-        const port = server.address().port;
-        wss = new WebSocketServer({ server: server });
-        wss.on('error', done);
-        wss.on('connection', (ws, upgradeReq) => {
-          if (upgradeReq.headers['user-agent']) {
-            done();
-          } else {
-            done('user agent is empty');
-          }
-        });
-        const socket = new WebSocket(`ws://127.0.0.1:${port}`);
-      });
-    });
-  });
-
   describe('Promise', () => {
     it('resolves correctly in Node.js calls', (done) => {
       class XElement extends HTMLElement {}
@@ -413,25 +240,6 @@ describe('chromium feature', () => {
     });
   });
 
-  describe('fetch', () => {
-    it('does not crash', (done) => {
-      const server = http.createServer((req, res) => {
-        res.end('test');
-        server.close();
-      });
-      server.listen(0, '127.0.0.1', () => {
-        const port = server.address().port;
-        fetch(`http://127.0.0.1:${port}`).then((res) => res.body.getReader())
-          .then((reader) => {
-            reader.read().then((r) => {
-              reader.cancel();
-              done();
-            });
-          }).catch((e) => done(e));
-      });
-    });
-  });
-
   describe('window.alert(message, title)', () => {
     it('throws an exception when the arguments cannot be converted to strings', () => {
       expect(() => {
diff --git a/spec/fixtures/pages/shared_worker.html b/spec/fixtures/pages/shared_worker.html
index 7a0d0757ab262..5bd409d857b93 100644
--- a/spec/fixtures/pages/shared_worker.html
+++ b/spec/fixtures/pages/shared_worker.html
@@ -5,7 +5,7 @@
   // Pass a random parameter to create independent worker.
   let worker = new SharedWorker(`../workers/shared_worker_node.js?a={Math.random()}`)
   worker.port.onmessage = function (event) {
-    ipcRenderer.sendToHost(event.data)
+    ipcRenderer.send('worker-result', event.data)
   }
 </script>
 </body>
diff --git a/spec/fixtures/pages/worker.html b/spec/fixtures/pages/worker.html
index c84ef52065e02..95aceac6c08aa 100644
--- a/spec/fixtures/pages/worker.html
+++ b/spec/fixtures/pages/worker.html
@@ -4,7 +4,7 @@
   const {ipcRenderer} = require('electron')
   let worker = new Worker(`../workers/worker_node.js`)
   worker.onmessage = function (event) {
-    ipcRenderer.sendToHost(event.data)
+    ipcRenderer.send('worker-result', event.data)
     worker.terminate()
   }
 </script>

From 77b4aab720afde0c2a265ca6307e6770ca1feb80 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 27 Jul 2022 02:10:14 -0700
Subject: [PATCH 636/811] test: migrate the rest of the webFrame tests to main
 (#35080)

---
 spec-main/api-web-frame-spec.ts | 135 ++++++++++++++++++++++++++++++--
 spec/api-web-frame-spec.js      | 114 ---------------------------
 2 files changed, 129 insertions(+), 120 deletions(-)
 delete mode 100644 spec/api-web-frame-spec.js

diff --git a/spec-main/api-web-frame-spec.ts b/spec-main/api-web-frame-spec.ts
index f7d9d9ffb138a..5b6b71b93f4b9 100644
--- a/spec-main/api-web-frame-spec.ts
+++ b/spec-main/api-web-frame-spec.ts
@@ -1,23 +1,22 @@
 import { expect } from 'chai';
 import * as path from 'path';
-import { BrowserWindow, ipcMain } from 'electron/main';
-import { closeAllWindows } from './window-helpers';
+import { BrowserWindow, ipcMain, WebContents } from 'electron/main';
 import { emittedOnce } from './events-helpers';
+import { defer } from './spec-helpers';
 
 describe('webFrame module', () => {
   const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
 
-  afterEach(closeAllWindows);
-
   it('can use executeJavaScript', async () => {
     const w = new BrowserWindow({
-      show: true,
+      show: false,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: true,
         preload: path.join(fixtures, 'pages', 'world-safe-preload.js')
       }
     });
+    defer(() => w.close());
     const isSafe = emittedOnce(ipcMain, 'executejs-safe');
     w.loadURL('about:blank');
     const [, wasSafe] = await isSafe;
@@ -26,13 +25,14 @@ describe('webFrame module', () => {
 
   it('can use executeJavaScript and catch conversion errors', async () => {
     const w = new BrowserWindow({
-      show: true,
+      show: false,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: true,
         preload: path.join(fixtures, 'pages', 'world-safe-preload-error.js')
       }
     });
+    defer(() => w.close());
     const execError = emittedOnce(ipcMain, 'executejs-safe');
     w.loadURL('about:blank');
     const [, error] = await execError;
@@ -48,6 +48,7 @@ describe('webFrame module', () => {
         contextIsolation: false
       }
     });
+    defer(() => w.close());
     await w.loadFile(path.join(fixtures, 'pages', 'webframe-spell-check.html'));
     w.focus();
     await w.webContents.executeJavaScript('document.querySelector("input").focus()', true);
@@ -70,4 +71,126 @@ describe('webFrame module', () => {
     expect(words.sort()).to.deep.equal(['spleling', 'test', 'you\'re', 'you', 're'].sort());
     expect(callbackDefined).to.be.true();
   });
+
+  describe('api', () => {
+    let w: WebContents;
+    before(async () => {
+      const win = new BrowserWindow({ show: false, webPreferences: { contextIsolation: false, nodeIntegration: true } });
+      await win.loadURL('about:blank');
+      w = win.webContents;
+      await w.executeJavaScript('webFrame = require(\'electron\').webFrame; null');
+    });
+    it('top is self for top frame', async () => {
+      const equal = await w.executeJavaScript('webFrame.top.context === webFrame.context');
+      expect(equal).to.be.true();
+    });
+
+    it('opener is null for top frame', async () => {
+      const equal = await w.executeJavaScript('webFrame.opener === null');
+      expect(equal).to.be.true();
+    });
+
+    it('firstChild is null for top frame', async () => {
+      const equal = await w.executeJavaScript('webFrame.firstChild === null');
+      expect(equal).to.be.true();
+    });
+
+    it('getFrameForSelector() does not crash when not found', async () => {
+      const equal = await w.executeJavaScript('webFrame.getFrameForSelector(\'unexist-selector\') === null');
+      expect(equal).to.be.true();
+    });
+
+    it('findFrameByName() does not crash when not found', async () => {
+      const equal = await w.executeJavaScript('webFrame.findFrameByName(\'unexist-name\') === null');
+      expect(equal).to.be.true();
+    });
+
+    it('findFrameByRoutingId() does not crash when not found', async () => {
+      const equal = await w.executeJavaScript('webFrame.findFrameByRoutingId(-1) === null');
+      expect(equal).to.be.true();
+    });
+
+    describe('executeJavaScript', () => {
+      before(() => {
+        w.executeJavaScript(`
+          childFrameElement = document.createElement('iframe');
+          document.body.appendChild(childFrameElement);
+          childFrame = webFrame.firstChild;
+          null
+        `);
+      });
+
+      after(() => {
+        w.executeJavaScript(`
+          childFrameElement.remove();
+          null
+        `);
+      });
+
+      it('executeJavaScript() yields results via a promise and a sync callback', async () => {
+        const { callbackResult, callbackError, result } = await w.executeJavaScript(`new Promise(resolve => {
+          let callbackResult, callbackError;
+          childFrame
+            .executeJavaScript('1 + 1', (result, error) => {
+              callbackResult = result;
+              callbackError = error;
+            }).then(result => resolve({callbackResult, callbackError, result}))
+        })`);
+
+        expect(callbackResult).to.equal(2);
+        expect(callbackError).to.be.undefined();
+        expect(result).to.equal(2);
+      });
+
+      it('executeJavaScriptInIsolatedWorld() yields results via a promise and a sync callback', async () => {
+        const { callbackResult, callbackError, result } = await w.executeJavaScript(`new Promise(resolve => {
+          let callbackResult, callbackError;
+          childFrame
+            .executeJavaScriptInIsolatedWorld(999, [{code: '1 + 1'}], (result, error) => {
+              callbackResult = result;
+              callbackError = error;
+            }).then(result => resolve({callbackResult, callbackError, result}))
+        })`);
+
+        expect(callbackResult).to.equal(2);
+        expect(callbackError).to.be.undefined();
+        expect(result).to.equal(2);
+      });
+
+      it('executeJavaScript() yields errors via a promise and a sync callback', async () => {
+        const { callbackResult, callbackError, error } = await w.executeJavaScript(`new Promise(resolve => {
+          let callbackResult, callbackError;
+          childFrame
+            .executeJavaScript('thisShouldProduceAnError()', (result, error) => {
+              callbackResult = result;
+              callbackError = error;
+            }).then(result => {throw new Error}, error => resolve({callbackResult, callbackError, error}))
+        })`);
+
+        expect(callbackResult).to.be.undefined();
+        expect(callbackError).to.be.an('error');
+        expect(error).to.be.an('error');
+      });
+
+      it('executeJavaScriptInIsolatedWorld() yields errors via a promise and a sync callback', async () => {
+        const { callbackResult, callbackError, error } = await w.executeJavaScript(`new Promise(resolve => {
+          let callbackResult, callbackError;
+          childFrame
+            .executeJavaScriptInIsolatedWorld(999, [{code: 'thisShouldProduceAnError()'}], (result, error) => {
+              callbackResult = result;
+              callbackError = error;
+            }).then(result => {throw new Error}, error => resolve({callbackResult, callbackError, error}))
+        })`);
+
+        expect(callbackResult).to.be.undefined();
+        expect(callbackError).to.be.an('error');
+        expect(error).to.be.an('error');
+      });
+
+      it('executeJavaScript(InIsolatedWorld) can be used without a callback', async () => {
+        expect(await w.executeJavaScript('webFrame.executeJavaScript(\'1 + 1\')')).to.equal(2);
+        expect(await w.executeJavaScript('webFrame.executeJavaScriptInIsolatedWorld(999, [{code: \'1 + 1\'}])')).to.equal(2);
+      });
+    });
+  });
 });
diff --git a/spec/api-web-frame-spec.js b/spec/api-web-frame-spec.js
deleted file mode 100644
index a9a76839530b7..0000000000000
--- a/spec/api-web-frame-spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-const { expect } = require('chai');
-const { webFrame } = require('electron');
-
-describe('webFrame module', function () {
-  it('top is self for top frame', () => {
-    expect(webFrame.top.context).to.equal(webFrame.context);
-  });
-
-  it('opener is null for top frame', () => {
-    expect(webFrame.opener).to.be.null();
-  });
-
-  it('firstChild is null for top frame', () => {
-    expect(webFrame.firstChild).to.be.null();
-  });
-
-  it('getFrameForSelector() does not crash when not found', () => {
-    expect(webFrame.getFrameForSelector('unexist-selector')).to.be.null();
-  });
-
-  it('findFrameByName() does not crash when not found', () => {
-    expect(webFrame.findFrameByName('unexist-name')).to.be.null();
-  });
-
-  it('findFrameByRoutingId() does not crash when not found', () => {
-    expect(webFrame.findFrameByRoutingId(-1)).to.be.null();
-  });
-
-  describe('executeJavaScript', () => {
-    let childFrameElement, childFrame;
-
-    before(() => {
-      childFrameElement = document.createElement('iframe');
-      document.body.appendChild(childFrameElement);
-      childFrame = webFrame.firstChild;
-    });
-
-    after(() => {
-      childFrameElement.remove();
-    });
-
-    it('executeJavaScript() yields results via a promise and a sync callback', async () => {
-      let callbackResult, callbackError;
-
-      const executeJavaScript = childFrame
-        .executeJavaScript('1 + 1', (result, error) => {
-          callbackResult = result;
-          callbackError = error;
-        });
-
-      expect(callbackResult).to.equal(2);
-      expect(callbackError).to.be.undefined();
-
-      const promiseResult = await executeJavaScript;
-      expect(promiseResult).to.equal(2);
-    });
-
-    it('executeJavaScriptInIsolatedWorld() yields results via a promise and a sync callback', async () => {
-      let callbackResult, callbackError;
-
-      const executeJavaScriptInIsolatedWorld = childFrame
-        .executeJavaScriptInIsolatedWorld(999, [{ code: '1 + 1' }], (result, error) => {
-          callbackResult = result;
-          callbackError = error;
-        });
-
-      expect(callbackResult).to.equal(2);
-      expect(callbackError).to.be.undefined();
-
-      const promiseResult = await executeJavaScriptInIsolatedWorld;
-      expect(promiseResult).to.equal(2);
-    });
-
-    it('executeJavaScript() yields errors via a promise and a sync callback', async () => {
-      let callbackResult, callbackError;
-
-      const executeJavaScript = childFrame
-        .executeJavaScript('thisShouldProduceAnError()', (result, error) => {
-          callbackResult = result;
-          callbackError = error;
-        });
-
-      expect(callbackResult).to.be.undefined();
-      expect(callbackError).to.be.an('error');
-
-      await expect(executeJavaScript).to.eventually.be.rejected('error is expected');
-    });
-
-    // executeJavaScriptInIsolatedWorld is failing to detect exec errors and is neither
-    // rejecting nor passing the error to the callback. This predates the reintroduction
-    // of the callback so will not be fixed as part of the callback PR
-    // if/when this is fixed the test can be uncommented.
-    //
-    // it('executeJavaScriptInIsolatedWorld() yields errors via a promise and a sync callback', done => {
-    //   let callbackResult, callbackError
-    //
-    //   const executeJavaScriptInIsolatedWorld = childFrame
-    //     .executeJavaScriptInIsolatedWorld(999, [{ code: 'thisShouldProduceAnError()' }], (result, error) => {
-    //       callbackResult = result
-    //       callbackError = error
-    //     });
-    //
-    //   expect(callbackResult).to.be.undefined()
-    //   expect(callbackError).to.be.an('error')
-    //
-    //   expect(executeJavaScriptInIsolatedWorld).to.eventually.be.rejected('error is expected');
-    // })
-
-    it('executeJavaScript(InIsolatedWorld) can be used without a callback', async () => {
-      expect(await webFrame.executeJavaScript('1 + 1')).to.equal(2);
-      expect(await webFrame.executeJavaScriptInIsolatedWorld(999, [{ code: '1 + 1' }])).to.equal(2);
-    });
-  });
-});

From b0c6fb51525a3a7167e818183c55217cbba7421f Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Wed, 27 Jul 2022 04:15:34 -0700
Subject: [PATCH 637/811] chore: add electon deps to //src gitignore (#35065)

---
 patches/chromium/.patches                     |  1 +
 ...hore_add_electron_deps_to_gitignores.patch | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 patches/chromium/chore_add_electron_deps_to_gitignores.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 0e6fdb164db03..f45619f998f34 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -113,3 +113,4 @@ feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
 fix_allow_guest_webcontents_to_enter_fullscreen.patch
 disable_freezing_flags_after_init_in_node.patch
 short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
+chore_add_electron_deps_to_gitignores.patch
diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
new file mode 100644
index 0000000000000..ab21d92a82438
--- /dev/null
+++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Tue, 26 Jul 2022 00:05:29 -0700
+Subject: chore: add electron deps to gitignores
+
+Makes things like "git status" quicker when developing electron locally
+
+diff --git a/.gitignore b/.gitignore
+index d68a1b2dd91704a00be9cce6ccfa5daf7da35e1a..ab30dd802543491352d3b407f12127c04742d1ab 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -229,6 +229,7 @@ vs-chromium-project.txt
+ /delegate_execute
+ /device/serial/device_serial_mojo.xml
+ /docs/website
++/electron
+ /google_apis/gcm/gcm.xml
+ /google_apis/internal
+ /googleurl
+diff --git a/third_party/.gitignore b/third_party/.gitignore
+index 63611fc675a17af16dc20cbd9b20e28db63a7ead..eb369ac8b3bc0c2344491438b67e1618d2efb244 100644
+--- a/third_party/.gitignore
++++ b/third_party/.gitignore
+@@ -83,6 +83,7 @@
+ /directxsdk
+ /dom_distiller_js/dist
+ /eigen3/src
++/electron_node
+ /elfutils/src
+ /emoji-segmenter/src
+ /emoji-metadata/src
+@@ -179,6 +180,7 @@
+ /mocha
+ /mockito/src
+ /nacl_sdk_binaries/
++/nan
+ /nasm
+ /nearby/src
+ /neon_2_sse/src
+@@ -242,6 +244,7 @@
+ /speex
+ /sqlite/src
+ /sqlite4java/lib/
++/squirrel.mac
+ /subresource-filter-ruleset/data/UnindexedRules
+ /swift-format
+ /swiftshader/

From 63593ffb22b1b1252fd47e41e170113744f99e6f Mon Sep 17 00:00:00 2001
From: Stuart Schechter <UppaJung@users.noreply.github.com>
Date: Wed, 27 Jul 2022 08:00:35 -0400
Subject: [PATCH 638/811] docs: don't wait for ready event to register open-url
 listener (#35019)

* Update app.md

Add warning about late registration of the open-url event.

* Update app.md
---
 docs/api/app.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/api/app.md b/docs/api/app.md
index 0bfc137a214ee..960bed3dc8782 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -130,6 +130,11 @@ set `NSPrincipalClass` to `AtomApplication`.
 
 You should call `event.preventDefault()` if you want to handle this event.
 
+As with the `open-file` event, be sure to register a listener for the `open-url`
+event early in your application startup to detect if the the application being
+is being opened to handle a URL. If you register the listener in response to a
+`ready` event, you'll miss URLs that trigger the launch of your application.
+
 ### Event: 'activate' _macOS_
 
 Returns:

From 99c2706376804dbe16537b96e8fdeb841281f93d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Jul 2022 06:01:22 -0700
Subject: [PATCH 639/811] Bump v21.0.0-nightly.20220727

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 0c8e3b1b47a97..d604f94d46eee 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220726
\ No newline at end of file
+21.0.0-nightly.20220727
\ No newline at end of file
diff --git a/package.json b/package.json
index a7ef000f01cf7..ae45ad91f9ebd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220726",
+  "version": "21.0.0-nightly.20220727",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 6feff27acb183..aa085eb46e844 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220726
- PRODUCTVERSION 21,0,0,20220726
+ FILEVERSION 21,0,0,20220727
+ PRODUCTVERSION 21,0,0,20220727
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From de1cec8693e1d9572cce8459ef4beb8fbdf0a3ef Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 27 Jul 2022 09:18:33 -0700
Subject: [PATCH 640/811] test: migrate shell specs to main process (#35058)

---
 shell/common/api/electron_api_shell.cc |  8 +++
 spec-main/api-shell-spec.ts            | 72 ++++++++++++++++++++-
 spec/api-shell-spec.js                 | 87 --------------------------
 3 files changed, 79 insertions(+), 88 deletions(-)
 delete mode 100644 spec/api-shell-spec.js

diff --git a/shell/common/api/electron_api_shell.cc b/shell/common/api/electron_api_shell.cc
index 20fd7929ee540..e279f3a73fe14 100644
--- a/shell/common/api/electron_api_shell.cc
+++ b/shell/common/api/electron_api_shell.cc
@@ -15,6 +15,7 @@
 #include "shell/common/platform_util.h"
 
 #if BUILDFLAG(IS_WIN)
+#include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/shortcut.h"
 
@@ -105,6 +106,11 @@ v8::Local<v8::Promise> TrashItem(v8::Isolate* isolate,
 }
 
 #if BUILDFLAG(IS_WIN)
+// The use of the ForTesting flavors is a hack workaround to avoid having to
+// patch these as friends into the associated guard classes.
+class ShortcutAccessScopedAllowBlocking
+    : public base::ScopedAllowBlockingForTesting {};
+
 bool WriteShortcutLink(const base::FilePath& shortcut_path,
                        gin_helper::Arguments* args) {
   base::win::ShortcutOperation operation =
@@ -136,6 +142,7 @@ bool WriteShortcutLink(const base::FilePath& shortcut_path,
   if (options.Get("toastActivatorClsid", &toastActivatorClsid))
     properties.set_toast_activator_clsid(toastActivatorClsid);
 
+  ShortcutAccessScopedAllowBlocking allow_blocking;
   base::win::ScopedCOMInitializer com_initializer;
   return base::win::CreateOrUpdateShortcutLink(shortcut_path, properties,
                                                operation);
@@ -145,6 +152,7 @@ v8::Local<v8::Value> ReadShortcutLink(gin_helper::ErrorThrower thrower,
                                       const base::FilePath& path) {
   using base::win::ShortcutProperties;
   gin::Dictionary options = gin::Dictionary::CreateEmpty(thrower.isolate());
+  ShortcutAccessScopedAllowBlocking allow_blocking;
   base::win::ScopedCOMInitializer com_initializer;
   base::win::ShortcutProperties properties;
   if (!base::win::ResolveShortcutProperties(
diff --git a/spec-main/api-shell-spec.ts b/spec-main/api-shell-spec.ts
index 33bc29791fa78..f2cd1cdf8f744 100644
--- a/spec-main/api-shell-spec.ts
+++ b/spec-main/api-shell-spec.ts
@@ -2,9 +2,10 @@ import { BrowserWindow, app } from 'electron/main';
 import { shell } from 'electron/common';
 import { closeAllWindows } from './window-helpers';
 import { emittedOnce } from './events-helpers';
-import { ifit } from './spec-helpers';
+import { ifdescribe, ifit } from './spec-helpers';
 import * as http from 'http';
 import * as fs from 'fs-extra';
+import * as os from 'os';
 import * as path from 'path';
 import { AddressInfo } from 'net';
 import { expect } from 'chai';
@@ -84,4 +85,73 @@ describe('shell module', () => {
       await expect(w.webContents.executeJavaScript('require(\'electron\').shell.trashItem(\'does-not-exist\')')).to.be.rejectedWith(/does-not-exist|Failed to move item|Failed to create FileOperation/);
     });
   });
+
+  const shortcutOptions = {
+    target: 'C:\\target',
+    description: 'description',
+    cwd: 'cwd',
+    args: 'args',
+    appUserModelId: 'appUserModelId',
+    icon: 'icon',
+    iconIndex: 1,
+    toastActivatorClsid: '{0E3CFA27-6FEA-410B-824F-A174B6E865E5}'
+  };
+  ifdescribe(process.platform === 'win32')('shell.readShortcutLink(shortcutPath)', () => {
+    it('throws when failed', () => {
+      expect(() => {
+        shell.readShortcutLink('not-exist');
+      }).to.throw('Failed to read shortcut link');
+    });
+
+    const fixtures = path.resolve(__dirname, '..', 'spec', 'fixtures');
+    it('reads all properties of a shortcut', () => {
+      const shortcut = shell.readShortcutLink(path.join(fixtures, 'assets', 'shortcut.lnk'));
+      expect(shortcut).to.deep.equal(shortcutOptions);
+    });
+  });
+
+  ifdescribe(process.platform === 'win32')('shell.writeShortcutLink(shortcutPath[, operation], options)', () => {
+    const tmpShortcut = path.join(os.tmpdir(), `${Date.now()}.lnk`);
+
+    afterEach(() => {
+      fs.unlinkSync(tmpShortcut);
+    });
+
+    it('writes the shortcut', () => {
+      expect(shell.writeShortcutLink(tmpShortcut, { target: 'C:\\' })).to.be.true();
+      expect(fs.existsSync(tmpShortcut)).to.be.true();
+    });
+
+    it('correctly sets the fields', () => {
+      expect(shell.writeShortcutLink(tmpShortcut, shortcutOptions)).to.be.true();
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
+    });
+
+    it('updates the shortcut', () => {
+      expect(shell.writeShortcutLink(tmpShortcut, 'update', shortcutOptions)).to.be.false();
+      expect(shell.writeShortcutLink(tmpShortcut, 'create', shortcutOptions)).to.be.true();
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
+      const change = { target: 'D:\\' };
+      expect(shell.writeShortcutLink(tmpShortcut, 'update', change)).to.be.true();
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal({ ...shortcutOptions, ...change });
+    });
+
+    it('replaces the shortcut', () => {
+      expect(shell.writeShortcutLink(tmpShortcut, 'replace', shortcutOptions)).to.be.false();
+      expect(shell.writeShortcutLink(tmpShortcut, 'create', shortcutOptions)).to.be.true();
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
+      const change = {
+        target: 'D:\\',
+        description: 'description2',
+        cwd: 'cwd2',
+        args: 'args2',
+        appUserModelId: 'appUserModelId2',
+        icon: 'icon2',
+        iconIndex: 2,
+        toastActivatorClsid: '{C51A3996-CAD9-4934-848B-16285D4A1496}'
+      };
+      expect(shell.writeShortcutLink(tmpShortcut, 'replace', change)).to.be.true();
+      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(change);
+    });
+  });
 });
diff --git a/spec/api-shell-spec.js b/spec/api-shell-spec.js
deleted file mode 100644
index 6eacf51363992..0000000000000
--- a/spec/api-shell-spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-const { expect } = require('chai');
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const http = require('http');
-const { shell } = require('electron');
-
-describe('shell module', () => {
-  const fixtures = path.resolve(__dirname, 'fixtures');
-  const shortcutOptions = {
-    target: 'C:\\target',
-    description: 'description',
-    cwd: 'cwd',
-    args: 'args',
-    appUserModelId: 'appUserModelId',
-    icon: 'icon',
-    iconIndex: 1,
-    toastActivatorClsid: '{0E3CFA27-6FEA-410B-824F-A174B6E865E5}'
-  };
-
-  describe('shell.readShortcutLink(shortcutPath)', () => {
-    beforeEach(function () {
-      if (process.platform !== 'win32') this.skip();
-    });
-
-    it('throws when failed', () => {
-      expect(() => {
-        shell.readShortcutLink('not-exist');
-      }).to.throw('Failed to read shortcut link');
-    });
-
-    it('reads all properties of a shortcut', () => {
-      const shortcut = shell.readShortcutLink(path.join(fixtures, 'assets', 'shortcut.lnk'));
-      expect(shortcut).to.deep.equal(shortcutOptions);
-    });
-  });
-
-  describe('shell.writeShortcutLink(shortcutPath[, operation], options)', () => {
-    beforeEach(function () {
-      if (process.platform !== 'win32') this.skip();
-    });
-
-    const tmpShortcut = path.join(os.tmpdir(), `${Date.now()}.lnk`);
-
-    afterEach(() => {
-      fs.unlinkSync(tmpShortcut);
-    });
-
-    it('writes the shortcut', () => {
-      expect(shell.writeShortcutLink(tmpShortcut, { target: 'C:\\' })).to.be.true();
-      expect(fs.existsSync(tmpShortcut)).to.be.true();
-    });
-
-    it('correctly sets the fields', () => {
-      expect(shell.writeShortcutLink(tmpShortcut, shortcutOptions)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
-    });
-
-    it('updates the shortcut', () => {
-      expect(shell.writeShortcutLink(tmpShortcut, 'update', shortcutOptions)).to.be.false();
-      expect(shell.writeShortcutLink(tmpShortcut, 'create', shortcutOptions)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
-      const change = { target: 'D:\\' };
-      expect(shell.writeShortcutLink(tmpShortcut, 'update', change)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal({ ...shortcutOptions, ...change });
-    });
-
-    it('replaces the shortcut', () => {
-      expect(shell.writeShortcutLink(tmpShortcut, 'replace', shortcutOptions)).to.be.false();
-      expect(shell.writeShortcutLink(tmpShortcut, 'create', shortcutOptions)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(shortcutOptions);
-      const change = {
-        target: 'D:\\',
-        description: 'description2',
-        cwd: 'cwd2',
-        args: 'args2',
-        appUserModelId: 'appUserModelId2',
-        icon: 'icon2',
-        iconIndex: 2,
-        toastActivatorClsid: '{C51A3996-CAD9-4934-848B-16285D4A1496}'
-      };
-      expect(shell.writeShortcutLink(tmpShortcut, 'replace', change)).to.be.true();
-      expect(shell.readShortcutLink(tmpShortcut)).to.deep.equal(change);
-    });
-  });
-});

From 3c2ec2280e2bc64d4a2b52e031e2e2099afe74a5 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 06:03:11 -0700
Subject: [PATCH 641/811] Bump v21.0.0-nightly.20220728

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d604f94d46eee..b30ad1810548f 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220727
\ No newline at end of file
+21.0.0-nightly.20220728
\ No newline at end of file
diff --git a/package.json b/package.json
index ae45ad91f9ebd..33bac7c4d6b04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220727",
+  "version": "21.0.0-nightly.20220728",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index aa085eb46e844..5c6ad5fe6db91 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220727
- PRODUCTVERSION 21,0,0,20220727
+ FILEVERSION 21,0,0,20220728
+ PRODUCTVERSION 21,0,0,20220728
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 674596d11e5ad72b6651073619d282fbfea74ae1 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Thu, 28 Jul 2022 19:05:59 -0400
Subject: [PATCH 642/811] ci: switch to GHA for WOA (#35109)

* ci: switch to GHA for WOA

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .github/workflows/electron_woa_testing.yml | 166 +++++++++++++++++++++
 appveyor.yml                               |   2 +-
 azure-pipelines-arm.yml                    | 121 ---------------
 azure-pipelines-woa.yml                    | 130 ----------------
 script/release/ci-release-build.js         |  93 +++---------
 vsts-arm-test-steps.yml                    | 110 --------------
 vsts-arm32v7.yml                           |  13 --
 vsts-arm64v8.yml                           |  13 --
 8 files changed, 188 insertions(+), 460 deletions(-)
 create mode 100644 .github/workflows/electron_woa_testing.yml
 delete mode 100644 azure-pipelines-arm.yml
 delete mode 100644 azure-pipelines-woa.yml
 delete mode 100644 vsts-arm-test-steps.yml
 delete mode 100644 vsts-arm32v7.yml
 delete mode 100644 vsts-arm64v8.yml

diff --git a/.github/workflows/electron_woa_testing.yml b/.github/workflows/electron_woa_testing.yml
new file mode 100644
index 0000000000000..1c20eda0aefb6
--- /dev/null
+++ b/.github/workflows/electron_woa_testing.yml
@@ -0,0 +1,166 @@
+name: Electron WOA Testing
+
+on:
+  push:    
+    branches: '**'
+  workflow_dispatch:
+    inputs:
+      appveyor_job_id:
+        description: 'Job Id of Appveyor WOA job to test'
+        type: text
+        required: true
+
+jobs:
+  electron-woa-testing:
+
+    runs-on: [self-hosted, woa]
+
+    permissions:
+      checks: write
+      pull-requests: write
+
+    steps:
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        status: in_progress
+    - name: Clean Workspace
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        Remove-Item * -Recurse -Force
+      shell: powershell
+    - name: Checkout
+      uses: actions/checkout@v3
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      with:
+        path: src\electron
+        fetch-depth: 0
+    - name: Yarn install
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        cd src\electron
+        node script/yarn.js install --frozen-lockfile
+    - name: Download and extract dist.zip for test
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        $localArtifactPath = "$pwd\dist.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/dist.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
+      shell: powershell
+    - name: Download and extract native test executables for test
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        $localArtifactPath = "src\out\Default\shell_browser_ui_unittests.exe"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/shell_browser_ui_unittests.exe"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+      shell: powershell
+    - name: Download and extract ffmpeg.zip for test
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        $localArtifactPath = "$pwd\ffmpeg.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/ffmpeg.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
+      shell: powershell
+    - name: Download node headers for test
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        $localArtifactPath = "src\node_headers.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/node_headers.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        cd src
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
+      shell: powershell
+    - name: Download electron.lib for test
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        $localArtifactPath = "src\out\Default\electron.lib"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/electron.lib"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+      shell: powershell
+    # Uncomment the following block if pdb files are needed to debug issues
+    # - name: Download pdb files for detailed stacktraces
+    #   if: ${{ github.event_name == 'workflow_dispatch' }}
+    #   run: |
+    #     try {
+    #       $localArtifactPath = "src\pdb.zip"
+    #       $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/pdb.zip"
+    #       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+    #       cd src
+    #       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
+    #     } catch {
+    #       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+    #     } finally {
+    #       $global:LASTEXITCODE = 0
+    #     }
+    #   shell: powershell
+    - name: Setup node headers
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        New-Item src\out\Default\gen\node_headers\Release -Type directory
+        Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
+      shell: powershell
+    - name: Run Electron Main process tests
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        cd src
+        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+        set npm_config_arch=arm64
+        cd electron
+        node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion  
+      env:
+        ELECTRON_ENABLE_STACK_DUMPING: true
+        ELECTRON_OUT_DIR: Default
+        IGNORE_YARN_INSTALL_ERROR: 1
+        ELECTRON_TEST_RESULTS_DIR: junit
+        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+        MOCHA_REPORTER: mocha-multi-reporters
+        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
+    - name: Run Electron Remote based tests
+      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) }}
+      run: |
+        cd src
+        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+        set npm_config_arch=arm64
+        cd electron
+        node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
+      env:
+        ELECTRON_OUT_DIR: Default
+        IGNORE_YARN_INSTALL_ERROR: 1
+        ELECTRON_TEST_RESULTS_DIR: junit
+        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+        MOCHA_REPORTER: mocha-multi-reporters
+        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action/composite@v1
+      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) }}
+      with:
+        files: "src/junit/**/*.xml"
+        check_name: "electron-woa-testing"
+    - name: Verify ffmpeg
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        cd src
+        echo "Verifying non proprietary ffmpeg"
+        python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+      shell: cmd
+    - name: Kill processes left running from last test run
+      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      run: |
+        Get-Process | Where Name -Like "electron*" | Stop-Process
+        Get-Process | Where Name -Like "msedge*" | Stop-Process
+      shell: powershell
+    - name: Delete user app data directories
+      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      run: |
+        Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+      shell: powershell
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 80ee94d49d314..b4593261bde6b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -223,7 +223,7 @@ deploy_script:
           & python script\release\uploaders\upload.py --verbose
         }
       } elseif (Test-Path Env:\TEST_WOA) {
-        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
+        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
   # Uncomment this lines to enable RDP
diff --git a/azure-pipelines-arm.yml b/azure-pipelines-arm.yml
deleted file mode 100644
index 868b7753944e2..0000000000000
--- a/azure-pipelines-arm.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-steps:
-- task: CopyFiles@2
-  displayName: 'Copy Files to: src/electron'
-  inputs:
-    TargetFolder: src/electron
-
-- bash: |
-    cd src/electron
-    node script/yarn.js install --frozen-lockfile
-  displayName: 'Yarn install'
-
-- bash: |
-    export ZIP_DEST=$PWD/src/out/Default
-    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
-    mkdir -p $ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
-    cd $ZIP_DEST
-    unzip -o dist.zip
-    xattr -cr Electron.app    
-  displayName: 'Download and unzip dist files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
-    mkdir -p $FFMPEG_ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
-    cd $FFMPEG_ZIP_DEST
-    unzip -o ffmpeg.zip
-  displayName: 'Download and unzip ffmpeg for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
-   mkdir -p $NODE_HEADERS_DEST
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
-   cd $NODE_HEADERS_DEST
-   tar xzf node_headers.tar.gz
-  displayName: 'Download and untar node header files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
-   mkdir -p $CROSS_ARCH_SNAPSHOTS
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.arm64.bin --dest=$CROSS_ARCH_SNAPSHOTS
-  displayName: 'Download cross arch snapshot files'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-    cd src
-    export ELECTRON_OUT_DIR=Default
-    export npm_config_arch=arm64
-    (cd electron && node script/yarn test --enable-logging --runners main)
-  displayName: 'Run Electron main tests'
-  timeoutInMinutes: 20
-  env:
-    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-
-- bash: |
-    cd src
-    export ELECTRON_OUT_DIR=Default
-    export npm_config_arch=arm64
-    (cd electron && node script/yarn test --enable-logging --runners remote)
-  displayName: 'Run Electron remote tests'
-  timeoutInMinutes: 20
-  condition: succeededOrFailed()
-  env:
-    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-
-- bash: |
-    cd src
-    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-  displayName: Verify non proprietary ffmpeg
-  timeoutInMinutes: 5
-  condition: succeededOrFailed()
-  env:
-    TARGET_ARCH: arm64
-
-- bash: |
-    cd src
-    echo Verify cross arch snapshot
-    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
-  displayName: Verify cross arch snapshot
-  timeoutInMinutes: 5
-  condition: succeededOrFailed()
-
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '*.xml'
-
-    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
-
-  condition: succeededOrFailed()
-
-- bash: killall Electron || echo "No Electron processes left running"
-  displayName: 'Kill processes left running from last test run'
-  condition: always()
-
-- bash: |
-    rm -rf ~/Library/Application\ Support/Electron*
-    rm -rf ~/Library/Application\ Support/electron*
-  displayName: 'Delete user app data directories'
-  condition: always()
-
-- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
-  displayName: 'Clean Agent Directories'
-
-  condition: always()
diff --git a/azure-pipelines-woa.yml b/azure-pipelines-woa.yml
deleted file mode 100644
index 9942f97f79dc3..0000000000000
--- a/azure-pipelines-woa.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-workspace:
-  clean: all
-
-steps:
-- checkout: self
-  path: src\electron
-
-- script: |
-    node script/yarn.js install --frozen-lockfile
-  displayName: 'Yarn install'
-
-- powershell: |
-    $localArtifactPath = "$pwd\dist.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\Default -y $localArtifactPath
-  displayName: 'Download and extract dist.zip for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\shell_browser_ui_unittests.exe"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/shell_browser_ui_unittests.exe"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-  displayName: 'Download and extract native test executables for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$pwd\ffmpeg.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\ffmpeg $localArtifactPath
-  displayName: 'Download and extract ffmpeg.zip for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$(Pipeline.Workspace)\src\node_headers.zip"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-    cd $(Pipeline.Workspace)\src
-    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
-  displayName: 'Download node headers for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\electron.lib"
-    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
-    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-  displayName: 'Download electron.lib for test'
-  env:
-    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-# Uncomment the following block if pdb files are needed to debug issues
-# - powershell: |
-#     try {
-#       $localArtifactPath = "$(Pipeline.Workspace)\src\pdb.zip"
-#       $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.zip"
-#       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
-#       cd $(Pipeline.Workspace)\src
-#       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
-#     } catch {
-#       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
-#     } finally {
-#       $global:LASTEXITCODE = 0
-#     }
-#   displayName: 'Download pdb files for detailed stacktraces'
-#   env:
-#     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
-
-- powershell: |
-    New-Item $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release -Type directory
-    Copy-Item -path $(Pipeline.Workspace)\src\out\Default\electron.lib -destination $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release\node.lib
-  displayName: 'Setup node headers'
-
-- script: |
-    cd $(Pipeline.Workspace)\src
-    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-    set npm_config_arch=arm64
-    cd electron
-    node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
-  displayName: 'Run Electron Main process tests'
-  env:
-    ELECTRON_ENABLE_STACK_DUMPING: true
-    ELECTRON_OUT_DIR: Default
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-    MOCHA_REPORTER: mocha-multi-reporters
-
-- script: |
-    cd $(Pipeline.Workspace)\src
-    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-    set npm_config_arch=arm64
-    cd electron
-    node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
-  displayName: 'Run Electron Remote based tests'
-  env:
-    ELECTRON_OUT_DIR: Default
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-    MOCHA_REPORTER: mocha-multi-reporters
-  condition: succeededOrFailed()
-
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '*.xml'
-    searchFolder: '$(Pipeline.Workspace)/src/junit/'
-  condition: always()
-
-- script: |
-    cd $(Pipeline.Workspace)\src
-    echo "Verifying non proprietary ffmpeg"
-    python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-  displayName: 'Verify ffmpeg'
-
-- powershell: |
-    Get-Process | Where Name –Like "electron*" | Stop-Process
-    Get-Process | Where Name –Like "msedge*" | Stop-Process
-  displayName: 'Kill processes left running from last test run'
-  condition: always()
-
-- powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
-  displayName: 'Delete user app data directories'
-  condition: always()
diff --git a/script/release/ci-release-build.js b/script/release/ci-release-build.js
index b31cfaa980784..ef3616374b4c8 100644
--- a/script/release/ci-release-build.js
+++ b/script/release/ci-release-build.js
@@ -2,11 +2,10 @@ if (!process.env.CI) require('dotenv-safe').load();
 
 const assert = require('assert');
 const got = require('got');
+const { Octokit } = require('@octokit/rest');
 
 const BUILD_APPVEYOR_URL = 'https://ci.appveyor.com/api/builds';
 const CIRCLECI_PIPELINE_URL = 'https://circleci.com/api/v2/project/gh/electron/electron/pipeline';
-const VSTS_URL = 'https://github.visualstudio.com/electron/_apis/build';
-const DEVOPS_URL = 'https://dev.azure.com/electron-ci/electron/_apis/build';
 const CIRCLECI_WAIT_TIME = process.env.CIRCLECI_WAIT_TIME || 30000;
 
 const appVeyorJobs = {
@@ -25,13 +24,7 @@ const circleCIPublishIndividualArches = {
   'linux-publish': ['arm', 'arm64', 'x64']
 };
 
-const vstsArmJobs = [
-  'electron-arm-testing',
-  'electron-osx-arm64-testing',
-  'electron-mas-arm64-testing',
-  'electron-arm64-testing',
-  'electron-woa-testing'
-];
+const GHAJobs = ['electron-woa-testing'];
 
 let jobRequestedCount = 0;
 
@@ -257,71 +250,28 @@ function buildCircleCI (targetBranch, options) {
   }
 }
 
-async function buildVSTS (targetBranch, options) {
-  assert(options.armTest, `${options.ci} only works with the --armTest option.`);
-  assert(vstsArmJobs.includes(options.job), `Unknown VSTS CI arm test job name: ${options.job}. Valid values are: ${vstsArmJobs}.`);
+async function buildGHA (targetBranch, options) {
+  const { GHA_TOKEN } = process.env;
+  assert(GHA_TOKEN, `${options.ci} requires the $GHA_TOKEN environment variable to be provided`);
 
-  console.log(`Triggering VSTS to run build on branch: ${targetBranch}.`);
-  const environmentVariables = {};
+  const octokit = new Octokit({ auth: GHA_TOKEN });
 
-  if (options.circleBuildNum) {
-    environmentVariables.CIRCLE_BUILD_NUM = options.circleBuildNum;
-  } else if (options.appveyorJobId) {
-    environmentVariables.APPVEYOR_JOB_ID = options.appveyorJobId;
-  }
+  assert(GHAJobs.includes(options.job), `Unknown GitHub Actions arm test job name: ${options.job}. Valid values are: ${GHAJobs}.`);
+  assert(options.commit !== null, 'commit is a required option for GitHub Actions');
 
-  let vstsURL = VSTS_URL;
-  let vstsToken = process.env.VSTS_TOKEN;
-  assert(vstsToken, `${options.ci} requires the $VSTS_TOKEN environment variable to be provided`);
-  if (options.ci === 'DevOps') {
-    vstsURL = DEVOPS_URL;
-    vstsToken = process.env.DEVOPS_TOKEN;
-  }
-  const requestOpts = {
-    url: `${vstsURL}/definitions?api-version=4.1`,
-    user: '',
-    password: vstsToken,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  };
+  console.log(`Triggering GitHub Actions to run build on branch: ${targetBranch}.`);
 
   jobRequestedCount++;
 
   try {
-    const vstsResponse = await makeRequest(requestOpts, true);
-    const buildToRun = vstsResponse.value.find(build => build.name === options.job);
-    callVSTSBuild(buildToRun, targetBranch, environmentVariables, vstsURL, vstsToken);
-  } catch (err) {
-    console.log('Problem calling VSTS to get build definitions: ', err);
-  }
-}
-
-async function callVSTSBuild (build, targetBranch, environmentVariables, vstsURL, vstsToken) {
-  const buildBody = {
-    definition: build,
-    sourceBranch: targetBranch,
-    priority: 'high'
-  };
-  if (Object.keys(environmentVariables).length !== 0) {
-    buildBody.parameters = JSON.stringify(environmentVariables);
-  }
-  const requestOpts = {
-    url: `${vstsURL}/builds?api-version=4.1`,
-    user: '',
-    password: vstsToken,
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(buildBody),
-    method: 'POST'
-  };
-
-  try {
-    const { _links } = await makeRequest(requestOpts, true);
-    console.log(`VSTS release build request for ${build.name} successful. Check ${_links.web.href} for status.`);
+    const response = await octokit.request('POST /repos/electron/electron/actions/workflows/electron_woa_testing.yml/dispatches', {
+      ref: targetBranch,
+      inputs: {
+        appveyor_job_id: `${options.appveyorJobId}`
+      }
+    });
   } catch (err) {
-    console.log(`Could not call VSTS for job ${build.name}: `, err);
+    console.log('Problem calling GitHub Actions to get build definitions: ', err);
   }
 }
 
@@ -336,9 +286,8 @@ function runRelease (targetBranch, options) {
         buildAppVeyor(targetBranch, options);
         break;
       }
-      case 'DevOps':
-      case 'VSTS': {
-        buildVSTS(targetBranch, options);
+      case 'GHA': {
+        buildGHA(targetBranch, options);
         break;
       }
       default: {
@@ -357,13 +306,13 @@ module.exports = runRelease;
 
 if (require.main === module) {
   const args = require('minimist')(process.argv.slice(2), {
-    boolean: ['ghRelease', 'armTest']
+    boolean: ['ghRelease']
   });
   const targetBranch = args._[0];
   if (args._.length < 1) {
     console.log(`Trigger CI to build release builds of electron.
-    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--arch=INDIVIDUAL_ARCH] [--ci=CircleCI|AppVeyor|VSTS|DevOps]
-    [--ghRelease] [--armTest] [--circleBuildNum=xxx] [--appveyorJobId=xxx] [--commit=sha] TARGET_BRANCH
+    Usage: ci-release-build.js [--job=CI_JOB_NAME] [--arch=INDIVIDUAL_ARCH] [--ci=CircleCI|AppVeyor|GHA]
+    [--ghRelease] [--circleBuildNum=xxx] [--appveyorJobId=xxx] [--commit=sha] TARGET_BRANCH
     `);
     process.exit(0);
   }
diff --git a/vsts-arm-test-steps.yml b/vsts-arm-test-steps.yml
deleted file mode 100644
index 5985e4d2637e4..0000000000000
--- a/vsts-arm-test-steps.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-steps:
-- task: CopyFiles@2
-  displayName: 'Copy Files to: src/electron'
-  inputs:
-    TargetFolder: src/electron
-
-- bash: |
-    cd src/electron
-    node script/yarn.js install --frozen-lockfile
-  displayName: 'Yarn install'
-
-- bash: |
-    export ZIP_DEST=$PWD/src/out/Default
-    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
-    mkdir -p $ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
-    cd $ZIP_DEST
-    unzip -o dist.zip
-  displayName: 'Download and unzip dist files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
-    mkdir -p $FFMPEG_ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
-    cd $FFMPEG_ZIP_DEST
-    unzip -o ffmpeg.zip
-  displayName: 'Download and unzip ffmpeg for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
-   mkdir -p $NODE_HEADERS_DEST
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
-   cd $NODE_HEADERS_DEST
-   tar xzf node_headers.tar.gz
-  displayName: 'Download and untar node header files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
-   mkdir -p $CROSS_ARCH_SNAPSHOTS
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.bin --dest=$CROSS_ARCH_SNAPSHOTS
-  displayName: 'Download cross arch snapshot files'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export NATIVE_UNITTESTS_DEST=$PWD/src/out/Default
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=shell_browser_ui_unittests --dest=$NATIVE_UNITTESTS_DEST
-   chmod +x $NATIVE_UNITTESTS_DEST/shell_browser_ui_unittests
-  displayName: 'Download native unittest executables'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-    sh -e /etc/init.d/xvfb start
-  displayName: Setup for headless testing
-  env:
-    DISPLAY: ":99.0"
-
-- bash: |
-    # Next line needed to avoid crash on arm32
-    sudo gdk-pixbuf-query-loaders --update-cache
-    cd src
-    export ELECTRON_OUT_DIR=Default
-    (cd electron && node script/yarn test -- --enable-logging)
-  displayName: 'Run Electron tests'
-  timeoutInMinutes: 20
-  env:
-    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-    CI: 1
-
-- bash: |
-    cd src
-    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-  displayName: Verify non proprietary ffmpeg
-  timeoutInMinutes: 5
-
-- bash: |
-    cd src
-    echo Verify cross arch snapshot
-    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
-  displayName: Verify cross arch snapshot
-  timeoutInMinutes: 5
-
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '*.xml'
-
-    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
-
-  condition: succeededOrFailed()
-
-- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
-  displayName: 'Clean Agent Directories'
-
-  condition: always()
diff --git a/vsts-arm32v7.yml b/vsts-arm32v7.yml
deleted file mode 100644
index feeb920ba8f39..0000000000000
--- a/vsts-arm32v7.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-resources:
-  containers:
-  - container: arm32v7-test-container
-    image: ghcr.io/electron/build:arm32v7-27db4a3e3512bfd2e47f58cea69922da0835f1d9
-    options: --shm-size 128m
-
-jobs:
-- job: Test_Arm32v7
-  container: arm32v7-test-container
-  displayName: Test Arm on Arm32v7 hardware
-  timeoutInMinutes: 30
-  steps:
-  - template: vsts-arm-test-steps.yml
diff --git a/vsts-arm64v8.yml b/vsts-arm64v8.yml
deleted file mode 100644
index e64708663b393..0000000000000
--- a/vsts-arm64v8.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-resources:
-  containers:
-  - container: arm64v8-test-container
-    image: ghcr.io/electron/build:arm64v8-27db4a3e3512bfd2e47f58cea69922da0835f1d9
-    options: --shm-size 128m
-
-jobs:
-- job: Test_Arm64
-  container: arm64v8-test-container
-  displayName: Test Arm64 on Arm64 hardware
-  timeoutInMinutes: 30
-  steps:
-  - template: vsts-arm-test-steps.yml

From 7f757075bc5ac35c751aecf0dd4a94d0daf21f7d Mon Sep 17 00:00:00 2001
From: Sofia Nguy <sofianguy@gmail.com>
Date: Thu, 28 Jul 2022 21:54:48 -0700
Subject: [PATCH 643/811] docs: update E21 release date (#35122)

* docs: update E21 release date

* chore: fix lint

Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
---
 docs/tutorial/electron-timelines.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/electron-timelines.md b/docs/tutorial/electron-timelines.md
index e98f5b14ed11d..6af3e41815f35 100644
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -24,10 +24,11 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
 | 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
 | 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | 🚫 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | 🚫 |
 | 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
 | 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | v16.14 | ✅ |
-| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | TBD | ✅ |
+| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | v16.15 | ✅ |
+| 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | M106 | TBD | ✅ |
 
 **Notes:**
 

From 8004cb8722c8d52f4cd553bbaea86750149e8ca4 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Fri, 29 Jul 2022 06:00:43 -0700
Subject: [PATCH 644/811] Bump v21.0.0-nightly.20220729

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b30ad1810548f..03b7d494e44ea 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220728
\ No newline at end of file
+21.0.0-nightly.20220729
\ No newline at end of file
diff --git a/package.json b/package.json
index 33bac7c4d6b04..ee8f36d254278 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220728",
+  "version": "21.0.0-nightly.20220729",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 5c6ad5fe6db91..3380c1a4a1a9a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220728
- PRODUCTVERSION 21,0,0,20220728
+ FILEVERSION 21,0,0,20220729
+ PRODUCTVERSION 21,0,0,20220729
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9028bb79a85fedf64230c2f1c6a29ab072c98c20 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 29 Jul 2022 17:09:47 +0200
Subject: [PATCH 645/811] fix: empty result of `webContents.getUserAgent()`
 (#35069)

fix: empty result of webContents.getUserAgent()
---
 shell/browser/api/electron_api_web_contents.cc | 11 +++--------
 shell/browser/electron_browser_context.cc      |  5 -----
 shell/browser/electron_browser_context.h       |  1 -
 spec-main/api-web-contents-spec.ts             |  6 ++++++
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index c444deba46a80..243db0489238d 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -675,10 +675,8 @@ WebContents::WebContents(v8::Isolate* isolate,
   auto session = Session::CreateFrom(isolate, GetBrowserContext());
   session_.Reset(isolate, session.ToV8());
 
-  absl::optional<std::string> user_agent_override =
-      GetBrowserContext()->GetUserAgentOverride();
-  if (user_agent_override)
-    SetUserAgent(*user_agent_override);
+  SetUserAgent(GetBrowserContext()->GetUserAgent());
+
   web_contents->SetUserData(kElectronApiWebContentsKey,
                             std::make_unique<UserDataLink>(GetWeakPtr()));
   InitZoomController(web_contents, gin::Dictionary::CreateEmpty(isolate));
@@ -884,10 +882,7 @@ void WebContents::InitWithSessionAndOptions(
 
   AutofillDriverFactory::CreateForWebContents(web_contents());
 
-  absl::optional<std::string> user_agent_override =
-      GetBrowserContext()->GetUserAgentOverride();
-  if (user_agent_override)
-    SetUserAgent(*user_agent_override);
+  SetUserAgent(GetBrowserContext()->GetUserAgent());
 
   if (IsGuest()) {
     NativeWindow* owner_window = nullptr;
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index ff4ed57d35964..432ea24c9ea22 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -308,11 +308,6 @@ std::string ElectronBrowserContext::GetUserAgent() const {
   return user_agent_.value_or(ElectronBrowserClient::Get()->GetUserAgent());
 }
 
-absl::optional<std::string> ElectronBrowserContext::GetUserAgentOverride()
-    const {
-  return user_agent_;
-}
-
 predictors::PreconnectManager* ElectronBrowserContext::GetPreconnectManager() {
   if (!preconnect_manager_.get()) {
     preconnect_manager_ =
diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h
index baaa2ee4ee3a3..b1fa4715cb758 100644
--- a/shell/browser/electron_browser_context.h
+++ b/shell/browser/electron_browser_context.h
@@ -89,7 +89,6 @@ class ElectronBrowserContext : public content::BrowserContext {
 
   void SetUserAgent(const std::string& user_agent);
   std::string GetUserAgent() const;
-  absl::optional<std::string> GetUserAgentOverride() const;
   bool CanUseHttpCache() const;
   int GetMaxCacheSize() const;
   ResolveProxyHelper* GetResolveProxyHelper();
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 8f4df42e2348f..3050b926988a6 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -902,6 +902,12 @@ describe('webContents module', () => {
   });
 
   describe('userAgent APIs', () => {
+    it('is not empty by default', () => {
+      const w = new BrowserWindow({ show: false });
+      const userAgent = w.webContents.getUserAgent();
+      expect(userAgent).to.be.a('string').that.is.not.empty();
+    });
+
     it('can set the user agent (functions)', () => {
       const w = new BrowserWindow({ show: false });
       const userAgent = w.webContents.getUserAgent();

From 00e9bf107a6357029b3e4c247456450c3d2554a4 Mon Sep 17 00:00:00 2001
From: Kilian Valkhof <kilian@kilianvalkhof.com>
Date: Fri, 29 Jul 2022 18:47:43 +0200
Subject: [PATCH 646/811] docs: new main -> renderers messageChannel example
 (#34978)

* docs: new main -> renderers messageChannel example

* consistent use of your

* fix a typo

* linting

* markdown linting

* Update docs/tutorial/message-ports.md

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

* update code example headings, reference contextIsolation example

* remove nodeIntegration: false from browserWindows

* rename "messagePort" to "electronMessagePort" for compatibility

Co-authored-by: Erick Zhao <erick@hotmail.ca>
---
 docs/tutorial/message-ports.md | 103 ++++++++++++++++++++++++++-------
 1 file changed, 81 insertions(+), 22 deletions(-)

diff --git a/docs/tutorial/message-ports.md b/docs/tutorial/message-ports.md
index 9f1e9bf467aff..b236f4133e450 100644
--- a/docs/tutorial/message-ports.md
+++ b/docs/tutorial/message-ports.md
@@ -8,8 +8,7 @@ your app.
 
 Here is a very brief example of what a MessagePort is and how it works:
 
-```js
-// renderer.js ///////////////////////////////////////////////////////////////
+```js title='renderer.js (Renderer Process)'
 // MessagePorts are created in pairs. A connected pair of message ports is
 // called a channel.
 const channel = new MessageChannel()
@@ -28,8 +27,7 @@ port2.postMessage({ answer: 42 })
 ipcRenderer.postMessage('port', null, [port1])
 ```
 
-```js
-// main.js ///////////////////////////////////////////////////////////////////
+```js title='main.js (Main Process)'
 // In the main process, we receive the port.
 ipcMain.on('port', (event) => {
   // When we receive a MessagePort in the main process, it becomes a
@@ -84,14 +82,84 @@ process, you can listen for the `close` event by calling `port.on('close',
 
 ## Example use cases
 
+### Setting up a MessageChannel between two renderers
+
+In this example, the main process sets up a MessageChannel, then sends each port
+to a different renderer. This allows renderers to send messages to each other
+without needing to use the main process as an in-between.
+
+```js title='main.js (Main Process)'
+const { BrowserWindow, app, MessageChannelMain } = require('electron')
+
+app.whenReady().then(async () => {
+  // create the windows.
+  const mainWindow = new BrowserWindow({
+    show: false,
+    webPreferences: {
+      contextIsolation: false,
+      preload: 'preloadMain.js'
+    }
+  })
+
+  const secondaryWindow = BrowserWindow({
+    show: false,
+    webPreferences: {
+      contextIsolation: false,
+      preload: 'preloadSecondary.js'
+    }
+  })
+
+  // set up the channel.
+  const { port1, port2 } = new MessageChannelMain()
+
+  // once the webContents are ready, send a port to each webContents with postMessage.
+  mainWindow.once('ready-to-show', () => {
+    mainWindow.webContents.postMessage('port', null, [port1])
+  })
+
+  secondaryWindow.once('ready-to-show', () => {
+    secondaryWindow.webContents.postMessage('port', null, [port2])
+  })
+})
+```
+
+Then, in your preload scripts you receive the port through IPC and set up the
+listeners.
+
+```js title='preloadMain.js and preloadSecondary.js (Preload scripts)'
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('port', e => {
+  // port received, make it globally available.
+  window.electronMessagePort = e.ports[0]
+
+  window.electronMessagePort.onmessage = messageEvent => {
+    // handle message
+  }
+})
+```
+
+In this example messagePort is bound to the `window` object directly. It is better
+to use `contextIsolation` and set up specific contextBridge calls for each of your
+expected messages, but for the simplicity of this example we don't. You can find an
+example of context isolation further down this page at [Communicating directly between the main process and the main world of a context-isolated page](#communicating-directly-between-the-main-process-and-the-main-world-of-a-context-isolated-page)
+
+That means window.messagePort is globally available and you can call
+`postMessage` on it from anywhere in your app to send a message to the other
+renderer.
+
+```js title='renderer.js (Renderer Process)'
+// elsewhere in your code to send a message to the other renderers message handler
+window.electronMessagePort.postmessage('ping')
+```
+
 ### Worker process
 
 In this example, your app has a worker process implemented as a hidden window.
 You want the app page to be able to communicate directly with the worker
 process, without the performance overhead of relaying via the main process.
 
-```js
-// main.js ///////////////////////////////////////////////////////////////////
+```js title='main.js (Main Process)'
 const { BrowserWindow, app, ipcMain, MessageChannelMain } = require('electron')
 
 app.whenReady().then(async () => {
@@ -129,8 +197,7 @@ app.whenReady().then(async () => {
 })
 ```
 
-```html
-<!-- worker.html ------------------------------------------------------------>
+```html  title='worker.html'
 <script>
 const { ipcRenderer } = require('electron')
 
@@ -153,8 +220,7 @@ ipcRenderer.on('new-client', (event) => {
 </script>
 ```
 
-```html
-<!-- app.html --------------------------------------------------------------->
+```html  title='app.html'
 <script>
 const { ipcRenderer } = require('electron')
 
@@ -182,9 +248,7 @@ Electron's built-in IPC methods only support two modes: fire-and-forget
 can implement a "response stream", where a single request responds with a
 stream of data.
 
-```js
-// renderer.js ///////////////////////////////////////////////////////////////
-
+```js title='renderer.js (Renderer Process)'
 const makeStreamingRequest = (element, callback) => {
   // MessageChannels are lightweight--it's cheap to create a new one for each
   // request.
@@ -213,9 +277,7 @@ makeStreamingRequest(42, (data) => {
 // We will see "got response data: 42" 10 times.
 ```
 
-```js
-// main.js ///////////////////////////////////////////////////////////////////
-
+```js  title='main.js (Main Process)'
 ipcMain.on('give-me-a-stream', (event, msg) => {
   // The renderer has sent us a MessagePort that it wants us to send our
   // response over.
@@ -242,8 +304,7 @@ the renderer are delivered to the isolated world, rather than to the main
 world. Sometimes you want to deliver messages to the main world directly,
 without having to step through the isolated world.
 
-```js
-// main.js ///////////////////////////////////////////////////////////////////
+```js title='main.js (Main Process)'
 const { BrowserWindow, app, MessageChannelMain } = require('electron')
 const path = require('path')
 
@@ -278,8 +339,7 @@ app.whenReady().then(async () => {
 })
 ```
 
-```js
-// preload.js ////////////////////////////////////////////////////////////////
+```js title='preload.js (Preload Script)'
 const { ipcRenderer } = require('electron')
 
 // We need to wait until the main world is ready to receive the message before
@@ -297,8 +357,7 @@ ipcRenderer.on('main-world-port', async (event) => {
 })
 ```
 
-```html
-<!-- index.html ------------------------------------------------------------->
+```html title='index.html'
 <script>
 window.onmessage = (event) => {
   // event.source === window means the message is coming from the preload

From b67c69d741c648569d86c5a7846f2559219f9b14 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 1 Aug 2022 05:42:02 -0500
Subject: [PATCH 647/811] fix: remove skip-taskbar feature on Linux. (#35123)

---
 docs/api/browser-window.md           | 2 +-
 shell/browser/native_window_views.cc | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index d2a4ef468b5e5..e5fd4045803a2 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -1323,7 +1323,7 @@ win.setSheetOffset(toolbarRect.height)
 
 Starts or stops flashing the window to attract user's attention.
 
-#### `win.setSkipTaskbar(skip)`
+#### `win.setSkipTaskbar(skip)` _macOS_ _Windows_
 
 * `skip` boolean
 
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index c73ea669fd0ed..583c303734a21 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -303,14 +303,9 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
 
 #if defined(USE_OZONE_PLATFORM_X11)
   if (IsX11()) {
-    // TODO(ckerr): remove in Electron v20.0.0
     // Before the window is mapped the SetWMSpecState can not work, so we have
     // to manually set the _NET_WM_STATE.
     std::vector<x11::Atom> state_atom_list;
-    bool skip_taskbar = false;
-    if (options.Get(options::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
-      state_atom_list.push_back(x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
-    }
 
     // Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
     if (fullscreen) {

From 29434ee7c671637bf2be54d0200ff4cdddec1d76 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 06:01:38 -0700
Subject: [PATCH 648/811] Bump v21.0.0-nightly.20220801

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 03b7d494e44ea..f1399fc1bc205 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220729
\ No newline at end of file
+21.0.0-nightly.20220801
\ No newline at end of file
diff --git a/package.json b/package.json
index ee8f36d254278..d24c804e1c64d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220729",
+  "version": "21.0.0-nightly.20220801",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 3380c1a4a1a9a..bb1f1cd52ecc3 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220729
- PRODUCTVERSION 21,0,0,20220729
+ FILEVERSION 21,0,0,20220801
+ PRODUCTVERSION 21,0,0,20220801
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 6c17dd229618d6033b0e2255db29315cd3a891a4 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Mon, 1 Aug 2022 07:52:26 -0700
Subject: [PATCH 649/811] fix: ensure native modules use the correct config
 (#35159)

* fix: ensure native modules are built with config.gypi

This works by patching node.h to check that two defines are set using the equivilant of an XNOR operation.  One define "ELECTRON_ENSURE_CONFIG_GYPI" is set via common.gypi which is _already_ used to build native modules and has been since the dawn of time.  Therefore this define will be set for all native module compilations targetting the Electron runtime.  The second define "USING_ELECTRON_CONFIG_GYPI" is only defined when the gypi argument "using_electron_config_gypi" is set to 1 which is only done so via config.gypi.  Only new enough versions of node-gyp correctly use the config.gypi file thus resulting in a compilation error on version of node-gyp that are too old.

* chore: fix lint

Co-authored-by: Samuel Attard <sattard@salesforce.com>
---
 BUILD.gn                                      |  1 +
 patches/node/.patches                         |  1 +
 ...compilation_fails_if_not_using_a_new.patch | 70 +++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch

diff --git a/BUILD.gn b/BUILD.gn
index ec385d1e8c8df..6ef3b3be92f9e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -233,6 +233,7 @@ action("electron_js2c") {
 action("generate_config_gypi") {
   outputs = [ "$root_gen_dir/config.gypi" ]
   script = "script/generate-config-gypi.py"
+  inputs = [ "//third_party/electron_node/configure.py" ]
   args = rebase_path(outputs) + [ target_cpu ]
 }
 
diff --git a/patches/node/.patches b/patches/node/.patches
index 17a4ed067136a..9e31afcb3458c 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -45,3 +45,4 @@ fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
 json_parse_errors_made_user-friendly.patch
 support_v8_sandboxed_pointers.patch
 build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
+build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
diff --git a/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
new file mode 100644
index 0000000000000..7b7150085658a
--- /dev/null
+++ b/patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Wed, 13 Jul 2022 13:56:12 -0700
+Subject: build: ensure native module compilation fails if not using a new
+ enough builder
+
+This should not be upstreamed, it is a quality-of-life patch for downstream module builders.
+
+diff --git a/common.gypi b/common.gypi
+index ca08deeb19f5fe9ee399ad809b24579fdaa10036..c68cf1eb0f9cdd2a8fe314237c1e790fe3690272 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -85,6 +85,8 @@
+ 
+     'v8_enable_reverse_jsargs%': 1,
+ 
++    'using_electron_config_gypi%': 0,
++
+     ##### end V8 defaults #####
+ 
+     # When building native modules using 'npm install' with the system npm,
+@@ -290,6 +292,7 @@
+       'V8_DEPRECATION_WARNINGS',
+       'V8_IMMINENT_DEPRECATION_WARNINGS',
+       '_GLIBCXX_USE_CXX11_ABI=1',
++      'ELECTRON_ENSURE_CONFIG_GYPI',
+     ],
+ 
+     # Forcibly disable -Werror.  We support a wide range of compilers, it's
+@@ -393,6 +396,11 @@
+           }],
+         ],
+       }],
++      ['using_electron_config_gypi == 1', {
++        'defines': [
++          'USING_ELECTRON_CONFIG_GYPI',
++        ],
++      }],
+       ['v8_enable_pointer_compression == 1', {
+         'defines': [
+           'V8_COMPRESS_POINTERS',
+diff --git a/configure.py b/configure.py
+index 426afed7cd0a3a403d4b753af0b25f55024d0f71..6ab1469c07298c9083a77d0211727a6fff37267e 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1427,6 +1427,7 @@ def configure_library(lib, output, pkgname=None):
+ 
+ 
+ def configure_v8(o):
++  o['variables']['using_electron_config_gypi'] = 1
+   o['variables']['v8_enable_webassembly'] = 1
+   o['variables']['v8_enable_lite_mode'] = 1 if options.v8_lite_mode else 0
+   o['variables']['v8_enable_gdbjit'] = 1 if options.gdb else 0
+diff --git a/src/node.h b/src/node.h
+index 0b807cb25f9eb52b2100f0e2a7c25344790967cf..a41b09047d2c499a90225651a8324ad83a7712e3 100644
+--- a/src/node.h
++++ b/src/node.h
+@@ -22,6 +22,12 @@
+ #ifndef SRC_NODE_H_
+ #define SRC_NODE_H_
+ 
++#ifdef ELECTRON_ENSURE_CONFIG_GYPI
++#ifndef USING_ELECTRON_CONFIG_GYPI
++#error "It looks like you are building this native module without using the right config.gypi.  This normally means that you need to update electron-rebuild (>=3.2.8) or node-gyp (>=8.4.0) if you're building modules directly."
++#endif
++#endif
++
+ #ifdef _WIN32
+ # ifndef BUILDING_NODE_EXTENSION
+ #  define NODE_EXTERN __declspec(dllexport)

From 7588bb7425522959206daaa25d7e1f36c7015934 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 1 Aug 2022 22:52:58 +0200
Subject: [PATCH 650/811] fix: DCHECK entering fullscreen while loading url
 (#35111)

* fix: DCHECK entering fullscreen while loading url

* spec: fixup test
---
 shell/browser/api/electron_api_web_contents.cc  | 15 ++++++++++-----
 shell/browser/native_window.cc                  |  4 +++-
 shell/browser/native_window.h                   | 16 ++++++++++++++--
 .../ui/cocoa/electron_ns_window_delegate.mm     |  2 +-
 spec-main/api-browser-window-spec.ts            | 17 +++++++++++++++++
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 243db0489238d..b7a03e906e2a1 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1327,6 +1327,8 @@ void WebContents::OnEnterFullscreenModeForTab(
     return;
   }
 
+  owner_window()->set_fullscreen_transition_type(
+      NativeWindow::FullScreenTransitionType::HTML);
   exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
       requesting_frame, options.display_id);
 
@@ -3537,12 +3539,15 @@ void WebContents::EnumerateDirectory(
 
 bool WebContents::IsFullscreenForTabOrPending(
     const content::WebContents* source) {
-  bool transition_fs = owner_window()
-                           ? owner_window()->fullscreen_transition_state() !=
-                                 NativeWindow::FullScreenTransitionState::NONE
-                           : false;
+  if (!owner_window())
+    return html_fullscreen_;
+
+  bool in_transition = owner_window()->fullscreen_transition_state() !=
+                       NativeWindow::FullScreenTransitionState::NONE;
+  bool is_html_transition = owner_window()->fullscreen_transition_type() ==
+                            NativeWindow::FullScreenTransitionType::HTML;
 
-  return html_fullscreen_ || transition_fs;
+  return html_fullscreen_ || (in_transition && is_html_transition);
 }
 
 bool WebContents::TakeFocus(content::WebContents* source, bool reverse) {
diff --git a/shell/browser/native_window.cc b/shell/browser/native_window.cc
index 67439e818700e..931e7759073cb 100644
--- a/shell/browser/native_window.cc
+++ b/shell/browser/native_window.cc
@@ -718,8 +718,10 @@ std::string NativeWindow::GetAccessibleTitle() {
 }
 
 void NativeWindow::HandlePendingFullscreenTransitions() {
-  if (pending_transitions_.empty())
+  if (pending_transitions_.empty()) {
+    set_fullscreen_transition_type(FullScreenTransitionType::NONE);
     return;
+  }
 
   bool next_transition = pending_transitions_.front();
   pending_transitions_.pop();
diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h
index 13de702f18863..6568f03127bf3 100644
--- a/shell/browser/native_window.h
+++ b/shell/browser/native_window.h
@@ -318,10 +318,11 @@ class NativeWindow : public base::SupportsUserData,
     observers_.RemoveObserver(obs);
   }
 
-  enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
-
   // Handle fullscreen transitions.
   void HandlePendingFullscreenTransitions();
+
+  enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
+
   void set_fullscreen_transition_state(FullScreenTransitionState state) {
     fullscreen_transition_state_ = state;
   }
@@ -329,6 +330,15 @@ class NativeWindow : public base::SupportsUserData,
     return fullscreen_transition_state_;
   }
 
+  enum class FullScreenTransitionType { HTML, NATIVE, NONE };
+
+  void set_fullscreen_transition_type(FullScreenTransitionType type) {
+    fullscreen_transition_type_ = type;
+  }
+  FullScreenTransitionType fullscreen_transition_type() const {
+    return fullscreen_transition_type_;
+  }
+
   views::Widget* widget() const { return widget_.get(); }
   views::View* content_view() const { return content_view_; }
 
@@ -390,6 +400,8 @@ class NativeWindow : public base::SupportsUserData,
   std::queue<bool> pending_transitions_;
   FullScreenTransitionState fullscreen_transition_state_ =
       FullScreenTransitionState::NONE;
+  FullScreenTransitionType fullscreen_transition_type_ =
+      FullScreenTransitionType::NONE;
 
  private:
   std::unique_ptr<views::Widget> widget_;
diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
index 362f464f91c82..243c2d3993dc3 100644
--- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm
@@ -19,7 +19,7 @@
 
 using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
 using FullScreenTransitionState =
-    electron::NativeWindowMac::FullScreenTransitionState;
+    electron::NativeWindow::FullScreenTransitionState;
 
 @implementation ElectronNSWindowDelegate
 
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 993c6ed2c3800..2ab728239b196 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -4954,6 +4954,23 @@ describe('BrowserWindow module', () => {
         await leaveFullScreen;
       });
 
+      it('should be able to load a URL while transitioning to fullscreen', async () => {
+        const w = new BrowserWindow({ fullscreen: true });
+        w.loadFile(path.join(fixtures, 'pages', 'c.html'));
+
+        const load = emittedOnce(w.webContents, 'did-finish-load');
+        const enterFS = emittedOnce(w, 'enter-full-screen');
+
+        await Promise.all([enterFS, load]);
+        expect(w.fullScreen).to.be.true();
+
+        await delay();
+
+        const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
+        w.setFullScreen(false);
+        await leaveFullScreen;
+      });
+
       it('can be changed with setFullScreen method', async () => {
         const w = new BrowserWindow();
         const enterFullScreen = emittedOnce(w, 'enter-full-screen');

From 0d36c0cdc6fe616fe235e0f1aa32b691054d503d Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 1 Aug 2022 18:59:20 -0400
Subject: [PATCH 651/811] ci: turn off windows on arm test result comments
 (#35142)

---
 .github/workflows/electron_woa_testing.yml | 66 +++++++++++++---------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/electron_woa_testing.yml b/.github/workflows/electron_woa_testing.yml
index 1c20eda0aefb6..01c2b9a08ca71 100644
--- a/.github/workflows/electron_woa_testing.yml
+++ b/.github/workflows/electron_woa_testing.yml
@@ -11,39 +11,43 @@ on:
         required: true
 
 jobs:
-  electron-woa-testing:
-
-    runs-on: [self-hosted, woa]
+  electron-woa-init:
+    if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
+    runs-on: ubuntu-latest
+    steps:
+        - name: Dummy step for push event
+          run: |
+            echo "This job is a needed initialization step for Electron WOA testing.  Another test result will appear once the electron-woa-testing build is done."
 
+  electron-woa-testing:    
+    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'electron/electron' }}    
+    runs-on: [self-hosted, woa]  
     permissions:
       checks: write
       pull-requests: write
-
     steps:
     - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         name: electron-woa-testing
         status: in_progress
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}    
+        output: |
+          {"summary":"Test In Progress","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}        
     - name: Clean Workspace
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         Remove-Item * -Recurse -Force
       shell: powershell
     - name: Checkout
       uses: actions/checkout@v3
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       with:
         path: src\electron
         fetch-depth: 0
     - name: Yarn install
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         cd src\electron
         node script/yarn.js install --frozen-lockfile
     - name: Download and extract dist.zip for test
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         $localArtifactPath = "$pwd\dist.zip"
         $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/dist.zip"
@@ -51,14 +55,12 @@ jobs:
         & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
       shell: powershell
     - name: Download and extract native test executables for test
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         $localArtifactPath = "src\out\Default\shell_browser_ui_unittests.exe"
         $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/shell_browser_ui_unittests.exe"
         Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
       shell: powershell
     - name: Download and extract ffmpeg.zip for test
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         $localArtifactPath = "$pwd\ffmpeg.zip"
         $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/ffmpeg.zip"
@@ -66,7 +68,6 @@ jobs:
         & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
       shell: powershell
     - name: Download node headers for test
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         $localArtifactPath = "src\node_headers.zip"
         $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/node_headers.zip"
@@ -75,7 +76,6 @@ jobs:
         & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
       shell: powershell
     - name: Download electron.lib for test
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         $localArtifactPath = "src\out\Default\electron.lib"
         $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/electron.lib"
@@ -98,13 +98,11 @@ jobs:
     #     }
     #   shell: powershell
     - name: Setup node headers
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         New-Item src\out\Default\gen\node_headers\Release -Type directory
         Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
       shell: powershell
     - name: Run Electron Main process tests
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         cd src
         set npm_config_nodedir=%cd%\out\Default\gen\node_headers
@@ -120,7 +118,7 @@ jobs:
         MOCHA_REPORTER: mocha-multi-reporters
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
     - name: Run Electron Remote based tests
-      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) }}
+      if: ${{ success() || failure() }}
       run: |
         cd src
         set npm_config_nodedir=%cd%\out\Default\gen\node_headers
@@ -134,33 +132,47 @@ jobs:
         MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
         MOCHA_REPORTER: mocha-multi-reporters
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Publish Test Results
-      uses: EnricoMi/publish-unit-test-result-action/composite@v1
-      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) }}
-      with:
-        files: "src/junit/**/*.xml"
-        check_name: "electron-woa-testing"
     - name: Verify ffmpeg
-      if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         cd src
         echo "Verifying non proprietary ffmpeg"
         python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
       shell: cmd
     - name: Kill processes left running from last test run
-      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      if: ${{ always() }}
       run: |
         Get-Process | Where Name -Like "electron*" | Stop-Process
         Get-Process | Where Name -Like "msedge*" | Stop-Process
       shell: powershell
     - name: Delete user app data directories
-      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      if: ${{ always() }}
       run: |
         Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
       shell: powershell
     - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ github.event_name == 'workflow_dispatch' &&  (success() || failure()) || cancelled() }}
+      if: ${{ success() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"${{ job.status }}","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ success() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"Job Succeeded","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}          
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ ! success() }}
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         name: electron-woa-testing
-        conclusion: "${{ job.status }}"
\ No newline at end of file
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"Job Failed","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}                    
\ No newline at end of file

From 0cdc946b2708c3592ec1c413f28a28442c843183 Mon Sep 17 00:00:00 2001
From: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
Date: Mon, 1 Aug 2022 17:40:17 -0700
Subject: [PATCH 652/811] fix: modify file extension generation on Windows
 (#34723)

* fix: modify file extension generation on Windows

* modify includes

* include vector in header

* add win build flags

* remove hardcoded strings

* Update shell/browser/electron_download_manager_delegate.h

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

* fix string manipulation and function definitions

* Update electron_download_manager_delegate.h

* convert to std::string and modify for electron

* Update shell/browser/electron_download_manager_delegate.cc

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

* remove vector include and update conversion

* add vectr include for lint

Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 .../electron_download_manager_delegate.cc     | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index 813a6dce4ea3c..e2a0c8896c547 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -30,6 +30,16 @@
 #include "shell/common/gin_converters/file_path_converter.h"
 #include "shell/common/options_switches.h"
 
+#if BUILDFLAG(IS_WIN)
+#include <vector>
+
+#include "base/i18n/case_conversion.h"
+#include "base/win/registry.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/shell_dialogs/execute_select_file_win.h"
+#include "ui/strings/grit/ui_strings.h"
+#endif  // BUILDFLAG(IS_WIN)
+
 namespace electron {
 
 namespace {
@@ -62,6 +72,112 @@ base::FilePath CreateDownloadPath(const GURL& url,
   return download_path.Append(generated_name);
 }
 
+#if BUILDFLAG(IS_WIN)
+// Get the file type description from the registry. This will be "Text Document"
+// for .txt files, "JPEG Image" for .jpg files, etc. If the registry doesn't
+// have an entry for the file type, we return false, true if the description was
+// found. 'file_ext' must be in form ".txt".
+// Modified from ui/shell_dialogs/select_file_dialog_win.cc
+bool GetRegistryDescriptionFromExtension(const std::string& file_ext,
+                                         std::string* reg_description) {
+  DCHECK(reg_description);
+  base::win::RegKey reg_ext(HKEY_CLASSES_ROOT,
+                            base::UTF8ToWide(file_ext).c_str(), KEY_READ);
+  std::wstring reg_app;
+  if (reg_ext.ReadValue(nullptr, &reg_app) == ERROR_SUCCESS &&
+      !reg_app.empty()) {
+    base::win::RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ);
+    std::wstring description;
+    if (reg_link.ReadValue(nullptr, &description) == ERROR_SUCCESS) {
+      *reg_description = base::WideToUTF8(description);
+      return true;
+    }
+  }
+  return false;
+}
+
+// Set up a filter for a Save/Open dialog, |ext_desc| as the text descriptions
+// of the |file_ext| types (optional), and (optionally) the default 'All Files'
+// view. The purpose of the filter is to show only files of a particular type in
+// a Windows Save/Open dialog box. The resulting filter is returned. The filter
+// created here are:
+//   1. only files that have 'file_ext' as their extension
+//   2. all files (only added if 'include_all_files' is true)
+// If a description is not provided for a file extension, it will be retrieved
+// from the registry. If the file extension does not exist in the registry, a
+// default description will be created (e.g. "qqq" yields "QQQ File").
+// Copied from ui/shell_dialogs/select_file_dialog_win.cc
+file_dialog::Filters FormatFilterForExtensions(
+    const std::vector<std::string>& file_ext,
+    const std::vector<std::string>& ext_desc,
+    bool include_all_files,
+    bool keep_extension_visible) {
+  const std::string all_ext = "*";
+  const std::string all_desc =
+      l10n_util::GetStringUTF8(IDS_APP_SAVEAS_ALL_FILES);
+
+  DCHECK(file_ext.size() >= ext_desc.size());
+
+  if (file_ext.empty())
+    include_all_files = true;
+
+  file_dialog::Filters result;
+  result.reserve(file_ext.size() + 1);
+
+  for (size_t i = 0; i < file_ext.size(); ++i) {
+    std::string ext = file_ext[i];
+    std::string desc;
+    if (i < ext_desc.size())
+      desc = ext_desc[i];
+
+    if (ext.empty()) {
+      // Force something reasonable to appear in the dialog box if there is no
+      // extension provided.
+      include_all_files = true;
+      continue;
+    }
+
+    if (desc.empty()) {
+      DCHECK(ext.find('.') != std::string::npos);
+      std::string first_extension = ext.substr(ext.find('.'));
+      size_t first_separator_index = first_extension.find(';');
+      if (first_separator_index != std::string::npos)
+        first_extension = first_extension.substr(0, first_separator_index);
+
+      // Find the extension name without the preceeding '.' character.
+      std::string ext_name = first_extension;
+      size_t ext_index = ext_name.find_first_not_of('.');
+      if (ext_index != std::string::npos)
+        ext_name = ext_name.substr(ext_index);
+
+      if (!GetRegistryDescriptionFromExtension(first_extension, &desc)) {
+        // The extension doesn't exist in the registry. Create a description
+        // based on the unknown extension type (i.e. if the extension is .qqq,
+        // then we create a description "QQQ File").
+        desc = l10n_util::GetStringFUTF8(
+            IDS_APP_SAVEAS_EXTENSION_FORMAT,
+            base::i18n::ToUpper(base::UTF8ToUTF16(ext_name)));
+        include_all_files = true;
+      }
+      if (desc.empty())
+        desc = "*." + ext_name;
+    } else if (keep_extension_visible) {
+      // Having '*' in the description could cause the windows file dialog to
+      // not include the file extension in the file dialog. So strip out any '*'
+      // characters if `keep_extension_visible` is set.
+      base::ReplaceChars(desc, "*", base::StringPiece(), &desc);
+    }
+
+    result.push_back({desc, {ext}});
+  }
+
+  if (include_all_files)
+    result.push_back({all_desc, {all_ext}});
+
+  return result;
+}
+#endif  // BUILDFLAG(IS_WIN)
+
 }  // namespace
 
 ElectronDownloadManagerDelegate::ElectronDownloadManagerDelegate(
@@ -130,6 +246,16 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated(
     const bool offscreen = !web_preferences || web_preferences->IsOffscreen();
     settings.force_detached = offscreen;
 
+#if BUILDFLAG(IS_WIN)
+    if (settings.filters.empty()) {
+      const std::wstring extension = settings.default_path.FinalExtension();
+      if (!extension.empty()) {
+        settings.filters = FormatFilterForExtensions(
+            {base::WideToUTF8(extension)}, {""}, true, true);
+      }
+    }
+#endif  // BUILDFLAG(IS_WIN)
+
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
     v8::HandleScope scope(isolate);
     gin_helper::Promise<gin_helper::Dictionary> dialog_promise(isolate);

From e3893632e7e7cf39fff160946fdc19a7ae058da2 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 2 Aug 2022 12:13:58 +0900
Subject: [PATCH 653/811] fix: touch events not recognized by WCO on windows
 (#35117)

---
 patches/chromium/.patches                     |  1 +
 ...dle_synthetic_mouse_events_for_touch.patch | 76 +++++++++++++++++++
 .../electron_desktop_window_tree_host_win.cc  | 21 +++++
 .../electron_desktop_window_tree_host_win.h   |  1 +
 4 files changed, 99 insertions(+)
 create mode 100644 patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index f45619f998f34..b2a8de2dd1ba0 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -114,3 +114,4 @@ fix_allow_guest_webcontents_to_enter_fullscreen.patch
 disable_freezing_flags_after_init_in_node.patch
 short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
+chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
diff --git a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
new file mode 100644
index 0000000000000..890c5af769a57
--- /dev/null
+++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Fri, 29 Jul 2022 00:29:35 +0900
+Subject: chore: allow chromium to handle synthetic mouse events for touch
+
+With WCO, allow chromium to handle synthetic mouse events generated for touch
+actions in the non-client caption area.
+
+diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+index f6b37bdec2343d45447b419aeadbe2aa19493c3c..bdbf7153f27376bd68459f9cb480bff7485c9e98 100644
+--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
++++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+@@ -1169,6 +1169,10 @@ void DesktopWindowTreeHostWin::HandleWindowScaleFactorChanged(
+   }
+ }
+ 
++bool DesktopWindowTreeHostWin::HandleMouseEventForCaption(UINT message) const {
++  return false;
++}
++
+ DesktopNativeCursorManager*
+ DesktopWindowTreeHostWin::GetSingletonDesktopNativeCursorManager() {
+   return new DesktopNativeCursorManagerWin();
+diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+index 0aae49ec83b88057434af5bbfb54b10e53469918..058e5dc978e76a71fa02dc9e275592f3c39befea 100644
+--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
++++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+@@ -263,6 +263,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
+   void HandleWindowSizeChanging() override;
+   void HandleWindowSizeUnchanged() override;
+   void HandleWindowScaleFactorChanged(float window_scale_factor) override;
++  bool HandleMouseEventForCaption(UINT message) const override;
+ 
+   Widget* GetWidget();
+   const Widget* GetWidget() const;
+diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
+index 3b546cf67089e6677fc668b4d1d6c0863282dff5..c6810f162806b36494885b2f63982a756d4dcd38 100644
+--- a/ui/views/win/hwnd_message_handler.cc
++++ b/ui/views/win/hwnd_message_handler.cc
+@@ -3129,15 +3129,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+       SetMsgHandled(FALSE);
+     // We must let Windows handle the caption buttons if it's drawing them, or
+     // they won't work.
++    bool simulate_mouse_event_for_caption = false;
+     if (delegate_->GetFrameMode() == FrameMode::SYSTEM_DRAWN &&
+         (hittest == HTCLOSE || hittest == HTMINBUTTON ||
+          hittest == HTMAXBUTTON)) {
+-      SetMsgHandled(FALSE);
++      simulate_mouse_event_for_caption =
++          delegate_->HandleMouseEventForCaption(message);
++      if (!simulate_mouse_event_for_caption)
++        SetMsgHandled(FALSE);
+     }
+     // Let resize events fall through. Ignore everything else, as we're either
+     // letting Windows handle it above or we've already handled the equivalent
+     // touch message.
+-    if (!IsHitTestOnResizeHandle(hittest))
++    if (!IsHitTestOnResizeHandle(hittest) && !simulate_mouse_event_for_caption)
+       return 0;
+   }
+ 
+diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
+index 5dbb192d0840ca0ded61397c399b774a8cb05cce..098a9c3140e9e140fdc8f0dc9cf4e8ec84451221 100644
+--- a/ui/views/win/hwnd_message_handler_delegate.h
++++ b/ui/views/win/hwnd_message_handler_delegate.h
+@@ -258,6 +258,10 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
+   // Called when the window scale factor has changed.
+   virtual void HandleWindowScaleFactorChanged(float window_scale_factor) = 0;
+ 
++  // Called when synthetic mouse event is generated for touch event on
++  // caption buttons.
++  virtual bool HandleMouseEventForCaption(UINT message) const = 0;
++
+  protected:
+   virtual ~HWNDMessageHandlerDelegate() = default;
+ };
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
index 7288007747759..e8922f8b2c280 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
@@ -95,6 +95,27 @@ bool ElectronDesktopWindowTreeHostWin::GetClientAreaInsets(
   return false;
 }
 
+bool ElectronDesktopWindowTreeHostWin::HandleMouseEventForCaption(
+    UINT message) const {
+  // Windows does not seem to generate WM_NCPOINTERDOWN/UP touch events for
+  // caption buttons with WCO. This results in a no-op for
+  // HWNDMessageHandler::HandlePointerEventTypeTouchOrNonClient and
+  // WM_SYSCOMMAND is not generated for the touch action. However, Windows will
+  // also generate a mouse event for every touch action and this gets handled in
+  // HWNDMessageHandler::HandleMouseEventInternal.
+  // With https://chromium-review.googlesource.com/c/chromium/src/+/1048877/
+  // Chromium lets the OS handle caption buttons for FrameMode::SYSTEM_DRAWN but
+  // again this does not generate the SC_MINIMIZE, SC_MAXIMIZE, SC_RESTORE
+  // commands when Non-client mouse events are generated for HTCLOSE,
+  // HTMINBUTTON, HTMAXBUTTON. To workaround this issue, wit this delegate we
+  // let chromium handle the mouse events via
+  // HWNDMessageHandler::HandleMouseInputForCaption instead of the OS and this
+  // will generate the necessary system commands to perform caption button
+  // actions due to the DefWindowProc call.
+  // https://source.chromium.org/chromium/chromium/src/+/main:ui/views/win/hwnd_message_handler.cc;l=3611
+  return native_window_view_->IsWindowControlsOverlayEnabled();
+}
+
 void ElectronDesktopWindowTreeHostWin::OnNativeThemeUpdated(
     ui::NativeTheme* observed_theme) {
   win::SetDarkModeForWindow(GetAcceleratedWidget());
diff --git a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
index 1b53f6f8e5313..2f63f34f63b63 100644
--- a/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
+++ b/shell/browser/ui/win/electron_desktop_window_tree_host_win.h
@@ -36,6 +36,7 @@ class ElectronDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin,
   bool GetDwmFrameInsetsInPixels(gfx::Insets* insets) const override;
   bool GetClientAreaInsets(gfx::Insets* insets,
                            HMONITOR monitor) const override;
+  bool HandleMouseEventForCaption(UINT message) const override;
 
   // ui::NativeThemeObserver:
   void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;

From 31be6ecf7b1e63f278b03c5d64d59288ee2f1cd7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 06:01:38 -0700
Subject: [PATCH 654/811] Bump v21.0.0-nightly.20220802

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f1399fc1bc205..028a221de6139 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220801
\ No newline at end of file
+21.0.0-nightly.20220802
\ No newline at end of file
diff --git a/package.json b/package.json
index d24c804e1c64d..00b93464c0b1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220801",
+  "version": "21.0.0-nightly.20220802",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index bb1f1cd52ecc3..1c6efc996a492 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220801
- PRODUCTVERSION 21,0,0,20220801
+ FILEVERSION 21,0,0,20220802
+ PRODUCTVERSION 21,0,0,20220802
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 53cd23159e0eeddf32399560e163c3fe1a1c144b Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 2 Aug 2022 11:53:36 -0700
Subject: [PATCH 655/811] chore: remove unsupported skiptaskbar linux impl
 (#35179)

chore: unsupported skiptaskbar linux impl
---
 shell/browser/native_window_views.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index 583c303734a21..bf60cc85f0736 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -1040,10 +1040,6 @@ void NativeWindowViews::SetSkipTaskbar(bool skip) {
     taskbar->AddTab(GetAcceleratedWidget());
     taskbar_host_.RestoreThumbarButtons(GetAcceleratedWidget());
   }
-#elif defined(USE_OZONE_PLATFORM_X11)
-  if (IsX11())
-    SetWMSpecState(static_cast<x11::Window>(GetAcceleratedWidget()), skip,
-                   x11::GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
 #endif
 }
 

From 3d4d1b33ba7f33fbdf377c7abc4c185ba1f29578 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Tue, 2 Aug 2022 12:45:30 -0700
Subject: [PATCH 656/811] fix: fail non-fatally when InitLogging fails (#35138)

---
 shell/common/logging.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/common/logging.cc b/shell/common/logging.cc
index a74702c7e5a93..5a109d9798ac4 100644
--- a/shell/common/logging.cc
+++ b/shell/common/logging.cc
@@ -141,7 +141,7 @@ void InitElectronLogging(const base::CommandLine& command_line,
           : APPEND_TO_OLD_LOG_FILE;
   bool success = InitLogging(settings);
   if (!success) {
-    PLOG(FATAL) << "Failed to init logging";
+    PLOG(ERROR) << "Failed to init logging";
   }
 
   SetLogItems(true /* pid */, false, true /* timestamp */, false);

From 3fe00d75e9499ed9f55754548358e10385ab169e Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Tue, 2 Aug 2022 12:57:42 -0700
Subject: [PATCH 657/811] chore: update NMV for Electron 21 (#35124)

---
 build/args/all.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/args/all.gn b/build/args/all.gn
index f1de439d833fc..0a02f0c15b27f 100644
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 107
+node_module_version = 109
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"

From 4e8480b15b63cf71648f8f9357713b8827dec27c Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 3 Aug 2022 16:51:30 +0900
Subject: [PATCH 658/811] chore: fix linking with component ffmpeg (#35178)

---
 BUILD.gn                                      |  7 +++++
 build/config/BUILD.gn                         | 20 -------------
 patches/chromium/.patches                     |  1 -
 .../v8_context_snapshot_generator.patch       | 20 -------------
 patches/config.json                           |  2 ++
 patches/ffmpeg/.patches                       |  1 +
 patches/ffmpeg/link_with_loader_path.patch    | 29 +++++++++++++++++++
 patches/v8/build_gn.patch                     | 11 +------
 ...export_private_v8_symbols_on_windows.patch |  2 +-
 patches/v8/expose_mksnapshot.patch            |  2 +-
 10 files changed, 42 insertions(+), 53 deletions(-)
 delete mode 100644 patches/chromium/v8_context_snapshot_generator.patch
 create mode 100644 patches/ffmpeg/.patches
 create mode 100644 patches/ffmpeg/link_with_loader_path.patch

diff --git a/BUILD.gn b/BUILD.gn
index 6ef3b3be92f9e..e1a99dfadb4d9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -901,6 +901,13 @@ if (is_mac) {
         "@executable_path/../../../../../..",
       ]
     }
+
+    # For component ffmpeg under non-component build, it is linked from
+    # @loader_path. However the ffmpeg.dylib is moved to a different place
+    # when generating app bundle, and we should change to link from @rpath.
+    if (is_component_ffmpeg && !is_component_build) {
+      ldflags += [ "-Wcrl,installnametool,-change,@loader_path/libffmpeg.dylib,@rpath/libffmpeg.dylib" ]
+    }
   }
 
   template("electron_helper_app") {
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index e805478b21a86..31ff2dc8bb246 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -1,23 +1,3 @@
-config("build_time_executable") {
-  configs = []
-
-  if (is_electron_build && !is_component_build) {
-    # The executables which have this config applied are dependent on ffmpeg,
-    # which is always a shared library in an Electron build. However, in the
-    # non-component build, executables don't have rpath set to search for
-    # libraries in the executable's directory, so ffmpeg cannot be found. So
-    # let's make sure rpath is set here.
-    # See '//build/config/gcc/BUILD.gn' for details on the rpath setting.
-    if (is_linux) {
-      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-    }
-
-    if (is_mac) {
-      ldflags = [ "-Wl,-rpath,@loader_path/." ]
-    }
-  }
-}
-
 # For MAS build, we force defining "MAS_BUILD".
 config("mas_build") {
   if (is_mas_build) {
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index b2a8de2dd1ba0..4a5fe02140ea0 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -12,7 +12,6 @@ webview_cross_drag.patch
 gin_enable_disable_v8_platform.patch
 disable-redraw-lock.patch
 enable_reset_aspect_ratio.patch
-v8_context_snapshot_generator.patch
 boringssl_build_gn.patch
 pepper_plugin_support.patch
 gtk_visibility.patch
diff --git a/patches/chromium/v8_context_snapshot_generator.patch b/patches/chromium/v8_context_snapshot_generator.patch
deleted file mode 100644
index 6e7f5ad9c9de6..0000000000000
--- a/patches/chromium/v8_context_snapshot_generator.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nitish Sakhawalkar <nitsakh@icloud.com>
-Date: Thu, 20 Sep 2018 17:47:58 -0700
-Subject: v8_context_snapshot_generator.patch
-
-v8_context_snapshot_generator is a build time executable.
-The patch adds the config.
-
-diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
-index a06eae4ab3217210f997126f7dcc318785cdb759..9484ccd615817459f17daf76ff9f82e88cfacbdd 100644
---- a/tools/v8_context_snapshot/BUILD.gn
-+++ b/tools/v8_context_snapshot/BUILD.gn
-@@ -114,6 +114,7 @@ if (use_v8_context_snapshot) {
-       configs += [
-         "//v8:external_startup_data",
-         ":disable_icf",
-+        "//electron/build/config:build_time_executable",
-       ]
-     }
-   }
diff --git a/patches/config.json b/patches/config.json
index 1f10e013b33b3..e142fc9deee0d 100644
--- a/patches/config.json
+++ b/patches/config.json
@@ -5,6 +5,8 @@
 
   "src/electron/patches/devtools_frontend": "src/third_party/devtools-frontend/src",
 
+  "src/electron/patches/ffmpeg": "src/third_party/ffmpeg",
+
   "src/electron/patches/webrtc": "src/third_party/webrtc",
 
   "src/electron/patches/v8":  "src/v8",
diff --git a/patches/ffmpeg/.patches b/patches/ffmpeg/.patches
new file mode 100644
index 0000000000000..31dc878c5b29c
--- /dev/null
+++ b/patches/ffmpeg/.patches
@@ -0,0 +1 @@
+link_with_loader_path.patch
diff --git a/patches/ffmpeg/link_with_loader_path.patch b/patches/ffmpeg/link_with_loader_path.patch
new file mode 100644
index 0000000000000..6665cd91ff354
--- /dev/null
+++ b/patches/ffmpeg/link_with_loader_path.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Tue, 2 Aug 2022 11:53:00 +0900
+Subject: fix: link with @loader_path/libffmpeg.dylib
+
+Submitted to https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/3803946.
+
+When building with `is_component_build=false is_component_ffmpeg=true`,
+we must manually instruct executables to link with the ffmpeg.dylib,
+which is generated at the @loader_path, where for most targets is the
+out/{Release,Debug} dir.
+
+Using @rpath is wrong because the @rpath of most targets does not
+include the out dir, and the linker won't be able to find ffmpeg.dylib
+because of so.
+
+diff --git a/BUILD.gn b/BUILD.gn
+index 5ea4e373360f1e09d8295be89beb063f482ec165..4fd65674d1a2a94868de6aa32bdde04a4b9c2662 100755
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -448,7 +448,7 @@ if (is_component_ffmpeg) {
+ 
+     if (!is_component_build) {
+       if (is_mac) {
+-        ldflags += [ "-Wl,-install_name,@rpath/libffmpeg.dylib" ]
++        ldflags += [ "-Wl,-install_name,@loader_path/libffmpeg.dylib" ]
+       } else if (is_linux) {
+         all_dependent_configs = [
+           "//build/config/gcc:rpath_for_built_shared_libraries",
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 23d717ab96d75..56bc38317f1db 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c918081b31fdf15efd325ae9d688f6c4f59aded1..3820a03365e58a05f2df16195ed6061f1c451a05 100644
+index c918081b31fdf15efd325ae9d688f6c4f59aded1..15d0dcf9f6ea151f4dcacff0f3dc11b318a1e1cd 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -636,7 +636,7 @@ config("internal_config") {
@@ -30,12 +30,3 @@ index c918081b31fdf15efd325ae9d688f6c4f59aded1..3820a03365e58a05f2df16195ed6061f
  
      deps = [
        ":v8_libbase",
-@@ -6037,6 +6037,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
- 
-     configs = [ ":internal_config" ]
- 
-+    configs += [ "//electron/build/config:build_time_executable" ]
-+
-     deps = [
-       ":v8_base_without_compiler",
-       ":v8_compiler_for_mksnapshot",
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 9c6435bc65f6d..6762589722f4e 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index b6a232081301a74ffbffb98311fc29c4015fc9f9..f5d605043e7f43324fd0bdf74f1decf634143cb0 100644
+index 88d775bfe22d6f1ff738120d11cb1123c5ac106c..feab71df47427d6aaebddb581762fa1a2fd16887 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -636,6 +636,10 @@ config("internal_config") {
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 823df35e5a67e..ba2b64e10fbf9 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,7 +6,7 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 3820a03365e58a05f2df16195ed6061f1c451a05..b6a232081301a74ffbffb98311fc29c4015fc9f9 100644
+index 15d0dcf9f6ea151f4dcacff0f3dc11b318a1e1cd..88d775bfe22d6f1ff738120d11cb1123c5ac106c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -6011,7 +6011,6 @@ if (current_toolchain == v8_generator_toolchain) {

From 7b8fb2b07418c7bad6ce811ca75c926ee53663fc Mon Sep 17 00:00:00 2001
From: msizanoen1 <55322658+msizanoen1@users.noreply.github.com>
Date: Wed, 3 Aug 2022 15:51:52 +0700
Subject: [PATCH 659/811] fix: Wayland general CSD fixes (#34955)

* fix: broken wayland window decorations due to botched chromium update

The `GetTitlebarBounds().height()` is obviously intended to be placed in
the `top` parameter, which used to be the second one before upstream
removed multi-parameter `gfx::Rect::Inset`, but it's the first parameter
for `gfx::Insets::TLBR`, which was intended to replace the removed
`Inset` function. However, whoever updated Chromium kept the parameter
unchanged, causing the title bar height to be passed to the `left`
parameter, causing the window title bar to be unclickable.

* fix: wayland window top bar buttons unclickable

Use NonClientFrameView::TargetForRect for the ClientFrameViewLinux
implementation because the default inherited from FramelessView blocks
any non-HTCLIENT events.

* fix: add maximized parameter to LinuxUI::GetWindowFrameProvider

* fix: pass frame_->IsMaximized() to GetWindowFrameProvider

This ensures that the toolkit renders the window decorations in maximized mode
while the window is maximized to ensure that there is no empty space around the window.
---
 patches/chromium/.patches                     |   1 +
 ...er_to_linuxui_getwindowframeprovider.patch | 176 ++++++++++++++++++
 .../ui/views/client_frame_view_linux.cc       |  12 +-
 .../ui/views/client_frame_view_linux.h        |   3 +
 4 files changed, 190 insertions(+), 2 deletions(-)
 create mode 100644 patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 4a5fe02140ea0..7cc9b8c2de314 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -114,3 +114,4 @@ disable_freezing_flags_after_init_in_node.patch
 short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
 chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
+add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
new file mode 100644
index 0000000000000..a7d6873b9ed49
--- /dev/null
+++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
@@ -0,0 +1,176 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: msizanoen1 <msizanoen@qtmlabs.xyz>
+Date: Tue, 19 Jul 2022 05:11:06 +0200
+Subject: Add maximized parameter to LinuxUI::GetWindowFrameProvider
+
+This allows ClientFrameViewLinux to instruct the toolkit to draw the window
+decorations in maximized mode where needed, preventing empty space caused
+by decoration shadows and rounded titlebars around the window while maximized.
+
+diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
+index 50c01fb42bc1a7350fae4773f1b549355c6cdc25..ab49a67e3b20cd240f532cfbf868533bb1f293d8 100644
+--- a/ui/gtk/gtk_ui.cc
++++ b/ui/gtk/gtk_ui.cc
+@@ -511,13 +511,15 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
+   return nullptr;
+ }
+ 
+-ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame) {
++ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame, bool maximized) {
+   if (!GtkCheckVersion(3, 14))
+     return nullptr;
+   auto& provider =
+-      solid_frame ? solid_frame_provider_ : transparent_frame_provider_;
++      maximized
++        ? (solid_frame ? solid_maximized_frame_provider_ : transparent_maximized_frame_provider_)
++        : (solid_frame ? solid_frame_provider_ : transparent_frame_provider_);
+   if (!provider)
+-    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame);
++    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame, maximized);
+   return provider.get();
+ }
+ 
+diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
+index 5206acf475346f50e0f31b7432d9b93afc3a8ad0..9f2b3cca2337b4528f9451c2fdec7c67021c949f 100644
+--- a/ui/gtk/gtk_ui.h
++++ b/ui/gtk/gtk_ui.h
+@@ -93,7 +93,7 @@ class GtkUi : public ui::LinuxUi {
+   bool PreferDarkTheme() const override;
+   bool AnimationsEnabled() const override;
+   std::unique_ptr<ui::NavButtonProvider> CreateNavButtonProvider() override;
+-  ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override;
++  ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) override;
+   base::flat_map<std::string, std::string> GetKeyboardLayoutMap() override;
+   std::string GetCursorThemeName() override;
+   int GetCursorThemeSize() override;
+@@ -197,6 +197,8 @@ class GtkUi : public ui::LinuxUi {
+   // while Chrome is running.
+   std::unique_ptr<ui::WindowFrameProvider> solid_frame_provider_;
+   std::unique_ptr<ui::WindowFrameProvider> transparent_frame_provider_;
++  std::unique_ptr<ui::WindowFrameProvider> solid_maximized_frame_provider_;
++  std::unique_ptr<ui::WindowFrameProvider> transparent_maximized_frame_provider_;
+ };
+ 
+ }  // namespace gtk
+diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc
+index e4dbdad327eb77994ffd7f068c67336a19897915..d3ae0636455489a7c7443df85cb769952c98aca2 100644
+--- a/ui/gtk/window_frame_provider_gtk.cc
++++ b/ui/gtk/window_frame_provider_gtk.cc
+@@ -38,16 +38,18 @@ std::string GetThemeName() {
+   return theme_string;
+ }
+ 
+-GtkCssContext WindowContext(bool solid_frame, bool focused) {
++GtkCssContext WindowContext(bool solid_frame, bool maximized, bool focused) {
+   std::string selector = "#window.background.";
+   selector += solid_frame ? "solid-csd" : "csd";
++  if (maximized)
++    selector += ".maximized";
+   if (!focused)
+     selector += ":inactive";
+   return AppendCssNodeToStyleContext({}, selector);
+ }
+ 
+-GtkCssContext DecorationContext(bool solid_frame, bool focused) {
+-  auto context = WindowContext(solid_frame, focused);
++GtkCssContext DecorationContext(bool solid_frame, bool maximized, bool focused) {
++  auto context = WindowContext(solid_frame, maximized, focused);
+   // GTK4 renders the decoration directly on the window.
+   if (!GtkCheckVersion(4))
+     context = AppendCssNodeToStyleContext(context, "#decoration");
+@@ -64,8 +66,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) {
+   return context;
+ }
+ 
+-GtkCssContext HeaderContext(bool solid_frame, bool focused) {
+-  auto context = WindowContext(solid_frame, focused);
++GtkCssContext HeaderContext(bool solid_frame, bool maximized, bool focused) {
++  auto context = WindowContext(solid_frame, maximized, focused);
+   context =
+       AppendCssNodeToStyleContext(context, "#headerbar.header-bar.titlebar");
+   if (!focused)
+@@ -110,8 +112,8 @@ int ComputeTopCornerRadius() {
+   // need to experimentally determine the corner radius by rendering a sample.
+   // Additionally, in GTK4, the headerbar corners get clipped by the window
+   // rather than the headerbar having its own rounded corners.
+-  auto context = GtkCheckVersion(4) ? DecorationContext(false, false)
+-                                    : HeaderContext(false, false);
++  auto context = GtkCheckVersion(4) ? DecorationContext(false, false, false)
++                                    : HeaderContext(false, false, false);
+   ApplyCssToContext(context, R"(window, headerbar {
+     background-image: none;
+     background-color: black;
+@@ -169,8 +171,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom(
+   unfocused_bitmap = src.unfocused_bitmap;
+ }
+ 
+-WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame)
+-    : solid_frame_(solid_frame) {}
++WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame, bool maximized)
++    : solid_frame_(solid_frame), maximized_(maximized) {}
+ 
+ WindowFrameProviderGtk::~WindowFrameProviderGtk() = default;
+ 
+@@ -264,7 +266,7 @@ void WindowFrameProviderGtk::PaintWindowFrame(gfx::Canvas* canvas,
+       top_area_height_dip * scale - asset.frame_thickness_px.top();
+ 
+   auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px},
+-                               HeaderContext(solid_frame_, focused), scale);
++                               HeaderContext(solid_frame_, maximized_, focused), scale);
+   image = gfx::ImageSkia::CreateFrom1xBitmap(header);
+   // In GTK4, the headerbar gets clipped by the window.
+   if (GtkCheckVersion(4)) {
+@@ -296,7 +298,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
+ 
+   gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip,
+                              2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip);
+-  auto focused_context = DecorationContext(solid_frame_, true);
++  auto focused_context = DecorationContext(solid_frame_, maximized_, true);
+   frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context));
+   frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context));
+   gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset));
+@@ -304,7 +306,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
+       PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale);
+   asset.unfocused_bitmap =
+       PaintBitmap(bitmap_size, frame_bounds_dip,
+-                  DecorationContext(solid_frame_, false), scale);
++                  DecorationContext(solid_frame_, maximized_, false), scale);
+ 
+   // In GTK4, there's no way to obtain the frame thickness from CSS values
+   // directly, so we must determine it experimentally based on the drawn
+diff --git a/ui/gtk/window_frame_provider_gtk.h b/ui/gtk/window_frame_provider_gtk.h
+index da0f7c33a260f8d98a73c126def30944589001df..a2999a6dcea30a9e468f974301b3a4f03dcb8aeb 100644
+--- a/ui/gtk/window_frame_provider_gtk.h
++++ b/ui/gtk/window_frame_provider_gtk.h
+@@ -14,7 +14,7 @@ namespace gtk {
+ 
+ class WindowFrameProviderGtk : public ui::WindowFrameProvider {
+  public:
+-  explicit WindowFrameProviderGtk(bool solid_frame);
++  explicit WindowFrameProviderGtk(bool solid_frame, bool maximized);
+ 
+   WindowFrameProviderGtk(const WindowFrameProviderGtk&) = delete;
+   WindowFrameProviderGtk& operator=(const WindowFrameProviderGtk&) = delete;
+@@ -69,6 +69,9 @@ class WindowFrameProviderGtk : public ui::WindowFrameProvider {
+ 
+   // Cached bitmaps and metrics.  The scale is rounded to percent.
+   base::flat_map<int, Asset> assets_;
++
++  // Whether to draw the window decorations as maximized.
++  bool maximized_;
+ };
+ 
+ }  // namespace gtk
+diff --git a/ui/linux/linux_ui.h b/ui/linux/linux_ui.h
+index 0cd8a0e101de186e11ead65526c7f0abc60c6577..7db580ce04a407877ca4108ec087120cdb9ce2ad 100644
+--- a/ui/linux/linux_ui.h
++++ b/ui/linux/linux_ui.h
+@@ -176,7 +176,7 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi
+   // if transparency is unsupported and the frame should be rendered opaque.
+   // The returned object is not owned by the caller and will remain alive until
+   // the process ends.
+-  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) = 0;
++  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) = 0;
+ 
+   // Returns a map of KeyboardEvent code to KeyboardEvent key values.
+   virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;
diff --git a/shell/browser/ui/views/client_frame_view_linux.cc b/shell/browser/ui/views/client_frame_view_linux.cc
index 011764e864f96..97905462a45b9 100644
--- a/shell/browser/ui/views/client_frame_view_linux.cc
+++ b/shell/browser/ui/views/client_frame_view_linux.cc
@@ -131,7 +131,7 @@ void ClientFrameViewLinux::Init(NativeWindowViews* window,
   host_supports_client_frame_shadow_ = tree_host->SupportsClientFrameShadow();
 
   frame_provider_ = ui::LinuxUi::instance()->GetWindowFrameProvider(
-      !host_supports_client_frame_shadow_);
+      !host_supports_client_frame_shadow_, frame_->IsMaximized());
 
   UpdateWindowTitle();
 
@@ -202,7 +202,7 @@ gfx::Rect ClientFrameViewLinux::GetBoundsForClientView() const {
   if (!frame_->IsFullscreen()) {
     client_bounds.Inset(GetBorderDecorationInsets());
     client_bounds.Inset(
-        gfx::Insets::TLBR(0, GetTitlebarBounds().height(), 0, 0));
+        gfx::Insets::TLBR(GetTitlebarBounds().height(), 0, 0, 0));
   }
   return client_bounds;
 }
@@ -274,6 +274,9 @@ void ClientFrameViewLinux::Layout() {
     return;
   }
 
+  frame_provider_ = ui::LinuxUi::instance()->GetWindowFrameProvider(
+      !host_supports_client_frame_shadow_, frame_->IsMaximized());
+
   UpdateButtonImages();
   LayoutButtons();
 
@@ -485,4 +488,9 @@ gfx::Size ClientFrameViewLinux::SizeWithDecorations(gfx::Size size) const {
   return size;
 }
 
+views::View* ClientFrameViewLinux::TargetForRect(views::View* root,
+                                                 const gfx::Rect& rect) {
+  return views::NonClientFrameView::TargetForRect(root, rect);
+}
+
 }  // namespace electron
diff --git a/shell/browser/ui/views/client_frame_view_linux.h b/shell/browser/ui/views/client_frame_view_linux.h
index c76512465e023..cd0acf7b8af07 100644
--- a/shell/browser/ui/views/client_frame_view_linux.h
+++ b/shell/browser/ui/views/client_frame_view_linux.h
@@ -67,6 +67,9 @@ class ClientFrameViewLinux : public FramelessView,
   void OnPaint(gfx::Canvas* canvas) override;
   const char* GetClassName() const override;
 
+  // Overriden from views::ViewTargeterDelegate
+  views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
+
  private:
   static constexpr int kNavButtonCount = 4;
 

From afa4f5052bf5984821b01729a94dcd5b0e04d794 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 3 Aug 2022 17:52:42 +0900
Subject: [PATCH 660/811] fix: consider dock space when showing menu (#35194)

---
 shell/browser/api/electron_api_menu_mac.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_menu_mac.mm b/shell/browser/api/electron_api_menu_mac.mm
index f0086d03fbbbb..eff18b2efd24c 100644
--- a/shell/browser/api/electron_api_menu_mac.mm
+++ b/shell/browser/api/electron_api_menu_mac.mm
@@ -131,7 +131,7 @@
   if (!item) {
     CGFloat windowBottom = CGRectGetMinY([view window].frame);
     CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
-    CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
+    CGFloat screenBottom = CGRectGetMinY([view window].screen.visibleFrame);
     CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
     if (distanceFromBottom < 0)
       position.y = position.y - distanceFromBottom + 4;
@@ -140,7 +140,7 @@
   // Place the menu left of cursor if it is overflowing off right of screen.
   CGFloat windowLeft = CGRectGetMinX([view window].frame);
   CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
-  CGFloat screenRight = CGRectGetMaxX([view window].screen.frame);
+  CGFloat screenRight = CGRectGetMaxX([view window].screen.visibleFrame);
   if (rightmostMenuPoint > screenRight)
     position.x = position.x - [menu size].width;
 

From fb39f241fb1cb43e19ffadd2a2b6a83c1724aec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maya=20Nedeljkovi=C4=87=20Bati=C4=87?=
 <maya.nedeljko@gmail.com>
Date: Wed, 3 Aug 2022 12:03:45 +0200
Subject: [PATCH 661/811] docs: update categories to match sidebar (#35196)

This page describes each of the categories available in the sidebar, but some of the category titles didn't match.
---
 docs/tutorial/introduction.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index 14089d9a3a678..7d669ecb9f5a3 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -44,14 +44,14 @@ are the different categories and what you can expect on each one:
   application.
 - **Processes in Electron**: In-depth reference on Electron processes and how to work with them.
 - **Best Practices**: Important checklists to keep in mind when developing an Electron app.
-- **How-To Examples**: Quick references to add features to your Electron app.
+- **Examples**: Quick references to add features to your Electron app.
 - **Development**: Miscellaneous development guides.
 - **Distribution**: Learn how to distribute your app to end users.
 - **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
   to create quality Electron applications.
-- **Resources**: Useful links to better understand how the Electron project works
+- **References**: Useful links to better understand how the Electron project works
   and is organized.
-- **Contributing to Electron**: Compiling Electron and making contributions can be daunting.
+- **Contributing**: Compiling Electron and making contributions can be daunting.
   We try to make it easier in this section.
 
 ## Getting help

From 4e919c919c030cdcf215256a7573864afd7748a2 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 06:01:39 -0700
Subject: [PATCH 662/811] Bump v21.0.0-nightly.20220803

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 028a221de6139..9cadb7205794f 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220802
\ No newline at end of file
+21.0.0-nightly.20220803
\ No newline at end of file
diff --git a/package.json b/package.json
index 00b93464c0b1e..0e0c5eace1788 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220802",
+  "version": "21.0.0-nightly.20220803",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 1c6efc996a492..bcaa5df6fb86a 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220802
- PRODUCTVERSION 21,0,0,20220802
+ FILEVERSION 21,0,0,20220803
+ PRODUCTVERSION 21,0,0,20220803
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 74432a313cb05bf61b1aaae889357d81f8620031 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick@hotmail.ca>
Date: Wed, 3 Aug 2022 07:12:06 -0700
Subject: [PATCH 663/811] docs: fix link in tutorial (#35192)

Relands https://github.com/electron/electronjs.org-new/pull/240 upstream
---
 docs/tutorial/tutorial-4-adding-features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/tutorial-4-adding-features.md b/docs/tutorial/tutorial-4-adding-features.md
index 38be5b5f4ca0d..b5fd630ed6e3c 100644
--- a/docs/tutorial/tutorial-4-adding-features.md
+++ b/docs/tutorial/tutorial-4-adding-features.md
@@ -64,7 +64,7 @@ into end users' hands.
 
 [discord]: https://discord.gg/electronjs
 [github]: https://github.com/electron/electronjs.org-new/issues/new
-[how to]: ./examples.md
+[how-to]: ./examples.md
 [node-platform]: https://nodejs.org/api/process.html#process_process_platform
 
 <!-- Tutorial links -->

From c47031a279492a074804ed5cfe714d5c92b3d128 Mon Sep 17 00:00:00 2001
From: TAN <tzzprc@outlook.com>
Date: Wed, 3 Aug 2022 22:20:37 +0800
Subject: [PATCH 664/811] docs: Fix the URL bugs at
 tutorial-6-publishing-updating.md (#35175)

* Update tutorial-6-publishing-updating.md

The dot at the end of the URL will depend on the site that cannot open. Because it will open `https://update.electronjs.org./` which does not exist.

* docs: fix the URL problems at tutorial-6-publishing-updating.md

The dot at the end of the URL will depend on the site that cannot open. Because it will open `https://update.electronjs.org./` which does not exist.

* docs: fix the URL problems at tutorial-6-publishing-updating.md

* docs: fix the URL problems at tutorial-6-publishing-updating.md
---
 docs/tutorial/tutorial-6-publishing-updating.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/tutorial-6-publishing-updating.md b/docs/tutorial/tutorial-6-publishing-updating.md
index 57df92d6f18f8..dc0fdc31f24a1 100644
--- a/docs/tutorial/tutorial-6-publishing-updating.md
+++ b/docs/tutorial/tutorial-6-publishing-updating.md
@@ -27,7 +27,7 @@ into your app code.
 ## Using update.electronjs.org
 
 The Electron maintainers provide a free auto-updating service for open-source apps
-at https://update.electronjs.org. Its requirements are:
+at [https://update.electronjs.org](https://update.electronjs.org). Its requirements are:
 
 - Your app runs on macOS or Windows
 - Your app has a public GitHub repository

From 98aa0ef090b6b6c3d5f5399a49cd8ac2b2e58d0c Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 07:37:56 -0700
Subject: [PATCH 665/811] Bump v21.0.0-alpha.1

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 9cadb7205794f..8ece06ab29052 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-nightly.20220803
\ No newline at end of file
+21.0.0-alpha.1
\ No newline at end of file
diff --git a/package.json b/package.json
index 0e0c5eace1788..e74fab83febe0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-nightly.20220803",
+  "version": "21.0.0-alpha.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index bcaa5df6fb86a..96f0b227b5475 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,20220803
- PRODUCTVERSION 21,0,0,20220803
+ FILEVERSION 21,0,0,1
+ PRODUCTVERSION 21,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c9e7f33f7ecc4a3cceeafd5a2f329c36d290785d Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 10:02:58 -0400
Subject: [PATCH 666/811] test: temporarily disable tests on mas arm64 that are
 causing a crash (#35247)

* test: temporarily disable test on mas arm64 that is causing crash

* disable the right test

* chore: speculative fix for CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER crash

* enable all the tests

* Revert "chore: speculative fix for CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER crash"

This reverts commit b7c8ef364c03053e776fcdf495c4caeafb2dadb7.

* test: disable tests that crash on mas arm64

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 spec-main/api-browser-window-spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 2ab728239b196..6be93a0fea768 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -5255,7 +5255,8 @@ describe('BrowserWindow module', () => {
     });
   });
 
-  describe('contextIsolation option with and without sandbox option', () => {
+  // TODO (jkleinsc) renable these tests on mas arm64
+  ifdescribe(!process.mas || process.arch !== 'arm64')('contextIsolation option with and without sandbox option', () => {
     const expectedContextData = {
       preloadContext: {
         preloadProperty: 'number',

From 7c6e16975f5e102669d6dec8ca28565683c50239 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 08:54:58 +0900
Subject: [PATCH 667/811] fix: app.relaunch loses args when execPath specified
 (#35254)

fix: app.relaunch loses args when execPath specified (#35108)

Co-authored-by: Aaron Meriwether <me@ameriwether.com>
---
 shell/browser/api/electron_api_app.cc |  4 +++-
 spec-main/api-app-spec.ts             |  8 +++++---
 spec/fixtures/api/relaunch/main.js    | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index c3f9bf1ed827c..73ff1d4956309 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -1151,7 +1151,9 @@ bool App::Relaunch(gin::Arguments* js_args) {
 
   gin_helper::Dictionary options;
   if (js_args->GetNext(&options)) {
-    if (options.Get("execPath", &exec_path) || options.Get("args", &args))
+    bool has_exec_path = options.Get("execPath", &exec_path);
+    bool has_args = options.Get("args", &args);
+    if (has_exec_path || has_args)
       override_argv = true;
   }
 
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index 347dae24d2b79..a08df928fad1e 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -370,9 +370,11 @@ describe('app module', () => {
       server!.once('error', error => done(error));
       server!.on('connection', client => {
         client.once('data', data => {
-          if (String(data) === 'false' && state === 'none') {
+          if (String(data) === '--first' && state === 'none') {
             state = 'first-launch';
-          } else if (String(data) === 'true' && state === 'first-launch') {
+          } else if (String(data) === '--second' && state === 'first-launch') {
+            state = 'second-launch';
+          } else if (String(data) === '--third' && state === 'second-launch') {
             done();
           } else {
             done(`Unexpected state: "${state}", data: "${data}"`);
@@ -381,7 +383,7 @@ describe('app module', () => {
       });
 
       const appPath = path.join(fixturesPath, 'api', 'relaunch');
-      const child = cp.spawn(process.execPath, [appPath]);
+      const child = cp.spawn(process.execPath, [appPath, '--first']);
       child.stdout.on('data', (c) => console.log(c.toString()));
       child.stderr.on('data', (c) => console.log(c.toString()));
       child.on('exit', (code, signal) => {
diff --git a/spec/fixtures/api/relaunch/main.js b/spec/fixtures/api/relaunch/main.js
index 272c41f4421aa..94898f6059d65 100644
--- a/spec/fixtures/api/relaunch/main.js
+++ b/spec/fixtures/api/relaunch/main.js
@@ -11,11 +11,15 @@ app.whenReady().then(() => {
   const lastArg = process.argv[process.argv.length - 1];
   const client = net.connect(socketPath);
   client.once('connect', () => {
-    client.end(String(lastArg === '--second'));
+    client.end(lastArg);
   });
   client.once('end', () => {
-    if (lastArg !== '--second') {
-      app.relaunch({ args: process.argv.slice(1).concat('--second') });
+    if (lastArg === '--first') {
+      // Once without execPath specified
+      app.relaunch({ args: process.argv.slice(1, -1).concat('--second') });
+    } else if (lastArg === '--second') {
+      // And once with execPath specified
+      app.relaunch({ execPath: process.argv[0], args: process.argv.slice(1, -1).concat('--third') });
     }
     app.exit(0);
   });

From 64b40ea69c31c728d604b3fa52596ceb40151ccb Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:01:10 +0900
Subject: [PATCH 668/811] docs: update tray docs with info for mac menubar
 icons (#35221)

Co-authored-by: Brad Carter <16466430+carterbs@users.noreply.github.com>
---
 docs/api/tray.md | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/docs/api/tray.md b/docs/api/tray.md
index d8dac322f769d..0cb995ce2fb3d 100644
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -25,15 +25,20 @@ app.whenReady().then(() => {
 })
 ```
 
-__Platform limitations:__
+__Platform Considerations__
+
+If you want to keep exact same behaviors on all platforms, you should not
+rely on the `click` event; instead, always attach a context menu to the tray icon.
+
+__Linux__
 
-* On Linux the app indicator will be used if it is supported, otherwise
-  `GtkStatusIcon` will be used instead.
 * On Linux distributions that only have app indicator support, you have to
   install `libappindicator1` to make the tray icon work.
+* The app indicator will be used if it is supported, otherwise
+  `GtkStatusIcon` will be used instead.
 * App indicator will only be shown when it has a context menu.
-* When app indicator is used on Linux, the `click` event is ignored.
-* On Linux in order for changes made to individual `MenuItem`s to take effect,
+* The `click` event is ignored when using the app indicator.
+* In order for changes made to individual `MenuItem`s to take effect,
   you have to call `setContextMenu` again. For example:
 
 ```javascript
@@ -55,10 +60,16 @@ app.whenReady().then(() => {
 })
 ```
 
-* On Windows it is recommended to use `ICO` icons to get best visual effects.
+__MacOS__
 
-If you want to keep exact same behaviors on all platforms, you should not
-rely on the `click` event and always attach a context menu to the tray icon.
+* Icons passed to the Tray constructor should be [Template Images](native-image.md#template-image).
+* To make sure your icon isn't grainy on retina monitors, be sure your `@2x` image is 144dpi.
+* If you are bundling your application (e.g., with webpack for development), be sure that the file names are not being mangled or hashed. The filename needs to end in Template, and the `@2x` image needs to have the same filename as the standard image, or MacOS will not magically invert your image's colors or use the high density image.
+* 16x16 (72dpi) and 32x32@2x (144dpi) work well for most icons.
+
+__Windows__
+
+* It is recommended to use `ICO` icons to get best visual effects.
 
 ### `new Tray(image, [guid])`
 

From 40058af821cc7da8af28e453971bd08d15fc3577 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 15:30:29 -0700
Subject: [PATCH 669/811] fix(docs): fix a typo in section on debugging with
 VSCode (#35285)

fix(docs): fix a typo

Co-authored-by: Trang Le <trang.thule@zoho.com>
---
 docs/tutorial/tutorial-2-first-app.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/tutorial-2-first-app.md b/docs/tutorial/tutorial-2-first-app.md
index 714d069827493..75d94d618e014 100644
--- a/docs/tutorial/tutorial-2-first-app.md
+++ b/docs/tutorial/tutorial-2-first-app.md
@@ -350,7 +350,7 @@ app.whenReady().then(() => {
 
 ## Optional: Debugging from VS Code
 
-If you want to debug your application using VS Code, you have need attach VS Code to
+If you want to debug your application using VS Code, you need to attach VS Code to
 both the main and renderer processes. Here is a sample configuration for you to
 run. Create a launch.json configuration in a new `.vscode` folder in your project:
 

From 5803a679637166048f6187ba952780a5abc40e03 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 22:42:17 +0200
Subject: [PATCH 670/811] docs: fix getStoragePath return type (#35296)

Fixes #35255

Co-authored-by: Samuel Attard <sam@electronjs.org>
---
 docs/api/session.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index ed8f895f1655b..f405d133ba523 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -1049,7 +1049,7 @@ is emitted.
 
 #### `ses.getStoragePath()`
 
-A `string | null` indicating the absolute file system path where data for this
+Returns `string | null` - The absolute file system path where data for this
 session is persisted on disk.  For in memory sessions this returns `null`.
 
 ### Instance Properties

From 752b10f16fadb2e07c7ad9bda7dc71bc8cab5a53 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Aug 2022 09:37:32 -0700
Subject: [PATCH 671/811] Bump v21.0.0-alpha.2

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 8ece06ab29052..d07528e5955b5 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.1
\ No newline at end of file
+21.0.0-alpha.2
\ No newline at end of file
diff --git a/package.json b/package.json
index e74fab83febe0..aed0753c89f84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.1",
+  "version": "21.0.0-alpha.2",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 96f0b227b5475..ec408c224f83c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,1
- PRODUCTVERSION 21,0,0,1
+ FILEVERSION 21,0,0,2
+ PRODUCTVERSION 21,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a66d3bf20640fbe59de77f8f6ece23435eaa97f6 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 17:06:50 +0900
Subject: [PATCH 672/811] docs: removes unused import in preload script
 (#35334)

* Remove unused import of path

This import gives out the error in the preload script:

Error: module not found: path
    at preloadRequire

* Remove import path as it is not used in the script

note: Removes import path as it is not used in the script

Co-authored-by: Rhitik Bhatt <bhattrhitik95@gmail.com>
---
 docs/fiddles/features/drag-and-drop/preload.js | 1 -
 docs/tutorial/native-file-drag-drop.md         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/docs/fiddles/features/drag-and-drop/preload.js b/docs/fiddles/features/drag-and-drop/preload.js
index 4609e12c75528..7e698ebb54ff2 100644
--- a/docs/fiddles/features/drag-and-drop/preload.js
+++ b/docs/fiddles/features/drag-and-drop/preload.js
@@ -1,5 +1,4 @@
 const { contextBridge, ipcRenderer } = require('electron')
-const path = require('path')
 
 contextBridge.exposeInMainWorld('electron', {
   startDrag: (fileName) => {
diff --git a/docs/tutorial/native-file-drag-drop.md b/docs/tutorial/native-file-drag-drop.md
index 75ef4eb212cdc..0b8b533212431 100644
--- a/docs/tutorial/native-file-drag-drop.md
+++ b/docs/tutorial/native-file-drag-drop.md
@@ -22,7 +22,6 @@ In `preload.js` use the [`contextBridge`] to inject a method `window.electron.st
 
 ```js
 const { contextBridge, ipcRenderer } = require('electron')
-const path = require('path')
 
 contextBridge.exposeInMainWorld('electron', {
   startDrag: (fileName) => {

From 9b38a25206883e4854a7e33ce260c1afc15f6344 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 10:42:39 -0400
Subject: [PATCH 673/811] docs: add Electron deps to license credits file
 (#35332)

* docs: add Electron deps to license credits file

* fixup! docs: add Electron deps to license credits file

remove nan; it is dev-only

Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 patches/chromium/.patches                     |  1 +
 ...lectron_deps_to_license_credits_file.patch | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 patches/chromium/add_electron_deps_to_license_credits_file.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 7cc9b8c2de314..ea04e58a07500 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -115,3 +115,4 @@ short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
 chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
 add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+add_electron_deps_to_license_credits_file.patch
diff --git a/patches/chromium/add_electron_deps_to_license_credits_file.patch b/patches/chromium/add_electron_deps_to_license_credits_file.patch
new file mode 100644
index 0000000000000..e789eaad6a8d0
--- /dev/null
+++ b/patches/chromium/add_electron_deps_to_license_credits_file.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Charles Kerr <charles@charleskerr.com>
+Date: Tue, 9 Aug 2022 12:35:36 -0500
+Subject: add electron deps to license credits file
+
+Ensure that licenses for the dependencies introduced by Electron
+are included in `LICENSES.chromium.html`
+
+diff --git a/tools/licenses.py b/tools/licenses.py
+index a58dbf44370baabbfa2986c734c96a210cc16f1d..1d6934460f788ab76275710e727fb062f5c92b5b 100755
+--- a/tools/licenses.py
++++ b/tools/licenses.py
+@@ -347,6 +347,32 @@ SPECIAL_CASES = {
+         "License File":
+         "/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE",
+     },
++
++    os.path.join('third_party', 'electron_node'): {
++        "Name": "Node.js",
++        "URL": "https://github.com/nodejs/node",
++        "License": "MIT",
++        "License File": "/third_party/electron_node/LICENSE",
++    },
++    os.path.join('third_party', 'squirrel.mac'): {
++        "Name": "Squirrel",
++        "URL": "https://github.com/Squirrel/Squirrel.Mac",
++        "License": "MIT",
++        "License File": "/third_party/squirrel.mac/LICENSE",
++    },
++    os.path.join('third_party', 'squirrel.mac', 'vendor', 'mantle'): {
++        "Name": "Mantle",
++        "URL": "https://github.com/Mantle/Mantle",
++        "License": "MIT",
++        "License File": "/third_party/squirrel.mac/vendor/mantle/LICENSE.md",
++    },
++    os.path.join('third_party', 'squirrel.mac', 'vendor', 'ReactiveObjC'): {
++        "Name": "ReactiveObjC",
++        "URL": "https://github.com/ReactiveCocoa/ReactiveObjC",
++        "License": "MIT",
++        "License File":
++        "/third_party/squirrel.mac/vendor/ReactiveObjC/LICENSE.md",
++    },
+ }
+ 
+ # Special value for 'License File' field used to indicate that the license file

From fe70152b433bcb9d4752e6bb32a220a0922bf030 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 08:42:41 -0700
Subject: [PATCH 674/811] Bump v21.0.0-alpha.3

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d07528e5955b5..d3ca33fc7b5c7 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.2
\ No newline at end of file
+21.0.0-alpha.3
\ No newline at end of file
diff --git a/package.json b/package.json
index aed0753c89f84..fe3c0b93be207 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.2",
+  "version": "21.0.0-alpha.3",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ec408c224f83c..2af8b533d1f3e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,2
- PRODUCTVERSION 21,0,0,2
+ FILEVERSION 21,0,0,3
+ PRODUCTVERSION 21,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 1978a0b5fe52aa3d6e40d48bb6b44d91407e7648 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 13:53:00 -0400
Subject: [PATCH 675/811] fix: `serialPort.open()` failing (#35339)

fix: serialPort.open() failing

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 shell/browser/serial/electron_serial_delegate.cc |  8 ++------
 shell/browser/serial/serial_chooser_context.cc   | 16 ++++++++++++++++
 shell/browser/serial/serial_chooser_context.h    |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc
index 98a5a3f803a7a..2306be383db46 100644
--- a/shell/browser/serial/electron_serial_delegate.cc
+++ b/shell/browser/serial/electron_serial_delegate.cc
@@ -56,10 +56,7 @@ bool ElectronSerialDelegate::HasPortPermission(
     content::RenderFrameHost* frame,
     const device::mojom::SerialPortInfo& port) {
   auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
-  auto* browser_context = web_contents->GetBrowserContext();
-  auto* chooser_context =
-      SerialChooserContextFactory::GetForBrowserContext(browser_context);
-  return chooser_context->HasPortPermission(
+  return GetChooserContext(frame)->HasPortPermission(
       web_contents->GetPrimaryMainFrame()->GetLastCommittedOrigin(), port,
       frame);
 }
@@ -91,8 +88,7 @@ void ElectronSerialDelegate::RevokePortPermissionWebInitiated(
 const device::mojom::SerialPortInfo* ElectronSerialDelegate::GetPortInfo(
     content::RenderFrameHost* frame,
     const base::UnguessableToken& token) {
-  // TODO(nornagon/jkleinsc): pass this on to the chooser context
-  return nullptr;
+  return GetChooserContext(frame)->GetPortInfo(token);
 }
 
 SerialChooserController* ElectronSerialDelegate::ControllerForFrame(
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
index 57798ccf5692f..080a1030d4315 100644
--- a/shell/browser/serial/serial_chooser_context.cc
+++ b/shell/browser/serial/serial_chooser_context.cc
@@ -103,6 +103,8 @@ void SerialChooserContext::GrantPortPermission(
     const url::Origin& origin,
     const device::mojom::SerialPortInfo& port,
     content::RenderFrameHost* render_frame_host) {
+  port_info_.insert({port.token, port.Clone()});
+
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       browser_context_->GetPermissionControllerDelegate());
   return permission_manager->GrantDevicePermission(
@@ -190,6 +192,9 @@ base::WeakPtr<SerialChooserContext> SerialChooserContext::AsWeakPtr() {
 }
 
 void SerialChooserContext::OnPortAdded(device::mojom::SerialPortInfoPtr port) {
+  if (!base::Contains(port_info_, port->token))
+    port_info_.insert({port->token, port->Clone()});
+
   for (auto& observer : port_observer_list_)
     observer.OnPortAdded(*port);
 }
@@ -198,6 +203,8 @@ void SerialChooserContext::OnPortRemoved(
     device::mojom::SerialPortInfoPtr port) {
   for (auto& observer : port_observer_list_)
     observer.OnPortRemoved(*port);
+
+  port_info_.erase(port->token);
 }
 
 void SerialChooserContext::EnsurePortManagerConnection() {
@@ -218,6 +225,15 @@ void SerialChooserContext::SetUpPortManagerConnection(
                      base::Unretained(this)));
 
   port_manager_->SetClient(client_receiver_.BindNewPipeAndPassRemote());
+  port_manager_->GetDevices(base::BindOnce(&SerialChooserContext::OnGetDevices,
+                                           weak_factory_.GetWeakPtr()));
+}
+
+void SerialChooserContext::OnGetDevices(
+    std::vector<device::mojom::SerialPortInfoPtr> ports) {
+  for (auto& port : ports)
+    port_info_.insert({port->token, std::move(port)});
+  is_initialized_ = true;
 }
 
 void SerialChooserContext::OnPortManagerConnectionError() {
diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h
index 2424ed1e64f19..148bf14996cad 100644
--- a/shell/browser/serial/serial_chooser_context.h
+++ b/shell/browser/serial/serial_chooser_context.h
@@ -97,6 +97,7 @@ class SerialChooserContext : public KeyedService,
   void EnsurePortManagerConnection();
   void SetUpPortManagerConnection(
       mojo::PendingRemote<device::mojom::SerialPortManager> manager);
+  void OnGetDevices(std::vector<device::mojom::SerialPortInfoPtr> ports);
   void OnPortManagerConnectionError();
   void RevokeObjectPermissionInternal(const url::Origin& origin,
                                       const base::Value& object,

From 855536bcb921b0a380edc28fd5e24dedb5aaf7ba Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 16:43:48 -0400
Subject: [PATCH 676/811] refactor: simplify `Browser::SetLoginItemSettings`
 (#35329)

refactor: simplify Browser::SetLoginItemSettings

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 shell/browser/browser_mac.mm | 39 +-----------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm
index ed35f421cea73..16e5c4cc22803 100644
--- a/shell/browser/browser_mac.mm
+++ b/shell/browser/browser_mac.mm
@@ -321,43 +321,6 @@
   return settings;
 }
 
-// Some logic here copied from GetLoginItemForApp in base/mac/mac_util.mm
-void RemoveFromLoginItems() {
-#pragma clang diagnostic push  // https://crbug.com/1154377
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  base::ScopedCFTypeRef<LSSharedFileListRef> login_items(
-      LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL));
-  if (!login_items.get()) {
-    LOG(ERROR) << "Couldn't get a Login Items list.";
-    return;
-  }
-
-  base::scoped_nsobject<NSArray> login_items_array(
-      base::mac::CFToNSCast(LSSharedFileListCopySnapshot(login_items, NULL)));
-  NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]];
-  for (id login_item in login_items_array.get()) {
-    LSSharedFileListItemRef item =
-        reinterpret_cast<LSSharedFileListItemRef>(login_item);
-
-    // kLSSharedFileListDoNotMountVolumes is used so that we don't trigger
-    // mounting when it's not expected by a user. Just listing the login
-    // items should not cause any side-effects.
-    base::ScopedCFTypeRef<CFErrorRef> error;
-    base::ScopedCFTypeRef<CFURLRef> item_url_ref(
-        LSSharedFileListItemCopyResolvedURL(
-            item, kLSSharedFileListDoNotMountVolumes, error.InitializeInto()));
-
-    if (!error && item_url_ref) {
-      base::ScopedCFTypeRef<CFURLRef> item_url(item_url_ref);
-      if (CFEqual(item_url, url)) {
-        LSSharedFileListItemRemove(login_items, item);
-        return;
-      }
-    }
-  }
-#pragma clang diagnostic pop
-}
-
 void Browser::SetLoginItemSettings(LoginItemSettings settings) {
 #if defined(MAS_BUILD)
   if (!platform_util::SetLoginItemEnabled(settings.open_at_login)) {
@@ -367,7 +330,7 @@ void RemoveFromLoginItems() {
   if (settings.open_at_login) {
     base::mac::AddToLoginItems(settings.open_as_hidden);
   } else {
-    RemoveFromLoginItems();
+    base::mac::RemoveFromLoginItems();
   }
 #endif
 }

From 8caea9006a41e3b67daa650e409a24d497c0b5df Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 17:03:05 +0900
Subject: [PATCH 677/811] fix: add uv_loop_close when object release to fix
 crash (#35336)

Co-authored-by: yangzuohui <yangzuohui@bytedance.com>
---
 shell/common/node_bindings.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index 71a2f54eb5c65..c350720a67766 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -136,6 +136,7 @@ void stop_and_close_uv_loop(uv_loop_t* loop) {
       break;
 
   DCHECK_EQ(0, uv_loop_alive(loop));
+  uv_loop_close(loop);
 }
 
 bool g_is_initialized = false;

From 28ca18a9122c71712931c3ab18d0a3617c75a676 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:50:15 -0700
Subject: [PATCH 678/811] feat: add WebContents.ipc (#35231)

feat: add WebContents.ipc (#34959)

Co-authored-by: Jeremy Rose <jeremya@chromium.org>
---
 docs/api/web-contents.md                      |  33 +++
 docs/api/web-frame-main.md                    |  25 +++
 lib/browser/api/ipc-main.ts                   |   3 -
 lib/browser/api/web-contents.ts               |  26 ++-
 lib/browser/api/web-frame-main.ts             |   9 +
 lib/browser/ipc-main-impl.ts                  |   7 +
 lib/browser/ipc-main-internal.ts              |   3 -
 .../api/electron_api_web_frame_main.cc        |  27 +++
 .../browser/api/electron_api_web_frame_main.h |   3 +
 spec-main/api-ipc-spec.ts                     | 202 +++++++++++++++++-
 spec-main/fixtures/preload-expose-ipc.js      |  14 ++
 typings/internal-ambient.d.ts                 |   1 +
 12 files changed, 341 insertions(+), 12 deletions(-)
 create mode 100644 spec-main/fixtures/preload-expose-ipc.js

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index d3f5b82a773fd..71f223081bdd6 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -862,6 +862,8 @@ Returns:
 
 Emitted when the renderer process sends an asynchronous message via `ipcRenderer.send()`.
 
+See also [`webContents.ipc`](#contentsipc-readonly), which provides an [`IpcMain`](ipc-main.md)-like interface for responding to IPC messages specifically from this WebContents.
+
 #### Event: 'ipc-message-sync'
 
 Returns:
@@ -872,6 +874,8 @@ Returns:
 
 Emitted when the renderer process sends a synchronous message via `ipcRenderer.sendSync()`.
 
+See also [`webContents.ipc`](#contentsipc-readonly), which provides an [`IpcMain`](ipc-main.md)-like interface for responding to IPC messages specifically from this WebContents.
+
 #### Event: 'preferred-size-changed'
 
 Returns:
@@ -1985,6 +1989,35 @@ This corresponds to the [animationPolicy][] accessibility feature in Chromium.
 
 ### Instance Properties
 
+#### `contents.ipc` _Readonly_
+
+An [`IpcMain`](ipc-main.md) scoped to just IPC messages sent from this
+WebContents.
+
+IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
+`ipcRenderer.postMessage` will be delivered in the following order:
+
+1. `contents.on('ipc-message')`
+2. `contents.mainFrame.on(channel)`
+3. `contents.ipc.on(channel)`
+4. `ipcMain.on(channel)`
+
+Handlers registered with `invoke` will be checked in the following order. The
+first one that is defined will be called, the rest will be ignored.
+
+1. `contents.mainFrame.handle(channel)`
+2. `contents.handle(channel)`
+3. `ipcMain.handle(channel)`
+
+A handler or event listener registered on the WebContents will receive IPC
+messages sent from any frame, including child frames. In most cases, only the
+main frame can send IPC messages. However, if the `nodeIntegrationInSubFrames`
+option is enabled, it is possible for child frames to send IPC messages also.
+In that case, handlers should check the `senderFrame` property of the IPC event
+to ensure that the message is coming from the expected frame. Alternatively,
+register handlers on the appropriate frame directly using the
+[`WebFrameMain.ipc`](web-frame-main.md#frameipc-readonly) interface.
+
 #### `contents.audioMuted`
 
 A `boolean` property that determines whether this page is muted.
diff --git a/docs/api/web-frame-main.md b/docs/api/web-frame-main.md
index e97041668e15b..8ce004b6e9172 100644
--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -140,6 +140,31 @@ ipcRenderer.on('port', (e, msg) => {
 
 ### Instance Properties
 
+#### `frame.ipc` _Readonly_
+
+An [`IpcMain`](ipc-main.md) instance scoped to the frame.
+
+IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
+`ipcRenderer.postMessage` will be delivered in the following order:
+
+1. `contents.on('ipc-message')`
+2. `contents.mainFrame.on(channel)`
+3. `contents.ipc.on(channel)`
+4. `ipcMain.on(channel)`
+
+Handlers registered with `invoke` will be checked in the following order. The
+first one that is defined will be called, the rest will be ignored.
+
+1. `contents.mainFrame.handle(channel)`
+2. `contents.handle(channel)`
+3. `ipcMain.handle(channel)`
+
+In most cases, only the main frame of a WebContents can send or receive IPC
+messages. However, if the `nodeIntegrationInSubFrames` option is enabled, it is
+possible for child frames to send and receive IPC messages also. The
+[`WebContents.ipc`](web-contents.md#contentsipc-readonly) interface may be more
+convenient when `nodeIntegrationInSubFrames` is not enabled.
+
 #### `frame.url` _Readonly_
 
 A `string` representing the current URL of the frame.
diff --git a/lib/browser/api/ipc-main.ts b/lib/browser/api/ipc-main.ts
index 20c7fb9dc5cf6..40aa4efd90aeb 100644
--- a/lib/browser/api/ipc-main.ts
+++ b/lib/browser/api/ipc-main.ts
@@ -2,7 +2,4 @@ import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 const ipcMain = new IpcMainImpl();
 
-// Do not throw exception when channel name is "error".
-ipcMain.on('error', () => {});
-
 export default ipcMain;
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 6433bed4df568..61378c00dee37 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -9,12 +9,15 @@ import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 // session is not used here, the purpose is to make sure session is initialized
 // before the webContents module.
 // eslint-disable-next-line
 session
 
+const webFrameMainBinding = process._linkedBinding('electron_browser_web_frame_main');
+
 let nextId = 0;
 const getNextId = function () {
   return ++nextId;
@@ -556,6 +559,12 @@ WebContents.prototype._init = function () {
 
   this._windowOpenHandler = null;
 
+  const ipc = new IpcMainImpl();
+  Object.defineProperty(this, 'ipc', {
+    get () { return ipc; },
+    enumerable: true
+  });
+
   // Dispatch IPC messages to the ipc module.
   this.on('-ipc-message' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, args: any[]) {
     addSenderFrameToEvent(event);
@@ -564,6 +573,9 @@ WebContents.prototype._init = function () {
     } else {
       addReplyToEvent(event);
       this.emit('ipc-message', event, channel, ...args);
+      const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+      maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, ...args);
+      ipc.emit(channel, event, ...args);
       ipcMain.emit(channel, event, ...args);
     }
   });
@@ -575,8 +587,10 @@ WebContents.prototype._init = function () {
       console.error(`Error occurred in handler for '${channel}':`, error);
       event.sendReply({ error: error.toString() });
     };
-    const target = internal ? ipcMainInternal : ipcMain;
-    if ((target as any)._invokeHandlers.has(channel)) {
+    const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+    const targets: (ElectronInternal.IpcMainInternal| undefined)[] = internal ? [ipcMainInternal] : [maybeWebFrame && maybeWebFrame.ipc, ipc, ipcMain];
+    const target = targets.find(target => target && (target as any)._invokeHandlers.has(channel));
+    if (target) {
       (target as any)._invokeHandlers.get(channel)(event, ...args);
     } else {
       event._throw(`No handler registered for '${channel}'`);
@@ -590,10 +604,13 @@ WebContents.prototype._init = function () {
       ipcMainInternal.emit(channel, event, ...args);
     } else {
       addReplyToEvent(event);
-      if (this.listenerCount('ipc-message-sync') === 0 && ipcMain.listenerCount(channel) === 0) {
+      const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+      if (this.listenerCount('ipc-message-sync') === 0 && ipc.listenerCount(channel) === 0 && ipcMain.listenerCount(channel) === 0 && (!maybeWebFrame || maybeWebFrame.ipc.listenerCount(channel) === 0)) {
         console.warn(`WebContents #${this.id} called ipcRenderer.sendSync() with '${channel}' channel without listeners.`);
       }
       this.emit('ipc-message-sync', event, channel, ...args);
+      maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, ...args);
+      ipc.emit(channel, event, ...args);
       ipcMain.emit(channel, event, ...args);
     }
   });
@@ -601,6 +618,9 @@ WebContents.prototype._init = function () {
   this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
     addSenderFrameToEvent(event);
     event.ports = ports.map(p => new MessagePortMain(p));
+    ipc.emit(channel, event, message);
+    const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+    maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, message);
     ipcMain.emit(channel, event, message);
   });
 
diff --git a/lib/browser/api/web-frame-main.ts b/lib/browser/api/web-frame-main.ts
index 2f75ee615a697..95e4a2fa4d636 100644
--- a/lib/browser/api/web-frame-main.ts
+++ b/lib/browser/api/web-frame-main.ts
@@ -1,7 +1,16 @@
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 const { WebFrameMain, fromId } = process._linkedBinding('electron_browser_web_frame_main');
 
+Object.defineProperty(WebFrameMain.prototype, 'ipc', {
+  get () {
+    const ipc = new IpcMainImpl();
+    Object.defineProperty(this, 'ipc', { value: ipc });
+    return ipc;
+  }
+});
+
 WebFrameMain.prototype.send = function (channel, ...args) {
   if (typeof channel !== 'string') {
     throw new Error('Missing required channel argument');
diff --git a/lib/browser/ipc-main-impl.ts b/lib/browser/ipc-main-impl.ts
index 9118f03e19498..0349cc00c0b4e 100644
--- a/lib/browser/ipc-main-impl.ts
+++ b/lib/browser/ipc-main-impl.ts
@@ -4,6 +4,13 @@ import { IpcMainInvokeEvent } from 'electron/main';
 export class IpcMainImpl extends EventEmitter {
   private _invokeHandlers: Map<string, (e: IpcMainInvokeEvent, ...args: any[]) => void> = new Map();
 
+  constructor () {
+    super();
+
+    // Do not throw exception when channel name is "error".
+    this.on('error', () => {});
+  }
+
   handle: Electron.IpcMain['handle'] = (method, fn) => {
     if (this._invokeHandlers.has(method)) {
       throw new Error(`Attempted to register a second handler for '${method}'`);
diff --git a/lib/browser/ipc-main-internal.ts b/lib/browser/ipc-main-internal.ts
index f6c24537d324c..0925f1ef87485 100644
--- a/lib/browser/ipc-main-internal.ts
+++ b/lib/browser/ipc-main-internal.ts
@@ -1,6 +1,3 @@
 import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 export const ipcMainInternal = new IpcMainImpl() as ElectronInternal.IpcMainInternal;
-
-// Do not throw exception when channel name is "error".
-ipcMainInternal.on('error', () => {});
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index 1c98ed6376461..f4bbe118ba248 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -362,6 +362,18 @@ gin::Handle<WebFrameMain> WebFrameMain::From(v8::Isolate* isolate,
   return handle;
 }
 
+// static
+gin::Handle<WebFrameMain> WebFrameMain::FromOrNull(
+    v8::Isolate* isolate,
+    content::RenderFrameHost* rfh) {
+  if (rfh == nullptr)
+    return gin::Handle<WebFrameMain>();
+  auto* web_frame = FromRenderFrameHost(rfh);
+  if (web_frame)
+    return gin::CreateHandle(isolate, web_frame);
+  return gin::Handle<WebFrameMain>();
+}
+
 // static
 v8::Local<v8::ObjectTemplate> WebFrameMain::FillObjectTemplate(
     v8::Isolate* isolate,
@@ -409,6 +421,20 @@ v8::Local<v8::Value> FromID(gin_helper::ErrorThrower thrower,
   return WebFrameMain::From(thrower.isolate(), rfh).ToV8();
 }
 
+v8::Local<v8::Value> FromIDOrNull(gin_helper::ErrorThrower thrower,
+                                  int render_process_id,
+                                  int render_frame_id) {
+  if (!electron::Browser::Get()->is_ready()) {
+    thrower.ThrowError("WebFrameMain is available only after app ready");
+    return v8::Null(thrower.isolate());
+  }
+
+  auto* rfh =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+
+  return WebFrameMain::FromOrNull(thrower.isolate(), rfh).ToV8();
+}
+
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
@@ -417,6 +443,7 @@ void Initialize(v8::Local<v8::Object> exports,
   gin_helper::Dictionary dict(isolate, exports);
   dict.Set("WebFrameMain", WebFrameMain::GetConstructor(context));
   dict.SetMethod("fromId", &FromID);
+  dict.SetMethod("fromIdOrNull", &FromIDOrNull);
 }
 
 }  // namespace
diff --git a/shell/browser/api/electron_api_web_frame_main.h b/shell/browser/api/electron_api_web_frame_main.h
index eb6138351f330..e8f1715ab83a2 100644
--- a/shell/browser/api/electron_api_web_frame_main.h
+++ b/shell/browser/api/electron_api_web_frame_main.h
@@ -44,6 +44,9 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
   static gin::Handle<WebFrameMain> From(
       v8::Isolate* isolate,
       content::RenderFrameHost* render_frame_host);
+  static gin::Handle<WebFrameMain> FromOrNull(
+      v8::Isolate* isolate,
+      content::RenderFrameHost* render_frame_host);
   static WebFrameMain* FromFrameTreeNodeId(int frame_tree_node_id);
   static WebFrameMain* FromRenderFrameHost(
       content::RenderFrameHost* render_frame_host);
diff --git a/spec-main/api-ipc-spec.ts b/spec-main/api-ipc-spec.ts
index 0595531be86ff..c63c9ba94eb85 100644
--- a/spec-main/api-ipc-spec.ts
+++ b/spec-main/api-ipc-spec.ts
@@ -3,8 +3,13 @@ import { expect } from 'chai';
 import { BrowserWindow, ipcMain, IpcMainInvokeEvent, MessageChannelMain, WebContents } from 'electron/main';
 import { closeAllWindows } from './window-helpers';
 import { emittedOnce } from './events-helpers';
+import { defer } from './spec-helpers';
+import * as path from 'path';
+import * as http from 'http';
+import { AddressInfo } from 'net';
 
 const v8Util = process._linkedBinding('electron_common_v8_util');
+const fixturesPath = path.resolve(__dirname, 'fixtures');
 
 describe('ipc module', () => {
   describe('invoke', () => {
@@ -90,7 +95,7 @@ describe('ipc module', () => {
     });
 
     it('throws an error when invoking a handler that was removed', async () => {
-      ipcMain.handle('test', () => {});
+      ipcMain.handle('test', () => { });
       ipcMain.removeHandler('test');
       const done = new Promise<void>(resolve => ipcMain.once('result', (e, arg) => {
         expect(arg.error).to.match(/No handler registered/);
@@ -101,9 +106,9 @@ describe('ipc module', () => {
     });
 
     it('forbids multiple handlers', async () => {
-      ipcMain.handle('test', () => {});
+      ipcMain.handle('test', () => { });
       try {
-        expect(() => { ipcMain.handle('test', () => {}); }).to.throw(/second handler/);
+        expect(() => { ipcMain.handle('test', () => { }); }).to.throw(/second handler/);
       } finally {
         ipcMain.removeHandler('test');
       }
@@ -563,4 +568,195 @@ describe('ipc module', () => {
     generateTests('WebContents.postMessage', contents => contents.postMessage.bind(contents));
     generateTests('WebFrameMain.postMessage', contents => contents.mainFrame.postMessage.bind(contents.mainFrame));
   });
+
+  describe('WebContents.ipc', () => {
+    afterEach(closeAllWindows);
+
+    it('receives ipc messages sent from the WebContents', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.send(\'test\', 42)');
+      const [, num] = await emittedOnce(w.webContents.ipc, 'test');
+      expect(num).to.equal(42);
+    });
+
+    it('receives sync-ipc messages sent from the WebContents', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.ipc.on('test', (event, arg) => {
+        event.returnValue = arg * 2;
+      });
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.sendSync(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('receives postMessage messages sent from the WebContents, w/ MessagePorts', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.postMessage(\'test\', null, [(new MessageChannel).port1])');
+      const [event] = await emittedOnce(w.webContents.ipc, 'test');
+      expect(event.ports.length).to.equal(1);
+    });
+
+    it('handles invoke messages sent from the WebContents', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.ipc.handle('test', (_event, arg) => arg * 2);
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('cascades to ipcMain', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      let gotFromIpcMain = false;
+      const ipcMainReceived = new Promise<void>(resolve => ipcMain.on('test', () => { gotFromIpcMain = true; resolve(); }));
+      const ipcReceived = new Promise<boolean>(resolve => w.webContents.ipc.on('test', () => { resolve(gotFromIpcMain); }));
+      defer(() => ipcMain.removeAllListeners('test'));
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.send(\'test\', 42)');
+
+      // assert that they are delivered in the correct order
+      expect(await ipcReceived).to.be.false();
+      await ipcMainReceived;
+    });
+
+    it('overrides ipcMain handlers', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.ipc.handle('test', (_event, arg) => arg * 2);
+      ipcMain.handle('test', () => { throw new Error('should not be called'); });
+      defer(() => ipcMain.removeHandler('test'));
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('falls back to ipcMain handlers', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      ipcMain.handle('test', (_event, arg) => { return arg * 2; });
+      defer(() => ipcMain.removeHandler('test'));
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('receives ipcs from child frames', async () => {
+      const server = http.createServer((req, res) => {
+        res.setHeader('content-type', 'text/html');
+        res.end('');
+      });
+      await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
+      const port = (server.address() as AddressInfo).port;
+      defer(() => {
+        server.close();
+      });
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegrationInSubFrames: true, preload: path.resolve(fixturesPath, 'preload-expose-ipc.js') } });
+      // Preloads don't run in about:blank windows, and file:// urls can't be loaded in iframes, so use a blank http page.
+      await w.loadURL(`data:text/html,<iframe src="http://localhost:${port}"></iframe>`);
+      w.webContents.mainFrame.frames[0].executeJavaScript('ipc.send(\'test\', 42)');
+      const [, arg] = await emittedOnce(w.webContents.ipc, 'test');
+      expect(arg).to.equal(42);
+    });
+  });
+
+  describe('WebFrameMain.ipc', () => {
+    afterEach(closeAllWindows);
+    it('responds to ipc messages in the main frame', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.send(\'test\', 42)');
+      const [, arg] = await emittedOnce(w.webContents.mainFrame.ipc, 'test');
+      expect(arg).to.equal(42);
+    });
+
+    it('responds to sync ipc messages in the main frame', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.mainFrame.ipc.on('test', (event, arg) => {
+        event.returnValue = arg * 2;
+      });
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.sendSync(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('receives postMessage messages sent from the WebContents, w/ MessagePorts', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.postMessage(\'test\', null, [(new MessageChannel).port1])');
+      const [event] = await emittedOnce(w.webContents.mainFrame.ipc, 'test');
+      expect(event.ports.length).to.equal(1);
+    });
+
+    it('handles invoke messages sent from the WebContents', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.mainFrame.ipc.handle('test', (_event, arg) => arg * 2);
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('cascades to WebContents and ipcMain', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      let gotFromIpcMain = false;
+      let gotFromWebContents = false;
+      const ipcMainReceived = new Promise<void>(resolve => ipcMain.on('test', () => { gotFromIpcMain = true; resolve(); }));
+      const ipcWebContentsReceived = new Promise<boolean>(resolve => w.webContents.ipc.on('test', () => { gotFromWebContents = true; resolve(gotFromIpcMain); }));
+      const ipcReceived = new Promise<boolean>(resolve => w.webContents.mainFrame.ipc.on('test', () => { resolve(gotFromWebContents); }));
+      defer(() => ipcMain.removeAllListeners('test'));
+      w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.send(\'test\', 42)');
+
+      // assert that they are delivered in the correct order
+      expect(await ipcReceived).to.be.false();
+      expect(await ipcWebContentsReceived).to.be.false();
+      await ipcMainReceived;
+    });
+
+    it('overrides ipcMain handlers', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.mainFrame.ipc.handle('test', (_event, arg) => arg * 2);
+      ipcMain.handle('test', () => { throw new Error('should not be called'); });
+      defer(() => ipcMain.removeHandler('test'));
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('overrides WebContents handlers', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.ipc.handle('test', () => { throw new Error('should not be called'); });
+      w.webContents.mainFrame.ipc.handle('test', (_event, arg) => arg * 2);
+      ipcMain.handle('test', () => { throw new Error('should not be called'); });
+      defer(() => ipcMain.removeHandler('test'));
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('falls back to WebContents handlers', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, contextIsolation: false } });
+      w.loadURL('about:blank');
+      w.webContents.ipc.handle('test', (_event, arg) => { return arg * 2; });
+      const result = await w.webContents.executeJavaScript('require(\'electron\').ipcRenderer.invoke(\'test\', 42)');
+      expect(result).to.equal(42 * 2);
+    });
+
+    it('receives ipcs from child frames', async () => {
+      const server = http.createServer((req, res) => {
+        res.setHeader('content-type', 'text/html');
+        res.end('');
+      });
+      await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
+      const port = (server.address() as AddressInfo).port;
+      defer(() => {
+        server.close();
+      });
+      const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegrationInSubFrames: true, preload: path.resolve(fixturesPath, 'preload-expose-ipc.js') } });
+      // Preloads don't run in about:blank windows, and file:// urls can't be loaded in iframes, so use a blank http page.
+      await w.loadURL(`data:text/html,<iframe src="http://localhost:${port}"></iframe>`);
+      w.webContents.mainFrame.frames[0].executeJavaScript('ipc.send(\'test\', 42)');
+      w.webContents.mainFrame.ipc.on('test', () => { throw new Error('should not be called'); });
+      const [, arg] = await emittedOnce(w.webContents.mainFrame.frames[0].ipc, 'test');
+      expect(arg).to.equal(42);
+    });
+  });
 });
diff --git a/spec-main/fixtures/preload-expose-ipc.js b/spec-main/fixtures/preload-expose-ipc.js
new file mode 100644
index 0000000000000..131399e0b0185
--- /dev/null
+++ b/spec-main/fixtures/preload-expose-ipc.js
@@ -0,0 +1,14 @@
+const { contextBridge, ipcRenderer } = require('electron');
+
+// NOTE: Never do this in an actual app! Very insecure!
+contextBridge.exposeInMainWorld('ipc', {
+  send (...args) {
+    return ipcRenderer.send(...args);
+  },
+  sendSync (...args) {
+    return ipcRenderer.sendSync(...args);
+  },
+  invoke (...args) {
+    return ipcRenderer.invoke(...args);
+  }
+});
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 950d848f50cb2..7fcd2ecb2acc2 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -237,6 +237,7 @@ declare namespace NodeJS {
     _linkedBinding(name: 'electron_browser_web_frame_main'): {
       WebFrameMain: typeof Electron.WebFrameMain;
       fromId(processId: number, routingId: number): Electron.WebFrameMain;
+      fromIdOrNull(processId: number, routingId: number): Electron.WebFrameMain;
     }
     _linkedBinding(name: 'electron_renderer_crash_reporter'): Electron.CrashReporter;
     _linkedBinding(name: 'electron_renderer_ipc'): { ipc: IpcRendererBinding };

From b31a4b43946cf5b5ec72a44258406a0750a78819 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 17 Aug 2022 15:20:20 -0700
Subject: [PATCH 679/811] fix: Frameless window shows frame while opening
 (#35353)

* fix: Frameless window shows frame while opening

* Clarify comments

* Inline setter

* Edit comment

Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
---
 patches/chromium/.patches                     |  1 +
 .../feat_add_set_can_resize_mutator.patch     | 27 +++++++++++++++++++
 shell/browser/native_window_views.cc          | 17 ++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 patches/chromium/feat_add_set_can_resize_mutator.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index ea04e58a07500..c9e516ffc0929 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -116,3 +116,4 @@ chore_add_electron_deps_to_gitignores.patch
 chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
 add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
 add_electron_deps_to_license_credits_file.patch
+feat_add_set_can_resize_mutator.patch
diff --git a/patches/chromium/feat_add_set_can_resize_mutator.patch b/patches/chromium/feat_add_set_can_resize_mutator.patch
new file mode 100644
index 0000000000000..5b2adba9ecd49
--- /dev/null
+++ b/patches/chromium/feat_add_set_can_resize_mutator.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
+Date: Tue, 2 Aug 2022 09:30:36 -0700
+Subject: feat: Add set_can_resize mutator
+
+Adds a set_can_resize mutator to WidgetDelegate that
+doesn't emit the OnSizeConstraintsChanged event.
+This way, we can call set_can_resize from Electron before
+the widget is initialized to set the value earlier,
+and in turn, avoid showing a frame at startup
+for frameless applications.
+
+diff --git a/ui/views/widget/widget_delegate.h b/ui/views/widget/widget_delegate.h
+index 431d19f2543a9011de76b941982603ff98afa041..32e07e0c9686e6942a40c4d4775a03068cfd33b5 100644
+--- a/ui/views/widget/widget_delegate.h
++++ b/ui/views/widget/widget_delegate.h
+@@ -323,6 +323,10 @@ class VIEWS_EXPORT WidgetDelegate {
+   // be cycled through with keyboard focus.
+   virtual void GetAccessiblePanes(std::vector<View*>* panes) {}
+ 
++  // A setter for the can_resize parameter that doesn't
++  // emit any events.
++  void set_can_resize(bool can_resize) { params_.can_resize = can_resize; }
++
+   // Setters for data parameters of the WidgetDelegate. If you use these
+   // setters, there is no need to override the corresponding virtual getters.
+   void SetAccessibleRole(ax::mojom::Role role);
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
index bf60cc85f0736..2fea92b1ed57a 100644
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -281,7 +281,24 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
       new ElectronDesktopWindowTreeHostLinux(this, native_widget);
 #endif
 
+  // Ref https://github.com/electron/electron/issues/30760
+  // Set the can_resize param before initializing the widget.
+  // When resizable_ is true, this causes the WS_THICKFRAME style
+  // to be passed into CreateWindowEx and SetWindowLong calls in
+  // WindowImpl::Init and HwndMessageHandler::SizeConstraintsChanged
+  // respectively. As a result, the Windows 7 frame doesn't show,
+  // but it isn't clear why this is the case.
+  // When resizable_ is false, WS_THICKFRAME is not passed into the
+  // SetWindowLong call, so the Windows 7 frame still shows.
+  // One workaround would be to call set_can_resize(true) here,
+  // and then move the SetCanResize(resizable_) call after the
+  // SetWindowLong call around line 365, but that's a much larger change.
+  set_can_resize(true);
   widget()->Init(std::move(params));
+
+  // When the workaround above is not needed anymore, only this
+  // call should be necessary.
+  // With the workaround in place, this call doesn't do anything.
   SetCanResize(resizable_);
 
   bool fullscreen = false;

From 5e6d15223131aa046dc6e156f31c79f29f52fe01 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:09:18 -0700
Subject: [PATCH 680/811] fix: don't bypass redirect checks (#35366)

Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
---
 shell/browser/electron_browser_client.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index ca46535c69055..8e1b6833470ff 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1487,9 +1487,6 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
       std::move(proxied_receiver), std::move(target_factory_remote),
       std::move(header_client_receiver), type);
 
-  if (bypass_redirect_checks)
-    *bypass_redirect_checks = true;
-
   return true;
 }
 

From 9673d29ebe99303e83d88adbda82dec68ba1b1ad Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 12:05:12 -0700
Subject: [PATCH 681/811] Bump v21.0.0-alpha.4

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d3ca33fc7b5c7..7d93bf328fd9c 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.3
\ No newline at end of file
+21.0.0-alpha.4
\ No newline at end of file
diff --git a/package.json b/package.json
index fe3c0b93be207..46c8cb2a04f61 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.3",
+  "version": "21.0.0-alpha.4",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2af8b533d1f3e..738c74779428e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,3
- PRODUCTVERSION 21,0,0,3
+ FILEVERSION 21,0,0,4
+ PRODUCTVERSION 21,0,0,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From b075434447a3eb339411101456d82022db093a10 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 18:00:45 -0700
Subject: [PATCH 682/811] fix: IPC emit order in -ipc-ports handler (#35364)

Co-authored-by: Milan Burda <miburda@microsoft.com>
---
 lib/browser/api/web-contents.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 61378c00dee37..5887f8ea2f03d 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -618,9 +618,9 @@ WebContents.prototype._init = function () {
   this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
     addSenderFrameToEvent(event);
     event.ports = ports.map(p => new MessagePortMain(p));
-    ipc.emit(channel, event, message);
     const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
     maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, message);
+    ipc.emit(channel, event, message);
     ipcMain.emit(channel, event, message);
   });
 

From 76e8536ca8918032fd3139a17ca904d8e28430bd Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 16:25:16 -0700
Subject: [PATCH 683/811] Bump v21.0.0-alpha.5

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7d93bf328fd9c..e17bf8f6e1427 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.4
\ No newline at end of file
+21.0.0-alpha.5
\ No newline at end of file
diff --git a/package.json b/package.json
index 46c8cb2a04f61..f3cb2326d05b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.4",
+  "version": "21.0.0-alpha.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 738c74779428e..b2beab41c0377 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,4
- PRODUCTVERSION 21,0,0,4
+ FILEVERSION 21,0,0,5
+ PRODUCTVERSION 21,0,0,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From cb6fa8268f11174208a48a6f421923a1e5a2a2f2 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 11:19:32 +0200
Subject: [PATCH 684/811] fix: ensure chrome colors are initialized (#35401)

* fix: ensure chrome colors are initialized

* build: fix linking on windows

* build: fix linking on windows

* build: add needed files to chromium_src/BUILD

Co-authored-by: Samuel Attard <sattard@salesforce.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
---
 chromium_src/BUILD.gn                        | 15 +++++++++++++++
 shell/browser/electron_browser_main_parts.cc |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index bfd971e576a85..2ec068f21e809 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -55,6 +55,14 @@ static_library("chrome") {
     "//chrome/browser/process_singleton.h",
     "//chrome/browser/process_singleton_internal.cc",
     "//chrome/browser/process_singleton_internal.h",
+    "//chrome/browser/themes/browser_theme_pack.cc",
+    "//chrome/browser/themes/browser_theme_pack.h",
+    "//chrome/browser/themes/custom_theme_supplier.cc",
+    "//chrome/browser/themes/custom_theme_supplier.h",
+    "//chrome/browser/themes/theme_properties.cc",
+    "//chrome/browser/themes/theme_properties.h",
+    "//chrome/browser/ui/color/chrome_color_mixers.cc",
+    "//chrome/browser/ui/color/chrome_color_mixers.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -69,7 +77,11 @@ static_library("chrome") {
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
+    "//chrome/browser/ui/frame/window_frame_util.cc",
+    "//chrome/browser/ui/frame/window_frame_util.h",
     "//chrome/browser/ui/native_window_tracker.h",
+    "//chrome/browser/ui/ui_features.cc",
+    "//chrome/browser/ui/ui_features.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -110,6 +122,8 @@ static_library("chrome") {
       "//chrome/browser/ui/view_ids.h",
       "//chrome/browser/win/chrome_process_finder.cc",
       "//chrome/browser/win/chrome_process_finder.h",
+      "//chrome/browser/win/titlebar_config.cc",
+      "//chrome/browser/win/titlebar_config.h",
       "//chrome/browser/win/titlebar_config.h",
       "//chrome/child/v8_crashpad_support_win.cc",
       "//chrome/child/v8_crashpad_support_win.h",
@@ -131,6 +145,7 @@ static_library("chrome") {
 
   public_deps = [
     "//chrome/browser:dev_ui_browser_resources",
+    "//chrome/browser/ui/color:mixers",
     "//chrome/common",
     "//chrome/common:version_header",
     "//components/keyed_service/content",
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index b422d930769f8..59d09e8730652 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -17,6 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/browser/ui/color/chrome_color_mixers.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/os_crypt/key_storage_config_linux.h"
@@ -224,6 +225,9 @@ int ElectronBrowserMainParts::PreEarlyInitialization() {
   screen_ = std::make_unique<display::ScopedNativeScreen>();
 #endif
 
+  ui::ColorProviderManager::Get().AppendColorProviderInitializer(
+      base::BindRepeating(AddChromeColorMixers));
+
   return GetExitCode();
 }
 

From 637824e0860ea56fe6411bf66b6936ffa86c7911 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 11:39:59 +0200
Subject: [PATCH 685/811] fix: promise support with
 webFrameMain.executeJavaScript (#35359)

* fix: promise support with webFrameMain.executeJavaScript

* chore: reject when result is an error

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 .../api/electron_api_web_frame_main.cc        | 32 ++++++++++------
 spec-main/api-web-frame-main-spec.ts          | 38 +++++++++++++++++++
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index f4bbe118ba248..178d3e30bda98 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -11,8 +11,9 @@
 
 #include "base/logging.h"
 #include "base/no_destructor.h"
-#include "content/browser/renderer_host/frame_tree_node.h"  // nogncheck
+#include "content/browser/renderer_host/render_frame_host_impl.h"  // nogncheck
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/common/isolated_world_ids.h"
 #include "electron/shell/common/api/api.mojom.h"
 #include "gin/object_template_builder.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -141,17 +142,24 @@ v8::Local<v8::Promise> WebFrameMain::ExecuteJavaScript(
     return handle;
   }
 
-  if (user_gesture) {
-    auto* ftn = content::FrameTreeNode::From(render_frame_);
-    ftn->UpdateUserActivationState(
-        blink::mojom::UserActivationUpdateType::kNotifyActivation,
-        blink::mojom::UserActivationNotificationType::kTest);
-  }
-
-  render_frame_->ExecuteJavaScriptForTests(
-      code, base::BindOnce([](gin_helper::Promise<base::Value> promise,
-                              base::Value value) { promise.Resolve(value); },
-                           std::move(promise)));
+  static_cast<content::RenderFrameHostImpl*>(render_frame_)
+      ->ExecuteJavaScriptForTests(
+          code, user_gesture, true /* resolve_promises */,
+          content::ISOLATED_WORLD_ID_GLOBAL,
+          base::BindOnce(
+              [](gin_helper::Promise<base::Value> promise,
+                 blink::mojom::JavaScriptExecutionResultType type,
+                 base::Value value) {
+                if (type ==
+                    blink::mojom::JavaScriptExecutionResultType::kSuccess) {
+                  promise.Resolve(value);
+                } else {
+                  v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+                  v8::HandleScope scope(isolate);
+                  promise.Reject(gin::ConvertToV8(isolate, value));
+                }
+              },
+              std::move(promise)));
 
   return handle;
 }
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index 8890e1402f52c..1bc812832fad5 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -163,6 +163,44 @@ describe('webFrameMain module', () => {
       expect(await getUrl(webFrame.frames[0])).to.equal(fileUrl('frame-with-frame.html'));
       expect(await getUrl(webFrame.frames[0].frames[0])).to.equal(fileUrl('frame.html'));
     });
+
+    it('can resolve promise', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      await w.loadFile(path.join(subframesPath, 'frame.html'));
+      const webFrame = w.webContents.mainFrame;
+      const p = () => webFrame.executeJavaScript('new Promise(resolve => setTimeout(resolve(42), 2000));');
+      const result = await p();
+      expect(result).to.equal(42);
+    });
+
+    it('can reject with error', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      await w.loadFile(path.join(subframesPath, 'frame.html'));
+      const webFrame = w.webContents.mainFrame;
+      const p = () => webFrame.executeJavaScript('new Promise((r,e) => setTimeout(e("error!"), 500));');
+      await expect(p()).to.be.eventually.rejectedWith('error!');
+      const errorTypes = new Set([
+        Error,
+        ReferenceError,
+        EvalError,
+        RangeError,
+        SyntaxError,
+        TypeError,
+        URIError
+      ]);
+      for (const error of errorTypes) {
+        await expect(webFrame.executeJavaScript(`Promise.reject(new ${error.name}("Wamp-wamp"))`))
+          .to.eventually.be.rejectedWith(/Error/);
+      }
+    });
+
+    it('can reject when script execution fails', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      await w.loadFile(path.join(subframesPath, 'frame.html'));
+      const webFrame = w.webContents.mainFrame;
+      const p = () => webFrame.executeJavaScript('console.log(test)');
+      await expect(p()).to.be.eventually.rejectedWith(/ReferenceError/);
+    });
   });
 
   describe('WebFrame.reload', () => {

From 8d6c29ecbc335382a004e5a852d12a3d880d2251 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 14:39:46 +0200
Subject: [PATCH 686/811] fix: add restore event for minimized maximization
 (#35410)

Co-authored-by: mlaurencin <mlaurencin@electronjs.org>
---
 shell/browser/native_window_views_win.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc
index dc6f089d06bf6..e4288d047c304 100644
--- a/shell/browser/native_window_views_win.cc
+++ b/shell/browser/native_window_views_win.cc
@@ -413,6 +413,8 @@ void NativeWindowViews::HandleSizeEvent(WPARAM w_param, LPARAM l_param) {
       // multiple times for one resize because of the SetWindowPlacement call.
       if (w_param == SIZE_MAXIMIZED &&
           last_window_state_ != ui::SHOW_STATE_MAXIMIZED) {
+        if (last_window_state_ == ui::SHOW_STATE_MINIMIZED)
+          NotifyWindowRestore();
         last_window_state_ = ui::SHOW_STATE_MAXIMIZED;
         NotifyWindowMaximize();
         ResetWindowControls();

From 95eb6ea7721c85b00d70c30bad5549182cfd5318 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 10:27:14 -0400
Subject: [PATCH 687/811] fix: undefined details.requestingUrl from
 session.setPermissionCheckHandler (#35409)

fix: undefined details.requestingUrl from setPermissionCheckHandler

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 shell/browser/electron_permission_manager.cc | 13 ++-
 spec-main/api-session-spec.ts                | 86 +++++++++++++++++++-
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index 74c523b54a3e6..dde2714caec07 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -339,9 +339,16 @@ blink::mojom::PermissionStatus
 ElectronPermissionManager::GetPermissionStatusForCurrentDocument(
     blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host) {
-  return GetPermissionStatus(
-      permission, render_frame_host->GetLastCommittedOrigin().GetURL(),
-      content::PermissionUtil::GetLastCommittedOriginAsURL(render_frame_host));
+  base::Value::Dict details;
+  details.Set("embeddingOrigin",
+              content::PermissionUtil::GetLastCommittedOriginAsURL(
+                  render_frame_host->GetMainFrame())
+                  .spec());
+  bool granted = CheckPermissionWithDetails(
+      permission, render_frame_host,
+      render_frame_host->GetLastCommittedOrigin().GetURL(), std::move(details));
+  return granted ? blink::mojom::PermissionStatus::GRANTED
+                 : blink::mojom::PermissionStatus::DENIED;
 }
 
 blink::mojom::PermissionStatus
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index 3631a532cab67..a1be9cf2db7a7 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -4,7 +4,7 @@ import * as https from 'https';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as ChildProcess from 'child_process';
-import { app, session, BrowserWindow, net, ipcMain, Session } from 'electron/main';
+import { app, session, BrowserWindow, net, ipcMain, Session, webFrameMain, WebFrameMain } from 'electron/main';
 import * as send from 'send';
 import * as auth from 'basic-auth';
 import { closeAllWindows } from './window-helpers';
@@ -1043,6 +1043,90 @@ describe('session module', () => {
     });
   });
 
+  describe('ses.setPermissionCheckHandler(handler)', () => {
+    afterEach(closeAllWindows);
+    it('details provides requestingURL for mainFrame', async () => {
+      const w = new BrowserWindow({
+        show: false,
+        webPreferences: {
+          partition: 'very-temp-permission-handler'
+        }
+      });
+      const ses = w.webContents.session;
+      const loadUrl = 'https://myfakesite/';
+      let handlerDetails : Electron.PermissionCheckHandlerHandlerDetails;
+
+      ses.protocol.interceptStringProtocol('https', (req, cb) => {
+        cb('<html><script>console.log(\'test\');</script></html>');
+      });
+
+      ses.setPermissionCheckHandler((wc, permission, requestingOrigin, details) => {
+        if (permission === 'clipboard-read') {
+          handlerDetails = details;
+          return true;
+        }
+        return false;
+      });
+
+      const readClipboardPermission: any = () => {
+        return w.webContents.executeJavaScript(`
+          navigator.permissions.query({name: 'clipboard-read'})
+              .then(permission => permission.state).catch(err => err.message);
+        `, true);
+      };
+
+      await w.loadURL(loadUrl);
+      const state = await readClipboardPermission();
+      expect(state).to.equal('granted');
+      expect(handlerDetails!.requestingUrl).to.equal(loadUrl);
+    });
+
+    it('details provides requestingURL for cross origin subFrame', async () => {
+      const w = new BrowserWindow({
+        show: false,
+        webPreferences: {
+          partition: 'very-temp-permission-handler'
+        }
+      });
+      const ses = w.webContents.session;
+      const loadUrl = 'https://myfakesite/';
+      let handlerDetails : Electron.PermissionCheckHandlerHandlerDetails;
+
+      ses.protocol.interceptStringProtocol('https', (req, cb) => {
+        cb('<html><script>console.log(\'test\');</script></html>');
+      });
+
+      ses.setPermissionCheckHandler((wc, permission, requestingOrigin, details) => {
+        if (permission === 'clipboard-read') {
+          handlerDetails = details;
+          return true;
+        }
+        return false;
+      });
+
+      const readClipboardPermission: any = (frame: WebFrameMain) => {
+        return frame.executeJavaScript(`
+          navigator.permissions.query({name: 'clipboard-read'})
+              .then(permission => permission.state).catch(err => err.message);
+        `, true);
+      };
+
+      await w.loadFile(path.join(fixtures, 'api', 'blank.html'));
+      w.webContents.executeJavaScript(`
+        var iframe = document.createElement('iframe');
+        iframe.src = '${loadUrl}';
+        document.body.appendChild(iframe);
+        null;
+      `);
+      const [,, frameProcessId, frameRoutingId] = await emittedOnce(w.webContents, 'did-frame-finish-load');
+      const state = await readClipboardPermission(webFrameMain.fromId(frameProcessId, frameRoutingId));
+      expect(state).to.equal('granted');
+      expect(handlerDetails!.requestingUrl).to.equal(loadUrl);
+      expect(handlerDetails!.isMainFrame).to.be.false();
+      expect(handlerDetails!.embeddingOrigin).to.equal('file:///');
+    });
+  });
+
   describe('ses.isPersistent()', () => {
     afterEach(closeAllWindows);
 

From c99a52eab46fc2c716396900c522d3166f0cc0e8 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 15:22:47 -0400
Subject: [PATCH 688/811] chore: bump chromium to 106.0.5216.0 (21-x-y)
 (#35363)

* chore: bump chromium to 106.0.5216.0 (main) (#34993)

* Trigger Build

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 .circleci/config/base.yml                     |   1 +
 DEPS                                          |   2 +-
 patches/chromium/.patches                     |   2 +-
 .../add_didinstallconditionalfeatures.patch   |  18 +-
 ...er_to_linuxui_getwindowframeprovider.patch |  16 +-
 ..._scheduler_throttling_per_renderview.patch |  24 +--
 ..._windows_to_have_different_web_prefs.patch |  46 +++--
 ..._secondary_label_via_simplemenumodel.patch |  44 ++---
 patches/chromium/blink_local_frame.patch      |  12 +-
 ...getting_string_values_for_crash_keys.patch |   2 +-
 .../build_add_electron_tracing_category.patch |   2 +-
 ...build_disable_partition_alloc_on_mac.patch |   2 +-
 ..._depend_on_packed_resource_integrity.patch |  16 +-
 .../build_libc_as_static_library.patch        |   2 +-
 ...bcxx_abi_unstable_false_for_electron.patch |   2 +-
 patches/chromium/can_create_window.patch      |  40 ++---
 ...hore_add_electron_deps_to_gitignores.patch |   4 +-
 ...dle_synthetic_mouse_events_for_touch.patch |   6 +-
 ...screationoverridden_with_full_params.patch |  32 ++--
 patches/chromium/chrome_key_systems.patch     |   4 +-
 patches/chromium/disable-redraw-lock.patch    |  10 +-
 .../disable_color_correct_rendering.patch     |  12 +-
 .../disable_compositor_recycling.patch        |   4 +-
 ...le_freezing_flags_after_init_in_node.patch |   2 +-
 patches/chromium/disable_hidden.patch         |   6 +-
 patches/chromium/disable_unload_metrics.patch |   6 +-
 ...ll_getwebframe_-_view_when_get_blink.patch |  25 ---
 .../chromium/enable_reset_aspect_ratio.patch  |   6 +-
 ...xpose_setuseragent_on_networkcontext.patch |  12 +-
 .../extend_apply_webpreferences.patch         |   4 +-
 ...dd_set_theme_source_to_allow_apps_to.patch |  14 +-
 ...screen_rendering_with_viz_compositor.patch |  18 +-
 ..._raw_response_headers_from_urlloader.patch |  18 +-
 ..._exclusive_access_for_electron_needs.patch |  34 ++--
 ...uest_webcontents_to_enter_fullscreen.patch |   4 +-
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...x_crash_when_saving_edited_pdf_files.patch |   2 +-
 ...ete_SerialPortManager_on_main_thread.patch |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   6 +-
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |  14 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |  14 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 patches/chromium/gtk_visibility.patch         |   2 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   2 +-
 ...tform_electron_can_call_x11_property.patch |   8 +-
 patches/chromium/isolate_holder.patch         |  41 ++++-
 .../load_v8_snapshot_in_browser_process.patch |   2 +-
 .../chromium/make_gtk_getlibgtk_public.patch  |   2 +-
 ...as_avoid_usage_of_private_macos_apis.patch |  12 +-
 .../mas_disable_custom_window_frame.patch     |   8 +-
 .../mas_disable_remote_accessibility.patch    |  34 ++--
 patches/chromium/mas_no_private_api.patch     |   8 +-
 ...emote_certificate_verification_logic.patch |  10 +-
 .../chromium/notification_provenance.patch    |   6 +-
 patches/chromium/picture-in-picture.patch     |   4 +-
 ...utofill_colors_to_the_color_pipeline.patch |  10 +-
 patches/chromium/printing.patch               | 116 ++++++------
 patches/chromium/process_singleton.patch      | 124 +++++++++++--
 ...r_changes_to_the_webcontentsobserver.patch |  14 +-
 .../render_widget_host_view_mac.patch         |  20 +--
 patches/chromium/resource_file_conflict.patch |   2 +-
 ...h_spell_check_delayed_initialization.patch | 112 ++++++++++++
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 .../support_mixed_sandbox_with_zygote.patch   |   6 +-
 ...andboxed_ppapi_processes_skip_zygote.patch |   4 +-
 patches/chromium/web_contents.patch           |   8 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  14 +-
 ...feat_add_hook_to_notify_script_ready.patch |  10 +-
 patches/config.json                           |   4 +-
 patches/lss/.patches                          |   1 +
 ...ix_cast_pwrite64_arg_to_long_for_arm.patch |  24 +++
 patches/node/.patches                         |   1 +
 ..._override_createjob_in_node_platform.patch |  41 +++++
 patches/v8/.patches                           |   1 -
 patches/v8/build_gn.patch                     |   6 +-
 ...ild_remove_legacy_oom_error_callback.patch | 168 ------------------
 ...able_is_execution_terminating_dcheck.patch |  13 ++
 patches/v8/dcheck.patch                       |   8 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ...ed_attribute_for_older_msvc_versions.patch |   8 +-
 ..._terminating_exception_in_microtasks.patch |  21 +--
 script/apply_all_patches.py                   |   7 +-
 script/verify-mksnapshot.py                   |   3 +
 shell/app/electron_main_delegate.cc           |   7 +-
 shell/app/electron_main_delegate.h            |   4 +-
 shell/browser/api/electron_api_menu.cc        |   2 +-
 .../browser/api/electron_api_web_contents.cc  |   2 +-
 .../bluetooth/electron_bluetooth_delegate.cc  |   3 +-
 .../bluetooth/electron_bluetooth_delegate.h   |   3 +-
 shell/browser/electron_browser_client.cc      |   3 +-
 shell/browser/electron_browser_main_parts.cc  |   7 +-
 shell/browser/hid/electron_hid_delegate.cc    |   2 +
 shell/browser/hid/electron_hid_delegate.h     |   3 +-
 .../printing/print_view_manager_electron.cc   |  90 +++++-----
 .../printing/print_view_manager_electron.h    |  24 +--
 shell/browser/special_storage_policy.cc       |   6 +-
 shell/browser/special_storage_policy.h        |   1 -
 shell/browser/ui/accelerator_util.cc          |   4 +-
 shell/browser/ui/accelerator_util.h           |   2 +-
 shell/browser/ui/electron_menu_model.cc       |  24 +--
 shell/browser/ui/electron_menu_model.h        |  22 +--
 shell/browser/ui/gtk/menu_util.cc             |   4 +-
 shell/browser/ui/views/global_menu_bar_x11.cc |  10 +-
 shell/browser/ui/views/menu_bar.cc            |  11 +-
 shell/browser/ui/views/menu_bar.h             |   4 +-
 shell/browser/ui/views/menu_model_adapter.cc  |   2 +-
 .../browser_exposed_renderer_interfaces.cc    |   5 +-
 .../electron_render_frame_observer.cc         |   1 +
 .../electron_content_utility_client.cc        |   2 +-
 114 files changed, 886 insertions(+), 779 deletions(-)
 delete mode 100644 patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
 create mode 100644 patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
 create mode 100644 patches/lss/.patches
 create mode 100644 patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
 create mode 100644 patches/node/fix_override_createjob_in_node_platform.patch
 delete mode 100644 patches/v8/build_remove_legacy_oom_error_callback.patch

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 61ee7d31ddf65..95094dec8728f 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -661,6 +661,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/buildtools/third_party/libc++
       - src/buildtools/third_party/libc++abi
       - src/out/Default/obj/buildtools/third_party
+      - src/v8/tools/builtins-pgo
 
 step-electron-dist-unzip: &step-electron-dist-unzip
   run:
diff --git a/DEPS b/DEPS
index a0ce155d6a56e..63e9d857212b9 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '105.0.5187.0',
+    '106.0.5216.0',
   'node_version':
     'v16.16.0',
   'nan_version':
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index c9e516ffc0929..485f18915fba5 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -76,7 +76,6 @@ chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
-don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
 web_contents.patch
 webview_fullscreen.patch
 disable_unload_metrics.patch
@@ -115,5 +114,6 @@ short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
 chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
 add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
 add_electron_deps_to_license_credits_file.patch
 feat_add_set_can_resize_mutator.patch
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index 9db40d62e73bf..bb65405ceecdc 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ed
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 4a69ce45890fd9ab730eef460396ab495b7a332a..3e186230715aaf840959a93038167749e3735a08 100644
+index 33497b7afbe1fa196a596a2cb384a81a973de026..b6b63c182980b09987e82911f72282c275ff0dc6 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4435,6 +4435,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4294,6 +4294,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 4a69ce45890fd9ab730eef460396ab495b7a332a..3e186230715aaf840959a93038167749
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 351a3a257a3eca98c4a2caf724714cbc788b5d72..73dbb5a289411ea32f06cb1ea50ef98153923101 100644
+index 19eae2c0b98ecf27c6d8196c7accc44bdb24a543..40b2dc79e13080d15094a3db235e2e21760ac96d 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -606,6 +606,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -585,6 +585,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index 351a3a257a3eca98c4a2caf724714cbc788b5d72..73dbb5a289411ea32f06cb1ea50ef981
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index acb427e4a6688f14f4a6ceaec8bf3988525c5e08..35623174f16399d5fff637a07554e43c55f902d1 100644
+index 544ea3f5cd705d61dd0b99f2e0f541d98ca75c53..d863681a4297cbf2844469a1baae2a81cb0d1238 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -606,6 +606,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -579,6 +579,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -79,7 +79,7 @@ index c8af53d40eaa1dd3a0067948a8cda80d1599cee3..4de918ee52efa7ec27a21aa2f57616d3
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index 27b366933ce11a029920b9f85060f8cce8deaacd..110996a9d55c1ba779e8aff598e9847dd6a38d86 100644
+index 83a62e23b1d395b0aa545de5b828c24196cccc6d..0ca8163eb9ab87aead27bc8b2ee9e614d7e1d8c7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
 @@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -92,7 +92,7 @@ index 27b366933ce11a029920b9f85060f8cce8deaacd..110996a9d55c1ba779e8aff598e9847d
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 7cbb31ddff83ea89ae879dfe190b62a8cdbeb7cf..ebc2f572b3340b7ca8719073afda8d266b18cbe5 100644
+index f40f022ff8ff88f1f128d4996f4460b8fdea1d95..480503e245dbb28dffc8ac9d2843d541793db534 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 7cbb31ddff83ea89ae879dfe190b62a8cdbeb7cf..ebc2f572b3340b7ca8719073afda8d26
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index c95ef4a4a3f9d40e0e4bedf6fc42225190626c42..36cc932782437b9f5d301416f5a4e8f48c3c837a 100644
+index c974fa2f7c7f9c2aa5f075ec4aeb887d0b104453..b4ed9b2fadcfad7676387045b8581eb8d33e89e8 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
index a7d6873b9ed49..cf013cc6850e6 100644
--- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
@@ -8,10 +8,10 @@ decorations in maximized mode where needed, preventing empty space caused
 by decoration shadows and rounded titlebars around the window while maximized.
 
 diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
-index 50c01fb42bc1a7350fae4773f1b549355c6cdc25..ab49a67e3b20cd240f532cfbf868533bb1f293d8 100644
+index 1fbb58152c19193d480b437aea123abdd61c24fe..2b7e305d643aa2e0afef4c578688897c3a8832bf 100644
 --- a/ui/gtk/gtk_ui.cc
 +++ b/ui/gtk/gtk_ui.cc
-@@ -511,13 +511,15 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
+@@ -500,13 +500,15 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
    return nullptr;
  }
  
@@ -31,10 +31,10 @@ index 50c01fb42bc1a7350fae4773f1b549355c6cdc25..ab49a67e3b20cd240f532cfbf868533b
  }
  
 diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
-index 5206acf475346f50e0f31b7432d9b93afc3a8ad0..9f2b3cca2337b4528f9451c2fdec7c67021c949f 100644
+index e73bbdf28fba1f5b96d326dd7b0fd9aaa33ba221..5a537c8f6291909392824d62fc04209ad662d59a 100644
 --- a/ui/gtk/gtk_ui.h
 +++ b/ui/gtk/gtk_ui.h
-@@ -93,7 +93,7 @@ class GtkUi : public ui::LinuxUi {
+@@ -94,7 +94,7 @@ class GtkUi : public ui::LinuxUiBase {
    bool PreferDarkTheme() const override;
    bool AnimationsEnabled() const override;
    std::unique_ptr<ui::NavButtonProvider> CreateNavButtonProvider() override;
@@ -43,7 +43,7 @@ index 5206acf475346f50e0f31b7432d9b93afc3a8ad0..9f2b3cca2337b4528f9451c2fdec7c67
    base::flat_map<std::string, std::string> GetKeyboardLayoutMap() override;
    std::string GetCursorThemeName() override;
    int GetCursorThemeSize() override;
-@@ -197,6 +197,8 @@ class GtkUi : public ui::LinuxUi {
+@@ -199,6 +199,8 @@ class GtkUi : public ui::LinuxUiBase {
    // while Chrome is running.
    std::unique_ptr<ui::WindowFrameProvider> solid_frame_provider_;
    std::unique_ptr<ui::WindowFrameProvider> transparent_frame_provider_;
@@ -139,7 +139,7 @@ index e4dbdad327eb77994ffd7f068c67336a19897915..d3ae0636455489a7c7443df85cb76995
    // In GTK4, there's no way to obtain the frame thickness from CSS values
    // directly, so we must determine it experimentally based on the drawn
 diff --git a/ui/gtk/window_frame_provider_gtk.h b/ui/gtk/window_frame_provider_gtk.h
-index da0f7c33a260f8d98a73c126def30944589001df..a2999a6dcea30a9e468f974301b3a4f03dcb8aeb 100644
+index 8370c1cb3f8c3532d94e1265242cbf2397920480..2e0105ba8782dfe0a3ac169850734032c8ab071c 100644
 --- a/ui/gtk/window_frame_provider_gtk.h
 +++ b/ui/gtk/window_frame_provider_gtk.h
 @@ -14,7 +14,7 @@ namespace gtk {
@@ -162,10 +162,10 @@ index da0f7c33a260f8d98a73c126def30944589001df..a2999a6dcea30a9e468f974301b3a4f0
  
  }  // namespace gtk
 diff --git a/ui/linux/linux_ui.h b/ui/linux/linux_ui.h
-index 0cd8a0e101de186e11ead65526c7f0abc60c6577..7db580ce04a407877ca4108ec087120cdb9ce2ad 100644
+index dee97740309e29c29d9c9c6c757455cddc817dbb..e5b71cd2b5e9e6252fe13c54bb54e26365347e2a 100644
 --- a/ui/linux/linux_ui.h
 +++ b/ui/linux/linux_ui.h
-@@ -176,7 +176,7 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi
+@@ -175,7 +175,7 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUi {
    // if transparency is unsupported and the frame should be rendered opaque.
    // The returned object is not owned by the caller and will remain alive until
    // the process ends.
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index 79081580812fe..b49de0ad61135 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 261e1dda1e128e22d15f3454f9012265db45bd74..98b130f0791d1ca2d59ef62151df7e60f3f40831 100644
+index 00f570d90db1279a486c3c0a34146e59b902c10f..373309f79a97ca58d2d291b6a162891935d5c4b7 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -666,6 +666,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -658,6 +658,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -48,10 +48,10 @@ index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
 diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index 2f073474d8be6d8051606b0f07272969d3936f28..7f9ec06a10b4cba254737fabdc38dddf86137ad7 100644
+index f55211fdb346c8659c93d077ec04ccebdae5b450..19b846f6ccf99423b712f0b589c20c1ab35bdfcf 100644
 --- a/content/renderer/render_view_impl.h
 +++ b/content/renderer/render_view_impl.h
-@@ -147,6 +147,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient {
+@@ -138,6 +138,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient {
                    bool was_created_by_renderer,
                    scoped_refptr<base::SingleThreadTaskRunner> task_runner);
  
@@ -73,10 +73,10 @@ index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index b01562ebe042bd23e7b5184aa28bb42f98f81ecb..5392b5ac0f95eab7fef3c59fd2e9b2dc2cfb7342 100644
+index 3af33a4d699b5bbfb0a1abac9408ad322a47a5ac..30bc8aa73fb46a0306ccc837a99cc4d58daef99d 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
-@@ -361,6 +361,7 @@ class WebView {
+@@ -366,6 +366,7 @@ class WebView {
    // Scheduling -----------------------------------------------------------
  
    virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index b01562ebe042bd23e7b5184aa28bb42f98f81ecb..5392b5ac0f95eab7fef3c59fd2e9b2dc
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 390e47422a0a106d0e5746c0af0611d420af8025..9151815e6bf33a3a6980f8337f578dc90e458696 100644
+index 8f15822dc33a2f8a19971afd7da0ab305f0b48b7..38faafcc7432c2bedead647d4946b7183233b4bc 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3742,6 +3742,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3758,6 +3758,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 390e47422a0a106d0e5746c0af0611d420af8025..9151815e6bf33a3a6980f8337f578dc9
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3753,7 +3760,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3769,7 +3776,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 390e47422a0a106d0e5746c0af0611d420af8025..9151815e6bf33a3a6980f8337f578dc9
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index ce3a483a4c06dc56a8a71d32d4d4a7077d524c2e..1cab34e52858808bceb52556c7ad0bbaa7584225 100644
+index 1b0e7811c023f795f9f8f8cdf8bf621e54b79855..915348eaa98191c60bddaaa3d146bdc99099e16b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -417,6 +417,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -416,6 +416,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index ce3a483a4c06dc56a8a71d32d4d4a7077d524c2e..1cab34e52858808bceb52556c7ad0bba
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -864,6 +865,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -866,6 +867,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index 2065bea3be2d5..d6f96237169cf 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,13 +8,13 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.
 
 diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
-index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..26b820b3ce387e01900cec4227ff290113a833c3 100644
+index e5c9ebda8156c1a7c32f7eb0661dff40f022c264..8840d4be4b49b27dfb257866f6a074efc34ff869 100644
 --- a/third_party/blink/common/web_preferences/web_preferences.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences.cc
-@@ -142,6 +142,19 @@ WebPreferences::WebPreferences()
-       fake_no_alloc_direct_call_for_testing_enabled(false),
+@@ -143,6 +143,19 @@ WebPreferences::WebPreferences()
        v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
        record_whole_document(false),
+       stylus_handwriting_enabled(false),
 +      // Begin Electron-specific WebPreferences.
 +      context_isolation(false),
 +      is_webview(false),
@@ -32,13 +32,13 @@ index 6d51f6a77c21b60ab756dbf8d4961b351a2e2b07..26b820b3ce387e01900cec4227ff2901
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 187fd8d9818693262256d5cbddd5e02659ba903d..28e5178361e03d1ac851fa74214931b2332dd9c2 100644
+index a910d7b53a1346797f0e2bd030dff7ff84a834b8..4847c7587484eb02b8d7f532be53e499517a95fb 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -148,6 +148,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
-       data.fake_no_alloc_direct_call_for_testing_enabled();
+@@ -149,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
    out->v8_cache_options = data.v8_cache_options();
    out->record_whole_document = data.record_whole_document();
+   out->stylus_handwriting_enabled = data.stylus_handwriting_enabled();
 +  // Begin Electron-specific WebPreferences.
 +  out->context_isolation = data.context_isolation();
 +  out->is_webview = data.is_webview();
@@ -51,12 +51,12 @@ index 187fd8d9818693262256d5cbddd5e02659ba903d..28e5178361e03d1ac851fa74214931b2
 +  out->enable_plugins = data.enable_plugins();
 +  out->enable_websql = data.enable_websql();
 +  out->webview_tag = data.webview_tag();
-+  // End Electron-specific WebPreferences.s
++  // End Electron-specific WebPreferences.
    out->cookie_enabled = data.cookie_enabled();
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 59947bfd3c042e5f7d3993967fece9b519f93472..cb2a53f6147767394585ed371744d8a140aace71 100644
+index 33ca0140e9434f37c67386973f1ebf460222691c..220551e3be0ae9275714f80758671eeac87b0cca 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -67,10 +67,10 @@ index 59947bfd3c042e5f7d3993967fece9b519f93472..cb2a53f6147767394585ed371744d8a1
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -154,6 +155,20 @@ struct BLINK_COMMON_EXPORT WebPreferences {
-   blink::mojom::V8CacheOptions v8_cache_options;
-   bool record_whole_document;
- 
+@@ -157,6 +158,19 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+   // If true, stylus handwriting recognition to text input will be available in
+   // editable input fields which are non-password type.
+   bool stylus_handwriting_enabled;
 +  // Begin Electron-specific WebPreferences.
 +  bool context_isolation;
 +  bool is_webview;
@@ -84,12 +84,11 @@ index 59947bfd3c042e5f7d3993967fece9b519f93472..cb2a53f6147767394585ed371744d8a1
 +  bool enable_websql;
 +  bool webview_tag;
 +  // End Electron-specific WebPreferences.
-+
+ 
    // This flags corresponds to a Page's Settings' setCookieEnabled state. It
    // only controls whether or not the "document.cookie" field is properly
-   // connected to the backing store, for instance if you wanted to be able to
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index bd425a5869477de9095c6a41c683609d065b08c0..c7ba3ff52c9de01028c9e2be214e20cd91cbf309 100644
+index d4c86ca871c796c3179a0fe099de0b3082ebf46e..0b438a894c37826c19bdac1b1474a50a4afe8e4f 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -100,8 +99,8 @@ index bd425a5869477de9095c6a41c683609d065b08c0..c7ba3ff52c9de01028c9e2be214e20cd
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -428,6 +429,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
-     return r.record_whole_document;
+@@ -433,6 +434,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+     return r.stylus_handwriting_enabled;
    }
  
 +  // Begin Electron-specific WebPreferences.
@@ -154,7 +153,7 @@ index bd425a5869477de9095c6a41c683609d065b08c0..c7ba3ff52c9de01028c9e2be214e20cd
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 738ac646e075f7a37ba2a263c7799a755e63d3fb..40ab2a4b9a1f9de5f201502adebc166a48fccd35 100644
+index 4638c6cf8f3834bb3dc5f98347069f1211cb7332..8cf8845375809f239998b1db256622c2ce5b1e58 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -165,10 +164,10 @@ index 738ac646e075f7a37ba2a263c7799a755e63d3fb..40ab2a4b9a1f9de5f201502adebc166a
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -206,6 +207,20 @@ struct WebPreferences {
-   V8CacheOptions v8_cache_options;
-   bool record_whole_document;
- 
+@@ -209,6 +210,19 @@ struct WebPreferences {
+   // If true, stylus handwriting recognition to text input will be available in
+   // editable input fields which are non-password type.
+   bool stylus_handwriting_enabled;
 +  // Begin Electron-specific WebPreferences.
 +  bool context_isolation;
 +  bool is_webview;
@@ -182,7 +181,6 @@ index 738ac646e075f7a37ba2a263c7799a755e63d3fb..40ab2a4b9a1f9de5f201502adebc166a
 +  bool enable_websql;
 +  bool webview_tag;
 +  // End Electron-specific WebPreferences.
-+
+ 
    // This flags corresponds to a Page's Settings' setCookieEnabled state. It
    // only controls whether or not the "document.cookie" field is properly
-   // connected to the backing store, for instance if you wanted to be able to
diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
index 3a1665ce876f7..f781f7e18480c 100644
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
 
 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index 20a3b1efcb52be5e10dc184df620ec8102f2aff3..dfebc65b2ce180e4cd175ab8d09ad7e16f6b8df5 100644
+index ce1d8d490c34b7a1f7f539dac401be4a4eafdde6..a40d91b1135f2baf0b5d654b7175107180048163 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
 @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
@@ -21,36 +21,36 @@ index 20a3b1efcb52be5e10dc184df620ec8102f2aff3..dfebc65b2ce180e4cd175ab8d09ad7e1
  ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
      int command_id) const {
    return ImageModel();
-@@ -304,6 +309,11 @@ void SimpleMenuModel::SetLabel(int index, const std::u16string& label) {
+@@ -310,6 +315,11 @@ void SimpleMenuModel::SetLabel(size_t index, const std::u16string& label) {
    MenuItemsChanged();
  }
  
-+void SimpleMenuModel::SetSecondaryLabel(int index, const std::u16string& secondary_label) {
++void SimpleMenuModel::SetSecondaryLabel(size_t index, const std::u16string& secondary_label) {
 +  items_[ValidateItemIndex(index)].secondary_label = secondary_label;
 +  MenuItemsChanged();
 +}
 +
- void SimpleMenuModel::SetMinorText(int index,
+ void SimpleMenuModel::SetMinorText(size_t index,
                                     const std::u16string& minor_text) {
    items_[ValidateItemIndex(index)].minor_text = minor_text;
-@@ -396,6 +406,12 @@ std::u16string SimpleMenuModel::GetLabelAt(int index) const {
+@@ -403,6 +413,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
    return items_[ValidateItemIndex(index)].label;
  }
  
-+std::u16string SimpleMenuModel::GetSecondaryLabelAt(int index) const {
++std::u16string SimpleMenuModel::GetSecondaryLabelAt(size_t index) const {
 +  if (IsItemDynamicAt(index))
 +    return delegate_->GetSecondaryLabelForCommandId(GetCommandIdAt(index));
 +  return items_[ValidateItemIndex(index)].secondary_label;
 +}
 +
- std::u16string SimpleMenuModel::GetMinorTextAt(int index) const {
+ std::u16string SimpleMenuModel::GetMinorTextAt(size_t index) const {
    return items_[ValidateItemIndex(index)].minor_text;
  }
 diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
-index eadda341710f3a2e35f0e5c6aeb65a0dcc7bf0dd..2a7cbfa33702b9a5b89d1e69d5e8d0af83735bd7 100644
+index 7ecb2f6cae709af8c512cfb6cac71d449a9b39c4..b7781d44125c1d66dba90bc39f9f17b194a85665 100644
 --- a/ui/base/models/simple_menu_model.h
 +++ b/ui/base/models/simple_menu_model.h
-@@ -49,6 +49,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -50,6 +50,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
      // Some command ids have labels and icons that change over time.
      virtual bool IsItemForCommandIdDynamic(int command_id) const;
      virtual std::u16string GetLabelForCommandId(int command_id) const;
@@ -58,25 +58,25 @@ index eadda341710f3a2e35f0e5c6aeb65a0dcc7bf0dd..2a7cbfa33702b9a5b89d1e69d5e8d0af
      // Gets the icon for the item with the specified id.
      virtual ImageModel GetIconForCommandId(int command_id) const;
  
-@@ -160,6 +161,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -167,6 +168,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
    // Sets the label for the item at |index|.
-   void SetLabel(int index, const std::u16string& label);
+   void SetLabel(size_t index, const std::u16string& label);
  
 +  // Sets the secondary_label for the item at |index|.
-+  void SetSecondaryLabel(int index, const std::u16string& secondary_label);
++  void SetSecondaryLabel(size_t index, const std::u16string& secondary_label);
 +
    // Sets the minor text for the item at |index|.
-   void SetMinorText(int index, const std::u16string& minor_text);
+   void SetMinorText(size_t index, const std::u16string& minor_text);
  
-@@ -199,6 +203,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
-   ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
-   int GetCommandIdAt(int index) const override;
-   std::u16string GetLabelAt(int index) const override;
-+  std::u16string GetSecondaryLabelAt(int index) const override;
-   std::u16string GetMinorTextAt(int index) const override;
-   ImageModel GetMinorIconAt(int index) const override;
-   bool IsItemDynamicAt(int index) const override;
-@@ -238,6 +243,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+@@ -206,6 +210,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
+   ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override;
+   int GetCommandIdAt(size_t index) const override;
+   std::u16string GetLabelAt(size_t index) const override;
++  std::u16string GetSecondaryLabelAt(size_t index) const override;
+   std::u16string GetMinorTextAt(size_t index) const override;
+   ImageModel GetMinorIconAt(size_t index) const override;
+   bool IsItemDynamicAt(size_t index) const override;
+@@ -246,6 +251,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
      int command_id = 0;
      ItemType type = TYPE_COMMAND;
      std::u16string label;
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index a6d6dfc7533ef..c3266e9e6c628 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 1ced95928589b38d76df1c460df7712e8e8c1611..2977ba7ce2f6a102f04bd9ad591fc583fd836051 100644
+index 83b1a2231b522d10cf4b17864e444a00ef514735..f74d6e73675713780326ab20e504e43be61659d9 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -124,14 +124,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
  
    DCHECK(!IsDetached());
  
@@ -33,7 +33,7 @@ index 1ced95928589b38d76df1c460df7712e8e8c1611..2977ba7ce2f6a102f04bd9ad591fc583
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -155,6 +147,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -154,6 +146,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,10 +49,10 @@ index 1ced95928589b38d76df1c460df7712e8e8c1611..2977ba7ce2f6a102f04bd9ad591fc583
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 5fccf35dfef38989bd68c69cfc35ac5d716ec165..dc45af36b30091b98cb37c927abd9a294c27bb71 100644
+index dd19180e5f29182a8993a18d939e5c78d49446c9..e3d7332e13524e5571b7aee2139648501d377dfb 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -544,10 +544,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index 5fccf35dfef38989bd68c69cfc35ac5d716ec165..dc45af36b30091b98cb37c927abd9a29
    if (!Client())
      return false;
  
-@@ -593,6 +589,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -594,6 +590,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/breakpad_allow_getting_string_values_for_crash_keys.patch b/patches/chromium/breakpad_allow_getting_string_values_for_crash_keys.patch
index 0cd9d06f2e8de..9c2342ded0f3b 100644
--- a/patches/chromium/breakpad_allow_getting_string_values_for_crash_keys.patch
+++ b/patches/chromium/breakpad_allow_getting_string_values_for_crash_keys.patch
@@ -13,7 +13,7 @@ on linux. If removing this patch doesn't cause a compile failure, it's
 fine to delete!
 
 diff --git a/components/crash/core/common/crash_key.h b/components/crash/core/common/crash_key.h
-index c0771b00922c1f21ec9dba726c5c7cd51c267d69..d731c7bf168c4b8df0a46da40c9164b4ac6239f3 100644
+index bf88c1180ee507c97e2613d4aba12a8e87fcfcd3..fae2b77315784f9167c0fcf4cc5330520c14b862 100644
 --- a/components/crash/core/common/crash_key.h
 +++ b/components/crash/core/common/crash_key.h
 @@ -219,6 +219,10 @@ class CrashKeyStringCombined : public internal::CrashKeyStringCombinedImpl {
diff --git a/patches/chromium/build_add_electron_tracing_category.patch b/patches/chromium/build_add_electron_tracing_category.patch
index f650856864da7..beea0817b40cb 100644
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index a1a93418b0b0d56f92647aa1087bb4485c354201..191bfe2d3922d2e65f0be10d6436c50efc3b0880 100644
+index be712614ac5be3573427247d7032432f18e47a15..4ad49e65f6139b43a8f9d1041dfdd4b6951ca7a7 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -80,6 +80,7 @@
diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch
index 47744405285ac..f0253548ac409 100644
--- a/patches/chromium/build_disable_partition_alloc_on_mac.patch
+++ b/patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -9,7 +9,7 @@ and can be removed when the crash in fork is resolved.
 Related issue: https://github.com/electron/electron/issues/32718
 
 diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
-index c3c62f83553bd0d258de4d5d9ecd8b02a74f594b..3dbf4462fa056db7a4084453ef35f1b944fbd093 100644
+index 605a2d455a8affffb3e864d872ffa767fdbc988f..ab4da059149f51724c057cdff7e04e9f6bc85270 100644
 --- a/base/allocator/allocator.gni
 +++ b/base/allocator/allocator.gni
 @@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index 9b872d4b44337..e4d390ca6ea25 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index a9e0afc645b8bd543590e80b55a7461381373187..3d2e799541e26f5e421e20ccaff65020687314c2 100644
+index 31d63709bd68819a439901823b6649e4328244f8..319447a52fb6ad39c879c3916bd8acfefb578981 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index a9e0afc645b8bd543590e80b55a7461381373187..3d2e799541e26f5e421e20ccaff65020
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 244373ba428ada917929c5161eb2c75ef1ccf8d3..556a613a6697eeea6b15894449fec884b97ec8b5 100644
+index db5d426cef5850603eb9f98c69989e5f11fcb513..198a31142605f428d00a6e594908fb2c7fbdcf50 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4574,7 +4574,7 @@ static_library("browser") {
+@@ -4614,7 +4614,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 244373ba428ada917929c5161eb2c75ef1ccf8d3..556a613a6697eeea6b15894449fec884
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 8c1a1b9c39a4ba00784ef91aaa81bf2453ac13e6..95e2f70445568d95351e8b1b5da71dc8e85e46cd 100644
+index 0119e51f4ee0f98968d854e6310234c01028c4ff..9d87f0fdbe110663ab0d3da26fbc0d34e9a0c579 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -5963,7 +5963,6 @@ test("unit_tests") {
+@@ -6011,7 +6011,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 8c1a1b9c39a4ba00784ef91aaa81bf2453ac13e6..95e2f70445568d95351e8b1b5da71dc8
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:crash_reporter_client_win_unit_tests",
-@@ -5988,6 +5987,10 @@ test("unit_tests") {
+@@ -6036,6 +6035,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 8c1a1b9c39a4ba00784ef91aaa81bf2453ac13e6..95e2f70445568d95351e8b1b5da71dc8
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6879,7 +6882,7 @@ test("unit_tests") {
+@@ -6933,7 +6936,7 @@ test("unit_tests") {
      }
  
      deps += [
@@ -77,7 +77,7 @@ index 8c1a1b9c39a4ba00784ef91aaa81bf2453ac13e6..95e2f70445568d95351e8b1b5da71dc8
        "//chrome/browser/enterprise/connectors/analysis:features",
        "//chrome/browser/media/router:test_support",
        "//chrome/browser/media/router/discovery:discovery",
-@@ -6993,6 +6996,10 @@ test("unit_tests") {
+@@ -7051,6 +7054,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index ea753eee3f9e0..14af10cde5c1f 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index b3e5378f711c54b76c73179e791646d4e5e4e96b..262c8e53ec25b2e91a73b5971d64dbe5d5e005a1 100644
+index 4fec8db3c0431294f65e2a7f0046b6ac5ba78c47..2a4ad0955b3c01b2f1d1665fb65e6d9bb16f5fc2 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
diff --git a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
index 2e6dc709deca9..9aa331ea94321 100644
--- a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
+++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
@@ -6,7 +6,7 @@ Subject: build: make libcxx_abi_unstable false for electron
 https://nornagon.medium.com/a-libc-odyssey-973e51649063
 
 diff --git a/build/config/c++/BUILD.gn b/build/config/c++/BUILD.gn
-index 09324583a2f98621fe328ec9f0178736dabe6d2b..d57c2c16ea3475c3ad77e81bdb9700ec2f64976a 100644
+index 5d222aaccd15cbcdd413094e33bd48fd3798de8f..a2653637c2735b268dc4e6174536565d9add17bf 100644
 --- a/build/config/c++/BUILD.gn
 +++ b/build/config/c++/BUILD.gn
 @@ -29,10 +29,12 @@ config("runtime_library") {
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index f29b6178fa7ff..005caa9f6af02 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index bdfc0719057218afeb61fec8f4e75298c3baa54c..9c6f51f1667d9bf1b430a83747faebf633a324c7 100644
+index 9fe7a9c021c8d29359f072e04665a55858048be6..115dab63efa4b90f37609a9a0a363ad75a0ff582 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7283,6 +7283,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7298,6 +7298,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index bdfc0719057218afeb61fec8f4e75298c3baa54c..9c6f51f1667d9bf1b430a83747faebf6
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 860e52ddb3db1ccc38a7ef6e11acc0da67c98ac5..14bc2c9e77b7db69d03c00314fe55806d2a9e38c 100644
+index 276ae812cfb35f4fe6000a87b38c2155f37b12d3..9a0edcadef1bc60b035ca67df5082a7d06dd4436 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3990,6 +3990,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3996,6 +3996,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 860e52ddb3db1ccc38a7ef6e11acc0da67c98ac5..14bc2c9e77b7db69d03c00314fe55806
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -4034,12 +4042,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4040,12 +4048,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,10 +53,10 @@ index 860e52ddb3db1ccc38a7ef6e11acc0da67c98ac5..14bc2c9e77b7db69d03c00314fe55806
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index cc492885ec8ae5577c6e8702dc30749331332103..c852b894f976304e6b20908a6e66ccd698887604 100644
+index fc7e18c294993f1fa8cef88782ae3f4ba60e4d54..c41545fc79a6a45c82aa39ff21e790bdcd7b8f01 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -587,6 +587,10 @@ struct CreateNewWindowParams {
+@@ -571,6 +571,10 @@ struct CreateNewWindowParams {
  
    // Additional parameters for creating picture-in-picture windows.
    blink.mojom.PictureInPictureWindowOptions? pip_options;
@@ -68,10 +68,10 @@ index cc492885ec8ae5577c6e8702dc30749331332103..c852b894f976304e6b20908a6e66ccd6
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 15620fd7b5d95eb031641e0eeb6d4c2ec74071d2..8f75315f0d4ba45314be5d2d88a417b44ba2c254 100644
+index 82a07cfb29870615a18a1718e5b6c0b2a42443ef..ba6e21fb83b4c58716b776c1a018c36f14902e6f 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -610,6 +610,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 15620fd7b5d95eb031641e0eeb6d4c2ec74071d2..8f75315f0d4ba45314be5d2d88a417b4
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index cadbd44a85b6117cd001c1dec120d18520ff2855..e0bfafe859b600ac5033f78d1eb5823ddda956c4 100644
+index 2f475430b85cf6029f0066f30069294847d05bd1..f399bc59be5705542b34185e7fe7202a029c40ea 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -165,6 +165,7 @@ class NetworkService;
+@@ -164,6 +164,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index cadbd44a85b6117cd001c1dec120d18520ff2855..e0bfafe859b600ac5033f78d1eb5823d
  }  // namespace network
  
  namespace sandbox {
-@@ -993,6 +994,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -991,6 +992,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -102,7 +102,7 @@ index cadbd44a85b6117cd001c1dec120d18520ff2855..e0bfafe859b600ac5033f78d1eb5823d
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index ef3889063b562a37fbd945fe30db0d776ecaee7a..99e8449e9c515dd70ed88546a71f83ae139178fe 100644
+index 74847a4fbd4d0d897ce6aecd1b39e30bc226f8f4..3ddcc2d403a68fdc2b4b0246899cd9507ecc6195 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -124,7 +124,7 @@ index ef3889063b562a37fbd945fe30db0d776ecaee7a..99e8449e9c515dd70ed88546a71f83ae
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index b088cb301003359fefad0ea9ca42b96f0cf3de6c..eec7bf18d17e85bde8017d4c8e7f064987b4d4d3 100644
+index 0274e3bb5cc62ce2c52be68a50b57c339fc5bba7..1ea3e1fdf067ea54ce54d31f494ac2bf42b2de3f 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,12 +150,12 @@ index b088cb301003359fefad0ea9ca42b96f0cf3de6c..eec7bf18d17e85bde8017d4c8e7f0649
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 913b3647c4632b580fa1551f4ebfeaca6f9fe17e..9cc6a793a1ec3e53db1ef31aec37c569695b197e 100644
+index f9a857f270bad274fc952655efd7a9a32fbd7fb1..80cad3267721dc7bf78f5b75f99cda2a0d1d2016 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
-@@ -315,6 +315,10 @@ WebView* RenderViewImpl::CreateView(
+@@ -297,6 +297,10 @@ WebView* RenderViewImpl::CreateView(
        /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
-       creator->IsAdSubframe());
+       creator->IsAdFrame());
  
 +  params->raw_features = features.raw_features.Utf8(
 +      WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
@@ -165,7 +165,7 @@ index 913b3647c4632b580fa1551f4ebfeaca6f9fe17e..9cc6a793a1ec3e53db1ef31aec37c569
    // moved on send.
    bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index d6dd69c53b66a89ea63927319d7b385f91921ea2..71748596f4d05de73263ed11b122d75a38b49616 100644
+index 6abdcf70bdeeb3a34d01c3b00e5f629373eef76b..537f71cbf3cc1112100a199a15b77a535efd8a4e 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
 @@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -212,10 +212,10 @@ index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index ec10f16c6e6c5507ad2fb0afe306a744885eb58e..3f7a069c3f1b8412074864eb99bf47469a699837 100644
+index cc39235616f0249c8a979a870885aec2d0e04cc4..77e6bbe18556279a98b5453d4ba1c3eb5b850287 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2084,6 +2084,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2090,6 +2090,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, entered_window);
  
diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
index ab21d92a82438..0808a245ec7e3 100644
--- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch
+++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
@@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores
 Makes things like "git status" quicker when developing electron locally
 
 diff --git a/.gitignore b/.gitignore
-index d68a1b2dd91704a00be9cce6ccfa5daf7da35e1a..ab30dd802543491352d3b407f12127c04742d1ab 100644
+index baf86ec0cde417fa4287f794de10b78d19439930..29d7b595fbfd6e211864e3baa8e2d3014b2e7a5b 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -229,6 +229,7 @@ vs-chromium-project.txt
+@@ -230,6 +230,7 @@ vs-chromium-project.txt
  /delegate_execute
  /device/serial/device_serial_mojo.xml
  /docs/website
diff --git a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
index 890c5af769a57..8c6aeac216019 100644
--- a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
+++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
@@ -7,7 +7,7 @@ With WCO, allow chromium to handle synthetic mouse events generated for touch
 actions in the non-client caption area.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index f6b37bdec2343d45447b419aeadbe2aa19493c3c..bdbf7153f27376bd68459f9cb480bff7485c9e98 100644
+index 2b1fa6a345247fdbb17bd2381ab9e74a8af40b8d..f11cefe945c33c82cafe7ac0d496f3fcfbc48931 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -1169,6 +1169,10 @@ void DesktopWindowTreeHostWin::HandleWindowScaleFactorChanged(
@@ -34,10 +34,10 @@ index 0aae49ec83b88057434af5bbfb54b10e53469918..058e5dc978e76a71fa02dc9e275592f3
    Widget* GetWidget();
    const Widget* GetWidget() const;
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 3b546cf67089e6677fc668b4d1d6c0863282dff5..c6810f162806b36494885b2f63982a756d4dcd38 100644
+index 67871eec9821cf100acc719a1765be489dfbe7d8..1f883dc7d46d5cc3fddffe75c55e6b96fb0fc5f2 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3129,15 +3129,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3136,15 +3136,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
        SetMsgHandled(FALSE);
      // We must let Windows handle the caption buttons if it's drawing them, or
      // they won't work.
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index 674924efd4bbe..e0a059103b137 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -108,10 +108,10 @@ index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c48
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index fd22d62a1346ee0f7c10659681e9a0e44535b44a..d51973a4ffdd2ea448fc3e8fab7cf3a47e867c7a 100644
+index ecf7d1e17ec8aa8f593b6f1b17d2d1c98928879a..8fa9f8b224526c7a41c16f0f6fd51c4ca6b3b66e 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1798,12 +1798,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1821,12 +1821,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index fd22d62a1346ee0f7c10659681e9a0e44535b44a..d51973a4ffdd2ea448fc3e8fab7cf3a4
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index 64eeec32ac70f32b71cd30f7d1adb1f12fa6fa46..8ebf50854a4fdf2cdc9b7f90844456c12902cb4b 100644
+index b0f70cfaa60d28547f74b199d41ce81a5cdc8891..74efdc0a0ba5e5b862e12180dbfdb9534e9e0a5d 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -843,8 +843,7 @@ class Browser : public TabStripModelObserver,
+@@ -855,8 +855,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index ad3f25362279d889e800cee3fd20240cc6d176a9..9b532970afe951f7c12629903baa39f2b8de1a5e 100644
+index a2f1f72a30f694d53f28d38d823341e7b4f008e1..7ff6febe70e9ec82becfbe036883fbc7572b5b01 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3916,8 +3916,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3922,8 +3922,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
@@ -260,7 +260,7 @@ index ad3f25362279d889e800cee3fd20240cc6d176a9..9b532970afe951f7c12629903baa39f2
          static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
              opener, source_site_instance, is_new_browsing_instance,
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 99e8449e9c515dd70ed88546a71f83ae139178fe..4f395474d3e0e1bf7a594fe3fa3e4cb53327aa69 100644
+index 3ddcc2d403a68fdc2b4b0246899cd9507ecc6195..eecc92f2ffce2c2eeb5fde977da6b94a29923b67 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -134,8 +134,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -274,7 +274,7 @@ index 99e8449e9c515dd70ed88546a71f83ae139178fe..4f395474d3e0e1bf7a594fe3fa3e4cb5
  }
  
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index eec7bf18d17e85bde8017d4c8e7f064987b4d4d3..d5457e3a2ae96305cbd215f0340295339c7838e5 100644
+index 1ea3e1fdf067ea54ce54d31f494ac2bf42b2de3f..aa9af63f6d4708660496e5892f00766281be22c9 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -317,8 +317,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -288,10 +288,10 @@ index eec7bf18d17e85bde8017d4c8e7f064987b4d4d3..d5457e3a2ae96305cbd215f034029533
    // Allow delegate to creates a custom WebContents when
    // WebContents::CreateNewWindow() is called. This function is only called
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-index 8349c8cb2078d09c9550024ae5ca845bdebfbd35..e3763eaa2c6f7ce842cf8964bf5590efd3892c61 100644
+index add3f3f73b1e44401b31330cd06f8c9211c62516..a64b0d6dac663b23e6cec32c2898ae88157ad602 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
-@@ -213,8 +213,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
+@@ -199,8 +199,7 @@ bool ExtensionOptionsGuest::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -302,7 +302,7 @@ index 8349c8cb2078d09c9550024ae5ca845bdebfbd35..e3763eaa2c6f7ce842cf8964bf5590ef
    // view is used for displaying embedded extension options, we want any
    // external links to be opened in a new tab, not in a new guest view so we
 diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
-index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e1002cf38cc 100644
+index f1c474143b087988b8084ad1bdf01b8ba80327e8..47ffb7d406eb04622fffce9f0671eddab4ff8fe3 100644
 --- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
 +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
 @@ -58,8 +58,7 @@ class ExtensionOptionsGuest
@@ -316,10 +316,10 @@ index 7350382146178f58960a9bf68cd959076d2d9790..a70a94d14bdfa993feab60b8e4f32e10
        content::RenderFrameHost* opener,
        content::SiteInstance* source_site_instance,
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-index 9fa230c1cd95f71690f5beef7b77c9759215e3e0..f0160abfd4980d323c8e3def86df7bdf3a137dc3 100644
+index 75a2534e3be7102a221378afbfef3df8e6a8555e..495fc687379c6456384acc3a1864c5f0c49ad47f 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
-@@ -403,8 +403,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
+@@ -399,8 +399,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -330,10 +330,10 @@ index 9fa230c1cd95f71690f5beef7b77c9759215e3e0..f0160abfd4980d323c8e3def86df7bdf
  }
  
 diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-index ef6faf317dd4168adf6fd530a7da0b80f9166dec..f401659a81d4aeaf71039d71eb8fec4844497334 100644
+index 26dc86a7534d9296f1b1f772ec95f5313c61061c..925152a6c1fb645dfff5bd7238b620a8344de734 100644
 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
 +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
-@@ -171,8 +171,7 @@ class MimeHandlerViewGuest
+@@ -170,8 +170,7 @@ class MimeHandlerViewGuest
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -372,7 +372,7 @@ index 0661fd642dcee69a7c8f955490dadf32dc0eb468..e3fa74da87513fbfcd035fa872dc938d
                            int opener_render_process_id,
                            int opener_render_frame_id,
 diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
-index 807879aa4894e5fabe043d07d5899e5700a7c172..5044c462ccfeaeb4aeb2dd3189e40e60c835ed73 100644
+index aa488570851f68e892b024c901f31b658929fc72..efe6a6bc939a6bdea0eaca65e12242e23f3e6d59 100644
 --- a/headless/lib/browser/headless_web_contents_impl.cc
 +++ b/headless/lib/browser/headless_web_contents_impl.cc
 @@ -179,8 +179,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index 831959365e6b5..3e7651e9250b7 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index f3cf8498493526d125eb42a7c42f7ad85dbc1fc2..35ec5dc4d87ecc61bd0f48be4c5d5867e9f75cce 100644
+index 732260f0da15c50f660348e0c66e0b3098aa418f..0a0394a3607e9b955f9fc517e0814ac07b3ba67e 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
@@ -20,7 +20,7 @@ index f3cf8498493526d125eb42a7c42f7ad85dbc1fc2..35ec5dc4d87ecc61bd0f48be4c5d5867
  #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
  #include "components/cdm/renderer/widevine_key_system_properties.h"
  #include "content/public/renderer/render_thread.h"
-@@ -184,12 +186,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
+@@ -235,12 +237,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {
  
  // Returns whether persistent-license session can be supported.
  bool CanSupportPersistentLicense() {
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 1cf28eb0621d3..39f1919a402ef 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,10 +15,10 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 1208238fbfb501e1776e8c3ba414a8c9ef23bc59..81f59c4476cd07930fc302ecbf0377a11bfee888 100644
+index 7438cdf5604e237b46a22a2dd808aa6d031aea5f..fe882b31026b527df28d384e6e7e7cccaee61d61 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -308,6 +308,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
+@@ -309,6 +309,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
  
  }  // namespace
  
@@ -29,7 +29,7 @@ index 1208238fbfb501e1776e8c3ba414a8c9ef23bc59..81f59c4476cd07930fc302ecbf0377a1
  // A scoping class that prevents a window from being able to redraw in response
  // to invalidations that may occur within it for the lifetime of the object.
  //
-@@ -358,7 +362,8 @@ class HWNDMessageHandler::ScopedRedrawLock {
+@@ -359,7 +363,8 @@ class HWNDMessageHandler::ScopedRedrawLock {
          hwnd_(owner_->hwnd()),
          cancel_unlock_(false),
          should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
@@ -39,7 +39,7 @@ index 1208238fbfb501e1776e8c3ba414a8c9ef23bc59..81f59c4476cd07930fc302ecbf0377a1
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -1051,6 +1056,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -1052,6 +1057,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
@@ -51,7 +51,7 @@ index 1208238fbfb501e1776e8c3ba414a8c9ef23bc59..81f59c4476cd07930fc302ecbf0377a1
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 65bf924561934d445e201aa2753ec7a3e32b6a6b..e4805643c6994404a1443fe89f0348a19310023b 100644
+index cdc283b7e1aa89c8a273c4df97ad8aea55024743..caa02c07b371569be5ac5ac3ce7efe40359cd017 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -207,6 +207,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 0a0817bf3cc3c..31116543398e5 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 6a148c3173f8f5653b945ed9b6ffcbf48d76d511..3809ffe0f487e60539db58980b3232030ce8d4f8 100644
+index 23c2ea10c648fd0f67f31118c0ae30c5647ce5e5..9fe5b106397e8b5a66bc4a10e874c5130e93e74d 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1864,6 +1864,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1866,6 +1866,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -81,7 +81,7 @@ index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd3
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 9b29ab96d6e7dd7160502ee2252843bdeeab84c9..a9889d625dac9148dd8bbc2853c4e09f6546bd0d 100644
+index 4b3c2d088253e478005bd0d891dbd9c62be3fed7..187c2ae02479fa9605abc9587ff14363b1203c58 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -93,7 +93,7 @@ index 9b29ab96d6e7dd7160502ee2252843bdeeab84c9..a9889d625dac9148dd8bbc2853c4e09f
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 3f0a3b2133f0d48054f33df28b93a9ee40d7ed78..801bf4b1090a8f0de922fdac6c4145c27a154460 100644
+index 7bb696c3ad090828b2a7e3a9a648b75bbf39f844..81f0d154838bcf3d3b4e12780ca37bcf26423d0e 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -199,6 +199,7 @@
@@ -104,7 +104,7 @@ index 3f0a3b2133f0d48054f33df28b93a9ee40d7ed78..801bf4b1090a8f0de922fdac6c4145c2
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3185,6 +3186,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3195,6 +3196,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -178,7 +178,7 @@ index 4f3b9b181b1998e0ebbd95955feeec28a5d6bcb7..00f2a213cded1985b3131fabf3560937
    // is what the renderer uses if its not threaded.
    settings.enable_checker_imaging =
 diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
-index 8bdb9fafc4c5e59d6d6aad323ca2547ecc1b4069..069ed9744dca4fb208daaaf76d4618706c65b84e 100644
+index 961b730933d285ccea7b81b8c21dd5bb0ecea56a..d6e536924f0b397d3e8808298d2b9fdd6025411f 100644
 --- a/ui/gfx/mac/io_surface.cc
 +++ b/ui/gfx/mac/io_surface.cc
 @@ -20,6 +20,7 @@
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 1104e02c2682e..47a43cc533925 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index fc7c4474aaa74000b901b93b26bb46d7a7dc07a3..9444d5411cf7caffb3cf180089ca5468c2303803 100644
+index 54681d4aaaa52ee07fba0055a8411b8e19b4cc8c..8109976614a9ae39dd802d433517bbf29a51349e 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -514,7 +514,11 @@
+@@ -516,7 +516,11 @@
      return;
  
    host()->WasHidden();
diff --git a/patches/chromium/disable_freezing_flags_after_init_in_node.patch b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
index 0a4782f3fd4a5..cf6502b77a868 100644
--- a/patches/chromium/disable_freezing_flags_after_init_in_node.patch
+++ b/patches/chromium/disable_freezing_flags_after_init_in_node.patch
@@ -15,7 +15,7 @@ at some point be an API to "unfreeze" the flags, or we may be able to refactor
 node initialization to not update flags after V8 initialization.
 
 diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
-index 02b4f803369202a81f2d54f3b35aef04be13dfa2..04a8d29ba210313076eacf5074ed86402160c0c3 100644
+index 207cda4b937282a3a719e4285f21066b4d1322f6..4367002caa2b3fd5885204a16f1802f67cde3ebc 100644
 --- a/content/renderer/render_process_impl.cc
 +++ b/content/renderer/render_process_impl.cc
 @@ -222,7 +222,8 @@ RenderProcessImpl::RenderProcessImpl()
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index c0a58fa2a1c4d..9c55c0da75f4a 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,7 +6,7 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 3c934fe49b745d79d502311af02c4b2409f87742..5647890d0f62bcd5b1d1b2e6adc511b262a83b7f 100644
+index cfa45a1e4e65b26085694979ac34a8844643b9c7..25a80899f9ae533e2d84e99076696468cef6e56d 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -20,7 +20,7 @@ index 3c934fe49b745d79d502311af02c4b2409f87742..5647890d0f62bcd5b1d1b2e6adc511b2
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 4c568e15eaf82231004e89590dfe2e28e6ba0ac0..2ba5e20d961494995c11ac2a40d2c78b8b3d7de0 100644
+index db807cca58eac2693aa4e8dabff7f3102c3ebaed..0646cecba3679dfa4cd04be093943545cade0e23 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -881,6 +881,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -34,7 +34,7 @@ index 4c568e15eaf82231004e89590dfe2e28e6ba0ac0..2ba5e20d961494995c11ac2a40d2c78b
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index f709beca890c426c9355297c6a741d5a8c887fdb..8050e3b8d603e48323002475680d76dfa059e20e 100644
+index ea62c4a966dd76c1964b6d7f9053cb4fb73376f5..79253c9d5c8f4e71e5c0d0d87dd641feab901e51 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
diff --git a/patches/chromium/disable_unload_metrics.patch b/patches/chromium/disable_unload_metrics.patch
index a5b8d7b4381d2..b9a96fd79cc60 100644
--- a/patches/chromium/disable_unload_metrics.patch
+++ b/patches/chromium/disable_unload_metrics.patch
@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
 should continue seeking for a real fix.
 
 diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
-index b88a9d695e2e743cdd9446e8e3c3ca38a914630a..a35f8b3118632d503c5750d59e847580cbb47a9f 100644
+index 8caea1c8d54c59efc5f7b758e78638042f7db23c..579c335888f4df61cfeb08e01ecef09ad1b3a92f 100644
 --- a/content/browser/renderer_host/navigator.cc
 +++ b/content/browser/renderer_host/navigator.cc
-@@ -1195,6 +1195,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1200,6 +1200,7 @@ void Navigator::RecordNavigationMetrics(
              .InMilliseconds());
    }
  
@@ -35,7 +35,7 @@ index b88a9d695e2e743cdd9446e8e3c3ca38a914630a..a35f8b3118632d503c5750d59e847580
    // If this is a same-process navigation and we have timestamps for unload
    // durations, fill those metrics out as well.
    if (params.unload_start && params.unload_end &&
-@@ -1245,6 +1246,7 @@ void Navigator::RecordNavigationMetrics(
+@@ -1250,6 +1251,7 @@ void Navigator::RecordNavigationMetrics(
           first_before_unload_start_time)
              .InMilliseconds());
    }
diff --git a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch b/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
deleted file mode 100644
index f6fb27f797122..0000000000000
--- a/patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <samuel.r.attard@gmail.com>
-Date: Fri, 18 Dec 2020 15:19:39 -0800
-Subject: Don't use potentially null "GetWebFrame()->View()" when get blink
- prefs
-
-For whatever reason (still haven't narrowed it down to an exact test case) when using OOPIFs the "GetWebFrame()->View()" call during "RenderFrameCreated" call be nullptr.  Accessing the prefs via the render_view though still works.
-
-This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572256
-
-Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
-
-diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 3e186230715aaf840959a93038167749e3735a08..4c2dbe2b7629c94a16620988ae96fb10da39e0b8 100644
---- a/content/renderer/render_frame_impl.cc
-+++ b/content/renderer/render_frame_impl.cc
-@@ -2294,7 +2294,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
- }
- 
- const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {
--  return GetWebView()->GetWebPreferences();
-+  return render_view_->GetWebView()->GetWebPreferences();
- }
- 
- const blink::RendererPreferences& RenderFrameImpl::GetRendererPreferences()
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index 5ecf357e66296..aa0b4d98274fc 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa19493c3c 100644
+index b6d243983474cfc2c314b555ccc1de4d833a7f00..2b1fa6a345247fdbb17bd2381ab9e74a8af40b8d 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 @@ -530,7 +530,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -19,10 +19,10 @@ index d7260950ca1ba9c71d9500560bc13314e78e2170..f6b37bdec2343d45447b419aeadbe2aa
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 81f59c4476cd07930fc302ecbf0377a11bfee888..70e33b49e77240248c629fb18c5d3ca57ea32d66 100644
+index fe882b31026b527df28d384e6e7e7cccaee61d61..82616ebcb1f56de12cbd932a4614bb3858e9bad9 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -1001,8 +1001,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -1002,8 +1002,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index 4b9312ed4d48d..b94ce7ad7c34b 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index d53e403bda407bb46f59395ebcbb39cd9495875b..4850469bb2bd96c87b0aa936c654f7bd58b7b17f 100644
+index 3e0ac81d77b3943a3021381e96f55059e4289a9b..ea7c2387bfc06d47cea6bd97d0b4b95f84811dde 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1410,6 +1410,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1412,6 +1412,13 @@ void NetworkContext::SetNetworkConditions(
                                        std::move(network_conditions));
  }
  
@@ -51,7 +51,7 @@ index d53e403bda407bb46f59395ebcbb39cd9495875b..4850469bb2bd96c87b0aa936c654f7bd
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 614ba5b278f8bed722072ca07399b247ddb971be..21024709a79dc2bb838492090ce1365450427430 100644
+index 07e6cb535bdc9fdc03ae8a115cc3b50d16d2c9b9..d4dd2699fa0876d374750135851e1e5325bf4e0d 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -296,6 +296,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -63,10 +63,10 @@ index 614ba5b278f8bed722072ca07399b247ddb971be..21024709a79dc2bb838492090ce13654
    void SetEnableReferrers(bool enable_referrers) override;
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 118c6469c038e5b53eb76f76abf60f5df15a94d1..9f364ccfd22e736330a2ce9879495fa072373997 100644
+index bc63400c5143f13fa8108bc431e08e83725d3b0b..f995a7277f76e30309752e2c4c193529d3f603b3 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1102,6 +1102,9 @@ interface NetworkContext {
+@@ -1103,6 +1103,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,7 +77,7 @@ index 118c6469c038e5b53eb76f76abf60f5df15a94d1..9f364ccfd22e736330a2ce9879495fa0
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index b23f4227a6819d1b6b894262f5dda39841b5dd2b..3b8761ddb1d2111cb5b4df0f2448742adeb8f0c8 100644
+index 82edffa618da7e5954b0adeb4f933dfe4035b48a..92d3b15ff81eb2dbe9e7d1466fc4a18e6ee7916d 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index c48ce3e718343..ce7e8f62fcf44 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 9151815e6bf33a3a6980f8337f578dc90e458696..664b8c2b0a3eb5da577a6ac9d70cafff4702a622 100644
+index 38faafcc7432c2bedead647d4946b7183233b4bc..ff4fc53da0e14a58218c3cb39595b502b5d47996 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -161,6 +161,7 @@
@@ -23,7 +23,7 @@ index 9151815e6bf33a3a6980f8337f578dc90e458696..664b8c2b0a3eb5da577a6ac9d70cafff
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1781,6 +1782,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1797,6 +1798,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
index 275f12dd363ba..4ce0b49181b6a 100644
--- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
+++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
@@ -13,7 +13,7 @@ uses internally for things like menus and devtools.
 We can remove this patch once it has in some shape been upstreamed.
 
 diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
-index 5dd898d8db8e6db8278f00d5caa5ab1a0d7f0fc0..90b80c3252a6134ba43f0496a7128cdbf21ce39b 100644
+index d7be414239f8e120c3b833a5f12ef06d0b3e57b5..eb6f2cd02483a7cf398fc6631f6b46cf336b481e 100644
 --- a/ui/native_theme/native_theme.cc
 +++ b/ui/native_theme/native_theme.cc
 @@ -124,6 +124,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
@@ -26,10 +26,10 @@ index 5dd898d8db8e6db8278f00d5caa5ab1a0d7f0fc0..90b80c3252a6134ba43f0496a7128cdb
  }
  
 diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
-index eefc078dffa1751b7ee812a90a1da5cc91606de0..14e68fab3ad52e60e36c57b7a66393f01ea1c8b6 100644
+index bd6a77d5f0f5dd93ea57455651d3cc5024dc45fb..63f4bee073cdcb5b37662b60a9bb0386d7f480c0 100644
 --- a/ui/native_theme/native_theme.h
 +++ b/ui/native_theme/native_theme.h
-@@ -393,6 +393,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -406,6 +406,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
            custom_theme,
        bool use_custom_frame = true) const;
  
@@ -53,8 +53,8 @@ index eefc078dffa1751b7ee812a90a1da5cc91606de0..14e68fab3ad52e60e36c57b7a66393f0
    // Returns a shared instance of the native theme that should be used for web
    // rendering. Do not use it in a normal application context (i.e. browser).
    // The returned object should not be deleted by the caller. This function is
-@@ -566,6 +583,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
-   bool forced_colors_ = false;
+@@ -584,6 +601,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+   PageColors page_colors_ = PageColors::kOff;
    PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
    PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
 +  ThemeSource theme_source_ = ThemeSource::kSystem;
@@ -62,10 +62,10 @@ index eefc078dffa1751b7ee812a90a1da5cc91606de0..14e68fab3ad52e60e36c57b7a66393f0
    SEQUENCE_CHECKER(sequence_checker_);
  };
 diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
-index 6b9fb74004eba57fdff396124214356f4bcf0852..70807b315f805baab2574148520323ce78f624cb 100644
+index b4840142322aa216369985a52567727f4e6806b7..63d77806ed6ed324d37e715319288c843c16f7a0 100644
 --- a/ui/native_theme/native_theme_win.cc
 +++ b/ui/native_theme/native_theme_win.cc
-@@ -618,6 +618,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
+@@ -621,6 +621,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
    // ...unless --force-dark-mode was specified in which case caveat emptor.
    if (InForcedColorsMode() && !IsForcedDarkMode())
      return false;
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 58c3b92a3edbe..6d34964ea3bf5 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 267af5f85d4036e144ad9829922dcd3ac62b8a31..a658a43a12f5597a7bea094471191d040fc3d6c2 100644
+index 90e1c4adeab61374adf9da5708497ea32a46c7f5..b812a22802c7c425ab259dfe5681cafe6ad758c8 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
 @@ -134,6 +134,8 @@ viz_component("service") {
@@ -94,7 +94,7 @@ index 267af5f85d4036e144ad9829922dcd3ac62b8a31..a658a43a12f5597a7bea094471191d04
      "display_embedder/software_output_surface.h",
      "display_embedder/vsync_parameter_listener.cc",
 diff --git a/components/viz/service/display_embedder/output_surface_provider.h b/components/viz/service/display_embedder/output_surface_provider.h
-index 2e9453c18f2f6623d31b477aa856152ddacc3e23..93b6080135c08bc9d4cf7020f4fcb15c06a01a60 100644
+index 18ea9142343e68dfa64c5e81269dbc80e55c1277..c76c4bcd3b30230753be51d87eabffa93a107b6e 100644
 --- a/components/viz/service/display_embedder/output_surface_provider.h
 +++ b/components/viz/service/display_embedder/output_surface_provider.h
 @@ -38,7 +38,8 @@ class OutputSurfaceProvider {
@@ -108,7 +108,7 @@ index 2e9453c18f2f6623d31b477aa856152ddacc3e23..93b6080135c08bc9d4cf7020f4fcb15c
  
  }  // namespace viz
 diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
-index c019d729f29440e44d9dd47ff62d3f8fa1ee19a8..8f589394b12cff75df9708310c5f891664674c28 100644
+index d6ffe3a759fbde3fbb0f86fda9a07c63d50ff73a..4854bca8e1d3117534e4bf02ea8ebf5b2e6ea70c 100644
 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
 +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
 @@ -23,12 +23,14 @@
@@ -119,9 +119,9 @@ index c019d729f29440e44d9dd47ff62d3f8fa1ee19a8..8f589394b12cff75df9708310c5f8916
  #include "components/viz/service/display_embedder/software_output_surface.h"
  #include "components/viz/service/gl/gpu_service_impl.h"
  #include "gpu/command_buffer/client/shared_memory_limits.h"
+ #include "gpu/command_buffer/service/scheduler_sequence.h"
  #include "gpu/config/gpu_finch_features.h"
  #include "gpu/ipc/common/surface_handle.h"
- #include "gpu/ipc/scheduler_sequence.h"
 +#include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"
  #include "ui/base/ui_base_switches.h"
  
@@ -502,7 +502,7 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
    waiting_on_draw_ack_ = true;
  
 diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-index 8eeb87e2322821ac52e4bc0000cb777d69515a2c..5a7d1501aed1f01b1b67ae156cfb927ee696f83b 100644
+index 4e150f1fc12884d92b11605b6f39ec4a1d720b99..569b4e2277c758f628e528b80917f0f1e65f76d8 100644
 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 @@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(
@@ -516,7 +516,7 @@ index 8eeb87e2322821ac52e4bc0000cb777d69515a2c..5a7d1501aed1f01b1b67ae156cfb927e
    // Creating output surface failed. The host can send a new request, possibly
    // with a different compositing mode.
 diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
-index 0e3af0f9280abe8560393325b400ad2543ed0556..7fe490e55a4bb8a183d0d241188ea15a44347245 100644
+index 4a9cf8ff4a94ecda70e3d0f8d1b9d18687e4aa87..27a7adcf524e33819b372213285bfccb1f3924ba 100644
 --- a/content/browser/compositor/viz_process_transport_factory.cc
 +++ b/content/browser/compositor/viz_process_transport_factory.cc
 @@ -381,8 +381,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -549,13 +549,13 @@ index b2f873919d68633103d115d7d9550a098c1a254c..8e38831a6df15d37e5fb87d63613b7db
  
    // Notifies that a swap has occurred and provides information about the pixel
 diff --git a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
-index 3c495dfe499e1bae90fa0d576d5f58f1300c17fa..678700882d379f528ee1d77819b063cfdcdad036 100644
+index 2534c06b9de7de9b6353c81016ae0fa8609effd3..e5edff80fcdd969c0854641a6e67af12b80138dc 100644
 --- a/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
 +++ b/services/viz/privileged/mojom/compositing/frame_sink_manager.mojom
-@@ -32,6 +32,7 @@ struct RootCompositorFrameSinkParams {
+@@ -31,6 +31,7 @@ struct RootCompositorFrameSinkParams {
+   bool send_swap_size_notifications = false;
    // Disables begin frame rate limiting for the display compositor.
    bool disable_frame_rate_limit = false;
-   bool use_preferred_interval_for_video = false;
 +  bool offscreen = false;
  
    [EnableIf=is_android]
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index 0771278f2d6df..b2f1ce41117e1 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -17,10 +17,10 @@ headers, moving forward we should find a way in upstream to provide
 access to these headers for loader clients created on the browser process.
 
 diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
-index c8e468f41930dc8e31533e086d72743e12d134f1..5b54e21568019b108d92c28086b8d73db98fc704 100644
+index 7e02d8c952d2228a39d1fd1fa5a36859e2ea9ab9..1cfa83a0d0d0fa3fec3f92faa94aece678f83552 100644
 --- a/services/network/public/cpp/resource_request.cc
 +++ b/services/network/public/cpp/resource_request.cc
-@@ -233,6 +233,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
+@@ -234,6 +234,7 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
           do_not_prompt_for_login == request.do_not_prompt_for_login &&
           is_outermost_main_frame == request.is_outermost_main_frame &&
           transition_type == request.transition_type &&
@@ -29,10 +29,10 @@ index c8e468f41930dc8e31533e086d72743e12d134f1..5b54e21568019b108d92c28086b8d73d
           upgrade_if_insecure == request.upgrade_if_insecure &&
           is_revalidating == request.is_revalidating &&
 diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
-index 9af8605aaab177daf89524680cb88455fcb48d04..9c851c96588342b245b24fed51d9241f8da7ffcc 100644
+index 10d7912016a57e413e7f6056697028bbc5a4e0e6..f22a212ca8dc3f95373e23d22689c896720b7ee0 100644
 --- a/services/network/public/cpp/resource_request.h
 +++ b/services/network/public/cpp/resource_request.h
-@@ -158,6 +158,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
+@@ -159,6 +159,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
    bool do_not_prompt_for_login = false;
    bool is_outermost_main_frame = false;
    int transition_type = 0;
@@ -103,10 +103,10 @@ index 3d2bcc3e81eb42f645fa4e8b1425cb5c54cfd3a1..4cdbe0e38609abfd0b0b5856deb8b2dd
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index 6805b5f3976f60e0cc72634f71bcb21879ffbde1..4d60c127bec00859ed523ca652336239ab71ae00 100644
+index bc7e0a4b2ae29ac40765a9339248d42d4d31713b..2e01e4898fd17cc96fab8c2a06d4d6aeacaf22f2 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -603,6 +603,7 @@ URLLoader::URLLoader(
+@@ -606,6 +606,7 @@ URLLoader::URLLoader(
                                    mojo::SimpleWatcher::ArmingPolicy::MANUAL,
                                    base::SequencedTaskRunnerHandle::Get()),
        per_factory_corb_state_(context.GetMutableCorbState()),
@@ -114,7 +114,7 @@ index 6805b5f3976f60e0cc72634f71bcb21879ffbde1..4d60c127bec00859ed523ca652336239
        devtools_request_id_(request.devtools_request_id),
        request_mode_(request.mode),
        request_credentials_mode_(request.credentials_mode),
-@@ -792,7 +793,7 @@ URLLoader::URLLoader(
+@@ -795,7 +796,7 @@ URLLoader::URLLoader(
    url_request_->SetRequestHeadersCallback(base::BindRepeating(
        &URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
  
@@ -123,7 +123,7 @@ index 6805b5f3976f60e0cc72634f71bcb21879ffbde1..4d60c127bec00859ed523ca652336239
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1541,6 +1542,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1545,6 +1546,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
@@ -144,7 +144,7 @@ index 6805b5f3976f60e0cc72634f71bcb21879ffbde1..4d60c127bec00859ed523ca652336239
  
    // Parse and remove the Trust Tokens response headers, if any are expected,
 diff --git a/services/network/url_loader.h b/services/network/url_loader.h
-index 158eaacb1bf69afad16107491851dab750df9606..eff061c729bed4b8f3b41699f66d087416b08f47 100644
+index 7a1d7fe570c3b3d94d1dbcfdda2b965323ce5e95..9bc4eb1a1f300529308a2f120b4bc676b11acfbe 100644
 --- a/services/network/url_loader.h
 +++ b/services/network/url_loader.h
 @@ -518,6 +518,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
diff --git a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
index ad32e434ee6bd..b9facbb0e987d 100644
--- a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
+++ b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
@@ -16,10 +16,10 @@ Linux or Windows to un-fullscreen in some circumstances without this
 change.
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e415735e4 100644
+index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff118eed07 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-@@ -16,12 +16,16 @@
+@@ -17,12 +17,16 @@
  #include "build/build_config.h"
  #include "chrome/browser/app_mode/app_mode_utils.h"
  #include "chrome/browser/profiles/profile.h"
@@ -36,7 +36,7 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
  #include "chrome/common/chrome_switches.h"
  #include "content/public/browser/navigation_details.h"
  #include "content/public/browser/navigation_entry.h"
-@@ -165,6 +169,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -177,6 +181,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      return;
    }
  
@@ -44,7 +44,7 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
    if (base::FeatureList::IsEnabled(
            blink::features::kWindowPlacementFullscreenCompanionWindow)) {
      if (!popunder_preventer_)
-@@ -172,6 +177,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -184,6 +189,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      else
        popunder_preventer_->WillActivateWebContents(web_contents);
    }
@@ -52,7 +52,7 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
  
    // Keep the current state. |SetTabWithExclusiveAccess| may change the return
    // value of |IsWindowFullscreenForTabOrPending|.
-@@ -221,7 +227,9 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -233,7 +239,9 @@ void FullscreenController::EnterFullscreenModeForTab(
  }
  
  void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -62,7 +62,7 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
  
    if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
      // During tab capture of fullscreen-within-tab views, the browser window
-@@ -276,11 +284,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
+@@ -288,11 +296,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
  void FullscreenController::FullscreenTabOpeningPopup(
      content::WebContents* opener,
      content::WebContents* popup) {
@@ -76,7 +76,7 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
  }
  
  void FullscreenController::OnTabDeactivated(
-@@ -443,17 +453,15 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -460,18 +470,17 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -96,25 +96,19 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
    bool entering_tab_fullscreen = option == TAB && !tab_fullscreen_;
 +#endif
    GURL url;
++#if 0
    if (option == TAB) {
      url = GetRequestingOrigin();
-@@ -463,6 +471,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+     tab_fullscreen_ = true;
+@@ -498,6 +507,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+     if (!extension_caused_fullscreen_.is_empty())
        url = extension_caused_fullscreen_;
    }
- 
-+#if 0
-   if (option == TAB && display_id != display::kInvalidDisplayId) {
-     // Check, but do not prompt, for permission to request a specific screen.
-     // Sites generally need permission to get the display id in the first place.
-@@ -480,6 +489,7 @@ void FullscreenController::EnterFullscreenModeInternal(
-           GetDisplayId(WebContents::FromRenderFrameHost(requesting_frame));
-     }
-   }
 +#endif
  
    if (option == BROWSER)
      base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
-@@ -507,12 +517,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
+@@ -525,12 +535,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
    RecordExitingUMA();
    toggled_into_fullscreen_ = false;
    started_fullscreen_transition_ = true;
@@ -131,10 +125,10 @@ index ac9f8b06b066adb53a92cb1768e21d6b6e9be2a8..ebc0f0fe568d7219486360bbe4b6c65e
    extension_caused_fullscreen_ = GURL();
  
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
-index f0841982cb296079c8b943067564d74bc1b7067c..49f59fc2c12c98faada52e0e7c8c9c6e6251b599 100644
+index a31c0b1a17d4cda765a4511923686b7f44d10e81..0b0a015f0500432273bf0e7f7231987cdd11b440 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
-@@ -242,10 +242,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
+@@ -247,10 +247,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
    // Used in testing to set the state to tab fullscreen.
    bool is_tab_fullscreen_for_testing_ = false;
  
diff --git a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
index 4931611c59b59..a66d7be8c24c1 100644
--- a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
+++ b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
@@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
 This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 6f01f3eb8df96320700448e4583e4a4a0b3d2beb..e3c9f87e651be09fd40f1f51b3f9ba6fb18a770b 100644
+index 2a3c04df4f6f44d2cf75b661761c91d66cdc7ba4..fd6477ee04aee6a87dd33ea0e573eec3d7bba175 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3447,7 +3447,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -3453,7 +3453,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame, options));
    DCHECK(requesting_frame->IsActive());
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 1fedb8674bcc3..3d0218f166189 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 70e33b49e77240248c629fb18c5d3ca57ea32d66..3b546cf67089e6677fc668b4d1d6c0863282dff5 100644
+index 82616ebcb1f56de12cbd932a4614bb3858e9bad9..67871eec9821cf100acc719a1765be489dfbe7d8 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3694,6 +3694,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3702,6 +3702,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
index 1c0ed1e2fd326..28b418cf624a8 100644
--- a/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
+++ b/patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
@@ -13,7 +13,7 @@ This patch can be removed should we choose to support chrome.fileSystem
 or support it enough to fix the crash.
 
 diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
-index 96d6028af1408c34f98ee638b8b8d41e8dc8b2ee..6e3c8da273aa4d24c32200f3d67210eb08ee3dad 100644
+index 940a00b9b9f992d4254fc74922c3d8b31772fa4e..b3373265a65a6b50276a09bfb54065521ad6eac4 100644
 --- a/chrome/browser/resources/pdf/pdf_viewer.ts
 +++ b/chrome/browser/resources/pdf/pdf_viewer.ts
 @@ -860,26 +860,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {
diff --git a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
index d1d1cd7380be1..dc7c6ef34bdba 100644
--- a/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
+++ b/patches/chromium/fix_dont_delete_SerialPortManager_on_main_thread.patch
@@ -50,10 +50,10 @@ upstream would also hit this DCHECK, so give it a try with content_shell or
 chrome and that would help reporting upstream crbug.
 
 diff --git a/services/device/device_service.cc b/services/device/device_service.cc
-index 1f18714dd0c79359173f8e9204b9314a92e3b2a8..068570dba8673d2b0af674f556465abda2ed16f5 100644
+index e1066e90022485463adb69f5738107670d94ba3f..85cdc5d2df4b17d41305fa8ff4337de65056cdf7 100644
 --- a/services/device/device_service.cc
 +++ b/services/device/device_service.cc
-@@ -158,7 +158,7 @@ DeviceService::~DeviceService() {
+@@ -159,7 +159,7 @@ DeviceService::~DeviceService() {
      // naturally sequenced after the last task on
      // |serial_port_manager_task_runner_| per ThreadPool shutdown semantics).
      // See crbug.com/1263149#c20 for details.
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index abdc12fa40bfd..c0a55bfbbaaf3 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 53435224b5e331bbe24119752c1a44a8d58bfa88..de1a5b60474ce872eba03dfb8931b9b566fd6cee 100644
+index 864c0a9b7072b6c3ac6584ed35a833dd6afb9e34..214f387fa670926a4c14d39ed1be556c6935c90a 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1828,7 +1828,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1837,7 +1837,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,7 +21,7 @@ index 53435224b5e331bbe24119752c1a44a8d58bfa88..de1a5b60474ce872eba03dfb8931b9b5
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index a3ae580ea073024882bd860abf914bbf7c0ed54d..85ae2b5ba31926d21ffb52ab31fca6a66ad6d5ec 100644
+index f92bcc8f2a212e6cda464d9b6060a561d689f467..f9cb0eea11665148a4be669acaf5703cf9c0ea09 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -669,6 +669,10 @@ class WebContents : public PageNavigator,
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 641d82a1db3ff..972b408dbbc00 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index a64114d9eeb56b3dc0389415d44a842d3cda12fb..6c3b36f36e375a626f9fc2a59935c5ac851a128c 100644
+index 2ade1a0771a8f9c3c790492aadbd711b97a4613c..4a5f3bf210869e55dbc735b70b5d27548f6b62a7 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3184,6 +3184,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3271,6 +3271,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index a64114d9eeb56b3dc0389415d44a842d3cda12fb..6c3b36f36e375a626f9fc2a59935c5ac
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index e0bfafe859b600ac5033f78d1eb5823ddda956c4..e2b0937007413b158ac28e48352acd3ab68e6dd0 100644
+index f399bc59be5705542b34185e7fe7202a029c40ea..3293b6e035a6ea182504aa2700866fea8c213f4c 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -272,6 +272,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -270,6 +270,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index f2cfeb9bf75dc..0c82f2e509740 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -7,10 +7,10 @@ We don't use gin to create the V8 platform, because we need to inject Node
 things.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 7b4b42449a60e9309135aae38213cb3b003337e0..7d9068b87eee4dbc3435ed6f67285d428dc85f52 100644
+index 88f9e4dd05d8efdabbbdd044f5e09e844ced3d55..c254b045494936eca14ce947e1c2de3327820aa2 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -123,9 +123,10 @@ void IsolateHolder::Initialize(ScriptMode mode,
+@@ -137,9 +137,10 @@ void IsolateHolder::Initialize(ScriptMode mode,
                                 const intptr_t* reference_table,
                                 const std::string js_command_line_flags,
                                 v8::FatalErrorCallback fatal_error_callback,
@@ -24,10 +24,10 @@ index 7b4b42449a60e9309135aae38213cb3b003337e0..7d9068b87eee4dbc3435ed6f67285d42
    g_reference_table = reference_table;
    g_fatal_error_callback = fatal_error_callback;
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d064318627452ba852b2 100644
+index d7739924bc3c3daec848db52730bd60c72ff2d8a..78af701cb06f6cb1bdd9829b2fcc46c8d63f5c4f 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
-@@ -102,7 +102,8 @@ class GIN_EXPORT IsolateHolder {
+@@ -109,7 +109,8 @@ class GIN_EXPORT IsolateHolder {
                           const intptr_t* reference_table = nullptr,
                           const std::string js_command_line_flags = {},
                           v8::FatalErrorCallback fatal_error_callback = nullptr,
@@ -38,10 +38,10 @@ index 20cfc2257e9ba25ec3f39f19db952ba6b6036c72..4efc13c79ae742fa1925d06431862745
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index d04aa76f6667c941637de26998b52b4b2f0d2802..1b41c6ad5681ee85250b27cb9d221995ca1e4b7f 100644
+index ab2affbcab0ca7eea0b908fd1dd75f36ef095385..952b3ba6247935053d9a080bced30e3b3c640dd4 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -353,7 +353,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -362,7 +362,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
                                 const std::string js_command_line_flags,
@@ -51,7 +51,7 @@ index d04aa76f6667c941637de26998b52b4b2f0d2802..1b41c6ad5681ee85250b27cb9d221995
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
-@@ -363,7 +364,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+@@ -372,7 +373,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    // See https://crbug.com/v8/11043
    SetFlags(mode, js_command_line_flags);
  
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index 3cfbeec908477..d43e9228ce721 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index bbdd4dcc4bc327b99db11629422cc92a9d477256..0f21c9a6e4da03e4af7a8ea692ce71bb008827ed 100644
+index 650a9128d26ac6a745abfdaca93d21f19e60343a..9ccc48f79e9fe9541f9fcd7063b1f58ef31931ae 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
 @@ -230,6 +230,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -28,10 +28,10 @@ index bbdd4dcc4bc327b99db11629422cc92a9d477256..0f21c9a6e4da03e4af7a8ea692ce71bb
  
  void GpuDataManagerImpl::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index 0a01900683c73778565f9059b293bbe863d2d070..cd4e58f73e7d5bd0f9f41b1ec63031666e6b978e 100644
+index 9f2b350bc160e01ae39becd405e8a7d99a9a8ec1..3601121e3290b7b3a71041ede93d8fb00a156332 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
-@@ -128,6 +128,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
+@@ -125,6 +125,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
    // BrowserMainParts override instead.
    void PostCreateThreads();
    void TerminateInfoCollectionGpuProcess();
@@ -40,10 +40,10 @@ index 0a01900683c73778565f9059b293bbe863d2d070..cd4e58f73e7d5bd0f9f41b1ec6303166
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 54e4a915263eaf1cb6a2854c61b26d0269a49228..567f9e42a931975770f8ce63ce9b0ba80f8f234c 100644
+index 855bd71694c21353337090d049dfcfa20ebccea4..dbd0636107b1e66cb7993e29b8ed0e7f0c91ee61 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1237,6 +1237,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1209,6 +1209,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
@@ -57,10 +57,10 @@ index 54e4a915263eaf1cb6a2854c61b26d0269a49228..567f9e42a931975770f8ce63ce9b0ba8
  
  void GpuDataManagerImplPrivate::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index 85a4d09a54922205d416538ea97c7f2b5897f86a..acba97124a8643c7452bea63e91533cbfa7e182c 100644
+index 1aff605f7c126104edc9e74adc80d56344177a80..93e589d1ede1fb33dde3b099d04540fef777e182 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -90,6 +90,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -87,6 +87,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool VulkanRequested() const;
    void PostCreateThreads();
    void TerminateInfoCollectionGpuProcess();
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index 6394ab0ab0cc6..fba6f47a9f03f 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 9a8d321de570ee1a0669aa6022e34f8ff604694f..abcdba63bcbd0b9e323bf482cc292360d30be8fe 100644
+index 1bc95f7cab225ff4ff5d9819fa07d8a8cf7d9f9c..3631ccc4e41db1b6c9d3873f52cc3ff708b18d68 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -971,6 +971,11 @@
+@@ -975,6 +975,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/gtk_visibility.patch b/patches/chromium/gtk_visibility.patch
index 1d054623e40a4..20894a2cf14e9 100644
--- a/patches/chromium/gtk_visibility.patch
+++ b/patches/chromium/gtk_visibility.patch
@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
      # on GTK.
      "//examples:peerconnection_client",
 diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
-index a4edf639f8fe7170ce15f80e6e429d035fd5d7f7..7bf86bfde863b05c4727f09b24f556f2073d928a 100644
+index 34126e87bb62c312230e4a0c479f49736fa20e35..7320904ca819b6f6616192dd9f04f02ead2430a8 100644
 --- a/ui/ozone/platform/x11/BUILD.gn
 +++ b/ui/ozone/platform/x11/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 1cd1f286df670..4249d68d5c2b2 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 194ce0ca751da8677df74489a04e143276264fbe..9df287e5a9d122f26730480d54a1bbfd47e8d95e 100755
+index f25be7d134b65a6caf65241a78111de145727fcd..4fcbd6e5fd6e0d692c3bad4232b37d2a95a7073f 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -302,6 +302,8 @@ def GetDefaultHostOs():
diff --git a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
index cbfe9c8f66bbb..963907108c66e 100644
--- a/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
+++ b/patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
@@ -9,10 +9,10 @@ at rutime. It would be best if eventually all usages of this property were
 replaced with clean ozone native implementations.
 
 diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
-index 7ffb9d707407210e566c8f2bd2f89cf7f31690c9..06bb59fe5e855d0a339e738cf12c566afcf376ac 100644
+index f7fe443469c54e6cf76c2eb7f00c94d245515e59..d2dac184b3bfa69e142c106ec91f94d5c5e38d5a 100644
 --- a/ui/ozone/platform/x11/ozone_platform_x11.cc
 +++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -199,6 +199,7 @@ class OzonePlatformX11 : public OzonePlatform,
+@@ -192,6 +192,7 @@ class OzonePlatformX11 : public OzonePlatform,
        properties->supports_vulkan_swap_chain = true;
        properties->uses_external_vulkan_image_factory = true;
        properties->skia_can_fall_back_to_x11 = true;
@@ -21,10 +21,10 @@ index 7ffb9d707407210e566c8f2bd2f89cf7f31690c9..06bb59fe5e855d0a339e738cf12c566a
        properties->supports_global_application_menus = true;
        properties->app_modal_dialogs_use_event_blocker = true;
 diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
-index df6b551b94bd4e04f4c0d6e976c68cc187a57d85..3b6dd20277af88568cdb17a7fddf89bdf89b5640 100644
+index 193224d33283d4d3c45dc11b9620700a3a379cce..81abd63261952f0930a4659f270791d27d9d74a3 100644
 --- a/ui/ozone/public/ozone_platform.h
 +++ b/ui/ozone/public/ozone_platform.h
-@@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+@@ -129,6 +129,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
      // Linux only: determines if Skia can fall back to the X11 output device.
      bool skia_can_fall_back_to_x11 = false;
  
diff --git a/patches/chromium/isolate_holder.patch b/patches/chromium/isolate_holder.patch
index 70d8833b4744a..4d79064e76138 100644
--- a/patches/chromium/isolate_holder.patch
+++ b/patches/chromium/isolate_holder.patch
@@ -15,38 +15,65 @@ for us to register the isolate in between Isolate::Allocate and
 Isolate::Initialize.
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index 7d9068b87eee4dbc3435ed6f67285d428dc85f52..c0b8c6e5b49390b8a87d6a9d19605f6b6a1c3562 100644
+index c254b045494936eca14ce947e1c2de3327820aa2..63c9b9681fcc4e1e9a9590d59d74349bb8aee3b1 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
-@@ -59,7 +59,8 @@ IsolateHolder::IsolateHolder(
+@@ -73,7 +73,8 @@ IsolateHolder::IsolateHolder(
      IsolateType isolate_type,
      IsolateCreationMode isolate_creation_mode,
      v8::CreateHistogramCallback create_histogram_callback,
 -    v8::AddHistogramSampleCallback add_histogram_sample_callback)
 +    v8::AddHistogramSampleCallback add_histogram_sample_callback,
++    v8::Isolate* isolate)
+     : IsolateHolder(task_runner,
+                     access_mode,
+                     isolate_type,
+@@ -81,14 +82,16 @@ IsolateHolder::IsolateHolder(
+                                              atomics_wait_mode,
+                                              create_histogram_callback,
+                                              add_histogram_sample_callback),
+-                    isolate_creation_mode) {}
++                    isolate_creation_mode,
++                    isolate) {}
+ 
+ IsolateHolder::IsolateHolder(
+     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+     AccessMode access_mode,
+     IsolateType isolate_type,
+     std::unique_ptr<v8::Isolate::CreateParams> params,
+-    IsolateCreationMode isolate_creation_mode)
++    IsolateCreationMode isolate_creation_mode,
 +    v8::Isolate* isolate)
      : access_mode_(access_mode), isolate_type_(isolate_type) {
    CHECK(Initialized())
        << "You need to invoke gin::IsolateHolder::Initialize first";
-@@ -70,7 +71,7 @@ IsolateHolder::IsolateHolder(
-   v8::ArrayBuffer::Allocator* allocator = g_array_buffer_allocator;
+@@ -99,7 +102,7 @@ IsolateHolder::IsolateHolder(
+   v8::ArrayBuffer::Allocator* allocator = params->array_buffer_allocator;
    DCHECK(allocator);
  
 -  isolate_ = v8::Isolate::Allocate();
 +  isolate_ = isolate ? isolate : v8::Isolate::Allocate();
    isolate_data_ = std::make_unique<PerIsolateData>(isolate_, allocator,
                                                     access_mode_, task_runner);
-   if (isolate_creation_mode == IsolateCreationMode::kCreateSnapshot) {
+   //  TODO(https://crbug.com/1347092): Refactor such that caller need not
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 4efc13c79ae742fa1925d064318627452ba852b2..978c0d144370162e65038cf8a2e125fbfd0f7ebf 100644
+index 78af701cb06f6cb1bdd9829b2fcc46c8d63f5c4f..4a36f4826f9df765c664a819eb4e3679fbecb104 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
-@@ -82,7 +82,8 @@ class GIN_EXPORT IsolateHolder {
+@@ -83,13 +83,15 @@ class GIN_EXPORT IsolateHolder {
        IsolateType isolate_type,
        IsolateCreationMode isolate_creation_mode = IsolateCreationMode::kNormal,
        v8::CreateHistogramCallback create_histogram_callback = nullptr,
 -      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr);
 +      v8::AddHistogramSampleCallback add_histogram_sample_callback = nullptr,
++      v8::Isolate* isolate = nullptr);
+   IsolateHolder(
+       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+       AccessMode access_mode,
+       IsolateType isolate_type,
+       std::unique_ptr<v8::Isolate::CreateParams> params,
+-      IsolateCreationMode isolate_creation_mode = IsolateCreationMode::kNormal);
++      IsolateCreationMode isolate_creation_mode = IsolateCreationMode::kNormal,
 +      v8::Isolate* isolate = nullptr);
    IsolateHolder(const IsolateHolder&) = delete;
    IsolateHolder& operator=(const IsolateHolder&) = delete;
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index 63c91afd53a98..e3d33b36f6ce7 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,7 +9,7 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 88e46d8d05c0b5732468568b84b3283d2f4a934e..f19e32fd33ff0ce8f44ecec76e4583273f43b231 100644
+index ed19f7f1a283da619c01e2dc476d9d1ace950dc7..ef51df5e85584329c9c02aa2b6b88ba9eadd1a31 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
diff --git a/patches/chromium/make_gtk_getlibgtk_public.patch b/patches/chromium/make_gtk_getlibgtk_public.patch
index 730a2877e5aa2..cb65b28e8d8c0 100644
--- a/patches/chromium/make_gtk_getlibgtk_public.patch
+++ b/patches/chromium/make_gtk_getlibgtk_public.patch
@@ -7,7 +7,7 @@ Allows embedders to get a handle to the gtk and
 gdk_pixbuf libraries already loaded in the process.
 
 diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
-index b5c7af5bdb93b320f95252d35d2d76bae7f8c445..65b097cfab72b92f301968715eb218ef0e468567 100644
+index 2ba5b4c4468fca1bf76011754e358c81f670a8d3..e831abb6d14be75b3f5e5b4b3455b8b136f921b1 100644
 --- a/ui/gtk/gtk_compat.cc
 +++ b/ui/gtk/gtk_compat.cc
 @@ -66,11 +66,6 @@ void* GetLibGio() {
diff --git a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
index 07ee9fd2c36f0..73fcfcd3ddf79 100644
--- a/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
+++ b/patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
@@ -39,13 +39,13 @@ index dd14c8cfa32ab0bb2e92f192c54a494c4f5b4fb7..2c6f0b336c97bc23995e9fe8cdc7f72a
  
  }  // namespace base
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index cee826cf8ca533778c716fd2592e625e93fe7efb..adfec0021ae00b3a9ccc792695a51a182626fee5 100644
+index 1cbc8d582610426c870ac14ee825345805a9639a..1889df911a449e0b2ed80b42d55d747b36f9cf8c 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
-@@ -30,12 +30,6 @@
+@@ -28,12 +28,6 @@
+ extern "C" {
+ CFTypeID SecKeyGetTypeID();
  #if !BUILDFLAG(IS_IOS)
- CFTypeID SecACLGetTypeID();
- CFTypeID SecTrustedApplicationGetTypeID();
 -// The NSFont/CTFont toll-free bridging is broken before 10.15.
 -// http://www.openradar.me/15341349 rdar://15341349
 -//
@@ -55,7 +55,7 @@ index cee826cf8ca533778c716fd2592e625e93fe7efb..adfec0021ae00b3a9ccc792695a51a18
  #endif
  }  // extern "C"
  
-@@ -317,8 +311,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
+@@ -315,8 +309,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) {
        const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
    DCHECK(!cf_val ||
           CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@@ -65,7 +65,7 @@ index cee826cf8ca533778c716fd2592e625e93fe7efb..adfec0021ae00b3a9ccc792695a51a18
    return ns_val;
  }
  
-@@ -389,9 +382,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
+@@ -387,9 +380,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) {
      return (CTFontRef)(cf_val);
    }
  
diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch
index 7c7230f4a4dce..6753852394ca9 100644
--- a/patches/chromium/mas_disable_custom_window_frame.patch
+++ b/patches/chromium/mas_disable_custom_window_frame.patch
@@ -75,7 +75,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b
 +
  @end
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
-index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807eb797316 100644
+index 77662e89cf2c6135b99b3905c20456f4da0a6e09..fea78cc7fa195f44d88ec08a027b8e90209ee47c 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 @@ -17,6 +17,7 @@ class NativeWidgetNSWindowBridge;
@@ -95,7 +95,7 @@ index 67ebc56bd7ee267c03a5543e10a6a41042fcaa38..af3ed27dea51c22ab32ce14686dd7807
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 48c86f5aa9578545f43b04b520e9f1dd92d224c5..fc57c47fe6afaabf363c9efdf75f60e866244fdb 100644
+index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583513ea8ec 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 @@ -77,7 +77,9 @@ void OrderChildWindow(NSWindow* child_window,
@@ -126,7 +126,7 @@ index 48c86f5aa9578545f43b04b520e9f1dd92d224c5..fc57c47fe6afaabf363c9efdf75f60e8
  @implementation NativeWidgetMacNSWindow {
   @private
    base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
-@@ -281,6 +287,8 @@ - (BOOL)hasViewsMenuActive {
+@@ -287,6 +293,8 @@ - (NSAccessibilityRole)accessibilityRole {
  
  // NSWindow overrides.
  
@@ -135,7 +135,7 @@ index 48c86f5aa9578545f43b04b520e9f1dd92d224c5..fc57c47fe6afaabf363c9efdf75f60e8
  + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    if (windowStyle & NSWindowStyleMaskTitled) {
      if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
-@@ -292,6 +300,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
+@@ -298,6 +306,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    return [super frameViewClassForStyleMask:windowStyle];
  }
  
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 51317f699d640..4a955cba8a74e 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,10 +44,10 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index 34721e51d0ebe3a99751bba88b0afe026a910cc6..3a415dd6daf655c31ceb6fd6d307dc6e96c9aced 100644
+index c8a108cd8d39bf5185db438092579f67d31938f1..7ceaca262d71b1738d1dc92421db5e94494d5a97 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-@@ -582,10 +582,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
+@@ -583,10 +583,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
    // this should be treated as an error and caught early.
    CHECK(bridged_view_);
  
@@ -61,10 +61,10 @@ index 34721e51d0ebe3a99751bba88b0afe026a910cc6..3a415dd6daf655c31ceb6fd6d307dc6e
    // Beware: This view was briefly removed (in favor of a bare CALayer) in
    // crrev/c/1236675. The ordering of unassociated layers relative to NSView
 diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4fb37ae38 100644
+index d6d48ab183ee32edc8c9c984673e050a2557950d..0022095c7ae81197ef5cdeddc62d8550fb973e03 100644
 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
 +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-@@ -74,8 +74,10 @@ id GetFocusedBrowserAccessibilityElement() override {
+@@ -76,8 +76,10 @@ id GetFocusedBrowserAccessibilityElement() override {
      return nil;
    }
    void SetAccessibilityWindow(NSWindow* window) override {
@@ -75,7 +75,7 @@ index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4
    }
  
    void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event,
-@@ -137,8 +139,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
+@@ -139,8 +141,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
  
    mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_;
    std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_;
@@ -87,7 +87,7 @@ index 60e99da4a9493dbaca871b08d75341a48488a65e..3328e9e90bd4904dd404b413fd4245f4
  }
  
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index f61b04b02673e9a73f9c23823017a56b65b47dee..297b5c5584e9221adf11515c015fd7f413d29aab 100644
+index 6c0700b182e9765afd60d8deec501d13432e1b0a..c85c024a5a5711471e24698f14dda21b49817424 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
 @@ -21,7 +21,9 @@
@@ -100,7 +100,7 @@ index f61b04b02673e9a73f9c23823017a56b65b47dee..297b5c5584e9221adf11515c015fd7f4
  
  namespace {
  
-@@ -609,6 +611,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -613,6 +615,7 @@ void PostAnnouncementNotification(NSString* announcement) {
    if ([NSApp isActive])
      return window == [NSApp accessibilityFocusedWindow];
  
@@ -108,7 +108,7 @@ index f61b04b02673e9a73f9c23823017a56b65b47dee..297b5c5584e9221adf11515c015fd7f4
    // TODO(accessibility): We need a solution to the problem described below.
    // If the window is NSAccessibilityRemoteUIElement, there are some challenges:
    // 1. NSApp is the browser which spawned the PWA, and what it considers the
-@@ -636,6 +639,7 @@ void PostAnnouncementNotification(NSString* announcement) {
+@@ -640,6 +643,7 @@ void PostAnnouncementNotification(NSString* announcement) {
    // from within the app shim content.
    if ([window isKindOfClass:[NSAccessibilityRemoteUIElement class]])
      return true;
@@ -144,7 +144,7 @@ index a27ce05f20a8d645688c5bb920d36e76901e2b37..cb4238fe7d5f2d182c742532cf467880
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7a7dc07a3 100644
+index 9c42f305d30b1f1cafd72fd7326894819fa57ee7..54681d4aaaa52ee07fba0055a8411b8e19b4cc8c 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
 @@ -258,8 +258,10 @@
@@ -158,7 +158,7 @@ index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1555,8 +1557,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1559,8 +1561,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -169,7 +169,7 @@ index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7
    return [GetInProcessNSView() window];
  }
  
-@@ -1600,9 +1604,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1604,9 +1608,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -181,7 +181,7 @@ index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2097,12 +2103,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2101,12 +2107,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -197,7 +197,7 @@ index 6975087ef6cc6483aa0d8c301cedfb126d471e11..fc7c4474aaa74000b901b93b26bb46d7
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index a922dc6ce99ed32ede8812a63a836f72691bece3..9e4ef4235c49eeb7cd34f05ae2d75169d787fa55 100644
+index 012ab83bb9f4887646decb030b4a18f6b21e0d01..0d8b56cc387b24833ec7950a8049e038f650020c 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -341,6 +341,13 @@ component("base") {
@@ -263,10 +263,10 @@ index fc847f1ae010e4e0d69836f16d83515b8a92073a..a4bebe5078ace6c49cb34912813bbaf7
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index 0ca869c22670d057362132b30c704876e1d4d850..839a6777ebd596f41467fd90c725eea374bf9a0a 100644
+index eaca66e6c854cf7c2ba57a988080d2dee03d08e7..88e75e76cc4accacfbe4e8a2a1934372424d0eb8 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-@@ -295,14 +295,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -325,14 +325,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const {
    if (in_process_ns_window_bridge_)
      return in_process_ns_window_bridge_->ns_view();
@@ -289,7 +289,7 @@ index 0ca869c22670d057362132b30c704876e1d4d850..839a6777ebd596f41467fd90c725eea3
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1261,6 +1269,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1289,6 +1297,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -297,7 +297,7 @@ index 0ca869c22670d057362132b30c704876e1d4d850..839a6777ebd596f41467fd90c725eea3
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1268,14 +1277,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1296,14 +1305,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index d97162e9a4bcf..fe24e81ac7299 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -313,10 +313,10 @@ index d59a16112d27e2696437163483c44eca414c225c..1ccd20fe7efa3cbae48f99d0660b0252
        NOTREACHED();
        return nullptr;
 diff --git a/ui/accessibility/platform/inspect/ax_transform_mac.mm b/ui/accessibility/platform/inspect/ax_transform_mac.mm
-index 7cb34e119cd30353fe56e7c71ed5e1d417896888..dbb6cc8e37eff9b30269687f29808ec3ca46b243 100644
+index 397f01d7249f491840e5953b65c2d54eb92dc638..a7279e44346cb5b0b26599bd62693ad40a59e84f 100644
 --- a/ui/accessibility/platform/inspect/ax_transform_mac.mm
 +++ b/ui/accessibility/platform/inspect/ax_transform_mac.mm
-@@ -86,6 +86,7 @@
+@@ -87,6 +87,7 @@
      }
    }
  
@@ -324,11 +324,11 @@ index 7cb34e119cd30353fe56e7c71ed5e1d417896888..dbb6cc8e37eff9b30269687f29808ec3
    // AXTextMarker
    if (IsAXTextMarker(value)) {
      return AXTextMarkerToBaseValue(value, indexer);
-@@ -94,6 +95,7 @@
+@@ -95,6 +96,7 @@
    // AXTextMarkerRange
    if (IsAXTextMarkerRange(value))
      return AXTextMarkerRangeToBaseValue(value, indexer);
 +#endif
  
    // Accessible object
-   if (IsNSAccessibilityElement(value) || IsAXUIElement(value)) {
+   if (AXElementWrapper::IsValidElement(value)) {
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 331914f8c122b..1ef84ebf1677c 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 2aaf6fb9cca420cde28635d7628c1b7830570f5a..d53e403bda407bb46f59395ebcbb39cd9495875b 100644
+index 33264a4ec00f67345bccbd59c042235a65fdded1..3e0ac81d77b3943a3021381e96f55059e4289a9b 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -130,6 +130,11 @@
@@ -128,7 +128,7 @@ index 2aaf6fb9cca420cde28635d7628c1b7830570f5a..d53e403bda407bb46f59395ebcbb39cd
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2304,6 +2401,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2320,6 +2417,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,7 +139,7 @@ index 2aaf6fb9cca420cde28635d7628c1b7830570f5a..d53e403bda407bb46f59395ebcbb39cd
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 97039f97082b79e4b7bd5cdb4a5b28023dc70e47..614ba5b278f8bed722072ca07399b247ddb971be 100644
+index fe906c8374fee5a4afdd193b8d4a2462c28ce835..07e6cb535bdc9fdc03ae8a115cc3b50d16d2c9b9 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -104,6 +104,7 @@ class URLMatcher;
@@ -159,7 +159,7 @@ index 97039f97082b79e4b7bd5cdb4a5b28023dc70e47..614ba5b278f8bed722072ca07399b247
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -821,6 +824,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -822,6 +825,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -169,7 +169,7 @@ index 97039f97082b79e4b7bd5cdb4a5b28023dc70e47..614ba5b278f8bed722072ca07399b247
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 0a376689aeb81f85372ce163d9e199ada2cdcde2..118c6469c038e5b53eb76f76abf60f5df15a94d1 100644
+index 99cd0107ab918600970055a542cb753b24264cba..bc63400c5143f13fa8108bc431e08e83725d3b0b 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
 @@ -283,6 +283,17 @@ struct NetworkContextFilePaths {
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 90182fe6604c9..9209f4710b026 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -133,10 +133,10 @@ index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5d
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 4b40e3faa498b6c86b381f6efae9d04e48a85c0f..5499f85fa578511d5817ecd9be2f33cf56e2db4b 100644
+index f4d1b2317145ecd14b58bd52cff9de0645b37044..d2fbb44deef7a63cc1f5296d338d518bccab6a7c 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2069,8 +2069,9 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2073,8 +2073,9 @@ void RenderProcessHostImpl::CreateNotificationService(
    // For workers:
    if (render_frame_id == MSG_ROUTING_NONE) {
      storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -148,7 +148,7 @@ index 4b40e3faa498b6c86b381f6efae9d04e48a85c0f..5499f85fa578511d5817ecd9be2f33cf
      return;
    }
  
-@@ -2078,7 +2079,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2082,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService(
    RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
    CHECK(rfh);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index 57f571ce58cc4..bf82c0887b174 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -9,7 +9,7 @@ don't get errors for Chrome's generated resources, which are non-existent
 because we don't generate them in our build.
 
 diff --git a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
-index 27e776fcf770b0ef72151d98d07778badabe807e..f7fb7850497a289ca8627752ba952d9f59468079 100644
+index be17e30aa831282c4be52e788d67993d47eba5df..d5c3988af5be1d9e89330eb5c5195f9b94d13ffc 100644
 --- a/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/document_overlay_window_views.cc
 @@ -15,15 +15,19 @@
@@ -138,7 +138,7 @@ index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..9dfdd0288391aac31556c716d24c66d1
  #include "ui/aura/window.h"
  #include "ui/aura/window_tree_host.h"
 diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
-index 0d5857b5f3afa823a7a2aff68f833623ec2e7b1c..fb6217f28c306921a86afc9b854a60b4e38e1584 100644
+index 9ce062e48c356f2ac23feb97c31aabcac8610942..08c27dc6f54c9216098d29b6a5331483722517d2 100644
 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
 @@ -15,9 +15,11 @@
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index 143f6b40db3d9..f137b04a6e09e 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index 989f4dc6d156aef77dadf111f12c403196e5342b..9fd2b3484016df7a622aaadf094028c4966394e6 100644
+index 277c93b46025fc5efa7c9462222bf3704172e035..6683578241804b9634965f96d0d1c1a317b94643 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
 @@ -129,6 +129,16 @@
@@ -28,7 +28,7 @@ index 989f4dc6d156aef77dadf111f12c403196e5342b..9fd2b3484016df7a622aaadf094028c4
    E_CPONLY(kColorSeparator) \
    E_CPONLY(kColorShadowBase) \
    E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
-@@ -182,6 +192,7 @@
+@@ -183,6 +193,7 @@
    E_CPONLY(kColorTreeNodeForeground) \
    E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
    E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@@ -37,10 +37,10 @@ index 989f4dc6d156aef77dadf111f12c403196e5342b..9fd2b3484016df7a622aaadf094028c4
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
-index 6e97a162f3a823090115fdcb47828c6e0b10ad06..5fcb8cb147aa1356853cb0ed1f3731456c434946 100644
+index ca33acaffdb3c3dbd8f5f1b7012b1013a983645e..ae5ca280a3965c5922f272fdbc45247fcc8a9750 100644
 --- a/ui/color/ui_color_mixer.cc
 +++ b/ui/color/ui_color_mixer.cc
-@@ -150,6 +150,17 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -151,6 +151,17 @@ void AddUiColorMixer(ColorProvider* provider,
                 gfx::kGoogleGreyAlpha500);
    mixer[kColorProgressBarPaused] = {kColorDisabledForeground};
    mixer[kColorProgressBar] = {kColorAccent};
@@ -58,7 +58,7 @@ index 6e97a162f3a823090115fdcb47828c6e0b10ad06..5fcb8cb147aa1356853cb0ed1f373145
    mixer[kColorSeparator] = {kColorMidground};
    mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
    mixer[kColorShadowValueAmbientShadowElevationThree] =
-@@ -230,6 +241,7 @@ void AddUiColorMixer(ColorProvider* provider,
+@@ -232,6 +243,7 @@ void AddUiColorMixer(ColorProvider* provider,
    mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
    mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
        kColorTreeNodeForegroundSelectedFocused};
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index f056759708d26..ff4a4d114645c 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index a3cf0a49943f53608f783f439917c256ec5b9040..d52cc220107218e53290d21ce1c52a7f855385b4 100644
+index 32902c0b0c7fa1f1b4371f1bee24c364a4ff89e2..0c9b25af67c7b44b8e839e8839a3ea0ca8b03202 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -973,7 +973,6 @@ if (is_win) {
@@ -78,7 +78,7 @@ index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dc
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index d9ae000f1348529ab849349d7562dbb04fe9fd16..fcfeffd86bd897467b12bf1aba4aaac09986cfd9 100644
+index ab2f824eb77ae4c8a916d57914120544bec70ec5..8eef429cf3ea613e83dc408d93faa8d2661cf5db 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -97,7 +97,7 @@ index d9ae000f1348529ab849349d7562dbb04fe9fd16..fcfeffd86bd897467b12bf1aba4aaac0
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -222,16 +222,19 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::Dict new_settings,
+@@ -209,16 +209,19 @@ void PrintJobWorker::SetSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -121,10 +121,10 @@ index d9ae000f1348529ab849349d7562dbb04fe9fd16..fcfeffd86bd897467b12bf1aba4aaac0
  
  #if BUILDFLAG(IS_CHROMEOS)
 diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
-index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf06d4852f5 100644
+index 398d59a0ebad165981e9e96b29ffc672e4b841eb..e420d87ef0e90cddb740ac4b24f92519a6eb3347 100644
 --- a/chrome/browser/printing/print_job_worker_oop.cc
 +++ b/chrome/browser/printing/print_job_worker_oop.cc
-@@ -362,7 +362,7 @@ void PrintJobWorkerOop::OnFailure() {
+@@ -356,7 +356,7 @@ void PrintJobWorkerOop::OnFailure() {
  }
  
  void PrintJobWorkerOop::ShowErrorDialog() {
@@ -134,7 +134,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851ac8b8df85 100644
+index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212b98a2b15 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -146,7 +146,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  #include "chrome/common/pref_names.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/prefs/pref_service.h"
-@@ -83,10 +81,23 @@ namespace printing {
+@@ -86,10 +84,23 @@ namespace printing {
  
  namespace {
  
@@ -170,7 +170,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -95,6 +106,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -98,6 +109,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -178,7 +178,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  }
  
  void OnDidGetDefaultPrintSettings(
-@@ -144,7 +156,9 @@ void OnDidUpdatePrintSettings(
+@@ -147,7 +159,9 @@ void OnDidUpdatePrintSettings(
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -189,7 +189,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -172,6 +186,7 @@ void OnDidScriptedPrint(
+@@ -175,6 +189,7 @@ void OnDidScriptedPrint(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -197,7 +197,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -181,7 +196,8 @@ void OnDidScriptedPrint(
+@@ -184,7 +199,8 @@ void OnDidScriptedPrint(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -207,7 +207,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -196,12 +212,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -199,12 +215,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -222,7 +222,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -209,7 +227,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -212,7 +230,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -234,7 +234,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -237,6 +258,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -240,6 +261,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
@@ -244,7 +244,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  
  #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
    enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -405,7 +429,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+@@ -452,7 +476,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -254,7 +254,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -420,8 +445,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -467,8 +492,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -267,7 +267,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  }
  
  void PrintViewManagerBase::UpdatePrintingEnabled() {
-@@ -429,8 +457,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
+@@ -476,8 +504,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
    // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
    web_contents()->GetPrimaryMainFrame()->ForEachRenderFrameHost(
        base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
@@ -277,7 +277,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -546,11 +573,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -593,11 +620,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -292,7 +292,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -588,18 +618,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -635,18 +665,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -314,7 +314,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -609,6 +641,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -656,6 +688,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -322,7 +322,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -640,14 +673,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -687,14 +720,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -339,7 +339,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
      return;
    }
  #endif
-@@ -685,7 +718,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -732,7 +765,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -347,7 +347,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  #endif
  
    ReleasePrinterQuery();
-@@ -700,6 +732,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -747,6 +779,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -359,7 +359,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -710,10 +747,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -757,10 +794,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -372,7 +372,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -769,7 +808,12 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -821,7 +860,12 @@ void PrintViewManagerBase::OnJobDone() {
    // Printing is done, we don't need it anymore.
    // print_job_->is_job_pending() may still be true, depending on the order
    // of object registration.
@@ -386,7 +386,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    ReleasePrintJob();
  }
  
-@@ -783,7 +827,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
+@@ -835,7 +879,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
  
    // Is the document already complete?
    if (print_job_->document() && print_job_->document()->IsComplete()) {
@@ -395,7 +395,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
      return true;
    }
  
-@@ -831,7 +875,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -883,7 +927,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current `print_job_`.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -407,7 +407,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    if (!weak_this)
      return false;
  
-@@ -852,7 +899,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -904,7 +951,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  #endif
    print_job_->AddObserver(*this);
  
@@ -416,7 +416,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    return true;
  }
  
-@@ -912,6 +959,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -964,6 +1011,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
    }
  #endif
  
@@ -428,7 +428,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    if (!print_job_)
      return;
  
-@@ -919,7 +971,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -971,7 +1023,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
      // printing_rfh_ should only ever point to a RenderFrameHost with a live
      // RenderFrame.
      DCHECK(rfh->IsRenderFrameLive());
@@ -437,7 +437,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    }
  
    print_job_->RemoveObserver(*this);
-@@ -961,7 +1013,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -1013,7 +1065,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -446,7 +446,7 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
      return true;
  
    if (!cookie) {
-@@ -1069,7 +1121,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1121,7 +1173,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -456,10 +456,10 @@ index 4bd871e5cadc693aea6e8c71b3fe3296b743d9ec..78f3db8a6fb8b9184cfd41188b11851a
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde990e10e1 100644
+index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187845e6a75 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
-@@ -41,6 +41,8 @@ namespace printing {
+@@ -43,6 +43,8 @@ namespace printing {
  class PrintQueriesQueue;
  class PrinterQuery;
  
@@ -468,7 +468,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde
  // Base class for managing the print commands for a WebContents.
  class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
   public:
-@@ -64,7 +66,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -70,7 +72,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Prints the current document immediately. Since the rendering is
    // asynchronous, the actual printing will not be completed on the return of
    // this function. Returns false if printing is impossible at the moment.
@@ -480,7 +480,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Prints the document in `print_data` with settings specified in
-@@ -113,6 +118,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -128,6 +133,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    void ShowInvalidPrinterSettingsError() override;
    void PrintingFailed(int32_t cookie,
                        mojom::PrintFailureReason reason) override;
@@ -488,7 +488,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -120,6 +126,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -135,6 +141,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    void AddObserver(Observer& observer);
    void RemoveObserver(Observer& observer);
  
@@ -503,7 +503,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde
   protected:
    explicit PrintViewManagerBase(content::WebContents* web_contents);
  
-@@ -241,7 +255,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -256,7 +270,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -513,7 +513,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0d3e4491826be629c7251a69afc7ebde
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -314,8 +329,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -336,8 +351,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -575,7 +575,7 @@ index 95d9f19082978772297cff1bcd9c5f73db50bd62..96fe7fbb54fe0908e2153d901c130b6a
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991aeed63e6d7 100644
+index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86bc0e0f90 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -586,7 +586,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1279,7 +1280,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1282,7 +1283,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -596,7 +596,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
      if (!weak_this)
        return;
  
-@@ -1310,7 +1312,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1313,7 +1315,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -605,7 +605,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1325,7 +1327,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1328,7 +1330,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -614,7 +614,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1402,7 +1404,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1405,7 +1407,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -624,7 +624,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1451,6 +1454,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
+@@ -1454,6 +1457,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -633,7 +633,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -2063,7 +2068,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2066,7 +2071,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -643,7 +643,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -2078,7 +2084,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2081,7 +2087,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -654,7 +654,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -2086,7 +2094,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2089,7 +2097,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -663,7 +663,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -2105,8 +2113,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2108,8 +2116,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -680,7 +680,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2364,36 +2379,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2374,36 +2389,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -745,7 +745,7 @@ index 0766270f7c8ff9f903395229a541ae1f6183899c..3f9b4a7ade69f3447f8537d2585991ae
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2518,7 +2549,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2528,7 +2559,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -796,10 +796,10 @@ index 66026548181a897c161d7202646f33fd8847ccb8..113a8165b5db6294087773e5a4b2f003
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 56e3651f7e79957e444ec82b534a07dff9ef7415..43f2d487947eaf77171d918cc5072aee4291290b 100644
+index 0704a34a2fc4afdf618004d5bee69a7777cc3491..47edb94bd9078364fb03f35849b389a6b2992922 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2766,8 +2766,9 @@ source_set("browser") {
+@@ -2783,8 +2783,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  
@@ -812,7 +812,7 @@ index 56e3651f7e79957e444ec82b534a07dff9ef7415..43f2d487947eaf77171d918cc5072aee
      if (is_chromeos) {
        sources += [
 diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
-index e3c1b29138f175836424bcfe917cd00bd081b34c..7d8b6f06c5d1a7ea9a5ed86c5c612e8df08f2659 100644
+index 2ae5fc805ccbd81448d3b9d5aa482bcfd7a747f8..b2ed764463f977bd242d9da79270244062c210d6 100644
 --- a/content/browser/utility_sandbox_delegate_win.cc
 +++ b/content/browser/utility_sandbox_delegate_win.cc
 @@ -95,6 +95,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetPolicy* policy) {
@@ -830,12 +830,12 @@ index e3c1b29138f175836424bcfe917cd00bd081b34c..7d8b6f06c5d1a7ea9a5ed86c5c612e8d
 +#endif
  }  // namespace
  
- bool UtilitySandboxedProcessLauncherDelegate::GetAppContainerId(
+ std::string UtilitySandboxedProcessLauncherDelegate::GetSandboxTag() {
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
-index 56ee836445c53c5cde3947fca19d8576d2684f6f..454e26baa8b3688c2af98081085aa5378ff0554b 100644
+index 6cca846b9831da669ca52aff776caf5a23f6f4d1..39d1032f276181a535de9fba89c2246c7a9814d7 100644
 --- a/printing/printing_context.cc
 +++ b/printing/printing_context.cc
-@@ -128,7 +128,6 @@ void PrintingContext::UsePdfSettings() {
+@@ -143,7 +143,6 @@ void PrintingContext::UsePdfSettings() {
  
  mojom::ResultCode PrintingContext::UpdatePrintSettings(
      base::Value::Dict job_settings) {
@@ -844,7 +844,7 @@ index 56ee836445c53c5cde3947fca19d8576d2684f6f..454e26baa8b3688c2af98081085aa537
      std::unique_ptr<PrintSettings> settings =
          PrintSettingsFromJobSettings(job_settings);
 diff --git a/printing/printing_context.h b/printing/printing_context.h
-index 58fcf619add5093bd99fd9c561e8686b060a01c6..76db2a2438cef84fcb6dfd4a67d2e171428e4be0 100644
+index 0e6dd8092f6025790560ca2bab2d68daf47caff2..a4aa6e21b1d37e534b543ad8b112070eedd12d2e 100644
 --- a/printing/printing_context.h
 +++ b/printing/printing_context.h
 @@ -171,6 +171,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index e77c36ab6114a..f91220b02b3ec 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -23,8 +23,35 @@ This patch adds a few changes to the Chromium code:
    `ProcessSingleton` instance that tries to connect to the socket
    before the browser thread is ready.
 
+diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
+index aca2f19f53657fc2b944b69418e099b056c8e734..e43b0d89e2e6ad0bcb2c34bfacc4ef3b59eaaab1 100644
+--- a/chrome/browser/chrome_browser_main.cc
++++ b/chrome/browser/chrome_browser_main.cc
+@@ -1424,7 +1424,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+   switch (notify_result_) {
+     case ProcessSingleton::PROCESS_NONE:
+       // No process already running, fall through to starting a new one.
+-      process_singleton_->StartWatching();
+       g_browser_process->platform_part()->PlatformSpecificCommandLineProcessing(
+           *base::CommandLine::ForCurrentProcess());
+       break;
+diff --git a/chrome/browser/chrome_process_singleton.cc b/chrome/browser/chrome_process_singleton.cc
+index d97fa8a96c110acc25b0ef46d7a4ac1c708f7c76..0919af8e8b0a51ef8e8dd28f2f07139d197a7384 100644
+--- a/chrome/browser/chrome_process_singleton.cc
++++ b/chrome/browser/chrome_process_singleton.cc
+@@ -31,10 +31,6 @@ ProcessSingleton::NotifyResult
+   return process_singleton_.NotifyOtherProcessOrCreate();
+ }
+ 
+-void ChromeProcessSingleton::StartWatching() {
+-  process_singleton_.StartWatching();
+-}
+-
+ void ChromeProcessSingleton::Cleanup() {
+   process_singleton_.Cleanup();
+ }
 diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
-index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de67fe0a779 100644
+index 7cd82d27a741f194da5d0b3fcfd9c15c8ea1fa5c..5a64220aaf1309832dc0ad543e353de67fe0a779 100644
 --- a/chrome/browser/process_singleton.h
 +++ b/chrome/browser/process_singleton.h
 @@ -102,12 +102,19 @@ class ProcessSingleton {
@@ -56,7 +83,17 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
    // Sets ourself up as the singleton instance.  Returns true on success.  If
    // false is returned, we are not the singleton instance and the caller must
-@@ -173,6 +182,8 @@ class ProcessSingleton {
+@@ -127,9 +136,6 @@ class ProcessSingleton {
+   // another process should call this directly.
+   bool Create();
+ 
+-  // Start watching for notifications from other processes.
+-  void StartWatching();
+-
+   // Clear any lock state during shutdown.
+   void Cleanup();
+ 
+@@ -176,6 +182,8 @@ class ProcessSingleton {
  #if BUILDFLAG(IS_WIN)
    bool EscapeVirtualization(const base::FilePath& user_data_dir);
  
@@ -65,7 +102,13 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
    HWND remote_window_;  // The HWND_MESSAGE of another browser.
    base::win::MessageWindow window_;  // The message-only window.
    bool is_virtualized_;  // Stuck inside Microsoft Softricity VM environment.
-@@ -222,6 +233,8 @@ class ProcessSingleton {
+@@ -220,12 +228,13 @@ class ProcessSingleton {
+ 
+   // Temporary directory to hold the socket.
+   base::ScopedTempDir socket_dir_;
+-  int sock_ = -1;
+ 
+   // Helper class for linux specific messages.  LinuxWatcher is ref counted
    // because it posts messages between threads.
    class LinuxWatcher;
    scoped_refptr<LinuxWatcher> watcher_;
@@ -75,7 +118,7 @@ index 16bb3aa15a5378e8319f75f4b6b72b39177828f4..5a64220aaf1309832dc0ad543e353de6
  
  #if BUILDFLAG(IS_MAC)
 diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
-index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527dcee5125 100644
+index 7e4cc9cdd350e814c20feccdcc8d70b1080e60a1..2de07460462632680f9b16a019744527dcee5125 100644
 --- a/chrome/browser/process_singleton_posix.cc
 +++ b/chrome/browser/process_singleton_posix.cc
 @@ -54,6 +54,7 @@
@@ -138,7 +181,17 @@ index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527
  bool ConnectSocket(ScopedSocket* socket,
                     const base::FilePath& socket_path,
                     const base::FilePath& cookie_path) {
-@@ -769,6 +791,10 @@ ProcessSingleton::ProcessSingleton(
+@@ -757,7 +779,8 @@ ProcessSingleton::ProcessSingleton(
+     const base::FilePath& user_data_dir,
+     const NotificationCallback& notification_callback)
+     : notification_callback_(notification_callback),
+-      current_pid_(base::GetCurrentProcId()) {
++      current_pid_(base::GetCurrentProcId()),
++      watcher_(new LinuxWatcher(this)) {
+   socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename);
+   lock_path_ = user_data_dir.Append(chrome::kSingletonLockFilename);
+   cookie_path_ = user_data_dir.Append(chrome::kSingletonCookieFilename);
+@@ -768,6 +791,10 @@ ProcessSingleton::ProcessSingleton(
  
  ProcessSingleton::~ProcessSingleton() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -149,7 +202,7 @@ index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527
  }
  
  ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
-@@ -933,6 +959,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
+@@ -932,6 +959,20 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
        base::Seconds(kTimeoutInSeconds));
  }
  
@@ -170,7 +223,7 @@ index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527
  ProcessSingleton::NotifyResult
  ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
      const base::CommandLine& command_line,
-@@ -1032,14 +1072,32 @@ bool ProcessSingleton::Create() {
+@@ -1031,14 +1072,32 @@ bool ProcessSingleton::Create() {
  #endif
    }
  
@@ -208,26 +261,58 @@ index fa7ae4812ae5c13355d06dde1e99a17b17da6184..2de07460462632680f9b16a019744527
    // Check that the directory was created with the correct permissions.
    int dir_mode = 0;
    CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
-@@ -1082,10 +1140,13 @@ bool ProcessSingleton::Create() {
-   if (listen(sock, 5) < 0)
+@@ -1050,9 +1109,10 @@ bool ProcessSingleton::Create() {
+   // leaving a dangling symlink.
+   base::FilePath socket_target_path =
+       socket_dir_.GetPath().Append(chrome::kSingletonSocketFilename);
++  int sock;
+   SockaddrUn addr;
+   socklen_t socklen;
+-  SetupSocket(socket_target_path.value(), &sock_, &addr, &socklen);
++  SetupSocket(socket_target_path.value(), &sock, &addr, &socklen);
+ 
+   // Setup the socket symlink and the two cookies.
+   base::FilePath cookie(GenerateCookie());
+@@ -1071,26 +1131,24 @@ bool ProcessSingleton::Create() {
+     return false;
+   }
+ 
+-  if (bind(sock_, reinterpret_cast<sockaddr*>(&addr), socklen) < 0) {
++  if (bind(sock, reinterpret_cast<sockaddr*>(&addr), socklen) < 0) {
+     PLOG(ERROR) << "Failed to bind() " << socket_target_path.value();
+-    CloseSocket(sock_);
++    CloseSocket(sock);
+     return false;
+   }
+ 
+-  if (listen(sock_, 5) < 0)
++  if (listen(sock, 5) < 0)
      NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
  
+-  return true;
+-}
++  sock_ = sock;
+ 
+-void ProcessSingleton::StartWatching() {
+-  DCHECK_GE(sock_, 0);
+-  DCHECK(!watcher_);
+-  watcher_ = new LinuxWatcher(this);
 -  DCHECK(BrowserThread::IsThreadInitialized(BrowserThread::IO));
 -  content::GetIOThreadTaskRunner({})->PostTask(
 -      FROM_HERE, base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening,
--                                watcher_, sock));
-+  sock_ = sock;
-+
+-                                watcher_, sock_));
 +  if (BrowserThread::IsThreadInitialized(BrowserThread::IO)) {
 +    StartListeningOnSocket();
 +  } else {
 +    listen_on_ready_ = true;
 +  }
- 
-   return true;
++
++  return true;
  }
+ 
+ void ProcessSingleton::Cleanup() {
 diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
-index 363c18e4d9d5c0fe30f843d32df67e97e3d73111..0c87fc8ccb4511904f19b76ae5e03a5df6664391 100644
+index 41bc176510f93ef667e4f1373eab61142f3e264f..0c87fc8ccb4511904f19b76ae5e03a5df6664391 100644
 --- a/chrome/browser/process_singleton_win.cc
 +++ b/chrome/browser/process_singleton_win.cc
 @@ -29,7 +29,9 @@
@@ -316,3 +401,12 @@ index 363c18e4d9d5c0fe30f843d32df67e97e3d73111..0c87fc8ccb4511904f19b76ae5e03a5d
          CHECK(result && window_.hwnd());
        }
      }
+@@ -430,8 +455,6 @@ bool ProcessSingleton::Create() {
+   return window_.hwnd() != NULL;
+ }
+ 
+-void ProcessSingleton::StartWatching() {}
+-
+ void ProcessSingleton::Cleanup() {
+ }
+ 
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 8a829b1be7f4c..7cc9d0f959433 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,7 +30,7 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 5647890d0f62bcd5b1d1b2e6adc511b262a83b7f..9a818c66d76d50e9ba678e7a8e57381315eacf88 100644
+index 25a80899f9ae533e2d84e99076696468cef6e56d..e8a3a0525bea6185f4d7ef94edc99d5e6f060787 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -43,10 +43,10 @@ index 5647890d0f62bcd5b1d1b2e6adc511b262a83b7f..9a818c66d76d50e9ba678e7a8e573813
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 14bc2c9e77b7db69d03c00314fe55806d2a9e38c..ad3f25362279d889e800cee3fd20240cc6d176a9 100644
+index 9a0edcadef1bc60b035ca67df5082a7d06dd4436..a2f1f72a30f694d53f28d38d823341e7b4f008e1 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4587,6 +4587,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4593,6 +4593,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index 14bc2c9e77b7db69d03c00314fe55806d2a9e38c..ad3f25362279d889e800cee3fd20240c
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index a636e3c31860f67b01c178fd580df466266481ed..53435224b5e331bbe24119752c1a44a8d58bfa88 100644
+index 3221d31d311c74f32f77fed34d53721017cac5e3..864c0a9b7072b6c3ac6584ed35a833dd6afb9e34 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -962,6 +962,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -967,6 +967,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
@@ -71,7 +71,7 @@ index a636e3c31860f67b01c178fd580df466266481ed..53435224b5e331bbe24119752c1a44a8
        RenderWidgetHostImpl* render_widget_host) override;
    bool IsShowingContextMenuOnPage() const override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index 9ee3b74460c009c92fb811787250270ea13233b3..802d02e825d98f103f48e3134d6b9dd7e99aa2c5 100644
+index af8a777096c1202b3742d328c02e9e957389fc1e..3a3359865bcedecfa946d517dd50b299172958c9 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
 @@ -13,6 +13,7 @@
@@ -82,7 +82,7 @@ index 9ee3b74460c009c92fb811787250270ea13233b3..802d02e825d98f103f48e3134d6b9dd7
  #include "content/public/browser/allow_service_worker_result.h"
  #include "content/public/browser/reload_type.h"
  #include "content/public/browser/render_frame_host.h"
-@@ -527,6 +528,9 @@ class CONTENT_EXPORT WebContentsObserver {
+@@ -533,6 +534,9 @@ class CONTENT_EXPORT WebContentsObserver {
    // Invoked when the primary main frame changes size.
    virtual void PrimaryMainFrameWasResized(bool width_changed) {}
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index 71fbcccf77efd..9fb935ca29a76 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,10 +10,10 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39fe14086e 100644
+index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3b7e5c7a7 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-@@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
+@@ -157,6 +157,15 @@ void ExtractUnderlines(NSAttributedString* string,
  
  }  // namespace
  
@@ -26,10 +26,10 @@ index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39
 +- (BOOL)shouldIgnoreMouseEvent;
 +@end
 +
- // These are not documented, so use only after checking -respondsToSelector:.
- @interface NSApplication (UndocumentedSpeechMethods)
- - (void)speakString:(NSString*)string;
-@@ -602,6 +611,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+ // RenderWidgetHostViewCocoa ---------------------------------------------------
+ 
+ // Private methods:
+@@ -597,6 +606,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -39,7 +39,7 @@ index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -678,6 +690,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -673,6 +685,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -50,7 +50,7 @@ index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -997,6 +1013,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -992,6 +1008,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSEventTypeKeyDown &&
                                !(modifierFlags & NSEventModifierFlagCommand);
  
@@ -61,7 +61,7 @@ index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39
    // We only handle key down events and just simply forward other events.
    if (eventType != NSEventTypeKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1778,9 +1798,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1812,9 +1832,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index 77b20580138a8b3365e82239e9c2b8af7f0e2c05..5c583a2f85565fb52d9cea21c2d08e39
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1789,7 +1811,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1823,7 +1845,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index c0b985cf6b960..15c40e58c1027 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,7 +52,7 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index f42cc96b606f07f66a9d4dfacbdcd5b8cb157d21..a9e0afc645b8bd543590e80b55a7461381373187 100644
+index 6042493f09bfefb8b0eaad16588acbae984a3dad..31d63709bd68819a439901823b6649e4328244f8 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -1546,7 +1546,7 @@ if (is_chrome_branded && !is_android) {
diff --git a/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch b/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
new file mode 100644
index 0000000000000..133baa6af9698
--- /dev/null
+++ b/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
@@ -0,0 +1,112 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <keeleymhammond@gmail.com>
+Date: Mon, 15 Aug 2022 21:51:18 -0700
+Subject: Revert "[SpellCheck] Fully launch spell check delayed initialization"
+
+This reverts commit bf1a502a147c3208d7bb9106fb3aa71b4eee3cf6.
+Delaying spell check initialization is causing specs for
+'custom dictionary word list API' to fail in Electron. This patch
+can be reverted when those failures are addressed. It's unlikely
+that this patch will be upstreamed.
+
+diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
+index 72f8e9251df63db8ebebad9a5b682add91340e79..89361e9e8ea4e73c571d3960123030c0011a129d 100644
+--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
++++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
+@@ -302,26 +302,7 @@ TEST_F(LanguageSettingsPrivateApiTest, GetNeverTranslateLanguagesListTest) {
+   }
+ }
+ 
+-class LanguageSettingsPrivateApiGetLanguageListTest
+-    : public LanguageSettingsPrivateApiTest {
+- public:
+-  LanguageSettingsPrivateApiGetLanguageListTest() = default;
+-  ~LanguageSettingsPrivateApiGetLanguageListTest() override = default;
+-
+- protected:
+-  void InitFeatures() override {
+-#if BUILDFLAG(IS_WIN)
+-    // Force Windows hybrid spellcheck to be enabled, and disable the delayed
+-    // init feature since that case is tested in
+-    // LanguageSettingsPrivateApiTestDelayInit below.
+-    feature_list_.InitWithFeatures(
+-        /*enabled_features=*/{spellcheck::kWinUseBrowserSpellChecker},
+-        /*disabled_features=*/{spellcheck::kWinDelaySpellcheckServiceInit});
+-#endif  // BUILDFLAG(IS_WIN)
+-  }
+-};
+-
+-TEST_F(LanguageSettingsPrivateApiGetLanguageListTest, GetLanguageList) {
++TEST_F(LanguageSettingsPrivateApiTest, GetLanguageListTest) {
+   translate::TranslateDownloadManager::GetInstance()->ResetForTesting();
+   RunGetLanguageListTest();
+ }
+diff --git a/chrome/browser/spellchecker/spellcheck_service_unittest.cc b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
+index b8fa14fa50d82521845b9f84d62d9de922df9168..1e9c21eca325845bbc8f09a5287a2451f9829e80 100644
+--- a/chrome/browser/spellchecker/spellcheck_service_unittest.cc
++++ b/chrome/browser/spellchecker/spellcheck_service_unittest.cc
+@@ -341,18 +341,9 @@ const std::vector<std::string> SpellcheckServiceHybridUnitTestBase::
+                              // dictionaries.
+ };
+ 
+-class GetDictionariesHybridUnitTestNoDelayInit
++class SpellcheckServiceHybridUnitTest
+     : public SpellcheckServiceHybridUnitTestBase,
+-      public testing::WithParamInterface<TestCase> {
+- protected:
+-  void InitFeatures() override {
+-    // Disable kWinDelaySpellcheckServiceInit, as the case where it's enabled
+-    // is tested in SpellcheckServiceWindowsDictionaryMappingUnitTestDelayInit.
+-    feature_list_.InitWithFeatures(
+-        /*enabled_features=*/{spellcheck::kWinUseBrowserSpellChecker},
+-        /*disabled_features=*/{spellcheck::kWinDelaySpellcheckServiceInit});
+-  }
+-};
++      public testing::WithParamInterface<TestCase> {};
+ 
+ static const TestCase kHybridGetDictionariesParams[] = {
+     // Galician (gl) has only Windows support, no Hunspell dictionary. Croatian
+@@ -407,10 +398,10 @@ static const TestCase kHybridGetDictionariesParams[] = {
+ };
+ 
+ INSTANTIATE_TEST_SUITE_P(TestCases,
+-                         GetDictionariesHybridUnitTestNoDelayInit,
++                         SpellcheckServiceHybridUnitTest,
+                          testing::ValuesIn(kHybridGetDictionariesParams));
+ 
+-TEST_P(GetDictionariesHybridUnitTestNoDelayInit, GetDictionaries) {
++TEST_P(SpellcheckServiceHybridUnitTest, GetDictionaries) {
+   RunGetDictionariesTest(GetParam().accept_languages,
+                          GetParam().spellcheck_dictionaries,
+                          GetParam().expected_dictionaries);
+@@ -440,16 +431,7 @@ std::ostream& operator<<(std::ostream& out,
+ 
+ class SpellcheckServiceWindowsDictionaryMappingUnitTest
+     : public SpellcheckServiceHybridUnitTestBase,
+-      public testing::WithParamInterface<DictionaryMappingTestCase> {
+- protected:
+-  void InitFeatures() override {
+-    // Disable kWinDelaySpellcheckServiceInit, as the case where it's enabled
+-    // is tested in SpellcheckServiceWindowsDictionaryMappingUnitTestDelayInit.
+-    feature_list_.InitWithFeatures(
+-        /*enabled_features=*/{spellcheck::kWinUseBrowserSpellChecker},
+-        /*disabled_features=*/{spellcheck::kWinDelaySpellcheckServiceInit});
+-  }
+-};
++      public testing::WithParamInterface<DictionaryMappingTestCase> {};
+ 
+ static const DictionaryMappingTestCase kHybridDictionaryMappingsParams[] = {
+     DictionaryMappingTestCase({"en-CA", "en-CA", "en-CA", "en", "en"}),
+diff --git a/components/spellcheck/common/spellcheck_features.cc b/components/spellcheck/common/spellcheck_features.cc
+index 37f2b0e837d8031bee488e9fd7bd4eb456c42204..dcd365a802e0feebbb2bc3839c7a0f47fb113c70 100644
+--- a/components/spellcheck/common/spellcheck_features.cc
++++ b/components/spellcheck/common/spellcheck_features.cc
+@@ -32,7 +32,7 @@ const base::Feature kWinUseBrowserSpellChecker{
+     "WinUseBrowserSpellChecker", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kWinDelaySpellcheckServiceInit{
+-    "WinDelaySpellcheckServiceInit", base::FEATURE_ENABLED_BY_DEFAULT};
++    "WinDelaySpellcheckServiceInit", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kWinRetrieveSuggestionsOnlyOnDemand{
+     "WinRetrieveSuggestionsOnlyOnDemand", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 1047a3423e7df..3b4aba5a4d8b0 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 028c190ad21eb1899c61295695931bd2353518a5..9e74a54266460fc51e6b3492c842cda3c0b88538 100644
+index 14985e39b792e931a9884ae95b8d550776520478..d6c104b05471161901e76051e6ec0d1059aa2dd1 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1255,7 +1255,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1282,7 +1282,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index ee020bad0e1f1..de9a6514f7b84 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 5499f85fa578511d5817ecd9be2f33cf56e2db4b..3f0a3b2133f0d48054f33df28b93a9ee40d7ed78 100644
+index d2fbb44deef7a63cc1f5296d338d518bccab6a7c..7bb696c3ad090828b2a7e3a9a648b75bbf39f844 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -1762,9 +1762,15 @@ bool RenderProcessHostImpl::Init() {
@@ -42,7 +42,7 @@ index 5499f85fa578511d5817ecd9be2f33cf56e2db4b..3f0a3b2133f0d48054f33df28b93a9ee
  
      auto file_data = std::make_unique<ChildProcessLauncherFileData>();
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
-index af8173d4203150237387529aa2b974aeec7c5a41..9fadaa80a4547a583484355342c3fd98d53bcd27 100644
+index 71bbf3608a2b112e51b6b178755f06657f657ff9..6f3f2f00f35f5c5b38654cb0388cba070e3cdab2 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
 @@ -31,6 +31,9 @@ namespace content {
@@ -66,7 +66,7 @@ index af8173d4203150237387529aa2b974aeec7c5a41..9fadaa80a4547a583484355342c3fd98
      dynamic_code_can_be_disabled_ = true;
      return;
 diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
-index 3a0e25b38965de5b57fd0be1112cf62dfda846d7..f412080cfb49330d855fdf1cbc13ff8850530401 100644
+index d820cb4ff004194d9c18bfddaf90bf520e8446ff..0dcffcf367b5d08bb31b68e648c1f4ce3aa15600 100644
 --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
 @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
index f0a87b75ca482..b89002c3b34f4 100644
--- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
+++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
@@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
 Unsandboxed ppapi processes should skip zygote.
 
 diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
-index 6e1d72902ec3e4a479304ff39b8b537d23f5cdf3..b7b198b159d250eca1498206ec29cc0270071f2a 100644
+index f822120af8bf8849609a765d7478fbdba1e50a8b..f928b747d202179636761666ff084a81433a933b 100644
 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
 @@ -8,6 +8,7 @@
@@ -17,7 +17,7 @@ index 6e1d72902ec3e4a479304ff39b8b537d23f5cdf3..b7b198b159d250eca1498206ec29cc02
  
  #if BUILDFLAG(IS_WIN)
  #include "base/win/windows_version.h"
-@@ -54,6 +55,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
+@@ -62,6 +63,9 @@ bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget(
  ZygoteHandle PpapiPluginSandboxedProcessLauncherDelegate::GetZygote() {
    const base::CommandLine& browser_command_line =
        *base::CommandLine::ForCurrentProcess();
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index a8d925dde904d..eb23dbf6cc5af 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 9b532970afe951f7c12629903baa39f2b8de1a5e..6f01f3eb8df96320700448e4583e4a4a0b3d2beb 100644
+index 7ff6febe70e9ec82becfbe036883fbc7572b5b01..2a3c04df4f6f44d2cf75b661761c91d66cdc7ba4 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3066,6 +3066,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3073,6 +3073,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 9b532970afe951f7c12629903baa39f2b8de1a5e..6f01f3eb8df96320700448e4583e4a4a
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3076,6 +3083,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3083,6 +3090,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,7 +35,7 @@ index 9b532970afe951f7c12629903baa39f2b8de1a5e..6f01f3eb8df96320700448e4583e4a4a
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index 5c710ded76711125c8e2de8e2c9bce7569548732..a3ae580ea073024882bd860abf914bbf7c0ed54d 100644
+index f07dd54c9498e677e4b3e6a24cb9d794f4465e93..f92bcc8f2a212e6cda464d9b6060a561d689f467 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -94,10 +94,13 @@ class BrowserContext;
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 4377c64198a83..8f160ca9f5c99 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 6f963b0a1fcb00a16bcf423a494aad29b4c86b52..004fbb98b212372f7af73b9334ff44fb7a2a5eba 100644
+index 7f60d038fb9c2bc8364c580bc9c7684d97fbbcfb..b1eddf20c22edf974375b8a04d70fca72f7834af 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -901,10 +901,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -900,10 +900,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // for the outermost view. Inner `WebContents` will have a
    // `WebContentsViewChildFrame` so when dragging between an inner
    // `WebContents` and its embedder the view IDs will be the same.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 2e374e7e83645..24da4c76a0724 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 9c6f51f1667d9bf1b430a83747faebf633a324c7..edc7111e2a61c917ec987264ddfbc4ee55f33730 100644
+index 115dab63efa4b90f37609a9a0a363ad75a0ff582..324232704f0bc0db6c20031cc0a2217b35667c3d 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6565,6 +6565,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6579,6 +6579,17 @@ void RenderFrameHostImpl::EnterFullscreen(
      }
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index 994967d5e1d8a..a84e0a2e368a3 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,7 +10,7 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df28cf05e4 100644
+index d1fa110e7ccdcf496fe5e967cdb85b5fa0e54301..b2f206ed814e43e04815d1247ba4c6aa27f7084d 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
 @@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -26,10 +26,10 @@ index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index e6ed59bb367c2ec8997867d847d79304b5e78be4..f2401245c4feb507966a47c82c66d956802d5ede 100644
+index 8077fb82bc4bb6594c4676db12223d43bf650688..c05cc4f60a97f10cb0ed194267d6c81a0b50cc7c 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -873,6 +873,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -869,6 +869,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index e6ed59bb367c2ec8997867d847d79304b5e78be4..f2401245c4feb507966a47c82c66d956
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 62370f36f8b19c409e65c3d19a7536a50c7f3d0c..ad67b32366ee276d4a9917e17ce335c3ec507a48 100644
+index 8f4b58da709ba6e6a89b3d35d6eae5c23ee19389..7aa2a565643c27d946588bfc5212b3df39eb9d82 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -183,6 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -182,6 +182,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -67,10 +67,10 @@ index b3845ea3620684e3a89f9c2a99fb9c8505f942e2..d7fed3409f1846d9655aa2b4adc89768
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index ef06596ca9597496809064a4b5a5388caf2dac5a..aa045c3bebc0653449d99dd6e507ac76952ebf8c 100644
+index 91fd003fe648c8ac854843922714f30434e3663f..f67fbdd1c9eda7feb9f171fa8482c1d5cc29d508 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
-@@ -735,6 +735,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
+@@ -744,6 +744,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
      nested_runner_->QuitNow();
    }
  
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 33c10c2fd8b05..6bde8843fc9a7 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,7 +19,7 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7b491b9ba 100644
+index b2f206ed814e43e04815d1247ba4c6aa27f7084d..62c1555386315e00bdf7f677eb85f04ecd9f05d8 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
 @@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -35,10 +35,10 @@ index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index f2401245c4feb507966a47c82c66d956802d5ede..916fc0110338224c21bc6cc29536a152659e9569 100644
+index c05cc4f60a97f10cb0ed194267d6c81a0b50cc7c..f7b7c348509c775c8877058aa525c5900fc9aec3 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -885,6 +885,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -881,6 +881,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index f2401245c4feb507966a47c82c66d956802d5ede..916fc0110338224c21bc6cc29536a152
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index ad67b32366ee276d4a9917e17ce335c3ec507a48..62bc2b9122733d397093fdba0b2315cb0993cb48 100644
+index 7aa2a565643c27d946588bfc5212b3df39eb9d82..488d24afedf147307cb71480f5e6f1716318f0d2 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -183,6 +183,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -182,6 +182,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
diff --git a/patches/config.json b/patches/config.json
index e142fc9deee0d..c204b2717009d 100644
--- a/patches/config.json
+++ b/patches/config.json
@@ -21,5 +21,7 @@
 
   "src/electron/patches/Mantle": "src/third_party/squirrel.mac/vendor/Mantle",
 
-  "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC"
+  "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
+
+  "src/electron/patches/lss": "src/third_party/lss"
 }
diff --git a/patches/lss/.patches b/patches/lss/.patches
new file mode 100644
index 0000000000000..773143e264950
--- /dev/null
+++ b/patches/lss/.patches
@@ -0,0 +1 @@
+fix_cast_pwrite64_arg_to_long_for_arm.patch
diff --git a/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch b/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
new file mode 100644
index 0000000000000..3f74555fe0fd9
--- /dev/null
+++ b/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: VerteDinde <keeleymhammond@gmail.com>
+Date: Tue, 9 Aug 2022 14:05:55 -0700
+Subject: fix: cast pwrite64 arg to long for arm
+
+This patch cases pwrite64 arg to a long in order to avoid a
+compilation error on arm. This patch can be eliminated when the
+upstream patch is merged into chromium main:
+
+https://chromium-review.googlesource.com/c/linux-syscall-support/+/3786946
+
+diff --git a/linux_syscall_support.h b/linux_syscall_support.h
+index e4e816f4bd001a6de7b98972d1cbaec9aaa8f821..5ea1295f8e9bb5312469dbc1aadb67dd620d35d3 100644
+--- a/linux_syscall_support.h
++++ b/linux_syscall_support.h
+@@ -4842,7 +4842,7 @@ struct kernel_statfs {
+                            unsigned, o2)
+       LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
+                            const void *,   b, size_t, c, unsigned, o1,
+-                           long, o2)
++                           unsigned, o2)
+       LSS_INLINE _syscall4(int, _readahead,          int,         f,
+                            unsigned,       o1, unsigned, o2, size_t, c)
+     #endif
diff --git a/patches/node/.patches b/patches/node/.patches
index 9e31afcb3458c..d035735890958 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -46,3 +46,4 @@ json_parse_errors_made_user-friendly.patch
 support_v8_sandboxed_pointers.patch
 build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
 build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
+fix_override_createjob_in_node_platform.patch
diff --git a/patches/node/fix_override_createjob_in_node_platform.patch b/patches/node/fix_override_createjob_in_node_platform.patch
new file mode 100644
index 0000000000000..252cf947f4bc4
--- /dev/null
+++ b/patches/node/fix_override_createjob_in_node_platform.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Keeley Hammond <khammond@slack-corp.com>
+Date: Tue, 2 Aug 2022 12:52:02 -0700
+Subject: fix: override createjob in node_platform
+
+This CL changed Platform::CreateJob to an abstract method:
+https://chromium-review.googlesource.com/c/v8/v8/+/3779694
+This patch adds an override for NodePlatform::CreateJob, using
+the same parameters as PostJob.
+
+diff --git a/src/node_platform.cc b/src/node_platform.cc
+index 5be79694fef65c9290f1b46d2657581dea16f543..e10caa9f6e39ec5b255acd9bc6b7f8efc77221d9 100644
+--- a/src/node_platform.cc
++++ b/src/node_platform.cc
+@@ -523,6 +523,12 @@ std::unique_ptr<v8::JobHandle> NodePlatform::PostJob(v8::TaskPriority priority,
+       this, priority, std::move(job_task), NumberOfWorkerThreads());
+ }
+ 
++std::unique_ptr<v8::JobHandle> NodePlatform::CreateJob(v8::TaskPriority priority,
++                                       std::unique_ptr<v8::JobTask> job_task) {
++  return v8::platform::NewDefaultJobHandle(
++      this, priority, std::move(job_task), NumberOfWorkerThreads());
++}
++
+ bool NodePlatform::IdleTasksEnabled(Isolate* isolate) {
+   return ForIsolate(isolate)->IdleTasksEnabled();
+ }
+diff --git a/src/node_platform.h b/src/node_platform.h
+index 4a05f3bba58c8e875d0ab67f292589edbb3b812b..b8a956c286a5ea88b8b520322e04b4e4e16a2591 100644
+--- a/src/node_platform.h
++++ b/src/node_platform.h
+@@ -158,6 +158,9 @@ class NodePlatform : public MultiIsolatePlatform {
+   std::unique_ptr<v8::JobHandle> PostJob(
+       v8::TaskPriority priority,
+       std::unique_ptr<v8::JobTask> job_task) override;
++  std::unique_ptr<v8::JobHandle> CreateJob(
++      v8::TaskPriority priority,
++      std::unique_ptr<v8::JobTask> job_task) override;
+ 
+   void RegisterIsolate(v8::Isolate* isolate, uv_loop_t* loop) override;
+   void RegisterIsolate(v8::Isolate* isolate,
diff --git a/patches/v8/.patches b/patches/v8/.patches
index 0e16c5eabc6fe..890f2f25a5475 100644
--- a/patches/v8/.patches
+++ b/patches/v8/.patches
@@ -9,4 +9,3 @@ fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
 revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch
 revert_runtime_dhceck_terminating_exception_in_microtasks.patch
 chore_disable_is_execution_terminating_dcheck.patch
-build_remove_legacy_oom_error_callback.patch
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 56bc38317f1db..85b8bf878eb58 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index c918081b31fdf15efd325ae9d688f6c4f59aded1..15d0dcf9f6ea151f4dcacff0f3dc11b318a1e1cd 100644
+index 0c1a72dfd2a3cb95004de7b32fc35ac982c5f927..f359ea10d6e83f94b698d9d728147944ea566018 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -636,7 +636,7 @@ config("internal_config") {
+@@ -650,7 +650,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index c918081b31fdf15efd325ae9d688f6c4f59aded1..15d0dcf9f6ea151f4dcacff0f3dc11b3
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -5999,7 +5999,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6124,7 +6124,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
diff --git a/patches/v8/build_remove_legacy_oom_error_callback.patch b/patches/v8/build_remove_legacy_oom_error_callback.patch
deleted file mode 100644
index 0fa0b7bbd422d..0000000000000
--- a/patches/v8/build_remove_legacy_oom_error_callback.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <keeleymhammond@gmail.com>
-Date: Tue, 14 Jun 2022 15:12:43 -0700
-Subject: build: remove legacy oom error callback
-
-Addresses 3646014: [API] Deprecate LegacyOOMErrorCallback:
-https://chromium-review.googlesource.com/c/v8/v8/+/3646014
-
-This deprecation was added to warn embedders that the legacy method
-was being replaced. However, Electron does not use the legacy method.
-The deprecation causes build issues on Windows, this patch removes
-the unused method entirely to avoid those errors.
-
-This patch can be removed in v8 10.6, when legacy_oom_error_callback
-is removed.
-
-diff --git a/include/v8-callbacks.h b/include/v8-callbacks.h
-index b39921dea0415362d1a30159f3fac0e345e2313e..810fc4edaf69565959148d3c1ec662f0db3e8490 100644
---- a/include/v8-callbacks.h
-+++ b/include/v8-callbacks.h
-@@ -217,10 +217,6 @@ using AddHistogramSampleCallback = void (*)(void* histogram, int sample);
- 
- using FatalErrorCallback = void (*)(const char* location, const char* message);
- 
--using LegacyOOMErrorCallback V8_DEPRECATED(
--    "Use OOMErrorCallback (https://crbug.com/1323177)") =
--    void (*)(const char* location, bool is_heap_oom);
--
- struct OOMDetails {
-   bool is_heap_oom = false;
-   const char* detail = nullptr;
-diff --git a/include/v8-initialization.h b/include/v8-initialization.h
-index 66adf98c17998dd81178e515db01ef43daae14d7..224ae0dc6b34b4724192a1b0547be110f796a9b2 100644
---- a/include/v8-initialization.h
-+++ b/include/v8-initialization.h
-@@ -284,9 +284,6 @@ class V8_EXPORT V8 {
-    */
-   static void SetFatalMemoryErrorCallback(OOMErrorCallback callback);
- 
--  V8_DEPRECATED("Use OOMErrorCallback (https://crbug.com/1323177)")
--  static void SetFatalMemoryErrorCallback(LegacyOOMErrorCallback callback);
--
-   /**
-    * Get statistics about the shared memory usage.
-    */
-diff --git a/include/v8-isolate.h b/include/v8-isolate.h
-index b54c7388603b4582356f6741c9a36f2835aa1928..b9533b78046228705e2038396eebf23b1d663df1 100644
---- a/include/v8-isolate.h
-+++ b/include/v8-isolate.h
-@@ -288,9 +288,6 @@ class V8_EXPORT Isolate {
-     FatalErrorCallback fatal_error_callback = nullptr;
-     OOMErrorCallback oom_error_callback = nullptr;
- 
--    V8_DEPRECATED("Use oom_error_callback (https://crbug.com/1323177)")
--    LegacyOOMErrorCallback legacy_oom_error_callback = nullptr;
--
-     /**
-      * The following parameter is experimental and may change significantly.
-      * This is currently for internal testing.
-@@ -1468,10 +1465,6 @@ class V8_EXPORT Isolate {
-   /** Set the callback to invoke in case of fatal errors. */
-   void SetFatalErrorHandler(FatalErrorCallback that);
- 
--  /** Set the callback to invoke in case of OOM errors (deprecated). */
--  V8_DEPRECATED("Use OOMErrorCallback (https://crbug.com/1323177)")
--  void SetOOMErrorHandler(LegacyOOMErrorCallback that);
--
-   /** Set the callback to invoke in case of OOM errors. */
-   void SetOOMErrorHandler(OOMErrorCallback that);
- 
-diff --git a/src/api/api.cc b/src/api/api.cc
-index 9fafa6b0089aabf55984b68cff85e353fe50ce52..9472ad8f4f776f98d398113b22a6a710596b3cde 100644
---- a/src/api/api.cc
-+++ b/src/api/api.cc
-@@ -171,13 +171,6 @@
- 
- namespace v8 {
- 
--// Redefine LegacyOOMErrorCallback here for internal usage. We still need to
--// support it but it is deprecated so would trigger warnings.
--// TODO(chromium:1323177): Remove this.
--using DeprecatedLegacyOOMErrorCallback = void (*)(const char* location,
--                                                  bool is_heap_oom);
--
--static DeprecatedLegacyOOMErrorCallback g_legacy_oom_error_callback = nullptr;
- static OOMErrorCallback g_oom_error_callback = nullptr;
- 
- static ScriptOrigin GetScriptOriginForScript(i::Isolate* i_isolate,
-@@ -235,9 +228,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
-     // Give the embedder a chance to handle the condition. If it doesn't,
-     // just crash.
-     if (g_oom_error_callback) g_oom_error_callback(location, details);
--    if (g_legacy_oom_error_callback) {
--      g_legacy_oom_error_callback(location, details.is_heap_oom);
--    }
-     FATAL("Fatal process out of memory: %s", location);
-     UNREACHABLE();
-   }
-@@ -313,9 +303,6 @@ void i::V8::FatalProcessOutOfMemory(i::Isolate* i_isolate, const char* location,
-   }
-   Utils::ReportOOMFailure(i_isolate, location, details);
-   if (g_oom_error_callback) g_oom_error_callback(location, details);
--  if (g_legacy_oom_error_callback) {
--    g_legacy_oom_error_callback(location, details.is_heap_oom);
--  }
-   // If the fatal error handler returns, we stop execution.
-   FATAL("API fatal error handler returned after process out of memory");
- }
-@@ -347,8 +334,6 @@ void Utils::ReportOOMFailure(i::Isolate* i_isolate, const char* location,
-                              const OOMDetails& details) {
-   if (auto oom_callback = i_isolate->oom_behavior()) {
-     oom_callback(location, details);
--  } else if (auto legacy_oom_callback = i_isolate->legacy_oom_behavior()) {
--    legacy_oom_callback(location, details.is_heap_oom);
-   } else {
-     // TODO(wfh): Remove this fallback once Blink is setting OOM handler. See
-     // crbug.com/614440.
-@@ -6175,11 +6160,6 @@ void v8::V8::SetFatalMemoryErrorCallback(
-   g_oom_error_callback = oom_error_callback;
- }
- 
--void v8::V8::SetFatalMemoryErrorCallback(
--    v8::LegacyOOMErrorCallback legacy_oom_error_callback) {
--  g_legacy_oom_error_callback = legacy_oom_error_callback;
--}
--
- void v8::V8::SetEntropySource(EntropySource entropy_source) {
-   base::RandomNumberGenerator::SetEntropySource(entropy_source);
- }
-@@ -8702,8 +8682,6 @@ void Isolate::Initialize(Isolate* v8_isolate,
- #endif
-   if (params.oom_error_callback) {
-     v8_isolate->SetOOMErrorHandler(params.oom_error_callback);
--  } else if (params.legacy_oom_error_callback) {
--    v8_isolate->SetOOMErrorHandler(params.legacy_oom_error_callback);
-   }
- #if __clang__
- #pragma clang diagnostic pop
-@@ -9445,8 +9423,6 @@ size_t Isolate::CopyCodePages(size_t capacity, MemoryRange* code_pages_out) {
- 
- CALLBACK_SETTER(FatalErrorHandler, FatalErrorCallback, exception_behavior)
- CALLBACK_SETTER(OOMErrorHandler, OOMErrorCallback, oom_behavior)
--CALLBACK_SETTER(OOMErrorHandler, DeprecatedLegacyOOMErrorCallback,
--                legacy_oom_behavior)
- CALLBACK_SETTER(ModifyCodeGenerationFromStringsCallback,
-                 ModifyCodeGenerationFromStringsCallback2,
-                 modify_code_gen_callback2)
-diff --git a/src/execution/isolate.h b/src/execution/isolate.h
-index 13100146bdc981480a08156b54649b8f995789ae..9a117c4220704ed512b117aa2f50c3791f8e9189 100644
---- a/src/execution/isolate.h
-+++ b/src/execution/isolate.h
-@@ -487,16 +487,9 @@ V8_EXPORT_PRIVATE void FreeCurrentEmbeddedBlob();
- 
- using DebugObjectCache = std::vector<Handle<HeapObject>>;
- 
--// Redefine LegacyOOMErrorCallback here for internal usage. We still need to
--// support it but it is deprecated so would trigger warnings.
--// TODO(chromium:1323177): Remove this.
--using DeprecatedLegacyOOMErrorCallback = void (*)(const char* location,
--                                                  bool is_heap_oom);
--
- #define ISOLATE_INIT_LIST(V)                                                  \
-   /* Assembler state. */                                                      \
-   V(FatalErrorCallback, exception_behavior, nullptr)                          \
--  V(DeprecatedLegacyOOMErrorCallback, legacy_oom_behavior, nullptr)           \
-   V(OOMErrorCallback, oom_behavior, nullptr)                                  \
-   V(LogEventCallback, event_logger, nullptr)                                  \
-   V(AllowCodeGenerationFromStringsCallback, allow_code_gen_callback, nullptr) \
diff --git a/patches/v8/chore_disable_is_execution_terminating_dcheck.patch b/patches/v8/chore_disable_is_execution_terminating_dcheck.patch
index dc3e18c332412..01fff8491a630 100644
--- a/patches/v8/chore_disable_is_execution_terminating_dcheck.patch
+++ b/patches/v8/chore_disable_is_execution_terminating_dcheck.patch
@@ -20,3 +20,16 @@ index 149dd0555a69be576fd1eb97aa79b8aedafcac04..233e6d2ac511c4a7fa45d47bb7448bee
    DCHECK_NO_SCRIPT_NO_EXCEPTION_MAYBE_TEARDOWN(i_isolate)
  
  #define ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate) \
+diff --git a/src/execution/microtask-queue.cc b/src/execution/microtask-queue.cc
+index f47228f80b6a2b9e89afd50e6f67eba1185c0dd6..8adf3a9159b947f4fa567317d05cf0b9f204c862 100644
+--- a/src/execution/microtask-queue.cc
++++ b/src/execution/microtask-queue.cc
+@@ -179,7 +179,7 @@ int MicrotaskQueue::RunMicrotasks(Isolate* isolate) {
+ 
+   if (isolate->is_execution_terminating()) {
+     DCHECK(isolate->has_scheduled_exception());
+-    DCHECK(maybe_result.is_null());
++    // DCHECK(maybe_result.is_null());
+     delete[] ring_buffer_;
+     ring_buffer_ = nullptr;
+     capacity_ = 0;
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 3dd20921716bf..6871851eab3de 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index bbab4c72ac93fe7a5bba5de531e66be0775244ca..9fafa6b0089aabf55984b68cff85e353fe50ce52 100644
+index 0b6bdbc0328dfc979531dbbb25c5fc7b02f661bd..191ee0bb424471c1240835dedc7f25b84221f3b1 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9194,7 +9194,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9181,7 +9181,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index bbab4c72ac93fe7a5bba5de531e66be0775244ca..9fafa6b0089aabf55984b68cff85e353
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
 diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 5ed434303b6be71dc99abd7600f4ef489f763419..7e2952b9b14f915df72573d6be0813401da0cafb 100644
+index 41f2378ba770a96d9722b8d50d28f3562ebf5101..59338d1d293d5325e89052dd226a9ad4f9e8b46a 100644
 --- a/src/heap/heap.cc
 +++ b/src/heap/heap.cc
-@@ -6195,9 +6195,9 @@ void Heap::TearDown() {
+@@ -6165,9 +6165,9 @@ void Heap::TearDown() {
  void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
                                   GCType gc_type, void* data) {
    DCHECK_NOT_NULL(callback);
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 6762589722f4e..722a2ab2441e6 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 88d775bfe22d6f1ff738120d11cb1123c5ac106c..feab71df47427d6aaebddb581762fa1a2fd16887 100644
+index 09c3dc73292e2778baba3a0f7f1a02d875845d34..cf9dff8346bbe086464391758a5c11f228b3898c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -636,6 +636,10 @@ config("internal_config") {
+@@ -650,6 +650,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index fe13e37d5a64e..d4730296b4dd9 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index 647fbb52bf1faaad92ef1b4537d6226344cb27b2..86b1123804058f1ecca5bd7076f5108cd1f28912 100644
+index fbdf5f029f19d8c231e70593e4860f8949e66e45..f98808fa74d79f8492f5a9aac92783b0775bfdf6 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -929,7 +929,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -930,7 +930,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index ba2b64e10fbf9..00ce43c0d6d10 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 15d0dcf9f6ea151f4dcacff0f3dc11b318a1e1cd..88d775bfe22d6f1ff738120d11cb1123c5ac106c 100644
+index f359ea10d6e83f94b698d9d728147944ea566018..09c3dc73292e2778baba3a0f7f1a02d875845d34 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -6011,7 +6011,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6136,7 +6136,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
index e39d8853848c3..3bc3ef7c64f34 100644
--- a/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
+++ b/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
@@ -6,10 +6,10 @@ Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
 This attribute can only be used in all contexts in Visual Studio 2019
 
 diff --git a/include/v8config.h b/include/v8config.h
-index 6213da2ef434fff934b298eada084647d7a6ddc4..754743b0c82e2ccf9a330d18785f8cb59df80869 100644
+index 85bbfce01dff2b0b499e5c02b80e23b682443582..9cedeff64478d900bc6730537caff16f09dcfd46 100644
 --- a/include/v8config.h
 +++ b/include/v8config.h
-@@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
+@@ -469,10 +469,13 @@ path. Add it with -I<path> to the command line
  # define V8_NOINLINE /* NOT SUPPORTED */
  #endif
  
@@ -25,7 +25,7 @@ index 6213da2ef434fff934b298eada084647d7a6ddc4..754743b0c82e2ccf9a330d18785f8cb5
  #else
  # define V8_DEPRECATED(message)
  #endif
-@@ -465,13 +468,17 @@ path. Add it with -I<path> to the command line
+@@ -480,7 +483,11 @@ path. Add it with -I<path> to the command line
  
  // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
  #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
@@ -38,6 +38,8 @@ index 6213da2ef434fff934b298eada084647d7a6ddc4..754743b0c82e2ccf9a330d18785f8cb5
  #else
  # define V8_DEPRECATE_SOON(message)
  #endif
+@@ -514,7 +521,7 @@ path. Add it with -I<path> to the command line
+   END_ALLOW_USE_DEPRECATED()
  
  
 -#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ < 6)
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index f4802be8f6e88..7befb3ae7a01e 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,10 +18,10 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index a984d2ce736a2c9a46eb7cc46eb03fc062f508d2..6bda9bc5878b1ee344eac9f9c4420db09a307792 100644
+index fe435ad067837df7f1ebc971083b6585952903f5..34660673e239cbc49e749732e95d16c20982a675 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
-@@ -6123,12 +6123,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+@@ -6124,12 +6124,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    StoreFullTaggedNoWriteBarrier(pending_message, message);
  }
  
@@ -35,10 +35,10 @@ index a984d2ce736a2c9a46eb7cc46eb03fc062f508d2..6bda9bc5878b1ee344eac9f9c4420db0
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index 9633ba5333c4f1c37e706f655fe37c59c4993b86..6022d5d5063bc6c4db1c15e1ffaaf4d5420c0a01 100644
+index c4878044b149ec23f4ac9198f402ccc5114e219e..ba9be792cbcce3cbc85062daa524010dced2cfeb 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -2518,7 +2518,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+@@ -2533,7 +2533,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
  
    TNode<HeapObject> GetPendingMessage();
    void SetPendingMessage(TNode<HeapObject> message);
@@ -46,16 +46,3 @@ index 9633ba5333c4f1c37e706f655fe37c59c4993b86..6022d5d5063bc6c4db1c15e1ffaaf4d5
  
    // Type checks.
    // Check whether the map is for an object with special properties, such as a
-diff --git a/src/execution/microtask-queue.cc b/src/execution/microtask-queue.cc
-index 2bea5d45bb0605877ad430882c914dddeb2c51c5..12a626900d0295be0b250cd6d4692ab4e329c681 100644
---- a/src/execution/microtask-queue.cc
-+++ b/src/execution/microtask-queue.cc
-@@ -179,8 +179,6 @@ int MicrotaskQueue::RunMicrotasks(Isolate* isolate) {
-                      processed_microtask_count);
-   }
- 
--  DCHECK_IMPLIES(isolate->has_scheduled_exception(),
--                 maybe_result.is_null() && maybe_exception.is_null());
-   // If execution is terminating, clean up and propagate that to TryCatch scope.
-   if (maybe_result.is_null() && maybe_exception.is_null()) {
-     delete[] ring_buffer_;
diff --git a/script/apply_all_patches.py b/script/apply_all_patches.py
index c2e83bea7798a..5e35fc686ec7b 100755
--- a/script/apply_all_patches.py
+++ b/script/apply_all_patches.py
@@ -11,9 +11,10 @@
 def apply_patches(dirs):
   threeway = os.environ.get("ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES")
   for patch_dir, repo in dirs.items():
-    git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
-      threeway=threeway is not None,
-      committer_name="Electron Scripts", committer_email="scripts@electron")
+    if os.path.exists(repo):
+      git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
+        threeway=threeway is not None,
+        committer_name="Electron Scripts", committer_email="scripts@electron")
 
 
 def parse_args():
diff --git a/script/verify-mksnapshot.py b/script/verify-mksnapshot.py
index 47d0a4fa32842..7efbc59dbe5f7 100755
--- a/script/verify-mksnapshot.py
+++ b/script/verify-mksnapshot.py
@@ -28,6 +28,7 @@ def main():
       if args.snapshot_files_dir is None:
         with open(os.path.join(app_path, 'mksnapshot_args')) as f:
           mkargs = f.read().splitlines()
+        print('running: ' + ' '.join(mkargs + [ SNAPSHOT_SOURCE ]))
         subprocess.check_call(mkargs + [ SNAPSHOT_SOURCE ], cwd=app_path)
         print('ok mksnapshot successfully created snapshot_blob.bin.')
         context_snapshot = 'v8_context_snapshot.bin'
@@ -41,6 +42,7 @@ def main():
                                     app_path)
         genargs = [ gen_binary, \
                   '--output_file={0}'.format(context_snapshot_path) ]
+        print('running: ' + ' '.join(genargs))
         subprocess.check_call(genargs)
         print('ok v8_context_snapshot_generator successfully created ' \
               + context_snapshot)
@@ -69,6 +71,7 @@ def main():
       else:
         electron = os.path.join(app_path, PROJECT_NAME)
 
+      print('running: ' + ' '.join([electron, test_path]))
       subprocess.check_call([electron, test_path])
       print('ok successfully used custom snapshot.')
   except subprocess.CalledProcessError as e:
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 897f8a698a4b7..537f74a14d6d9 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -240,7 +240,7 @@ const char* const ElectronMainDelegate::kNonWildcardDomainNonPortSchemes[] = {
 const size_t ElectronMainDelegate::kNonWildcardDomainNonPortSchemesSize =
     std::size(kNonWildcardDomainNonPortSchemes);
 
-bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
+absl::optional<int> ElectronMainDelegate::BasicStartupComplete() {
   auto* command_line = base::CommandLine::ForCurrentProcess();
 
 #if BUILDFLAG(IS_WIN)
@@ -318,7 +318,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) {
   content_client_ = std::make_unique<ElectronContentClient>();
   SetContentClient(content_client_.get());
 
-  return false;
+  return absl::nullopt;
 }
 
 void ElectronMainDelegate::PreSandboxStartup() {
@@ -411,7 +411,7 @@ void ElectronMainDelegate::SandboxInitialized(const std::string& process_type) {
 #endif
 }
 
-void ElectronMainDelegate::PreBrowserMain() {
+absl::optional<int> ElectronMainDelegate::PreBrowserMain() {
   // This is initialized early because the service manager reads some feature
   // flags and we need to make sure the feature list is initialized before the
   // service manager reads the features.
@@ -419,6 +419,7 @@ void ElectronMainDelegate::PreBrowserMain() {
 #if BUILDFLAG(IS_MAC)
   RegisterAtomCrApp();
 #endif
+  return absl::nullopt;
 }
 
 content::ContentBrowserClient*
diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
index dd43875cc5d17..e8e57fad85db6 100644
--- a/shell/app/electron_main_delegate.h
+++ b/shell/app/electron_main_delegate.h
@@ -32,10 +32,10 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
 
  protected:
   // content::ContentMainDelegate:
-  bool BasicStartupComplete(int* exit_code) override;
+  absl::optional<int> BasicStartupComplete() override;
   void PreSandboxStartup() override;
   void SandboxInitialized(const std::string& process_type) override;
-  void PreBrowserMain() override;
+  absl::optional<int> PreBrowserMain() override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
   content::ContentGpuClient* CreateContentGpuClient() override;
   content::ContentRendererClient* CreateContentRendererClient() override;
diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc
index 3bea4fcca49a8..1208144c96798 100644
--- a/shell/browser/api/electron_api_menu.cc
+++ b/shell/browser/api/electron_api_menu.cc
@@ -210,7 +210,7 @@ void Menu::Clear() {
 }
 
 int Menu::GetIndexOfCommandId(int command_id) const {
-  return model_->GetIndexOfCommandId(command_id);
+  return model_->GetIndexOfCommandId(command_id).value_or(-1);
 }
 
 int Menu::GetItemCount() const {
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index b7a03e906e2a1..21b96159fb493 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2859,7 +2859,7 @@ void WebContents::OnPDFCreated(
     gin_helper::Promise<v8::Local<v8::Value>> promise,
     PrintViewManagerElectron::PrintResult print_result,
     scoped_refptr<base::RefCountedMemory> data) {
-  if (print_result != PrintViewManagerElectron::PrintResult::PRINT_SUCCESS) {
+  if (print_result != PrintViewManagerElectron::PrintResult::kPrintSuccess) {
     promise.RejectWithErrorMessage(
         "Failed to generate PDF: " +
         PrintViewManagerElectron::PrintResultToString(print_result));
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
index 98330a4787bc7..340cb5a4a35f2 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
@@ -134,7 +134,8 @@ void ElectronBluetoothDelegate::ShowDevicePairPrompt(
     content::RenderFrameHost* frame,
     const std::u16string& device_identifier,
     PairPromptCallback callback,
-    PairingKind pairing_kind) {
+    PairingKind pairing_kind,
+    const absl::optional<std::u16string>& pin) {
   NOTIMPLEMENTED();
   std::move(callback).Run(BluetoothDelegate::PairPromptResult(
       BluetoothDelegate::PairPromptStatus::kCancelled));
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h
index 48d07dfb6f8b7..df4f07703e815 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.h
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h
@@ -55,7 +55,8 @@ class ElectronBluetoothDelegate : public content::BluetoothDelegate {
   void ShowDevicePairPrompt(content::RenderFrameHost* frame,
                             const std::u16string& device_identifier,
                             PairPromptCallback callback,
-                            PairingKind pairing_kind) override;
+                            PairingKind pairing_kind,
+                            const absl::optional<std::u16string>& pin) override;
   blink::WebBluetoothDeviceId GetWebBluetoothDeviceId(
       content::RenderFrameHost* frame,
       const std::string& device_address) override;
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 8e1b6833470ff..546dc7e6fdcb4 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1536,8 +1536,7 @@ void ElectronBrowserClient::OverrideURLLoaderFactoryParams(
 bool ElectronBrowserClient::PreSpawnChild(sandbox::TargetPolicy* policy,
                                           sandbox::mojom::Sandbox sandbox_type,
                                           ChildSpawnFlags flags) {
-  // Allow crashpad to communicate via named pipe.
-  sandbox::ResultCode result = policy->AddRule(
+  sandbox::ResultCode result = policy->GetConfig()->AddRule(
       sandbox::SubSystem::kFiles, sandbox::Semantics::kFilesAllowAny,
       L"\\??\\pipe\\crashpad_*");
   if (result != sandbox::SBOX_ALL_OK)
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 59d09e8730652..046752918d45c 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -83,6 +83,7 @@
 #endif
 
 #if BUILDFLAG(IS_WIN)
+#include "base/win/dark_mode_support.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/display/win/dpi.h"
 #include "ui/gfx/system_fonts_win.h"
@@ -374,7 +375,6 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
 void ElectronBrowserMainParts::ToolkitInitialized() {
 #if BUILDFLAG(IS_LINUX)
   auto linux_ui = ui::CreateLinuxUi();
-  DCHECK(ui::LinuxInputMethodContextFactory::instance());
 
   // Try loading gtk symbols used by Electron.
   electron::InitializeElectron_gtk(gtk::GetLibGtk());
@@ -444,6 +444,11 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
   SpellcheckServiceFactory::GetInstance();
 #endif
 
+#if BUILDFLAG(IS_WIN)
+  // access ui native theme here to prevent blocking calls later
+  base::win::AllowDarkModeForApp(true);
+#endif
+
   content::WebUIControllerFactory::RegisterFactory(
       ElectronWebUIControllerFactory::GetInstance());
 
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
index 6c67490e75893..0fef6977e96aa 100644
--- a/shell/browser/hid/electron_hid_delegate.cc
+++ b/shell/browser/hid/electron_hid_delegate.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/containers/contains.h"
 #include "chrome/common/chrome_features.h"
 #include "content/public/browser/web_contents.h"
 #include "services/device/public/cpp/hid/hid_switches.h"
@@ -106,6 +107,7 @@ void ElectronHidDelegate::AddObserver(content::BrowserContext* browser_context,
 }
 
 void ElectronHidDelegate::RemoveObserver(
+    content::BrowserContext* browser_context,
     content::HidDelegate::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
diff --git a/shell/browser/hid/electron_hid_delegate.h b/shell/browser/hid/electron_hid_delegate.h
index 91c1dccfcde2c..2b09fa84f92bc 100644
--- a/shell/browser/hid/electron_hid_delegate.h
+++ b/shell/browser/hid/electron_hid_delegate.h
@@ -46,7 +46,8 @@ class ElectronHidDelegate : public content::HidDelegate,
       content::BrowserContext* browser_context) override;
   void AddObserver(content::BrowserContext* browser_context,
                    content::HidDelegate::Observer* observer) override;
-  void RemoveObserver(content::HidDelegate::Observer* observer) override;
+  void RemoveObserver(content::BrowserContext* browser_context,
+                      content::HidDelegate::Observer* observer) override;
   const device::mojom::HidDeviceInfo* GetDeviceInfo(
       content::BrowserContext* browser_context,
       const std::string& guid) override;
diff --git a/shell/browser/printing/print_view_manager_electron.cc b/shell/browser/printing/print_view_manager_electron.cc
index ccfb4d0f44ffe..9d33db221eb7b 100644
--- a/shell/browser/printing/print_view_manager_electron.cc
+++ b/shell/browser/printing/print_view_manager_electron.cc
@@ -63,27 +63,27 @@ void PrintViewManagerElectron::BindPrintManagerHost(
 // static
 std::string PrintViewManagerElectron::PrintResultToString(PrintResult result) {
   switch (result) {
-    case PRINT_SUCCESS:
+    case kPrintSuccess:
       return std::string();  // no error message
-    case PRINTING_FAILED:
+    case kPrintFailure:
       return "Printing failed";
-    case INVALID_PRINTER_SETTINGS:
+    case kInvalidPrinterSettings:
       return "Show invalid printer settings error";
-    case INVALID_MEMORY_HANDLE:
+    case kInvalidMemoryHandle:
       return "Invalid memory handle";
-    case METAFILE_MAP_ERROR:
+    case kMetafileMapError:
       return "Map to shared memory error";
-    case METAFILE_INVALID_HEADER:
+    case kMetafileInvalidHeader:
       return "Invalid metafile header";
-    case METAFILE_GET_DATA_ERROR:
+    case kMetafileGetDataError:
       return "Get data from metafile error";
-    case SIMULTANEOUS_PRINT_ACTIVE:
+    case kSimultaneousPrintActive:
       return "The previous printing job hasn't finished";
-    case PAGE_RANGE_SYNTAX_ERROR:
+    case kPageRangeSyntaxError:
       return "Page range syntax error";
-    case PAGE_RANGE_INVALID_RANGE:
+    case kPageRangeInvalidRange:
       return "Page range is invalid (start > end)";
-    case PAGE_COUNT_EXCEEDED:
+    case kPageCountExceeded:
       return "Page range exceeds page count";
     default:
       NOTREACHED();
@@ -99,39 +99,31 @@ void PrintViewManagerElectron::PrintToPdf(
   DCHECK(callback);
 
   if (callback_) {
-    std::move(callback).Run(SIMULTANEOUS_PRINT_ACTIVE,
+    std::move(callback).Run(kSimultaneousPrintActive,
                             base::MakeRefCounted<base::RefCountedString>());
     return;
   }
 
   if (!rfh->IsRenderFrameLive()) {
-    std::move(callback).Run(PRINTING_FAILED,
+    std::move(callback).Run(kPrintFailure,
                             base::MakeRefCounted<base::RefCountedString>());
     return;
   }
 
-  absl::variant<printing::PageRanges, print_to_pdf::PageRangeError>
+  absl::variant<printing::PageRanges, print_to_pdf::PdfPrintResult>
       parsed_ranges = print_to_pdf::TextPageRangesToPageRanges(page_ranges);
-  if (absl::holds_alternative<print_to_pdf::PageRangeError>(parsed_ranges)) {
-    PrintResult print_result;
-    switch (absl::get<print_to_pdf::PageRangeError>(parsed_ranges)) {
-      case print_to_pdf::PageRangeError::kSyntaxError:
-        print_result = PAGE_RANGE_SYNTAX_ERROR;
-        break;
-      case print_to_pdf::PageRangeError::kInvalidRange:
-        print_result = PAGE_RANGE_INVALID_RANGE;
-        break;
-    }
-    std::move(callback).Run(print_result,
-                            base::MakeRefCounted<base::RefCountedString>());
+  if (absl::holds_alternative<print_to_pdf::PdfPrintResult>(parsed_ranges)) {
+    DCHECK_NE(absl::get<print_to_pdf::PdfPrintResult>(parsed_ranges),
+              print_to_pdf::PdfPrintResult::kPrintSuccess);
+    std::move(callback).Run(
+        static_cast<PrintResult>(
+            absl::get<print_to_pdf::PdfPrintResult>(parsed_ranges)),
+        base::MakeRefCounted<base::RefCountedString>());
     return;
   }
 
   printing_rfh_ = rfh;
   print_pages_params->pages = absl::get<printing::PageRanges>(parsed_ranges);
-  auto cookie = print_pages_params->params->document_cookie;
-  set_cookie(cookie);
-  headless_jobs_.emplace_back(cookie);
   callback_ = std::move(callback);
 
   // There is no need for a weak pointer here since the mojo proxy is held
@@ -147,26 +139,32 @@ void PrintViewManagerElectron::OnDidPrintWithParams(
   if (result->is_failure_reason()) {
     switch (result->get_failure_reason()) {
       case printing::mojom::PrintFailureReason::kGeneralFailure:
-        ReleaseJob(PRINTING_FAILED);
+        FailJob(kPrintFailure);
         return;
       case printing::mojom::PrintFailureReason::kInvalidPageRange:
-        ReleaseJob(PAGE_COUNT_EXCEEDED);
+        FailJob(kPageCountExceeded);
         return;
     }
   }
 
   auto& content = *result->get_params()->content;
   if (!content.metafile_data_region.IsValid()) {
-    ReleaseJob(INVALID_MEMORY_HANDLE);
+    FailJob(kInvalidMemoryHandle);
     return;
   }
+
   base::ReadOnlySharedMemoryMapping map = content.metafile_data_region.Map();
   if (!map.IsValid()) {
-    ReleaseJob(METAFILE_MAP_ERROR);
+    FailJob(kMetafileMapError);
     return;
   }
-  data_ = std::string(static_cast<const char*>(map.memory()), map.size());
-  ReleaseJob(PRINT_SUCCESS);
+
+  std::string data =
+      std::string(static_cast<const char*>(map.memory()), map.size());
+  std::move(callback_).Run(kPrintSuccess,
+                           base::RefCountedString::TakeString(&data));
+
+  Reset();
 }
 
 void PrintViewManagerElectron::GetDefaultPrintSettings(
@@ -201,7 +199,7 @@ void PrintViewManagerElectron::ShowInvalidPrinterSettingsError() {
     return;
   }
 
-  ReleaseJob(INVALID_PRINTER_SETTINGS);
+  FailJob(kInvalidPrinterSettings);
 }
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -248,12 +246,7 @@ void PrintViewManagerElectron::RenderFrameDeleted(
   if (printing_rfh_ != render_frame_host)
     return;
 
-  if (callback_) {
-    std::move(callback_).Run(PRINTING_FAILED,
-                             base::MakeRefCounted<base::RefCountedString>());
-  }
-
-  Reset();
+  FailJob(kPrintFailure);
 }
 
 void PrintViewManagerElectron::DidGetPrintedPagesCount(int32_t cookie,
@@ -270,17 +263,14 @@ void PrintViewManagerElectron::Reset() {
   data_.clear();
 }
 
-void PrintViewManagerElectron::ReleaseJob(PrintResult result) {
+void PrintViewManagerElectron::FailJob(PrintResult result) {
+  DCHECK_NE(result, kPrintSuccess);
   if (callback_) {
-    DCHECK(result == PRINT_SUCCESS || data_.empty());
     std::move(callback_).Run(result,
-                             base::RefCountedString::TakeString(&data_));
-    if (printing_rfh_ && printing_rfh_->IsRenderFrameLive()) {
-      GetPrintRenderFrame(printing_rfh_)->PrintingDone(result == PRINT_SUCCESS);
-    }
-
-    Reset();
+                             base::MakeRefCounted<base::RefCountedString>());
   }
+
+  Reset();
 }
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(PrintViewManagerElectron);
diff --git a/shell/browser/printing/print_view_manager_electron.h b/shell/browser/printing/print_view_manager_electron.h
index bf244a522ac2b..733e41ac4d748 100644
--- a/shell/browser/printing/print_view_manager_electron.h
+++ b/shell/browser/printing/print_view_manager_electron.h
@@ -26,17 +26,17 @@ class PrintViewManagerElectron
       public content::WebContentsUserData<PrintViewManagerElectron> {
  public:
   enum PrintResult {
-    PRINT_SUCCESS,
-    PRINTING_FAILED,
-    INVALID_PRINTER_SETTINGS,
-    INVALID_MEMORY_HANDLE,
-    METAFILE_MAP_ERROR,
-    METAFILE_INVALID_HEADER,
-    METAFILE_GET_DATA_ERROR,
-    SIMULTANEOUS_PRINT_ACTIVE,
-    PAGE_RANGE_SYNTAX_ERROR,
-    PAGE_RANGE_INVALID_RANGE,
-    PAGE_COUNT_EXCEEDED,
+    kPrintSuccess,
+    kPrintFailure,
+    kInvalidPrinterSettings,
+    kInvalidMemoryHandle,
+    kMetafileMapError,
+    kMetafileInvalidHeader,
+    kMetafileGetDataError,
+    kSimultaneousPrintActive,
+    kPageRangeSyntaxError,
+    kPageRangeInvalidRange,
+    kPageCountExceeded,
   };
 
   using PrintToPDFCallback =
@@ -91,8 +91,8 @@ class PrintViewManagerElectron
                       CheckForCancelCallback callback) override;
 #endif
 
+  void FailJob(PrintResult result);
   void Reset();
-  void ReleaseJob(PrintResult result);
 
   raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
   PrintToPDFCallback callback_;
diff --git a/shell/browser/special_storage_policy.cc b/shell/browser/special_storage_policy.cc
index 37ab036c7969a..351e831bef995 100644
--- a/shell/browser/special_storage_policy.cc
+++ b/shell/browser/special_storage_policy.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "services/network/public/cpp/session_cookie_delete_predicate.h"
 
 namespace electron {
 
@@ -37,9 +38,4 @@ bool SpecialStoragePolicy::HasSessionOnlyOrigins() {
   return false;
 }
 
-network::DeleteCookiePredicate
-SpecialStoragePolicy::CreateDeleteCookieOnExitPredicate() {
-  return network::DeleteCookiePredicate();
-}
-
 }  // namespace electron
diff --git a/shell/browser/special_storage_policy.h b/shell/browser/special_storage_policy.h
index aa0ac9cca583d..30aa4bd54fb5a 100644
--- a/shell/browser/special_storage_policy.h
+++ b/shell/browser/special_storage_policy.h
@@ -20,7 +20,6 @@ class SpecialStoragePolicy : public storage::SpecialStoragePolicy {
   bool HasIsolatedStorage(const GURL& origin) override;
   bool IsStorageSessionOnly(const GURL& origin) override;
   bool HasSessionOnlyOrigins() override;
-  network::DeleteCookiePredicate CreateDeleteCookieOnExitPredicate() override;
 
  protected:
   ~SpecialStoragePolicy() override;
diff --git a/shell/browser/ui/accelerator_util.cc b/shell/browser/ui/accelerator_util.cc
index c9c5fb511e824..c40f10bead1e5 100644
--- a/shell/browser/ui/accelerator_util.cc
+++ b/shell/browser/ui/accelerator_util.cc
@@ -71,8 +71,8 @@ bool StringToAccelerator(const std::string& shortcut,
 
 void GenerateAcceleratorTable(AcceleratorTable* table,
                               electron::ElectronMenuModel* model) {
-  int count = model->GetItemCount();
-  for (int i = 0; i < count; ++i) {
+  size_t count = model->GetItemCount();
+  for (size_t i = 0; i < count; ++i) {
     electron::ElectronMenuModel::ItemType type = model->GetTypeAt(i);
     if (type == electron::ElectronMenuModel::TYPE_SUBMENU) {
       auto* submodel = model->GetSubmenuModelAt(i);
diff --git a/shell/browser/ui/accelerator_util.h b/shell/browser/ui/accelerator_util.h
index c573aeaab2260..35c44869aa6b6 100644
--- a/shell/browser/ui/accelerator_util.h
+++ b/shell/browser/ui/accelerator_util.h
@@ -14,7 +14,7 @@
 namespace accelerator_util {
 
 typedef struct {
-  int position;
+  size_t position;
   electron::ElectronMenuModel* model;
 } MenuItem;
 typedef std::map<ui::Accelerator, MenuItem> AcceleratorTable;
diff --git a/shell/browser/ui/electron_menu_model.cc b/shell/browser/ui/electron_menu_model.cc
index 23e0dd079327f..3f305cb515ed3 100644
--- a/shell/browser/ui/electron_menu_model.cc
+++ b/shell/browser/ui/electron_menu_model.cc
@@ -27,42 +27,43 @@ ElectronMenuModel::ElectronMenuModel(Delegate* delegate)
 
 ElectronMenuModel::~ElectronMenuModel() = default;
 
-void ElectronMenuModel::SetToolTip(int index, const std::u16string& toolTip) {
+void ElectronMenuModel::SetToolTip(size_t index,
+                                   const std::u16string& toolTip) {
   int command_id = GetCommandIdAt(index);
   toolTips_[command_id] = toolTip;
 }
 
-std::u16string ElectronMenuModel::GetToolTipAt(int index) {
+std::u16string ElectronMenuModel::GetToolTipAt(size_t index) {
   const int command_id = GetCommandIdAt(index);
   const auto iter = toolTips_.find(command_id);
   return iter == std::end(toolTips_) ? std::u16string() : iter->second;
 }
 
-void ElectronMenuModel::SetRole(int index, const std::u16string& role) {
+void ElectronMenuModel::SetRole(size_t index, const std::u16string& role) {
   int command_id = GetCommandIdAt(index);
   roles_[command_id] = role;
 }
 
-std::u16string ElectronMenuModel::GetRoleAt(int index) {
+std::u16string ElectronMenuModel::GetRoleAt(size_t index) {
   const int command_id = GetCommandIdAt(index);
   const auto iter = roles_.find(command_id);
   return iter == std::end(roles_) ? std::u16string() : iter->second;
 }
 
-void ElectronMenuModel::SetSecondaryLabel(int index,
+void ElectronMenuModel::SetSecondaryLabel(size_t index,
                                           const std::u16string& sublabel) {
   int command_id = GetCommandIdAt(index);
   sublabels_[command_id] = sublabel;
 }
 
-std::u16string ElectronMenuModel::GetSecondaryLabelAt(int index) const {
+std::u16string ElectronMenuModel::GetSecondaryLabelAt(size_t index) const {
   int command_id = GetCommandIdAt(index);
   const auto iter = sublabels_.find(command_id);
   return iter == std::end(sublabels_) ? std::u16string() : iter->second;
 }
 
 bool ElectronMenuModel::GetAcceleratorAtWithParams(
-    int index,
+    size_t index,
     bool use_default_accelerator,
     ui::Accelerator* accelerator) const {
   if (delegate_) {
@@ -72,7 +73,7 @@ bool ElectronMenuModel::GetAcceleratorAtWithParams(
   return false;
 }
 
-bool ElectronMenuModel::ShouldRegisterAcceleratorAt(int index) const {
+bool ElectronMenuModel::ShouldRegisterAcceleratorAt(size_t index) const {
   if (delegate_) {
     return delegate_->ShouldRegisterAcceleratorForCommandId(
         GetCommandIdAt(index));
@@ -80,7 +81,7 @@ bool ElectronMenuModel::ShouldRegisterAcceleratorAt(int index) const {
   return true;
 }
 
-bool ElectronMenuModel::WorksWhenHiddenAt(int index) const {
+bool ElectronMenuModel::WorksWhenHiddenAt(size_t index) const {
   if (delegate_) {
     return delegate_->ShouldCommandIdWorkWhenHidden(GetCommandIdAt(index));
   }
@@ -88,7 +89,8 @@ bool ElectronMenuModel::WorksWhenHiddenAt(int index) const {
 }
 
 #if BUILDFLAG(IS_MAC)
-bool ElectronMenuModel::GetSharingItemAt(int index, SharingItem* item) const {
+bool ElectronMenuModel::GetSharingItemAt(size_t index,
+                                         SharingItem* item) const {
   if (delegate_)
     return delegate_->GetSharingItemForCommandId(GetCommandIdAt(index), item);
   return false;
@@ -118,7 +120,7 @@ void ElectronMenuModel::MenuWillShow() {
   }
 }
 
-ElectronMenuModel* ElectronMenuModel::GetSubmenuModelAt(int index) {
+ElectronMenuModel* ElectronMenuModel::GetSubmenuModelAt(size_t index) {
   return static_cast<ElectronMenuModel*>(
       ui::SimpleMenuModel::GetSubmenuModelAt(index));
 }
diff --git a/shell/browser/ui/electron_menu_model.h b/shell/browser/ui/electron_menu_model.h
index 355a3f7040927..63999ad1614ba 100644
--- a/shell/browser/ui/electron_menu_model.h
+++ b/shell/browser/ui/electron_menu_model.h
@@ -81,20 +81,20 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
   void AddObserver(Observer* obs) { observers_.AddObserver(obs); }
   void RemoveObserver(Observer* obs) { observers_.RemoveObserver(obs); }
 
-  void SetToolTip(int index, const std::u16string& toolTip);
-  std::u16string GetToolTipAt(int index);
-  void SetRole(int index, const std::u16string& role);
-  std::u16string GetRoleAt(int index);
-  void SetSecondaryLabel(int index, const std::u16string& sublabel);
-  std::u16string GetSecondaryLabelAt(int index) const override;
-  bool GetAcceleratorAtWithParams(int index,
+  void SetToolTip(size_t index, const std::u16string& toolTip);
+  std::u16string GetToolTipAt(size_t index);
+  void SetRole(size_t index, const std::u16string& role);
+  std::u16string GetRoleAt(size_t index);
+  void SetSecondaryLabel(size_t index, const std::u16string& sublabel);
+  std::u16string GetSecondaryLabelAt(size_t index) const override;
+  bool GetAcceleratorAtWithParams(size_t index,
                                   bool use_default_accelerator,
                                   ui::Accelerator* accelerator) const;
-  bool ShouldRegisterAcceleratorAt(int index) const;
-  bool WorksWhenHiddenAt(int index) const;
+  bool ShouldRegisterAcceleratorAt(size_t index) const;
+  bool WorksWhenHiddenAt(size_t index) const;
 #if BUILDFLAG(IS_MAC)
   // Return the SharingItem of menu item.
-  bool GetSharingItemAt(int index, SharingItem* item) const;
+  bool GetSharingItemAt(size_t index, SharingItem* item) const;
   // Set/Get the SharingItem of this menu.
   void SetSharingItem(SharingItem item);
   const absl::optional<SharingItem>& GetSharingItem() const;
@@ -109,7 +109,7 @@ class ElectronMenuModel : public ui::SimpleMenuModel {
   }
 
   using SimpleMenuModel::GetSubmenuModelAt;
-  ElectronMenuModel* GetSubmenuModelAt(int index);
+  ElectronMenuModel* GetSubmenuModelAt(size_t index);
 
  private:
   Delegate* delegate_;  // weak ref.
diff --git a/shell/browser/ui/gtk/menu_util.cc b/shell/browser/ui/gtk/menu_util.cc
index 964099d690735..08f16d2e754ee 100644
--- a/shell/browser/ui/gtk/menu_util.cc
+++ b/shell/browser/ui/gtk/menu_util.cc
@@ -150,7 +150,7 @@ void ExecuteCommand(ui::MenuModel* model, int id) {
 
   if (event && event->type == GDK_BUTTON_RELEASE)
     event_flags = EventFlagsFromGdkState(event->button.state);
-  model->ActivatedAt(id, event_flags);
+  model->ActivatedAt(static_cast<int>(id), event_flags);
 
   if (event)
     gdk_event_free(event);
@@ -163,7 +163,7 @@ void BuildSubmenuFromModel(ui::MenuModel* model,
                            void* this_ptr) {
   std::map<int, GtkWidget*> radio_groups;
   GtkWidget* menu_item = nullptr;
-  for (int i = 0; i < model->GetItemCount(); ++i) {
+  for (size_t i = 0; i < model->GetItemCount(); ++i) {
     std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
         base::UTF16ToUTF8(model->GetLabelAt(i)));
 
diff --git a/shell/browser/ui/views/global_menu_bar_x11.cc b/shell/browser/ui/views/global_menu_bar_x11.cc
index 27f90b94b46cf..785a59866faf2 100644
--- a/shell/browser/ui/views/global_menu_bar_x11.cc
+++ b/shell/browser/ui/views/global_menu_bar_x11.cc
@@ -143,7 +143,7 @@ ElectronMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
       g_object_get_data(G_OBJECT(item), "model"));
 }
 
-bool GetMenuItemID(DbusmenuMenuitem* item, int* id) {
+bool GetMenuItemID(DbusmenuMenuitem* item, size_t* id) {
   gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
   if (id_ptr != nullptr) {
     *id = GPOINTER_TO_INT(id_ptr) - 1;
@@ -162,7 +162,7 @@ void SetMenuItemID(DbusmenuMenuitem* item, int id) {
 
 std::string GetMenuModelStatus(ElectronMenuModel* model) {
   std::string ret;
-  for (int i = 0; i < model->GetItemCount(); ++i) {
+  for (size_t i = 0; i < model->GetItemCount(); ++i) {
     int status = model->GetTypeAt(i) | (model->IsVisibleAt(i) << 3) |
                  (model->IsEnabledAt(i) << 4) |
                  (model->IsItemCheckedAt(i) << 5);
@@ -231,7 +231,7 @@ void GlobalMenuBarX11::OnWindowUnmapped() {
 
 void GlobalMenuBarX11::BuildMenuFromModel(ElectronMenuModel* model,
                                           DbusmenuMenuitem* parent) {
-  for (int i = 0; i < model->GetItemCount(); ++i) {
+  for (size_t i = 0; i < model->GetItemCount(); ++i) {
     DbusmenuMenuitem* item = menuitem_new();
     menuitem_property_set_bool(item, kPropertyVisible, model->IsVisibleAt(i));
 
@@ -309,14 +309,14 @@ void GlobalMenuBarX11::RegisterAccelerator(DbusmenuMenuitem* item,
 
 void GlobalMenuBarX11::OnItemActivated(DbusmenuMenuitem* item,
                                        unsigned int timestamp) {
-  int id;
+  size_t id;
   ElectronMenuModel* model = ModelForMenuItem(item);
   if (model && GetMenuItemID(item, &id))
     model->ActivatedAt(id, 0);
 }
 
 void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
-  int id;
+  size_t id;
   ElectronMenuModel* model = ModelForMenuItem(item);
   if (!model || !GetMenuItemID(item, &id))
     return;
diff --git a/shell/browser/ui/views/menu_bar.cc b/shell/browser/ui/views/menu_bar.cc
index b8d254ee665a6..7a0ba8139e1f0 100644
--- a/shell/browser/ui/views/menu_bar.cc
+++ b/shell/browser/ui/views/menu_bar.cc
@@ -81,7 +81,7 @@ void MenuBar::ActivateAccelerator(char16_t key) {
     static_cast<SubmenuButton*>(child)->Activate(nullptr);
 }
 
-int MenuBar::GetItemCount() const {
+size_t MenuBar::GetItemCount() const {
   return menu_model_ ? menu_model_->GetItemCount() : 0;
 }
 
@@ -92,7 +92,7 @@ bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
     return false;
 
   auto children = GetChildrenInZOrder();
-  for (int i = 0, n = children.size(); i < n; ++i) {
+  for (size_t i = 0, n = children.size(); i < n; ++i) {
     if (children[i]->GetBoundsInScreen().Contains(screenPoint) &&
         (menu_model_->GetTypeAt(i) == ElectronMenuModel::TYPE_SUBMENU)) {
       *menu_model = menu_model_->GetSubmenuModelAt(i);
@@ -174,7 +174,7 @@ const char* MenuBar::GetClassName() const {
   return kViewClassName;
 }
 
-void MenuBar::ButtonPressed(int id, const ui::Event& event) {
+void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
   // Hide the accelerator when a submenu is activated.
   SetAcceleratorVisibility(pane_has_focus());
 
@@ -193,7 +193,8 @@ void MenuBar::ButtonPressed(int id, const ui::Event& event) {
   SubmenuButton* source = nullptr;
   for (auto* child : children()) {
     auto* button = static_cast<SubmenuButton*>(child);
-    if (button->GetID() == id) {
+    int button_id = button->GetID();
+    if (button_id >= 0 && static_cast<size_t>(button_id) == id) {
       source = button;
       break;
     }
@@ -222,7 +223,7 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
 
 void MenuBar::RebuildChildren() {
   RemoveAllChildViews();
-  for (int i = 0, n = GetItemCount(); i < n; ++i) {
+  for (size_t i = 0, n = GetItemCount(); i < n; ++i) {
     auto* button = new SubmenuButton(
         base::BindRepeating(&MenuBar::ButtonPressed, base::Unretained(this), i),
         menu_model_->GetLabelAt(i), background_color_);
diff --git a/shell/browser/ui/views/menu_bar.h b/shell/browser/ui/views/menu_bar.h
index 4ef178538a6ca..91546fb33cc55 100644
--- a/shell/browser/ui/views/menu_bar.h
+++ b/shell/browser/ui/views/menu_bar.h
@@ -43,7 +43,7 @@ class MenuBar : public views::AccessiblePaneView,
   void ActivateAccelerator(char16_t key);
 
   // Returns there are how many items in the root menu.
-  int GetItemCount() const;
+  size_t GetItemCount() const;
 
   // Get the menu under specified screen point.
   bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
@@ -71,7 +71,7 @@ class MenuBar : public views::AccessiblePaneView,
   const char* GetClassName() const override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
-  void ButtonPressed(int id, const ui::Event& event);
+  void ButtonPressed(size_t id, const ui::Event& event);
 
   void RebuildChildren();
   void UpdateViewColors();
diff --git a/shell/browser/ui/views/menu_model_adapter.cc b/shell/browser/ui/views/menu_model_adapter.cc
index be8083833d01d..99958ffaaa793 100644
--- a/shell/browser/ui/views/menu_model_adapter.cc
+++ b/shell/browser/ui/views/menu_model_adapter.cc
@@ -14,7 +14,7 @@ MenuModelAdapter::~MenuModelAdapter() = default;
 bool MenuModelAdapter::GetAccelerator(int id,
                                       ui::Accelerator* accelerator) const {
   ui::MenuModel* model = menu_model_;
-  int index = 0;
+  size_t index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
     return static_cast<ElectronMenuModel*>(model)->GetAcceleratorAtWithParams(
         index, true, accelerator);
diff --git a/shell/renderer/browser_exposed_renderer_interfaces.cc b/shell/renderer/browser_exposed_renderer_interfaces.cc
index 55781e58edd5d..04e82d7daa2b9 100644
--- a/shell/renderer/browser_exposed_renderer_interfaces.cc
+++ b/shell/renderer/browser_exposed_renderer_interfaces.cc
@@ -33,7 +33,8 @@ void ExposeElectronRendererInterfacesToBrowser(
     electron::RendererClientBase* client,
     mojo::BinderMap* binders) {
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
-  binders->Add(base::BindRepeating(&BindSpellChecker, client),
-               base::SequencedTaskRunnerHandle::Get());
+  binders->Add<spellcheck::mojom::SpellChecker>(
+      base::BindRepeating(&BindSpellChecker, client),
+      base::SequencedTaskRunnerHandle::Get());
 #endif
 }
diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc
index 5c4f0d248fcdd..3fbdf4e5bbb50 100644
--- a/shell/renderer/electron_render_frame_observer.cc
+++ b/shell/renderer/electron_render_frame_observer.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/renderer/render_frame.h"
diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc
index c53e537dad067..0a711e13e8497 100644
--- a/shell/utility/electron_content_utility_client.cc
+++ b/shell/utility/electron_content_utility_client.cc
@@ -94,7 +94,7 @@ void ElectronContentUtilityClient::ExposeInterfacesToBrowser(
   // interfaces to the BinderMap.
   if (!utility_process_running_elevated_) {
 #if BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(IS_WIN)
-    binders->Add(
+    binders->Add<printing::mojom::PdfToEmfConverterFactory>(
         base::BindRepeating(printing::PdfToEmfConverterFactory::Create),
         base::ThreadTaskRunnerHandle::Get());
 #endif

From 63fe34c703e903eff273beb832b896258a3be991 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 10:18:11 +0900
Subject: [PATCH 689/811] build: fix export patches to work when source
 directory does not exist (#35437)

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 script/lib/git.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/lib/git.py b/script/lib/git.py
index aa3adb16158c1..93e61e6757ad4 100644
--- a/script/lib/git.py
+++ b/script/lib/git.py
@@ -238,6 +238,11 @@ def to_utf8(patch):
 
 
 def export_patches(repo, out_dir, patch_range=None, dry_run=False):
+  if not os.path.exists(repo):
+    sys.stderr.write(
+      "Skipping patches in {} because it does not exist.\n".format(repo)
+    )
+    return
   if patch_range is None:
     patch_range, num_patches = guess_base_commit(repo)
     sys.stderr.write("Exporting {} patches in {} since {}\n".format(

From a3cfd1a206934b3c5f0ee0be8c2e1457861ba5f7 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:08:20 +0200
Subject: [PATCH 690/811] fix: Node.js `atob` input validation (#35443)

fix: Node.js atob input validation

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 patches/node/.patches                         |  1 +
 .../buffer_fix_atob_input_validation.patch    | 89 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 patches/node/buffer_fix_atob_input_validation.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index d035735890958..0f1d131df59fa 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -47,3 +47,4 @@ support_v8_sandboxed_pointers.patch
 build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
 build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
 fix_override_createjob_in_node_platform.patch
+buffer_fix_atob_input_validation.patch
diff --git a/patches/node/buffer_fix_atob_input_validation.patch b/patches/node/buffer_fix_atob_input_validation.patch
new file mode 100644
index 0000000000000..a4285f7b7223e
--- /dev/null
+++ b/patches/node/buffer_fix_atob_input_validation.patch
@@ -0,0 +1,89 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Tue, 23 Aug 2022 11:13:45 +0200
+Subject: buffer: fix `atob` input validation
+
+This patch combines:
+
+* https://github.com/nodejs/node/pull/42539
+* https://github.com/nodejs/node/pull/42662
+
+To bring the Node.js implementation of atob into alignment with the
+WHATWG spec.
+
+diff --git a/lib/buffer.js b/lib/buffer.js
+index 57d6cddbaa2e6bdd846a667897588dea18daeb42..7602d4049e9bb1c09440bc3af09ad5ad9c768308 100644
+--- a/lib/buffer.js
++++ b/lib/buffer.js
+@@ -23,8 +23,10 @@
+ 
+ const {
+   Array,
++  ArrayFrom,
+   ArrayIsArray,
+   ArrayPrototypeForEach,
++  ArrayPrototypeIndexOf,
+   MathFloor,
+   MathMin,
+   MathTrunc,
+@@ -1231,8 +1233,25 @@ function btoa(input) {
+   return buf.toString('base64');
+ }
+ 
+-const kBase64Digits =
+-  'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
++// Refs: https://infra.spec.whatwg.org/#forgiving-base64-decode
++const kForgivingBase64AllowedChars = [
++  // ASCII whitespace
++  // Refs: https://infra.spec.whatwg.org/#ascii-whitespace
++  0x09, 0x0A, 0x0C, 0x0D, 0x20,
++
++  // Uppercase letters
++  ...ArrayFrom({ length: 26 }, (_, i) => StringPrototypeCharCodeAt('A') + i),
++
++  // Lowercase letters
++  ...ArrayFrom({ length: 26 }, (_, i) => StringPrototypeCharCodeAt('a') + i),
++
++  // Decimal digits
++  ...ArrayFrom({ length: 10 }, (_, i) => StringPrototypeCharCodeAt('0') + i),
++
++  0x2B, // +
++  0x2F, // /
++  0x3D, // =
++];
+ 
+ function atob(input) {
+   // The implementation here has not been performance optimized in any way and
+@@ -1241,11 +1260,31 @@ function atob(input) {
+   if (arguments.length === 0) {
+     throw new ERR_MISSING_ARGS('input');
+   }
++
+   input = `${input}`;
++  let nonAsciiWhitespaceCharCount = 0;
++
+   for (let n = 0; n < input.length; n++) {
+-    if (!kBase64Digits.includes(input[n]))
++    const index = ArrayPrototypeIndexOf(
++      kForgivingBase64AllowedChars,
++      StringPrototypeCharCodeAt(input, n));
++
++    if (index > 4) {
++      // The first 5 elements of `kForgivingBase64AllowedChars` are
++      // ASCII whitespace char codes.
++      nonAsciiWhitespaceCharCount++;
++    } else if (index === -1) {
+       throw lazyDOMException('Invalid character', 'InvalidCharacterError');
++    }
+   }
++
++  // See #3 - https://infra.spec.whatwg.org/#forgiving-base64
++  if (nonAsciiWhitespaceCharCount % 4 === 1) {
++    throw lazyDOMException(
++      'The string to be decoded is not correctly encoded.',
++      'InvalidCharacterError');
++  }
++
+   return Buffer.from(input, 'base64').toString('latin1');
+ }
+ 

From 0ad176fd13d8de3b0d08c3587469256bd6d01278 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:52:24 +0200
Subject: [PATCH 691/811] fix: fullscreen crashing with `roundedCorners: false`
 (#35454)

fix: fullscreen crashing with roundedCorners

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 docs/api/browser-window.md           | 3 ++-
 shell/browser/native_window_mac.mm   | 5 ++++-
 spec-main/api-browser-window-spec.ts | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
index e5fd4045803a2..16a005cd35706 100644
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -246,7 +246,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `trafficLightPosition` [Point](structures/point.md) (optional) _macOS_ -
     Set a custom position for the traffic light buttons in frameless windows.
   * `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
-    should have rounded corners on macOS. Default is `true`.
+    should have rounded corners on macOS. Default is `true`. Setting this property
+    to `false` will prevent the window from being fullscreenable.
   * `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
     the title in the title bar in full screen mode on macOS for `hiddenInset`
     titleBarStyle. Default is `false`.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
index f535844af4712..2bb5e3a4c5064 100644
--- a/shell/browser/native_window_mac.mm
+++ b/shell/browser/native_window_mac.mm
@@ -299,7 +299,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   bool rounded_corner = true;
   options.Get(options::kRoundedCorners, &rounded_corner);
   if (!rounded_corner && !has_frame())
-    styleMask = 0;
+    styleMask = NSWindowStyleMaskBorderless;
 
   if (minimizable)
     styleMask |= NSWindowStyleMaskMiniaturizable;
@@ -691,6 +691,9 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::SetFullScreen(bool fullscreen) {
+  if (!has_frame() && !HasStyleMask(NSWindowStyleMaskTitled))
+    return;
+
   // [NSWindow -toggleFullScreen] is an asynchronous operation, which means
   // that it's possible to call it while a fullscreen transition is currently
   // in process. This can create weird behavior (incl. phantom windows),
diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 6be93a0fea768..a55316e21d31d 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -1450,6 +1450,11 @@ describe('BrowserWindow module', () => {
             expect(w.fullScreen).to.be.true();
           });
 
+          it('does not go fullscreen if roundedCorners are enabled', async () => {
+            w = new BrowserWindow({ frame: false, roundedCorners: false, fullscreen: true });
+            expect(w.fullScreen).to.be.false();
+          });
+
           it('can be changed', () => {
             w.fullScreen = false;
             expect(w.fullScreen).to.be.false();

From 38d408a26b5326bb69f96c65746829dce67655b8 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 09:52:53 +0200
Subject: [PATCH 692/811] fix: pass rfh instances through to the permission
 helper (#35467)

* fix: pass rfh instances through to the permission helper

* refactor: use WeakDocumentPtr instead of frame node id

* fix: handle missing initiator document

* fix: dispatch openExternal event for top level webview navs still

Co-authored-by: Samuel Attard <sattard@salesforce.com>
---
 docs/api/session.md                            |  2 +-
 shell/browser/api/electron_api_web_contents.cc |  2 +-
 shell/browser/electron_browser_client.cc       | 18 ++++++++++++++++--
 .../browser/web_contents_permission_helper.cc  | 17 +++++++++++++----
 shell/browser/web_contents_permission_helper.h | 10 +++++++---
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index f405d133ba523..93f11522be042 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -635,7 +635,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
     * `notifications` - Request notification creation and the ability to display them in the user's system tray.
     * `midi` - Request MIDI access in the `webmidi` API.
     * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
-    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
+    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more. These requests always appear to originate from the main frame.
     * `fullscreen` - Request for the app to enter fullscreen mode.
     * `openExternal` - Request to open links in external applications.
     * `unknown` - An unrecognized permission request
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 21b96159fb493..7415e0c5d00f9 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1311,7 +1311,7 @@ void WebContents::EnterFullscreenModeForTab(
   auto callback =
       base::BindRepeating(&WebContents::OnEnterFullscreenModeForTab,
                           base::Unretained(this), requesting_frame, options);
-  permission_helper->RequestFullscreenPermission(callback);
+  permission_helper->RequestFullscreenPermission(requesting_frame, callback);
 }
 
 void WebContents::OnEnterFullscreenModeForTab(
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 546dc7e6fdcb4..141f04da18110 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -49,6 +49,7 @@
 #include "content/public/browser/tts_controller.h"
 #include "content/public/browser/tts_platform.h"
 #include "content/public/browser/url_loader_request_interceptor.h"
+#include "content/public/browser/weak_document_ptr.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ -987,7 +988,7 @@ void ElectronBrowserClient::WebNotificationAllowed(
     return;
   }
   permission_helper->RequestWebNotificationPermission(
-      base::BindOnce(std::move(callback), web_contents->IsAudioMuted()));
+      rfh, base::BindOnce(std::move(callback), web_contents->IsAudioMuted()));
 }
 
 void ElectronBrowserClient::RenderProcessHostDestroyed(
@@ -1022,6 +1023,7 @@ void OnOpenExternal(const GURL& escaped_url, bool allowed) {
 
 void HandleExternalProtocolInUI(
     const GURL& url,
+    content::WeakDocumentPtr document_ptr,
     content::WebContents::OnceGetter web_contents_getter,
     bool has_user_gesture) {
   content::WebContents* web_contents = std::move(web_contents_getter).Run();
@@ -1033,9 +1035,18 @@ void HandleExternalProtocolInUI(
   if (!permission_helper)
     return;
 
+  content::RenderFrameHost* rfh = document_ptr.AsRenderFrameHostIfValid();
+  if (!rfh) {
+    // If the render frame host is not valid it means it was a top level
+    // navigation and the frame has already been disposed of.  In this case we
+    // take the current main frame and declare it responsible for the
+    // transition.
+    rfh = web_contents->GetPrimaryMainFrame();
+  }
+
   GURL escaped_url(base::EscapeExternalHandlerValue(url.spec()));
   auto callback = base::BindOnce(&OnOpenExternal, escaped_url);
-  permission_helper->RequestOpenExternalPermission(std::move(callback),
+  permission_helper->RequestOpenExternalPermission(rfh, std::move(callback),
                                                    has_user_gesture, url);
 }
 
@@ -1055,6 +1066,9 @@ bool ElectronBrowserClient::HandleExternalProtocol(
   content::GetUIThreadTaskRunner({})->PostTask(
       FROM_HERE,
       base::BindOnce(&HandleExternalProtocolInUI, url,
+                     initiator_document
+                         ? initiator_document->GetWeakDocumentPtr()
+                         : content::WeakDocumentPtr(),
                      std::move(web_contents_getter), has_user_gesture));
   return true;
 }
diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc
index 49dcfc1a1c6cd..31d32cf53ddb4 100644
--- a/shell/browser/web_contents_permission_helper.cc
+++ b/shell/browser/web_contents_permission_helper.cc
@@ -149,16 +149,16 @@ WebContentsPermissionHelper::WebContentsPermissionHelper(
 WebContentsPermissionHelper::~WebContentsPermissionHelper() = default;
 
 void WebContentsPermissionHelper::RequestPermission(
+    content::RenderFrameHost* requesting_frame,
     blink::PermissionType permission,
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
     base::Value::Dict details) {
-  auto* rfh = web_contents_->GetPrimaryMainFrame();
   auto* permission_manager = static_cast<ElectronPermissionManager*>(
       web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
   auto origin = web_contents_->GetLastCommittedURL();
   permission_manager->RequestPermissionWithDetails(
-      permission, rfh, origin, false, std::move(details),
+      permission, requesting_frame, origin, false, std::move(details),
       base::BindOnce(&OnPermissionResponse, std::move(callback)));
 }
 
@@ -174,8 +174,10 @@ bool WebContentsPermissionHelper::CheckPermission(
 }
 
 void WebContentsPermissionHelper::RequestFullscreenPermission(
+    content::RenderFrameHost* requesting_frame,
     base::OnceCallback<void(bool)> callback) {
   RequestPermission(
+      requesting_frame,
       static_cast<blink::PermissionType>(PermissionType::FULLSCREEN),
       std::move(callback));
 }
@@ -201,13 +203,17 @@ void WebContentsPermissionHelper::RequestMediaAccessPermission(
 
   // The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
   // are presented as same type in content_converter.h.
-  RequestPermission(blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
+  RequestPermission(content::RenderFrameHost::FromID(request.render_process_id,
+                                                     request.render_frame_id),
+                    blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
                     false, std::move(details));
 }
 
 void WebContentsPermissionHelper::RequestWebNotificationPermission(
+    content::RenderFrameHost* requesting_frame,
     base::OnceCallback<void(bool)> callback) {
-  RequestPermission(blink::PermissionType::NOTIFICATIONS, std::move(callback));
+  RequestPermission(requesting_frame, blink::PermissionType::NOTIFICATIONS,
+                    std::move(callback));
 }
 
 void WebContentsPermissionHelper::RequestPointerLockPermission(
@@ -216,6 +222,7 @@ void WebContentsPermissionHelper::RequestPointerLockPermission(
     base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
         callback) {
   RequestPermission(
+      web_contents_->GetPrimaryMainFrame(),
       static_cast<blink::PermissionType>(PermissionType::POINTER_LOCK),
       base::BindOnce(std::move(callback), web_contents_, user_gesture,
                      last_unlocked_by_target),
@@ -223,12 +230,14 @@ void WebContentsPermissionHelper::RequestPointerLockPermission(
 }
 
 void WebContentsPermissionHelper::RequestOpenExternalPermission(
+    content::RenderFrameHost* requesting_frame,
     base::OnceCallback<void(bool)> callback,
     bool user_gesture,
     const GURL& url) {
   base::Value::Dict details;
   details.Set("externalURL", url.spec());
   RequestPermission(
+      requesting_frame,
       static_cast<blink::PermissionType>(PermissionType::OPEN_EXTERNAL),
       std::move(callback), user_gesture, std::move(details));
 }
diff --git a/shell/browser/web_contents_permission_helper.h b/shell/browser/web_contents_permission_helper.h
index 2f0012837ffd5..43a5ca63ec307 100644
--- a/shell/browser/web_contents_permission_helper.h
+++ b/shell/browser/web_contents_permission_helper.h
@@ -33,7 +33,8 @@ class WebContentsPermissionHelper
   };
 
   // Asynchronous Requests
-  void RequestFullscreenPermission(base::OnceCallback<void(bool)> callback);
+  void RequestFullscreenPermission(content::RenderFrameHost* requesting_frame,
+                                   base::OnceCallback<void(bool)> callback);
   void RequestMediaAccessPermission(const content::MediaStreamRequest& request,
                                     content::MediaResponseCallback callback);
   void RequestPointerLockPermission(
@@ -42,8 +43,10 @@ class WebContentsPermissionHelper
       base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
           callback);
   void RequestWebNotificationPermission(
+      content::RenderFrameHost* requesting_frame,
       base::OnceCallback<void(bool)> callback);
-  void RequestOpenExternalPermission(base::OnceCallback<void(bool)> callback,
+  void RequestOpenExternalPermission(content::RenderFrameHost* requesting_frame,
+                                     base::OnceCallback<void(bool)> callback,
                                      bool user_gesture,
                                      const GURL& url);
 
@@ -56,7 +59,8 @@ class WebContentsPermissionHelper
   explicit WebContentsPermissionHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsPermissionHelper>;
 
-  void RequestPermission(blink::PermissionType permission,
+  void RequestPermission(content::RenderFrameHost* requesting_frame,
+                         blink::PermissionType permission,
                          base::OnceCallback<void(bool)> callback,
                          bool user_gesture = false,
                          base::Value::Dict details = {});

From 0e7973340435bd953f6d1f69f42e3493fa825fe3 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:28:21 +0200
Subject: [PATCH 693/811] docs: update docs description to match sidebar
 (#35482)

Update introduction.md

Co-authored-by: Nik K <nk@nikk.ca>
---
 docs/tutorial/introduction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md
index 7d669ecb9f5a3..581435524079c 100644
--- a/docs/tutorial/introduction.md
+++ b/docs/tutorial/introduction.md
@@ -47,7 +47,7 @@ are the different categories and what you can expect on each one:
 - **Examples**: Quick references to add features to your Electron app.
 - **Development**: Miscellaneous development guides.
 - **Distribution**: Learn how to distribute your app to end users.
-- **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
+- **Testing And Debugging**: How to debug JavaScript, write tests, and other tools used
   to create quality Electron applications.
 - **References**: Useful links to better understand how the Electron project works
   and is organized.

From 4ab9295e62dca5afd006fa052907bce9775ae01c Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:25:38 +0200
Subject: [PATCH 694/811] chore: delete implicit fallthrough patch (#35469)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 patches/node/.patches                         |  1 -
 .../chore_fix_-wimplicit-fallthrough.patch    | 76 -------------------
 2 files changed, 77 deletions(-)
 delete mode 100644 patches/node/chore_fix_-wimplicit-fallthrough.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 0f1d131df59fa..72c5a5b2d6a7d 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -16,7 +16,6 @@ fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
 repl_fix_crash_when_sharedarraybuffer_disabled.patch
 fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
-chore_fix_-wimplicit-fallthrough.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
 fix_serdes_test.patch
diff --git a/patches/node/chore_fix_-wimplicit-fallthrough.patch b/patches/node/chore_fix_-wimplicit-fallthrough.patch
deleted file mode 100644
index 41f961ad0e5c9..0000000000000
--- a/patches/node/chore_fix_-wimplicit-fallthrough.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <shelley.vohr@gmail.com>
-Date: Mon, 11 Oct 2021 13:46:24 +0200
-Subject: chore: fix -Wimplicit-fallthrough
-
-Upstreamed at https://github.com/nghttp2/nghttp2/pull/1626.
-
-diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
-index 8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8..63e1149f0c4a39cb944114e5824d6074343301e8 100644
---- a/deps/nghttp2/BUILD.gn
-+++ b/deps/nghttp2/BUILD.gn
-@@ -16,7 +16,6 @@ static_library("nghttp2") {
- 
-   cflags_c = [
-     "-Wno-implicit-function-declaration",
--    "-Wno-implicit-fallthrough",
-     "-Wno-string-plus-int",
-     "-Wno-unreachable-code-return",
-     "-Wno-unused-but-set-variable",
-diff --git a/deps/nghttp2/lib/nghttp2_hd.c b/deps/nghttp2/lib/nghttp2_hd.c
-index 30ee9b88920c0a0bb8f8b714e3deabe0207cac40..010edf48f614c23e971df0f37716275cc1656469 100644
---- a/deps/nghttp2/lib/nghttp2_hd.c
-+++ b/deps/nghttp2/lib/nghttp2_hd.c
-@@ -1892,7 +1892,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
-         rv = NGHTTP2_ERR_HEADER_COMP;
-         goto fail;
-       }
--    /* fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_HD_STATE_INFLATE_START:
-     case NGHTTP2_HD_STATE_OPCODE:
-       if ((*in & 0xe0u) == 0x20u) {
-@@ -2002,7 +2002,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
-       inflater->left = 0;
-       inflater->shift = 0;
-       DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
--    /* Fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN:
-       rfin = 0;
-       rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-@@ -2086,7 +2086,7 @@ ssize_t nghttp2_hd_inflate_hd_nv(nghttp2_hd_inflater *inflater,
-       inflater->left = 0;
-       inflater->shift = 0;
-       DEBUGF("inflatehd: huffman encoded=%d\n", inflater->huffman_encoded != 0);
--    /* Fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_HD_STATE_READ_VALUELEN:
-       rfin = 0;
-       rv = hd_inflate_read_len(inflater, &rfin, in, last, 7, NGHTTP2_HD_MAX_NV);
-diff --git a/deps/nghttp2/lib/nghttp2_session.c b/deps/nghttp2/lib/nghttp2_session.c
-index 380a47c1b1e82b015c271e2818aed0baf982aa2d..2f3997709cd07f6f8294f985f60b2e1e4b85a2cf 100644
---- a/deps/nghttp2/lib/nghttp2_session.c
-+++ b/deps/nghttp2/lib/nghttp2_session.c
-@@ -2644,10 +2644,10 @@ static int session_after_frame_sent1(nghttp2_session *session) {
-     case NGHTTP2_HCAT_PUSH_RESPONSE:
-       stream->flags = (uint8_t)(stream->flags & ~NGHTTP2_STREAM_FLAG_PUSH);
-       ++session->num_outgoing_streams;
--    /* Fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_HCAT_RESPONSE:
-       stream->state = NGHTTP2_STREAM_OPENED;
--    /* Fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_HCAT_HEADERS:
-       if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-         nghttp2_stream_shutdown(stream, NGHTTP2_SHUT_WR);
-@@ -5456,7 +5456,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
- 
-       iframe->state = NGHTTP2_IB_READ_HEAD;
- 
--    /* Fall through */
-+      __attribute__((fallthrough));
-     case NGHTTP2_IB_READ_HEAD: {
-       int on_begin_frame_called = 0;
- 

From c8b3e23f31b72d2fa91607f86b121b407cbed157 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 09:19:34 -0700
Subject: [PATCH 695/811] Bump v21.0.0-alpha.6

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index e17bf8f6e1427..6e35d6e99ba3b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.5
\ No newline at end of file
+21.0.0-alpha.6
\ No newline at end of file
diff --git a/package.json b/package.json
index f3cb2326d05b6..5ab1d2b8dd38d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.5",
+  "version": "21.0.0-alpha.6",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b2beab41c0377..4bfcbdf9c74ce 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,5
- PRODUCTVERSION 21,0,0,5
+ FILEVERSION 21,0,0,6
+ PRODUCTVERSION 21,0,0,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 65a2c18560eedec519ae85f424a3beeb7770f133 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 10:36:52 -0700
Subject: [PATCH 696/811] Revert "Bump v21.0.0-alpha.6"

This reverts commit c8b3e23f31b72d2fa91607f86b121b407cbed157.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6e35d6e99ba3b..e17bf8f6e1427 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.6
\ No newline at end of file
+21.0.0-alpha.5
\ No newline at end of file
diff --git a/package.json b/package.json
index 5ab1d2b8dd38d..f3cb2326d05b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.6",
+  "version": "21.0.0-alpha.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bfcbdf9c74ce..b2beab41c0377 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,6
- PRODUCTVERSION 21,0,0,6
+ FILEVERSION 21,0,0,5
+ PRODUCTVERSION 21,0,0,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 23aa6e50844dd64e3f7bcf9bfff93218eabcdce8 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:50:06 -0700
Subject: [PATCH 697/811] build: update libcxx filenames (#35497)

* build: update libcxx filenames

* build: change upload_to_storage variable

Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
---
 .circleci/config/base.yml |   2 +-
 filenames.libcxx.gni      | 233 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 229 insertions(+), 6 deletions(-)

diff --git a/.circleci/config/base.yml b/.circleci/config/base.yml
index 95094dec8728f..1092fced82811 100644
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -635,7 +635,7 @@ step-electron-publish: &step-electron-publish
       cd src/electron
       if [ "$UPLOAD_TO_STORAGE" == "1" ]; then
         echo 'Uploading Electron release distribution to Azure'
-        script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
+        script/release/uploaders/upload.py --verbose --upload_to_storage
       else
         echo 'Uploading Electron release distribution to GitHub releases'
         script/release/uploaders/upload.py --verbose
diff --git a/filenames.libcxx.gni b/filenames.libcxx.gni
index 56021a48dd9e4..4d45f286950a0 100644
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -1,6 +1,7 @@
 libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/adjacent_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/algorithm_family.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/all_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/any_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/binary_search.h",
@@ -42,9 +43,11 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted_until.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/iter_swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/iterator_operations.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/lexicographical_compare.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/lower_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/make_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/make_projected.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/max.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/max_element.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/merge.h",
@@ -67,14 +70,86 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_adjacent_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_all_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_any_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_binary_search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_count.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_count_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_equal.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_equal_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_fill.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_fill_n.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_end.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_first_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if_not.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_for_each_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_generate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_generate_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_includes.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_inplace_merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_partitioned.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted_until.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_iterator_concept.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_lexicographical_compare.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_lower_bound.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_make_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_merge.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_minmax.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_minmax_element.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_mismatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_none_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_nth_element.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partial_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partial_sort_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_pop_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_push_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_copy_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_rotate_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_intersection.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_symmetric_difference.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_union.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_shuffle.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_partition.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_sort.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_transform.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_upper_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy_if.h",
@@ -107,6 +182,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_iter.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_range.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/upper_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__assert",
   "//buildtools/third_party/libc++/trunk/include/__availability",
@@ -118,15 +194,28 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/tables.h",
+  "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_result.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/calendar.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_timespec.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/day.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/duration.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/file_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/hh_mm_ss.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/high_resolution_clock.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/literals.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/month.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/month_weekday.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/monthday.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/steady_clock.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/system_clock.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/time_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/weekday.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/year.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month_day.h",
+  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month_weekday.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/common_comparison_category.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/compare_partial_order_fallback.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/compare_strong_order_fallback.h",
@@ -169,6 +258,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__coroutine/noop_coroutine_handle.h",
   "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
   "//buildtools/third_party/libc++/trunk/include/__debug",
+  "//buildtools/third_party/libc++/trunk/include/__debug_utils/randomize_range.h",
   "//buildtools/third_party/libc++/trunk/include/__errc",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/copy_options.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_entry.h",
@@ -186,7 +276,12 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__filesystem/recursive_directory_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/space_info.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/u8path.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/buffer.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/enable_insertable.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/extended_grapheme_cluster_table.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_arg.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/format_arg_store.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_args.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_context.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_error.h",
@@ -200,9 +295,11 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_floating_point.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_integer.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/formatter_output.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_pointer.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_string.h",
   "//buildtools/third_party/libc++/trunk/include/__format/parser_std_format_spec.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/unicode.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_function.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
@@ -210,6 +307,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/bind_front.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binder1st.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binder2nd.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/boyer_moore_searcher.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/compose.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/default_searcher.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/function.h",
@@ -230,11 +328,14 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/span.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/string_view.h",
   "//buildtools/third_party/libc++/trunk/include/__hash_table",
   "//buildtools/third_party/libc++/trunk/include/__ios/fpos.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/access.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/advance.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/back_insert_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/bounded_iter.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
@@ -255,6 +356,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/iterator_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/mergeable.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/move_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/move_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/next.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/ostream_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/ostreambuf_iterator.h",
@@ -268,14 +370,15 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/sortable.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/unreachable_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/wrap_iter.h",
-  "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
   "//buildtools/third_party/libc++/trunk/include/__locale",
   "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/allocate_at_least.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocation_guard.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_arg_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/assume_aligned.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/auto_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/compressed_pair.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/concepts.h",
@@ -285,6 +388,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__memory/ranges_uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/raw_storage_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/shared_ptr.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/swap_allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
@@ -355,8 +459,10 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/empty_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/filter_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/lazy_split_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/non_propagating_cache.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/owning_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/range_adaptor.h",
@@ -371,16 +477,16 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/transform_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/view_interface.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/views.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/zip_view.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
   "//buildtools/third_party/libc++/trunk/include/__std_stream",
-  "//buildtools/third_party/libc++/trunk/include/__string",
+  "//buildtools/third_party/libc++/trunk/include/__string/char_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__string/extern_template_lists.h",
   "//buildtools/third_party/libc++/trunk/include/__support/android/locale_bionic.h",
   "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/gettod_zos.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
@@ -398,6 +504,122 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__threading_support",
   "//buildtools/third_party/libc++/trunk/include/__tree",
   "//buildtools/third_party/libc++/trunk/include/__tuple",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_cv.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_lvalue_reference.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_rvalue_reference.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_volatile.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/aligned_storage.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/aligned_union.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/alignment_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/apply_cv.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/common_reference.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/common_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/conditional.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/conjunction.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cv.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cvref.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/decay.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/disjunction.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/enable_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/extent.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/has_unique_object_representation.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/has_virtual_destructor.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/integral_constant.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_abstract.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_aggregate.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_arithmetic.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_array.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_base_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_bounded_array.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_callable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_class.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_compound.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_constant_evaluated.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_convertible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_copy_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_copy_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_core_convertible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_default_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_empty.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_enum.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_final.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_floating_point.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_function.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_fundamental.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_integral.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_literal_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_function_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_object_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_move_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_move_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_convertible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_copy_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_copy_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_default_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_move_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_move_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_null_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_object.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_pod.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_polymorphic.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_primary_template.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_reference.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_reference_wrapper.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_referenceable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_same.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_scalar.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_scoped_enum.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_standard_layout.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivial.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copy_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copy_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copyable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_default_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_assignable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_constructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unbounded_array.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_union.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unsigned.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_valid_expansion.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_void.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_volatile.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/lazy.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_signed.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_unsigned.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/nat.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/negation.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/promote.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/rank.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_all_extents.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cv.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cvref.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_extent.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_pointer.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_reference.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_volatile.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/type_identity.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/type_list.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/underlying_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/void_t.h",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
   "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/auto_cast.h",
@@ -512,7 +734,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/map",
   "//buildtools/third_party/libc++/trunk/include/math.h",
   "//buildtools/third_party/libc++/trunk/include/memory",
-  "//buildtools/third_party/libc++/trunk/include/module.modulemap",
+  "//buildtools/third_party/libc++/trunk/include/module.modulemap.in",
   "//buildtools/third_party/libc++/trunk/include/mutex",
   "//buildtools/third_party/libc++/trunk/include/new",
   "//buildtools/third_party/libc++/trunk/include/numbers",
@@ -532,6 +754,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/span",
   "//buildtools/third_party/libc++/trunk/include/sstream",
   "//buildtools/third_party/libc++/trunk/include/stack",
+  "//buildtools/third_party/libc++/trunk/include/stdatomic.h",
   "//buildtools/third_party/libc++/trunk/include/stdbool.h",
   "//buildtools/third_party/libc++/trunk/include/stddef.h",
   "//buildtools/third_party/libc++/trunk/include/stdexcept",

From f9b02358c66a1c404f665ff47568ab75024464ad Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:51:14 -0700
Subject: [PATCH 698/811] Bump v21.0.0-alpha.6

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index e17bf8f6e1427..6e35d6e99ba3b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.5
\ No newline at end of file
+21.0.0-alpha.6
\ No newline at end of file
diff --git a/package.json b/package.json
index f3cb2326d05b6..5ab1d2b8dd38d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.5",
+  "version": "21.0.0-alpha.6",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b2beab41c0377..4bfcbdf9c74ce 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,5
- PRODUCTVERSION 21,0,0,5
+ FILEVERSION 21,0,0,6
+ PRODUCTVERSION 21,0,0,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 018bc0993e3cdf9c5e2eece06f8007efae89ee4b Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 30 Aug 2022 10:57:32 +0200
Subject: [PATCH 699/811] chore: use nghttp2's config.h on all platforms
 (#35487)

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

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 patches/node/build_add_gn_build_files.patch | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
index 61e2003bd275c..8b8ed6a9e3d63 100644
--- a/patches/node/build_add_gn_build_files.patch
+++ b/patches/node/build_add_gn_build_files.patch
@@ -672,10 +672,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb
 +}
 diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8
+index 0000000000000000000000000000000000000000..9abde472d88923db835b12982b7f2ccb1f260196
 --- /dev/null
 +++ b/deps/nghttp2/BUILD.gn
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,47 @@
 +config("nghttp2_config") {
 +  defines = [ "NGHTTP2_STATICLIB" ]
 +  include_dirs = [ "lib/includes" ]
@@ -686,11 +686,9 @@ index 0000000000000000000000000000000000000000..8bfecba74d4d90e9fbf0e2cd301118e4
 +    "_U_",
 +    "BUILDING_NGHTTP2",
 +    "NGHTTP2_STATICLIB",
++    "HAVE_CONFIG_H",
 +  ]
 +  include_dirs = [ "lib/includes" ]
-+  if (is_win) {
-+    defines += [ "HAVE_CONFIG_H" ]
-+  }
 +
 +  cflags_c = [
 +    "-Wno-implicit-function-declaration",

From 7b623862961446071773f917ba4b96fecce6bed6 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 30 Aug 2022 13:58:28 +0200
Subject: [PATCH 700/811] fix: crash on WebWorker destruction (#35492)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 ...nterrupt_on_io_change_option_to_uv_loop_configure.patch | 7 +++++--
 shell/common/node_bindings.cc                              | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch b/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
index df4c22dbe6633..a568f9f86ab4a 100644
--- a/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
+++ b/patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
@@ -136,7 +136,7 @@ index 7cd3a2a954ff7d70e6ba7a6f7538648841bc54b2..f89b7158218be60ac10e61484a2d5e5e
  
  
 diff --git a/deps/uv/src/unix/loop.c b/deps/uv/src/unix/loop.c
-index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..353143e5ebecae598425dc036f4458bb7c43bb0b 100644
+index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..46fc03264b6cc1a3a4d8faf5ec5a754fc07c9b6d 100644
 --- a/deps/uv/src/unix/loop.c
 +++ b/deps/uv/src/unix/loop.c
 @@ -217,6 +217,11 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
@@ -151,7 +151,7 @@ index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..353143e5ebecae598425dc036f4458bb
    if (option != UV_LOOP_BLOCK_SIGNAL)
      return UV_ENOSYS;
  
-@@ -226,3 +231,37 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
+@@ -226,3 +231,40 @@ int uv__loop_configure(uv_loop_t* loop, uv_loop_option option, va_list ap) {
    loop->flags |= UV_LOOP_BLOCK_SIGPROF;
    return 0;
  }
@@ -183,6 +183,9 @@ index a88e71c339351f2ebcdd6c3f933fc3b1122910ed..353143e5ebecae598425dc036f4458bb
 +  if (r == len)
 +    return;
 +
++  if (!uv_loop_alive(loop))
++    return;
++
 +  if (r == -1)
 +    if (errno == EAGAIN || errno == EWOULDBLOCK)
 +      return;
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
index c350720a67766..ce03319e87d26 100644
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -37,6 +37,7 @@
 #include "shell/common/mac/main_application_bundle.h"
 #include "shell/common/node_includes.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h"  // nogncheck
+#include "third_party/electron_node/src/debug_utils.h"
 
 #if !defined(MAS_BUILD)
 #include "shell/common/crash_keys.h"
@@ -136,7 +137,7 @@ void stop_and_close_uv_loop(uv_loop_t* loop) {
       break;
 
   DCHECK_EQ(0, uv_loop_alive(loop));
-  uv_loop_close(loop);
+  node::CheckedUvLoopClose(loop);
 }
 
 bool g_is_initialized = false;

From da47103ad701527174eea10a396c5574b07f5e9b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Aug 2022 10:11:56 -0700
Subject: [PATCH 701/811] Bump v21.0.0-beta.1

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 6e35d6e99ba3b..ba444125b88fa 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-alpha.6
\ No newline at end of file
+21.0.0-beta.1
\ No newline at end of file
diff --git a/package.json b/package.json
index 5ab1d2b8dd38d..349b1d7c300d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-alpha.6",
+  "version": "21.0.0-beta.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bfcbdf9c74ce..96f0b227b5475 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,6
- PRODUCTVERSION 21,0,0,6
+ FILEVERSION 21,0,0,1
+ PRODUCTVERSION 21,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 5e8b4bd86ffa5eae1a26f119a1d78ba7922457b0 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 11:20:10 +0900
Subject: [PATCH 702/811] fix: crash when switching origins with emulation
 settings set (#35488)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 patches/chromium/.patches                     |  1 +
 ...ler_update_functions_to_early_return.patch | 45 +++++++++++++++++++
 spec-main/api-web-contents-spec.ts            | 30 +++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 485f18915fba5..d53c82faf37f4 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -117,3 +117,4 @@ add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
 revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
 add_electron_deps_to_license_credits_file.patch
 feat_add_set_can_resize_mutator.patch
+fix_revert_emulationhandler_update_functions_to_early_return.patch
diff --git a/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch b/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch
new file mode 100644
index 0000000000000..7a34a68504653
--- /dev/null
+++ b/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Fri, 26 Aug 2022 11:24:27 +0200
+Subject: fix: revert EmulationHandler update functions to early return
+
+Our debugger class (a subclass of ontent::DevToolsAgentHostClient) isn't
+aware of those changes unless we hook RenderFrameHostChanged. If we
+don't do this, some navigation lifecycle events
+{loadingFinished, dataReceived} emitted by the renderer are lost. We
+disconnect and reconnect the webcontents to the DevToolsAgentHost to
+prevent this from happening.
+
+As of https://chromium-review.googlesource.com/c/chromium/src/+/3758294
+this results in a DCHECK, since DevToolsAgentHost::DisconnectWebContents
+results in a call to UpdateDeviceEmulationState and host_ is nullptr. To
+fix this, we revert those state update calls to early returns.
+
+Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856525
+
+diff --git a/content/browser/devtools/protocol/emulation_handler.cc b/content/browser/devtools/protocol/emulation_handler.cc
+index 84736afeb21d1deec0f4032ef6f3304075d8fffb..d023bb7b5a34c5c055d3d7cc5dc3e04ef43bcc3b 100644
+--- a/content/browser/devtools/protocol/emulation_handler.cc
++++ b/content/browser/devtools/protocol/emulation_handler.cc
+@@ -565,7 +565,9 @@ WebContentsImpl* EmulationHandler::GetWebContents() {
+ }
+ 
+ void EmulationHandler::UpdateTouchEventEmulationState() {
+-  DCHECK(host_);
++  if (!host_)
++    return;
++
+   // We only have a single TouchEmulator for all frames, so let the main frame's
+   // EmulationHandler enable/disable it.
+   DCHECK(!host_->GetParentOrOuterDocument());
+@@ -585,7 +587,9 @@ void EmulationHandler::UpdateTouchEventEmulationState() {
+ }
+ 
+ void EmulationHandler::UpdateDeviceEmulationState() {
+-  DCHECK(host_);
++  if (!host_)
++    return;
++
+   // Device emulation only happens on the outermost main frame.
+   DCHECK(!host_->GetParentOrOuterDocument());
+ 
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 3050b926988a6..6b326e8008e64 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -326,6 +326,7 @@ describe('webContents module', () => {
 
   describe('loadURL() promise API', () => {
     let w: BrowserWindow;
+
     beforeEach(async () => {
       w = new BrowserWindow({ show: false });
     });
@@ -357,6 +358,35 @@ describe('webContents module', () => {
         .and.have.property('code', 'ERR_FAILED');
     });
 
+    it('does not crash when loading a new URL with emulation settings set', async () => {
+      const setEmulation = async () => {
+        if (w.webContents) {
+          w.webContents.debugger.attach('1.3');
+
+          const deviceMetrics = {
+            width: 700,
+            height: 600,
+            deviceScaleFactor: 2,
+            mobile: true,
+            dontSetVisibleSize: true
+          };
+          await w.webContents.debugger.sendCommand(
+            'Emulation.setDeviceMetricsOverride',
+            deviceMetrics
+          );
+        }
+      };
+
+      try {
+        await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+        await setEmulation();
+        await w.loadURL('data:text/html,<h1>HELLO</h1>');
+        await setEmulation();
+      } catch (e) {
+        expect((e as Error).message).to.match(/Debugger is already attached to the target/);
+      }
+    });
+
     it('sets appropriate error information on rejection', async () => {
       let err: any;
       try {

From fb0bbf0100528c2d00bae2e20a9c19e99b325655 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 06:31:01 -0700
Subject: [PATCH 703/811] Bump v21.0.0-beta.2

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index ba444125b88fa..7a05c6935a16e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.1
\ No newline at end of file
+21.0.0-beta.2
\ No newline at end of file
diff --git a/package.json b/package.json
index 349b1d7c300d5..0021bf5283ec7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.2",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 96f0b227b5475..ec408c224f83c 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,1
- PRODUCTVERSION 21,0,0,1
+ FILEVERSION 21,0,0,2
+ PRODUCTVERSION 21,0,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From e78aa6af167870a6f5bfcfd4844f50f91ca71cef Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 12:18:03 -0400
Subject: [PATCH 704/811] fix: `screen.getCursorScreenPoint()` crash on Wayland
 (#35575)

fix: screen.getCursorScreenPoint() crash on Wayland

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 shell/browser/api/electron_api_screen.cc | 17 ++++++++++++++++-
 shell/browser/api/electron_api_screen.h  |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc
index 53ae9f6b378d4..592d0017aeac6 100644
--- a/shell/browser/api/electron_api_screen.cc
+++ b/shell/browser/api/electron_api_screen.cc
@@ -24,6 +24,10 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
 namespace electron::api {
 
 gin::WrapperInfo Screen::kWrapperInfo = {gin::kEmbedderNativeGin};
@@ -68,7 +72,18 @@ Screen::~Screen() {
   screen_->RemoveObserver(this);
 }
 
-gfx::Point Screen::GetCursorScreenPoint() {
+gfx::Point Screen::GetCursorScreenPoint(v8::Isolate* isolate) {
+#if defined(USE_OZONE)
+  // Wayland will crash unless a window is created prior to calling
+  // GetCursorScreenPoint.
+  if (!ui::OzonePlatform::IsInitialized()) {
+    gin_helper::ErrorThrower thrower(isolate);
+    thrower.ThrowError(
+        "screen.getCursorScreenPoint() cannot be called before a window has "
+        "been created.");
+    return gfx::Point();
+  }
+#endif
   return screen_->GetCursorScreenPoint();
 }
 
diff --git a/shell/browser/api/electron_api_screen.h b/shell/browser/api/electron_api_screen.h
index 67c8fa7226dbe..ef203cd7b1076 100644
--- a/shell/browser/api/electron_api_screen.h
+++ b/shell/browser/api/electron_api_screen.h
@@ -40,7 +40,7 @@ class Screen : public gin::Wrappable<Screen>,
   Screen(v8::Isolate* isolate, display::Screen* screen);
   ~Screen() override;
 
-  gfx::Point GetCursorScreenPoint();
+  gfx::Point GetCursorScreenPoint(v8::Isolate* isolate);
   display::Display GetPrimaryDisplay();
   std::vector<display::Display> GetAllDisplays();
   display::Display GetDisplayNearestPoint(const gfx::Point& point);

From e48878ea63fef7c947dc7cf0c6811bb289c62164 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Tue, 6 Sep 2022 10:27:46 -0700
Subject: [PATCH 705/811] chore: cherry-pick 9b5207569882 from chromium
 (#35543)

* chore: cherry-pick 9b5207569882 from chromium

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/.patches                     |   1 +
 .../chromium/cherry-pick-9b5207569882.patch   | 179 ++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 patches/chromium/cherry-pick-9b5207569882.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index d53c82faf37f4..4a5283fa144b0 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -118,3 +118,4 @@ revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
 add_electron_deps_to_license_credits_file.patch
 feat_add_set_can_resize_mutator.patch
 fix_revert_emulationhandler_update_functions_to_early_return.patch
+cherry-pick-9b5207569882.patch
diff --git a/patches/chromium/cherry-pick-9b5207569882.patch b/patches/chromium/cherry-pick-9b5207569882.patch
new file mode 100644
index 0000000000000..a327b22364d20
--- /dev/null
+++ b/patches/chromium/cherry-pick-9b5207569882.patch
@@ -0,0 +1,179 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ken Rockot <rockot@google.com>
+Date: Wed, 31 Aug 2022 15:39:45 +0000
+Subject: Mojo: Validate response message type
+
+Ensures that a response message is actually the type expected by the
+original request.
+
+Fixed: 1358134
+Change-Id: I8f8f58168764477fbf7a6d2e8aeb040f07793d45
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3864274
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Commit-Queue: Ken Rockot <rockot@google.com>
+Cr-Commit-Position: refs/heads/main@{#1041553}
+
+diff --git a/mojo/public/cpp/bindings/interface_endpoint_client.h b/mojo/public/cpp/bindings/interface_endpoint_client.h
+index 0ebbc94ad51cca74fcebc357b5262229ae5c9d0e..cd79a5edb3f939623b874db36542ee651113c164 100644
+--- a/mojo/public/cpp/bindings/interface_endpoint_client.h
++++ b/mojo/public/cpp/bindings/interface_endpoint_client.h
+@@ -221,20 +221,32 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) InterfaceEndpointClient
+   void ForgetAsyncRequest(uint64_t request_id);
+ 
+  private:
+-  // Maps from the id of a response to the MessageReceiver that handles the
+-  // response.
+-  using AsyncResponderMap =
+-      std::map<uint64_t, std::unique_ptr<MessageReceiver>>;
++  struct PendingAsyncResponse {
++   public:
++    PendingAsyncResponse(uint32_t request_message_name,
++                         std::unique_ptr<MessageReceiver> responder);
++    PendingAsyncResponse(PendingAsyncResponse&&);
++    PendingAsyncResponse(const PendingAsyncResponse&) = delete;
++    PendingAsyncResponse& operator=(PendingAsyncResponse&&);
++    PendingAsyncResponse& operator=(const PendingAsyncResponse&) = delete;
++    ~PendingAsyncResponse();
++
++    uint32_t request_message_name;
++    std::unique_ptr<MessageReceiver> responder;
++  };
++
++  using AsyncResponderMap = std::map<uint64_t, PendingAsyncResponse>;
+ 
+   struct SyncResponseInfo {
+    public:
+-    explicit SyncResponseInfo(bool* in_response_received);
++    SyncResponseInfo(uint32_t request_message_name, bool* in_response_received);
+ 
+     SyncResponseInfo(const SyncResponseInfo&) = delete;
+     SyncResponseInfo& operator=(const SyncResponseInfo&) = delete;
+ 
+     ~SyncResponseInfo();
+ 
++    uint32_t request_message_name;
+     Message response;
+ 
+     // Points to a stack-allocated variable.
+diff --git a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
+index ded0d20ab193cfdaf36bd44c25719d7073c989fb..a6f41414b8918989662eb0a1dea773932631c8cc 100644
+--- a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
++++ b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
+@@ -30,6 +30,7 @@
+ #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
+ #include "mojo/public/cpp/bindings/sync_event_watcher.h"
+ #include "mojo/public/cpp/bindings/thread_safe_proxy.h"
++#include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_mojo_event_info.pbzero.h"
+ 
+ namespace mojo {
+@@ -316,9 +317,27 @@ class ResponderThunk : public MessageReceiverWithStatus {
+ 
+ // ----------------------------------------------------------------------------
+ 
++InterfaceEndpointClient::PendingAsyncResponse::PendingAsyncResponse(
++    uint32_t request_message_name,
++    std::unique_ptr<MessageReceiver> responder)
++    : request_message_name(request_message_name),
++      responder(std::move(responder)) {}
++
++InterfaceEndpointClient::PendingAsyncResponse::PendingAsyncResponse(
++    PendingAsyncResponse&&) = default;
++
++InterfaceEndpointClient::PendingAsyncResponse&
++InterfaceEndpointClient::PendingAsyncResponse::operator=(
++    PendingAsyncResponse&&) = default;
++
++InterfaceEndpointClient::PendingAsyncResponse::~PendingAsyncResponse() =
++    default;
++
+ InterfaceEndpointClient::SyncResponseInfo::SyncResponseInfo(
++    uint32_t request_message_name,
+     bool* in_response_received)
+-    : response_received(in_response_received) {}
++    : request_message_name(request_message_name),
++      response_received(in_response_received) {}
+ 
+ InterfaceEndpointClient::SyncResponseInfo::~SyncResponseInfo() {}
+ 
+@@ -606,6 +625,7 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
+   // message before calling |SendMessage()| below.
+ #endif
+ 
++  const uint32_t message_name = message->name();
+   const bool is_sync = message->has_flag(Message::kFlagIsSync);
+   const bool exclusive_wait = message->has_flag(Message::kFlagNoInterrupt);
+   if (!controller_->SendMessage(message))
+@@ -622,7 +642,8 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
+       controller_->RegisterExternalSyncWaiter(request_id);
+     }
+     base::AutoLock lock(async_responders_lock_);
+-    async_responders_[request_id] = std::move(responder);
++    async_responders_.emplace(
++        request_id, PendingAsyncResponse{message_name, std::move(responder)});
+     return true;
+   }
+ 
+@@ -630,7 +651,8 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
+ 
+   bool response_received = false;
+   sync_responses_.insert(std::make_pair(
+-      request_id, std::make_unique<SyncResponseInfo>(&response_received)));
++      request_id,
++      std::make_unique<SyncResponseInfo>(message_name, &response_received)));
+ 
+   base::WeakPtr<InterfaceEndpointClient> weak_self =
+       weak_ptr_factory_.GetWeakPtr();
+@@ -808,13 +830,13 @@ void InterfaceEndpointClient::ResetFromAnotherSequenceUnsafe() {
+ }
+ 
+ void InterfaceEndpointClient::ForgetAsyncRequest(uint64_t request_id) {
+-  std::unique_ptr<MessageReceiver> responder;
++  absl::optional<PendingAsyncResponse> response;
+   {
+     base::AutoLock lock(async_responders_lock_);
+     auto it = async_responders_.find(request_id);
+     if (it == async_responders_.end())
+       return;
+-    responder = std::move(it->second);
++    response = std::move(it->second);
+     async_responders_.erase(it);
+   }
+ }
+@@ -906,6 +928,10 @@ bool InterfaceEndpointClient::HandleValidatedMessage(Message* message) {
+         return false;
+ 
+       if (it->second) {
++        if (message->name() != it->second->request_message_name) {
++          return false;
++        }
++
+         it->second->response = std::move(*message);
+         *it->second->response_received = true;
+         return true;
+@@ -916,18 +942,22 @@ bool InterfaceEndpointClient::HandleValidatedMessage(Message* message) {
+       sync_responses_.erase(it);
+     }
+ 
+-    std::unique_ptr<MessageReceiver> responder;
++    absl::optional<PendingAsyncResponse> pending_response;
+     {
+       base::AutoLock lock(async_responders_lock_);
+       auto it = async_responders_.find(request_id);
+       if (it == async_responders_.end())
+         return false;
+-      responder = std::move(it->second);
++      pending_response = std::move(it->second);
+       async_responders_.erase(it);
+     }
+ 
++    if (message->name() != pending_response->request_message_name) {
++      return false;
++    }
++
+     internal::MessageDispatchContext dispatch_context(message);
+-    return responder->Accept(message);
++    return pending_response->responder->Accept(message);
+   } else {
+     if (mojo::internal::ControlMessageHandler::IsControlMessage(message))
+       return control_message_handler_.Accept(message);

From 605ee9e28a65ea8237dd73cc3b39b6e036fd4296 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 15:03:08 -0700
Subject: [PATCH 706/811] Bump v21.0.0-beta.3

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 7a05c6935a16e..27cb877ac6eab 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.2
\ No newline at end of file
+21.0.0-beta.3
\ No newline at end of file
diff --git a/package.json b/package.json
index 0021bf5283ec7..475732894d7e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.2",
+  "version": "21.0.0-beta.3",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ec408c224f83c..2af8b533d1f3e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,2
- PRODUCTVERSION 21,0,0,2
+ FILEVERSION 21,0,0,3
+ PRODUCTVERSION 21,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 85f93bc5bf04a25f3b34e8689553499ce7202c29 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 14:07:58 -0400
Subject: [PATCH 707/811] docs: add fuses and asar integrity docs (#35596)

Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
---
 docs/tutorial/asar-integrity.md | 53 +++++++++++++++++++++++++++++++
 docs/tutorial/fuses.md          | 55 ++++++++++++++++++++++++++++++++-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 docs/tutorial/asar-integrity.md

diff --git a/docs/tutorial/asar-integrity.md b/docs/tutorial/asar-integrity.md
new file mode 100644
index 0000000000000..63320cea31336
--- /dev/null
+++ b/docs/tutorial/asar-integrity.md
@@ -0,0 +1,53 @@
+---
+title: 'ASAR Integrity'
+description: 'An experimental feature that ensures the validity of ASAR contents at runtime.'
+slug: asar-integrity
+hide_title: false
+---
+
+## Platform Support
+
+Currently ASAR integrity checking is only supported on macOS.
+
+## Requirements
+
+### Electron Forge / Electron Packager
+
+If you are using `>= electron-packager@15.4.0` or `>= @electron-forge/core@6.0.0-beta.61` then all these requirements are met for you automatically and you can skip to [Toggling the Fuse](#toggling-the-fuse).
+
+### Other build systems
+
+In order to enable ASAR integrity checking you need to ensure that your `app.asar` file was generated by a version of the `asar` npm package that supports asar integrity.  Support was introduced in version `3.1.0`.
+
+Your must then populate a valid `ElectronAsarIntegrity` dictionary block in your packaged apps `Info.plist`.  An example is included below.
+
+```plist
+<key>ElectronAsarIntegrity</key>
+<dict>
+  <key>Resources/app.asar</key>
+  <dict>
+    <key>algorithm</key>
+    <string>SHA256</string>
+    <key>hash</key>
+    <string>9d1f61ea03c4bb62b4416387a521101b81151da0cfbe18c9f8c8b818c5cebfac</string>
+  </dict>
+</dict>
+```
+
+Valid `algorithm` values are currently `SHA256` only.  The `hash` is a hash of the ASAR header using the given algorithm.  The `asar` package exposes a `getRawHeader` method whose result can then be hashed to generate this value.
+
+## Toggling the Fuse
+
+ASAR integrity checking is currently disabled by default and can be enabled by toggling a fuse. See [Electron Fuses](fuses.md) for more information on what Electron Fuses are and how they work.  When enabling this fuse you typically also want to enable the `onlyLoadAppFromAsar` fuse otherwise the validity checking can be bypassed via the Electron app code search path.
+
+```js
+require('@electron/fuses').flipFuses(
+  // E.g. /a/b/Foo.app
+  pathToPackagedApp,
+  {
+    version: FuseVersion.V1,
+    [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
+    [FuseV1Options.OnlyLoadAppFromAsar]: true
+  }
+)
+```
diff --git a/docs/tutorial/fuses.md b/docs/tutorial/fuses.md
index 099c8d0bcd0ef..a3beb86a24b06 100644
--- a/docs/tutorial/fuses.md
+++ b/docs/tutorial/fuses.md
@@ -8,6 +8,52 @@ For a subset of Electron functionality it makes sense to disable certain feature
 
 Fuses are the solution to this problem, at a high level they are "magic bits" in the Electron binary that can be flipped when packaging your Electron app to enable / disable certain features / restrictions.  Because they are flipped at package time before you code sign your app the OS becomes responsible for ensuring those bits aren't flipped back via OS level code signing validation (Gatekeeper / App Locker).
 
+## Current Fuses
+
+### `runAsNode`
+
+**Default:** Enabled
+**@electron/fuses:** `FuseV1Options.RunAsNode`
+
+The runAsNode fuse toggles whether the `ELECTRON_RUN_AS_NODE` environment variable is respected or not.  Please note that if this fuse is disabled then `process.fork` in the main process will not function as expected as it depends on this environment variable to function.
+
+### `cookieEncryption`
+
+**Default:** Disabled
+**@electron/fuses:** `FuseV1Options.EnableCookieEncryption`
+
+The cookieEncryption fuse toggles whether the cookie store on disk is encrypted using OS level cryptography keys.  By default the sqlite database that Chromium uses to store cookies stores the values in plaintext.  If you wish to ensure your apps cookies are encrypted in the same way Chrome does then you should enable this fuse.  Please note it is a one-way transition, if you enable this fuse existing unencrypted cookies will be encrypted-on-write but if you then disable the fuse again your cookie store will effectively be corrupt and useless.  Most apps can safely enable this fuse.
+
+### `nodeOptions`
+
+**Default:** Enabled
+**@electron/fuses:** `FuseV1Options.EnableNodeOptionsEnvironmentVariable`
+
+The nodeOptions fuse toggles whether the [`NODE_OPTIONS`](https://nodejs.org/api/cli.html#node_optionsoptions) environment variable is respected or not.  This environment variable can be used to pass all kinds of custom options to the Node.js runtime and isn't typically used by apps in production.  Most apps can safely disable this fuse.
+
+### `nodeCliInspect`
+
+**Default:** Enabled
+**@electron/fuses:** `FuseV1Options.EnableNodeCliInspectArguments`
+
+The nodeCliInspect fuse toggles whether the `--inspect`, `--inspect-brk`, etc. flags are respected or not.  When disabled it also ensures that `SIGUSR1` signal does not initialize the main process inspector.  Most apps can safely disable this fuse.
+
+### `embeddedAsarIntegrityValidation`
+
+**Default:** Disabled
+**@electron/fuses:** `FuseV1Options.EnableEmbeddedAsarIntegrityValidation`
+
+The embeddedAsarIntegrityValidation fuse toggles an experimental feature on macOS that validates the content of the `app.asar` file when it is loaded.  This feature is designed to have a minimal performance impact but may marginally slow down file reads from inside the `app.asar` archive.
+
+For more information on how to use asar integrity validation please read the [Asar Integrity](asar-integrity.md) documentation.
+
+### `onlyLoadAppFromAsar`
+
+**Default:** Disabled
+**@electron/fuses:** `FuseV1Options.OnlyLoadAppFromAsar`
+
+The onlyLoadAppFromAsar fuse changes the search system that Electron uses to locate your app code.  By default Electron will search in the following order `app.asar` -> `app` -> `default_app.asasr`.  When this fuse is enabled the search order becomes a single entry `app.asar` thus ensuring that when combined with the `embeddedAsarIntegrityValidation` fuse it is impossible to load non-validated code.
+
 ## How do I flip the fuses?
 
 ### The easy way
@@ -20,11 +66,18 @@ require('@electron/fuses').flipFuses(
   require('electron'),
   // Fuses to flip
   {
-    runAsNode: false
+    version: FuseVersion.V1,
+    [FuseV1Options.RunAsNode]: false
   }
 )
 ```
 
+You can validate the fuses have been flipped or check the fuse status of an arbitrary Electron app using the fuses CLI.
+
+```bash
+ npx @electron/fuses read --app /Applications/Foo.app
+```
+
 ### The hard way
 
 #### Quick Glossary

From a5db8a3d53b21293a06a5cc1779f57148be65e9f Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 06:46:39 -0400
Subject: [PATCH 708/811] fix: session.getBlobData never resolves with blob
 sizes > 65536 (#35602)

fix: session.getBlobData never resolves with blob sizes > 65536 (#35277)

* fix: session.getBlobData never resolves with blob sizes > 65536 (#34398)

* Add unit test case for session.getBlobData

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

Co-authored-by: Frank Pian <bianyongfang@vip.qq.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 .../api/electron_api_data_pipe_holder.cc      |  5 ++-
 spec-main/api-session-spec.ts                 | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/shell/browser/api/electron_api_data_pipe_holder.cc b/shell/browser/api/electron_api_data_pipe_holder.cc
index f33f1d9b85b99..67fe81959a12f 100644
--- a/shell/browser/api/electron_api_data_pipe_holder.cc
+++ b/shell/browser/api/electron_api_data_pipe_holder.cc
@@ -86,8 +86,11 @@ class DataPipeReader {
     if (result == MOJO_RESULT_OK) {  // success
       remaining_size_ -= length;
       head_ += length;
-      if (remaining_size_ == 0)
+      if (remaining_size_ == 0) {
         OnSuccess();
+      } else {
+        handle_watcher_.ArmOrNotify();
+      }
     } else if (result == MOJO_RESULT_SHOULD_WAIT) {  // IO pending
       handle_watcher_.ArmOrNotify();
     } else {  // error
diff --git a/spec-main/api-session-spec.ts b/spec-main/api-session-spec.ts
index a1be9cf2db7a7..f7817c7e03376 100644
--- a/spec-main/api-session-spec.ts
+++ b/spec-main/api-session-spec.ts
@@ -529,6 +529,50 @@ describe('session module', () => {
     });
   });
 
+  describe('ses.getBlobData2()', () => {
+    const scheme = 'cors-blob';
+    const protocol = session.defaultSession.protocol;
+    const url = `${scheme}://host`;
+    after(async () => {
+      await protocol.unregisterProtocol(scheme);
+    });
+    afterEach(closeAllWindows);
+
+    it('returns blob data for uuid', (done) => {
+      const content = `<html>
+                       <script>
+                       let fd = new FormData();
+                       fd.append("data", new Blob(new Array(65_537).fill('a')));
+                       fetch('${url}', {method:'POST', body: fd });
+                       </script>
+                       </html>`;
+
+      protocol.registerStringProtocol(scheme, (request, callback) => {
+        try {
+          if (request.method === 'GET') {
+            callback({ data: content, mimeType: 'text/html' });
+          } else if (request.method === 'POST') {
+            const uuid = request.uploadData![1].blobUUID;
+            expect(uuid).to.be.a('string');
+            session.defaultSession.getBlobData(uuid!).then(result => {
+              try {
+                const data = new Array(65_537).fill('a');
+                expect(result.toString()).to.equal(data.join(''));
+                done();
+              } catch (e) {
+                done(e);
+              }
+            });
+          }
+        } catch (e) {
+          done(e);
+        }
+      });
+      const w = new BrowserWindow({ show: false });
+      w.loadURL(url);
+    });
+  });
+
   describe('ses.setCertificateVerifyProc(callback)', () => {
     let server: http.Server;
 

From 62b64e6e604d6d683c887afc5d81ac3eb91411a7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 06:31:18 -0700
Subject: [PATCH 709/811] Bump v21.0.0-beta.4

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 27cb877ac6eab..b904bee955b55 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.3
\ No newline at end of file
+21.0.0-beta.4
\ No newline at end of file
diff --git a/package.json b/package.json
index 475732894d7e5..26d61b20e07ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.3",
+  "version": "21.0.0-beta.4",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2af8b533d1f3e..738c74779428e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,3
- PRODUCTVERSION 21,0,0,3
+ FILEVERSION 21,0,0,4
+ PRODUCTVERSION 21,0,0,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 686a554c6a16dbf2e8cdf261fef07002e757494f Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 09:59:16 -0700
Subject: [PATCH 710/811] fix: Set background for WCO container (#35612)

* fix: Set background for WCO container

* Add background when invalidating as well

Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
---
 shell/browser/ui/views/win_caption_button_container.cc | 3 +++
 shell/browser/ui/views/win_frame_view.cc               | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/shell/browser/ui/views/win_caption_button_container.cc b/shell/browser/ui/views/win_caption_button_container.cc
index 62ce6d9e5b880..92c0fca690cbd 100644
--- a/shell/browser/ui/views/win_caption_button_container.cc
+++ b/shell/browser/ui/views/win_caption_button_container.cc
@@ -14,6 +14,7 @@
 #include "shell/browser/ui/views/win_frame_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/strings/grit/ui_strings.h"
+#include "ui/views/background.h"
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/view_class_properties.h"
 
@@ -128,6 +129,8 @@ void WinCaptionButtonContainer::AddedToWidget() {
   UpdateButtons();
 
   if (frame_view_->window()->IsWindowControlsOverlayEnabled()) {
+    SetBackground(views::CreateSolidBackground(
+        frame_view_->window()->overlay_button_color()));
     SetPaintToLayer();
   }
 }
diff --git a/shell/browser/ui/views/win_frame_view.cc b/shell/browser/ui/views/win_frame_view.cc
index cea0b2937c92a..ad01b0cbac91e 100644
--- a/shell/browser/ui/views/win_frame_view.cc
+++ b/shell/browser/ui/views/win_frame_view.cc
@@ -19,6 +19,7 @@
 #include "ui/display/win/dpi.h"
 #include "ui/display/win/screen_win.h"
 #include "ui/gfx/geometry/dip_util.h"
+#include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/win/hwnd_util.h"
 
@@ -58,6 +59,8 @@ void WinFrameView::InvalidateCaptionButtons() {
   if (!caption_button_container_)
     return;
 
+  caption_button_container_->SetBackground(
+      views::CreateSolidBackground(window()->overlay_button_color()));
   caption_button_container_->InvalidateLayout();
   caption_button_container_->SchedulePaint();
 }

From 91969330dddfb1ea9026028089662283fd1ad556 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 06:31:02 -0700
Subject: [PATCH 711/811] Bump v21.0.0-beta.5

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index b904bee955b55..c8bf94a544abf 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.4
\ No newline at end of file
+21.0.0-beta.5
\ No newline at end of file
diff --git a/package.json b/package.json
index 26d61b20e07ca..2b7bacaa6deb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.4",
+  "version": "21.0.0-beta.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 738c74779428e..b2beab41c0377 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,4
- PRODUCTVERSION 21,0,0,4
+ FILEVERSION 21,0,0,5
+ PRODUCTVERSION 21,0,0,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a1e792f48a4ca98fb014b645e36b7e027abe548e Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:04:49 -0700
Subject: [PATCH 712/811] docs: Use inline image link in faq.md (#35648)

* Use absolute URL in faq.md image link

The relative link is rendered relative to the host domain, which works fine when viewing it on Github, but since you also use the same generated HTML in your doc site, the link is broken. See here: https://www.electronjs.org/docs/latest/faq#the-font-looks-blurry-what-is-this-and-what-can-i-do

Using an absolute URL here should fix the issue on the main site.

* Use inline image reference for subpixel rendering example

As suggested by @dsanders11

Co-authored-by: Adrian Petrescu <adrian@apetre.sc>
---
 docs/faq.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 174104aee9b0c..84b3b5cf6e201 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -135,7 +135,7 @@ is only available in renderer processes.
 
 If [sub-pixel anti-aliasing](https://alienryderflex.com/sub_pixel/) is deactivated, then fonts on LCD screens can look blurry. Example:
 
-![subpixel rendering example]
+![Subpixel rendering example](images/subpixel-rendering-screenshot.gif)
 
 Sub-pixel anti-aliasing needs a non-transparent background of the layer containing the font glyphs. (See [this issue](https://github.com/electron/electron/issues/6344#issuecomment-420371918) for more info).
 
@@ -161,4 +161,3 @@ Notice that just setting the background in the CSS does not have the desired eff
 [indexed-db]: https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API
 [message-port]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
 [browser-window]: api/browser-window.md
-[subpixel rendering example]: images/subpixel-rendering-screenshot.gif

From 8ce7209b9ba170fa45dc81acdf7b442daed446f1 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:06:19 -0700
Subject: [PATCH 713/811] fix: potential "Object has been destroyed" error in
 BrowserWindow.getFocusedWindow (#35646)

Co-authored-by: Milan Burda <milan.burda@gmail.com>
---
 lib/browser/api/browser-window.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/browser-window.ts b/lib/browser/api/browser-window.ts
index d20ea0bda5571..053e09ab63690 100644
--- a/lib/browser/api/browser-window.ts
+++ b/lib/browser/api/browser-window.ts
@@ -72,9 +72,8 @@ BrowserWindow.getAllWindows = () => {
 
 BrowserWindow.getFocusedWindow = () => {
   for (const window of BrowserWindow.getAllWindows()) {
-    const hasWC = window.webContents && !window.webContents.isDestroyed();
-    if (!window.isDestroyed() && hasWC) {
-      if (window.isFocused() || window.isDevToolsFocused()) return window;
+    if (!window.isDestroyed() && window.webContents && !window.webContents.isDestroyed()) {
+      if (window.isFocused() || window.webContents.isDevToolsFocused()) return window;
     }
   }
   return null;

From fb4990a537ca2ccb1d1839dd89263937326fd846 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:12:05 -0700
Subject: [PATCH 714/811] docs: fix misspelling in fuses (#35620)

Co-authored-by: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
---
 docs/tutorial/fuses.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/fuses.md b/docs/tutorial/fuses.md
index a3beb86a24b06..bb0c61b475136 100644
--- a/docs/tutorial/fuses.md
+++ b/docs/tutorial/fuses.md
@@ -52,7 +52,7 @@ For more information on how to use asar integrity validation please read the [As
 **Default:** Disabled
 **@electron/fuses:** `FuseV1Options.OnlyLoadAppFromAsar`
 
-The onlyLoadAppFromAsar fuse changes the search system that Electron uses to locate your app code.  By default Electron will search in the following order `app.asar` -> `app` -> `default_app.asasr`.  When this fuse is enabled the search order becomes a single entry `app.asar` thus ensuring that when combined with the `embeddedAsarIntegrityValidation` fuse it is impossible to load non-validated code.
+The onlyLoadAppFromAsar fuse changes the search system that Electron uses to locate your app code.  By default Electron will search in the following order `app.asar` -> `app` -> `default_app.asar`.  When this fuse is enabled the search order becomes a single entry `app.asar` thus ensuring that when combined with the `embeddedAsarIntegrityValidation` fuse it is impossible to load non-validated code.
 
 ## How do I flip the fuses?
 

From 135c8c34ece0fa1fa04bad6e99af4bca5f788343 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:14:46 -0700
Subject: [PATCH 715/811] fix: ensure history navigations are
 sandboxed-iframe-aware (#35623)

Co-authored-by: Jeremy Spiegel <jeremy.spiegel@frontapp.com>
---
 .../browser/api/electron_api_web_contents.cc  |  5 ----
 shell/browser/api/electron_api_web_contents.h |  1 -
 spec-main/chromium-spec.ts                    | 28 +++++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 7415e0c5d00f9..030ccee6f0f7e 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1380,11 +1380,6 @@ bool WebContents::HandleContextMenu(content::RenderFrameHost& render_frame_host,
   return true;
 }
 
-bool WebContents::OnGoToEntryOffset(int offset) {
-  GoToOffset(offset);
-  return false;
-}
-
 void WebContents::FindReply(content::WebContents* web_contents,
                             int request_id,
                             int number_of_matches,
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 7ccc525f56096..45b4846d2f9b4 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -534,7 +534,6 @@ class WebContents : public ExclusiveAccessContext,
       content::RenderWidgetHost* render_widget_host) override;
   bool HandleContextMenu(content::RenderFrameHost& render_frame_host,
                          const content::ContextMenuParams& params) override;
-  bool OnGoToEntryOffset(int offset) override;
   void FindReply(content::WebContents* web_contents,
                  int request_id,
                  int number_of_matches,
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index cf241bccbc719..957fab8b67ccf 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -1571,6 +1571,34 @@ describe('chromium features', () => {
         expect((w.webContents as any).length()).to.equal(2);
       });
     });
+
+    describe('window.history.back', () => {
+      it('should not allow sandboxed iframe to modify main frame state', async () => {
+        const w = new BrowserWindow({ show: false });
+        w.loadURL('data:text/html,<iframe sandbox="allow-scripts"></iframe>');
+        await Promise.all([
+          emittedOnce(w.webContents, 'navigation-entry-committed'),
+          emittedOnce(w.webContents, 'did-frame-navigate'),
+          emittedOnce(w.webContents, 'did-navigate')
+        ]);
+
+        w.webContents.executeJavaScript('window.history.pushState(1, "")');
+        await Promise.all([
+          emittedOnce(w.webContents, 'navigation-entry-committed'),
+          emittedOnce(w.webContents, 'did-navigate-in-page')
+        ]);
+
+        (w.webContents as any).once('navigation-entry-committed', () => {
+          expect.fail('Unexpected navigation-entry-committed');
+        });
+        w.webContents.once('did-navigate-in-page', () => {
+          expect.fail('Unexpected did-navigate-in-page');
+        });
+        await w.webContents.mainFrame.frames[0].executeJavaScript('window.history.back()');
+        expect(await w.webContents.executeJavaScript('window.history.state')).to.equal(1);
+        expect((w.webContents as any).getActiveIndex()).to.equal(1);
+      });
+    });
   });
 
   describe('chrome://media-internals', () => {

From f9b2608f2c48f89f4c7087920fe3cb3fef89ed2e Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:33:40 -0700
Subject: [PATCH 716/811] docs: update sandbox renderer defaults for Electron
 20 (#35615)

docs: update sandbox renderer defaults for Electron 20 (#35379)

* docs: update E20 sandbox rendering defaults

* docs: update tutorial

* simplify paragraph

* dont mention context isolation

Co-authored-by: Erick Zhao <erick@hotmail.ca>
---
 docs/tutorial/sandbox.md            | 74 +++++++++++++++--------------
 docs/tutorial/tutorial-3-preload.md | 20 +++++++-
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/docs/tutorial/sandbox.md b/docs/tutorial/sandbox.md
index db71727efb6cc..5081d557ba0db 100644
--- a/docs/tutorial/sandbox.md
+++ b/docs/tutorial/sandbox.md
@@ -12,28 +12,10 @@ the GPU service and the network service.
 
 See Chromium's [Sandbox design document][sandbox] for more information.
 
-## Electron's sandboxing policies
-
-Electron comes with a mixed sandbox environment, meaning sandboxed processes can run
-alongside privileged ones. By default, renderer processes are not sandboxed, but
-utility processes are. Note that as in Chromium, the main (browser) process is
-privileged and cannot be sandboxed.
-
-Historically, this mixed sandbox approach was established because having Node.js available
-in the renderer is an extremely powerful tool for app developers. Unfortunately, this
-feature is also an equally massive security vulnerability.
-
-Theoretically, unsandboxed renderers are not a problem for desktop applications that
-only display trusted code, but they make Electron less secure than Chromium for
-displaying untrusted web content. However, even purportedly trusted code may be
-dangerous — there are countless attack vectors that malicious actors can use, from
-cross-site scripting to content injection to man-in-the-middle attacks on remotely loaded
-websites, just to name a few. For this reason, we recommend enabling renderer sandboxing
-for the vast majority of cases under an abundance of caution.
-
-<!--TODO: update this guide when #28466 is either solved or closed -->
-Note that there is an active discussion in the issue tracker to enable renderer sandboxing
-by default. See [#28466][issue-28466]) for details.
+Starting from Electron 20, the sandbox is enabled for renderer processes without any
+further configuration. If you want to disable the sandbox for a process, see the
+[Disabling the sandbox for a single process](#disabling-the-sandbox-for-a-single-process)
+section.
 
 ## Sandbox behaviour in Electron
 
@@ -46,12 +28,17 @@ When renderer processes in Electron are sandboxed, they behave in the same way a
 regular Chrome renderer would. A sandboxed renderer won't have a Node.js
 environment initialized.
 
-<!-- TODO(erickzhao): when we have a solid guide for IPC, link it here -->
 Therefore, when the sandbox is enabled, renderer processes can only perform privileged
 tasks (such as interacting with the filesystem, making changes to the system, or spawning
 subprocesses) by delegating these tasks to the main process via inter-process
 communication (IPC).
 
+:::note
+
+For more info on inter-process communication, check out our [IPC guide](./ipc.md).
+
+:::
+
 ### Preload scripts
 
 In order to allow renderer processes to communicate with the main process, preload
@@ -66,7 +53,7 @@ but can only import a subset of Electron and Node's built-in modules:
 
 In addition, the preload script also polyfills certain Node.js primitives as globals:
 
-* [`Buffer`](https://nodejs.org/api/Buffer.html)
+* [`Buffer`](https://nodejs.org/api/buffer.html)
 * [`process`](../api/process.md)
 * [`clearImmediate`](https://nodejs.org/api/timers.html#timers_clearimmediate_immediate)
 * [`setImmediate`](https://nodejs.org/api/timers.html#timers_setimmediate_callback_args)
@@ -83,13 +70,17 @@ privileged APIs to untrusted code running in the renderer process unless
 
 ## Configuring the sandbox
 
-### Enabling the sandbox for a single process
+For most apps, sandboxing is the best choice. In certain use cases that are incompatible with
+the sandbox (for instance, when using native node modules in the renderer),
+it is possible to disable the sandbox for specific processes. This comes with security
+risks, especially if any untrusted code or content is present in the unsandboxed process.
 
-In Electron, renderer sandboxing can be enabled on a per-process basis with
-the `sandbox: true` preference in the [`BrowserWindow`][browser-window] constructor.
+### Disabling the sandbox for a single process
 
-```js
-// main.js
+In Electron, renderer sandboxing can be disabled on a per-process basis with
+the `sandbox: false` preference in the [`BrowserWindow`][browser-window] constructor.
+
+```js title='main.js'
 app.whenReady().then(() => {
   const win = new BrowserWindow({
     webPreferences: {
@@ -100,17 +91,30 @@ app.whenReady().then(() => {
 })
 ```
 
+Sandboxing is also disabled whenever Node.js integration is enabled in the renderer.
+This can be done through the BrowserWindow constructor with the `nodeIntegration: true` flag.
+
+```js title='main.js'
+app.whenReady().then(() => {
+  const win = new BrowserWindow({
+    webPreferences: {
+      nodeIntegration: true
+    }
+  })
+  win.loadURL('https://google.com')
+})
+```
+
 ### Enabling the sandbox globally
 
 If you want to force sandboxing for all renderers, you can also use the
 [`app.enableSandbox`][enable-sandbox] API. Note that this API has to be called before the
 app's `ready` event.
 
-```js
-// main.js
+```js title='main.js'
 app.enableSandbox()
 app.whenReady().then(() => {
-  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
+  // any sandbox:false calls are overridden since `app.enableSandbox()` was called.
   const win = new BrowserWindow()
   win.loadURL('https://google.com')
 })
@@ -139,16 +143,16 @@ issues:
    have, to inherit everything we can from Chromium, and to respond quickly to
    security issues, but Electron cannot be as secure as Chromium without the
    resources that Chromium is able to dedicate.
-2. Some security features in Chrome (such as Safe Browsing and Certificate
+1. Some security features in Chrome (such as Safe Browsing and Certificate
    Transparency) require a centralized authority and dedicated servers, both of
    which run counter to the goals of the Electron project. As such, we disable
    those features in Electron, at the cost of the associated security they
    would otherwise bring.
-3. There is only one Chromium, whereas there are many thousands of apps built
+1. There is only one Chromium, whereas there are many thousands of apps built
    on Electron, all of which behave slightly differently. Accounting for those
    differences can yield a huge possibility space, and make it challenging to
    ensure the security of the platform in unusual use cases.
-4. We can't push security updates to users directly, so we rely on app vendors
+1. We can't push security updates to users directly, so we rely on app vendors
    to upgrade the version of Electron underlying their app in order for
    security updates to reach users.
 
diff --git a/docs/tutorial/tutorial-3-preload.md b/docs/tutorial/tutorial-3-preload.md
index 6f84cfe421909..80e12ef0e82d7 100644
--- a/docs/tutorial/tutorial-3-preload.md
+++ b/docs/tutorial/tutorial-3-preload.md
@@ -38,7 +38,25 @@ called a **preload**.
 ## Augmenting the renderer with a preload script
 
 A BrowserWindow's preload script runs in a context that has access to both the HTML DOM
-and a Node.js environment. Preload scripts are injected before a web page loads in the renderer,
+and a limited subset of Node.js and Electron APIs.
+
+:::info Preload script sandboxing
+
+From Electron 20 onwards, preload scripts are **sandboxed** by default and no longer have access
+to a full Node.js environment. Practically, this means that you have a polyfilled `require`
+function that only has access to a limited set of APIs.
+
+| Available API      | Details                                                                                                                                                                                                                                                        |
+| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Electron modules   | Renderer process modules                                                                                                                                                                                                                                       |
+| Node.js modules    | [`events`](https://nodejs.org/api/events.html), [`timers`](https://nodejs.org/api/timers.html), [`url`](https://nodejs.org/api/url.html)                                                                                                                       |
+| Polyfilled globals | [`Buffer`](https://nodejs.org/api/buffer.html), [`process`](../api/process.md), [`clearImmediate`](https://nodejs.org/api/timers.html#timers_clearimmediate_immediate), [`setImmediate`](https://nodejs.org/api/timers.html#timers_setimmediate_callback_args) |
+
+For more information, check out the [Process Sandboxing](./sandbox.md) guide.
+
+:::
+
+Preload scripts are injected before a web page loads in the renderer,
 similar to a Chrome extension's [content scripts][content-script]. To add features to your renderer
 that require privileged access, you can define [global] objects through the
 [contextBridge][contextbridge] API.

From aaf560817b5173ac7288b382a4e6d6eb3ff25a3d Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:36:58 -0700
Subject: [PATCH 717/811] chore: bump chromium to 106.0.5249.30 (21-x-y)
 (#35423)

---
 DEPS                                          |   2 +-
 chromium_src/BUILD.gn                         |   7 +-
 patches/chromium/.patches                     |   4 +-
 patches/chromium/accelerator.patch            |   6 +-
 ...client_precreatemessageloop_callback.patch |  16 +-
 .../add_didinstallconditionalfeatures.patch   |  20 +-
 ...pedcliboardwriter_writeunsaferawdata.patch |   2 +-
 ..._scheduler_throttling_per_renderview.patch |  45 ++--
 ..._windows_to_have_different_web_prefs.patch |  14 +-
 ..._secondary_label_via_simplemenumodel.patch |   6 +-
 patches/chromium/blink_local_frame.patch      |  12 +-
 ...build_disable_partition_alloc_on_mac.patch |   2 +-
 ...build_disable_print_content_analysis.patch |   9 +-
 ..._depend_on_packed_resource_integrity.patch |  20 +-
 .../build_libc_as_static_library.patch        |   2 +-
 patches/chromium/can_create_window.patch      |  48 ++---
 .../chromium/cherry-pick-9b5207569882.patch   | 179 ----------------
 ...hore_add_electron_deps_to_gitignores.patch |   2 +-
 ...dle_synthetic_mouse_events_for_touch.patch |   4 +-
 ...screationoverridden_with_full_params.patch |  16 +-
 patches/chromium/chrome_key_systems.patch     |   2 +-
 .../crash_allow_setting_more_options.patch    |   4 +-
 patches/chromium/disable-redraw-lock.patch    |   4 +-
 .../disable_color_correct_rendering.patch     |  14 +-
 .../disable_compositor_recycling.patch        |   4 +-
 patches/chromium/disable_hidden.patch         |  12 +-
 ...ization_guide_for_preconnect_feature.patch |  59 ++++++
 ...ythreadcreated_if_pcscan_is_disabled.patch |   2 +-
 .../chromium/enable_reset_aspect_ratio.patch  |   4 +-
 ...xpose_setuseragent_on_networkcontext.patch |  16 +-
 .../extend_apply_webpreferences.patch         |   6 +-
 ..._registry_to_multibuffer_data_source.patch |  10 +-
 ...to_add_observers_on_created_hunspell.patch |   2 +-
 ...screen_rendering_with_viz_compositor.patch |   4 +-
 ..._raw_response_headers_from_urlloader.patch |   4 +-
 ...uest_webcontents_to_enter_fullscreen.patch |   4 +-
 .../fix_aspect_ratio_with_max_size.patch      |   4 +-
 ...ntcapturercount_in_web_contents_impl.patch |   8 +-
 ...out_profile_refs_in_accessibility_ui.patch |  63 +++---
 ...from_localframe_requestexecutescript.patch | 198 ++++++++++++++++++
 ...ler_update_functions_to_early_return.patch |   6 +-
 ...for_components_segmentation_platform.patch |  47 +++++
 patches/chromium/frame_host_manager.patch     |   8 +-
 .../gin_enable_disable_v8_platform.patch      |   6 +-
 ...gpu_notify_when_dxdiag_request_fails.patch |  10 +-
 .../chromium/gritsettings_resource_ids.patch  |   4 +-
 ...sync_with_host_os_mac_on_linux_in_ci.patch |   4 +-
 .../load_v8_snapshot_in_browser_process.patch |   4 +-
 ...reate_a_console_if_logging_to_stderr.patch |   4 +-
 .../mas_disable_custom_window_frame.patch     |  14 +-
 .../mas_disable_remote_accessibility.patch    |  34 +--
 patches/chromium/mas_no_private_api.patch     |   2 +-
 ...emote_certificate_verification_logic.patch |  14 +-
 .../chromium/notification_provenance.patch    |  12 +-
 patches/chromium/picture-in-picture.patch     |   6 +-
 ...utofill_colors_to_the_color_pipeline.patch |   2 +-
 patches/chromium/printing.patch               | 118 +++++------
 patches/chromium/process_singleton.patch      |   4 +-
 ...r_changes_to_the_webcontentsobserver.patch |  14 +-
 .../render_widget_host_view_base.patch        |  12 +-
 .../render_widget_host_view_mac.patch         |  12 +-
 patches/chromium/resource_file_conflict.patch |   6 +-
 ...h_spell_check_delayed_initialization.patch |   4 +-
 patches/chromium/scroll_bounce_flag.patch     |   4 +-
 ...ecks_in_mediastreamdevicescontroller.patch |  57 +++--
 .../support_mixed_sandbox_with_zygote.patch   |   4 +-
 patches/chromium/sysroot.patch                |   2 +-
 patches/chromium/web_contents.patch           |  10 +-
 patches/chromium/webview_cross_drag.patch     |   4 +-
 patches/chromium/webview_fullscreen.patch     |   4 +-
 .../worker_context_will_destroy.patch         |  18 +-
 ...feat_add_hook_to_notify_script_ready.patch |  16 +-
 patches/config.json                           |   4 +-
 patches/lss/.patches                          |   1 -
 ...ix_cast_pwrite64_arg_to_long_for_arm.patch |  24 ---
 patches/node/.patches                         |   2 +
 .../enable_-wunqualified-std-cast-call.patch  |  21 ++
 .../node/v8_api_advance_api_deprecation.patch |  22 ++
 patches/v8/build_gn.patch                     |   6 +-
 patches/v8/dcheck.patch                       |  21 +-
 ...export_private_v8_symbols_on_windows.patch |   4 +-
 ...ort_symbols_needed_for_windows_build.patch |   4 +-
 patches/v8/expose_mksnapshot.patch            |   4 +-
 ..._terminating_exception_in_microtasks.patch |   8 +-
 ...workaround_an_undefined_symbol_error.patch |   6 +-
 .../browser/api/electron_api_web_contents.cc  |   1 +
 shell/browser/api/electron_api_web_contents.h |   1 +
 shell/browser/electron_browser_client.cc      |  92 ++++----
 shell/browser/electron_browser_context.cc     |   7 +
 shell/browser/electron_browser_context.h      |   2 +
 shell/browser/electron_permission_manager.cc  |  10 +
 shell/browser/electron_permission_manager.h   |  11 +-
 .../desktop_notification_controller.cc        |  14 +-
 shell/browser/ui/devtools_ui.cc               |   8 +-
 shell/browser/zoom_level_delegate.cc          |  62 +++---
 shell/browser/zoom_level_delegate.h           |   5 +-
 .../extensions/electron_extensions_client.cc  |   5 +
 .../extensions/electron_extensions_client.h   |   2 +
 shell/renderer/api/electron_api_web_frame.cc  |  76 +++----
 shell/renderer/electron_api_service_impl.cc   |   4 +-
 shell/renderer/electron_autofill_agent.cc     |   4 +-
 shell/renderer/renderer_client_base.cc        |  11 +-
 102 files changed, 944 insertions(+), 804 deletions(-)
 delete mode 100644 patches/chromium/cherry-pick-9b5207569882.patch
 create mode 100644 patches/chromium/disable_optimization_guide_for_preconnect_feature.patch
 create mode 100644 patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
 create mode 100644 patches/chromium/fix_the_gn_gen_for_components_segmentation_platform.patch
 delete mode 100644 patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
 create mode 100644 patches/node/enable_-wunqualified-std-cast-call.patch
 create mode 100644 patches/node/v8_api_advance_api_deprecation.patch

diff --git a/DEPS b/DEPS
index 63e9d857212b9..dfd7929b7e30a 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5216.0',
+    '106.0.5249.30',
   'node_version':
     'v16.16.0',
   'nan_version':
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index 2ec068f21e809..c07fb721a8484 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -156,10 +156,7 @@ static_library("chrome") {
     "//services/strings",
   ]
 
-  deps = [
-    "//chrome/browser:resource_prefetch_predictor_proto",
-    "//components/optimization_guide/proto:optimization_guide_proto",
-  ]
+  deps = [ "//chrome/browser:resource_prefetch_predictor_proto" ]
 
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
@@ -232,6 +229,8 @@ static_library("chrome") {
       "//chrome/browser/printing/printer_query.h",
       "//chrome/browser/printing/printing_service.cc",
       "//chrome/browser/printing/printing_service.h",
+      "//components/printing/browser/print_to_pdf/pdf_print_job.cc",
+      "//components/printing/browser/print_to_pdf/pdf_print_job.h",
       "//components/printing/browser/print_to_pdf/pdf_print_utils.cc",
       "//components/printing/browser/print_to_pdf/pdf_print_utils.h",
     ]
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 4a5283fa144b0..e575ac484e854 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -118,4 +118,6 @@ revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
 add_electron_deps_to_license_credits_file.patch
 feat_add_set_can_resize_mutator.patch
 fix_revert_emulationhandler_update_functions_to_early_return.patch
-cherry-pick-9b5207569882.patch
+fix_return_v8_value_from_localframe_requestexecutescript.patch
+disable_optimization_guide_for_preconnect_feature.patch
+fix_the_gn_gen_for_components_segmentation_platform.patch
diff --git a/patches/chromium/accelerator.patch b/patches/chromium/accelerator.patch
index 2582196629449..4786fa2f37a82 100644
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
 3. Ctrl-Shift-= and Ctrl-Plus show up as such
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a1f702d8b 100644
+index e032433d7096a941132c25528781ecbf375eb9af..33d88f947bc9a0a4795f1584e114952f942b277b 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -44,7 +44,7 @@ index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a
    }
  
  #if BUILDFLAG(IS_MAC)
-@@ -447,7 +457,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -445,7 +455,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
      const std::u16string& shortcut) const {
    std::u16string result = shortcut;
  
@@ -53,7 +53,7 @@ index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a
      result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
  
    // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
-@@ -455,7 +465,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
+@@ -453,7 +463,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
    // more information.
    if (IsCtrlDown())
      result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
index 1b789c2492f9b..78b99613ad424 100644
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index b692a49b71661b8394c1126250fb150653aece97..c087c0f99a15edd3a9c776a68c76b2cf46257123 100644
+index d435206f773dd30086ae81868412bc28029935d8..a0856c214d962199a2e51c7bd14f0f676d35507e 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
@@ -24,16 +24,16 @@ index b692a49b71661b8394c1126250fb150653aece97..c087c0f99a15edd3a9c776a68c76b2cf
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -337,7 +341,6 @@ int GpuMain(MainFunctionParams parameters) {
-   ChildProcess gpu_process(io_thread_type);
-   DCHECK(base::ThreadPoolInstance::Get()->WasStarted());
+@@ -323,7 +327,6 @@ int GpuMain(MainFunctionParams parameters) {
+       const_cast<base::CommandLine*>(&command_line), gpu_preferences);
+   const bool dead_on_arrival = !init_success;
  
 -  auto* client = GetContentClient()->gpu();
-   if (client)
-     client->PostIOThreadCreated(gpu_process.io_task_runner());
- 
+   if (client) {
+     client->PostSandboxInitialized();
+   }
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index 04274b751b498456fc4b269bfbc6399b4f27d3ed..2fb98baf0df4e191e5e18fd7055cc2d92a2156df 100644
+index a5d868b9e409c986bc85dfd71bb0363b5fa22145..9abe1cf5b2cc8ce60387ddf81b7c13aff9c178c4 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
 @@ -29,6 +29,10 @@ class CONTENT_EXPORT ContentGpuClient {
diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch
index bb65405ceecdc..71ebf42a19af7 100644
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
 context, which can cause some preload scripts to trip.
 
 diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
-index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ede21d73be 100644
+index 7d169540590b83924766b1d423dc1bc46ab35250..f5bbb6ab26bd714d667236071a2eb0a5794a5631 100644
 --- a/content/public/renderer/render_frame_observer.h
 +++ b/content/public/renderer/render_frame_observer.h
 @@ -136,6 +136,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index 5a7d3da58451f491ed6dfabd3bc31a645843bb60..36cbf8c5c01330acc8b3a708bd6481ed
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 33497b7afbe1fa196a596a2cb384a81a973de026..b6b63c182980b09987e82911f72282c275ff0dc6 100644
+index 8199122b2d759aa8b27affabe67b108fb9a16c38..97cf24ad5f4a64322f242b0c339a807e3edb23fc 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4294,6 +4294,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4345,6 +4345,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -40,10 +40,10 @@ index 33497b7afbe1fa196a596a2cb384a81a973de026..b6b63c182980b09987e82911f72282c2
                                                 int world_id) {
    for (auto& observer : observers_)
 diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
-index 19eae2c0b98ecf27c6d8196c7accc44bdb24a543..40b2dc79e13080d15094a3db235e2e21760ac96d 100644
+index c8e822502d1b18c701a303024c3cba7e434d7829..89a048fbdaec8a8ea184790b78b0c63cfda7d171 100644
 --- a/content/renderer/render_frame_impl.h
 +++ b/content/renderer/render_frame_impl.h
-@@ -585,6 +585,8 @@ class CONTENT_EXPORT RenderFrameImpl
+@@ -588,6 +588,8 @@ class CONTENT_EXPORT RenderFrameImpl
                            uint32_t ng_call_count) override;
    void DidCreateScriptContext(v8::Local<v8::Context> context,
                                int world_id) override;
@@ -53,10 +53,10 @@ index 19eae2c0b98ecf27c6d8196c7accc44bdb24a543..40b2dc79e13080d15094a3db235e2e21
                                  int world_id) override;
    void DidChangeScrollOffset() override;
 diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
-index 544ea3f5cd705d61dd0b99f2e0f541d98ca75c53..d863681a4297cbf2844469a1baae2a81cb0d1238 100644
+index 4ef7353157272a623cea6b086b84da72ca795fca..548f6afd429695088bd83743fa6f6c1cd4197276 100644
 --- a/third_party/blink/public/web/web_local_frame_client.h
 +++ b/third_party/blink/public/web/web_local_frame_client.h
-@@ -579,6 +579,9 @@ class BLINK_EXPORT WebLocalFrameClient {
+@@ -584,6 +584,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) {}
  
@@ -92,7 +92,7 @@ index 83a62e23b1d395b0aa545de5b828c24196cccc6d..0ca8163eb9ab87aead27bc8b2ee9e614
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index f40f022ff8ff88f1f128d4996f4460b8fdea1d95..480503e245dbb28dffc8ac9d2843d541793db534 100644
+index 2ac22a0410eea7f67cc7eb066879da649f7c6a0e..53ec3d177afbd75b4e67c6ab847094994c291dcb 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -123,10 +123,10 @@ index c974fa2f7c7f9c2aa5f075ec4aeb887d0b104453..b4ed9b2fadcfad7676387045b8581eb8
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index d44adfd65bd9a71996cdd323a5220d2dcaa09de2..1011a318a7d79186abe556d03f78badc725c802a 100644
+index a2d7e97958d378dc5d37524f2f5516205c010749..e3f605938b3eea7f1c4dfac8e3c25014ebd15476 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -366,6 +366,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -367,6 +367,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}
diff --git a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
index 89a42e0df8307..d269e9a1c9409 100644
--- a/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
+++ b/patches/chromium/add_ui_scopedcliboardwriter_writeunsaferawdata.patch
@@ -29,7 +29,7 @@ index 1eb1d0fe4696f26e7de43fc8797c283e9e6db042..766f8d8df866ce7fbc337cecceb715cc
    objects_.clear();
    platform_representations_.clear();
 diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
-index c47909313da0d7cd8a2b3cd670327011af66e3fb..0d259c21507f38124dfa46aceeacfda76cfd4a38 100644
+index 96f5bf8b6b5f3ed5ab25e15845f0de455eb68e0b..e6718a893e1bc5c970245c8265c95dda5d5fa2ff 100644
 --- a/ui/base/clipboard/scoped_clipboard_writer.h
 +++ b/ui/base/clipboard/scoped_clipboard_writer.h
 @@ -84,6 +84,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
index b49de0ad61135..7b9ff9388c669 100644
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index 00f570d90db1279a486c3c0a34146e59b902c10f..373309f79a97ca58d2d291b6a162891935d5c4b7 100644
+index 5c03f1194643c6f7302131404f7d869502f1e18b..fa990e6a444d5321213d956b01ba89ef21d57bd2 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -658,6 +658,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -659,6 +659,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,10 +22,10 @@ index 00f570d90db1279a486c3c0a34146e59b902c10f..373309f79a97ca58d2d291b6a1628919
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 3ccc771a82992ae70c770fa6d2dde92904aa17db..505091e9006f7d41fa8d02e603afef1d10b35bf4 100644
+index dfefe47c77c723c1cfdc6abe0e8ff96bc5ec6ddd..8d195ec46b9a6ea830c1ff36ee740b3b8be2b341 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -138,6 +138,7 @@ class CONTENT_EXPORT RenderViewHostImpl
+@@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
    void EnablePreferredSizeMode() override;
    void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
  
@@ -34,7 +34,7 @@ index 3ccc771a82992ae70c770fa6d2dde92904aa17db..505091e9006f7d41fa8d02e603afef1d
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da4689b7a2 100644
+index 2e4af843d7d0bbef5b7e6357de73355068b38948..77c69de4a541c56389ae11330f67c5fb6bbc4d2a 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
 @@ -77,6 +77,9 @@ class CONTENT_EXPORT RenderViewHost {
@@ -47,27 +47,14 @@ index 4d2a4c6746e1dbfc619faf2e16eaa4948d74e372..6c9f190ff595234eca18ff20ca0655da
   private:
    // This interface should only be implemented inside content.
    friend class RenderViewHostImpl;
-diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
-index f55211fdb346c8659c93d077ec04ccebdae5b450..19b846f6ccf99423b712f0b589c20c1ab35bdfcf 100644
---- a/content/renderer/render_view_impl.h
-+++ b/content/renderer/render_view_impl.h
-@@ -138,6 +138,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient {
-                   bool was_created_by_renderer,
-                   scoped_refptr<base::SingleThreadTaskRunner> task_runner);
- 
-+  void OnSetSchedulerThrottling(bool allowed);
-+
-   static WindowOpenDisposition NavigationPolicyToDisposition(
-       blink::WebNavigationPolicy policy);
- 
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319b1a5ec28 100644
+index 6ff7c34463f3ce5011ea8711d23f9cd11da38d8b..2b8e313dfac2ea9fad0583bb5e98d0c385e8584a 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
-@@ -108,4 +108,7 @@ interface PageBroadcast {
- 
-   // Sent to whole page, but should only be used by the main frame.
-   SetPageBaseBackgroundColor(skia.mojom.SkColor? color);
+@@ -137,4 +137,7 @@ interface PageBroadcast {
+     mojo_base.mojom.UnguessableToken devtools_frame_token,
+     RemoteFrameInterfacesFromBrowser remote_frame_interfaces,
+     RemoteMainFrameInterfaces remote_main_frame_interfaces);
 +
 +  // Whether to enable the Renderer scheduler background throttling.
 +  SetSchedulerThrottling(bool allowed);
@@ -85,10 +72,10 @@ index 3af33a4d699b5bbfb0a1abac9408ad322a47a5ac..30bc8aa73fb46a0306ccc837a99cc4d5
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 8f15822dc33a2f8a19971afd7da0ab305f0b48b7..38faafcc7432c2bedead647d4946b7183233b4bc 100644
+index 231f76d07d8a0d3d060b30e0ff6eabe4aa33d755..40aa3b1a5c569e66b6f5d1630afe248c40d5715b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3758,6 +3758,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3787,6 +3787,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +89,7 @@ index 8f15822dc33a2f8a19971afd7da0ab305f0b48b7..38faafcc7432c2bedead647d4946b718
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3769,7 +3776,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3798,7 +3805,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +100,10 @@ index 8f15822dc33a2f8a19971afd7da0ab305f0b48b7..38faafcc7432c2bedead647d4946b718
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 1b0e7811c023f795f9f8f8cdf8bf621e54b79855..915348eaa98191c60bddaaa3d146bdc99099e16b 100644
+index 08cc81481cbe4fe40a7df6316db765fa2eac7fda..c5dfefd84b44de5a2c28afb2b9bd8035647da12b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -416,6 +416,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -425,6 +425,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +111,7 @@ index 1b0e7811c023f795f9f8f8cdf8bf621e54b79855..915348eaa98191c60bddaaa3d146bdc9
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -866,6 +867,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -875,6 +876,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  
diff --git a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
index d6f96237169cf..5bf9d19e0f1d6 100644
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -32,7 +32,7 @@ index e5c9ebda8156c1a7c32f7eb0661dff40f022c264..8840d4be4b49b27dfb257866f6a074ef
        accelerated_video_decode_enabled(false),
        animation_policy(
 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index a910d7b53a1346797f0e2bd030dff7ff84a834b8..4847c7587484eb02b8d7f532be53e499517a95fb 100644
+index cfd107cf7257b5c0c2482baba8964e1d2508fc8b..6a2e25a3d7700df9c59952ff19c9ce62d391005c 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 @@ -149,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -56,7 +56,7 @@ index a910d7b53a1346797f0e2bd030dff7ff84a834b8..4847c7587484eb02b8d7f532be53e499
    out->accelerated_video_decode_enabled =
        data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index 33ca0140e9434f37c67386973f1ebf460222691c..220551e3be0ae9275714f80758671eeac87b0cca 100644
+index adbb4f0de4d787ac7710de06de2bf3b32dc6491f..c68a71ca2e272874420d309f2154cf89cf99b7ec 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
 @@ -10,6 +10,7 @@
@@ -67,7 +67,7 @@ index 33ca0140e9434f37c67386973f1ebf460222691c..220551e3be0ae9275714f80758671eea
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
  #include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
-@@ -157,6 +158,19 @@ struct BLINK_COMMON_EXPORT WebPreferences {
+@@ -159,6 +160,19 @@ struct BLINK_COMMON_EXPORT WebPreferences {
    // If true, stylus handwriting recognition to text input will be available in
    // editable input fields which are non-password type.
    bool stylus_handwriting_enabled;
@@ -88,7 +88,7 @@ index 33ca0140e9434f37c67386973f1ebf460222691c..220551e3be0ae9275714f80758671eea
    // This flags corresponds to a Page's Settings' setCookieEnabled state. It
    // only controls whether or not the "document.cookie" field is properly
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index d4c86ca871c796c3179a0fe099de0b3082ebf46e..0b438a894c37826c19bdac1b1474a50a4afe8e4f 100644
+index fa2db0ccc2d9f72aa4976816548df31f83c2ef54..ab896b217be1f8695c6d05414252a37c8086369d 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 @@ -6,6 +6,7 @@
@@ -99,7 +99,7 @@ index d4c86ca871c796c3179a0fe099de0b3082ebf46e..0b438a894c37826c19bdac1b1474a50a
  #include "mojo/public/cpp/bindings/struct_traits.h"
  #include "net/nqe/effective_connection_type.h"
  #include "third_party/blink/public/common/common_export.h"
-@@ -433,6 +434,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -438,6 +439,52 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
      return r.stylus_handwriting_enabled;
    }
  
@@ -153,7 +153,7 @@ index d4c86ca871c796c3179a0fe099de0b3082ebf46e..0b438a894c37826c19bdac1b1474a50a
      return r.cookie_enabled;
    }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index 4638c6cf8f3834bb3dc5f98347069f1211cb7332..8cf8845375809f239998b1db256622c2ce5b1e58 100644
+index 656ed9364bc7b5874273797f3587d5d74f2c6bdb..e8e990b10890cca95ecc8927222e622eee8b888f 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 @@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
@@ -164,7 +164,7 @@ index 4638c6cf8f3834bb3dc5f98347069f1211cb7332..8cf8845375809f239998b1db256622c2
  
  enum PointerType {
    kPointerNone                              = 1,             // 1 << 0
-@@ -209,6 +210,19 @@ struct WebPreferences {
+@@ -210,6 +211,19 @@ struct WebPreferences {
    // If true, stylus handwriting recognition to text input will be available in
    // editable input fields which are non-password type.
    bool stylus_handwriting_enabled;
diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
index f781f7e18480c..ae09b284c270f 100644
--- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
+++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
 Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
 
 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
-index ce1d8d490c34b7a1f7f539dac401be4a4eafdde6..a40d91b1135f2baf0b5d654b7175107180048163 100644
+index 6e1ed6b05b9358a46c796ac175a6556703477a1f..f138d6dc153694c2c3fbb8c98d9557e5bab8214e 100644
 --- a/ui/base/models/simple_menu_model.cc
 +++ b/ui/base/models/simple_menu_model.cc
 @@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
@@ -21,7 +21,7 @@ index ce1d8d490c34b7a1f7f539dac401be4a4eafdde6..a40d91b1135f2baf0b5d654b71751071
  ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
      int command_id) const {
    return ImageModel();
-@@ -310,6 +315,11 @@ void SimpleMenuModel::SetLabel(size_t index, const std::u16string& label) {
+@@ -311,6 +316,11 @@ void SimpleMenuModel::SetLabel(size_t index, const std::u16string& label) {
    MenuItemsChanged();
  }
  
@@ -33,7 +33,7 @@ index ce1d8d490c34b7a1f7f539dac401be4a4eafdde6..a40d91b1135f2baf0b5d654b71751071
  void SimpleMenuModel::SetMinorText(size_t index,
                                     const std::u16string& minor_text) {
    items_[ValidateItemIndex(index)].minor_text = minor_text;
-@@ -403,6 +413,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
+@@ -404,6 +414,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
    return items_[ValidateItemIndex(index)].label;
  }
  
diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch
index c3266e9e6c628..f92f01efc91b9 100644
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 83b1a2231b522d10cf4b17864e444a00ef514735..f74d6e73675713780326ab20e504e43be61659d9 100644
+index 0e50579d9b1c989beee4113d6762d32b8074efb4..bbcd21ddc38a799fe4226447f9b3447f1ea54feb 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -124,14 +124,6 @@ bool Frame::Detach(FrameDetachType type) {
  
    DCHECK(!IsDetached());
  
@@ -33,7 +33,7 @@ index 83b1a2231b522d10cf4b17864e444a00ef514735..f74d6e73675713780326ab20e504e43b
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -154,6 +146,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -155,6 +147,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,10 +49,10 @@ index 83b1a2231b522d10cf4b17864e444a00ef514735..f74d6e73675713780326ab20e504e43b
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index dd19180e5f29182a8993a18d939e5c78d49446c9..e3d7332e13524e5571b7aee2139648501d377dfb 100644
+index 90cf3971e573aaec7a85ccf4b6fff9f931924bdc..bb4e80de2930b2e3213cc7c4469bb2875760ebee 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -545,10 +545,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -547,10 +547,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index dd19180e5f29182a8993a18d939e5c78d49446c9..e3d7332e13524e5571b7aee213964850
    if (!Client())
      return false;
  
-@@ -594,6 +590,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -596,6 +592,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  
diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch
index f0253548ac409..c3a8068824ee9 100644
--- a/patches/chromium/build_disable_partition_alloc_on_mac.patch
+++ b/patches/chromium/build_disable_partition_alloc_on_mac.patch
@@ -9,7 +9,7 @@ and can be removed when the crash in fork is resolved.
 Related issue: https://github.com/electron/electron/issues/32718
 
 diff --git a/base/allocator/allocator.gni b/base/allocator/allocator.gni
-index 605a2d455a8affffb3e864d872ffa767fdbc988f..ab4da059149f51724c057cdff7e04e9f6bc85270 100644
+index 674def40cfdc83432d0f3ced8ab3f570dc9e8b1b..96e5e5e145715218724f93041060df60d709839a 100644
 --- a/base/allocator/allocator.gni
 +++ b/base/allocator/allocator.gni
 @@ -20,7 +20,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
diff --git a/patches/chromium/build_disable_print_content_analysis.patch b/patches/chromium/build_disable_print_content_analysis.patch
index dd26dbc9c487a..ae1dfdc82ce17 100644
--- a/patches/chromium/build_disable_print_content_analysis.patch
+++ b/patches/chromium/build_disable_print_content_analysis.patch
@@ -13,16 +13,15 @@ This patch can be removed when enable_print_content_analysis can be more
 easily enabled or disabled by default with buildflags.
 
 diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
-index 1d2b24adbb39215531bbe189d6191dba026d4f68..88b7962836cfe93a59d1569245f4815f22be355e 100644
+index e57b8edde3b3e8f7a9cd580e2bcd039f1beebdff..f49cbaa980674444ccaee4a615dc99e9c630f7b8 100644
 --- a/printing/buildflags/buildflags.gni
 +++ b/printing/buildflags/buildflags.gni
-@@ -36,8 +36,7 @@ declare_args() {
+@@ -36,7 +36,7 @@ declare_args() {
  
    # Enable snapshotting a page when printing for its content to be analyzed for
    # sensitive content by enterprise users.
--  enable_print_content_analysis =
--      is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac
-+  enable_print_content_analysis = is_chromeos_ash || is_chromeos_lacros
+-  enable_print_content_analysis = is_chromeos || is_win || is_linux || is_mac
++  enable_print_content_analysis = is_chromeos
  }
  
  declare_args() {
diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
index e4d390ca6ea25..66ec8aaf66484 100644
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 31d63709bd68819a439901823b6649e4328244f8..319447a52fb6ad39c879c3916bd8acfefb578981 100644
+index 0223183c4e869e835429a52ad7d9eb381a2d21f5..47162ccaa75ea637b7ce5ed0fed976862b14c427 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -175,11 +175,16 @@ if (!is_android && !is_mac) {
+@@ -176,11 +176,16 @@ if (!is_android && !is_mac) {
          "common/crash_keys.h",
        ]
  
@@ -33,10 +33,10 @@ index 31d63709bd68819a439901823b6649e4328244f8..319447a52fb6ad39c879c3916bd8acfe
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index db5d426cef5850603eb9f98c69989e5f11fcb513..198a31142605f428d00a6e594908fb2c7fbdcf50 100644
+index bb193ea0cb1df492e52a5023bd84852bfc3985ce..f89c54a1f73f26ca142a2764fd235111e6cbeff0 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4614,7 +4614,7 @@ static_library("browser") {
+@@ -4623,7 +4623,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index db5d426cef5850603eb9f98c69989e5f11fcb513..198a31142605f428d00a6e594908fb2c
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 0119e51f4ee0f98968d854e6310234c01028c4ff..9d87f0fdbe110663ab0d3da26fbc0d34e9a0c579 100644
+index ade95f3592fc54e69ec8717c7542ef2eae645056..c339589fc723be5ad49cca88bddbd9ae8a649644 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6011,7 +6011,6 @@ test("unit_tests") {
+@@ -6038,7 +6038,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 0119e51f4ee0f98968d854e6310234c01028c4ff..9d87f0fdbe110663ab0d3da26fbc0d34
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:crash_reporter_client_win_unit_tests",
-@@ -6036,6 +6035,10 @@ test("unit_tests") {
+@@ -6063,6 +6062,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,16 +68,16 @@ index 0119e51f4ee0f98968d854e6310234c01028c4ff..9d87f0fdbe110663ab0d3da26fbc0d34
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6933,7 +6936,7 @@ test("unit_tests") {
+@@ -6964,7 +6967,7 @@ test("unit_tests") {
      }
  
      deps += [
 -      "//chrome:packed_resources_integrity_hash",
 +    # "//chrome:packed_resources_integrity_hash",
+       "//chrome/browser/autofill_assistant/password_change/vector_icons:vector_icons",
        "//chrome/browser/enterprise/connectors/analysis:features",
        "//chrome/browser/media/router:test_support",
-       "//chrome/browser/media/router/discovery:discovery",
-@@ -7051,6 +7054,10 @@ test("unit_tests") {
+@@ -7083,6 +7086,10 @@ test("unit_tests") {
      }
    }
  
diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch
index 14af10cde5c1f..1724d3fa2ba8a 100644
--- a/patches/chromium/build_libc_as_static_library.patch
+++ b/patches/chromium/build_libc_as_static_library.patch
@@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
 nan tests
 
 diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
-index 4fec8db3c0431294f65e2a7f0046b6ac5ba78c47..2a4ad0955b3c01b2f1d1665fb65e6d9bb16f5fc2 100644
+index 01f5a1713c28f077e624fe1ea1c84fa3b514d660..3837b9ccf00b2d9f0b655a2c08e96d5020b0afbf 100644
 --- a/buildtools/third_party/libc++/BUILD.gn
 +++ b/buildtools/third_party/libc++/BUILD.gn
 @@ -44,7 +44,11 @@ config("winver") {
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 005caa9f6af02..55d8906d9432c 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 9fe7a9c021c8d29359f072e04665a55858048be6..115dab63efa4b90f37609a9a0a363ad75a0ff582 100644
+index abfe94dc8c31fc928eb554ec3f2ec095aa6a970b..e815010dcb9437727f32b12f0d47a31384e24677 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7298,6 +7298,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -7313,6 +7313,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 9fe7a9c021c8d29359f072e04665a55858048be6..115dab63efa4b90f37609a9a0a363ad7
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 276ae812cfb35f4fe6000a87b38c2155f37b12d3..9a0edcadef1bc60b035ca67df5082a7d06dd4436 100644
+index 8e1c0feede6dc599c0bc78d6278726b16c7931df..2b393e7e7089d17a0906610c3c8979c20928a5f6 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3996,6 +3996,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4012,6 +4012,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 276ae812cfb35f4fe6000a87b38c2155f37b12d3..9a0edcadef1bc60b035ca67df5082a7d
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -4040,12 +4048,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -4056,12 +4064,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -53,10 +53,10 @@ index 276ae812cfb35f4fe6000a87b38c2155f37b12d3..9a0edcadef1bc60b035ca67df5082a7d
                               new_contents_impl, opener, params.target_url,
                               params.referrer.To<Referrer>(), params.disposition,
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index fc7e18c294993f1fa8cef88782ae3f4ba60e4d54..c41545fc79a6a45c82aa39ff21e790bdcd7b8f01 100644
+index 4eee5f6c069c83039bf0acee71056d8ed4ea92eb..9212926fba9d06296c9c46a95519b6ed777569ee 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
-@@ -571,6 +571,10 @@ struct CreateNewWindowParams {
+@@ -574,6 +574,10 @@ struct CreateNewWindowParams {
  
    // Additional parameters for creating picture-in-picture windows.
    blink.mojom.PictureInPictureWindowOptions? pip_options;
@@ -68,10 +68,10 @@ index fc7e18c294993f1fa8cef88782ae3f4ba60e4d54..c41545fc79a6a45c82aa39ff21e790bd
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 82a07cfb29870615a18a1718e5b6c0b2a42443ef..ba6e21fb83b4c58716b776c1a018c36f14902e6f 100644
+index a9c96d4b463929143c7de0ec29d4afee5315fd92..2750d9f6c377b36fd1684077d9eec1cde78c856c 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -610,6 +610,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index 82a07cfb29870615a18a1718e5b6c0b2a42443ef..ba6e21fb83b4c58716b776c1a018c36f
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 2f475430b85cf6029f0066f30069294847d05bd1..f399bc59be5705542b34185e7fe7202a029c40ea 100644
+index bac29d867e465c87f69ea4f28eac118718db0992..7eb47e0c73c7f0d8a0cadcf5b8163f8a5154faea 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -164,6 +164,7 @@ class NetworkService;
+@@ -163,6 +163,7 @@ class NetworkService;
  class TrustedURLLoaderHeaderClient;
  }  // namespace mojom
  struct ResourceRequest;
@@ -92,7 +92,7 @@ index 2f475430b85cf6029f0066f30069294847d05bd1..f399bc59be5705542b34185e7fe7202a
  }  // namespace network
  
  namespace sandbox {
-@@ -991,6 +992,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -999,6 +1000,8 @@ class CONTENT_EXPORT ContentBrowserClient {
        const std::string& frame_name,
        WindowOpenDisposition disposition,
        const blink::mojom::WindowFeatures& features,
@@ -149,13 +149,13 @@ index 0274e3bb5cc62ce2c52be68a50b57c339fc5bba7..1ea3e1fdf067ea54ce54d31f494ac2bf
    // Notifies the delegate about the creation of a new WebContents. This
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
-diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index f9a857f270bad274fc952655efd7a9a32fbd7fb1..80cad3267721dc7bf78f5b75f99cda2a0d1d2016 100644
---- a/content/renderer/render_view_impl.cc
-+++ b/content/renderer/render_view_impl.cc
-@@ -297,6 +297,10 @@ WebView* RenderViewImpl::CreateView(
-       /*openee_can_access_opener_origin=*/true, !creator->IsAllowedToDownload(),
-       creator->IsAdFrame());
+diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
+index d70f6df69aa604972755d1cfe0cfcd2b0369f68c..8199122b2d759aa8b27affabe67b108fb9a16c38 100644
+--- a/content/renderer/render_frame_impl.cc
++++ b/content/renderer/render_frame_impl.cc
+@@ -6196,6 +6196,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
+       /*openee_can_access_opener_origin=*/true,
+       !GetWebFrame()->IsAllowedToDownload(), GetWebFrame()->IsAdFrame());
  
 +  params->raw_features = features.raw_features.Utf8(
 +      WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
@@ -165,10 +165,10 @@ index f9a857f270bad274fc952655efd7a9a32fbd7fb1..80cad3267721dc7bf78f5b75f99cda2a
    // moved on send.
    bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 6abdcf70bdeeb3a34d01c3b00e5f629373eef76b..537f71cbf3cc1112100a199a15b77a535efd8a4e 100644
+index 40b82385697d8721ef6da3d0c77544d6d0ca400c..3a2d5207fb2eeea4b016012b09c3668af8dc35b4 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -440,6 +440,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -482,6 +482,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
      const std::string& frame_name,
      WindowOpenDisposition disposition,
      const blink::mojom::WindowFeatures& features,
@@ -212,12 +212,12 @@ index 34570168ccb123f5102dcf8fa6bbf98e7c373ec6..192701e56d258da41b3724292853885e
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index cc39235616f0249c8a979a870885aec2d0e04cc4..77e6bbe18556279a98b5453d4ba1c3eb5b850287 100644
+index 5bf3339038b6a8498221d1bd222ec340d78d1b92..c4be7a96144ac53be856fbf52dff8e990aa736aa 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2090,6 +2090,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2091,6 +2091,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
    WebWindowFeatures window_features =
-       GetWindowFeaturesFromString(features, entered_window);
+       GetWindowFeaturesFromString(features, entered_window, completed_url);
  
 +  window_features.raw_features = features;
 +
diff --git a/patches/chromium/cherry-pick-9b5207569882.patch b/patches/chromium/cherry-pick-9b5207569882.patch
deleted file mode 100644
index a327b22364d20..0000000000000
--- a/patches/chromium/cherry-pick-9b5207569882.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ken Rockot <rockot@google.com>
-Date: Wed, 31 Aug 2022 15:39:45 +0000
-Subject: Mojo: Validate response message type
-
-Ensures that a response message is actually the type expected by the
-original request.
-
-Fixed: 1358134
-Change-Id: I8f8f58168764477fbf7a6d2e8aeb040f07793d45
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3864274
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Commit-Queue: Ken Rockot <rockot@google.com>
-Cr-Commit-Position: refs/heads/main@{#1041553}
-
-diff --git a/mojo/public/cpp/bindings/interface_endpoint_client.h b/mojo/public/cpp/bindings/interface_endpoint_client.h
-index 0ebbc94ad51cca74fcebc357b5262229ae5c9d0e..cd79a5edb3f939623b874db36542ee651113c164 100644
---- a/mojo/public/cpp/bindings/interface_endpoint_client.h
-+++ b/mojo/public/cpp/bindings/interface_endpoint_client.h
-@@ -221,20 +221,32 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) InterfaceEndpointClient
-   void ForgetAsyncRequest(uint64_t request_id);
- 
-  private:
--  // Maps from the id of a response to the MessageReceiver that handles the
--  // response.
--  using AsyncResponderMap =
--      std::map<uint64_t, std::unique_ptr<MessageReceiver>>;
-+  struct PendingAsyncResponse {
-+   public:
-+    PendingAsyncResponse(uint32_t request_message_name,
-+                         std::unique_ptr<MessageReceiver> responder);
-+    PendingAsyncResponse(PendingAsyncResponse&&);
-+    PendingAsyncResponse(const PendingAsyncResponse&) = delete;
-+    PendingAsyncResponse& operator=(PendingAsyncResponse&&);
-+    PendingAsyncResponse& operator=(const PendingAsyncResponse&) = delete;
-+    ~PendingAsyncResponse();
-+
-+    uint32_t request_message_name;
-+    std::unique_ptr<MessageReceiver> responder;
-+  };
-+
-+  using AsyncResponderMap = std::map<uint64_t, PendingAsyncResponse>;
- 
-   struct SyncResponseInfo {
-    public:
--    explicit SyncResponseInfo(bool* in_response_received);
-+    SyncResponseInfo(uint32_t request_message_name, bool* in_response_received);
- 
-     SyncResponseInfo(const SyncResponseInfo&) = delete;
-     SyncResponseInfo& operator=(const SyncResponseInfo&) = delete;
- 
-     ~SyncResponseInfo();
- 
-+    uint32_t request_message_name;
-     Message response;
- 
-     // Points to a stack-allocated variable.
-diff --git a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
-index ded0d20ab193cfdaf36bd44c25719d7073c989fb..a6f41414b8918989662eb0a1dea773932631c8cc 100644
---- a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
-+++ b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
-@@ -30,6 +30,7 @@
- #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
- #include "mojo/public/cpp/bindings/sync_event_watcher.h"
- #include "mojo/public/cpp/bindings/thread_safe_proxy.h"
-+#include "third_party/abseil-cpp/absl/types/optional.h"
- #include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_mojo_event_info.pbzero.h"
- 
- namespace mojo {
-@@ -316,9 +317,27 @@ class ResponderThunk : public MessageReceiverWithStatus {
- 
- // ----------------------------------------------------------------------------
- 
-+InterfaceEndpointClient::PendingAsyncResponse::PendingAsyncResponse(
-+    uint32_t request_message_name,
-+    std::unique_ptr<MessageReceiver> responder)
-+    : request_message_name(request_message_name),
-+      responder(std::move(responder)) {}
-+
-+InterfaceEndpointClient::PendingAsyncResponse::PendingAsyncResponse(
-+    PendingAsyncResponse&&) = default;
-+
-+InterfaceEndpointClient::PendingAsyncResponse&
-+InterfaceEndpointClient::PendingAsyncResponse::operator=(
-+    PendingAsyncResponse&&) = default;
-+
-+InterfaceEndpointClient::PendingAsyncResponse::~PendingAsyncResponse() =
-+    default;
-+
- InterfaceEndpointClient::SyncResponseInfo::SyncResponseInfo(
-+    uint32_t request_message_name,
-     bool* in_response_received)
--    : response_received(in_response_received) {}
-+    : request_message_name(request_message_name),
-+      response_received(in_response_received) {}
- 
- InterfaceEndpointClient::SyncResponseInfo::~SyncResponseInfo() {}
- 
-@@ -606,6 +625,7 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
-   // message before calling |SendMessage()| below.
- #endif
- 
-+  const uint32_t message_name = message->name();
-   const bool is_sync = message->has_flag(Message::kFlagIsSync);
-   const bool exclusive_wait = message->has_flag(Message::kFlagNoInterrupt);
-   if (!controller_->SendMessage(message))
-@@ -622,7 +642,8 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
-       controller_->RegisterExternalSyncWaiter(request_id);
-     }
-     base::AutoLock lock(async_responders_lock_);
--    async_responders_[request_id] = std::move(responder);
-+    async_responders_.emplace(
-+        request_id, PendingAsyncResponse{message_name, std::move(responder)});
-     return true;
-   }
- 
-@@ -630,7 +651,8 @@ bool InterfaceEndpointClient::SendMessageWithResponder(
- 
-   bool response_received = false;
-   sync_responses_.insert(std::make_pair(
--      request_id, std::make_unique<SyncResponseInfo>(&response_received)));
-+      request_id,
-+      std::make_unique<SyncResponseInfo>(message_name, &response_received)));
- 
-   base::WeakPtr<InterfaceEndpointClient> weak_self =
-       weak_ptr_factory_.GetWeakPtr();
-@@ -808,13 +830,13 @@ void InterfaceEndpointClient::ResetFromAnotherSequenceUnsafe() {
- }
- 
- void InterfaceEndpointClient::ForgetAsyncRequest(uint64_t request_id) {
--  std::unique_ptr<MessageReceiver> responder;
-+  absl::optional<PendingAsyncResponse> response;
-   {
-     base::AutoLock lock(async_responders_lock_);
-     auto it = async_responders_.find(request_id);
-     if (it == async_responders_.end())
-       return;
--    responder = std::move(it->second);
-+    response = std::move(it->second);
-     async_responders_.erase(it);
-   }
- }
-@@ -906,6 +928,10 @@ bool InterfaceEndpointClient::HandleValidatedMessage(Message* message) {
-         return false;
- 
-       if (it->second) {
-+        if (message->name() != it->second->request_message_name) {
-+          return false;
-+        }
-+
-         it->second->response = std::move(*message);
-         *it->second->response_received = true;
-         return true;
-@@ -916,18 +942,22 @@ bool InterfaceEndpointClient::HandleValidatedMessage(Message* message) {
-       sync_responses_.erase(it);
-     }
- 
--    std::unique_ptr<MessageReceiver> responder;
-+    absl::optional<PendingAsyncResponse> pending_response;
-     {
-       base::AutoLock lock(async_responders_lock_);
-       auto it = async_responders_.find(request_id);
-       if (it == async_responders_.end())
-         return false;
--      responder = std::move(it->second);
-+      pending_response = std::move(it->second);
-       async_responders_.erase(it);
-     }
- 
-+    if (message->name() != pending_response->request_message_name) {
-+      return false;
-+    }
-+
-     internal::MessageDispatchContext dispatch_context(message);
--    return responder->Accept(message);
-+    return pending_response->responder->Accept(message);
-   } else {
-     if (mojo::internal::ControlMessageHandler::IsControlMessage(message))
-       return control_message_handler_.Accept(message);
diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
index 0808a245ec7e3..f17521282d3c7 100644
--- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch
+++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch
@@ -6,7 +6,7 @@ Subject: chore: add electron deps to gitignores
 Makes things like "git status" quicker when developing electron locally
 
 diff --git a/.gitignore b/.gitignore
-index baf86ec0cde417fa4287f794de10b78d19439930..29d7b595fbfd6e211864e3baa8e2d3014b2e7a5b 100644
+index 651d8ec7d8e98e7588f8f182018188ab234d5c5a..1fc645a7f748d3cad8ca2f4fa9897454cb937a4c 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -230,6 +230,7 @@ vs-chromium-project.txt
diff --git a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
index 8c6aeac216019..5274875a7f85e 100644
--- a/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
+++ b/patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
@@ -34,10 +34,10 @@ index 0aae49ec83b88057434af5bbfb54b10e53469918..058e5dc978e76a71fa02dc9e275592f3
    Widget* GetWidget();
    const Widget* GetWidget() const;
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 67871eec9821cf100acc719a1765be489dfbe7d8..1f883dc7d46d5cc3fddffe75c55e6b96fb0fc5f2 100644
+index 2dbe61a4bdf6556f6db101e47d81d37417736bd1..dec439f15a7995b14ccf4ef95651413911b5fc4f 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3136,15 +3136,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
+@@ -3137,15 +3137,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
        SetMsgHandled(FALSE);
      // We must let Windows handle the caption buttons if it's drawing them, or
      // they won't work.
diff --git a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
index e0a059103b137..6a20c695f0e15 100644
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -63,10 +63,10 @@ index faa684c429e8cd5817c043db48dcbea33c6c8782..8b5991bc8279585cc0749f6816aa8a03
        content::RenderFrameHost* requesting_frame,
        const blink::mojom::FullscreenOptions& options) final;
 diff --git a/chrome/browser/ui/ash/ash_web_view_impl.cc b/chrome/browser/ui/ash/ash_web_view_impl.cc
-index 268355f22577cf21926e209a9fcdb3f52314f2ac..80f998cdb10d9955e438ba5ef4599b35c448fae2 100644
+index a3083a16b1317cc58b87e13f30498bcf3e475eaf..50deda6f7ee9b2cbf57288d54a30a44022be808a 100644
 --- a/chrome/browser/ui/ash/ash_web_view_impl.cc
 +++ b/chrome/browser/ui/ash/ash_web_view_impl.cc
-@@ -84,10 +84,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
+@@ -96,10 +96,9 @@ bool AshWebViewImpl::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -108,10 +108,10 @@ index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c48
    }
  
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index ecf7d1e17ec8aa8f593b6f1b17d2d1c98928879a..8fa9f8b224526c7a41c16f0f6fd51c4ca6b3b66e 100644
+index 244584b4df1fb85241212c44cca7da3e87c174f3..1e6239c111b0ea765388f384385789537f473237 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -1821,12 +1821,11 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -1811,12 +1811,11 @@ bool Browser::IsWebContentsCreationOverridden(
      content::SiteInstance* source_site_instance,
      content::mojom::WindowContainerType window_container_type,
      const GURL& opener_url,
@@ -127,10 +127,10 @@ index ecf7d1e17ec8aa8f593b6f1b17d2d1c98928879a..8fa9f8b224526c7a41c16f0f6fd51c4c
  
  WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index b0f70cfaa60d28547f74b199d41ce81a5cdc8891..74efdc0a0ba5e5b862e12180dbfdb9534e9e0a5d 100644
+index 38ee0d848089a4abefa357e47169da871753df6e..53332516617dc196ce21d674ab6987c6de8438e0 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -855,8 +855,7 @@ class Browser : public TabStripModelObserver,
+@@ -852,8 +852,7 @@ class Browser : public TabStripModelObserver,
        content::SiteInstance* source_site_instance,
        content::mojom::WindowContainerType window_container_type,
        const GURL& opener_url,
@@ -246,10 +246,10 @@ index c6bd5c19f8a7ceec17c9e32af5296a9617f3a619..02199b439fba7fdc617b7f7980d958b7
    void AddNewContents(content::WebContents* source,
                        std::unique_ptr<content::WebContents> new_contents,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index a2f1f72a30f694d53f28d38d823341e7b4f008e1..7ff6febe70e9ec82becfbe036883fbc7572b5b01 100644
+index 47b85a2bd890485dec96e23fb2cb8f8553f5c4e2..7f04a05eec8780e735e0458c75103d9f2e9b858b 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3922,8 +3922,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3938,8 +3938,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
  
    if (delegate_ && delegate_->IsWebContentsCreationOverridden(
                         source_site_instance, params.window_container_type,
diff --git a/patches/chromium/chrome_key_systems.patch b/patches/chromium/chrome_key_systems.patch
index 3e7651e9250b7..9dd19626a1871 100644
--- a/patches/chromium/chrome_key_systems.patch
+++ b/patches/chromium/chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 732260f0da15c50f660348e0c66e0b3098aa418f..0a0394a3607e9b955f9fc517e0814ac07b3ba67e 100644
+index 30da015cffeb945973d0045ce297467ab16d7db6..53e7bd0f7dbff8c620a5827abb3ba871703a4f06 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -17,7 +17,9 @@
diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch
index f4516dfd22cd5..0d5a296c8366a 100644
--- a/patches/chromium/crash_allow_setting_more_options.patch
+++ b/patches/chromium/crash_allow_setting_more_options.patch
@@ -75,7 +75,7 @@ index 2532e99f00b39777cd9640c76704f7430d39502e..323e039e4591a4099b187f7a0097b4ee
    // Used by WebView to sample crashes without generating the unwanted dumps. If
    // the returned value is less than 100, crash dumping will be sampled to that
 diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
-index 7159bea91a25700f0cb36c48cab62fe2d616b3bd..9bcc5ae7e870c27c3533534c06daa890de5a4816 100644
+index a80a792f1cb2c996b77443a3383663b4687ae044..2b1453353ce93632b378d4b25295b5cb14df9b2c 100644
 --- a/components/crash/core/app/crashpad_linux.cc
 +++ b/components/crash/core/app/crashpad_linux.cc
 @@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
@@ -128,7 +128,7 @@ index dc041c43371fd58e3121ef6bc423aadb644bb8d0..a1fa566775724b4a1662a939fda3f0a5
          arguments.push_back("--monitor-self");
        }
 diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
-index ad401a7711ceff58abacb99a03fda258fccd12a0..de04f4df602e3a0b20af045111faf8a7bf8e9e28 100644
+index ae8801a7fc877241313de84a6ae0698d4f2adf69..9ae249bfe41da9743adc7f60d69be0f003ca31e2 100644
 --- a/components/crash/core/app/crashpad_win.cc
 +++ b/components/crash/core/app/crashpad_win.cc
 @@ -91,6 +91,7 @@ bool PlatformCrashpadInitialization(
diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch
index 39f1919a402ef..86f7dcc317504 100644
--- a/patches/chromium/disable-redraw-lock.patch
+++ b/patches/chromium/disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 7438cdf5604e237b46a22a2dd808aa6d031aea5f..fe882b31026b527df28d384e6e7e7cccaee61d61 100644
+index 29e812d41d5c8b1384db2231c625a39579fed6dc..b0d12e9b64cc7aa5448e88f540e7a594fca3c80e 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -309,6 +309,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -39,7 +39,7 @@ index 7438cdf5604e237b46a22a2dd808aa6d031aea5f..fe882b31026b527df28d384e6e7e7ccc
                       (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
                        !ui::win::IsAeroGlassEnabled())) {
      if (should_lock_)
-@@ -1052,6 +1057,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
+@@ -1053,6 +1058,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
    return scoped_enable;
  }
  
diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch
index 31116543398e5..e0ce3e006d1cb 100644
--- a/patches/chromium/disable_color_correct_rendering.patch
+++ b/patches/chromium/disable_color_correct_rendering.patch
@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
 https://crbug.com/634542 and https://crbug.com/711107.
 
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
-index 23c2ea10c648fd0f67f31118c0ae30c5647ce5e5..9fe5b106397e8b5a66bc4a10e874c5130e93e74d 100644
+index 5542037a338e34800d86c3ca9cbaf0511fa60570..e5011a2b9d2127c1e17730db54f9574f1ed1d287 100644
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -1866,6 +1866,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
+@@ -1873,6 +1873,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
  TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
      gfx::ContentColorUsage content_color_usage) const {
    TargetColorParams params;
@@ -35,7 +35,7 @@ index 23c2ea10c648fd0f67f31118c0ae30c5647ce5e5..9fe5b106397e8b5a66bc4a10e874c513
    // If we are likely to software composite the resource, we use sRGB because
    // software compositing is unable to perform color conversion.
 diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
-index 5eaf2d9cab94def423be78b414179e6ccc596437..1ca8b5968350e88761d9ebc073fe8c573d0f3b5d 100644
+index 809fb46cc34db308e0ec73197859045ba639407c..9360695cd920de372529206212f795f299405fcf 100644
 --- a/cc/trees/layer_tree_settings.h
 +++ b/cc/trees/layer_tree_settings.h
 @@ -93,6 +93,8 @@ class CC_EXPORT LayerTreeSettings {
@@ -81,7 +81,7 @@ index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd3
        !command_line->HasSwitch(switches::kUIDisablePartialSwap);
  
 diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
-index 4b3c2d088253e478005bd0d891dbd9c62be3fed7..187c2ae02479fa9605abc9587ff14363b1203c58 100644
+index 3f413731440ea6597001c8da03c1ac3c49bb60b2..fe1f2373f0b5f5e8eed2e0966910a6454db776d4 100644
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
 @@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -93,7 +93,7 @@ index 4b3c2d088253e478005bd0d891dbd9c62be3fed7..187c2ae02479fa9605abc9587ff14363
      sandbox::policy::switches::kGpuSandboxAllowSysVShm,
      sandbox::policy::switches::kGpuSandboxFailuresFatal,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index 7bb696c3ad090828b2a7e3a9a648b75bbf39f844..81f0d154838bcf3d3b4e12780ca37bcf26423d0e 100644
+index 368d47247ced2320e0627e9cce3cf05e59ea9f39..c675f0f37fa75dd0a39d503564c7ac265614d4e9 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
 @@ -199,6 +199,7 @@
@@ -104,7 +104,7 @@ index 7bb696c3ad090828b2a7e3a9a648b75bbf39f844..81f0d154838bcf3d3b4e12780ca37bcf
  #include "ui/gl/gl_switches.h"
  #include "url/gurl.h"
  #include "url/origin.h"
-@@ -3195,6 +3196,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3205,6 +3206,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
    // Propagate the following switches to the renderer command line (along
    // with any associated values) if present in the browser command line.
    static const char* const kSwitchNames[] = {
@@ -156,7 +156,7 @@ index 75d7af9a79d4e7f2cd39e45496ab5fff66407638..35b0bb908245330fbdc5205caa3299bf
  }
  
 diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
-index 4f3b9b181b1998e0ebbd95955feeec28a5d6bcb7..00f2a213cded1985b3131fabf3560937c56f6ffd 100644
+index ba6ab6961dec25a3f9c572341d24f341c8f58358..ba8cfd2a2572368fc14073a53f8544f269089894 100644
 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
 @@ -24,6 +24,7 @@
diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch
index 47a43cc533925..cd20c93d4784f 100644
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 54681d4aaaa52ee07fba0055a8411b8e19b4cc8c..8109976614a9ae39dd802d433517bbf29a51349e 100644
+index f28dcfe0721239ca9341a0db80e8626a515c34d8..ed10d28ed53a9debdfd26723e17b325b26249ab9 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -516,7 +516,11 @@
+@@ -517,7 +517,11 @@
      return;
  
    host()->WasHidden();
diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch
index 9c55c0da75f4a..f86b8471da647 100644
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index cfa45a1e4e65b26085694979ac34a8844643b9c7..25a80899f9ae533e2d84e99076696468cef6e56d 100644
+index 311dd906e497f5ba8a19037e629aa58c44773e67..457ba67603442e8ae9ea75be1cb3b4bf32ed4c4f 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -809,6 +809,9 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -810,6 +810,9 @@ void RenderWidgetHostImpl::WasHidden() {
    if (is_hidden_)
      return;
  
@@ -20,10 +20,10 @@ index cfa45a1e4e65b26085694979ac34a8844643b9c7..25a80899f9ae533e2d84e99076696468
        blink::mojom::PointerLockResult::kWrongDocument);
  
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index db807cca58eac2693aa4e8dabff7f3102c3ebaed..0646cecba3679dfa4cd04be093943545cade0e23 100644
+index 527463920c3d259ca0f30c70a5a860394d0cf4e9..2b50994469ee8ede3b4417650386e26553436e6e 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -881,6 +881,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -883,6 +883,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
  
    SiteInstanceGroup* GetSiteInstanceGroup();
  
@@ -34,10 +34,10 @@ index db807cca58eac2693aa4e8dabff7f3102c3ebaed..0646cecba3679dfa4cd04be093943545
    // |routing_id| must not be MSG_ROUTING_NONE.
    // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index ea62c4a966dd76c1964b6d7f9053cb4fb73376f5..79253c9d5c8f4e71e5c0d0d87dd641feab901e51 100644
+index 9d1301a55acdc5f70550c7222cd31f8338f0e7f4..82e9c9ba7c7cade143aeffdd1e123131d7568698 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -592,7 +592,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -594,7 +594,7 @@ void RenderWidgetHostViewAura::HideImpl() {
    DCHECK(visibility_ == Visibility::HIDDEN ||
           visibility_ == Visibility::OCCLUDED);
  
diff --git a/patches/chromium/disable_optimization_guide_for_preconnect_feature.patch b/patches/chromium/disable_optimization_guide_for_preconnect_feature.patch
new file mode 100644
index 0000000000000..725c9f03956a6
--- /dev/null
+++ b/patches/chromium/disable_optimization_guide_for_preconnect_feature.patch
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: John Kleinschmidt <jkleinsc@electronjs.org>
+Date: Thu, 1 Sep 2022 11:31:24 -0400
+Subject: disable optimization guide for preconnect feature
+
+The optimization guide component
+(https://source.chromium.org/chromium/chromium/src/+/main:components/optimization_guide/)
+is not enabled for Electron, but the preconnect feature uses the resource prefetch
+predictor code which includes this component.  This patch disables the optimization guide
+component code in the resource prefetch predictor code since it is unused and including
+it causes compilation problems on Windows.
+
+diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc
+index c4b64a7812bac4534371887eb7e0a07ec9cab8ff..b827d69964d824540ea70f66c467e91be8391e6c 100644
+--- a/chrome/browser/predictors/resource_prefetch_predictor.cc
++++ b/chrome/browser/predictors/resource_prefetch_predictor.cc
+@@ -100,10 +100,12 @@ PreconnectPrediction& PreconnectPrediction::operator=(
+ PreconnectPrediction& PreconnectPrediction::operator=(
+     PreconnectPrediction&& other) = default;
+ 
++#if 0
+ OptimizationGuidePrediction::OptimizationGuidePrediction() = default;
+ OptimizationGuidePrediction::OptimizationGuidePrediction(
+     const OptimizationGuidePrediction& prediction) = default;
+ OptimizationGuidePrediction::~OptimizationGuidePrediction() = default;
++#endif
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ // ResourcePrefetchPredictor static functions.
+diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h
+index 53a23990019accc0504a25dae935c53348c7eaa7..ef6667ce8bbc062dbfb8d2e2cdb6886b3e994b76 100644
+--- a/chrome/browser/predictors/resource_prefetch_predictor.h
++++ b/chrome/browser/predictors/resource_prefetch_predictor.h
+@@ -26,7 +26,9 @@
+ #include "components/history/core/browser/history_service_observer.h"
+ #include "components/history/core/browser/history_types.h"
+ #include "components/keyed_service/core/keyed_service.h"
++#if 0
+ #include "components/optimization_guide/content/browser/optimization_guide_decider.h"
++#endif
+ #include "components/sqlite_proto/key_value_data.h"
+ #include "net/base/network_isolation_key.h"
+ #include "services/network/public/mojom/fetch_api.mojom-forward.h"
+@@ -110,6 +112,7 @@ struct PreconnectPrediction {
+   std::vector<PrefetchRequest> prefetch_requests;
+ };
+ 
++#if 0
+ // Stores a result of a prediction from the optimization guide.
+ struct OptimizationGuidePrediction {
+   OptimizationGuidePrediction();
+@@ -121,6 +124,7 @@ struct OptimizationGuidePrediction {
+   std::vector<GURL> predicted_subresources;
+   absl::optional<base::TimeTicks> optimization_guide_prediction_arrived;
+ };
++#endif
+ 
+ // Contains logic for learning what can be prefetched and for kicking off
+ // speculative prefetching.
diff --git a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
index d800d93049955..21ba62c9fe028 100644
--- a/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
+++ b/patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
@@ -50,7 +50,7 @@ index 714232b0c2707d6c256e634ff784c18322bf0a85..48c8d0051c427954fe7265fee9cd0c6b
  #endif
  
 diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
-index 3327d353cd887d027cf1d9b483ebf6e6aaaef169..dab0d2cf3e87fc082f72f40d1d622efd390885d1 100644
+index 960d0100e1857592ee24b2da22e0253ab06098c1..dca9fb72fb69386ffb0910e13f841fa698250b66 100644
 --- a/base/threading/platform_thread_win.cc
 +++ b/base/threading/platform_thread_win.cc
 @@ -30,6 +30,7 @@
diff --git a/patches/chromium/enable_reset_aspect_ratio.patch b/patches/chromium/enable_reset_aspect_ratio.patch
index aa0b4d98274fc..cc467f7b1764c 100644
--- a/patches/chromium/enable_reset_aspect_ratio.patch
+++ b/patches/chromium/enable_reset_aspect_ratio.patch
@@ -19,10 +19,10 @@ index b6d243983474cfc2c314b555ccc1de4d833a7f00..2b1fa6a345247fdbb17bd2381ab9e74a
                                     aspect_ratio.height());
  }
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index fe882b31026b527df28d384e6e7e7cccaee61d61..82616ebcb1f56de12cbd932a4614bb3858e9bad9 100644
+index b0d12e9b64cc7aa5448e88f540e7a594fca3c80e..91e45df23e659d705839fa3798ad3452bac012e5 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -1002,8 +1002,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
+@@ -1003,8 +1003,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
  }
  
  void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch
index b94ce7ad7c34b..561fd2959781f 100644
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,7 +33,7 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
  
  }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 3e0ac81d77b3943a3021381e96f55059e4289a9b..ea7c2387bfc06d47cea6bd97d0b4b95f84811dde 100644
+index f25c1baa5142d53a882b864a67d94e9e0911f0bf..4dbbc74ddb359047f1dd9e158b8dcaf63bde3790 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -1412,6 +1412,13 @@ void NetworkContext::SetNetworkConditions(
@@ -51,22 +51,22 @@ index 3e0ac81d77b3943a3021381e96f55059e4289a9b..ea7c2387bfc06d47cea6bd97d0b4b95f
    // This may only be called on NetworkContexts created with the constructor
    // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 07e6cb535bdc9fdc03ae8a115cc3b50d16d2c9b9..d4dd2699fa0876d374750135851e1e5325bf4e0d 100644
+index a9a1beed6c8e59abb9065701f34f155905781a2a..5ced53f2e875091cdaf6a38384de4f7890cd71e9 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -296,6 +296,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -300,6 +300,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
    void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
                              mojom::NetworkConditionsPtr conditions) override;
 +  void SetUserAgent(const std::string& new_user_agent) override;
    void SetAcceptLanguage(const std::string& new_accept_language) override;
    void SetEnableReferrers(bool enable_referrers) override;
- #if BUILDFLAG(IS_CHROMEOS)
+   void SetEnablePreconnect(bool enable_preconnect) override;
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index bc63400c5143f13fa8108bc431e08e83725d3b0b..f995a7277f76e30309752e2c4c193529d3f603b3 100644
+index e47bbfac56cd6c787ba3e7c0518a5326386a19b6..105011c25861fe00cc8e72fe8f310ee5118725c3 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1103,6 +1103,9 @@ interface NetworkContext {
+@@ -1106,6 +1106,9 @@ interface NetworkContext {
    SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                         NetworkConditions? conditions);
  
@@ -77,7 +77,7 @@ index bc63400c5143f13fa8108bc431e08e83725d3b0b..f995a7277f76e30309752e2c4c193529
    SetAcceptLanguage(string new_accept_language);
  
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index 82edffa618da7e5954b0adeb4f933dfe4035b48a..92d3b15ff81eb2dbe9e7d1466fc4a18e6ee7916d 100644
+index 52f08526b9988beae7ec5b0fa44ced84d38f73ce..3f55bfcf0ed5dd83e73984cb3ba16cfa1fb7b685 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
 @@ -134,6 +134,7 @@ class TestNetworkContext : public mojom::NetworkContext {
@@ -87,4 +87,4 @@ index 82edffa618da7e5954b0adeb4f933dfe4035b48a..92d3b15ff81eb2dbe9e7d1466fc4a18e
 +  void SetUserAgent(const std::string& new_user_agent) override {}
    void SetAcceptLanguage(const std::string& new_accept_language) override {}
    void SetEnableReferrers(bool enable_referrers) override {}
- #if BUILDFLAG(IS_CHROMEOS)
+   void SetEnablePreconnect(bool enable_preconnect) override {}
diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch
index ce7e8f62fcf44..95c55e850c28a 100644
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 38faafcc7432c2bedead647d4946b7183233b4bc..ff4fc53da0e14a58218c3cb39595b502b5d47996 100644
+index 40aa3b1a5c569e66b6f5d1630afe248c40d5715b..d61f63d5c16f3d93b301f1a338ae329b6f034753 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -161,6 +161,7 @@
+@@ -164,6 +164,7 @@
  #include "third_party/blink/renderer/core/timing/window_performance.h"
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
@@ -23,7 +23,7 @@ index 38faafcc7432c2bedead647d4946b7183233b4bc..ff4fc53da0e14a58218c3cb39595b502
  #include "third_party/blink/renderer/platform/graphics/image.h"
  #include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
  #include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
-@@ -1797,6 +1798,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
+@@ -1807,6 +1808,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
  #if BUILDFLAG(IS_MAC)
    web_view_impl->SetMaximumLegibleScale(
        prefs.default_maximum_page_scale_factor);
diff --git a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
index 6df94a6111ad2..bde6d8fe143bc 100644
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -13,11 +13,11 @@ other protocols to register their streaming behavior. MultibufferDataSource::Ass
 then refers to the list so that it can correctly determine the data source's settings.
 
 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-index 2879fec717b0b2bba66c599a063079b7ca8ce4b2..4bea0a1be7be5aa8c93a7a4d3cff0dc0ad1c2cd0 100644
+index c881e7951d10c48faac556661018423dff12b102..0f5408f3ddc65b856e62a05d3fe48a4397827cba 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-@@ -10,8 +10,10 @@
- #include "base/callback_helpers.h"
+@@ -11,8 +11,10 @@
+ #include "base/containers/adapters.h"
  #include "base/cxx17_backports.h"
  #include "base/location.h"
 +#include "base/no_destructor.h"
@@ -27,7 +27,7 @@ index 2879fec717b0b2bba66c599a063079b7ca8ce4b2..4bea0a1be7be5aa8c93a7a4d3cff0dc0
  #include "media/base/media_log.h"
  #include "net/base/net_errors.h"
  #include "third_party/blink/renderer/platform/media/buffered_data_source_host_impl.h"
-@@ -60,8 +62,20 @@ const int kUpdateBufferSizeFrequency = 32;
+@@ -61,8 +63,20 @@ const int kUpdateBufferSizeFrequency = 32;
  // How long to we delay a seek after a read?
  constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
  
@@ -48,7 +48,7 @@ index 2879fec717b0b2bba66c599a063079b7ca8ce4b2..4bea0a1be7be5aa8c93a7a4d3cff0dc0
  class MultiBufferDataSource::ReadOperation {
   public:
    ReadOperation() = delete;
-@@ -153,7 +167,14 @@ bool MultiBufferDataSource::media_has_played() const {
+@@ -154,7 +168,14 @@ bool MultiBufferDataSource::media_has_played() const {
  
  bool MultiBufferDataSource::AssumeFullyBuffered() const {
    DCHECK(url_data_);
diff --git a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
index d191cb136ea35..f1d733bd953da 100644
--- a/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
+++ b/patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
@@ -7,7 +7,7 @@ Subject: feat: allow embedders to add observers on created hunspell
 This patch is used by Electron to implement spellchecker events.
 
 diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
-index db3c802746235c0dcfe7fe19ca4315ee77c96743..e9a7dfb8f3a4271d35ef1d33d2dd346c23d65b47 100644
+index bbc3ea681bfe0db0e122635db5442c447a30d387..26bc4ccfcc7583fd76cd290132b0729c1f01bae3 100644
 --- a/chrome/browser/spellchecker/spellcheck_service.cc
 +++ b/chrome/browser/spellchecker/spellcheck_service.cc
 @@ -467,6 +467,9 @@ void SpellcheckService::LoadDictionaries() {
diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
index 6d34964ea3bf5..bf7eab53b1692 100644
--- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
+++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
@@ -81,10 +81,10 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
   private:
    const HWND hwnd_;
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 90e1c4adeab61374adf9da5708497ea32a46c7f5..b812a22802c7c425ab259dfe5681cafe6ad758c8 100644
+index e3056ad83f954787f50c2507cb63659605c3dd3b..358eceadb8a3c2a6782f5fcd4b57630f87689c8b 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
-@@ -134,6 +134,8 @@ viz_component("service") {
+@@ -136,6 +136,8 @@ viz_component("service") {
      "display_embedder/skia_output_surface_impl_on_gpu.h",
      "display_embedder/skia_render_copy_results.cc",
      "display_embedder/skia_render_copy_results.h",
diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
index b2f1ce41117e1..3b31f510cf4c4 100644
--- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
@@ -103,7 +103,7 @@ index 3d2bcc3e81eb42f645fa4e8b1425cb5c54cfd3a1..4cdbe0e38609abfd0b0b5856deb8b2dd
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index bc7e0a4b2ae29ac40765a9339248d42d4d31713b..2e01e4898fd17cc96fab8c2a06d4d6aeacaf22f2 100644
+index 2e8a874bf93e03e7c194dc13555eead6fe1fcafa..5b28db971f8feebd36965ccafe8b1b957b3f1ede 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -606,6 +606,7 @@ URLLoader::URLLoader(
@@ -123,7 +123,7 @@ index bc7e0a4b2ae29ac40765a9339248d42d4d31713b..2e01e4898fd17cc96fab8c2a06d4d6ae
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -1545,6 +1546,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -1555,6 +1556,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();
diff --git a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
index a66d7be8c24c1..7786b2fb77fe4 100644
--- a/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
+++ b/patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
@@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
 This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 2a3c04df4f6f44d2cf75b661761c91d66cdc7ba4..fd6477ee04aee6a87dd33ea0e573eec3d7bba175 100644
+index 2aa24b773a974e7789c661a0ffa5e01715c6e229..74993d461cbd0885a709cf8b663b9c69650aa3cf 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3453,7 +3453,7 @@ void WebContentsImpl::EnterFullscreenMode(
+@@ -3469,7 +3469,7 @@ void WebContentsImpl::EnterFullscreenMode(
    OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
    DCHECK(CanEnterFullscreenMode(requesting_frame, options));
    DCHECK(requesting_frame->IsActive());
diff --git a/patches/chromium/fix_aspect_ratio_with_max_size.patch b/patches/chromium/fix_aspect_ratio_with_max_size.patch
index 3d0218f166189..1f2b4db050994 100644
--- a/patches/chromium/fix_aspect_ratio_with_max_size.patch
+++ b/patches/chromium/fix_aspect_ratio_with_max_size.patch
@@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
 BrowserWindow.
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 82616ebcb1f56de12cbd932a4614bb3858e9bad9..67871eec9821cf100acc719a1765be489dfbe7d8 100644
+index 91e45df23e659d705839fa3798ad3452bac012e5..2dbe61a4bdf6556f6db101e47d81d37417736bd1 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
-@@ -3702,6 +3702,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
+@@ -3703,6 +3703,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    max_window_size = delegate_->DIPToScreenSize(max_window_size);
diff --git a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
index c0a55bfbbaaf3..4ad225cdb9e3c 100644
--- a/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
+++ b/patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
 to users. We should try to upstream this.
 
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 864c0a9b7072b6c3ac6584ed35a833dd6afb9e34..214f387fa670926a4c14d39ed1be556c6935c90a 100644
+index 892efd5009b0a0ef00081bd765d20c46d68b2324..f40238dc39a017a07972c8fec48a802da8a2cad0 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -1837,7 +1837,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -1858,7 +1858,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    // IncrementCapturerCount() is destructed.
    void DecrementCapturerCount(bool stay_hidden,
                                bool stay_awake,
@@ -21,10 +21,10 @@ index 864c0a9b7072b6c3ac6584ed35a833dd6afb9e34..214f387fa670926a4c14d39ed1be556c
    // Calculates the PageVisibilityState for |visibility|, taking the capturing
    // state into account.
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index f92bcc8f2a212e6cda464d9b6060a561d689f467..f9cb0eea11665148a4be669acaf5703cf9c0ea09 100644
+index a389a9c41f96ec3231b62510cde140c52dcdbe9e..25f7919970139baf58531a257f7a8c7184fef85a 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
-@@ -669,6 +669,10 @@ class WebContents : public PageNavigator,
+@@ -670,6 +670,10 @@ class WebContents : public PageNavigator,
        bool stay_awake,
        bool is_activity = true) = 0;
  
diff --git a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
index e10ef4f219dd3..079a862e35e77 100644
--- a/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
+++ b/patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch
@@ -7,11 +7,11 @@ This tweaks Chrome's Accessibility support at chrome://accessibility
 to make it usable from Electron by removing Profile references.
 
 diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc
-index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f21e88f30 100644
+index 28366584e6a3cc2655e5bc7417c4e52b9d0f4163..46894c02ca15f7091f280b2960f2ec628c500e53 100644
 --- a/chrome/browser/accessibility/accessibility_ui.cc
 +++ b/chrome/browser/accessibility/accessibility_ui.cc
-@@ -22,7 +22,10 @@
- #include "base/values.h"
+@@ -21,7 +21,10 @@
+ #include "base/trace_event/trace_event.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
 +#if 0
@@ -21,7 +21,7 @@ index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f
  #include "chrome/common/pref_names.h"
  #include "chrome/common/webui_url_constants.h"
  #include "chrome/grit/dev_ui_browser_resources.h"
-@@ -50,9 +53,11 @@
+@@ -49,9 +52,11 @@
  #include "ui/views/accessibility/view_accessibility.h"
  
  #if !BUILDFLAG(IS_ANDROID)
@@ -33,50 +33,49 @@ index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f
  #include "ui/views/accessibility/widget_ax_tree_id_map.h"
  #include "ui/views/widget/widget.h"
  #include "ui/views/widget/widget_delegate.h"
-@@ -164,7 +169,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
+@@ -162,7 +167,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
                                 accessibility_mode);
  }
  
 -#if !BUILDFLAG(IS_ANDROID)
 +#if 0
- std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(Browser* browser) {
-   std::unique_ptr<base::DictionaryValue> target_data(
-       new base::DictionaryValue());
-@@ -203,7 +208,9 @@ void HandleAccessibilityRequestCallback(
+ base::Value::Dict BuildTargetDescriptor(Browser* browser) {
+   base::Value::Dict target_data;
+   target_data.Set(kSessionIdField, browser->session_id().id());
+@@ -196,7 +201,9 @@ void HandleAccessibilityRequestCallback(
    DCHECK(ShouldHandleAccessibilityRequestCallback(path));
  
-   base::DictionaryValue data;
+   base::Value::Dict data;
 +#if 0
    PrefService* pref = Profile::FromBrowserContext(current_context)->GetPrefs();
 +#endif
    ui::AXMode mode =
        content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
    bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
-@@ -237,7 +244,7 @@ void HandleAccessibilityRequestCallback(
-   data.SetBoolKey(kViewsAccessibility,
-                   features::IsAccessibilityTreeForViewsEnabled());
+@@ -228,7 +235,7 @@ void HandleAccessibilityRequestCallback(
+   // enabled.
+   data.Set(kViewsAccessibility, features::IsAccessibilityTreeForViewsEnabled());
  
 -  bool show_internal = pref->GetBoolean(prefs::kShowInternalAccessibilityTree);
 +  bool show_internal = true;
-   data.SetStringKey(kInternal, show_internal ? kOn : kOff);
+   data.Set(kInternal, show_internal ? kOn : kOff);
  
-   std::unique_ptr<base::ListValue> page_list(new base::ListValue());
-@@ -274,12 +281,12 @@ void HandleAccessibilityRequestCallback(
+   base::Value::List page_list;
+@@ -264,11 +271,11 @@ void HandleAccessibilityRequestCallback(
    data.Set(kPagesField, std::move(page_list));
  
-   std::unique_ptr<base::ListValue> browser_list(new base::ListValue());
+   base::Value::List browser_list;
 -#if !BUILDFLAG(IS_ANDROID)
 +#if 0
    for (Browser* browser : *BrowserList::GetInstance()) {
-     browser_list->Append(
-         base::Value::FromUniquePtrValue(BuildTargetDescriptor(browser)));
+     browser_list.Append(BuildTargetDescriptor(browser));
    }
 -#endif  // !BUILDFLAG(IS_ANDROID)
 +#endif // !BUILDFLAG(IS_ANDROID)
    data.Set(kBrowsersField, std::move(browser_list));
  
-   std::unique_ptr<base::ListValue> widgets_list(new base::ListValue());
-@@ -497,8 +504,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(
+   base::Value::List widgets_list;
+@@ -483,8 +490,10 @@ void AccessibilityUIMessageHandler::SetGlobalFlag(
  
    AllowJavascript();
    if (flag_name_str == kInternal) {
@@ -87,7 +86,7 @@ index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f
      return;
    }
  
-@@ -605,10 +614,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
+@@ -588,10 +597,12 @@ void AccessibilityUIMessageHandler::RequestWebContentsTree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
@@ -98,26 +97,26 @@ index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f
    std::string accessibility_contents =
 -      web_contents->DumpAccessibilityTree(internal, property_filters);
 +      web_contents->DumpAccessibilityTree(true, property_filters);
-   result->SetStringKey(kTreeField, accessibility_contents);
-   FireWebUIListener(request_type, *(result.get()));
+   result.Set(kTreeField, accessibility_contents);
+   FireWebUIListener(request_type, result);
  }
-@@ -633,6 +644,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+@@ -614,6 +625,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
                       AXPropertyFilter::ALLOW_EMPTY);
    AddPropertyFilters(property_filters, deny, AXPropertyFilter::DENY);
  
 +#if 0
    for (Browser* browser : *BrowserList::GetInstance()) {
      if (browser->session_id().id() == session_id) {
-       std::unique_ptr<base::DictionaryValue> result(
-@@ -647,6 +659,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
+       base::Value::Dict result = BuildTargetDescriptor(browser);
+@@ -626,6 +638,7 @@ void AccessibilityUIMessageHandler::RequestNativeUITree(
        return;
      }
    }
 +#endif
  #endif  // !BUILDFLAG(IS_ANDROID)
    // No browser with the specified |session_id| was found.
-   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
-@@ -763,5 +776,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
+   base::Value::Dict result;
+@@ -738,5 +751,7 @@ void AccessibilityUIMessageHandler::RequestAccessibilityEvents(
  // static
  void AccessibilityUIMessageHandler::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -126,10 +125,10 @@ index a1c0a809fee4ddbda55540139e866cfe494c5590..25888d4405b60925ef60726a0f486f6f
 +#endif
  }
 diff --git a/chrome/browser/accessibility/accessibility_ui.h b/chrome/browser/accessibility/accessibility_ui.h
-index 6bc5891205fc94377040d9195b0ee15a47a90382..16a25b6a5670a74cf260210b06bc9892431cd760 100644
+index 8ae101cdb4de8ea570e3af6e05e9124b51a9f14c..2706f8ad05a6bee71b68f59406eb0bd3391a3fcd 100644
 --- a/chrome/browser/accessibility/accessibility_ui.h
 +++ b/chrome/browser/accessibility/accessibility_ui.h
-@@ -25,6 +25,8 @@ struct AXEventNotificationDetails;
+@@ -22,6 +22,8 @@ struct AXEventNotificationDetails;
  class WebContents;
  }  // namespace content
  
@@ -138,7 +137,7 @@ index 6bc5891205fc94377040d9195b0ee15a47a90382..16a25b6a5670a74cf260210b06bc9892
  namespace user_prefs {
  class PrefRegistrySyncable;
  }  // namespace user_prefs
-@@ -66,6 +68,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
+@@ -63,6 +65,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
    static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
  
   private:
diff --git a/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
new file mode 100644
index 0000000000000..db49bbdb07304
--- /dev/null
+++ b/patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
@@ -0,0 +1,198 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Mon, 5 Sep 2022 19:07:54 +0900
+Subject: fix: return v8::Value from LocalFrame::RequestExecuteScript
+
+Allows api::WebFrame::ExecuteJavaScript(InIsolateWorld) to work with
+v8::Value instead of base::Value.
+Refs https://bugs.chromium.org/p/chromium/issues/detail?id=1323953
+
+diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
+index 032ef69a5b50cef88f341b8a7a3de0acef88898d..a425fe1fb6275afd8e25033932f6f444efd6f643 100644
+--- a/extensions/renderer/script_injection.cc
++++ b/extensions/renderer/script_injection.cc
+@@ -332,6 +332,7 @@ void ScriptInjection::InjectJs(std::set<std::string>* executing_scripts,
+       blink::mojom::LoadEventBlockingOption::kBlock,
+       base::BindOnce(&ScriptInjection::OnJsInjectionCompleted,
+                      weak_ptr_factory_.GetWeakPtr()),
++      base::NullCallback(),
+       blink::BackForwardCacheAware::kPossiblyDisallow,
+       injector_->ShouldWaitForPromise());
+ }
+diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
+index ba043cf658f568e4390db1619b1042749e430b2b..285d53074a0fcfb00caaec8c3f8a0bbebcd68953 100644
+--- a/third_party/blink/public/web/web_local_frame.h
++++ b/third_party/blink/public/web/web_local_frame.h
+@@ -424,6 +424,7 @@ class WebLocalFrame : public WebFrame {
+                                     mojom::EvaluationTiming,
+                                     mojom::LoadEventBlockingOption,
+                                     WebScriptExecutionCallback,
++                                    WebScriptExecutionCallbackUnmodified,
+                                     BackForwardCacheAware,
+                                     mojom::PromiseResultOption) = 0;
+ 
+diff --git a/third_party/blink/public/web/web_script_execution_callback.h b/third_party/blink/public/web/web_script_execution_callback.h
+index c37e7ef609c91e9b9107d7a6194b213039184fb9..3f2e27b4f51dc1d673883cf2bf75f596a952ac44 100644
+--- a/third_party/blink/public/web/web_script_execution_callback.h
++++ b/third_party/blink/public/web/web_script_execution_callback.h
+@@ -17,6 +17,12 @@ namespace base {
+ class TimeTicks;
+ }
+ 
++namespace v8 {
++class Value;
++template <class T>
++class Local;
++}
++
+ namespace blink {
+ 
+ template <typename T>
+@@ -26,6 +32,9 @@ using WebScriptExecutionCallback =
+     base::OnceCallback<void(const WebVector<v8::Local<v8::Value>>&,
+                             base::TimeTicks)>;
+ 
++using WebScriptExecutionCallbackUnmodified =
++    base::OnceCallback<void(const WebVector<v8::Local<v8::Value>>&)>;
++
+ }  // namespace blink
+ 
+ #endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
+diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
+index 3891afe36284d033e3ba88ffda63545b07f6c718..69eb59439932887b34099f7cd3ebd51ecd4aa676 100644
+--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
++++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
+@@ -1133,6 +1133,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
+   auto* executor = MakeGarbageCollected<PausableScriptExecutor>(
+       DomWindow(), ToScriptState(frame_, *isolated_world),
+       execution_request->Callback(),
++      base::NullCallback(),
+       /*executor=*/execution_request);
+   executor->Run();
+ 
+diff --git a/third_party/blink/renderer/core/frame/pausable_script_executor.cc b/third_party/blink/renderer/core/frame/pausable_script_executor.cc
+index 4b2b8fc8e5b48948b36bfdc5b76ebeabe5c72606..90437b41b3e12309c194d9f3e94ac37603403227 100644
+--- a/third_party/blink/renderer/core/frame/pausable_script_executor.cc
++++ b/third_party/blink/renderer/core/frame/pausable_script_executor.cc
+@@ -262,7 +262,7 @@ void PausableScriptExecutor::CreateAndRun(LocalDOMWindow* window,
+   }
+   PausableScriptExecutor* executor =
+       MakeGarbageCollected<PausableScriptExecutor>(
+-          window, script_state, std::move(callback),
++          window, script_state, std::move(callback), base::NullCallback(),
+           MakeGarbageCollected<V8FunctionExecutor>(
+               window->GetIsolate(), function, receiver, argc, argv));
+   executor->Run();
+@@ -277,6 +277,14 @@ void PausableScriptExecutor::ContextDestroyed() {
+     ScriptState::Scope script_scope(script_state_);
+     std::move(callback_).Run(Vector<v8::Local<v8::Value>>(), {});
+   }
++  if (raw_callback_) {
++    // Though the context is (about to be) destroyed, the callback is invoked
++    // with a vector of v8::Local<>s, which implies that creating v8::Locals
++    // is permitted. Ensure a valid scope is present for the callback.
++    // See https://crbug.com/840719.
++    ScriptState::Scope script_scope(script_state_);
++    std::move(raw_callback_).Run(Vector<v8::Local<v8::Value>>());
++  }
+   Dispose();
+ }
+ 
+@@ -285,11 +293,12 @@ PausableScriptExecutor::PausableScriptExecutor(
+     scoped_refptr<DOMWrapperWorld> world,
+     Vector<WebScriptSource> sources,
+     mojom::blink::UserActivationOption user_gesture,
+-    WebScriptExecutionCallback callback)
++    WebScriptExecutionCallback callback,
++    WebScriptExecutionCallbackUnmodified raw_callback)
+     : PausableScriptExecutor(
+           window,
+           ToScriptState(window, *world),
+-          std::move(callback),
++          std::move(callback), std::move(raw_callback),
+           MakeGarbageCollected<WebScriptExecutor>(std::move(sources),
+                                                   world->GetWorldId(),
+                                                   user_gesture)) {}
+@@ -298,11 +307,12 @@ PausableScriptExecutor::PausableScriptExecutor(
+     LocalDOMWindow* window,
+     ScriptState* script_state,
+     WebScriptExecutionCallback callback,
++    WebScriptExecutionCallbackUnmodified raw_callback,
+     Executor* executor)
+     : ExecutionContextLifecycleObserver(window),
+       script_state_(script_state),
+       callback_(std::move(callback)),
+-      blocking_option_(mojom::blink::LoadEventBlockingOption::kDoNotBlock),
++      raw_callback_(std::move(raw_callback)),
+       executor_(executor) {
+   CHECK(script_state_);
+   CHECK(script_state_->ContextIsValid());
+@@ -388,6 +398,9 @@ void PausableScriptExecutor::HandleResults(
+   if (callback_)
+     std::move(callback_).Run(results, start_time_);
+ 
++  if (raw_callback_)
++    std::move(raw_callback_).Run(results);
++
+   Dispose();
+ }
+ 
+diff --git a/third_party/blink/renderer/core/frame/pausable_script_executor.h b/third_party/blink/renderer/core/frame/pausable_script_executor.h
+index 12a42ef52c2689a1c2d3029890fed8e12faa03aa..fe5bd4bee4f236f2958dcf03e1f644639afc4c75 100644
+--- a/third_party/blink/renderer/core/frame/pausable_script_executor.h
++++ b/third_party/blink/renderer/core/frame/pausable_script_executor.h
+@@ -48,10 +48,12 @@ class CORE_EXPORT PausableScriptExecutor final
+                          scoped_refptr<DOMWrapperWorld>,
+                          Vector<WebScriptSource>,
+                          mojom::blink::UserActivationOption,
+-                         WebScriptExecutionCallback);
++                         WebScriptExecutionCallback,
++                         WebScriptExecutionCallbackUnmodified);
+   PausableScriptExecutor(LocalDOMWindow*,
+                          ScriptState*,
+                          WebScriptExecutionCallback,
++                         WebScriptExecutionCallbackUnmodified,
+                          Executor*);
+   ~PausableScriptExecutor() override;
+ 
+@@ -75,6 +77,7 @@ class CORE_EXPORT PausableScriptExecutor final
+ 
+   Member<ScriptState> script_state_;
+   WebScriptExecutionCallback callback_;
++  WebScriptExecutionCallbackUnmodified raw_callback_;
+   base::TimeTicks start_time_;
+   mojom::blink::LoadEventBlockingOption blocking_option_;
+   TaskHandle task_handle_;
+diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+index a31fe747be3c228c4eec512835de6368d29516aa..4197391cb15a55eaca55eca2d3886ebcb8360e95 100644
+--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
++++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+@@ -1086,6 +1086,7 @@ void WebLocalFrameImpl::RequestExecuteScript(
+     mojom::blink::EvaluationTiming evaluation_timing,
+     mojom::blink::LoadEventBlockingOption blocking_option,
+     WebScriptExecutionCallback callback,
++    WebScriptExecutionCallbackUnmodified raw_callback,
+     BackForwardCacheAware back_forward_cache_aware,
+     mojom::blink::PromiseResultOption promise_behavior) {
+   DCHECK(GetFrame());
+@@ -1109,7 +1110,7 @@ void WebLocalFrameImpl::RequestExecuteScript(
+                         base::checked_cast<wtf_size_t>(sources.size()));
+   auto* executor = MakeGarbageCollected<PausableScriptExecutor>(
+       GetFrame()->DomWindow(), std::move(world), std::move(script_sources),
+-      user_gesture, std::move(callback));
++      user_gesture, std::move(callback), std::move(raw_callback));
+   executor->set_wait_for_promise(promise_behavior);
+   switch (evaluation_timing) {
+     case mojom::blink::EvaluationTiming::kAsynchronous:
+diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+index 76cbde766ba8ebc1b503eea9a5b6335f775dc00c..ebb1084be8069251d8f568e7b9f30d3dc83b0a64 100644
+--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
++++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+@@ -189,6 +189,7 @@ class CORE_EXPORT WebLocalFrameImpl final
+                             mojom::blink::EvaluationTiming,
+                             mojom::blink::LoadEventBlockingOption,
+                             WebScriptExecutionCallback,
++                            WebScriptExecutionCallbackUnmodified,
+                             BackForwardCacheAware back_forward_cache_aware,
+                             mojom::blink::PromiseResultOption) override;
+   void Alert(const WebString& message) override;
diff --git a/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch b/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch
index 7a34a68504653..0ff3414d49fa0 100644
--- a/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch
+++ b/patches/chromium/fix_revert_emulationhandler_update_functions_to_early_return.patch
@@ -18,10 +18,10 @@ fix this, we revert those state update calls to early returns.
 Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856525
 
 diff --git a/content/browser/devtools/protocol/emulation_handler.cc b/content/browser/devtools/protocol/emulation_handler.cc
-index 84736afeb21d1deec0f4032ef6f3304075d8fffb..d023bb7b5a34c5c055d3d7cc5dc3e04ef43bcc3b 100644
+index 90c7fbebfcedd744163f8294be6de99db7b54aef..5c507f3aa02d918fc9c87ed3842f282f4545f0ff 100644
 --- a/content/browser/devtools/protocol/emulation_handler.cc
 +++ b/content/browser/devtools/protocol/emulation_handler.cc
-@@ -565,7 +565,9 @@ WebContentsImpl* EmulationHandler::GetWebContents() {
+@@ -588,7 +588,9 @@ WebContentsImpl* EmulationHandler::GetWebContents() {
  }
  
  void EmulationHandler::UpdateTouchEventEmulationState() {
@@ -32,7 +32,7 @@ index 84736afeb21d1deec0f4032ef6f3304075d8fffb..d023bb7b5a34c5c055d3d7cc5dc3e04e
    // We only have a single TouchEmulator for all frames, so let the main frame's
    // EmulationHandler enable/disable it.
    DCHECK(!host_->GetParentOrOuterDocument());
-@@ -585,7 +587,9 @@ void EmulationHandler::UpdateTouchEventEmulationState() {
+@@ -608,7 +610,9 @@ void EmulationHandler::UpdateTouchEventEmulationState() {
  }
  
  void EmulationHandler::UpdateDeviceEmulationState() {
diff --git a/patches/chromium/fix_the_gn_gen_for_components_segmentation_platform.patch b/patches/chromium/fix_the_gn_gen_for_components_segmentation_platform.patch
new file mode 100644
index 0000000000000..be71fd0151a97
--- /dev/null
+++ b/patches/chromium/fix_the_gn_gen_for_components_segmentation_platform.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Adam Kallai <kadam@inf.u-szeged.hu>
+Date: Mon, 22 Aug 2022 20:35:17 +0000
+Subject: Fix the gn gen for components/segmentation_platform
+
+'optimization_guide_segmentation_handler' dependency only available if
+the 'build_with_tflite_lib' condition is set.
+
+Change-Id: I4d13e1f17caaaa744b3c95e425466cf851edf613
+
+Bug: 1355185
+Change-Id: I4d13e1f17caaaa744b3c95e425466cf851edf613
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3845194
+Reviewed-by: Siddhartha S <ssid@chromium.org>
+Commit-Queue: Siddhartha S <ssid@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1037919}
+(cherry picked from commit 9352250ae5e5589a7484873d7efe66d708ba6ad6)
+
+diff --git a/components/segmentation_platform/embedder/BUILD.gn b/components/segmentation_platform/embedder/BUILD.gn
+index 385ab7e469f4e0c02500295edc7f24cedaf0ac6b..9bbac1528bcf0c7c1589c4962bee0ff9c5febaf7 100644
+--- a/components/segmentation_platform/embedder/BUILD.gn
++++ b/components/segmentation_platform/embedder/BUILD.gn
+@@ -2,6 +2,8 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
++import("//components/optimization_guide/features.gni")
++
+ if (is_android) {
+   import("//build/config/android/config.gni")
+   import("//build/config/android/rules.gni")
+@@ -21,11 +23,14 @@ source_set("embedder") {
+     "//components/optimization_guide/core",
+     "//components/optimization_guide/core:features",
+     "//components/segmentation_platform/internal",
+-    "//components/segmentation_platform/internal:optimization_guide_segmentation_handler",
+     "//components/segmentation_platform/internal/proto",
+     "//components/segmentation_platform/public",
+     "//url",
+   ]
++
++  if (build_with_tflite_lib) {
++    deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
++  }
+ }
+ 
+ source_set("unit_tests") {
diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch
index 972b408dbbc00..27a1fc982be1a 100644
--- a/patches/chromium/frame_host_manager.patch
+++ b/patches/chromium/frame_host_manager.patch
@@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
 Allows embedder to intercept site instances created by chromium.
 
 diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
-index 2ade1a0771a8f9c3c790492aadbd711b97a4613c..4a5f3bf210869e55dbc735b70b5d27548f6b62a7 100644
+index 569297aab0b4187afde801643957949216404082..a1e332ae2bcf2027019261e38bb82c8446e014d1 100644
 --- a/content/browser/renderer_host/render_frame_host_manager.cc
 +++ b/content/browser/renderer_host/render_frame_host_manager.cc
-@@ -3271,6 +3271,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
+@@ -3270,6 +3270,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
      request->ResetStateForSiteInstanceChange();
    }
  
@@ -20,10 +20,10 @@ index 2ade1a0771a8f9c3c790492aadbd711b97a4613c..4a5f3bf210869e55dbc735b70b5d2754
  }
  
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index f399bc59be5705542b34185e7fe7202a029c40ea..3293b6e035a6ea182504aa2700866fea8c213f4c 100644
+index 7eb47e0c73c7f0d8a0cadcf5b8163f8a5154faea..a699439c45bcfce66b697e2a97e6d1ae408cd343 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
-@@ -270,6 +270,11 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
  
    virtual ~ContentBrowserClient() = default;
  
diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch
index 0c82f2e509740..e2c389870ebf4 100644
--- a/patches/chromium/gin_enable_disable_v8_platform.patch
+++ b/patches/chromium/gin_enable_disable_v8_platform.patch
@@ -38,10 +38,10 @@ index d7739924bc3c3daec848db52730bd60c72ff2d8a..78af701cb06f6cb1bdd9829b2fcc46c8
    // Returns whether `Initialize` has already been invoked in the process.
    // Initialization is a one-way operation (i.e., this method cannot return
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index ab2affbcab0ca7eea0b908fd1dd75f36ef095385..952b3ba6247935053d9a080bced30e3b3c640dd4 100644
+index cb3302bb2abb735609436bdf2a5d4d51cc4258ad..5530d975303cc96701e4b70ffbcaf6e7c02bb016 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -362,7 +362,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
+@@ -368,7 +368,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
  // static
  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
                                 const std::string js_command_line_flags,
@@ -51,7 +51,7 @@ index ab2affbcab0ca7eea0b908fd1dd75f36ef095385..952b3ba6247935053d9a080bced30e3b
    static bool v8_is_initialized = false;
    if (v8_is_initialized)
      return;
-@@ -372,7 +373,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
+@@ -378,7 +379,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    // See https://crbug.com/v8/11043
    SetFlags(mode, js_command_line_flags);
  
diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
index d43e9228ce721..4f42b1699b1a1 100644
--- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
+++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
@@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event
 to identify it.
 
 diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
-index 650a9128d26ac6a745abfdaca93d21f19e60343a..9ccc48f79e9fe9541f9fcd7063b1f58ef31931ae 100644
+index 54cc8dc51d400a5738c7e3d63e6f368bead2a021..182ef4fde23a6afe2e9d8a8f02d8ccf6161c633e 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl.cc
 @@ -230,6 +230,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -28,7 +28,7 @@ index 650a9128d26ac6a745abfdaca93d21f19e60343a..9ccc48f79e9fe9541f9fcd7063b1f58e
  
  void GpuDataManagerImpl::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
-index 9f2b350bc160e01ae39becd405e8a7d99a9a8ec1..3601121e3290b7b3a71041ede93d8fb00a156332 100644
+index 1fc56c055d423ab074f8f4f90415e34593a04a18..c637247f003e1c6bfe073a43a09851682cd242cc 100644
 --- a/content/browser/gpu/gpu_data_manager_impl.h
 +++ b/content/browser/gpu/gpu_data_manager_impl.h
 @@ -125,6 +125,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
@@ -40,10 +40,10 @@ index 9f2b350bc160e01ae39becd405e8a7d99a9a8ec1..3601121e3290b7b3a71041ede93d8fb0
    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
  
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
-index 855bd71694c21353337090d049dfcfa20ebccea4..dbd0636107b1e66cb7993e29b8ed0e7f0c91ee61 100644
+index 526b9768da187b0f7d94b3500a63af8242d568af..01faafb23559dd13f5a770c1dd3864a2ea858321 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1209,6 +1209,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
+@@ -1199,6 +1199,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    if (host)
      host->ForceShutdown();
  }
@@ -57,7 +57,7 @@ index 855bd71694c21353337090d049dfcfa20ebccea4..dbd0636107b1e66cb7993e29b8ed0e7f
  
  void GpuDataManagerImplPrivate::UpdateDawnInfo(
 diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
-index 1aff605f7c126104edc9e74adc80d56344177a80..93e589d1ede1fb33dde3b099d04540fef777e182 100644
+index af6dd8d8af99c5bd1e854c8cfbeb89e04476fefd..758adb66dff5aefad9f3c9f8c23de6fa9df33ef7 100644
 --- a/content/browser/gpu/gpu_data_manager_impl_private.h
 +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
 @@ -87,6 +87,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch
index fba6f47a9f03f..5b11d2d911004 100644
--- a/patches/chromium/gritsettings_resource_ids.patch
+++ b/patches/chromium/gritsettings_resource_ids.patch
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
 Add electron resources file to the list of resource ids generation.
 
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
-index 1bc95f7cab225ff4ff5d9819fa07d8a8cf7d9f9c..3631ccc4e41db1b6c9d3873f52cc3ff708b18d68 100644
+index d9ae17943b8fcfaa6026869328e60c8cc4057425..7d97829b1a0d2589607eb696bdde1fa72cc09424 100644
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -975,6 +975,11 @@
+@@ -984,6 +984,11 @@
      "includes": [4960],
    },
  
diff --git a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
index 4249d68d5c2b2..89ec97f2f2949 100644
--- a/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
+++ b/patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
@@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index f25be7d134b65a6caf65241a78111de145727fcd..4fcbd6e5fd6e0d692c3bad4232b37d2a95a7073f 100755
+index c8703580d32010666d81fc28ea7325ef0b292fec..a8c9e3af875586d041d58d6d70b5b81092139eed 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
-@@ -302,6 +302,8 @@ def GetDefaultHostOs():
+@@ -307,6 +307,8 @@ def GetDefaultHostOs():
        'win32': 'win',
    }
    default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)
diff --git a/patches/chromium/load_v8_snapshot_in_browser_process.patch b/patches/chromium/load_v8_snapshot_in_browser_process.patch
index e3d33b36f6ce7..5fb0d549c8417 100644
--- a/patches/chromium/load_v8_snapshot_in_browser_process.patch
+++ b/patches/chromium/load_v8_snapshot_in_browser_process.patch
@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
 in the browser process.
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index ed19f7f1a283da619c01e2dc476d9d1ace950dc7..ef51df5e85584329c9c02aa2b6b88ba9eadd1a31 100644
+index fb4af331fb38b9e431137fd2b3806be84175acbf..14ca983c91cfe495ebd2859866a7f434d0a9ab02 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
+@@ -253,11 +253,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
  
  bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
                            const std::string& process_type) {
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
index f54ca7b264d4c..81ba08c541044 100644
--- a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
+++ b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -9,10 +9,10 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index b54d534b4d408c30341b20409fec75d3a66ca519..d0a00518d06bbb0da228662924b2ab9e568ef940 100644
+index 34cbeddf6cabd78806304e45e25074d5d2ccd51e..db66cfa6313e805e91d9dbb189ae10b02792a112 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -386,8 +386,12 @@ RunContentProcess(ContentMainParams params,
+@@ -413,8 +413,12 @@ RunContentProcess(ContentMainParams params,
  
  #if BUILDFLAG(IS_WIN)
      // Route stdio to parent console (if any) or create one.
diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch
index 6753852394ca9..726031eb70315 100644
--- a/patches/chromium/mas_disable_custom_window_frame.patch
+++ b/patches/chromium/mas_disable_custom_window_frame.patch
@@ -75,7 +75,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b
 +
  @end
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
-index 77662e89cf2c6135b99b3905c20456f4da0a6e09..fea78cc7fa195f44d88ec08a027b8e90209ee47c 100644
+index cfbb9f03214084c5181e48e1b0d497ab0b5cf1b3..21fdd6e2e9fae08443ca74c49c1b6984ea0c3429 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.h
 @@ -17,6 +17,7 @@ class NativeWidgetNSWindowBridge;
@@ -95,10 +95,10 @@ index 77662e89cf2c6135b99b3905c20456f4da0a6e09..fea78cc7fa195f44d88ec08a027b8e90
  // The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
  // can only be accomplished by overriding methods.
 diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583513ea8ec 100644
+index 8ffa07e273fc65d8d29e119bb7dd4114b5eba6f4..60de405c461ec05a7036025553b82dd18f2acd13 100644
 --- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
-@@ -77,7 +77,9 @@ void OrderChildWindow(NSWindow* child_window,
+@@ -78,7 +78,9 @@ void OrderChildWindow(NSWindow* child_window,
  }  // namespace
  
  @interface NSWindow (Private)
@@ -108,7 +108,7 @@ index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583
  - (BOOL)hasKeyAppearance;
  - (long long)_resizeDirectionForMouseLocation:(CGPoint)location;
  - (BOOL)_isConsideredOpenForPersistentState;
-@@ -109,6 +111,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
+@@ -110,6 +112,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event {
  }
  @end
  
@@ -117,7 +117,7 @@ index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583
  @implementation NativeWidgetMacNSWindowTitledFrame
  - (void)mouseDown:(NSEvent*)event {
    if (self.window.isMovable)
-@@ -135,6 +139,8 @@ - (BOOL)usesCustomDrawing {
+@@ -136,6 +140,8 @@ - (BOOL)usesCustomDrawing {
  }
  @end
  
@@ -126,7 +126,7 @@ index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583
  @implementation NativeWidgetMacNSWindow {
   @private
    base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
-@@ -287,6 +293,8 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -285,6 +291,8 @@ - (NSAccessibilityRole)accessibilityRole {
  
  // NSWindow overrides.
  
@@ -135,7 +135,7 @@ index 18c63a44773700852365c508ee222232d0e5c8ec..8c644c4e16ce2305719caaa7d67dc583
  + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    if (windowStyle & NSWindowStyleMaskTitled) {
      if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
-@@ -298,6 +306,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
+@@ -296,6 +304,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
    return [super frameViewClassForStyleMask:windowStyle];
  }
  
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 4a955cba8a74e..81239e0f75fef 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -44,7 +44,7 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
  
  }  // namespace
 diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
-index c8a108cd8d39bf5185db438092579f67d31938f1..7ceaca262d71b1738d1dc92421db5e94494d5a97 100644
+index 378cb463ff2ad323fe413d5ef40d6bd48659a5df..686527e081f1dc9bfa3cd8313ef818a05a4e5bfb 100644
 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
 @@ -583,10 +583,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -61,10 +61,10 @@ index c8a108cd8d39bf5185db438092579f67d31938f1..7ceaca262d71b1738d1dc92421db5e94
    // Beware: This view was briefly removed (in favor of a bare CALayer) in
    // crrev/c/1236675. The ordering of unassociated layers relative to NSView
 diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-index d6d48ab183ee32edc8c9c984673e050a2557950d..0022095c7ae81197ef5cdeddc62d8550fb973e03 100644
+index be7b05ee4f779ccc44e6eea7ff7fb3e8bd504d6f..3b3336913cf91c3b7f22cefb4139f82b882c97c9 100644
 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
 +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
-@@ -76,8 +76,10 @@ id GetFocusedBrowserAccessibilityElement() override {
+@@ -77,8 +77,10 @@ id GetFocusedBrowserAccessibilityElement() override {
      return nil;
    }
    void SetAccessibilityWindow(NSWindow* window) override {
@@ -75,7 +75,7 @@ index d6d48ab183ee32edc8c9c984673e050a2557950d..0022095c7ae81197ef5cdeddc62d8550
    }
  
    void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event,
-@@ -139,8 +141,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
+@@ -140,8 +142,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override {
  
    mojo::AssociatedRemote<mojom::RenderWidgetHostNSViewHost> host_;
    std::unique_ptr<RenderWidgetHostNSViewBridge> bridge_;
@@ -117,10 +117,10 @@ index 6c0700b182e9765afd60d8deec501d13432e1b0a..c85c024a5a5711471e24698f14dda21b
    return false;
  }
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
-index a27ce05f20a8d645688c5bb920d36e76901e2b37..cb4238fe7d5f2d182c742532cf467880db7b309e 100644
+index 0549e3b400cb42e1a3491a2de9739c275ae006df..ab59ea7211b425e36d3d0fa673d8c09b99140716 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.h
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
-@@ -51,7 +51,9 @@ class ScopedPasswordInputEnabler;
+@@ -52,7 +52,9 @@ class ScopedPasswordInputEnabler;
  
  @protocol RenderWidgetHostViewMacDelegate;
  
@@ -130,7 +130,7 @@ index a27ce05f20a8d645688c5bb920d36e76901e2b37..cb4238fe7d5f2d182c742532cf467880
  @class RenderWidgetHostViewCocoa;
  
  namespace content {
-@@ -665,10 +667,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
+@@ -668,10 +670,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
    // EnsureSurfaceSynchronizedForWebTest().
    uint32_t latest_capture_sequence_number_ = 0u;
  
@@ -144,10 +144,10 @@ index a27ce05f20a8d645688c5bb920d36e76901e2b37..cb4238fe7d5f2d182c742532cf467880
    // Used to force the NSApplication's focused accessibility element to be the
    // content::BrowserAccessibilityCocoa accessibility tree when the NSView for
 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 9c42f305d30b1f1cafd72fd7326894819fa57ee7..54681d4aaaa52ee07fba0055a8411b8e19b4cc8c 100644
+index d460e055c8bc70845cdf89567e17a79da70fd9f1..f28dcfe0721239ca9341a0db80e8626a515c34d8 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -258,8 +258,10 @@
+@@ -259,8 +259,10 @@
  void RenderWidgetHostViewMac::MigrateNSViewBridge(
      remote_cocoa::mojom::Application* remote_cocoa_application,
      uint64_t parent_ns_view_id) {
@@ -158,7 +158,7 @@ index 9c42f305d30b1f1cafd72fd7326894819fa57ee7..54681d4aaaa52ee07fba0055a8411b8e
  
    // Disconnect from the previous bridge (this will have the effect of
    // destroying the associated bridge), and close the receiver (to allow it
-@@ -1559,8 +1561,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1561,8 +1563,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  gfx::NativeViewAccessible
  RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@@ -169,7 +169,7 @@ index 9c42f305d30b1f1cafd72fd7326894819fa57ee7..54681d4aaaa52ee07fba0055a8411b8e
    return [GetInProcessNSView() window];
  }
  
-@@ -1604,9 +1608,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -1606,9 +1610,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  }
  
  void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@@ -181,7 +181,7 @@ index 9c42f305d30b1f1cafd72fd7326894819fa57ee7..54681d4aaaa52ee07fba0055a8411b8e
  }
  
  bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
-@@ -2101,12 +2107,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
+@@ -2103,12 +2109,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
  
  void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
      const std::vector<uint8_t>& window_token) {
@@ -235,7 +235,7 @@ index e7adfee3210ec723c687adfcc4bee8827ef643e7..25a924a47eeb30d783ef83dbb4896c4b
 +
  #endif  // UI_BASE_COCOA_REMOTE_ACCESSIBILITY_API_H_
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
-index fc847f1ae010e4e0d69836f16d83515b8a92073a..a4bebe5078ace6c49cb34912813bbaf76b43b00c 100644
+index 5a09100094d0371a3e58db6c7626e06bdcdd17c3..1aa7bde93efdf198998ba4e6a97dcf2aadd9f4e9 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
 @@ -32,7 +32,9 @@
@@ -248,7 +248,7 @@ index fc847f1ae010e4e0d69836f16d83515b8a92073a..a4bebe5078ace6c49cb34912813bbaf7
  @class NSView;
  
  namespace remote_cocoa {
-@@ -447,11 +449,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
+@@ -449,11 +451,13 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
    mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
        remote_ns_window_remote_;
  
@@ -263,7 +263,7 @@ index fc847f1ae010e4e0d69836f16d83515b8a92073a..a4bebe5078ace6c49cb34912813bbaf7
    // Used to force the NSApplication's focused accessibility element to be the
    // views::Views accessibility tree when the NSView for this is focused.
 diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
-index eaca66e6c854cf7c2ba57a988080d2dee03d08e7..88e75e76cc4accacfbe4e8a2a1934372424d0eb8 100644
+index cdaf472a02038e1fbcb15747dd1992e2ea0e998b..a9cb80cf7f3631eab7d0fcbcf685ee88af6d8972 100644
 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
 @@ -325,14 +325,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -289,7 +289,7 @@ index eaca66e6c854cf7c2ba57a988080d2dee03d08e7..88e75e76cc4accacfbe4e8a2a1934372
  }
  
  remote_cocoa::mojom::NativeWidgetNSWindow*
-@@ -1289,6 +1297,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1304,6 +1312,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
  void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
      const std::vector<uint8_t>& window_token,
      const std::vector<uint8_t>& view_token) {
@@ -297,7 +297,7 @@ index eaca66e6c854cf7c2ba57a988080d2dee03d08e7..88e75e76cc4accacfbe4e8a2a1934372
    remote_window_accessible_ =
        ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
    remote_view_accessible_ =
-@@ -1296,14 +1305,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
+@@ -1311,14 +1320,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
    [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
    [remote_view_accessible_
        setTopLevelUIElement:remote_window_accessible_.get()];
diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch
index fe24e81ac7299..34f1f6b50e6aa 100644
--- a/patches/chromium/mas_no_private_api.patch
+++ b/patches/chromium/mas_no_private_api.patch
@@ -166,7 +166,7 @@ index 69e60d498941c34cfac9e79c7517765bf93849f5..b998ad7cf01c21e93c57e1283cfdcb1e
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 2a9cf9620bcc4453a24d48037f0092b6f270806a..6182aac37a7153b9a193565253fe77f9b72db55f 100644
+index d872796dee0dee4aa14c238f788b962b3f1c9311..4d5f74c18d773755d5d8f7223bc0d5c944467d69 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -176,6 +176,12 @@ source_set("audio") {
diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
index 1ef84ebf1677c..1872cac3cff7d 100644
--- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
 session.setCertificateVerifyCallback.
 
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index 33264a4ec00f67345bccbd59c042235a65fdded1..3e0ac81d77b3943a3021381e96f55059e4289a9b 100644
+index 3ee7e8145e8cd0a68680e2044f0fb44d314a4317..f25c1baa5142d53a882b864a67d94e9e0911f0bf 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
 @@ -130,6 +130,11 @@
@@ -128,7 +128,7 @@ index 33264a4ec00f67345bccbd59c042235a65fdded1..3e0ac81d77b3943a3021381e96f55059
  void NetworkContext::CreateURLLoaderFactory(
      mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
      mojom::URLLoaderFactoryParamsPtr params) {
-@@ -2320,6 +2417,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2324,6 +2421,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
          std::move(cert_verifier));
      cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -139,7 +139,7 @@ index 33264a4ec00f67345bccbd59c042235a65fdded1..3e0ac81d77b3943a3021381e96f55059
  
    builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index fe906c8374fee5a4afdd193b8d4a2462c28ce835..07e6cb535bdc9fdc03ae8a115cc3b50d16d2c9b9 100644
+index cc1c9079baed00f6327efe929ab9d004d2272cfb..a9a1beed6c8e59abb9065701f34f155905781a2a 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
 @@ -104,6 +104,7 @@ class URLMatcher;
@@ -150,7 +150,7 @@ index fe906c8374fee5a4afdd193b8d4a2462c28ce835..07e6cb535bdc9fdc03ae8a115cc3b50d
  class CookieManager;
  class ExpectCTReporter;
  class HostResolver;
-@@ -236,6 +237,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -240,6 +241,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    void CreateURLLoaderFactory(
        mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
        mojom::URLLoaderFactoryParamsPtr params) override;
@@ -159,7 +159,7 @@ index fe906c8374fee5a4afdd193b8d4a2462c28ce835..07e6cb535bdc9fdc03ae8a115cc3b50d
    void ResetURLLoaderFactories() override;
    void GetCookieManager(
        mojo::PendingReceiver<mojom::CookieManager> receiver) override;
-@@ -822,6 +825,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -827,6 +830,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
    std::vector<base::OnceClosure> dismount_closures_;
  #endif  // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
  
@@ -169,7 +169,7 @@ index fe906c8374fee5a4afdd193b8d4a2462c28ce835..07e6cb535bdc9fdc03ae8a115cc3b50d
    // CertNetFetcher is not used by the current platform, or if the actual
    // net::CertVerifier is instantiated outside of the network service.
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 99cd0107ab918600970055a542cb753b24264cba..bc63400c5143f13fa8108bc431e08e83725d3b0b 100644
+index e4eec4dde27862507252d6853ec3186400181c95..e47bbfac56cd6c787ba3e7c0518a5326386a19b6 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
 @@ -283,6 +283,17 @@ struct NetworkContextFilePaths {
@@ -190,7 +190,7 @@ index 99cd0107ab918600970055a542cb753b24264cba..bc63400c5143f13fa8108bc431e08e83
  // Parameters for constructing a network context.
  struct NetworkContextParams {
    // The user agent string.
-@@ -848,6 +859,9 @@ interface NetworkContext {
+@@ -851,6 +862,9 @@ interface NetworkContext {
    // Sets a client for this network context.
    SetClient(pending_remote<NetworkContextClient> client);
  
diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch
index 9209f4710b026..ef1fb762c08ec 100644
--- a/patches/chromium/notification_provenance.patch
+++ b/patches/chromium/notification_provenance.patch
@@ -91,10 +91,10 @@ index 41fb02d532190e82d50286e2733a6c3627bf25c8..f19bb5dcb69233733125029d8f997f73
          /*weak_document_ptr=*/WeakDocumentPtr(),
          notification_service_remote_.BindNewPipeAndPassReceiver());
 diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
-index 61ac1d7760432bd1a4118c0929a35168a3e26f49..e2ce4aa910053b1a4fb52fcc1197943af95b02f6 100644
+index fdd74853b9b277d9b47fb99311349b66f70dfa11..06d1f5a8cc7f0ff12e4a7d66b435a19369af126b 100644
 --- a/content/browser/notifications/platform_notification_context_impl.cc
 +++ b/content/browser/notifications/platform_notification_context_impl.cc
-@@ -282,6 +282,7 @@ void PlatformNotificationContextImpl::Shutdown() {
+@@ -283,6 +283,7 @@ void PlatformNotificationContextImpl::Shutdown() {
  
  void PlatformNotificationContextImpl::CreateService(
      RenderProcessHost* render_process_host,
@@ -102,7 +102,7 @@ index 61ac1d7760432bd1a4118c0929a35168a3e26f49..e2ce4aa910053b1a4fb52fcc1197943a
      const url::Origin& origin,
      const GURL& document_url,
      const WeakDocumentPtr& weak_document_ptr,
-@@ -289,7 +290,8 @@ void PlatformNotificationContextImpl::CreateService(
+@@ -290,7 +291,8 @@ void PlatformNotificationContextImpl::CreateService(
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
    services_.push_back(std::make_unique<BlinkNotificationServiceImpl>(
        this, browser_context_, service_worker_context_, render_process_host,
@@ -133,10 +133,10 @@ index 424fae79eb1c93f1fac293ae8fdeb6d067f523cc..6a2f074ad981deb15b46bd91b6d7eb5d
        const GURL& document_url,
        const WeakDocumentPtr& weak_document_ptr,
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index f4d1b2317145ecd14b58bd52cff9de0645b37044..d2fbb44deef7a63cc1f5296d338d518bccab6a7c 100644
+index 18ad9b07e8d6ce33e4f5497aed48269ea49e2b9e..161aefa1d91923be35046dfe735071c687710deb 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2073,8 +2073,9 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2075,8 +2075,9 @@ void RenderProcessHostImpl::CreateNotificationService(
    // For workers:
    if (render_frame_id == MSG_ROUTING_NONE) {
      storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@@ -148,7 +148,7 @@ index f4d1b2317145ecd14b58bd52cff9de0645b37044..d2fbb44deef7a63cc1f5296d338d518b
      return;
    }
  
-@@ -2082,7 +2083,7 @@ void RenderProcessHostImpl::CreateNotificationService(
+@@ -2084,7 +2085,7 @@ void RenderProcessHostImpl::CreateNotificationService(
    RenderFrameHost* rfh = RenderFrameHost::FromID(GetID(), render_frame_id);
    CHECK(rfh);
    storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch
index bf82c0887b174..6db8209177164 100644
--- a/patches/chromium/picture-in-picture.patch
+++ b/patches/chromium/picture-in-picture.patch
@@ -113,7 +113,7 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
    // OverlayWindowViews
    bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
 diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
-index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..9dfdd0288391aac31556c716d24c66d123fbd783 100644
+index 590d247e1136b9ac5f766a613e8d91916eb0dda4..453c358d210d48d21a237654143439f2065e98fe 100644
 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
 +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
 @@ -14,9 +14,11 @@
@@ -126,9 +126,9 @@ index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..9dfdd0288391aac31556c716d24c66d1
  #include "chrome/browser/ui/browser_finder.h"
 +#endif
  #include "chrome/grit/generated_resources.h"
+ #include "chromeos/ui/base/chromeos_ui_constants.h"
  #include "components/vector_icons/vector_icons.h"
- #include "content/public/browser/picture_in_picture_window_controller.h"
-@@ -36,7 +38,7 @@
+@@ -37,7 +39,7 @@
  #include "ui/aura/window.h"
  #endif
  
diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
index f137b04a6e09e..fdd22562281f6 100644
--- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
+++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
@@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them.  This patch can be
 our autofill implementation to work like Chromium's.
 
 diff --git a/ui/color/color_id.h b/ui/color/color_id.h
-index 277c93b46025fc5efa7c9462222bf3704172e035..6683578241804b9634965f96d0d1c1a317b94643 100644
+index 401c319799f6bc97845bd88a3f0211d2d6511274..db0d729b22b8ae22781b15de00507f14cc669b83 100644
 --- a/ui/color/color_id.h
 +++ b/ui/color/color_id.h
 @@ -129,6 +129,16 @@
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
index ff4a4d114645c..07f0ca2501605 100644
--- a/patches/chromium/printing.patch
+++ b/patches/chromium/printing.patch
@@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 32902c0b0c7fa1f1b4371f1bee24c364a4ff89e2..0c9b25af67c7b44b8e839e8839a3ea0ca8b03202 100644
+index 645819d78ca8526340714f05acc9f1819e72c4e3..86f6cfd19586f1d352d6a91c3d76b7323ccf26fe 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -973,7 +973,6 @@ if (is_win) {
+@@ -987,7 +987,6 @@ if (is_win) {
        "//media:media_unittests",
        "//media/midi:midi_unittests",
        "//net:net_unittests",
@@ -22,7 +22,7 @@ index 32902c0b0c7fa1f1b4371f1bee24c364a4ff89e2..0c9b25af67c7b44b8e839e8839a3ea0c
        "//sql:sql_unittests",
        "//third_party/breakpad:symupload($host_toolchain)",
        "//ui/base:ui_base_unittests",
-@@ -982,6 +981,10 @@ if (is_win) {
+@@ -996,6 +995,10 @@ if (is_win) {
        "//ui/views:views_unittests",
        "//url:url_unittests",
      ]
@@ -78,7 +78,7 @@ index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dc
                 : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
    }
 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
-index ab2f824eb77ae4c8a916d57914120544bec70ec5..8eef429cf3ea613e83dc408d93faa8d2661cf5db 100644
+index f0d4596f0e95391e752c48dc6ac12f76397c27f1..b7313ce8037c88aa5b8826dc2edcb0dfa4ebee46 100644
 --- a/chrome/browser/printing/print_job_worker.cc
 +++ b/chrome/browser/printing/print_job_worker.cc
 @@ -20,7 +20,6 @@
@@ -97,7 +97,7 @@ index ab2f824eb77ae4c8a916d57914120544bec70ec5..8eef429cf3ea613e83dc408d93faa8d2
  #include "printing/backend/print_backend.h"
  #include "printing/buildflags/buildflags.h"
  #include "printing/mojom/print.mojom.h"
-@@ -209,16 +209,19 @@ void PrintJobWorker::SetSettings(base::Value::Dict new_settings,
+@@ -208,16 +208,19 @@ void PrintJobWorker::SetSettings(base::Value::Dict new_settings,
  #endif  // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
    }
  
@@ -134,7 +134,7 @@ index 398d59a0ebad165981e9e96b29ffc672e4b841eb..e420d87ef0e90cddb740ac4b24f92519
  
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212b98a2b15 100644
+index 8f4cb7f50dd34c4ef49022242c4b93d703a508a2..d9183b6c1d84a4685f38e84071eb25f26cd28867 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,8 +30,6 @@
@@ -146,7 +146,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  #include "chrome/common/pref_names.h"
  #include "chrome/grit/generated_resources.h"
  #include "components/prefs/pref_service.h"
-@@ -86,10 +84,23 @@ namespace printing {
+@@ -82,10 +80,23 @@ namespace printing {
  
  namespace {
  
@@ -170,7 +170,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    // Runs always on the UI thread.
    static bool is_dialog_shown = false;
    if (is_dialog_shown)
-@@ -98,6 +109,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
+@@ -94,6 +105,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
    base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
  
    chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
@@ -178,7 +178,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  }
  
  void OnDidGetDefaultPrintSettings(
-@@ -147,7 +159,9 @@ void OnDidUpdatePrintSettings(
+@@ -143,7 +155,9 @@ void OnDidUpdatePrintSettings(
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    DCHECK(printer_query);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -189,7 +189,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
      RenderParamsFromPrintSettings(printer_query->settings(),
                                    params->params.get());
      params->params->document_cookie = printer_query->cookie();
-@@ -175,6 +189,7 @@ void OnDidScriptedPrint(
+@@ -171,6 +185,7 @@ void OnDidScriptedPrint(
      mojom::PrintManagerHost::ScriptedPrintCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
    mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
@@ -197,7 +197,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
        printer_query->settings().dpi()) {
      RenderParamsFromPrintSettings(printer_query->settings(),
-@@ -184,7 +199,8 @@ void OnDidScriptedPrint(
+@@ -180,7 +195,8 @@ void OnDidScriptedPrint(
    }
    bool has_valid_cookie = params->params->document_cookie;
    bool has_dpi = !params->params->dpi.IsEmpty();
@@ -207,7 +207,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  
    if (has_dpi && has_valid_cookie) {
      queue->QueuePrinterQuery(std::move(printer_query));
-@@ -199,12 +215,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
+@@ -195,12 +211,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
      : PrintManager(web_contents),
        queue_(g_browser_process->print_job_manager()->queue()) {
    DCHECK(queue_);
@@ -222,7 +222,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  }
  
  PrintViewManagerBase::~PrintViewManagerBase() {
-@@ -212,7 +230,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
+@@ -208,7 +226,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
    DisconnectFromCurrentPrintJob();
  }
  
@@ -234,17 +234,17 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
    // is still valid after a possible inner message loop runs in
    // `DisconnectFromCurrentPrintJob()`.
-@@ -240,6 +261,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
+@@ -236,6 +257,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
  #endif
  
    SetPrintingRFH(rfh);
 +  callback_ = std::move(callback);
 +
 +  GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
- 
- #if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
-   enterprise_connectors::ContentAnalysisDelegate::Data scanning_data;
-@@ -452,7 +476,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
+   CompletePrintNow(rfh);
+   return true;
+ }
+@@ -395,7 +419,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
  void PrintViewManagerBase::ScriptedPrintReply(
      ScriptedPrintCallback callback,
      int process_id,
@@ -254,7 +254,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
-@@ -467,8 +492,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
+@@ -410,8 +435,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
      return;
    }
  
@@ -267,7 +267,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  }
  
  void PrintViewManagerBase::UpdatePrintingEnabled() {
-@@ -476,8 +504,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
+@@ -419,8 +447,7 @@ void PrintViewManagerBase::UpdatePrintingEnabled() {
    // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
    web_contents()->GetPrimaryMainFrame()->ForEachRenderFrameHost(
        base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
@@ -277,7 +277,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  }
  
  void PrintViewManagerBase::NavigationStopped() {
-@@ -593,11 +620,14 @@ void PrintViewManagerBase::DidPrintDocument(
+@@ -536,11 +563,14 @@ void PrintViewManagerBase::DidPrintDocument(
  void PrintViewManagerBase::GetDefaultPrintSettings(
      GetDefaultPrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -292,7 +292,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  #if BUILDFLAG(ENABLE_OOP_PRINTING)
    if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
        !service_manager_client_id_.has_value()) {
-@@ -635,18 +665,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -578,18 +608,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
      base::Value::Dict job_settings,
      UpdatePrintSettingsCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -314,7 +314,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    content::BrowserContext* context =
        web_contents() ? web_contents()->GetBrowserContext() : nullptr;
    PrefService* prefs =
-@@ -656,6 +688,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
+@@ -599,6 +631,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
      if (value > 0)
        job_settings.Set(kSettingRasterizePdfDpi, value);
    }
@@ -322,7 +322,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  
    auto callback_wrapper =
        base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
-@@ -687,14 +720,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
+@@ -630,14 +663,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
      // didn't happen for some reason.
      bad_message::ReceivedBadMessage(
          render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@@ -339,7 +339,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
      return;
    }
  #endif
-@@ -732,7 +765,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
+@@ -675,7 +708,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
    PrintManager::PrintingFailed(cookie, reason);
  
  #if !BUILDFLAG(IS_ANDROID)  // Android does not implement this function.
@@ -347,7 +347,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  #endif
  
    ReleasePrinterQuery();
-@@ -747,6 +779,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
+@@ -690,6 +722,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
  }
  
  void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
@@ -359,7 +359,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    base::ThreadTaskRunnerHandle::Get()->PostTask(
        FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
                                  l10n_util::GetStringUTF16(
-@@ -757,10 +794,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
+@@ -700,10 +737,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
      content::RenderFrameHost* render_frame_host,
      content::RenderFrameHost::LifecycleState /*old_state*/,
      content::RenderFrameHost::LifecycleState new_state) {
@@ -372,7 +372,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
  }
  
  void PrintViewManagerBase::DidStartLoading() {
-@@ -821,7 +860,12 @@ void PrintViewManagerBase::OnJobDone() {
+@@ -759,7 +798,12 @@ void PrintViewManagerBase::OnJobDone() {
    // Printing is done, we don't need it anymore.
    // print_job_->is_job_pending() may still be true, depending on the order
    // of object registration.
@@ -386,7 +386,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    ReleasePrintJob();
  }
  
-@@ -835,7 +879,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
+@@ -773,7 +817,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
  
    // Is the document already complete?
    if (print_job_->document() && print_job_->document()->IsComplete()) {
@@ -395,7 +395,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
      return true;
    }
  
-@@ -883,7 +927,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -821,7 +865,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  
    // Disconnect the current `print_job_`.
    auto weak_this = weak_ptr_factory_.GetWeakPtr();
@@ -407,7 +407,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    if (!weak_this)
      return false;
  
-@@ -904,7 +951,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
+@@ -842,7 +889,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
  #endif
    print_job_->AddObserver(*this);
  
@@ -416,7 +416,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    return true;
  }
  
-@@ -964,6 +1011,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -902,6 +949,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
    }
  #endif
  
@@ -428,7 +428,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    if (!print_job_)
      return;
  
-@@ -971,7 +1023,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
+@@ -909,7 +961,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
      // printing_rfh_ should only ever point to a RenderFrameHost with a live
      // RenderFrame.
      DCHECK(rfh->IsRenderFrameLive());
@@ -437,7 +437,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    }
  
    print_job_->RemoveObserver(*this);
-@@ -1013,7 +1065,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
+@@ -951,7 +1003,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
  }
  
  bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@@ -446,7 +446,7 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
      return true;
  
    if (!cookie) {
-@@ -1121,7 +1173,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
+@@ -1059,7 +1111,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
  }
  
  void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@@ -456,10 +456,10 @@ index 8a17d3bf5a7fe924d5e562589864747e294931d1..5b270a41efb53bef55cbcb65ca655212
    for (auto& observer : GetObservers())
      observer.OnPrintNow(rfh);
 diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
-index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187845e6a75 100644
+index 871e00c49028ccf58d207f904c22e0107f3c2b65..c9b136ab165410eb533f84254454dac0b6674f14 100644
 --- a/chrome/browser/printing/print_view_manager_base.h
 +++ b/chrome/browser/printing/print_view_manager_base.h
-@@ -43,6 +43,8 @@ namespace printing {
+@@ -42,6 +42,8 @@ namespace printing {
  class PrintQueriesQueue;
  class PrinterQuery;
  
@@ -468,7 +468,7 @@ index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187
  // Base class for managing the print commands for a WebContents.
  class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
   public:
-@@ -70,7 +72,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -65,7 +67,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Prints the current document immediately. Since the rendering is
    // asynchronous, the actual printing will not be completed on the return of
    // this function. Returns false if printing is impossible at the moment.
@@ -480,7 +480,7 @@ index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Prints the document in `print_data` with settings specified in
-@@ -128,6 +133,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -123,6 +128,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    void ShowInvalidPrinterSettingsError() override;
    void PrintingFailed(int32_t cookie,
                        mojom::PrintFailureReason reason) override;
@@ -488,7 +488,7 @@ index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187
  
    // Adds and removes observers for `PrintViewManagerBase` events. The order in
    // which notifications are sent to observers is undefined. Observers must be
-@@ -135,6 +141,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -130,6 +136,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    void AddObserver(Observer& observer);
    void RemoveObserver(Observer& observer);
  
@@ -503,7 +503,7 @@ index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187
   protected:
    explicit PrintViewManagerBase(content::WebContents* web_contents);
  
-@@ -256,7 +270,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -251,7 +265,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // Runs `callback` with `params` to reply to ScriptedPrint().
    void ScriptedPrintReply(ScriptedPrintCallback callback,
                            int process_id,
@@ -513,7 +513,7 @@ index f146d74541cae93a957c5b2596a005e25c20f7cf..120f2bb8b27f814c4f7dc93cef7fb187
  
    // Requests the RenderView to render all the missing pages for the print job.
    // No-op if no print job is pending. Returns true if at least one page has
-@@ -336,8 +351,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
+@@ -324,8 +339,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
    // The current RFH that is printing with a system printing dialog.
    raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
  
@@ -575,7 +575,7 @@ index 95d9f19082978772297cff1bcd9c5f73db50bd62..96fe7fbb54fe0908e2153d901c130b6a
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86bc0e0f90 100644
+index 2331b4db94bb6397616dc230498960860554787f..ade741255b9e0274252121ecc2ec68697429c8ad 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -586,7 +586,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
  #include "printing/units.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
  #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
-@@ -1282,7 +1283,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
+@@ -1283,7 +1284,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
      if (!weak_this)
        return;
  
@@ -596,7 +596,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
      if (!weak_this)
        return;
  
-@@ -1313,7 +1315,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
+@@ -1314,7 +1316,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
    receivers_.Add(this, std::move(receiver));
  }
  
@@ -605,7 +605,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
    ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
-@@ -1328,7 +1330,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
+@@ -1329,7 +1331,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
    // plugin node and print that instead.
    auto plugin = delegate_->GetPdfElement(frame);
  
@@ -614,7 +614,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
  
    if (!render_frame_gone_)
      frame->DispatchAfterPrintEvent();
-@@ -1405,7 +1407,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
+@@ -1406,7 +1408,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
    }
  
    Print(frame, print_preview_context_.source_node(),
@@ -624,7 +624,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
    if (!render_frame_gone_)
      print_preview_context_.DispatchAfterPrintEvent();
    // WARNING: |this| may be gone at this point. Do not do any more work here and
-@@ -1454,6 +1457,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
+@@ -1455,6 +1458,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
    if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
      return;
  
@@ -633,7 +633,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
    print_preview_context_.OnPrintPreview();
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -2066,7 +2071,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2067,7 +2072,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
        return;
  
      Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@@ -643,7 +643,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
      // Check if |this| is still valid.
      if (!weak_this)
        return;
-@@ -2081,7 +2087,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
+@@ -2082,7 +2088,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
  
  void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
                                     const blink::WebNode& node,
@@ -654,7 +654,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
    // If still not finished with earlier print request simply ignore.
    if (prep_frame_view_)
      return;
-@@ -2089,7 +2097,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2090,7 +2098,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
    FrameReference frame_ref(frame);
  
    uint32_t expected_page_count = 0;
@@ -663,7 +663,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
      DidFinishPrinting(FAIL_PRINT_INIT);
      return;  // Failed to init print page settings.
    }
-@@ -2108,8 +2116,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
+@@ -2109,8 +2117,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
          print_pages_params_->params->print_scaling_option;
  
      auto self = weak_ptr_factory_.GetWeakPtr();
@@ -680,7 +680,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
      // Check if |this| is still valid.
      if (!self)
        return;
-@@ -2374,36 +2389,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
+@@ -2375,36 +2390,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
    }
  }
  
@@ -745,7 +745,7 @@ index fe8cd8bc27b1e955b177c7952ccb862faf0f228b..d5a2a9a8452b925a693335547d193a86
      notify_browser_of_print_failure_ = false;
      GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
      return false;
-@@ -2528,7 +2559,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
+@@ -2529,7 +2560,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
        std::move(params),
        base::BindOnce(
            [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@@ -796,10 +796,10 @@ index 66026548181a897c161d7202646f33fd8847ccb8..113a8165b5db6294087773e5a4b2f003
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
    // Set options for print preset from source PDF document.
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 0704a34a2fc4afdf618004d5bee69a7777cc3491..47edb94bd9078364fb03f35849b389a6b2992922 100644
+index 993ec8acd401d5ccb1e07652c28f6f0a1d89c6bc..638dbd46cb572274a17b0c06ed3db0cf7b614b7f 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2783,8 +2783,9 @@ source_set("browser") {
+@@ -2802,8 +2802,9 @@ source_set("browser") {
        "//ppapi/shared_impl",
      ]
  
@@ -812,7 +812,7 @@ index 0704a34a2fc4afdf618004d5bee69a7777cc3491..47edb94bd9078364fb03f35849b389a6
      if (is_chromeos) {
        sources += [
 diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
-index 2ae5fc805ccbd81448d3b9d5aa482bcfd7a747f8..b2ed764463f977bd242d9da79270244062c210d6 100644
+index e7f5b062791f6b2b94943c88d487757f2d77c7c5..f69ed3d412caa7254cfbea85a5448770a42b537d 100644
 --- a/content/browser/utility_sandbox_delegate_win.cc
 +++ b/content/browser/utility_sandbox_delegate_win.cc
 @@ -95,6 +95,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetPolicy* policy) {
@@ -828,9 +828,9 @@ index 2ae5fc805ccbd81448d3b9d5aa482bcfd7a747f8..b2ed764463f977bd242d9da792702440
    return true;
  }
 +#endif
- }  // namespace
  
- std::string UtilitySandboxedProcessLauncherDelegate::GetSandboxTag() {
+ std::string UtilityAppContainerId(base::CommandLine& cmd_line) {
+   return base::WideToUTF8(cmd_line.GetProgram().value());
 diff --git a/printing/printing_context.cc b/printing/printing_context.cc
 index 6cca846b9831da669ca52aff776caf5a23f6f4d1..39d1032f276181a535de9fba89c2246c7a9814d7 100644
 --- a/printing/printing_context.cc
diff --git a/patches/chromium/process_singleton.patch b/patches/chromium/process_singleton.patch
index f91220b02b3ec..958b5d49d399c 100644
--- a/patches/chromium/process_singleton.patch
+++ b/patches/chromium/process_singleton.patch
@@ -24,10 +24,10 @@ This patch adds a few changes to the Chromium code:
    before the browser thread is ready.
 
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
-index aca2f19f53657fc2b944b69418e099b056c8e734..e43b0d89e2e6ad0bcb2c34bfacc4ef3b59eaaab1 100644
+index c29925908862930061f63e9f02d614b8a8a7980d..5ce3a8dd6366093ac5d09bab8b1774b8771faea8 100644
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1424,7 +1424,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1421,7 +1421,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
    switch (notify_result_) {
      case ProcessSingleton::PROCESS_NONE:
        // No process already running, fall through to starting a new one.
diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
index 7cc9d0f959433..afee0cfa345d2 100644
--- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
+++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -30,10 +30,10 @@ index bdad25cd2c823fa2125fc523c400479882735ae6..bf2ddb136274eb3e4e597ed3060aabca
    // RenderWidgetHost on the primary main frame, and false otherwise.
    virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 25a80899f9ae533e2d84e99076696468cef6e56d..e8a3a0525bea6185f4d7ef94edc99d5e6f060787 100644
+index 457ba67603442e8ae9ea75be1cb3b4bf32ed4c4f..50680346b1db4c687d9d956fd3a13adbbd27e65a 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -2075,6 +2075,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
+@@ -2076,6 +2076,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
  void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
    if (view_)
      view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 25a80899f9ae533e2d84e99076696468cef6e56d..e8a3a0525bea6185f4d7ef94edc99d5e
  
  void RenderWidgetHostImpl::ShowContextMenuAtPoint(
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 9a0edcadef1bc60b035ca67df5082a7d06dd4436..a2f1f72a30f694d53f28d38d823341e7b4f008e1 100644
+index 2b393e7e7089d17a0906610c3c8979c20928a5f6..47b85a2bd890485dec96e23fb2cb8f8553f5c4e2 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4593,6 +4593,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
+@@ -4609,6 +4609,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
    return text_input_manager_.get();
  }
  
@@ -59,10 +59,10 @@ index 9a0edcadef1bc60b035ca67df5082a7d06dd4436..a2f1f72a30f694d53f28d38d823341e7
      RenderWidgetHostImpl* render_widget_host) {
    return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
 diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
-index 3221d31d311c74f32f77fed34d53721017cac5e3..864c0a9b7072b6c3ac6584ed35a833dd6afb9e34 100644
+index 91dd718d313ee66bfeea3c0a08e5d2ec3e38b133..892efd5009b0a0ef00081bd765d20c46d68b2324 100644
 --- a/content/browser/web_contents/web_contents_impl.h
 +++ b/content/browser/web_contents/web_contents_impl.h
-@@ -967,6 +967,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
+@@ -974,6 +974,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
    void SendScreenRects() override;
    void SendActiveState(bool active) override;
    TextInputManager* GetTextInputManager() override;
@@ -71,7 +71,7 @@ index 3221d31d311c74f32f77fed34d53721017cac5e3..864c0a9b7072b6c3ac6584ed35a833dd
        RenderWidgetHostImpl* render_widget_host) override;
    bool IsShowingContextMenuOnPage() const override;
 diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
-index af8a777096c1202b3742d328c02e9e957389fc1e..3a3359865bcedecfa946d517dd50b299172958c9 100644
+index bea8d6a0d6ac44c56132bc7e3745c5c154a02e79..e3fc1e633a9803eee837acbf6434fc6471d5c067 100644
 --- a/content/public/browser/web_contents_observer.h
 +++ b/content/public/browser/web_contents_observer.h
 @@ -13,6 +13,7 @@
diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch
index 334712e8f5286..0726ac0addf00 100644
--- a/patches/chromium/render_widget_host_view_base.patch
+++ b/patches/chromium/render_widget_host_view_base.patch
@@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
 ... something to do with OSR? and maybe <webview> as well? terrifying.
 
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
-index eefdd87f1f85ac62079e97f1a7736234952d419c..f2b1959f7650ecd98ed2db870d1c723a78f6e1c1 100644
+index 999eeb6fc817a3898b2227fd58aa1ecc660f21a3..8c51cd22fef29fe3e647b80e951af4cf7d9e4637 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
-@@ -703,6 +703,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
+@@ -705,6 +705,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
    return false;
  }
  
@@ -24,7 +24,7 @@ index eefdd87f1f85ac62079e97f1a7736234952d419c..f2b1959f7650ecd98ed2db870d1c723a
      const blink::WebMouseEvent& event,
      const ui::LatencyInfo& latency) {
 diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
-index 4174581cda568c887e34c2e2b29edf5ef6e2a092..770599358ca8badf180e249410ba71016d60ab99 100644
+index f3a4f3961b543be0787b9f6ace585ce614e3c23e..5f112610fa0815f58436c54c9631b59ddf8606db 100644
 --- a/content/browser/renderer_host/render_widget_host_view_base.h
 +++ b/content/browser/renderer_host/render_widget_host_view_base.h
 @@ -26,8 +26,10 @@
@@ -38,7 +38,7 @@ index 4174581cda568c887e34c2e2b29edf5ef6e2a092..770599358ca8badf180e249410ba7101
  #include "content/public/browser/render_widget_host_view.h"
  #include "content/public/common/page_visibility_state.h"
  #include "content/public/common/widget_type.h"
-@@ -67,9 +69,11 @@ class CursorManager;
+@@ -68,9 +70,11 @@ class CursorManager;
  class MouseWheelPhaseHandler;
  class RenderWidgetHostImpl;
  class RenderWidgetHostViewBaseObserver;
@@ -50,7 +50,7 @@ index 4174581cda568c887e34c2e2b29edf5ef6e2a092..770599358ca8badf180e249410ba7101
  class WebCursor;
  class WebContentsAccessibility;
  class DelegatedFrameHost;
-@@ -146,6 +150,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -147,6 +151,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
        const gfx::Rect& keyboard_rect) override {}
    bool IsHTMLFormPopup() const override;
  
@@ -60,7 +60,7 @@ index 4174581cda568c887e34c2e2b29edf5ef6e2a092..770599358ca8badf180e249410ba7101
    // This only needs to be overridden by RenderWidgetHostViewBase subclasses
    // that handle content embedded within other RenderWidgetHostViews.
    gfx::PointF TransformPointToRootCoordSpaceF(
-@@ -308,6 +315,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
+@@ -315,6 +322,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
    virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
                                     const ui::LatencyInfo& latency);
  
diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch
index 9fb935ca29a76..fc700f5317d69 100644
--- a/patches/chromium/render_widget_host_view_mac.patch
+++ b/patches/chromium/render_widget_host_view_mac.patch
@@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
 Additionally, disables usage of some private APIs in MAS builds.
 
 diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
-index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3b7e5c7a7 100644
+index e26ed62d252e27792d3f2813b502ac93f723a5c2..87b977a5da2334c1494402f81588d0a3fcd8c7a0 100644
 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
 @@ -157,6 +157,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -29,7 +29,7 @@ index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3
  // RenderWidgetHostViewCocoa ---------------------------------------------------
  
  // Private methods:
-@@ -597,6 +606,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
+@@ -598,6 +607,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
  }
  
  - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@@ -39,7 +39,7 @@ index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3
    return [self acceptsMouseEventsWhenInactive];
  }
  
-@@ -673,6 +685,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
+@@ -674,6 +686,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
    // its parent view.
    BOOL hitSelf = NO;
    while (view) {
@@ -50,7 +50,7 @@ index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3
      if (view == self)
        hitSelf = YES;
      if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
-@@ -992,6 +1008,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
+@@ -993,6 +1009,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
                                eventType == NSEventTypeKeyDown &&
                                !(modifierFlags & NSEventModifierFlagCommand);
  
@@ -61,7 +61,7 @@ index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3
    // We only handle key down events and just simply forward other events.
    if (eventType != NSEventTypeKeyDown) {
      _hostHelper->ForwardKeyboardEvent(event, latency_info);
-@@ -1812,9 +1832,11 @@ - (NSAccessibilityRole)accessibilityRole {
+@@ -1813,9 +1833,11 @@ - (NSAccessibilityRole)accessibilityRole {
  // Since this implementation doesn't have to wait any IPC calls, this doesn't
  // make any key-typing jank. --hbono 7/23/09
  //
@@ -73,7 +73,7 @@ index e4246c858efdd4d0a6060fd497081e0895a46e20..3f489f6563407ed484df1526bcec35b3
  
  - (NSArray*)validAttributesForMarkedText {
    // This code is just copied from WebKit except renaming variables.
-@@ -1823,7 +1845,10 @@ - (NSArray*)validAttributesForMarkedText {
+@@ -1824,7 +1846,10 @@ - (NSArray*)validAttributesForMarkedText {
          initWithObjects:NSUnderlineStyleAttributeName,
                          NSUnderlineColorAttributeName,
                          NSMarkedClauseSegmentAttributeName,
diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch
index 15c40e58c1027..3638b1d443987 100644
--- a/patches/chromium/resource_file_conflict.patch
+++ b/patches/chromium/resource_file_conflict.patch
@@ -52,10 +52,10 @@ Some alternatives to this patch:
 None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
 
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 6042493f09bfefb8b0eaad16588acbae984a3dad..31d63709bd68819a439901823b6649e4328244f8 100644
+index aee9abd99a03ad2266e2fcd15c680ae3b97e9dc3..0223183c4e869e835429a52ad7d9eb381a2d21f5 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -1546,7 +1546,7 @@ if (is_chrome_branded && !is_android) {
+@@ -1547,7 +1547,7 @@ if (is_chrome_branded && !is_android) {
    }
  }
  
@@ -64,7 +64,7 @@ index 6042493f09bfefb8b0eaad16588acbae984a3dad..31d63709bd68819a439901823b6649e4
    chrome_paks("packed_resources") {
      if (is_mac) {
        output_dir = "$root_gen_dir/repack"
-@@ -1575,6 +1575,12 @@ if (!is_android) {
+@@ -1576,6 +1576,12 @@ if (!is_android) {
    }
  }
  
diff --git a/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch b/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
index 133baa6af9698..02dc352163d6c 100644
--- a/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
+++ b/patches/chromium/revert_spellcheck_fully_launch_spell_check_delayed_initialization.patch
@@ -10,10 +10,10 @@ can be reverted when those failures are addressed. It's unlikely
 that this patch will be upstreamed.
 
 diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
-index 72f8e9251df63db8ebebad9a5b682add91340e79..89361e9e8ea4e73c571d3960123030c0011a129d 100644
+index 328574de32fb02f014433b1005d5aa625e498d9f..5cdc5a8c67688747ff3b5323c42e4605ab613347 100644
 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
 +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
-@@ -302,26 +302,7 @@ TEST_F(LanguageSettingsPrivateApiTest, GetNeverTranslateLanguagesListTest) {
+@@ -297,26 +297,7 @@ TEST_F(LanguageSettingsPrivateApiTest, GetNeverTranslateLanguagesListTest) {
    }
  }
  
diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch
index 3b4aba5a4d8b0..b674f5fe65211 100644
--- a/patches/chromium/scroll_bounce_flag.patch
+++ b/patches/chromium/scroll_bounce_flag.patch
@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
 Patch to make scrollBounce option work.
 
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
-index 14985e39b792e931a9884ae95b8d550776520478..d6c104b05471161901e76051e6ec0d1059aa2dd1 100644
+index a15cfb291dea69d78bad2b4726b013d8a636a361..50c1d506d20be94d89f7c33fe3efb4bd30fb2305 100644
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1282,7 +1282,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
+@@ -1285,7 +1285,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
  }
  
  bool RenderThreadImpl::IsElasticOverscrollEnabled() {
diff --git a/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
index 82cc6601cc08a..a47563743be14 100644
--- a/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
+++ b/patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
@@ -15,26 +15,25 @@ short-circuit all the permissions checks in MSDC for now to allow us to
 unduplicate this code.
 
 diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
-index 13bbeaac938b27446d5b62eb92ca761487db5fef..4cfe57a6356bbc2492f59957a0dfcf63052b7ee8 100644
+index 71eb2eda28d4d0d5dd9a1ad37309dd27caa69ccf..88a1d29ded5630a484106e6638921c6d279778d7 100644
 --- a/components/webrtc/media_stream_devices_controller.cc
 +++ b/components/webrtc/media_stream_devices_controller.cc
-@@ -93,11 +93,14 @@ void MediaStreamDevicesController::RequestPermissions(
+@@ -92,10 +92,12 @@ void MediaStreamDevicesController::RequestPermissions(
  
    std::vector<blink::PermissionType> permission_types;
  
 +#if 0
-   permissions::PermissionManager* permission_manager =
-       permissions::PermissionsClient::Get()->GetPermissionManager(
-           web_contents->GetBrowserContext());
+   content::PermissionController* permission_controller =
+       web_contents->GetBrowserContext()->GetPermissionController();
+-
 +#endif
- 
    if (controller->ShouldRequestAudio()) {
 +#if 0
-     permissions::PermissionResult permission_status =
-         permission_manager->GetPermissionStatusForCurrentDocument(
-             ContentSettingsType::MEDIASTREAM_MIC, rfh);
-@@ -109,10 +112,12 @@ void MediaStreamDevicesController::RequestPermissions(
-           permissions::PermissionStatusSource::FEATURE_POLICY);
+     content::PermissionResult permission_status =
+         permission_controller->GetPermissionResultForCurrentDocument(
+             blink::PermissionType::AUDIO_CAPTURE, rfh);
+@@ -106,10 +108,12 @@ void MediaStreamDevicesController::RequestPermissions(
+                               content::PermissionStatusSource::FEATURE_POLICY);
        return;
      }
 +#endif
@@ -43,26 +42,26 @@ index 13bbeaac938b27446d5b62eb92ca761487db5fef..4cfe57a6356bbc2492f59957a0dfcf63
    }
    if (controller->ShouldRequestVideo()) {
 +#if 0
-     permissions::PermissionResult permission_status =
-         permission_manager->GetPermissionStatusForCurrentDocument(
-             ContentSettingsType::MEDIASTREAM_CAMERA, rfh);
-@@ -124,6 +129,7 @@ void MediaStreamDevicesController::RequestPermissions(
-           permissions::PermissionStatusSource::FEATURE_POLICY);
+     content::PermissionResult permission_status =
+         permission_controller->GetPermissionResultForCurrentDocument(
+             blink::PermissionType::VIDEO_CAPTURE, rfh);
+@@ -120,6 +124,7 @@ void MediaStreamDevicesController::RequestPermissions(
+                               content::PermissionStatusSource::FEATURE_POLICY);
        return;
      }
 +#endif
  
      permission_types.push_back(blink::PermissionType::VIDEO_CAPTURE);
  
-@@ -135,6 +141,7 @@ void MediaStreamDevicesController::RequestPermissions(
+@@ -131,6 +136,7 @@ void MediaStreamDevicesController::RequestPermissions(
      // pan-tilt-zoom permission and there are suitable PTZ capable devices
      // available.
      if (request.request_pan_tilt_zoom_permission && has_pan_tilt_zoom_camera) {
 +#if 0
        permission_status =
-           permission_manager->GetPermissionStatusForCurrentDocument(
-               ContentSettingsType::CAMERA_PAN_TILT_ZOOM, rfh);
-@@ -144,6 +151,7 @@ void MediaStreamDevicesController::RequestPermissions(
+           permission_controller->GetPermissionResultForCurrentDocument(
+               blink::PermissionType::CAMERA_PAN_TILT_ZOOM, rfh);
+@@ -140,6 +146,7 @@ void MediaStreamDevicesController::RequestPermissions(
          controller->RunCallback(/*blocked_by_permissions_policy=*/false);
          return;
        }
@@ -70,16 +69,16 @@ index 13bbeaac938b27446d5b62eb92ca761487db5fef..4cfe57a6356bbc2492f59957a0dfcf63
  
        permission_types.push_back(blink::PermissionType::CAMERA_PAN_TILT_ZOOM);
      }
-@@ -417,6 +425,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
-   if (rfh->GetLastCommittedOrigin().GetURL() != request_.security_origin) {
-     return false;
-   }
+@@ -428,6 +435,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+ 
+   // TODO(raymes): This function wouldn't be needed if
+   // PermissionManager::RequestPermissions returned a denial reason.
 +#if 0
-   permissions::PermissionResult result =
-       permissions::PermissionsClient::Get()
-           ->GetPermissionManager(web_contents_->GetBrowserContext())
-@@ -425,6 +434,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
-     DCHECK_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+   content::PermissionResult result =
+       web_contents_->GetBrowserContext()
+           ->GetPermissionController()
+@@ -436,6 +444,7 @@ bool MediaStreamDevicesController::PermissionIsBlockedForReason(
+     DCHECK_EQ(blink::mojom::PermissionStatus::DENIED, result.status);
      return true;
    }
 +#endif
diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch
index de9a6514f7b84..7ed514ab08de2 100644
--- a/patches/chromium/support_mixed_sandbox_with_zygote.patch
+++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch
@@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
 does touch a security-sensitive class.
 
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
-index d2fbb44deef7a63cc1f5296d338d518bccab6a7c..7bb696c3ad090828b2a7e3a9a648b75bbf39f844 100644
+index 161aefa1d91923be35046dfe735071c687710deb..368d47247ced2320e0627e9cce3cf05e59ea9f39 100644
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1762,9 +1762,15 @@ bool RenderProcessHostImpl::Init() {
+@@ -1764,9 +1764,15 @@ bool RenderProcessHostImpl::Init() {
      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
              cmd_line.get(), IsJitDisabled());
diff --git a/patches/chromium/sysroot.patch b/patches/chromium/sysroot.patch
index 715b58b173cd0..e4fac7f0441b5 100644
--- a/patches/chromium/sysroot.patch
+++ b/patches/chromium/sysroot.patch
@@ -7,7 +7,7 @@ Make chrome's install-sysroot scripts point to our custom sysroot builds,
 which include extra deps that Electron needs (e.g. libnotify)
 
 diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
-index eaa1c2edfd6fba471312fdb4eb3917b50e38e018..74140d29ed56ce54e39940e7bffa3778db983f27 100755
+index abd7eb4a8d116075751bcf6e44f872bac83431ef..54c01f56ac3f17b4534b6e89d9f8c4ba3bd79bf9 100755
 --- a/build/linux/sysroot_scripts/install-sysroot.py
 +++ b/build/linux/sysroot_scripts/install-sysroot.py
 @@ -41,9 +41,11 @@ except ImportError:
diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch
index eb23dbf6cc5af..1b5ecfb240dbc 100644
--- a/patches/chromium/web_contents.patch
+++ b/patches/chromium/web_contents.patch
@@ -9,10 +9,10 @@ is needed for OSR.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 7ff6febe70e9ec82becfbe036883fbc7572b5b01..2a3c04df4f6f44d2cf75b661761c91d66cdc7ba4 100644
+index 7f04a05eec8780e735e0458c75103d9f2e9b858b..2aa24b773a974e7789c661a0ffa5e01715c6e229 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3073,6 +3073,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3089,6 +3089,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
        site_instance.get(), params.renderer_initiated_creation,
        params.main_frame_name, GetOpener(), primary_main_frame_policy);
  
@@ -26,7 +26,7 @@ index 7ff6febe70e9ec82becfbe036883fbc7572b5b01..2a3c04df4f6f44d2cf75b661761c91d6
    std::unique_ptr<WebContentsViewDelegate> delegate =
        GetContentClient()->browser()->GetWebContentsViewDelegate(this);
  
-@@ -3083,6 +3090,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
+@@ -3099,6 +3106,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
      view_ = CreateWebContentsView(this, std::move(delegate),
                                    &render_view_host_delegate_view_);
    }
@@ -35,7 +35,7 @@ index 7ff6febe70e9ec82becfbe036883fbc7572b5b01..2a3c04df4f6f44d2cf75b661761c91d6
    CHECK(view_.get());
  
 diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
-index f07dd54c9498e677e4b3e6a24cb9d794f4465e93..f92bcc8f2a212e6cda464d9b6060a561d689f467 100644
+index 024cd37e818e1c508cf2a8e324478235444f16ed..a389a9c41f96ec3231b62510cde140c52dcdbe9e 100644
 --- a/content/public/browser/web_contents.h
 +++ b/content/public/browser/web_contents.h
 @@ -94,10 +94,13 @@ class BrowserContext;
@@ -52,7 +52,7 @@ index f07dd54c9498e677e4b3e6a24cb9d794f4465e93..f92bcc8f2a212e6cda464d9b6060a561
  class WebUI;
  struct DropData;
  struct MHTMLGenerationParams;
-@@ -236,6 +239,10 @@ class WebContents : public PageNavigator,
+@@ -237,6 +240,10 @@ class WebContents : public PageNavigator,
      network::mojom::WebSandboxFlags starting_sandbox_flags =
          network::mojom::WebSandboxFlags::kNone;
  
diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch
index 8f160ca9f5c99..b44e2eccaa131 100644
--- a/patches/chromium/webview_cross_drag.patch
+++ b/patches/chromium/webview_cross_drag.patch
@@ -8,10 +8,10 @@ This allows dragging and dropping between <webview>s.
 Originally landed in https://github.com/electron/libchromiumcontent/pull/267
 
 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
-index 7f60d038fb9c2bc8364c580bc9c7684d97fbbcfb..b1eddf20c22edf974375b8a04d70fca72f7834af 100644
+index 3e2342d28760172bcfd765f7ac3733b4d89a1445..351bee9cfcc31dc6ca06f1fc502b70617105191a 100644
 --- a/content/browser/web_contents/web_contents_view_aura.cc
 +++ b/content/browser/web_contents/web_contents_view_aura.cc
-@@ -900,10 +900,7 @@ bool WebContentsViewAura::IsValidDragTarget(
+@@ -916,10 +916,7 @@ bool WebContentsViewAura::IsValidDragTarget(
    // for the outermost view. Inner `WebContents` will have a
    // `WebContentsViewChildFrame` so when dragging between an inner
    // `WebContents` and its embedder the view IDs will be the same.
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index 24da4c76a0724..bd47818e88ade 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 115dab63efa4b90f37609a9a0a363ad75a0ff582..324232704f0bc0db6c20031cc0a2217b35667c3d 100644
+index e815010dcb9437727f32b12f0d47a31384e24677..bb1ffcd003807084b970e11a1b464e5f72142c53 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6579,6 +6579,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -6567,6 +6567,17 @@ void RenderFrameHostImpl::EnterFullscreen(
      }
    }
  
diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch
index a84e0a2e368a3..4eca49c954db9 100644
--- a/patches/chromium/worker_context_will_destroy.patch
+++ b/patches/chromium/worker_context_will_destroy.patch
@@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
 https://chromium-review.googlesource.com/c/chromium/src/+/1954347
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index d1fa110e7ccdcf496fe5e967cdb85b5fa0e54301..b2f206ed814e43e04815d1247ba4c6aa27f7084d 100644
+index a9146ec6c85b3dfa854d764e8010124f76cd3fc7..e0b308051be9b34ce26b65f6cd582beb7743662d 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -365,6 +365,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -26,10 +26,10 @@ index d1fa110e7ccdcf496fe5e967cdb85b5fa0e54301..b2f206ed814e43e04815d1247ba4c6aa
    // An empty URL is returned if the URL is not overriden.
    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index 8077fb82bc4bb6594c4676db12223d43bf650688..c05cc4f60a97f10cb0ed194267d6c81a0b50cc7c 100644
+index b822b43d0a2398689120a87b6dbd5f1c5f0f4ee3..53b42b67823474fc5c688654da280cde82faea87 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -869,6 +869,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
+@@ -860,6 +860,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
  }
  
@@ -43,10 +43,10 @@ index 8077fb82bc4bb6594c4676db12223d43bf650688..c05cc4f60a97f10cb0ed194267d6c81a
      const v8::Local<v8::Context>& worker) {
    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 8f4b58da709ba6e6a89b3d35d6eae5c23ee19389..7aa2a565643c27d946588bfc5212b3df39eb9d82 100644
+index 9718602c31f866b668cd211ff4fd72f69de1cd42..8f80fb04990c3e2820dcbc9b89dc0255c9c49d30 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -182,6 +182,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -180,6 +180,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -55,10 +55,10 @@ index 8f4b58da709ba6e6a89b3d35d6eae5c23ee19389..7aa2a565643c27d946588bfc5212b3df
        const blink::WebSecurityOrigin& script_origin) override;
    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index b3845ea3620684e3a89f9c2a99fb9c8505f942e2..d7fed3409f1846d9655aa2b4adc89768af8ba22f 100644
+index ad34b6230f57ad906bae515aa73ea2aaf1bfeede..b5cff1fee2d14c02f2d67cf012b7ba24fc3a7a06 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -638,6 +638,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -625,6 +625,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@@ -67,7 +67,7 @@ index b3845ea3620684e3a89f9c2a99fb9c8505f942e2..d7fed3409f1846d9655aa2b4adc89768
        const WebSecurityOrigin& script_origin) {
      return false;
 diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
-index 91fd003fe648c8ac854843922714f30434e3663f..f67fbdd1c9eda7feb9f171fa8482c1d5cc29d508 100644
+index 20d674166c78e316751bfa3ec7aed74656eea9b4..d289cfca8d8a9b093d8d30427e594c46b2f56c79 100644
 --- a/third_party/blink/renderer/core/workers/worker_thread.cc
 +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
 @@ -744,6 +744,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
diff --git a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
index 6bde8843fc9a7..d33d2271d35af 100644
--- a/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
+++ b/patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
@@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
 initialized.
 
 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
-index b2f206ed814e43e04815d1247ba4c6aa27f7084d..62c1555386315e00bdf7f677eb85f04ecd9f05d8 100644
+index e0b308051be9b34ce26b65f6cd582beb7743662d..857d5eb211890b10e143f54662636f2ba522b698 100644
 --- a/content/public/renderer/content_renderer_client.h
 +++ b/content/public/renderer/content_renderer_client.h
-@@ -360,6 +360,11 @@ class CONTENT_EXPORT ContentRendererClient {
+@@ -365,6 +365,11 @@ class CONTENT_EXPORT ContentRendererClient {
    virtual void DidInitializeWorkerContextOnWorkerThread(
        v8::Local<v8::Context> context) {}
  
@@ -35,10 +35,10 @@ index b2f206ed814e43e04815d1247ba4c6aa27f7084d..62c1555386315e00bdf7f677eb85f04e
    // from the worker thread.
    virtual void WillDestroyWorkerContextOnWorkerThread(
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
-index c05cc4f60a97f10cb0ed194267d6c81a0b50cc7c..f7b7c348509c775c8877058aa525c5900fc9aec3 100644
+index 53b42b67823474fc5c688654da280cde82faea87..db175070bdcefc84f1d6001568941a9f4f14789c 100644
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -881,6 +881,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
+@@ -872,6 +872,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
        worker);
  }
  
@@ -52,10 +52,10 @@ index c05cc4f60a97f10cb0ed194267d6c81a0b50cc7c..f7b7c348509c775c8877058aa525c590
      const blink::WebSecurityOrigin& script_origin) {
    return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
 diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
-index 7aa2a565643c27d946588bfc5212b3df39eb9d82..488d24afedf147307cb71480f5e6f1716318f0d2 100644
+index 8f80fb04990c3e2820dcbc9b89dc0255c9c49d30..f16af9a3e4027066cddbd5082998adc837e9b5dc 100644
 --- a/content/renderer/renderer_blink_platform_impl.h
 +++ b/content/renderer/renderer_blink_platform_impl.h
-@@ -182,6 +182,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
+@@ -180,6 +180,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    void DidStartWorkerThread() override;
    void WillStopWorkerThread() override;
    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@@ -65,10 +65,10 @@ index 7aa2a565643c27d946588bfc5212b3df39eb9d82..488d24afedf147307cb71480f5e6f171
    bool AllowScriptExtensionForServiceWorker(
        const blink::WebSecurityOrigin& script_origin) override;
 diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
-index d7fed3409f1846d9655aa2b4adc89768af8ba22f..169916298918d19f23f4e4dce5a306e94d640226 100644
+index b5cff1fee2d14c02f2d67cf012b7ba24fc3a7a06..765c0882406fa0ab7ae3d0460ff9a9814f60db0a 100644
 --- a/third_party/blink/public/platform/platform.h
 +++ b/third_party/blink/public/platform/platform.h
-@@ -638,6 +638,8 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -625,6 +625,8 @@ class BLINK_PLATFORM_EXPORT Platform {
    virtual void DidStartWorkerThread() {}
    virtual void WillStopWorkerThread() {}
    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
diff --git a/patches/config.json b/patches/config.json
index c204b2717009d..e142fc9deee0d 100644
--- a/patches/config.json
+++ b/patches/config.json
@@ -21,7 +21,5 @@
 
   "src/electron/patches/Mantle": "src/third_party/squirrel.mac/vendor/Mantle",
 
-  "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
-
-  "src/electron/patches/lss": "src/third_party/lss"
+  "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC"
 }
diff --git a/patches/lss/.patches b/patches/lss/.patches
index 773143e264950..e69de29bb2d1d 100644
--- a/patches/lss/.patches
+++ b/patches/lss/.patches
@@ -1 +0,0 @@
-fix_cast_pwrite64_arg_to_long_for_arm.patch
diff --git a/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch b/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
deleted file mode 100644
index 3f74555fe0fd9..0000000000000
--- a/patches/lss/fix_cast_pwrite64_arg_to_long_for_arm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <keeleymhammond@gmail.com>
-Date: Tue, 9 Aug 2022 14:05:55 -0700
-Subject: fix: cast pwrite64 arg to long for arm
-
-This patch cases pwrite64 arg to a long in order to avoid a
-compilation error on arm. This patch can be eliminated when the
-upstream patch is merged into chromium main:
-
-https://chromium-review.googlesource.com/c/linux-syscall-support/+/3786946
-
-diff --git a/linux_syscall_support.h b/linux_syscall_support.h
-index e4e816f4bd001a6de7b98972d1cbaec9aaa8f821..5ea1295f8e9bb5312469dbc1aadb67dd620d35d3 100644
---- a/linux_syscall_support.h
-+++ b/linux_syscall_support.h
-@@ -4842,7 +4842,7 @@ struct kernel_statfs {
-                            unsigned, o2)
-       LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
-                            const void *,   b, size_t, c, unsigned, o1,
--                           long, o2)
-+                           unsigned, o2)
-       LSS_INLINE _syscall4(int, _readahead,          int,         f,
-                            unsigned,       o1, unsigned, o2, size_t, c)
-     #endif
diff --git a/patches/node/.patches b/patches/node/.patches
index 72c5a5b2d6a7d..611f1f217aa15 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -47,3 +47,5 @@ build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
 build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
 fix_override_createjob_in_node_platform.patch
 buffer_fix_atob_input_validation.patch
+v8_api_advance_api_deprecation.patch
+enable_-wunqualified-std-cast-call.patch
diff --git a/patches/node/enable_-wunqualified-std-cast-call.patch b/patches/node/enable_-wunqualified-std-cast-call.patch
new file mode 100644
index 0000000000000..0a78954c84505
--- /dev/null
+++ b/patches/node/enable_-wunqualified-std-cast-call.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Fri, 26 Aug 2022 00:10:16 +0900
+Subject: Enable -Wunqualified-std-cast-call
+
+Refs https://chromium-review.googlesource.com/c/chromium/src/+/3825237
+Should be upstreamed.
+
+diff --git a/src/node_http2.cc b/src/node_http2.cc
+index ca82da47b4b160af0b1c11f9d162919272666cdb..e60036bb9cc07c5a87c2a017507c3533e229f14f 100644
+--- a/src/node_http2.cc
++++ b/src/node_http2.cc
+@@ -645,7 +645,7 @@ void Http2Stream::EmitStatistics() {
+           duration,
+           statistics_);
+ 
+-  env()->SetImmediate([entry = move(entry)](Environment* env) {
++  env()->SetImmediate([entry = std::move(entry)](Environment* env) {
+     if (HasHttp2Observer(env))
+       entry->Notify(env);
+   });
diff --git a/patches/node/v8_api_advance_api_deprecation.patch b/patches/node/v8_api_advance_api_deprecation.patch
new file mode 100644
index 0000000000000..bb431064a381a
--- /dev/null
+++ b/patches/node/v8_api_advance_api_deprecation.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Fri, 26 Aug 2022 00:03:44 +0900
+Subject: v8: [api] Advance API deprecation
+
+Refs https://chromium-review.googlesource.com/c/v8/v8/+/3702449
+Should be upstreamed.
+
+diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
+index 2c36a0b132cf1b21595ac39619b99d316ad81d9e..3dfea77eab2ff880508eda95a5dff80a6564251f 100644
+--- a/src/inspector_agent.cc
++++ b/src/inspector_agent.cc
+@@ -217,7 +217,8 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
+                        bool prevent_shutdown)
+       : delegate_(std::move(delegate)), prevent_shutdown_(prevent_shutdown),
+         retaining_context_(false) {
+-    session_ = inspector->connect(CONTEXT_GROUP_ID, this, StringView());
++    session_ = inspector->connect(
++        CONTEXT_GROUP_ID, this, StringView(),V8Inspector::kFullyTrusted);
+     node_dispatcher_ = std::make_unique<protocol::UberDispatcher>(this);
+     tracing_agent_ =
+         std::make_unique<protocol::TracingAgent>(env, main_thread_);
diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch
index 85b8bf878eb58..4a5ba08bbfe6a 100644
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,10 +9,10 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 0c1a72dfd2a3cb95004de7b32fc35ac982c5f927..f359ea10d6e83f94b698d9d728147944ea566018 100644
+index 83082271b8b76179b41e943190303e31fa639a95..0a23171a391606bb3408dcf8a488d075a148443a 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -650,7 +650,7 @@ config("internal_config") {
+@@ -663,7 +663,7 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
@@ -21,7 +21,7 @@ index 0c1a72dfd2a3cb95004de7b32fc35ac982c5f927..f359ea10d6e83f94b698d9d728147944
      defines += [ "BUILDING_V8_SHARED" ]
    }
  
-@@ -6124,7 +6124,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6166,7 +6166,7 @@ if (current_toolchain == v8_generator_toolchain) {
        "src/interpreter/bytecodes.h",
      ]
  
diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch
index 6871851eab3de..937d33fb705c8 100644
--- a/patches/v8/dcheck.patch
+++ b/patches/v8/dcheck.patch
@@ -6,10 +6,10 @@ Subject: dcheck.patch
 https://github.com/auchenberg/volkswagen
 
 diff --git a/src/api/api.cc b/src/api/api.cc
-index 0b6bdbc0328dfc979531dbbb25c5fc7b02f661bd..191ee0bb424471c1240835dedc7f25b84221f3b1 100644
+index 353fa739d89bf85d6dbb202d62b3ddab9b0a899e..ae6d7c8548c1cb336e07dcfe7507f7919eb85845 100644
 --- a/src/api/api.cc
 +++ b/src/api/api.cc
-@@ -9181,7 +9181,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
+@@ -9171,7 +9171,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
  }
  
  void Isolate::PerformMicrotaskCheckpoint() {
@@ -18,20 +18,3 @@ index 0b6bdbc0328dfc979531dbbb25c5fc7b02f661bd..191ee0bb424471c1240835dedc7f25b8
    i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
    i_isolate->default_microtask_queue()->PerformCheckpoint(this);
  }
-diff --git a/src/heap/heap.cc b/src/heap/heap.cc
-index 41f2378ba770a96d9722b8d50d28f3562ebf5101..59338d1d293d5325e89052dd226a9ad4f9e8b46a 100644
---- a/src/heap/heap.cc
-+++ b/src/heap/heap.cc
-@@ -6165,9 +6165,9 @@ void Heap::TearDown() {
- void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
-                                  GCType gc_type, void* data) {
-   DCHECK_NOT_NULL(callback);
--  DCHECK(gc_prologue_callbacks_.end() ==
--         std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
--                   GCCallbackTuple(callback, gc_type, data)));
-+  // DCHECK(gc_prologue_callbacks_.end() ==
-+  //        std::find(gc_prologue_callbacks_.begin(), gc_prologue_callbacks_.end(),
-+  //                  GCCallbackTuple(callback, gc_type, data)));
-   gc_prologue_callbacks_.emplace_back(callback, gc_type, data);
- }
- 
diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
index 722a2ab2441e6..8b0f56b8fe03a 100644
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).
 
 diff --git a/BUILD.gn b/BUILD.gn
-index 09c3dc73292e2778baba3a0f7f1a02d875845d34..cf9dff8346bbe086464391758a5c11f228b3898c 100644
+index b0c6d08bf50a3443e2589f09b6f1f5b7734c000c..7728123805054064d5acecacf6cbf8d1fe4a56c1 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -650,6 +650,10 @@ config("internal_config") {
+@@ -663,6 +663,10 @@ config("internal_config") {
      ":cppgc_header_features",
    ]
  
diff --git a/patches/v8/export_symbols_needed_for_windows_build.patch b/patches/v8/export_symbols_needed_for_windows_build.patch
index d4730296b4dd9..f4551bf39ef14 100644
--- a/patches/v8/export_symbols_needed_for_windows_build.patch
+++ b/patches/v8/export_symbols_needed_for_windows_build.patch
@@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
 These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
 
 diff --git a/src/objects/objects.h b/src/objects/objects.h
-index fbdf5f029f19d8c231e70593e4860f8949e66e45..f98808fa74d79f8492f5a9aac92783b0775bfdf6 100644
+index ced30839aa8627b9b21eabea1a4a3b2574a906d8..f038aea4e2e105b711f4530a1c40d63ee340724f 100644
 --- a/src/objects/objects.h
 +++ b/src/objects/objects.h
-@@ -930,7 +930,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
+@@ -928,7 +928,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
  // Utility superclass for stack-allocated objects that must be updated
  // on gc.  It provides two ways for the gc to update instances, either
  // iterating or updating after gc.
diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch
index 00ce43c0d6d10..b9959281d59e2 100644
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index f359ea10d6e83f94b698d9d728147944ea566018..09c3dc73292e2778baba3a0f7f1a02d875845d34 100644
+index 0a23171a391606bb3408dcf8a488d075a148443a..b0c6d08bf50a3443e2589f09b6f1f5b7734c000c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -6136,7 +6136,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6178,7 +6178,6 @@ if (current_toolchain == v8_generator_toolchain) {
  
  if (current_toolchain == v8_snapshot_toolchain) {
    v8_executable("mksnapshot") {
diff --git a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
index 7befb3ae7a01e..3d3a888d896e7 100644
--- a/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
+++ b/patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
@@ -18,10 +18,10 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
 diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
-index fe435ad067837df7f1ebc971083b6585952903f5..34660673e239cbc49e749732e95d16c20982a675 100644
+index 9a12cfdd9d02624a6fbbf5b10da958a6024b0857..01acdbcd633e9f11e6bd0673ed33eed5ce4f61fa 100644
 --- a/src/codegen/code-stub-assembler.cc
 +++ b/src/codegen/code-stub-assembler.cc
-@@ -6124,12 +6124,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
+@@ -6139,12 +6139,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    StoreFullTaggedNoWriteBarrier(pending_message, message);
  }
  
@@ -35,10 +35,10 @@ index fe435ad067837df7f1ebc971083b6585952903f5..34660673e239cbc49e749732e95d16c2
                                                    int type) {
    return Word32Equal(instance_type, Int32Constant(type));
 diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
-index c4878044b149ec23f4ac9198f402ccc5114e219e..ba9be792cbcce3cbc85062daa524010dced2cfeb 100644
+index 5c89a2ac9de2db35c4b5c326a02269203bb0ce46..ecc20c69e8f72179d32ce53e68bc463105907d11 100644
 --- a/src/codegen/code-stub-assembler.h
 +++ b/src/codegen/code-stub-assembler.h
-@@ -2533,7 +2533,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
+@@ -2538,7 +2538,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
  
    TNode<HeapObject> GetPendingMessage();
    void SetPendingMessage(TNode<HeapObject> message);
diff --git a/patches/v8/workaround_an_undefined_symbol_error.patch b/patches/v8/workaround_an_undefined_symbol_error.patch
index 39c674b87d709..45230556a6913 100644
--- a/patches/v8/workaround_an_undefined_symbol_error.patch
+++ b/patches/v8/workaround_an_undefined_symbol_error.patch
@@ -12,10 +12,10 @@ By moving some functions out of the the arm64-assembler header file,
 this error no longer seems to happen.
 
 diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
-index 818af524388b1aba51e984b7ff7f7b856d1e590b..7ba8a0e9bc11a65e72e66aebd87e19359ba5594e 100644
+index 0110e903fd9c3681dca9921d4ad26fa47c38886a..18be54526bc11a4b285d9e0ab1873d587f11899d 100644
 --- a/src/codegen/arm64/assembler-arm64.cc
 +++ b/src/codegen/arm64/assembler-arm64.cc
-@@ -3630,6 +3630,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
+@@ -3627,6 +3627,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
         ImmMoveWide(static_cast<int>(imm)) | ShiftMoveWide(shift));
  }
  
@@ -39,7 +39,7 @@ index 818af524388b1aba51e984b7ff7f7b856d1e590b..7ba8a0e9bc11a65e72e66aebd87e1935
                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
 diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
-index e3d8eb27dea2d241933bcb597bef35b46fcd2a09..0a752245ec25c80d5ed34b1a858fa43cc0d6dd40 100644
+index f26054a12ee493fc82cc5285de96da3b5aa149b2..23d8ead77dc4cde1da093510353cc93c14ce4fe0 100644
 --- a/src/codegen/arm64/assembler-arm64.h
 +++ b/src/codegen/arm64/assembler-arm64.h
 @@ -2120,11 +2120,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 030ccee6f0f7e..e6cd258588445 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -1286,6 +1286,7 @@ void WebContents::UpdateExclusiveAccessExitBubbleContent(
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type,
     ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
+    bool notify_download,
     bool force_update) {}
 
 void WebContents::OnExclusiveAccessUserInput() {}
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 45b4846d2f9b4..111984a20c37d 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -664,6 +664,7 @@ class WebContents : public ExclusiveAccessContext,
       const GURL& url,
       ExclusiveAccessBubbleType bubble_type,
       ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
+      bool notify_download,
       bool force_update) override;
   void OnExclusiveAccessUserInput() override;
   content::WebContents* GetActiveWebContents() override;
diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc
index 141f04da18110..a344b55023484 100644
--- a/shell/browser/electron_browser_client.cc
+++ b/shell/browser/electron_browser_client.cc
@@ -1572,56 +1572,61 @@ void ElectronBrowserClient::
     if (render_frame_host.GetFrameTreeNodeId() ==
             contents->GetPrimaryMainFrame()->GetFrameTreeNodeId() ||
         (prefs && prefs->AllowsNodeIntegrationInSubFrames())) {
-      associated_registry.AddInterface(base::BindRepeating(
+      associated_registry.AddInterface<mojom::ElectronApiIPC>(
+          base::BindRepeating(
+              [](content::RenderFrameHost* render_frame_host,
+                 mojo::PendingAssociatedReceiver<mojom::ElectronApiIPC>
+                     receiver) {
+                ElectronApiIPCHandlerImpl::Create(render_frame_host,
+                                                  std::move(receiver));
+              },
+              &render_frame_host));
+    }
+  }
+
+  associated_registry.AddInterface<mojom::ElectronWebContentsUtility>(
+      base::BindRepeating(
           [](content::RenderFrameHost* render_frame_host,
-             mojo::PendingAssociatedReceiver<electron::mojom::ElectronApiIPC>
+             mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility>
                  receiver) {
-            ElectronApiIPCHandlerImpl::Create(render_frame_host,
-                                              std::move(receiver));
+            ElectronWebContentsUtilityHandlerImpl::Create(render_frame_host,
+                                                          std::move(receiver));
           },
           &render_frame_host));
-    }
-  }
-
-  associated_registry.AddInterface(base::BindRepeating(
-      [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<
-             electron::mojom::ElectronWebContentsUtility> receiver) {
-        ElectronWebContentsUtilityHandlerImpl::Create(render_frame_host,
-                                                      std::move(receiver));
-      },
-      &render_frame_host));
 
-  associated_registry.AddInterface(base::BindRepeating(
-      [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<mojom::ElectronAutofillDriver>
-             receiver) {
-        AutofillDriverFactory::BindAutofillDriver(std::move(receiver),
-                                                  render_frame_host);
-      },
-      &render_frame_host));
+  associated_registry.AddInterface<mojom::ElectronAutofillDriver>(
+      base::BindRepeating(
+          [](content::RenderFrameHost* render_frame_host,
+             mojo::PendingAssociatedReceiver<mojom::ElectronAutofillDriver>
+                 receiver) {
+            AutofillDriverFactory::BindAutofillDriver(std::move(receiver),
+                                                      render_frame_host);
+          },
+          &render_frame_host));
 #if BUILDFLAG(ENABLE_PRINTING)
-  associated_registry.AddInterface(base::BindRepeating(
-      [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost>
-             receiver) {
-        PrintViewManagerElectron::BindPrintManagerHost(std::move(receiver),
-                                                       render_frame_host);
-      },
-      &render_frame_host));
+  associated_registry.AddInterface<printing::mojom::PrintManagerHost>(
+      base::BindRepeating(
+          [](content::RenderFrameHost* render_frame_host,
+             mojo::PendingAssociatedReceiver<printing::mojom::PrintManagerHost>
+                 receiver) {
+            PrintViewManagerElectron::BindPrintManagerHost(std::move(receiver),
+                                                           render_frame_host);
+          },
+          &render_frame_host));
 #endif
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  associated_registry.AddInterface(base::BindRepeating(
-      [](content::RenderFrameHost* render_frame_host,
-         mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>
-             receiver) {
-        extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
-            std::move(receiver), render_frame_host);
-      },
-      &render_frame_host));
+  associated_registry.AddInterface<extensions::mojom::LocalFrameHost>(
+      base::BindRepeating(
+          [](content::RenderFrameHost* render_frame_host,
+             mojo::PendingAssociatedReceiver<extensions::mojom::LocalFrameHost>
+                 receiver) {
+            extensions::ExtensionWebContentsObserver::BindLocalFrameHost(
+                std::move(receiver), render_frame_host);
+          },
+          &render_frame_host));
 #endif
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
-  associated_registry.AddInterface(base::BindRepeating(
+  associated_registry.AddInterface<pdf::mojom::PdfService>(base::BindRepeating(
       [](content::RenderFrameHost* render_frame_host,
          mojo::PendingAssociatedReceiver<pdf::mojom::PdfService> receiver) {
         pdf::PDFWebContentsHelper::BindPdfService(std::move(receiver),
@@ -1697,9 +1702,10 @@ void ElectronBrowserClient::ExposeInterfacesToRenderer(
     blink::AssociatedInterfaceRegistry* associated_registry,
     content::RenderProcessHost* render_process_host) {
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  associated_registry->AddInterface(base::BindRepeating(
-      &extensions::EventRouter::BindForRenderer, render_process_host->GetID()));
-  associated_registry->AddInterface(
+  associated_registry->AddInterface<extensions::mojom::EventRouter>(
+      base::BindRepeating(&extensions::EventRouter::BindForRenderer,
+                          render_process_host->GetID()));
+  associated_registry->AddInterface<extensions::mojom::GuestView>(
       base::BindRepeating(&extensions::ExtensionsGuestView::CreateForExtensions,
                           render_process_host->GetID()));
 #endif
diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc
index 432ea24c9ea22..4699a1c908c91 100644
--- a/shell/browser/electron_browser_context.cc
+++ b/shell/browser/electron_browser_context.cc
@@ -389,6 +389,13 @@ ElectronBrowserContext::GetStorageNotificationService() {
   return nullptr;
 }
 
+content::ReduceAcceptLanguageControllerDelegate*
+ElectronBrowserContext::GetReduceAcceptLanguageControllerDelegate() {
+  // Needs implementation
+  // Refs https://chromium-review.googlesource.com/c/chromium/src/+/3687391
+  return nullptr;
+}
+
 ResolveProxyHelper* ElectronBrowserContext::GetResolveProxyHelper() {
   if (!resolve_proxy_helper_) {
     resolve_proxy_helper_ = base::MakeRefCounted<ResolveProxyHelper>(this);
diff --git a/shell/browser/electron_browser_context.h b/shell/browser/electron_browser_context.h
index b1fa4715cb758..2e1d3bbbb0c9e 100644
--- a/shell/browser/electron_browser_context.h
+++ b/shell/browser/electron_browser_context.h
@@ -118,6 +118,8 @@ class ElectronBrowserContext : public content::BrowserContext {
   content::ClientHintsControllerDelegate* GetClientHintsControllerDelegate()
       override;
   content::StorageNotificationService* GetStorageNotificationService() override;
+  content::ReduceAcceptLanguageControllerDelegate*
+  GetReduceAcceptLanguageControllerDelegate() override;
 
   CookieChangeNotifier* cookie_change_notifier() const {
     return cookie_change_notifier_.get();
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index dde2714caec07..8b3d4d50df02f 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -253,6 +253,16 @@ blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
                  : blink::mojom::PermissionStatus::DENIED;
 }
 
+content::PermissionResult
+ElectronPermissionManager::GetPermissionResultForOriginWithoutContext(
+    blink::PermissionType permission,
+    const url::Origin& origin) {
+  blink::mojom::PermissionStatus status =
+      GetPermissionStatus(permission, origin.GetURL(), origin.GetURL());
+  return content::PermissionResult(
+      status, content::PermissionStatusSource::UNSPECIFIED);
+}
+
 ElectronPermissionManager::SubscriptionId
 ElectronPermissionManager::SubscribePermissionStatusChange(
     blink::PermissionType permission,
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index bf98621105b56..00cbb81e9f733 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -73,6 +73,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
                           const GURL& requesting_origin,
                           bool user_gesture,
                           StatusesCallback callback) override;
+
   void RequestPermissionsWithDetails(
       const std::vector<blink::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
@@ -80,10 +81,6 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       base::Value::Dict details,
       StatusesCallback callback);
 
-  blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
-      blink::PermissionType permission,
-      content::RenderFrameHost* render_frame_host) override;
-
   bool CheckPermissionWithDetails(blink::PermissionType permission,
                                   content::RenderFrameHost* render_frame_host,
                                   const GURL& requesting_origin,
@@ -124,6 +121,12 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       base::OnceCallback<
           void(const std::vector<blink::mojom::PermissionStatus>&)> callback)
       override;
+  content::PermissionResult GetPermissionResultForOriginWithoutContext(
+      blink::PermissionType permission,
+      const url::Origin& origin) override;
+  blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
+      blink::PermissionType permission,
+      content::RenderFrameHost* render_frame_host) override;
   blink::mojom::PermissionStatus GetPermissionStatusForWorker(
       blink::PermissionType permission,
       content::RenderProcessHost* render_process_host,
diff --git a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
index ba6deb94882af..03e435baee20e 100644
--- a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
+++ b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc
@@ -246,7 +246,7 @@ void DesktopNotificationController::AnimateAll() {
         break;
       }
 
-      it = move(it2);
+      it = std::move(it2);
     }
   }
 
@@ -280,12 +280,12 @@ DesktopNotificationController::AddNotification(std::u16string caption,
                                                HBITMAP image) {
   auto data = std::make_shared<NotificationData>();
   data->controller = this;
-  data->caption = move(caption);
-  data->body_text = move(body_text);
+  data->caption = std::move(caption);
+  data->body_text = std::move(body_text);
   data->image = CopyBitmap(image);
 
   // Enqueue new notification
-  Notification ret{*queue_.insert(queue_.end(), move(data))};
+  Notification ret{*queue_.insert(queue_.end(), std::move(data))};
   CheckQueue();
   return ret;
 }
@@ -311,7 +311,7 @@ void DesktopNotificationController::CloseNotification(
 
 void DesktopNotificationController::CheckQueue() {
   while (instances_.size() < instances_.capacity() && !queue_.empty()) {
-    CreateToast(move(queue_.front()));
+    CreateToast(std::move(queue_.front()));
     queue_.pop_front();
   }
 }
@@ -409,8 +409,8 @@ void DesktopNotificationController::Notification::Set(std::u16string caption,
   if (data_->image)
     DeleteBitmap(data_->image);
 
-  data_->caption = move(caption);
-  data_->body_text = move(body_text);
+  data_->caption = std::move(caption);
+  data_->body_text = std::move(body_text);
   data_->image = CopyBitmap(image);
 
   auto* hwnd = data_->controller->GetToast(data_.get());
diff --git a/shell/browser/ui/devtools_ui.cc b/shell/browser/ui/devtools_ui.cc
index ab9f2ffcee28b..0da78f52fb272 100644
--- a/shell/browser/ui/devtools_ui.cc
+++ b/shell/browser/ui/devtools_ui.cc
@@ -31,8 +31,8 @@ std::string PathWithoutParams(const std::string& path) {
       .substr(1);
 }
 
-std::string GetMimeTypeForPath(const std::string& path) {
-  std::string filename = PathWithoutParams(path);
+std::string GetMimeTypeForUrl(const GURL& url) {
+  std::string filename = url.ExtractFileName();
   if (base::EndsWith(filename, ".html", base::CompareCase::INSENSITIVE_ASCII)) {
     return "text/html";
   } else if (base::EndsWith(filename, ".css",
@@ -95,8 +95,8 @@ class BundledDataSource : public content::URLDataSource {
     std::move(callback).Run(nullptr);
   }
 
-  std::string GetMimeType(const std::string& path) override {
-    return GetMimeTypeForPath(path);
+  std::string GetMimeType(const GURL& url) override {
+    return GetMimeTypeForUrl(url);
   }
 
   bool ShouldAddContentSecurityPolicy() override { return false; }
diff --git a/shell/browser/zoom_level_delegate.cc b/shell/browser/zoom_level_delegate.cc
index bbe8ce0daee38..a49cd01af0abf 100644
--- a/shell/browser/zoom_level_delegate.cc
+++ b/shell/browser/zoom_level_delegate.cc
@@ -6,12 +6,12 @@
 
 #include <functional>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/values.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_filter.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -63,18 +63,11 @@ void ZoomLevelDelegate::SetDefaultZoomLevelPref(double level) {
 }
 
 double ZoomLevelDelegate::GetDefaultZoomLevelPref() const {
-  double default_zoom_level = 0.0;
-
-  const base::Value* default_zoom_level_dictionary =
-      pref_service_->GetDictionary(kPartitionDefaultZoomLevel);
+  const base::Value::Dict& default_zoom_level_dictionary =
+      pref_service_->GetValueDict(kPartitionDefaultZoomLevel);
   // If no default has been previously set, the default returned is the
   // value used to initialize default_zoom_level in this function.
-  absl::optional<double> maybe_default_zoom_level =
-      default_zoom_level_dictionary->FindDoubleKey(partition_key_);
-  if (maybe_default_zoom_level.has_value())
-    default_zoom_level = maybe_default_zoom_level.value();
-
-  return default_zoom_level;
+  return default_zoom_level_dictionary.FindDouble(partition_key_).value_or(0.0);
 }
 
 void ZoomLevelDelegate::OnZoomLevelChanged(
@@ -84,35 +77,33 @@ void ZoomLevelDelegate::OnZoomLevelChanged(
 
   double level = change.zoom_level;
   DictionaryPrefUpdate update(pref_service_, kPartitionPerHostZoomLevels);
-  base::Value* host_zoom_dictionaries = update.Get();
-  DCHECK(host_zoom_dictionaries);
+  base::Value* host_zoom_update = update.Get();
+  DCHECK(host_zoom_update);
+  base::Value::Dict& host_zoom_dictionaries = host_zoom_update->GetDict();
 
   bool modification_is_removal =
       blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
 
-  base::Value* host_zoom_dictionary =
-      host_zoom_dictionaries->FindDictKey(partition_key_);
+  base::Value::Dict* host_zoom_dictionary =
+      host_zoom_dictionaries.FindDict(partition_key_);
   if (!host_zoom_dictionary) {
-    host_zoom_dictionaries->SetKey(partition_key_,
-                                   base::Value(base::Value::Type::DICTIONARY));
-    host_zoom_dictionary = host_zoom_dictionaries->FindDictKey(partition_key_);
+    base::Value::Dict dict;
+    host_zoom_dictionaries.Set(partition_key_, std::move(dict));
+    host_zoom_dictionary = host_zoom_dictionaries.FindDict(partition_key_);
   }
 
   if (modification_is_removal)
-    host_zoom_dictionary->RemoveKey(change.host);
+    host_zoom_dictionary->Remove(change.host);
   else
-    host_zoom_dictionary->SetKey(change.host, base::Value(level));
+    host_zoom_dictionary->Set(change.host, base::Value(level));
 }
 
 void ZoomLevelDelegate::ExtractPerHostZoomLevels(
-    const base::DictionaryValue* host_zoom_dictionary) {
+    const base::Value::Dict& host_zoom_dictionary) {
   std::vector<std::string> keys_to_remove;
-  std::unique_ptr<base::DictionaryValue> host_zoom_dictionary_copy =
-      host_zoom_dictionary->DeepCopyWithoutEmptyChildren();
-  for (base::DictionaryValue::Iterator i(*host_zoom_dictionary_copy);
-       !i.IsAtEnd(); i.Advance()) {
-    const std::string& host(i.key());
-    const absl::optional<double> zoom_level = i.value().GetIfDouble();
+  base::Value::Dict host_zoom_dictionary_copy = host_zoom_dictionary.Clone();
+  for (auto [host, value] : host_zoom_dictionary_copy) {
+    const absl::optional<double> zoom_level = value.GetIfDouble();
 
     // Filter out A) the empty host, B) zoom levels equal to the default; and
     // remember them, so that we can later erase them from Prefs.
@@ -120,14 +111,14 @@ void ZoomLevelDelegate::ExtractPerHostZoomLevels(
     // level was set to its current value. In either case, SetZoomLevelForHost
     // will ignore type B values, thus, to have consistency with HostZoomMap's
     // internal state, these values must also be removed from Prefs.
-    if (host.empty() || !zoom_level ||
-        blink::PageZoomValuesEqual(*zoom_level,
+    if (host.empty() || !zoom_level.has_value() ||
+        blink::PageZoomValuesEqual(zoom_level.value(),
                                    host_zoom_map_->GetDefaultZoomLevel())) {
       keys_to_remove.push_back(host);
       continue;
     }
 
-    host_zoom_map_->SetZoomLevelForHost(host, *zoom_level);
+    host_zoom_map_->SetZoomLevelForHost(host, zoom_level.value());
   }
 
   // Sanitize prefs to remove entries that match the default zoom level and/or
@@ -155,16 +146,15 @@ void ZoomLevelDelegate::InitHostZoomMap(content::HostZoomMap* host_zoom_map) {
 
   // Initialize the HostZoomMap with per-host zoom levels from the persisted
   // zoom-level preference values.
-  const base::Value* host_zoom_dictionaries =
-      pref_service_->GetDictionary(kPartitionPerHostZoomLevels);
-  const base::Value* host_zoom_dictionary =
-      host_zoom_dictionaries->FindDictKey(partition_key_);
+  const base::Value::Dict& host_zoom_dictionaries =
+      pref_service_->GetValueDict(kPartitionPerHostZoomLevels);
+  const base::Value::Dict* host_zoom_dictionary =
+      host_zoom_dictionaries.FindDict(partition_key_);
   if (host_zoom_dictionary) {
     // Since we're calling this before setting up zoom_subscription_ below we
     // don't need to worry that host_zoom_dictionary is indirectly affected
     // by calls to HostZoomMap::SExtractPerHostZoomLevelsetZoomLevelForHost().
-    ExtractPerHostZoomLevels(
-        &base::Value::AsDictionaryValue(*host_zoom_dictionary));
+    ExtractPerHostZoomLevels(*host_zoom_dictionary);
   }
   zoom_subscription_ =
       host_zoom_map_->AddZoomLevelChangedCallback(base::BindRepeating(
diff --git a/shell/browser/zoom_level_delegate.h b/shell/browser/zoom_level_delegate.h
index 56dcba7e68eb0..1c4302fadf8b1 100644
--- a/shell/browser/zoom_level_delegate.h
+++ b/shell/browser/zoom_level_delegate.h
@@ -7,12 +7,12 @@
 
 #include <string>
 
+#include "base/values.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/zoom_level_delegate.h"
 
 namespace base {
-class DictionaryValue;
 class FilePath;
 }  // namespace base
 
@@ -45,8 +45,7 @@ class ZoomLevelDelegate : public content::ZoomLevelDelegate {
   void InitHostZoomMap(content::HostZoomMap* host_zoom_map) override;
 
  private:
-  void ExtractPerHostZoomLevels(
-      const base::DictionaryValue* host_zoom_dictionary);
+  void ExtractPerHostZoomLevels(const base::Value::Dict& host_zoom_dictionary);
 
   // This is a callback function that receives notifications from HostZoomMap
   // when per-host zoom levels change. It is used to update the per-host
diff --git a/shell/common/extensions/electron_extensions_client.cc b/shell/common/extensions/electron_extensions_client.cc
index c2f9a573701ce..76baa9df41c5d 100644
--- a/shell/common/extensions/electron_extensions_client.cc
+++ b/shell/common/extensions/electron_extensions_client.cc
@@ -67,6 +67,7 @@ base::LazyInstance<ElectronPermissionMessageProvider>::DestructorAtExit
 
 ElectronExtensionsClient::ElectronExtensionsClient()
     : webstore_base_url_(extension_urls::kChromeWebstoreBaseURL),
+      new_webstore_base_url_(extension_urls::kNewChromeWebstoreBaseURL),
       webstore_update_url_(extension_urls::kChromeWebstoreUpdateURL) {
   AddAPIProvider(std::make_unique<extensions::CoreExtensionsAPIProvider>());
   AddAPIProvider(std::make_unique<ElectronExtensionsAPIProvider>());
@@ -127,6 +128,10 @@ const GURL& ElectronExtensionsClient::GetWebstoreBaseURL() const {
   return webstore_base_url_;
 }
 
+const GURL& ElectronExtensionsClient::GetNewWebstoreBaseURL() const {
+  return new_webstore_base_url_;
+}
+
 const GURL& ElectronExtensionsClient::GetWebstoreUpdateURL() const {
   return webstore_update_url_;
 }
diff --git a/shell/common/extensions/electron_extensions_client.h b/shell/common/extensions/electron_extensions_client.h
index c69a875b5dcb7..885f85554f62e 100644
--- a/shell/common/extensions/electron_extensions_client.h
+++ b/shell/common/extensions/electron_extensions_client.h
@@ -52,11 +52,13 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient {
   const GURL& GetWebstoreBaseURL() const override;
   const GURL& GetWebstoreUpdateURL() const override;
   bool IsBlocklistUpdateURL(const GURL& url) const override;
+  const GURL& GetNewWebstoreBaseURL() const override;
 
  private:
   ScriptingAllowlist scripting_allowlist_;
 
   const GURL webstore_base_url_;
+  const GURL new_webstore_base_url_;
   const GURL webstore_update_url_;
 };
 
diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc
index 12e8cc1018e86..d2399e50c0415 100644
--- a/shell/renderer/api/electron_api_web_frame.cc
+++ b/shell/renderer/api/electron_api_web_frame.cc
@@ -23,6 +23,7 @@
 #include "shell/common/gin_converters/blink_converter.h"
 #include "shell/common/gin_converters/callback_converter.h"
 #include "shell/common/gin_converters/file_path_converter.h"
+#include "shell/common/gin_converters/value_converter.h"
 #include "shell/common/gin_helper/dictionary.h"
 #include "shell/common/gin_helper/error_thrower.h"
 #include "shell/common/gin_helper/function_template_extensions.h"
@@ -56,27 +57,6 @@
 
 namespace gin {
 
-template <>
-struct Converter<blink::WebLocalFrame::ScriptExecutionType> {
-  static bool FromV8(v8::Isolate* isolate,
-                     v8::Local<v8::Value> val,
-                     blink::WebLocalFrame::ScriptExecutionType* out) {
-    std::string execution_type;
-    if (!ConvertFromV8(isolate, val, &execution_type))
-      return false;
-    if (execution_type == "asynchronous") {
-      *out = blink::WebLocalFrame::kAsynchronous;
-    } else if (execution_type == "asynchronousBlockingOnload") {
-      *out = blink::WebLocalFrame::kAsynchronousBlockingOnload;
-    } else if (execution_type == "synchronous") {
-      *out = blink::WebLocalFrame::kSynchronous;
-    } else {
-      return false;
-    }
-    return true;
-  }
-};
-
 template <>
 struct Converter<blink::WebCssOrigin> {
   static bool FromV8(v8::Isolate* isolate,
@@ -132,7 +112,7 @@ bool SpellCheckWord(content::RenderFrame* render_frame,
 
 #endif
 
-class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
+class ScriptExecutionCallback {
  public:
   // for compatibility with the older version of this, error is after result
   using CompletionCallback =
@@ -144,7 +124,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
       CompletionCallback callback)
       : promise_(std::move(promise)), callback_(std::move(callback)) {}
 
-  ~ScriptExecutionCallback() override = default;
+  ~ScriptExecutionCallback() = default;
 
   // disable copy
   ScriptExecutionCallback(const ScriptExecutionCallback&) = delete;
@@ -193,8 +173,7 @@ class ScriptExecutionCallback : public blink::WebScriptExecutionCallback {
     }
   }
 
-  void Completed(
-      const blink::WebVector<v8::Local<v8::Value>>& result) override {
+  void Completed(const blink::WebVector<v8::Local<v8::Value>>& result) {
     v8::Isolate* isolate = promise_.isolate();
     if (!result.empty()) {
       if (!result[0].IsEmpty()) {
@@ -660,13 +639,20 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     ScriptExecutionCallback::CompletionCallback completion_callback;
     args->GetNext(&completion_callback);
 
+    auto* self = new ScriptExecutionCallback(std::move(promise),
+                                             std::move(completion_callback));
+
     render_frame->GetWebFrame()->RequestExecuteScript(
         blink::DOMWrapperWorld::kMainWorldId, base::make_span(&source, 1),
-        has_user_gesture, blink::WebLocalFrame::kSynchronous,
-        new ScriptExecutionCallback(std::move(promise),
-                                    std::move(completion_callback)),
+        has_user_gesture ? blink::mojom::UserActivationOption::kActivate
+                         : blink::mojom::UserActivationOption::kDoNotActivate,
+        blink::mojom::EvaluationTiming::kSynchronous,
+        blink::mojom::LoadEventBlockingOption::kDoNotBlock,
+        base::NullCallback(),
+        base::BindOnce(&ScriptExecutionCallback::Completed,
+                       base::Unretained(self)),
         blink::BackForwardCacheAware::kAllow,
-        blink::WebLocalFrame::PromiseBehavior::kDontWait);
+        blink::mojom::PromiseResultOption::kDoNotWait);
 
     return handle;
   }
@@ -692,9 +678,19 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
     bool has_user_gesture = false;
     args->GetNext(&has_user_gesture);
 
-    blink::WebLocalFrame::ScriptExecutionType scriptExecutionType =
-        blink::WebLocalFrame::kSynchronous;
-    args->GetNext(&scriptExecutionType);
+    blink::mojom::EvaluationTiming script_execution_type =
+        blink::mojom::EvaluationTiming::kSynchronous;
+    blink::mojom::LoadEventBlockingOption load_blocking_option =
+        blink::mojom::LoadEventBlockingOption::kDoNotBlock;
+    std::string execution_type;
+    args->GetNext(&execution_type);
+
+    if (execution_type == "asynchronous") {
+      script_execution_type = blink::mojom::EvaluationTiming::kAsynchronous;
+    } else if (execution_type == "asynchronousBlockingOnload") {
+      script_execution_type = blink::mojom::EvaluationTiming::kAsynchronous;
+      load_blocking_option = blink::mojom::LoadEventBlockingOption::kBlock;
+    }
 
     ScriptExecutionCallback::CompletionCallback completion_callback;
     args->GetNext(&completion_callback);
@@ -724,13 +720,19 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
                            blink::WebURL(GURL(url)));
     }
 
+    // Deletes itself.
+    auto* self = new ScriptExecutionCallback(std::move(promise),
+                                             std::move(completion_callback));
+
     render_frame->GetWebFrame()->RequestExecuteScript(
-        world_id, base::make_span(sources), has_user_gesture,
-        scriptExecutionType,
-        new ScriptExecutionCallback(std::move(promise),
-                                    std::move(completion_callback)),
+        world_id, base::make_span(sources),
+        has_user_gesture ? blink::mojom::UserActivationOption::kActivate
+                         : blink::mojom::UserActivationOption::kDoNotActivate,
+        script_execution_type, load_blocking_option, base::NullCallback(),
+        base::BindOnce(&ScriptExecutionCallback::Completed,
+                       base::Unretained(self)),
         blink::BackForwardCacheAware::kPossiblyDisallow,
-        blink::WebLocalFrame::PromiseBehavior::kDontWait);
+        blink::mojom::PromiseResultOption::kDoNotWait);
 
     return handle;
   }
diff --git a/shell/renderer/electron_api_service_impl.cc b/shell/renderer/electron_api_service_impl.cc
index 7c39544973936..0a8f35bac6bc5 100644
--- a/shell/renderer/electron_api_service_impl.cc
+++ b/shell/renderer/electron_api_service_impl.cc
@@ -107,8 +107,8 @@ ElectronApiServiceImpl::ElectronApiServiceImpl(
     RendererClientBase* renderer_client)
     : content::RenderFrameObserver(render_frame),
       renderer_client_(renderer_client) {
-  registry_.AddInterface(base::BindRepeating(&ElectronApiServiceImpl::BindTo,
-                                             base::Unretained(this)));
+  registry_.AddInterface<mojom::ElectronRenderer>(base::BindRepeating(
+      &ElectronApiServiceImpl::BindTo, base::Unretained(this)));
 }
 
 void ElectronApiServiceImpl::BindTo(
diff --git a/shell/renderer/electron_autofill_agent.cc b/shell/renderer/electron_autofill_agent.cc
index 115f602c77660..c648ee17fb2a2 100644
--- a/shell/renderer/electron_autofill_agent.cc
+++ b/shell/renderer/electron_autofill_agent.cc
@@ -52,8 +52,8 @@ AutofillAgent::AutofillAgent(content::RenderFrame* frame,
                              blink::AssociatedInterfaceRegistry* registry)
     : content::RenderFrameObserver(frame) {
   render_frame()->GetWebFrame()->SetAutofillClient(this);
-  registry->AddInterface(base::BindRepeating(&AutofillAgent::BindReceiver,
-                                             base::Unretained(this)));
+  registry->AddInterface<mojom::ElectronAutofillAgent>(base::BindRepeating(
+      &AutofillAgent::BindReceiver, base::Unretained(this)));
 }
 
 AutofillAgent::~AutofillAgent() = default;
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
index b57b46cc8c580..9187dca38e7d4 100644
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -322,10 +322,11 @@ void RendererClientBase::RenderFrameCreated(
 
   dispatcher->OnRenderFrameCreated(render_frame);
 
-  render_frame->GetAssociatedInterfaceRegistry()->AddInterface(
-      base::BindRepeating(
-          &extensions::MimeHandlerViewContainerManager::BindReceiver,
-          render_frame->GetRoutingID()));
+  render_frame->GetAssociatedInterfaceRegistry()
+      ->AddInterface<extensions::mojom::MimeHandlerViewContainerManager>(
+          base::BindRepeating(
+              &extensions::MimeHandlerViewContainerManager::BindReceiver,
+              render_frame->GetRoutingID()));
 #endif
 
 #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
@@ -635,7 +636,7 @@ void RendererClientBase::AllowGuestViewElementDefinition(
 
   render_frame->GetWebFrame()->RequestExecuteV8Function(
       context->GetCreationContextChecked(), register_cb, v8::Null(isolate), 0,
-      nullptr, nullptr);
+      nullptr, base::NullCallback());
 }
 
 }  // namespace electron

From 672464d900267b9d0f531befb99516314ee02a99 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:36:23 -0700
Subject: [PATCH 718/811] docs: fix typescript error in code samples (#35656)

Fixed typescript error

Co-authored-by: Leon Schwanitz <leon@28minds.com>
---
 docs/fiddles/features/web-serial/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/fiddles/features/web-serial/main.js b/docs/fiddles/features/web-serial/main.js
index 37b9f35c27b2f..7150ec60651e9 100644
--- a/docs/fiddles/features/web-serial/main.js
+++ b/docs/fiddles/features/web-serial/main.js
@@ -33,12 +33,16 @@ function createWindow () {
     if (permission === 'serial' && details.securityOrigin === 'file:///') {
       return true
     }
+    
+    return false
   })
 
   mainWindow.webContents.session.setDevicePermissionHandler((details) => {
     if (details.deviceType === 'serial' && details.origin === 'file://') {
       return true
     }
+    
+    return false
   })
   
   mainWindow.loadFile('index.html')

From fad97e0b06643febc6aa2da89144aadd5c022c8b Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:51:45 -0700
Subject: [PATCH 719/811] docs: improve registerFileProtocol example (#35599)

docs: improve registerFileProtocol example (#35580)

* improve registerFileProtocol example

* link ProtocolResponse

* kick lint

Co-authored-by: Kishan Bagaria <hi@kishan.info>
---
 docs/api/protocol.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/api/protocol.md b/docs/api/protocol.md
index 7a2b334016191..8b0d2fbc89906 100644
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -10,11 +10,12 @@ An example of implementing a protocol that has the same effect as the
 ```javascript
 const { app, protocol } = require('electron')
 const path = require('path')
+const url = require('url')
 
 app.whenReady().then(() => {
   protocol.registerFileProtocol('atom', (request, callback) => {
-    const url = request.url.substr(7)
-    callback({ path: path.normalize(`${__dirname}/${url}`) })
+    const filePath = url.fileURLToPath('file://' + request.url.slice('atom://'.length))
+    callback(filePath)
   })
 })
 ```
@@ -175,7 +176,7 @@ property.
 * `handler` Function
   * `request` [ProtocolRequest](structures/protocol-request.md)
   * `callback` Function
-    * `response` ProtocolResponse
+    * `response` [ProtocolResponse](structures/protocol-response.md)
 
 Returns `boolean` - Whether the protocol was successfully registered
 

From 8becf52f11a9291c9f023212db6fc6fab9f21ccb Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 02:29:38 -0700
Subject: [PATCH 720/811] fix: allow maximizing when window enters tablet mode
 with WCO (#35664)

* fix: Backport CL 3753528 for WCO

* Update comment

* Update shell/browser/ui/views/win_caption_button_container.cc

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

Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Co-authored-by: Robo <hop2deep@gmail.com>
---
 shell/browser/ui/views/win_caption_button_container.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/browser/ui/views/win_caption_button_container.cc b/shell/browser/ui/views/win_caption_button_container.cc
index 92c0fca690cbd..99a7fc4bc057b 100644
--- a/shell/browser/ui/views/win_caption_button_container.cc
+++ b/shell/browser/ui/views/win_caption_button_container.cc
@@ -159,10 +159,11 @@ void WinCaptionButtonContainer::UpdateButtons() {
   const bool is_touch = ui::TouchUiController::Get()->touch_ui();
   restore_button_->SetEnabled(!is_touch);
 
-  // The maximize button should only be enabled if the window is
-  // maximizable *and* touch mode is disabled.
+  // In touch mode, windows cannot be taken out of fullscreen or tiled mode, so
+  // the maximize/restore button should be disabled, unless the window is not
+  // maximized.
   const bool maximizable = frame_view_->window()->IsMaximizable();
-  maximize_button_->SetEnabled(!is_touch && maximizable);
+  maximize_button_->SetEnabled(!(is_touch && is_maximized) && maximizable);
 
   const bool closable = frame_view_->window()->IsClosable();
   close_button_->SetEnabled(closable);

From 12992b253ce588969c1bb97ad91406fe97939df0 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:53:53 -0700
Subject: [PATCH 721/811] chore: make macOS spellchecker fns formal no-ops
 (#35679)

* chore: make macOS spellchecker fns formal no-ops

* docs: correct no-op note

* test: add no-op specs

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 docs/api/session.md                       |  2 +-
 shell/browser/api/electron_api_session.cc |  4 +++
 spec-main/spellchecker-spec.ts            | 38 +++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/docs/api/session.md b/docs/api/session.md
index 93f11522be042..c691f237e7260 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -932,7 +932,7 @@ Returns `string[]` - An array of language codes the spellchecker is enabled for.
 will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
 setting with the current OS locale.  This setting is persisted across restarts.
 
-**Note:** On macOS the OS spellchecker is used and has its own list of languages.  This API is a no-op on macOS.
+**Note:** On macOS the OS spellchecker is used and has its own list of languages. On macOS, this API will return whichever languages have been configured by the OS.
 
 #### `ses.setSpellCheckerDictionaryDownloadURL(url)`
 
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index 3b691b06bdbc3..a5d59b2d2b2d8 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -1024,6 +1024,7 @@ base::Value Session::GetSpellCheckerLanguages() {
 void Session::SetSpellCheckerLanguages(
     gin_helper::ErrorThrower thrower,
     const std::vector<std::string>& languages) {
+#if !BUILDFLAG(IS_MAC)
   base::Value::List language_codes;
   for (const std::string& lang : languages) {
     std::string code = spellcheck::GetCorrespondingSpellCheckLanguage(lang);
@@ -1039,10 +1040,12 @@ void Session::SetSpellCheckerLanguages(
   // Enable spellcheck if > 0 languages, disable if no languages set
   browser_context_->prefs()->SetBoolean(spellcheck::prefs::kSpellCheckEnable,
                                         !languages.empty());
+#endif
 }
 
 void SetSpellCheckerDictionaryDownloadURL(gin_helper::ErrorThrower thrower,
                                           const GURL& url) {
+#if !BUILDFLAG(IS_MAC)
   if (!url.is_valid()) {
     thrower.ThrowError(
         "The URL you provided to setSpellCheckerDictionaryDownloadURL is not a "
@@ -1050,6 +1053,7 @@ void SetSpellCheckerDictionaryDownloadURL(gin_helper::ErrorThrower thrower,
     return;
   }
   SpellcheckHunspellDictionary::SetBaseDownloadURL(url);
+#endif
 }
 
 v8::Local<v8::Promise> Session::ListWordsInSpellCheckerDictionary() {
diff --git a/spec-main/spellchecker-spec.ts b/spec-main/spellchecker-spec.ts
index 3cc058158729b..be16f63a6c7e6 100644
--- a/spec-main/spellchecker-spec.ts
+++ b/spec-main/spellchecker-spec.ts
@@ -212,6 +212,44 @@ ifdescribe(features.isBuiltinSpellCheckerEnabled())('spellchecker', function ()
           });
         });
 
+        describe('ses.setSpellCheckerLanguages', () => {
+          const isMac = process.platform === 'darwin';
+
+          ifit(isMac)('should be a no-op when setSpellCheckerLanguages is called on macOS', () => {
+            expect(() => {
+              w.webContents.session.setSpellCheckerLanguages(['i-am-a-nonexistent-language']);
+            }).to.not.throw();
+          });
+
+          ifit(!isMac)('should throw when a bad language is passed', () => {
+            expect(() => {
+              w.webContents.session.setSpellCheckerLanguages(['i-am-a-nonexistent-language']);
+            }).to.throw(/Invalid language code provided: "i-am-a-nonexistent-language" is not a valid language code/);
+          });
+
+          ifit(!isMac)('should not throw when a recognized language is passed', () => {
+            expect(() => {
+              w.webContents.session.setSpellCheckerLanguages(['es']);
+            }).to.not.throw();
+          });
+        });
+
+        describe('SetSpellCheckerDictionaryDownloadURL', () => {
+          const isMac = process.platform === 'darwin';
+
+          ifit(isMac)('should be a no-op when a bad url is passed on macOS', () => {
+            expect(() => {
+              w.webContents.session.setSpellCheckerDictionaryDownloadURL('i-am-not-a-valid-url');
+            }).to.not.throw();
+          });
+
+          ifit(!isMac)('should throw when a bad url is passed', () => {
+            expect(() => {
+              w.webContents.session.setSpellCheckerDictionaryDownloadURL('i-am-not-a-valid-url');
+            }).to.throw(/The URL you provided to setSpellCheckerDictionaryDownloadURL is not a valid URL/);
+          });
+        });
+
         describe('ses.removeWordFromSpellCheckerDictionary', () => {
           it('should successfully remove words to custom dictionary', async () => {
             const result1 = ses.addWordToSpellCheckerDictionary('foobar');

From b0b8fc2688f6d3fdacaac21bc12db048db6126d0 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 06:30:59 -0700
Subject: [PATCH 722/811] Bump v21.0.0-beta.6

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c8bf94a544abf..680e9b9bea5b6 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.5
\ No newline at end of file
+21.0.0-beta.6
\ No newline at end of file
diff --git a/package.json b/package.json
index 2b7bacaa6deb2..cac68d5f4f9c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.5",
+  "version": "21.0.0-beta.6",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b2beab41c0377..4bfcbdf9c74ce 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,5
- PRODUCTVERSION 21,0,0,5
+ FILEVERSION 21,0,0,6
+ PRODUCTVERSION 21,0,0,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From a2c687fcc3cbdcc3a865c3e203a40811af82cb75 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:38:03 -0700
Subject: [PATCH 723/811] Revert "Bump v21.0.0-beta.6"

This reverts commit b0b8fc2688f6d3fdacaac21bc12db048db6126d0.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 680e9b9bea5b6..c8bf94a544abf 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.6
\ No newline at end of file
+21.0.0-beta.5
\ No newline at end of file
diff --git a/package.json b/package.json
index cac68d5f4f9c3..2b7bacaa6deb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.6",
+  "version": "21.0.0-beta.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bfcbdf9c74ce..b2beab41c0377 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,6
- PRODUCTVERSION 21,0,0,6
+ FILEVERSION 21,0,0,5
+ PRODUCTVERSION 21,0,0,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From cbf5843c9a9455d2320040ba1a6387d929e88fc4 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 19:06:18 +0200
Subject: [PATCH 724/811] fix: WCO occlusion of DevTools (#35688)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 docs/api/web-contents.md                       | 2 ++
 shell/browser/api/electron_api_web_contents.cc | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 71f223081bdd6..0c7f18d55cd0e 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -1626,6 +1626,8 @@ Opens the devtools.
 When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
 explicitly passing an empty `mode` can force using last used dock state.
 
+On Windows, if Windows Control Overlay is enabled, Devtools will be opened with `mode: 'detach'`.
+
 #### `contents.closeDevTools()`
 
 Closes the devtools.
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index e6cd258588445..e74f2523d5d5e 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -175,6 +175,7 @@
 
 #if BUILDFLAG(IS_WIN)
 #include "printing/backend/win_helper.h"
+#include "shell/browser/native_window_views.h"
 #endif
 #endif
 
@@ -2415,6 +2416,14 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
     }
   }
 
+#if BUILDFLAG(IS_WIN)
+  auto* win = static_cast<NativeWindowViews*>(owner_window());
+  // Force a detached state when WCO is enabled to match Chrome
+  // behavior and prevent occlusion of DevTools.
+  if (win && win->IsWindowControlsOverlayEnabled())
+    state = "detach";
+#endif
+
   DCHECK(inspectable_web_contents_);
   inspectable_web_contents_->SetDockState(state);
   inspectable_web_contents_->ShowDevTools(activate);

From 5e7ff852f31c4957f831d29d7022e78ded065bda Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:13:25 -0700
Subject: [PATCH 725/811] chore: bump chromium to 106.0.5249.40 (21-x-y)
 (#35686)

* chore: bump chromium in DEPS to 106.0.5249.40

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                             |  2 +-
 ...apt_exclusive_access_for_electron_needs.patch | 16 ++++++++--------
 .../mas_disable_remote_accessibility.patch       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DEPS b/DEPS
index dfd7929b7e30a..ffca45b11d44a 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.30',
+    '106.0.5249.40',
   'node_version':
     'v16.16.0',
   'nan_version':
diff --git a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
index b9facbb0e987d..6daf2cabfd185 100644
--- a/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
+++ b/patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
@@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
 change.
 
 diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
-index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff118eed07 100644
+index 8106b5ceec5b6b3ca01d14308a351e63eac809c1..5758757980879a9c1810c4de44f228860688d442 100644
 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
 @@ -17,12 +17,16 @@
@@ -36,7 +36,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
  #include "chrome/common/chrome_switches.h"
  #include "content/public/browser/navigation_details.h"
  #include "content/public/browser/navigation_entry.h"
-@@ -177,6 +181,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -181,6 +185,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      return;
    }
  
@@ -44,7 +44,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
    if (base::FeatureList::IsEnabled(
            blink::features::kWindowPlacementFullscreenCompanionWindow)) {
      if (!popunder_preventer_)
-@@ -184,6 +189,7 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -188,6 +193,7 @@ void FullscreenController::EnterFullscreenModeForTab(
      else
        popunder_preventer_->WillActivateWebContents(web_contents);
    }
@@ -52,7 +52,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
  
    // Keep the current state. |SetTabWithExclusiveAccess| may change the return
    // value of |IsWindowFullscreenForTabOrPending|.
-@@ -233,7 +239,9 @@ void FullscreenController::EnterFullscreenModeForTab(
+@@ -237,7 +243,9 @@ void FullscreenController::EnterFullscreenModeForTab(
  }
  
  void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -62,7 +62,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
  
    if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
      // During tab capture of fullscreen-within-tab views, the browser window
-@@ -288,11 +296,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
+@@ -292,11 +300,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
  void FullscreenController::FullscreenTabOpeningPopup(
      content::WebContents* opener,
      content::WebContents* popup) {
@@ -76,7 +76,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
  }
  
  void FullscreenController::OnTabDeactivated(
-@@ -460,18 +470,17 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -465,18 +475,17 @@ void FullscreenController::EnterFullscreenModeInternal(
    // Do not enter fullscreen mode if disallowed by pref. This prevents the user
    // from manually entering fullscreen mode and also disables kiosk mode on
    // desktop platforms.
@@ -100,7 +100,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
    if (option == TAB) {
      url = GetRequestingOrigin();
      tab_fullscreen_ = true;
-@@ -498,6 +507,7 @@ void FullscreenController::EnterFullscreenModeInternal(
+@@ -509,6 +518,7 @@ void FullscreenController::EnterFullscreenModeInternal(
      if (!extension_caused_fullscreen_.is_empty())
        url = extension_caused_fullscreen_;
    }
@@ -108,7 +108,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
  
    if (option == BROWSER)
      base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
-@@ -525,12 +535,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
+@@ -536,12 +546,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
    RecordExitingUMA();
    toggled_into_fullscreen_ = false;
    started_fullscreen_transition_ = true;
diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch
index 81239e0f75fef..f24ef46dfb0ed 100644
--- a/patches/chromium/mas_disable_remote_accessibility.patch
+++ b/patches/chromium/mas_disable_remote_accessibility.patch
@@ -197,7 +197,7 @@ index d460e055c8bc70845cdf89567e17a79da70fd9f1..f28dcfe0721239ca9341a0db80e8626a
  
  ///////////////////////////////////////////////////////////////////////////////
 diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
-index 012ab83bb9f4887646decb030b4a18f6b21e0d01..0d8b56cc387b24833ec7950a8049e038f650020c 100644
+index 8efef6d9adbca21613be3c32fe9f43b2d50ff8c5..6e819be94a6a5e8a26598f4883697719fecef693 100644
 --- a/ui/base/BUILD.gn
 +++ b/ui/base/BUILD.gn
 @@ -341,6 +341,13 @@ component("base") {

From 908751b4f179395f2fb0289f64b9757ad7edcf73 Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Thu, 15 Sep 2022 13:17:05 -0700
Subject: [PATCH 726/811] chore: update filenames.libcxx.gni (#35689)

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 filenames.libcxx.gni | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/filenames.libcxx.gni b/filenames.libcxx.gni
index 4d45f286950a0..e2f5c15d90e64 100644
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -1,7 +1,6 @@
 libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/adjacent_find.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/algorithm_family.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/all_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/any_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/binary_search.h",
@@ -74,6 +73,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_all_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_any_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_binary_search.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_clamp.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_backward.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_if.h",
@@ -98,6 +98,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap_until.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_partitioned.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted_until.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_iterator_concept.h",
@@ -114,6 +115,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_mismatch.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move_backward.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_next_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_none_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_nth_element.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partial_sort.h",
@@ -122,6 +124,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_point.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_pop_heap.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_prev_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_push_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_copy.h",
@@ -133,7 +136,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_if.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_rotate.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_rotate_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sample.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search_n.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_difference.h",
@@ -179,6 +184,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_sort.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/swap_ranges.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/transform.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/uniform_random_bit_generator_adaptor.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_iter.h",
@@ -328,6 +334,8 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/hash.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/pair.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/span.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/string_view.h",
   "//buildtools/third_party/libc++/trunk/include/__hash_table",
@@ -514,6 +522,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/aligned_union.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/alignment_of.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/apply_cv.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/can_extract_key.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/common_reference.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/common_type.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/conditional.h",
@@ -521,6 +530,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cv.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cvref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/decay.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/dependent_type.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/disjunction.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/enable_if.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/extent.h",
@@ -535,6 +545,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_base_of.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_bounded_array.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_callable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_char_like_type.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_class.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_compound.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_const.h",
@@ -552,6 +563,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_floating_point.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_function.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_fundamental.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_implicitly_default_constructible.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_integral.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_literal_type.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_function_pointer.h",
@@ -583,6 +595,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_standard_layout.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_swappable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivial.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_assignable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_constructible.h",
@@ -602,20 +615,24 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_volatile.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/lazy.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_const_lvalue_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/make_signed.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/make_unsigned.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/maybe_const.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/nat.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/negation.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/promote.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/rank.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_all_extents.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_const.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_const_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cv.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cvref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_extent.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_pointer.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_reference.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_volatile.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/result_of.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_identity.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_list.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/underlying_type.h",
@@ -624,6 +641,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/auto_cast.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/cmp.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/convert_to_integral.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/declval.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/exchange.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/forward.h",
@@ -639,6 +657,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__utility/transaction.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/unreachable.h",
   "//buildtools/third_party/libc++/trunk/include/__variant/monostate.h",
+  "//buildtools/third_party/libc++/trunk/include/__verbose_abort",
   "//buildtools/third_party/libc++/trunk/include/algorithm",
   "//buildtools/third_party/libc++/trunk/include/any",
   "//buildtools/third_party/libc++/trunk/include/array",

From afd392b921a0a9f83be0364ea31a71510cee3dfd Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:17:39 -0700
Subject: [PATCH 727/811] docs: add back docs about asar archives (#35667)

Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
---
 docs/README.md                 |   1 +
 docs/tutorial/asar-archives.md | 175 +++++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 docs/tutorial/asar-archives.md

diff --git a/docs/README.md b/docs/README.md
index e346d985d755d..40ae2be10c18c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -68,6 +68,7 @@ an issue:
   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
   * [Windows Store](tutorial/windows-store-guide.md)
   * [Snapcraft](tutorial/snapcraft.md)
+  * [ASAR Archives](tutorial/asar-archives.md)
 * [Updates](tutorial/updates.md)
 * [Getting Support](tutorial/support.md)
 
diff --git a/docs/tutorial/asar-archives.md b/docs/tutorial/asar-archives.md
new file mode 100644
index 0000000000000..23b987f42ee50
--- /dev/null
+++ b/docs/tutorial/asar-archives.md
@@ -0,0 +1,175 @@
+---
+title: ASAR Archives
+description: What is ASAR archive and how does it affect the application.
+slug: asar-archives
+hide_title: false
+---
+
+After creating an [application distribution](application-distribution.md), the
+app's source code are usually bundled into an [ASAR
+archive](https://github.com/electron/asar), which is a simple extensive archive
+format designed for Electron apps. By bundling the app we can mitigate issues
+around long path names on Windows, speed up `require` and conceal your source
+code from cursory inspection.
+
+The bundled app runs in a virtual file system and most APIs would just work
+normally, but for some cases you might want to work on ASAR archives explicitly
+due to a few caveats.
+
+## Using ASAR Archives
+
+In Electron there are two sets of APIs: Node APIs provided by Node.js and Web
+APIs provided by Chromium. Both APIs support reading files from ASAR archives.
+
+### Node API
+
+With special patches in Electron, Node APIs like `fs.readFile` and `require`
+treat ASAR archives as virtual directories, and the files in it as normal
+files in the filesystem.
+
+For example, suppose we have an `example.asar` archive under `/path/to`:
+
+```sh
+$ asar list /path/to/example.asar
+/app.js
+/file.txt
+/dir/module.js
+/static/index.html
+/static/main.css
+/static/jquery.min.js
+```
+
+Read a file in the ASAR archive:
+
+```javascript
+const fs = require('fs')
+fs.readFileSync('/path/to/example.asar/file.txt')
+```
+
+List all files under the root of the archive:
+
+```javascript
+const fs = require('fs')
+fs.readdirSync('/path/to/example.asar')
+```
+
+Use a module from the archive:
+
+```javascript
+require('./path/to/example.asar/dir/module.js')
+```
+
+You can also display a web page in an ASAR archive with `BrowserWindow`:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow()
+
+win.loadURL('file:///path/to/example.asar/static/index.html')
+```
+
+### Web API
+
+In a web page, files in an archive can be requested with the `file:` protocol.
+Like the Node API, ASAR archives are treated as directories.
+
+For example, to get a file with `$.get`:
+
+```html
+<script>
+let $ = require('./jquery.min.js')
+$.get('file:///path/to/example.asar/file.txt', (data) => {
+  console.log(data)
+})
+</script>
+```
+
+### Treating an ASAR archive as a Normal File
+
+For some cases like verifying the ASAR archive's checksum, we need to read the
+content of an ASAR archive as a file. For this purpose you can use the built-in
+`original-fs` module which provides original `fs` APIs without `asar` support:
+
+```javascript
+const originalFs = require('original-fs')
+originalFs.readFileSync('/path/to/example.asar')
+```
+
+You can also set `process.noAsar` to `true` to disable the support for `asar` in
+the `fs` module:
+
+```javascript
+const fs = require('fs')
+process.noAsar = true
+fs.readFileSync('/path/to/example.asar')
+```
+
+## Limitations of the Node API
+
+Even though we tried hard to make ASAR archives in the Node API work like
+directories as much as possible, there are still limitations due to the
+low-level nature of the Node API.
+
+### Archives Are Read-only
+
+The archives can not be modified so all Node APIs that can modify files will not
+work with ASAR archives.
+
+### Working Directory Can Not Be Set to Directories in Archive
+
+Though ASAR archives are treated as directories, there are no actual
+directories in the filesystem, so you can never set the working directory to
+directories in ASAR archives. Passing them as the `cwd` option of some APIs
+will also cause errors.
+
+### Extra Unpacking on Some APIs
+
+Most `fs` APIs can read a file or get a file's information from ASAR archives
+without unpacking, but for some APIs that rely on passing the real file path to
+underlying system calls, Electron will extract the needed file into a
+temporary file and pass the path of the temporary file to the APIs to make them
+work. This adds a little overhead for those APIs.
+
+APIs that requires extra unpacking are:
+
+* `child_process.execFile`
+* `child_process.execFileSync`
+* `fs.open`
+* `fs.openSync`
+* `process.dlopen` - Used by `require` on native modules
+
+### Fake Stat Information of `fs.stat`
+
+The `Stats` object returned by `fs.stat` and its friends on files in `asar`
+archives is generated by guessing, because those files do not exist on the
+filesystem. So you should not trust the `Stats` object except for getting file
+size and checking file type.
+
+### Executing Binaries Inside ASAR archive
+
+There are Node APIs that can execute binaries like `child_process.exec`,
+`child_process.spawn` and `child_process.execFile`, but only `execFile` is
+supported to execute binaries inside ASAR archive.
+
+This is because `exec` and `spawn` accept `command` instead of `file` as input,
+and `command`s are executed under shell. There is no reliable way to determine
+whether a command uses a file in asar archive, and even if we do, we can not be
+sure whether we can replace the path in command without side effects.
+
+## Adding Unpacked Files to ASAR archives
+
+As stated above, some Node APIs will unpack the file to the filesystem when
+called. Apart from the performance issues, various anti-virus scanners might
+be triggered by this behavior.
+
+As a workaround, you can leave various files unpacked using the `--unpack` option.
+In the following example, shared libraries of native Node.js modules will not be
+packed:
+
+```sh
+$ asar pack app app.asar --unpack *.node
+```
+
+After running the command, you will notice that a folder named `app.asar.unpacked`
+was created together with the `app.asar` file. It contains the unpacked files
+and should be shipped together with the `app.asar` archive.

From cb08a466ac9bb9819dbffdbf93e4255aad51e865 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:31:46 -0700
Subject: [PATCH 728/811] Bump v21.0.0-beta.6

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c8bf94a544abf..680e9b9bea5b6 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.5
\ No newline at end of file
+21.0.0-beta.6
\ No newline at end of file
diff --git a/package.json b/package.json
index 2b7bacaa6deb2..cac68d5f4f9c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.5",
+  "version": "21.0.0-beta.6",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b2beab41c0377..4bfcbdf9c74ce 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,5
- PRODUCTVERSION 21,0,0,5
+ FILEVERSION 21,0,0,6
+ PRODUCTVERSION 21,0,0,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c5e920e361bce1abb4beaa2569535fa970985753 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:05:12 -0700
Subject: [PATCH 729/811] build: make check-symlinks.js aware of BRANDING.json
 changes (#35669)

Right now the `check-symlinks.js` assumes that the branding product name
is "Electron". If users change `BRANDING.json` on custom builds, the
script will fail.

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
Co-authored-by: Juan Cruz Viotti <jv@jviotti.com>
---
 script/check-symlinks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/check-symlinks.js b/script/check-symlinks.js
index db422bb6dc7e6..c68e2ac27eb82 100644
--- a/script/check-symlinks.js
+++ b/script/check-symlinks.js
@@ -2,13 +2,14 @@ const fs = require('fs');
 const path = require('path');
 
 const utils = require('./lib/utils');
+const branding = require('../shell/app/BRANDING.json');
 
 if (process.platform !== 'darwin') {
   console.log('Not checking symlinks on non-darwin platform');
   process.exit(0);
 }
 
-const appPath = path.resolve(__dirname, '..', '..', 'out', utils.getOutDir(), 'Electron.app');
+const appPath = path.resolve(__dirname, '..', '..', 'out', utils.getOutDir(), `${branding.product_name}.app`);
 const visited = new Set();
 const traverse = (p) => {
   if (visited.has(p)) return;

From b5cf0ad9710d0c36f51d9cbcb3dff927ba951093 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:20:20 -0700
Subject: [PATCH 730/811] feat: webFrameMain.origin (#35534)

* feat: webFrameMain.origin

* add tests

* update docs

* fix spec

Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
---
 docs/api/web-frame-main.md                    | 10 +++
 .../api/electron_api_web_frame_main.cc        |  7 ++
 .../browser/api/electron_api_web_frame_main.h |  1 +
 spec-main/api-web-frame-main-spec.ts          | 78 +++++++++++++++----
 4 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/docs/api/web-frame-main.md b/docs/api/web-frame-main.md
index 8ce004b6e9172..3d3b87b354028 100644
--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -169,6 +169,16 @@ convenient when `nodeIntegrationInSubFrames` is not enabled.
 
 A `string` representing the current URL of the frame.
 
+#### `frame.origin` _Readonly_
+
+A `string` representing the current origin of the frame, serialized according
+to [RFC 6454](https://www.rfc-editor.org/rfc/rfc6454). This may be different
+from the URL. For instance, if the frame is a child window opened to
+`about:blank`, then `frame.origin` will return the parent frame's origin, while
+`frame.url` will return the empty string. Pages without a scheme/host/port
+triple origin will have the serialized origin of `"null"` (that is, the string
+containing the letters n, u, l, l).
+
 #### `frame.top` _Readonly_
 
 A `WebFrameMain | null` representing top frame in the frame hierarchy to which `frame`
diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc
index 178d3e30bda98..0c92c632f3909 100644
--- a/shell/browser/api/electron_api_web_frame_main.cc
+++ b/shell/browser/api/electron_api_web_frame_main.cc
@@ -296,6 +296,12 @@ GURL WebFrameMain::URL() const {
   return render_frame_->GetLastCommittedURL();
 }
 
+std::string WebFrameMain::Origin() const {
+  if (!CheckRenderFrame())
+    return std::string();
+  return render_frame_->GetLastCommittedOrigin().Serialize();
+}
+
 blink::mojom::PageVisibilityState WebFrameMain::VisibilityState() const {
   if (!CheckRenderFrame())
     return blink::mojom::PageVisibilityState::kHidden;
@@ -397,6 +403,7 @@ v8::Local<v8::ObjectTemplate> WebFrameMain::FillObjectTemplate(
       .SetProperty("processId", &WebFrameMain::ProcessID)
       .SetProperty("routingId", &WebFrameMain::RoutingID)
       .SetProperty("url", &WebFrameMain::URL)
+      .SetProperty("origin", &WebFrameMain::Origin)
       .SetProperty("visibilityState", &WebFrameMain::VisibilityState)
       .SetProperty("top", &WebFrameMain::Top)
       .SetProperty("parent", &WebFrameMain::Parent)
diff --git a/shell/browser/api/electron_api_web_frame_main.h b/shell/browser/api/electron_api_web_frame_main.h
index e8f1715ab83a2..32e5e351d505d 100644
--- a/shell/browser/api/electron_api_web_frame_main.h
+++ b/shell/browser/api/electron_api_web_frame_main.h
@@ -109,6 +109,7 @@ class WebFrameMain : public gin::Wrappable<WebFrameMain>,
   int ProcessID() const;
   int RoutingID() const;
   GURL URL() const;
+  std::string Origin() const;
   blink::mojom::PageVisibilityState VisibilityState() const;
 
   content::RenderFrameHost* Top() const;
diff --git a/spec-main/api-web-frame-main-spec.ts b/spec-main/api-web-frame-main-spec.ts
index 1bc812832fad5..9ce8f071e2f17 100644
--- a/spec-main/api-web-frame-main-spec.ts
+++ b/spec-main/api-web-frame-main-spec.ts
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import * as http from 'http';
 import * as path from 'path';
 import * as url from 'url';
-import { BrowserWindow, WebFrameMain, webFrameMain, ipcMain } from 'electron/main';
+import { BrowserWindow, WebFrameMain, webFrameMain, ipcMain, app, WebContents } from 'electron/main';
 import { closeAllWindows } from './window-helpers';
 import { emittedOnce, emittedNTimes } from './events-helpers';
 import { AddressInfo } from 'net';
-import { ifit, waitUntil } from './spec-helpers';
+import { defer, ifit, waitUntil } from './spec-helpers';
 
 describe('webFrameMain module', () => {
   const fixtures = path.resolve(__dirname, '..', 'spec-main', 'fixtures');
@@ -39,7 +39,7 @@ describe('webFrameMain module', () => {
     let webFrame: WebFrameMain;
 
     beforeEach(async () => {
-      w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
       webFrame = w.webContents.mainFrame;
     });
@@ -88,8 +88,8 @@ describe('webFrameMain module', () => {
     });
 
     describe('cross-origin', () => {
-      let serverA = null as unknown as Server;
-      let serverB = null as unknown as Server;
+      let serverA: Server;
+      let serverB: Server;
 
       before(async () => {
         serverA = await createServer();
@@ -112,7 +112,7 @@ describe('webFrameMain module', () => {
 
   describe('WebFrame.url', () => {
     it('should report correct address for each subframe', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
       const webFrame = w.webContents.mainFrame;
 
@@ -122,9 +122,59 @@ describe('webFrameMain module', () => {
     });
   });
 
+  describe('WebFrame.origin', () => {
+    it('should be null for a fresh WebContents', () => {
+      const w = new BrowserWindow({ show: false });
+      expect(w.webContents.mainFrame.origin).to.equal('null');
+    });
+
+    it('should be file:// for file frames', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadFile(path.join(fixtures, 'blank.html'));
+      expect(w.webContents.mainFrame.origin).to.equal('file://');
+    });
+
+    it('should be http:// for an http frame', async () => {
+      const w = new BrowserWindow({ show: false });
+      const s = await createServer();
+      defer(() => s.server.close());
+      await w.loadURL(s.url);
+      expect(w.webContents.mainFrame.origin).to.equal(s.url.replace(/\/$/, ''));
+    });
+
+    it('should show parent origin when child page is about:blank', async () => {
+      const w = new BrowserWindow({ show: false });
+      await w.loadFile(path.join(fixtures, 'blank.html'));
+      const webContentsCreated: Promise<[unknown, WebContents]> = emittedOnce(app, 'web-contents-created') as any;
+      expect(w.webContents.mainFrame.origin).to.equal('file://');
+      await w.webContents.executeJavaScript('window.open("", null, "show=false"), null');
+      const [, childWebContents] = await webContentsCreated;
+      expect(childWebContents.mainFrame.origin).to.equal('file://');
+    });
+
+    it('should show parent frame\'s origin when about:blank child window opened through cross-origin subframe', async () => {
+      const w = new BrowserWindow({ show: false });
+      const serverA = await createServer();
+      const serverB = await createServer();
+      defer(() => {
+        serverA.server.close();
+        serverB.server.close();
+      });
+      await w.loadURL(serverA.url + '?frameSrc=' + encodeURIComponent(serverB.url));
+      const { mainFrame } = w.webContents;
+      expect(mainFrame.origin).to.equal(serverA.url.replace(/\/$/, ''));
+      const [childFrame] = mainFrame.frames;
+      expect(childFrame.origin).to.equal(serverB.url.replace(/\/$/, ''));
+      const webContentsCreated: Promise<[unknown, WebContents]> = emittedOnce(app, 'web-contents-created') as any;
+      await childFrame.executeJavaScript('window.open("", null, "show=false"), null');
+      const [, childWebContents] = await webContentsCreated;
+      expect(childWebContents.mainFrame.origin).to.equal(childFrame.origin);
+    });
+  });
+
   describe('WebFrame IDs', () => {
     it('has properties for various identifiers', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame.html'));
       const webFrame = w.webContents.mainFrame;
       expect(webFrame).to.have.ownProperty('url').that.is.a('string');
@@ -154,7 +204,7 @@ describe('webFrameMain module', () => {
 
   describe('WebFrame.executeJavaScript', () => {
     it('can inject code into any subframe', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
       const webFrame = w.webContents.mainFrame;
 
@@ -165,7 +215,7 @@ describe('webFrameMain module', () => {
     });
 
     it('can resolve promise', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame.html'));
       const webFrame = w.webContents.mainFrame;
       const p = () => webFrame.executeJavaScript('new Promise(resolve => setTimeout(resolve(42), 2000));');
@@ -174,7 +224,7 @@ describe('webFrameMain module', () => {
     });
 
     it('can reject with error', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame.html'));
       const webFrame = w.webContents.mainFrame;
       const p = () => webFrame.executeJavaScript('new Promise((r,e) => setTimeout(e("error!"), 500));');
@@ -195,7 +245,7 @@ describe('webFrameMain module', () => {
     });
 
     it('can reject when script execution fails', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame.html'));
       const webFrame = w.webContents.mainFrame;
       const p = () => webFrame.executeJavaScript('console.log(test)');
@@ -205,7 +255,7 @@ describe('webFrameMain module', () => {
 
   describe('WebFrame.reload', () => {
     it('reloads a frame', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
       await w.loadFile(path.join(subframesPath, 'frame.html'));
       const webFrame = w.webContents.mainFrame;
 
@@ -238,7 +288,7 @@ describe('webFrameMain module', () => {
     let w: BrowserWindow;
 
     beforeEach(async () => {
-      w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      w = new BrowserWindow({ show: false });
     });
 
     // TODO(jkleinsc) fix this flaky test on linux
@@ -301,7 +351,7 @@ describe('webFrameMain module', () => {
     });
 
     it('can find each frame from navigation events', async () => {
-      const w = new BrowserWindow({ show: false, webPreferences: { contextIsolation: true } });
+      const w = new BrowserWindow({ show: false });
 
       // frame-with-frame-container.html, frame-with-frame.html, frame.html
       const didFrameFinishLoad = emittedNTimes(w.webContents, 'did-frame-finish-load', 3);

From 99d9537ef72511da49e1e9df6dbf84fca055cc56 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:20:47 -0700
Subject: [PATCH 731/811] build: fix building with enable_basic_printing false
 (#35693)

Co-authored-by: Milan Burda <miburda@microsoft.com>
---
 shell/browser/api/electron_api_web_contents.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index e74f2523d5d5e..ed4e6c6825324 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -143,6 +143,10 @@
 #include "shell/browser/osr/osr_web_contents_view.h"
 #endif
 
+#if BUILDFLAG(IS_WIN)
+#include "shell/browser/native_window_views.h"
+#endif
+
 #if !BUILDFLAG(IS_MAC)
 #include "ui/aura/window.h"
 #else
@@ -175,9 +179,8 @@
 
 #if BUILDFLAG(IS_WIN)
 #include "printing/backend/win_helper.h"
-#include "shell/browser/native_window_views.h"
-#endif
 #endif
+#endif  // BUILDFLAG(ENABLE_PRINTING)
 
 #if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
 #include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"

From 8b6b8824876d18a9d8473dff2316b54ab9b7a4c7 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 06:30:51 -0700
Subject: [PATCH 732/811] Bump v21.0.0-beta.7

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 680e9b9bea5b6..f170e99978b5b 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.6
\ No newline at end of file
+21.0.0-beta.7
\ No newline at end of file
diff --git a/package.json b/package.json
index cac68d5f4f9c3..efcaeac7e2924 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.6",
+  "version": "21.0.0-beta.7",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 4bfcbdf9c74ce..e1b5e1c888e5e 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,6
- PRODUCTVERSION 21,0,0,6
+ FILEVERSION 21,0,0,7
+ PRODUCTVERSION 21,0,0,7
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 64b5d7be2efc48e30c9b5fb3094f48c640a25f7d Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:27:52 -0400
Subject: [PATCH 733/811] build: update `.nvmrc` Node.js version from 14 to 16
 (#35700)

Update `.nvmrc` Node.js version from 14 to 16

The `DEPS` file states that Electron is on Node.js ^16.x. I am guessing that the PR bumping to Node.js 16 overlooked the `.nvmrc` file, which is updated in this PR. If leaving the `.nvmrc` file on 14 was intentional, please disregard this PR.

Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 8351c19397f4f..b6a7d89c68e0c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14
+16

From a1789897d3311fa308e8b9efdece9ce9c1aef543 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 08:31:58 -0700
Subject: [PATCH 734/811] fix: uv_os_gethostname failing on Windows 7 (libuv
 patch regression) (#35704)

Co-authored-by: Milan Burda <miburda@microsoft.com>
---
 ...ash_caused_by_gethostnamew_on_windows_7.patch | 16 +++++++++++++++-
 ...lang_-wdeprecated-declarations_in_libuv.patch |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch b/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
index 5ebadbf25bec8..8d1899062c761 100644
--- a/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
+++ b/patches/node/fix_crash_caused_by_gethostnamew_on_windows_7.patch
@@ -6,7 +6,7 @@ Subject: fix: crash caused by GetHostNameW on Windows 7
 Backported from https://github.com/libuv/libuv/pull/3285.
 
 diff --git a/deps/uv/src/win/util.c b/deps/uv/src/win/util.c
-index 33e874ac442f88b58d2b68c8ec9764f6f664552e..2d4cc0aaa02e61bf359e80eca27527efb49fd85e 100644
+index 33e874ac442f88b58d2b68c8ec9764f6f664552e..37ece5e2867ab836492a8b7faa0aa5e1b8e562f0 100644
 --- a/deps/uv/src/win/util.c
 +++ b/deps/uv/src/win/util.c
 @@ -37,6 +37,7 @@
@@ -166,3 +166,17 @@ index 33e874ac442f88b58d2b68c8ec9764f6f664552e..2d4cc0aaa02e61bf359e80eca27527ef
  int uv_os_gethostname(char* buffer, size_t* size) {
    WCHAR buf[UV_MAXHOSTNAMESIZE];
    size_t len;
+@@ -1674,10 +1803,10 @@ int uv_os_gethostname(char* buffer, size_t* size) {
+ 
+   uv__once_init(); /* Initialize winsock */
+ 
+-  if (pGetHostNameW == NULL)
+-    return UV_ENOSYS;
++  uv_sGetHostNameW gethostnamew =
++      pGetHostNameW == NULL ? uv__gethostnamew_nt60 : pGetHostNameW;
+ 
+-  if (pGetHostNameW(buf, UV_MAXHOSTNAMESIZE) != 0)
++  if (gethostnamew(buf, UV_MAXHOSTNAMESIZE) != 0)
+     return uv_translate_sys_error(WSAGetLastError());
+ 
+   convert_result = uv__convert_utf16_to_utf8(buf, -1, &utf8_str);
diff --git a/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch b/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
index bb7df671a3957..a6ae0650793b4 100644
--- a/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
+++ b/patches/node/fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
@@ -6,7 +6,7 @@ Subject: fix: suppress clang -Wdeprecated-declarations in libuv
 Should be upstreamed.
 
 diff --git a/deps/uv/src/win/util.c b/deps/uv/src/win/util.c
-index 2d4cc0aaa02e61bf359e80eca27527efb49fd85e..aaa16052e2a9c7d1dca82763c41c0890371f1471 100644
+index 37ece5e2867ab836492a8b7faa0aa5e1b8e562f0..d50296728f7e0810064647125a469f3ed714f8ea 100644
 --- a/deps/uv/src/win/util.c
 +++ b/deps/uv/src/win/util.c
 @@ -1950,10 +1950,17 @@ int uv_os_uname(uv_utsname_t* buffer) {

From 3437ffca8b6ab582b360a4a2f3372c140269a5b0 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:50:46 -0400
Subject: [PATCH 735/811] fix: edge case in app.isInApplicationsFolder()
 (#35730)

fix: edge case in app.isInApplicationsFolder() (#35636)

* fix: edge case in IsInApplicationsFolder

* use realpath instead

* lint

* revert lowercasing

* optimize

* Update shell/browser/ui/cocoa/electron_bundle_mover.mm

* lint

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

Co-authored-by: Kishan Bagaria <hi@kishan.info>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 shell/browser/ui/cocoa/electron_bundle_mover.mm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/shell/browser/ui/cocoa/electron_bundle_mover.mm b/shell/browser/ui/cocoa/electron_bundle_mover.mm
index 881b49c9fa467..57dcadc9932d9 100644
--- a/shell/browser/ui/cocoa/electron_bundle_mover.mm
+++ b/shell/browser/ui/cocoa/electron_bundle_mover.mm
@@ -182,18 +182,27 @@
   return IsInApplicationsFolder([[NSBundle mainBundle] bundlePath]);
 }
 
+NSString* resolvePath(NSString* path) {
+  NSString* standardizedPath = [path stringByStandardizingPath];
+  char resolved[PATH_MAX];
+  if (realpath([standardizedPath UTF8String], resolved) == NULL)
+    return path;
+  return @(resolved);
+}
+
 bool ElectronBundleMover::IsInApplicationsFolder(NSString* bundlePath) {
   // Check all the normal Application directories
   NSArray* applicationDirs = NSSearchPathForDirectoriesInDomains(
       NSApplicationDirectory, NSAllDomainsMask, true);
+  NSString* resolvedBundlePath = resolvePath(bundlePath);
   for (NSString* appDir in applicationDirs) {
-    if ([bundlePath hasPrefix:appDir])
+    if ([resolvedBundlePath hasPrefix:appDir])
       return true;
   }
 
   // Also, handle the case that the user has some other Application directory
   // (perhaps on a separate data partition).
-  if ([[bundlePath pathComponents] containsObject:@"Applications"])
+  if ([[resolvedBundlePath pathComponents] containsObject:@"Applications"])
     return true;
 
   return false;

From f18485f8bf98739ede44c6235d92c7c389237736 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 12:22:42 -0500
Subject: [PATCH 736/811] chore: fix ambiguous reference gcc compile error
 (#35734)

Co-authored-by: Bruno Pitrus <brunopitrus@hotmail.com>
---
 shell/browser/serial/electron_serial_delegate.cc | 10 ++++++----
 shell/browser/serial/electron_serial_delegate.h  |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc
index 2306be383db46..0c7f63d4ab9fe 100644
--- a/shell/browser/serial/electron_serial_delegate.cc
+++ b/shell/browser/serial/electron_serial_delegate.cc
@@ -66,16 +66,18 @@ device::mojom::SerialPortManager* ElectronSerialDelegate::GetPortManager(
   return GetChooserContext(frame)->GetPortManager();
 }
 
-void ElectronSerialDelegate::AddObserver(content::RenderFrameHost* frame,
-                                         Observer* observer) {
+void ElectronSerialDelegate::AddObserver(
+    content::RenderFrameHost* frame,
+    content::SerialDelegate::Observer* observer) {
   observer_list_.AddObserver(observer);
   auto* chooser_context = GetChooserContext(frame);
   if (!port_observation_.IsObserving())
     port_observation_.Observe(chooser_context);
 }
 
-void ElectronSerialDelegate::RemoveObserver(content::RenderFrameHost* frame,
-                                            Observer* observer) {
+void ElectronSerialDelegate::RemoveObserver(
+    content::RenderFrameHost* frame,
+    content::SerialDelegate::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h
index 5876d7e511041..add2c4471f1e4 100644
--- a/shell/browser/serial/electron_serial_delegate.h
+++ b/shell/browser/serial/electron_serial_delegate.h
@@ -38,9 +38,9 @@ class ElectronSerialDelegate : public content::SerialDelegate,
   device::mojom::SerialPortManager* GetPortManager(
       content::RenderFrameHost* frame) override;
   void AddObserver(content::RenderFrameHost* frame,
-                   Observer* observer) override;
+                   content::SerialDelegate::Observer* observer) override;
   void RemoveObserver(content::RenderFrameHost* frame,
-                      Observer* observer) override;
+                      content::SerialDelegate::Observer* observer) override;
   void RevokePortPermissionWebInitiated(
       content::RenderFrameHost* frame,
       const base::UnguessableToken& token) override;

From fc1d8a80e66cf442c915cce11f62b739ad429189 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 22:04:31 -0500
Subject: [PATCH 737/811] chore: add missing .eslintrc.json files to limit
 imports properly (#35747)

Co-authored-by: Milan Burda <milan.burda@gmail.com>
---
 lib/browser/.eslintrc.json            |  2 +-
 lib/common/.eslintrc.json             | 23 +++++++++++++++++++++++
 lib/common/api/clipboard.ts           |  1 +
 lib/isolated_renderer/.eslintrc.json  | 18 ++++++++++++++++++
 lib/renderer/.eslintrc.json           | 18 ++++++++++++++++++
 lib/renderer/common-init.ts           |  2 +-
 lib/renderer/inspector.ts             |  2 +-
 lib/renderer/web-frame-init.ts        |  2 +-
 lib/sandboxed_renderer/.eslintrc.json | 18 ++++++++++++++++++
 lib/worker/.eslintrc.json             | 18 ++++++++++++++++++
 10 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 lib/common/.eslintrc.json
 create mode 100644 lib/isolated_renderer/.eslintrc.json
 create mode 100644 lib/renderer/.eslintrc.json
 create mode 100644 lib/sandboxed_renderer/.eslintrc.json
 create mode 100644 lib/worker/.eslintrc.json

diff --git a/lib/browser/.eslintrc.json b/lib/browser/.eslintrc.json
index 27d223a509d96..dab1dafc3f26e 100644
--- a/lib/browser/.eslintrc.json
+++ b/lib/browser/.eslintrc.json
@@ -18,4 +18,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/lib/common/.eslintrc.json b/lib/common/.eslintrc.json
new file mode 100644
index 0000000000000..42964484b5c34
--- /dev/null
+++ b/lib/common/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main",
+          "electron/renderer"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*",
+          "@electron/internal/isolated_renderer/*",
+          "@electron/internal/renderer/*",
+          "@electron/internal/sandboxed_worker/*",
+          "@electron/internal/worker/*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/lib/common/api/clipboard.ts b/lib/common/api/clipboard.ts
index dd03b4f279d68..55f7958bc7963 100644
--- a/lib/common/api/clipboard.ts
+++ b/lib/common/api/clipboard.ts
@@ -1,5 +1,6 @@
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
+// eslint-disable-next-line no-restricted-imports
 import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
 
 const clipboard = process._linkedBinding('electron_common_clipboard');
diff --git a/lib/isolated_renderer/.eslintrc.json b/lib/isolated_renderer/.eslintrc.json
new file mode 100644
index 0000000000000..cb5f6cadaa4f3
--- /dev/null
+++ b/lib/isolated_renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/lib/renderer/.eslintrc.json b/lib/renderer/.eslintrc.json
new file mode 100644
index 0000000000000..cb5f6cadaa4f3
--- /dev/null
+++ b/lib/renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/lib/renderer/common-init.ts b/lib/renderer/common-init.ts
index 4ceff37416d59..bfec34419ddd3 100644
--- a/lib/renderer/common-init.ts
+++ b/lib/renderer/common-init.ts
@@ -1,4 +1,4 @@
-import { ipcRenderer } from 'electron';
+import { ipcRenderer } from 'electron/renderer';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 
 import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';
diff --git a/lib/renderer/inspector.ts b/lib/renderer/inspector.ts
index 346de2030ef40..8dd941d30619a 100644
--- a/lib/renderer/inspector.ts
+++ b/lib/renderer/inspector.ts
@@ -2,7 +2,7 @@ import { internalContextBridge } from '@electron/internal/renderer/api/context-b
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import { webFrame } from 'electron/renderer';
-import { IPC_MESSAGES } from '../common/ipc-messages';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const { contextIsolationEnabled } = internalContextBridge;
 
diff --git a/lib/renderer/web-frame-init.ts b/lib/renderer/web-frame-init.ts
index 37225cfb3428a..ac4db7f9a74dc 100644
--- a/lib/renderer/web-frame-init.ts
+++ b/lib/renderer/web-frame-init.ts
@@ -1,4 +1,4 @@
-import { webFrame, WebFrame } from 'electron';
+import { webFrame, WebFrame } from 'electron/renderer';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
diff --git a/lib/sandboxed_renderer/.eslintrc.json b/lib/sandboxed_renderer/.eslintrc.json
new file mode 100644
index 0000000000000..cb5f6cadaa4f3
--- /dev/null
+++ b/lib/sandboxed_renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/lib/worker/.eslintrc.json b/lib/worker/.eslintrc.json
new file mode 100644
index 0000000000000..cb5f6cadaa4f3
--- /dev/null
+++ b/lib/worker/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}

From 0ced2338ea20a1c372bc8f06f19a44141f6086d8 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:25:43 +0200
Subject: [PATCH 738/811] fix: crash loading non-standard schemes in iframes
 (#35517)

* fix: crash loading non-standard schemes in iframes

* test: move fixture to correct location

* chore: update patches

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/.patches                     |  1 +
 ...ding_non-standard_schemes_in_iframes.patch | 78 +++++++++++++++++++
 spec-main/api-protocol-spec.ts                | 23 +++++-
 spec-main/fixtures/pages/iframe-protocol.html | 11 +++
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
 create mode 100644 spec-main/fixtures/pages/iframe-protocol.html

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index e575ac484e854..14f516fa4dc37 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -121,3 +121,4 @@ fix_revert_emulationhandler_update_functions_to_early_return.patch
 fix_return_v8_value_from_localframe_requestexecutescript.patch
 disable_optimization_guide_for_preconnect_feature.patch
 fix_the_gn_gen_for_components_segmentation_platform.patch
+fix_crash_loading_non-standard_schemes_in_iframes.patch
diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
new file mode 100644
index 0000000000000..84d7eb40925bc
--- /dev/null
+++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Mon, 29 Aug 2022 11:44:57 +0200
+Subject: fix: crash loading non-standard schemes in iframes
+
+This fixes a crash that occurs when loading non-standard schemes from
+iframes or webviews. This was happening because
+ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin contains explicit
+exceptions to allow built-in non-standard schemes, but does not check
+for non-standard schemes registered by the embedder.
+
+Upstream, https://bugs.chromium.org/p/chromium/issues/detail?id=1081397
+contains several paths forward - here I chose to swap out the
+CHECK in navigation_request.cc from policy->CanAccessDataForOrigin to
+policy->CanCommitOriginAndUrl.
+
+Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
+
+diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
+index 37434a26db44ed035fcbebd9febbda10efa859da..060b310d38db85944e37b8a202493212106d8946 100644
+--- a/content/browser/renderer_host/navigation_request.cc
++++ b/content/browser/renderer_host/navigation_request.cc
+@@ -6573,10 +6573,11 @@ std::pair<url::Origin, std::string> NavigationRequest::
+   if (IsForMhtmlSubframe())
+     return origin_with_debug_info;
+ 
+-  int process_id = GetRenderFrameHost()->GetProcess()->GetID();
+-  auto* policy = ChildProcessSecurityPolicyImpl::GetInstance();
+-  CHECK(
+-      policy->CanAccessDataForOrigin(process_id, origin_with_debug_info.first));
++  CanCommitStatus can_commit = GetRenderFrameHost()->CanCommitOriginAndUrl(
++    origin_with_debug_info.first, GetURL(), IsSameDocument(), IsPdf(),
++    GetUrlInfo().is_sandboxed);
++  CHECK_EQ(CanCommitStatus::CAN_COMMIT_ORIGIN_AND_URL, can_commit);
++
+   return origin_with_debug_info;
+ }
+ 
+diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
+index 6aff64db8cc09f95d658fe9e0bd54c0b4c6ff433..e1dda0c951f9ea6f28b6d43ab2b9d4481f5d7773 100644
+--- a/content/browser/renderer_host/render_frame_host_impl.h
++++ b/content/browser/renderer_host/render_frame_host_impl.h
+@@ -2557,6 +2557,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
+     HandleAXEvents(tree_id, std::move(updates_and_events), reset_token);
+   }
+ 
++  // Returns whether the given origin and URL is allowed to commit in the
++  // current RenderFrameHost. The |url| is used to ensure it matches the origin
++  // in cases where it is applicable. This is a more conservative check than
++  // RenderProcessHost::FilterURL, since it will be used to kill processes that
++  // commit unauthorized origins.
++  CanCommitStatus CanCommitOriginAndUrl(const url::Origin& origin,
++                                        const GURL& url,
++                                        bool is_same_document_navigation,
++                                        bool is_pdf,
++                                        bool is_sandboxed);
++
+  protected:
+   friend class RenderFrameHostFactory;
+ 
+@@ -2892,17 +2903,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
+   // relevant.
+   void ResetWaitingState();
+ 
+-  // Returns whether the given origin and URL is allowed to commit in the
+-  // current RenderFrameHost. The |url| is used to ensure it matches the origin
+-  // in cases where it is applicable. This is a more conservative check than
+-  // RenderProcessHost::FilterURL, since it will be used to kill processes that
+-  // commit unauthorized origins.
+-  CanCommitStatus CanCommitOriginAndUrl(const url::Origin& origin,
+-                                        const GURL& url,
+-                                        bool is_same_document_navigation,
+-                                        bool is_pdf,
+-                                        bool is_sandboxed);
+-
+   // Returns whether a subframe navigation request should be allowed to commit
+   // to the current RenderFrameHost.
+   bool CanSubframeCommitOriginAndUrl(NavigationRequest* navigation_request);
diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
index 980c289cb1e7f..7988724baf5b4 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec-main/api-protocol-spec.ts
@@ -9,7 +9,7 @@ import * as fs from 'fs';
 import * as qs from 'querystring';
 import * as stream from 'stream';
 import { EventEmitter } from 'events';
-import { closeWindow } from './window-helpers';
+import { closeAllWindows, closeWindow } from './window-helpers';
 import { emittedOnce } from './events-helpers';
 import { WebmGenerator } from './video-helpers';
 import { delay } from './spec-helpers';
@@ -216,6 +216,8 @@ describe('protocol module', () => {
     const normalPath = path.join(fixturesPath, 'pages', 'a.html');
     const normalContent = fs.readFileSync(normalPath);
 
+    afterEach(closeAllWindows);
+
     it('sends file path as response', async () => {
       registerFileProtocol(protocolName, (request, callback) => callback(filePath));
       const r = await ajax(protocolName + '://fake-host');
@@ -239,6 +241,25 @@ describe('protocol module', () => {
       expect(r.headers).to.have.property('x-great-header', 'sogreat');
     });
 
+    it('can load iframes with custom protocols', (done) => {
+      registerFileProtocol('custom', (request, callback) => {
+        const filename = request.url.substring(9);
+        const p = path.join(__dirname, 'fixtures', 'pages', filename);
+        callback({ path: p });
+      });
+
+      const w = new BrowserWindow({
+        show: false,
+        webPreferences: {
+          nodeIntegration: true,
+          contextIsolation: false
+        }
+      });
+
+      w.loadFile(path.join(__dirname, 'fixtures', 'pages', 'iframe-protocol.html'));
+      ipcMain.once('loaded-iframe-custom-protocol', () => done());
+    });
+
     it.skip('throws an error when custom headers are invalid', (done) => {
       registerFileProtocol(protocolName, (request, callback) => {
         expect(() => callback({
diff --git a/spec-main/fixtures/pages/iframe-protocol.html b/spec-main/fixtures/pages/iframe-protocol.html
new file mode 100644
index 0000000000000..a283115b19382
--- /dev/null
+++ b/spec-main/fixtures/pages/iframe-protocol.html
@@ -0,0 +1,11 @@
+<body>
+  <iframe src="custom://base-page.html"></iframe>
+  <script>
+    const { ipcRenderer } = require('electron');
+    const iframe = document.querySelector('iframe');
+
+    iframe.addEventListener('load', () => {
+      ipcRenderer.send('loaded-iframe-custom-protocol');
+    });
+  </script>
+</body>

From 199ccfd84014377811cbeec685ba6d774e40878c Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 16:12:40 -0400
Subject: [PATCH 739/811] docs: fix wording mistake in security.md section 4
 (#35743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docs: fix wording mistake in security.md section 4 (#35682)

Update security.md

Under "4. Process Sandboxing", it said "For mor information on what `contextIsolation` is..." which was the previous section (copied from there). This updates it to say "For more information on what Process Sandboxing is..."

Co-authored-by: Sebastian Vittersø <37065184+sebastianvitterso@users.noreply.github.com>
---
 docs/tutorial/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md
index 0d98921a95afe..2a26dae1e267a 100644
--- a/docs/tutorial/security.md
+++ b/docs/tutorial/security.md
@@ -256,7 +256,7 @@ the sandbox in all renderers. Loading, reading or processing any untrusted
 content in an unsandboxed process, including the main process, is not advised.
 
 :::info
-For more information on what `contextIsolation` is and how to enable it please
+For more information on what Process Sandboxing is and how to enable it please
 see our dedicated [Process Sandboxing](sandbox.md) document.
 :::info
 

From 248ae5dc43efc888ad4198753192cb76023bfdb7 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 11:56:27 +0200
Subject: [PATCH 740/811] docs: add forge-overview.md (#35759)

---
 docs/tutorial/application-distribution.md |   4 +-
 docs/tutorial/boilerplates-and-clis.md    |   6 +-
 docs/tutorial/code-signing.md             | 109 +---------------------
 docs/tutorial/distribution-overview.md    |   2 +-
 docs/tutorial/forge-overview.md           |  36 +++++++
 docs/tutorial/tutorial-5-packaging.md     |   7 ++
 6 files changed, 51 insertions(+), 113 deletions(-)
 create mode 100644 docs/tutorial/forge-overview.md

diff --git a/docs/tutorial/application-distribution.md b/docs/tutorial/application-distribution.md
index 1b17541f2b3f5..6f5d86290dc0d 100644
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -11,8 +11,8 @@ can either use specialized tooling or manual approaches.
 ## With tooling
 
 There are a couple tools out there that exist to package and distribute your Electron app.
-We recommend using [Electron Forge](https://www.electronforge.io). You can check out
-its documentation directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
+We recommend using [Electron Forge](./forge-overview.md). You can check out
+its [documentation](https://www.electronforge.io) directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
 part of the Electron tutorial.
 
 ## Manual packaging
diff --git a/docs/tutorial/boilerplates-and-clis.md b/docs/tutorial/boilerplates-and-clis.md
index 304254285180e..f344ae1b25979 100644
--- a/docs/tutorial/boilerplates-and-clis.md
+++ b/docs/tutorial/boilerplates-and-clis.md
@@ -26,10 +26,8 @@ beginners, using a command line tool is likely to be helpful*.
 
 ## electron-forge
 
-A "complete tool for building modern Electron applications". Electron Forge
-unifies the existing (and well maintained) build tools for Electron development
-into a cohesive package so that anyone can jump right in to Electron
-development.
+Electron Forge is a tool for packaging and publishing Electron applications. It unifies Electron's tooling ecosystem
+into a single extensible interface so that anyone can jump right into making Electron apps.
 
 Forge comes with [a ready-to-use template](https://electronforge.io/templates) using Webpack as a bundler. It includes an example typescript configuration and provides two configuration files to enable easy customization. It uses the same core modules used by the
 greater Electron community (like [`electron-packager`](https://github.com/electron/electron-packager)) –
diff --git a/docs/tutorial/code-signing.md b/docs/tutorial/code-signing.md
index a035b480cd57e..06fae1eaf7252 100644
--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -54,85 +54,11 @@ and notarized requires a few additions to your configuration. [Forge](https://el
 collection of the official Electron tools, using [`electron-packager`],
 [`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-Let's take a look at an example `package.json` configuration with all required fields. Not all of them are
-required: the tools will be clever enough to automatically find a suitable `identity`, for instance,
-but we recommend that you are explicit.
-
-```json title="package.json" {7}
-{
-  "name": "my-app",
-  "version": "0.0.1",
-  "config": {
-    "forge": {
-      "packagerConfig": {
-        "osxSign": {
-          "identity": "Developer ID Application: Felix Rieseberg (LT94ZKYDCJ)",
-          "hardened-runtime": true,
-          "entitlements": "entitlements.plist",
-          "entitlements-inherit": "entitlements.plist",
-          "signature-flags": "library"
-        },
-        "osxNotarize": {
-          "appleId": "felix@felix.fun",
-          "appleIdPassword": "my-apple-id-password"
-        }
-      }
-    }
-  }
-}
-```
-
-The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
-to assure the Apple security mechanisms that your app is doing these things
-without meaning any harm:
-
-```xml title="entitlements.plist"
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.debugger</key>
-    <true/>
-  </dict>
-</plist>
-```
-
-Note that up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
-as well. However, it should not be used anymore if it can be avoided.
-
-To see all of this in action, check out Electron Fiddle's source code,
-[especially its `electron-forge` configuration
-file](https://github.com/electron/fiddle/blob/master/forge.config.js).
-
-If you plan to access the microphone or camera within your app using Electron's APIs, you'll also
-need to add the following entitlements:
-
-```xml title="entitlements.plist"
-<key>com.apple.security.device.audio-input</key>
-<true/>
-<key>com.apple.security.device.camera</key>
-<true/>
-```
-
-If these are not present in your app's entitlements when you invoke, for example:
-
-```js title="main.js"
-const { systemPreferences } = require('electron')
-const microphone = systemPreferences.askForMediaAccess('microphone')
-```
-
-Your app may crash. See the Resource Access section in [Hardened Runtime](https://developer.apple.com/documentation/security/hardened_runtime) for more information and entitlements you may need.
-
-### Using Electron Builder
-
-Electron Builder comes with a custom solution for signing your application. You
-can find [its documentation here](https://www.electron.build/code-signing).
+Detailed instructions on how to configure your application can be found in the [Electron Forge Code Signing Tutorial](https://www.electronforge.io/guides/code-signing/code-signing-macos).
 
 ### Using Electron Packager
 
-If you're not using an integrated build pipeline like Forge or Builder, you
+If you're not using an integrated build pipeline like Forge, you
 are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
 [`electron-notarize`].
 
@@ -204,36 +130,7 @@ commit it to your source code.
 
 ### Using Electron Forge
 
-Once you have a code signing certificate file (`.pfx`), you can sign
-[Squirrel.Windows][maker-squirrel] and [MSI][maker-msi] installers in Electron Forge
-with the `certificateFile` and `certificatePassword` fields in their respective
-configuration objects.
-
-For example, if you keep your Forge config in your `package.json` file and are
-creating a Squirrel.Windows installer:
-
-```json {9-15} title='package.json'
-{
-  "name": "my-app",
-  "version": "0.0.1",
-  //...
-  "config": {
-    "forge": {
-      "packagerConfig": {},
-      "makers": [
-        {
-          "name": "@electron-forge/maker-squirrel",
-          "config": {
-            "certificateFile": "./cert.pfx",
-            "certificatePassword": "this-is-a-secret"
-          }
-        }
-      ]
-    }
-  }
-  //...
-}
-```
+Electron Forge is the recommended way to sign your `Squirrel.Windows` and `WiX MSI` installers. Detailed instructions on how to configure your application can be found in the [Electron Forge Code Signing Tutorial](https://www.electronforge.io/guides/code-signing/code-signing-macos).
 
 ### Using electron-winstaller (Squirrel.Windows)
 
diff --git a/docs/tutorial/distribution-overview.md b/docs/tutorial/distribution-overview.md
index b7e9bd991b4fd..1c78837c144d2 100644
--- a/docs/tutorial/distribution-overview.md
+++ b/docs/tutorial/distribution-overview.md
@@ -11,7 +11,7 @@ you can deliver it to your users.
 ## Packaging
 
 To distribute your app with Electron, you need to package all your resources and assets
-into an executable and rebrand it. To do this, you can either use specialized tooling
+into an executable and rebrand it. To do this, you can either use specialized tooling like Electron Forge
 or do it manually. See the [Application Packaging][application-packaging] tutorial
 for more information.
 
diff --git a/docs/tutorial/forge-overview.md b/docs/tutorial/forge-overview.md
new file mode 100644
index 0000000000000..e297e700c4fdc
--- /dev/null
+++ b/docs/tutorial/forge-overview.md
@@ -0,0 +1,36 @@
+# Distributing Apps With Electron Forge
+
+Electron Forge is a tool for packaging and publishing Electron applications.
+It unifies Electron's build tooling ecosystem into
+a single extensible interface so that anyone can jump right into making Electron apps.
+
+## Getting started
+
+The [Electron Forge docs] contain detailed information on taking your application
+from source code to your end users' machines.
+This includes:
+
+* Packaging your application [(package)]
+* Generating executables and installers for each OS [(make)], and,
+* Publishing these files to online platforms to download [(publish)].
+
+For beginners, we recommend following through Electron's [tutorial] to develop, build,
+package and publish your first Electron app. If you have already developed an app on your machine
+and want to start on packaging and distribution, start from [step 5] of the tutorial.
+
+## Getting help
+
+* If you need help with developing your app, our [community Discord server][discord] is a great place
+to get advice from other Electron app developers.
+* If you suspect you're running into a bug with Forge, please check the [GitHub issue tracker]
+to see if any existing issues match your problem. If not, feel free to fill out our bug report
+template and submit a new issue.
+
+[Electron Forge Docs]: https://www.electronforge.io/
+[step 5]: ./tutorial-5-packaging.md
+[(package)]: https://www.electronforge.io/cli#package
+[(make)]: https://www.electronforge.io/cli#make
+[(publish)]: https://www.electronforge.io/cli#publish
+[GitHub issue tracker]: https://github.com/electron-userland/electron-forge/issues
+[discord]: https://discord.gg/APGC3k5yaH
+[tutorial]: https://www.electronjs.org/docs/latest/tutorial/tutorial-prerequisites
diff --git a/docs/tutorial/tutorial-5-packaging.md b/docs/tutorial/tutorial-5-packaging.md
index 3ab4f15b50d84..032511145e746 100644
--- a/docs/tutorial/tutorial-5-packaging.md
+++ b/docs/tutorial/tutorial-5-packaging.md
@@ -111,6 +111,12 @@ Electron Forge can be configured to create distributables in different OS-specif
 
 :::
 
+:::tip Creating and Adding Application Icons
+
+Setting custom application icons requires a few additions to your config. Check out [Forge's icon tutorial] for more information.
+
+:::
+
 :::note Packaging without Electron Forge
 
 If you want to manually package your code, or if you're just interested understanding the
@@ -214,6 +220,7 @@ information.
 [electron forge]: https://www.electronforge.io
 [electron forge cli documentation]: https://www.electronforge.io/cli#commands
 [makers]: https://www.electronforge.io/config/makers
+[Forge's icon tutorial]: https://www.electronforge.io/guides/create-and-add-icons
 
 <!-- Tutorial links -->
 

From 3dd6c6886b2b87a223c201a045cf21fed32ad09d Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 06:30:57 -0700
Subject: [PATCH 741/811] Bump v21.0.0-beta.8

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index f170e99978b5b..4e769dc94ad4e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.7
\ No newline at end of file
+21.0.0-beta.8
\ No newline at end of file
diff --git a/package.json b/package.json
index efcaeac7e2924..3b417c1fa169f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.7",
+  "version": "21.0.0-beta.8",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index e1b5e1c888e5e..b422eaf79de86 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,7
- PRODUCTVERSION 21,0,0,7
+ FILEVERSION 21,0,0,8
+ PRODUCTVERSION 21,0,0,8
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 38bb3e81d306a4b7af3e9053bb9e9b52b52df737 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 10:01:11 -0700
Subject: [PATCH 742/811] fix: compensate for title bar height when setting
 bounds on `BrowserView` (#35502)

fix: compensate for title bar height when setting bounds

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 shell/browser/native_browser_view_mac.mm | 39 +++++++++++++++++++-----
 spec-main/api-browser-view-spec.ts       |  9 +++++-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/shell/browser/native_browser_view_mac.mm b/shell/browser/native_browser_view_mac.mm
index 9cb5d11d8610b..685b7194b5280 100644
--- a/shell/browser/native_browser_view_mac.mm
+++ b/shell/browser/native_browser_view_mac.mm
@@ -262,9 +262,21 @@ - (void)drawDebugRect:(NSRect)aRect {
   auto* view = iwc_view->GetNativeView().GetNativeNSView();
   auto* superview = view.superview;
   const auto superview_height = superview ? superview.frame.size.height : 0;
+
+  // We need to use the content rect to calculate the titlebar height if the
+  // superview is an framed NSWindow, otherwise it will be offset incorrectly by
+  // the height of the titlebar.
+  auto titlebar_height = 0;
+  if (auto* win = [superview window]) {
+    const auto content_rect_height =
+        [win contentRectForFrameRect:superview.frame].size.height;
+    titlebar_height = superview_height - content_rect_height;
+  }
+
+  auto new_height =
+      superview_height - bounds.y() - bounds.height() + titlebar_height;
   view.frame =
-      NSMakeRect(bounds.x(), superview_height - bounds.y() - bounds.height(),
-                 bounds.width(), bounds.height());
+      NSMakeRect(bounds.x(), new_height, bounds.width(), bounds.height());
 
   // Ensure draggable regions are properly updated to reflect new bounds.
   UpdateDraggableRegions(draggable_regions_);
@@ -275,12 +287,23 @@ - (void)drawDebugRect:(NSRect)aRect {
   if (!iwc_view)
     return gfx::Rect();
   NSView* view = iwc_view->GetNativeView().GetNativeNSView();
-  const int superview_height =
-      (view.superview) ? view.superview.frame.size.height : 0;
-  return gfx::Rect(
-      view.frame.origin.x,
-      superview_height - view.frame.origin.y - view.frame.size.height,
-      view.frame.size.width, view.frame.size.height);
+  auto* superview = view.superview;
+  const int superview_height = superview ? superview.frame.size.height : 0;
+
+  // We need to use the content rect to calculate the titlebar height if the
+  // superview is an framed NSWindow, otherwise it will be offset incorrectly by
+  // the height of the titlebar.
+  auto titlebar_height = 0;
+  if (auto* win = [superview window]) {
+    const auto content_rect_height =
+        [win contentRectForFrameRect:superview.frame].size.height;
+    titlebar_height = superview_height - content_rect_height;
+  }
+
+  auto new_height = superview_height - view.frame.origin.y -
+                    view.frame.size.height + titlebar_height;
+  return gfx::Rect(view.frame.origin.x, new_height, view.frame.size.width,
+                   view.frame.size.height);
 }
 
 void NativeBrowserViewMac::SetBackgroundColor(SkColor color) {
diff --git a/spec-main/api-browser-view-spec.ts b/spec-main/api-browser-view-spec.ts
index 3352c06e991a4..ef32bef9feaa2 100644
--- a/spec-main/api-browser-view-spec.ts
+++ b/spec-main/api-browser-view-spec.ts
@@ -146,7 +146,14 @@ describe('BrowserView module', () => {
   });
 
   describe('BrowserView.getBounds()', () => {
-    it('returns the current bounds', () => {
+    it('returns correct bounds on a framed window', () => {
+      view = new BrowserView();
+      const bounds = { x: 10, y: 20, width: 30, height: 40 };
+      view.setBounds(bounds);
+      expect(view.getBounds()).to.deep.equal(bounds);
+    });
+
+    it('returns correct bounds on a frameless window', () => {
       view = new BrowserView();
       const bounds = { x: 10, y: 20, width: 30, height: 40 };
       view.setBounds(bounds);

From 46c473930e4e15b6dc3ed8ca94f38ba3ae214eb8 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 22:18:19 +0200
Subject: [PATCH 743/811] chore: bump chromium to 106.0.5249.51 (21-x-y)
 (#35768)

* chore: bump chromium in DEPS to 106.0.5249.51

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                      | 2 +-
 patches/chromium/can_create_window.patch  | 2 +-
 patches/chromium/webview_fullscreen.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DEPS b/DEPS
index ffca45b11d44a..b730762315bc2 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.40',
+    '106.0.5249.51',
   'node_version':
     'v16.16.0',
   'nan_version':
diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch
index 55d8906d9432c..6a4ef1c6c1dbd 100644
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,7 +9,7 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index abfe94dc8c31fc928eb554ec3f2ec095aa6a970b..e815010dcb9437727f32b12f0d47a31384e24677 100644
+index 753d3cb544f812689616ce7bd05d24844f20883c..1f58d6a342b0c1e0c5fd4d525a684a166f11a69d 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -7313,6 +7313,7 @@ void RenderFrameHostImpl::CreateNewWindow(
diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch
index bd47818e88ade..915b68b72b7c5 100644
--- a/patches/chromium/webview_fullscreen.patch
+++ b/patches/chromium/webview_fullscreen.patch
@@ -14,7 +14,7 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index e815010dcb9437727f32b12f0d47a31384e24677..bb1ffcd003807084b970e11a1b464e5f72142c53 100644
+index 1f58d6a342b0c1e0c5fd4d525a684a166f11a69d..05d803e286343e1443863c6dd292102bae12fe83 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -6567,6 +6567,17 @@ void RenderFrameHostImpl::EnterFullscreen(

From 3f10c4d1f852e24a63694f4b5d175d2f04f6ca3c Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 11:35:13 -0700
Subject: [PATCH 744/811] docs: changed event.data to data under the
 message.port in docs (#35782)

* docs: changed event.data to data under the message.port in docs

* docs: corrected BrowserWindow wrong usage and change window.messagePort to window.electronMessagePort

Co-authored-by: cyrilchukwuebuka <muofunanya3@gmail.com>
---
 docs/tutorial/message-ports.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/message-ports.md b/docs/tutorial/message-ports.md
index b236f4133e450..583ced73c438e 100644
--- a/docs/tutorial/message-ports.md
+++ b/docs/tutorial/message-ports.md
@@ -101,7 +101,7 @@ app.whenReady().then(async () => {
     }
   })
 
-  const secondaryWindow = BrowserWindow({
+  const secondaryWindow = new BrowserWindow({
     show: false,
     webPreferences: {
       contextIsolation: false,
@@ -144,7 +144,7 @@ to use `contextIsolation` and set up specific contextBridge calls for each of yo
 expected messages, but for the simplicity of this example we don't. You can find an
 example of context isolation further down this page at [Communicating directly between the main process and the main world of a context-isolated page](#communicating-directly-between-the-main-process-and-the-main-world-of-a-context-isolated-page)
 
-That means window.messagePort is globally available and you can call
+That means window.electronMessagePort is globally available and you can call
 `postMessage` on it from anywhere in your app to send a message to the other
 renderer.
 
@@ -272,7 +272,7 @@ const makeStreamingRequest = (element, callback) => {
 }
 
 makeStreamingRequest(42, (data) => {
-  console.log('got response data:', event.data)
+  console.log('got response data:', data)
 })
 // We will see "got response data: 42" 10 times.
 ```

From f3667073e849263b3ed5b6975b1a7382b934e5f8 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 11:44:27 -0700
Subject: [PATCH 745/811] docs: update the link for Introduction to Node.js
 (#35771)

Updated the link for Introduction to NodeJs

Co-authored-by: Aman Gupta <techbugaman@gmail.com>
---
 docs/tutorial/tutorial-1-prerequisites.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial/tutorial-1-prerequisites.md b/docs/tutorial/tutorial-1-prerequisites.md
index 4c73758ab4023..164811fc4ec80 100644
--- a/docs/tutorial/tutorial-1-prerequisites.md
+++ b/docs/tutorial/tutorial-1-prerequisites.md
@@ -123,7 +123,7 @@ the list of versions in the [electron/releases] repository.
 [homebrew]: https://brew.sh/
 [mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/
 [node]: https://nodejs.org/
-[node-guide]: https://nodejs.dev/learn
+[node-guide]: https://nodejs.dev/en/learn/
 [node-download]: https://nodejs.org/en/download/
 [nvm]: https://github.com/nvm-sh/nvm
 [process-model]: ./process-model.md

From 0a4b160328beaafdfd88debeb6d3784d04a7137a Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 12:40:47 -0700
Subject: [PATCH 746/811] fix: allow docking DevTools with WCO (#35765)

fix: allow for docking devtools with WCO

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 shell/browser/api/electron_api_web_contents.cc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index ed4e6c6825324..3340c0e47e357 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2410,14 +2410,6 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
       !owner_window()) {
     state = "detach";
   }
-  bool activate = true;
-  if (args && args->Length() == 1) {
-    gin_helper::Dictionary options;
-    if (args->GetNext(&options)) {
-      options.Get("mode", &state);
-      options.Get("activate", &activate);
-    }
-  }
 
 #if BUILDFLAG(IS_WIN)
   auto* win = static_cast<NativeWindowViews*>(owner_window());
@@ -2427,6 +2419,15 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
     state = "detach";
 #endif
 
+  bool activate = true;
+  if (args && args->Length() == 1) {
+    gin_helper::Dictionary options;
+    if (args->GetNext(&options)) {
+      options.Get("mode", &state);
+      options.Get("activate", &activate);
+    }
+  }
+
   DCHECK(inspectable_web_contents_);
   inspectable_web_contents_->SetDockState(state);
   inspectable_web_contents_->ShowDevTools(activate);

From 9631cee679fe60188a1030bface77982699c9f89 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Sat, 24 Sep 2022 12:31:53 -0700
Subject: [PATCH 747/811] feat: allow custom v8 snapshots to be used in the
 main process and the default snapshot in the renderer process (#35695)

* feat: allow custom v8 snapshots to be used in the main process and the default snapshot in the renderer process (#35266)

* Updates to allow for using a custom v8 snapshot file name

* Allow using a custom v8 snapshot file name

* Fix up patch due to merge

* Use fuse to set up custom v8 snapshot file in browser process

* Refactor to use delegate instead of command line parameter

* Refactoring

* Update due to merge

* PR comments

* Rename patch

* Rename patch

* chore: update patches

Co-authored-by: Ryan Manuel <ryanm@cypress.io>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 build/fuses/fuses.json5                       |   3 +-
 docs/tutorial/fuses.md                        |   7 +
 patches/chromium/.patches                     |   1 +
 ...e_browser_v8_snapshot_file_name_fuse.patch | 156 ++++++++++++++++++
 shell/app/electron_main_delegate.cc           |  15 ++
 shell/app/electron_main_delegate.h            |   2 +
 6 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch

diff --git a/build/fuses/fuses.json5 b/build/fuses/fuses.json5
index f4984aa2a17b4..e8df5ffd7ab98 100644
--- a/build/fuses/fuses.json5
+++ b/build/fuses/fuses.json5
@@ -7,5 +7,6 @@
   "node_options": "1",
   "node_cli_inspect": "1",
   "embedded_asar_integrity_validation": "0",
-  "only_load_app_from_asar": "0"
+  "only_load_app_from_asar": "0",
+  "load_browser_process_specific_v8_snapshot": "0"
 }
diff --git a/docs/tutorial/fuses.md b/docs/tutorial/fuses.md
index bb0c61b475136..d933a841c46c5 100644
--- a/docs/tutorial/fuses.md
+++ b/docs/tutorial/fuses.md
@@ -54,6 +54,13 @@ For more information on how to use asar integrity validation please read the [As
 
 The onlyLoadAppFromAsar fuse changes the search system that Electron uses to locate your app code.  By default Electron will search in the following order `app.asar` -> `app` -> `default_app.asar`.  When this fuse is enabled the search order becomes a single entry `app.asar` thus ensuring that when combined with the `embeddedAsarIntegrityValidation` fuse it is impossible to load non-validated code.
 
+### `loadBrowserProcessSpecificV8Snapshot`
+
+**Default:** Disabled
+**@electron/fuses:** `FuseV1Options.LoadBrowserProcessSpecificV8Snapshot`
+
+The loadBrowserProcessSpecificV8Snapshot fuse changes which V8 snapshot file is used for the browser process.  By default Electron's processes will all use the same V8 snapshot file.  When this fuse is enabled the browser process uses the file called `browser_v8_context_snapshot.bin` for its V8 snapshot. The other processes will use the V8 snapshot file that they normally do.
+
 ## How do I flip the fuses?
 
 ### The easy way
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 14f516fa4dc37..6b99ece695061 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -122,3 +122,4 @@ fix_return_v8_value_from_localframe_requestexecutescript.patch
 disable_optimization_guide_for_preconnect_feature.patch
 fix_the_gn_gen_for_components_segmentation_platform.patch
 fix_crash_loading_non-standard_schemes_in_iframes.patch
+create_browser_v8_snapshot_file_name_fuse.patch
diff --git a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
new file mode 100644
index 0000000000000..5eaff40c1c9ca
--- /dev/null
+++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
@@ -0,0 +1,156 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ryan Manuel <ryanm@cypress.io>
+Date: Thu, 4 Aug 2022 22:37:01 -0500
+Subject: Create browser v8 snapshot file name fuse
+
+By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This patch allows consumers
+to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
+
+diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
+index 14ca983c91cfe495ebd2859866a7f434d0a9ab02..a3e5764a1920c8a6bf1ce21e02d0ac743b027a40 100644
+--- a/content/app/content_main_runner_impl.cc
++++ b/content/app/content_main_runner_impl.cc
+@@ -37,6 +37,7 @@
+ #include "base/process/memory.h"
+ #include "base/process/process.h"
+ #include "base/process/process_handle.h"
++#include "base/strings/string_piece.h"
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/task/thread_pool/thread_pool_instance.h"
+@@ -232,8 +233,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
+ 
+ #endif
+ 
+-void LoadV8SnapshotFile(const base::CommandLine& command_line) {
++void LoadV8SnapshotFile(const raw_ptr<ContentMainDelegate> delegate, const base::CommandLine& command_line) {
+   const gin::V8SnapshotFileType snapshot_type = GetSnapshotType(command_line);
++  base::StringPiece browser_v8_snapshot_file_name = delegate->GetBrowserV8SnapshotFilename();
++  if (!browser_v8_snapshot_file_name.empty()) {
++    gin::V8Initializer::LoadV8SnapshotFromFileName(browser_v8_snapshot_file_name, snapshot_type);
++    return;
++  }
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+   base::FileDescriptorStore& file_descriptor_store =
+       base::FileDescriptorStore::GetInstance();
+@@ -262,11 +268,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
+ 
+ #endif  // V8_USE_EXTERNAL_STARTUP_DATA
+ 
+-void LoadV8SnapshotIfNeeded(const base::CommandLine& command_line,
++void LoadV8SnapshotIfNeeded(const raw_ptr<ContentMainDelegate> delegate,
++                            const base::CommandLine& command_line,
+                             const std::string& process_type) {
+ #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
+   if (ShouldLoadV8Snapshot(command_line, process_type))
+-    LoadV8SnapshotFile(command_line);
++    LoadV8SnapshotFile(delegate, command_line);
+ #endif  // V8_USE_EXTERNAL_STARTUP_DATA
+ }
+ 
+@@ -925,7 +932,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
+     return TerminateForFatalInitializationError();
+ #endif  // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
+ 
+-  LoadV8SnapshotIfNeeded(command_line, process_type);
++  LoadV8SnapshotIfNeeded(delegate_, command_line, process_type);
+ 
+   blink::TrialTokenValidator::SetOriginTrialPolicyGetter(
+       base::BindRepeating([]() -> blink::OriginTrialPolicy* {
+diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
+index 5450eb6ba565164953b778f861d8fc75a06b6115..3f15d5a83d6e8011da09da178a0a9dfd2dd95d30 100644
+--- a/content/public/app/content_main_delegate.cc
++++ b/content/public/app/content_main_delegate.cc
+@@ -5,6 +5,7 @@
+ #include "content/public/app/content_main_delegate.h"
+ 
+ #include "base/check.h"
++#include "base/strings/string_piece.h"
+ #include "build/build_config.h"
+ #include "content/public/browser/content_browser_client.h"
+ #include "content/public/common/content_client.h"
+@@ -83,6 +84,10 @@ absl::optional<int> ContentMainDelegate::PostEarlyInitialization(
+   return absl::nullopt;
+ }
+ 
++base::StringPiece ContentMainDelegate::GetBrowserV8SnapshotFilename() {
++  return base::StringPiece();
++}
++
+ ContentClient* ContentMainDelegate::CreateContentClient() {
+   return new ContentClient();
+ }
+diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
+index f40146c4ed20e63dd09450e43c26736171f02ed4..5e3246a1346bd0210e7b83842a17dcc1986c8647 100644
+--- a/content/public/app/content_main_delegate.h
++++ b/content/public/app/content_main_delegate.h
+@@ -9,6 +9,7 @@
+ #include <string>
+ #include <vector>
+ 
++#include "base/strings/string_piece.h"
+ #include "build/build_config.h"
+ #include "content/common/content_export.h"
+ #include "content/public/common/main_function_params.h"
+@@ -154,6 +155,8 @@ class CONTENT_EXPORT ContentMainDelegate {
+   virtual bool ShouldHandleConsoleControlEvents();
+ #endif
+ 
++  virtual base::StringPiece GetBrowserV8SnapshotFilename();
++
+  protected:
+   friend class ContentClientCreator;
+   friend class ContentClientInitializer;
+diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
+index 5530d975303cc96701e4b70ffbcaf6e7c02bb016..edd9959cc0fd23711e19de4aee104199a8a3599e 100644
+--- a/gin/v8_initializer.cc
++++ b/gin/v8_initializer.cc
+@@ -496,8 +496,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
+ 
+ #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
+ 
+-// static
+-void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
++void V8Initializer::LoadV8SnapshotFromFileName(base::StringPiece file_name, V8SnapshotFileType snapshot_file_type) {
+   if (g_mapped_snapshot) {
+     // TODO(crbug.com/802962): Confirm not loading different type of snapshot
+     // files in a process.
+@@ -506,10 +505,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
+ 
+   base::MemoryMappedFile::Region file_region;
+   base::File file =
+-      OpenV8File(GetSnapshotFileName(snapshot_file_type), &file_region);
++      OpenV8File(file_name.data(), &file_region);
+   LoadV8SnapshotFromFile(std::move(file), &file_region, snapshot_file_type);
+ }
+ 
++// static
++void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
++  const char* file_name = GetSnapshotFileName(snapshot_file_type);
++
++  LoadV8SnapshotFromFileName(file_name, snapshot_file_type);
++}
++
+ // static
+ void V8Initializer::LoadV8SnapshotFromFile(
+     base::File snapshot_file,
+diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
+index 13a120c7fe8e69a44793473f3124c33d572a07a3..acb294780873c1d84546eb2b9acc00f86838361d 100644
+--- a/gin/v8_initializer.h
++++ b/gin/v8_initializer.h
+@@ -9,6 +9,7 @@
+ 
+ #include "base/files/file.h"
+ #include "base/files/memory_mapped_file.h"
++#include "base/strings/string_piece.h"
+ #include "build/build_config.h"
+ #include "gin/array_buffer.h"
+ #include "gin/gin_export.h"
+@@ -42,6 +43,7 @@ class GIN_EXPORT V8Initializer {
+                                         int* snapshot_size_out);
+ 
+ #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
++  static void LoadV8SnapshotFromFileName(base::StringPiece file_name, V8SnapshotFileType snapshot_file_type);
+   // Load V8 snapshot from default resources, if they are available.
+   static void LoadV8Snapshot(
+       V8SnapshotFileType snapshot_file_type = V8SnapshotFileType::kDefault);
diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 537f74a14d6d9..73d063026ad3e 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -23,6 +23,7 @@
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "content/public/common/content_switches.h"
 #include "electron/buildflags/buildflags.h"
+#include "electron/fuses.h"
 #include "extensions/common/constants.h"
 #include "ipc/ipc_buildflags.h"
 #include "sandbox/policy/switches.h"
@@ -422,6 +423,20 @@ absl::optional<int> ElectronMainDelegate::PreBrowserMain() {
   return absl::nullopt;
 }
 
+base::StringPiece ElectronMainDelegate::GetBrowserV8SnapshotFilename() {
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+  std::string process_type =
+      command_line->GetSwitchValueASCII(::switches::kProcessType);
+  bool load_browser_process_specific_v8_snapshot =
+      process_type.empty() &&
+      electron::fuses::IsLoadBrowserProcessSpecificV8SnapshotEnabled();
+  if (load_browser_process_specific_v8_snapshot) {
+    return "browser_v8_context_snapshot.bin";
+  }
+  return ContentMainDelegate::GetBrowserV8SnapshotFilename();
+}
+
 content::ContentBrowserClient*
 ElectronMainDelegate::CreateContentBrowserClient() {
   browser_client_ = std::make_unique<ElectronBrowserClient>();
diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
index e8e57fad85db6..0a8363fb7a90b 100644
--- a/shell/app/electron_main_delegate.h
+++ b/shell/app/electron_main_delegate.h
@@ -30,6 +30,8 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
   ElectronMainDelegate(const ElectronMainDelegate&) = delete;
   ElectronMainDelegate& operator=(const ElectronMainDelegate&) = delete;
 
+  base::StringPiece GetBrowserV8SnapshotFilename() override;
+
  protected:
   // content::ContentMainDelegate:
   absl::optional<int> BasicStartupComplete() override;

From 015be485736f4da7f79e95bf194f9d248d49caa9 Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 06:30:56 -0700
Subject: [PATCH 748/811] Bump v21.0.0-beta.9

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 4e769dc94ad4e..d3de8d4c16efb 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.8
\ No newline at end of file
+21.0.0-beta.9
\ No newline at end of file
diff --git a/package.json b/package.json
index 3b417c1fa169f..286542f290a97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.8",
+  "version": "21.0.0-beta.9",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b422eaf79de86..7ed941f3826e8 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,8
- PRODUCTVERSION 21,0,0,8
+ FILEVERSION 21,0,0,9
+ PRODUCTVERSION 21,0,0,9
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From 9c3d32a0d3714179cd4641c9ea05a8f8a44fa50b Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 06:34:17 -0700
Subject: [PATCH 749/811] Revert "Bump v21.0.0-beta.9"

This reverts commit 015be485736f4da7f79e95bf194f9d248d49caa9.
---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index d3de8d4c16efb..4e769dc94ad4e 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.9
\ No newline at end of file
+21.0.0-beta.8
\ No newline at end of file
diff --git a/package.json b/package.json
index 286542f290a97..3b417c1fa169f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.9",
+  "version": "21.0.0-beta.8",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 7ed941f3826e8..b422eaf79de86 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,9
- PRODUCTVERSION 21,0,0,9
+ FILEVERSION 21,0,0,8
+ PRODUCTVERSION 21,0,0,8
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From f1e4cfaca38035ec12122b5b13f7223cd7317a75 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 11:29:01 -0400
Subject: [PATCH 750/811] build: remove unused GitHub app config file (#35814)

chore: remove unused GitHub action config file

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
---
 .github/semantic.yml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .github/semantic.yml

diff --git a/.github/semantic.yml b/.github/semantic.yml
deleted file mode 100644
index 4168a3cdeed9e..0000000000000
--- a/.github/semantic.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Always validate the PR title, and ignore the commits
-titleOnly: true

From 6e2d2d8d73312865e8df86640d7b3eb49b8d4443 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 08:50:42 -0700
Subject: [PATCH 751/811] fix: potential exception when calling
 webFrameMainBinding.fromIdOrNull() (#35803)

* fix: potential exception when calling webFrameMainBinding.fromIdOrNull()

* replace try/catch in getWebFrameForEvent

Co-authored-by: Milan Burda <miburda@microsoft.com>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
---
 lib/browser/api/web-contents.ts | 15 ++++++++++-----
 typings/internal-ambient.d.ts   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 5887f8ea2f03d..a0369fc734a14 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -536,6 +536,11 @@ const addReturnValueToEvent = (event: Electron.IpcMainEvent) => {
   });
 };
 
+const getWebFrameForEvent = (event: Electron.IpcMainEvent | Electron.IpcMainInvokeEvent) => {
+  if (!event.processId || !event.frameId) return null;
+  return webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+};
+
 const commandLine = process._linkedBinding('electron_common_command_line');
 const environment = process._linkedBinding('electron_common_environment');
 
@@ -573,7 +578,7 @@ WebContents.prototype._init = function () {
     } else {
       addReplyToEvent(event);
       this.emit('ipc-message', event, channel, ...args);
-      const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+      const maybeWebFrame = getWebFrameForEvent(event);
       maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, ...args);
       ipc.emit(channel, event, ...args);
       ipcMain.emit(channel, event, ...args);
@@ -587,8 +592,8 @@ WebContents.prototype._init = function () {
       console.error(`Error occurred in handler for '${channel}':`, error);
       event.sendReply({ error: error.toString() });
     };
-    const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
-    const targets: (ElectronInternal.IpcMainInternal| undefined)[] = internal ? [ipcMainInternal] : [maybeWebFrame && maybeWebFrame.ipc, ipc, ipcMain];
+    const maybeWebFrame = getWebFrameForEvent(event);
+    const targets: (ElectronInternal.IpcMainInternal| null)[] = internal ? [ipcMainInternal] : [maybeWebFrame && maybeWebFrame.ipc, ipc, ipcMain];
     const target = targets.find(target => target && (target as any)._invokeHandlers.has(channel));
     if (target) {
       (target as any)._invokeHandlers.get(channel)(event, ...args);
@@ -604,7 +609,7 @@ WebContents.prototype._init = function () {
       ipcMainInternal.emit(channel, event, ...args);
     } else {
       addReplyToEvent(event);
-      const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+      const maybeWebFrame = getWebFrameForEvent(event);
       if (this.listenerCount('ipc-message-sync') === 0 && ipc.listenerCount(channel) === 0 && ipcMain.listenerCount(channel) === 0 && (!maybeWebFrame || maybeWebFrame.ipc.listenerCount(channel) === 0)) {
         console.warn(`WebContents #${this.id} called ipcRenderer.sendSync() with '${channel}' channel without listeners.`);
       }
@@ -618,7 +623,7 @@ WebContents.prototype._init = function () {
   this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
     addSenderFrameToEvent(event);
     event.ports = ports.map(p => new MessagePortMain(p));
-    const maybeWebFrame = webFrameMainBinding.fromIdOrNull(event.processId, event.frameId);
+    const maybeWebFrame = getWebFrameForEvent(event);
     maybeWebFrame && maybeWebFrame.ipc.emit(channel, event, message);
     ipc.emit(channel, event, message);
     ipcMain.emit(channel, event, message);
diff --git a/typings/internal-ambient.d.ts b/typings/internal-ambient.d.ts
index 7fcd2ecb2acc2..6dcf6de2ca985 100644
--- a/typings/internal-ambient.d.ts
+++ b/typings/internal-ambient.d.ts
@@ -237,7 +237,7 @@ declare namespace NodeJS {
     _linkedBinding(name: 'electron_browser_web_frame_main'): {
       WebFrameMain: typeof Electron.WebFrameMain;
       fromId(processId: number, routingId: number): Electron.WebFrameMain;
-      fromIdOrNull(processId: number, routingId: number): Electron.WebFrameMain;
+      fromIdOrNull(processId: number, routingId: number): Electron.WebFrameMain | null;
     }
     _linkedBinding(name: 'electron_renderer_crash_reporter'): Electron.CrashReporter;
     _linkedBinding(name: 'electron_renderer_ipc'): { ipc: IpcRendererBinding };

From 587abcc0a3a3919fce0fe683ac5c7d6b5fe34fc5 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 12:51:23 -0400
Subject: [PATCH 752/811] build: fix major dependencies update workflow file
 (#35817)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
---
 .github/workflows/release_dependency_versions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release_dependency_versions.yml b/.github/workflows/release_dependency_versions.yml
index d03cf272cc30f..d270b6a21bbac 100644
--- a/.github/workflows/release_dependency_versions.yml
+++ b/.github/workflows/release_dependency_versions.yml
@@ -20,7 +20,7 @@ jobs:
   trigger:
     runs-on: ubuntu-latest
     needs: check_tag
-    if: jobs.check_tag.outputs.should_release == 'true'
+    if: needs.check_tag.outputs.should_release == 'true'
     steps:
       - uses: actions/checkout@v3
       - name: Trigger New chromedriver Release

From c97955017dc64d0deecd73ee06a2f0a49f582bff Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:07:06 -0700
Subject: [PATCH 753/811] feat: add app.getSystemLocale() method (#35794)

* feat: add app.getSystemLocale() method

* Update shell/browser/electron_browser_main_parts.cc

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

* Change methods to be const

* Apply PR feedback

* Fix mac compile

* Add missing scope

* Apply style changes

* Change note

* Add braces to get the comment indentation right

* Change to static

* Apply PR feedback

* Fix the documentation

* Remove extraneous file

Co-authored-by: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
---
 docs/api/app.md                                  |  8 +++++++-
 shell/browser/api/electron_api_app.cc            | 12 ++++++++++++
 shell/browser/api/electron_api_app.h             |  1 +
 shell/browser/browser_process_impl.cc            |  8 ++++++++
 shell/browser/browser_process_impl.h             |  4 ++++
 shell/browser/electron_browser_main_parts.cc     | 13 +++++++++++--
 shell/browser/electron_browser_main_parts.h      |  1 +
 shell/browser/electron_browser_main_parts_mac.mm | 14 ++++++++++++++
 spec-main/api-app-spec.ts                        |  6 ++++++
 spec-main/chromium-spec.ts                       |  6 ++++--
 spec/fixtures/api/locale-check/main.js           |  2 +-
 11 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/docs/api/app.md b/docs/api/app.md
index 960bed3dc8782..624c5a1ebb054 100755
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -715,7 +715,7 @@ To set the locale, you'll want to use a command line switch at app startup, whic
 **Note:** When distributing your packaged app, you have to also ship the
 `locales` folder.
 
-**Note:** On Windows, you have to call it after the `ready` events gets emitted.
+**Note:** This API must be called after the `ready` event is emitted.
 
 ### `app.getLocaleCountryCode()`
 
@@ -723,6 +723,12 @@ Returns `string` - User operating system's locale two-letter [ISO 3166](https://
 
 **Note:** When unable to detect locale country code, it returns empty string.
 
+### `app.getSystemLocale()`
+
+Returns `string` - The current system locale. On Windows and Linux, it is fetched using Chromium's `i18n` library. On macOS, the `NSLocale` object is used instead.
+
+**Note:** This API must be called after the `ready` event is emitted.
+
 ### `app.addRecentDocument(path)` _macOS_ _Windows_
 
 * `path` string
diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc
index 73ff1d4956309..65b8fe7dbe85b 100644
--- a/shell/browser/api/electron_api_app.cc
+++ b/shell/browser/api/electron_api_app.cc
@@ -47,6 +47,7 @@
 #include "shell/browser/api/electron_api_session.h"
 #include "shell/browser/api/electron_api_web_contents.h"
 #include "shell/browser/api/gpuinfo_manager.h"
+#include "shell/browser/browser_process_impl.h"
 #include "shell/browser/electron_browser_context.h"
 #include "shell/browser/electron_browser_main_parts.h"
 #include "shell/browser/javascript_environment.h"
@@ -1038,6 +1039,16 @@ std::string App::GetLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
+std::string App::GetSystemLocale(gin_helper::ErrorThrower thrower) const {
+  if (!Browser::Get()->is_ready()) {
+    thrower.ThrowError(
+        "app.getSystemLocale() can only be called "
+        "after app is ready");
+    return std::string();
+  }
+  return static_cast<BrowserProcessImpl*>(g_browser_process)->GetSystemLocale();
+}
+
 std::string App::GetLocaleCountryCode() {
   std::string region;
 #if BUILDFLAG(IS_WIN)
@@ -1779,6 +1790,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetMethod("setAppLogsPath", &App::SetAppLogsPath)
       .SetMethod("setDesktopName", &App::SetDesktopName)
       .SetMethod("getLocale", &App::GetLocale)
+      .SetMethod("getSystemLocale", &App::GetSystemLocale)
       .SetMethod("getLocaleCountryCode", &App::GetLocaleCountryCode)
 #if BUILDFLAG(USE_NSS_CERTS)
       .SetMethod("importCertificate", &App::ImportCertificate)
diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h
index c253088deb64d..079c5ca1fd6ab 100644
--- a/shell/browser/api/electron_api_app.h
+++ b/shell/browser/api/electron_api_app.h
@@ -191,6 +191,7 @@ class App : public ElectronBrowserClient::Delegate,
   void SetDesktopName(const std::string& desktop_name);
   std::string GetLocale();
   std::string GetLocaleCountryCode();
+  std::string GetSystemLocale(gin_helper::ErrorThrower thrower) const;
   void OnSecondInstance(const base::CommandLine& cmd,
                         const base::FilePath& cwd,
                         const std::vector<const uint8_t> additional_data);
diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc
index 31653e104f8c5..1d6fccb5e0b5c 100644
--- a/shell/browser/browser_process_impl.cc
+++ b/shell/browser/browser_process_impl.cc
@@ -293,6 +293,14 @@ HidPolicyAllowedDevices* BrowserProcessImpl::hid_policy_allowed_devices() {
   return nullptr;
 }
 
+void BrowserProcessImpl::SetSystemLocale(const std::string& locale) {
+  system_locale_ = locale;
+}
+
+const std::string& BrowserProcessImpl::GetSystemLocale() const {
+  return system_locale_;
+}
+
 void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) {
   locale_ = locale;
 }
diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h
index 3a135cade0cbb..05bcd3f3ba3a0 100644
--- a/shell/browser/browser_process_impl.h
+++ b/shell/browser/browser_process_impl.h
@@ -49,6 +49,9 @@ class BrowserProcessImpl : public BrowserProcess {
   void PostDestroyThreads() {}
   void PostMainMessageLoopRun();
 
+  void SetSystemLocale(const std::string& locale);
+  const std::string& GetSystemLocale() const;
+
   void EndSession() override {}
   void FlushLocalStateAndReply(base::OnceClosure reply) override {}
   bool IsShuttingDown() override;
@@ -110,6 +113,7 @@ class BrowserProcessImpl : public BrowserProcess {
 #endif
   std::unique_ptr<PrefService> local_state_;
   std::string locale_;
+  std::string system_locale_;
 };
 
 #endif  // ELECTRON_SHELL_BROWSER_BROWSER_PROCESS_IMPL_H_
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
index 046752918d45c..82a479866288f 100644
--- a/shell/browser/electron_browser_main_parts.cc
+++ b/shell/browser/electron_browser_main_parts.cc
@@ -11,6 +11,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
+#include "base/i18n/rtl.h"
 #include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ -283,8 +284,16 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
 }
 
 int ElectronBrowserMainParts::PreCreateThreads() {
-  if (!views::LayoutProvider::Get())
+  if (!views::LayoutProvider::Get()) {
     layout_provider_ = std::make_unique<views::LayoutProvider>();
+  }
+
+  // Fetch the system locale for Electron.
+#if BUILDFLAG(IS_MAC)
+  fake_browser_process_->SetSystemLocale(GetCurrentSystemLocale());
+#else
+  fake_browser_process_->SetSystemLocale(base::i18n::GetConfiguredLocale());
+#endif
 
   auto* command_line = base::CommandLine::ForCurrentProcess();
   std::string locale = command_line->GetSwitchValueASCII(::switches::kLang);
@@ -321,7 +330,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
   }
 #endif
 
-  // Initialize the app locale.
+  // Initialize the app locale for Electron and Chromium.
   std::string app_locale = l10n_util::GetApplicationLocale(loaded_locale);
   ElectronBrowserClient::SetApplicationLocale(app_locale);
   fake_browser_process_->SetApplicationLocale(app_locale);
diff --git a/shell/browser/electron_browser_main_parts.h b/shell/browser/electron_browser_main_parts.h
index 3c45ed29bfbb7..76d5d2d0774fc 100644
--- a/shell/browser/electron_browser_main_parts.h
+++ b/shell/browser/electron_browser_main_parts.h
@@ -130,6 +130,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
   void FreeAppDelegate();
   void RegisterURLHandler();
   void InitializeMainNib();
+  static std::string GetCurrentSystemLocale();
 #endif
 
 #if BUILDFLAG(IS_MAC)
diff --git a/shell/browser/electron_browser_main_parts_mac.mm b/shell/browser/electron_browser_main_parts_mac.mm
index f280f66579f06..4ed64a912d769 100644
--- a/shell/browser/electron_browser_main_parts_mac.mm
+++ b/shell/browser/electron_browser_main_parts_mac.mm
@@ -4,6 +4,8 @@
 
 #include "shell/browser/electron_browser_main_parts.h"
 
+#include <string>
+
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
@@ -74,4 +76,16 @@
   [mainNib release];
 }
 
+std::string ElectronBrowserMainParts::GetCurrentSystemLocale() {
+  NSString* systemLocaleIdentifier =
+      [[NSLocale currentLocale] localeIdentifier];
+
+  // Mac OS X uses "_" instead of "-", so swap to get a real locale value.
+  std::string locale_value = [[systemLocaleIdentifier
+      stringByReplacingOccurrencesOfString:@"_"
+                                withString:@"-"] UTF8String];
+
+  return locale_value;
+}
+
 }  // namespace electron
diff --git a/spec-main/api-app-spec.ts b/spec-main/api-app-spec.ts
index a08df928fad1e..a244364fdf253 100644
--- a/spec-main/api-app-spec.ts
+++ b/spec-main/api-app-spec.ts
@@ -118,6 +118,12 @@ describe('app module', () => {
     });
   });
 
+  describe('app.getSystemLocale()', () => {
+    it('should not be empty', () => {
+      expect(app.getSystemLocale()).to.not.equal('');
+    });
+  });
+
   describe('app.getLocaleCountryCode()', () => {
     it('should be empty or have length of two', () => {
       const localeCountryCode = app.getLocaleCountryCode();
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 957fab8b67ccf..0427588893f64 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -374,6 +374,7 @@ describe('command line switches', () => {
   });
   describe('--lang switch', () => {
     const currentLocale = app.getLocale();
+    const currentSystemLocale = app.getSystemLocale();
     const testLocale = async (locale: string, result: string, printEnv: boolean = false) => {
       const appPath = path.join(fixturesPath, 'api', 'locale-check');
       const args = [appPath, `--set-lang=${locale}`];
@@ -396,8 +397,9 @@ describe('command line switches', () => {
       expect(output).to.equal(result);
     };
 
-    it('should set the locale', async () => testLocale('fr', 'fr'));
-    it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale));
+    it('should set the locale', async () => testLocale('fr', `fr|${currentSystemLocale}`));
+    it('should set the locale with country code', async () => testLocale('zh-CN', `zh-CN|${currentSystemLocale}`));
+    it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}`));
 
     const lcAll = String(process.env.LC_ALL);
     ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => {
diff --git a/spec/fixtures/api/locale-check/main.js b/spec/fixtures/api/locale-check/main.js
index 929a9e0e9519a..dd4e6317dbb61 100644
--- a/spec/fixtures/api/locale-check/main.js
+++ b/spec/fixtures/api/locale-check/main.js
@@ -9,7 +9,7 @@ app.whenReady().then(() => {
   if (process.argv[3] === '--print-env') {
     process.stdout.write(String(process.env.LC_ALL));
   } else {
-    process.stdout.write(app.getLocale());
+    process.stdout.write(`${app.getLocale()}|${app.getSystemLocale()}`);
   }
   process.stdout.end();
 

From 7bf3913bf33f154ee1a0a8bf5f81238fce0da834 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 13:29:38 -0400
Subject: [PATCH 754/811] feat: add support for Web Bluetooth pin pairing
 (#35818)

* feat: add bluetooth pairing handler

* Update docs/api/session.md

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

* Update docs/api/session.md

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

* docs: update based on review

* Apply suggestions from code review

Co-authored-by: Erick Zhao <erick@hotmail.ca>
Co-authored-by: Charles Kerr <charles@charleskerr.com>

* chore: update docs per review

* chore: cleanup callback per review

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Erick Zhao <erick@hotmail.ca>
---
 docs/api/session.md                           | 65 +++++++++++++++++
 docs/fiddles/features/web-bluetooth/main.js   | 19 ++++-
 .../fiddles/features/web-bluetooth/preload.js |  6 ++
 .../features/web-bluetooth/renderer.js        | 28 +++++++-
 docs/tutorial/devices.md                      |  4 ++
 filenames.auto.gni                            |  1 +
 shell/browser/api/electron_api_session.cc     | 14 ++++
 shell/browser/api/electron_api_session.h      |  2 +
 .../bluetooth/electron_bluetooth_delegate.cc  | 69 ++++++++++++++++++-
 .../bluetooth/electron_bluetooth_delegate.h   |  7 ++
 shell/browser/electron_permission_manager.cc  | 17 +++++
 shell/browser/electron_permission_manager.h   |  9 +++
 12 files changed, 235 insertions(+), 6 deletions(-)
 create mode 100644 docs/fiddles/features/web-bluetooth/preload.js

diff --git a/docs/api/session.md b/docs/api/session.md
index c691f237e7260..ee1c3e7a8b347 100644
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -769,6 +769,71 @@ app.whenReady().then(() => {
 })
 ```
 
+#### `ses.setBluetoothPairingHandler(handler)` _Windows_ _Linux_
+
+* `handler` Function | null
+  * `details` Object
+    * `deviceId` string
+    * `pairingKind` string - The type of pairing prompt being requested.
+      One of the following values:
+      * `confirm`
+        This prompt is requesting confirmation that the Bluetooth device should
+        be paired.
+      * `confirmPin`
+        This prompt is requesting confirmation that the provided PIN matches the
+        pin displayed on the device.
+      * `providePin`
+        This prompt is requesting that a pin be provided for the device.
+    * `frame` [WebFrameMain](web-frame-main.md)
+    * `pin` string (optional) - The pin value to verify if `pairingKind` is `confirmPin`.
+  * `callback` Function
+    * `response` Object
+      * `confirmed` boolean - `false` should be passed in if the dialog is canceled.
+        If the `pairingKind` is `confirm` or `confirmPin`, this value should indicate
+        if the pairing is confirmed.  If the `pairingKind` is `providePin` the value
+        should be `true` when a value is provided.
+      * `pin` string | null (optional) - When the `pairingKind` is `providePin`
+        this value should be the required pin for the Bluetooth device.
+
+Sets a handler to respond to Bluetooth pairing requests. This handler
+allows developers to handle devices that require additional validation
+before pairing.  When a handler is not defined, any pairing on Linux or Windows
+that requires additional validation will be automatically cancelled.
+macOS does not require a handler because macOS handles the pairing
+automatically.  To clear the handler, call `setBluetoothPairingHandler(null)`.
+
+```javascript
+
+const { app, BrowserWindow, ipcMain, session } = require('electron')
+
+let bluetoothPinCallback = null
+
+function createWindow () {
+  const mainWindow = new BrowserWindow({
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }
+  })
+}
+
+// Listen for an IPC message from the renderer to get the response for the Bluetooth pairing.
+ipcMain.on('bluetooth-pairing-response', (event, response) => {
+  bluetoothPinCallback(response)
+})
+
+mainWindow.webContents.session.setBluetoothPairingHandler((details, callback) => {
+  bluetoothPinCallback = callback
+  // Send a IPC message to the renderer to prompt the user to confirm the pairing.
+  // Note that this will require logic in the renderer to handle this message and
+  // display a prompt to the user.
+  mainWindow.webContents.send('bluetooth-pairing-request', details)
+})
+
+app.whenReady().then(() => {
+  createWindow()
+})
+```
+
 #### `ses.clearHostResolverCache()`
 
 Returns `Promise<void>` - Resolves when the operation is complete.
diff --git a/docs/fiddles/features/web-bluetooth/main.js b/docs/fiddles/features/web-bluetooth/main.js
index b3cc55a438198..5d560579cc05f 100644
--- a/docs/fiddles/features/web-bluetooth/main.js
+++ b/docs/fiddles/features/web-bluetooth/main.js
@@ -1,10 +1,13 @@
-const {app, BrowserWindow} = require('electron')
+const {app, BrowserWindow, ipcMain} = require('electron')
 const path = require('path')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({
     width: 800,
-    height: 600
+    height: 600,
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js')
+    }    
   })
 
   mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
@@ -14,6 +17,18 @@ function createWindow () {
     } 
   })
 
+  // Listen for a message from the renderer to get the response for the Bluetooth pairing.
+  ipcMain.on('bluetooth-pairing-response', (event, response) => {
+    bluetoothPinCallback(response)
+  })
+
+  mainWindow.webContents.session.setBluetoothPairingHandler((details, callback) => {
+
+    bluetoothPinCallback = callback
+    // Send a message to the renderer to prompt the user to confirm the pairing.
+    mainWindow.webContents.send('bluetooth-pairing-request', details)
+  })  
+
   mainWindow.loadFile('index.html')
 }
 
diff --git a/docs/fiddles/features/web-bluetooth/preload.js b/docs/fiddles/features/web-bluetooth/preload.js
new file mode 100644
index 0000000000000..0732ea315ff7f
--- /dev/null
+++ b/docs/fiddles/features/web-bluetooth/preload.js
@@ -0,0 +1,6 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  bluetoothPairingRequest: (callback) => ipcRenderer.on('bluetooth-pairing-request', callback),
+  bluetoothPairingResponse: (response) => ipcRenderer.send('bluetooth-pairing-respnse', response)
+})
\ No newline at end of file
diff --git a/docs/fiddles/features/web-bluetooth/renderer.js b/docs/fiddles/features/web-bluetooth/renderer.js
index e5830955599af..080fb6105b287 100644
--- a/docs/fiddles/features/web-bluetooth/renderer.js
+++ b/docs/fiddles/features/web-bluetooth/renderer.js
@@ -5,4 +5,30 @@ async function testIt() {
   document.getElementById('device-name').innerHTML = device.name || `ID: ${device.id}`
 }
 
-document.getElementById('clickme').addEventListener('click',testIt)
\ No newline at end of file
+document.getElementById('clickme').addEventListener('click',testIt)
+
+window.electronAPI.bluetoothPairingRequest((event, details) => {
+  const response = {}
+  
+  switch (details.pairingKind) {
+    case 'confirm': {
+      response.confirmed = confirm(`Do you want to connect to device ${details.deviceId}?`)
+      break
+    }
+    case 'confirmPin': {
+      response.confirmed = confirm(`Does the pin ${details.pin} match the pin displayed on device ${details.deviceId}?`)
+      break
+    }
+    case 'providePin': {
+      const pin = prompt(`Please provide a pin for ${details.deviceId}.`)
+      if (pin) {
+        response.pin = pin
+        response.confirmed = true
+      } else {
+        response.confirmed = false
+      }
+    }
+  }
+
+  window.electronAPI.bluetoothPairingResponse(response)
+})
\ No newline at end of file
diff --git a/docs/tutorial/devices.md b/docs/tutorial/devices.md
index cba807891f07b..6f11fec760208 100644
--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -16,6 +16,10 @@ with bluetooth devices. In order to use this API in Electron, developers will
 need to handle the [`select-bluetooth-device` event on the webContents](../api/web-contents.md#event-select-bluetooth-device)
 associated with the device request.
 
+Additionally, [`ses.setBluetoothPairingHandler(handler)`](../api/session.md#sessetbluetoothpairinghandlerhandler-windows-linux)
+can be used to handle pairing to bluetooth devices on Windows or Linux when
+additional validation such as a pin is needed.
+
 ### Example
 
 This example demonstrates an Electron application that automatically selects
diff --git a/filenames.auto.gni b/filenames.auto.gni
index 2b865962a3885..57d9f4d1384ee 100644
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -142,6 +142,7 @@ auto_filenames = {
     "lib/common/define-properties.ts",
     "lib/common/ipc-messages.ts",
     "lib/common/web-view-methods.ts",
+    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/ipc-renderer.ts",
diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc
index a5d59b2d2b2d8..340adbd1a65a3 100644
--- a/shell/browser/api/electron_api_session.cc
+++ b/shell/browser/api/electron_api_session.cc
@@ -655,6 +655,18 @@ void Session::SetDevicePermissionHandler(v8::Local<v8::Value> val,
   permission_manager->SetDevicePermissionHandler(handler);
 }
 
+void Session::SetBluetoothPairingHandler(v8::Local<v8::Value> val,
+                                         gin::Arguments* args) {
+  ElectronPermissionManager::BluetoothPairingHandler handler;
+  if (!(val->IsNull() || gin::ConvertFromV8(args->isolate(), val, &handler))) {
+    args->ThrowTypeError("Must pass null or function");
+    return;
+  }
+  auto* permission_manager = static_cast<ElectronPermissionManager*>(
+      browser_context()->GetPermissionControllerDelegate());
+  permission_manager->SetBluetoothPairingHandler(handler);
+}
+
 v8::Local<v8::Promise> Session::ClearHostResolverCache(gin::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
   gin_helper::Promise<void> promise(isolate);
@@ -1204,6 +1216,8 @@ gin::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
                  &Session::SetPermissionCheckHandler)
       .SetMethod("setDevicePermissionHandler",
                  &Session::SetDevicePermissionHandler)
+      .SetMethod("setBluetoothPairingHandler",
+                 &Session::SetBluetoothPairingHandler)
       .SetMethod("clearHostResolverCache", &Session::ClearHostResolverCache)
       .SetMethod("clearAuthCache", &Session::ClearAuthCache)
       .SetMethod("allowNTLMCredentialsForDomains",
diff --git a/shell/browser/api/electron_api_session.h b/shell/browser/api/electron_api_session.h
index c5f21920dcc6e..9507d706a4f20 100644
--- a/shell/browser/api/electron_api_session.h
+++ b/shell/browser/api/electron_api_session.h
@@ -105,6 +105,8 @@ class Session : public gin::Wrappable<Session>,
                                  gin::Arguments* args);
   void SetDevicePermissionHandler(v8::Local<v8::Value> val,
                                   gin::Arguments* args);
+  void SetBluetoothPairingHandler(v8::Local<v8::Value> val,
+                                  gin::Arguments* args);
   v8::Local<v8::Promise> ClearHostResolverCache(gin::Arguments* args);
   v8::Local<v8::Promise> ClearAuthCache();
   void AllowNTLMCredentialsForDomains(const std::string& domains);
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
index 340cb5a4a35f2..6cfc775041553 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc
@@ -7,6 +7,7 @@
 #include <memory>
 #include <utility>
 
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/public/browser/render_frame_host.h"
@@ -14,7 +15,10 @@
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/public/cpp/bluetooth_uuid.h"
 #include "shell/browser/api/electron_api_web_contents.h"
+#include "shell/browser/electron_permission_manager.h"
 #include "shell/browser/lib/bluetooth_chooser.h"
+#include "shell/common/gin_converters/frame_converter.h"
+#include "shell/common/gin_helper/dictionary.h"
 #include "third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h"
 #include "third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom.h"
 
@@ -23,6 +27,28 @@ using content::RenderFrameHost;
 using content::WebContents;
 using device::BluetoothUUID;
 
+namespace gin {
+
+template <>
+struct Converter<content::BluetoothDelegate::PairingKind> {
+  static v8::Local<v8::Value> ToV8(
+      v8::Isolate* isolate,
+      content::BluetoothDelegate::PairingKind pairing_kind) {
+    switch (pairing_kind) {
+      case content::BluetoothDelegate::PairingKind::kConfirmOnly:
+        return StringToV8(isolate, "confirm");
+      case content::BluetoothDelegate::PairingKind::kConfirmPinMatch:
+        return StringToV8(isolate, "confirmPin");
+      case content::BluetoothDelegate::PairingKind::kProvidePin:
+        return StringToV8(isolate, "providePin");
+      default:
+        return StringToV8(isolate, "unknown");
+    }
+  }
+};
+
+}  // namespace gin
+
 namespace electron {
 
 ElectronBluetoothDelegate::ElectronBluetoothDelegate() = default;
@@ -136,9 +162,46 @@ void ElectronBluetoothDelegate::ShowDevicePairPrompt(
     PairPromptCallback callback,
     PairingKind pairing_kind,
     const absl::optional<std::u16string>& pin) {
-  NOTIMPLEMENTED();
-  std::move(callback).Run(BluetoothDelegate::PairPromptResult(
-      BluetoothDelegate::PairPromptStatus::kCancelled));
+  auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
+  if (web_contents) {
+    auto* permission_manager = static_cast<ElectronPermissionManager*>(
+        web_contents->GetBrowserContext()->GetPermissionControllerDelegate());
+
+    v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+    v8::HandleScope scope(isolate);
+    gin_helper::Dictionary details =
+        gin_helper::Dictionary::CreateEmpty(isolate);
+    details.Set("deviceId", device_identifier);
+    details.Set("pairingKind", pairing_kind);
+    details.SetGetter("frame", frame);
+    if (pin.has_value()) {
+      details.Set("pin", pin.value());
+    }
+
+    permission_manager->CheckBluetoothDevicePair(
+        details, base::AdaptCallbackForRepeating(base::BindOnce(
+                     &ElectronBluetoothDelegate::OnDevicePairPromptResponse,
+                     weak_factory_.GetWeakPtr(), std::move(callback))));
+  }
+}
+
+void ElectronBluetoothDelegate::OnDevicePairPromptResponse(
+    PairPromptCallback callback,
+    base::Value::Dict response) {
+  BluetoothDelegate::PairPromptResult result;
+  if (response.FindBool("confirmed").value_or(false)) {
+    result.result_code = BluetoothDelegate::PairPromptStatus::kSuccess;
+  } else {
+    result.result_code = BluetoothDelegate::PairPromptStatus::kCancelled;
+  }
+
+  const std::string* pin = response.FindString("pin");
+  if (pin) {
+    std::u16string trimmed_input = base::UTF8ToUTF16(*pin);
+    base::TrimWhitespace(trimmed_input, base::TRIM_ALL, &trimmed_input);
+    result.pin = base::UTF16ToUTF8(trimmed_input);
+  }
+  std::move(callback).Run(result);
 }
 
 }  // namespace electron
diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.h b/shell/browser/bluetooth/electron_bluetooth_delegate.h
index df4f07703e815..8328f45636ad3 100644
--- a/shell/browser/bluetooth/electron_bluetooth_delegate.h
+++ b/shell/browser/bluetooth/electron_bluetooth_delegate.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observation.h"
 #include "content/public/browser/bluetooth_delegate.h"
@@ -91,6 +92,12 @@ class ElectronBluetoothDelegate : public content::BluetoothDelegate {
   void AddFramePermissionObserver(FramePermissionObserver* observer) override;
   void RemoveFramePermissionObserver(
       FramePermissionObserver* observer) override;
+
+ private:
+  void OnDevicePairPromptResponse(PairPromptCallback callback,
+                                  base::Value::Dict response);
+
+  base::WeakPtrFactory<ElectronBluetoothDelegate> weak_factory_{this};
 };
 
 }  // namespace electron
diff --git a/shell/browser/electron_permission_manager.cc b/shell/browser/electron_permission_manager.cc
index 8b3d4d50df02f..995a704bb6503 100644
--- a/shell/browser/electron_permission_manager.cc
+++ b/shell/browser/electron_permission_manager.cc
@@ -130,6 +130,11 @@ void ElectronPermissionManager::SetDevicePermissionHandler(
   device_permission_handler_ = handler;
 }
 
+void ElectronPermissionManager::SetBluetoothPairingHandler(
+    const BluetoothPairingHandler& handler) {
+  bluetooth_pairing_handler_ = handler;
+}
+
 void ElectronPermissionManager::RequestPermission(
     blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
@@ -276,6 +281,18 @@ ElectronPermissionManager::SubscribePermissionStatusChange(
 void ElectronPermissionManager::UnsubscribePermissionStatusChange(
     SubscriptionId id) {}
 
+void ElectronPermissionManager::CheckBluetoothDevicePair(
+    gin_helper::Dictionary details,
+    PairCallback pair_callback) const {
+  if (bluetooth_pairing_handler_.is_null()) {
+    base::Value::Dict response;
+    response.Set("confirmed", false);
+    std::move(pair_callback).Run(std::move(response));
+  } else {
+    bluetooth_pairing_handler_.Run(details, std::move(pair_callback));
+  }
+}
+
 bool ElectronPermissionManager::CheckPermissionWithDetails(
     blink::PermissionType permission,
     content::RenderFrameHost* render_frame_host,
diff --git a/shell/browser/electron_permission_manager.h b/shell/browser/electron_permission_manager.h
index 00cbb81e9f733..3aa980ea22d71 100644
--- a/shell/browser/electron_permission_manager.h
+++ b/shell/browser/electron_permission_manager.h
@@ -13,6 +13,7 @@
 #include "content/public/browser/permission_controller_delegate.h"
 #include "gin/dictionary.h"
 #include "shell/browser/electron_browser_context.h"
+#include "shell/common/gin_helper/dictionary.h"
 
 namespace base {
 class Value;
@@ -38,6 +39,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       base::OnceCallback<void(blink::mojom::PermissionStatus)>;
   using StatusesCallback = base::OnceCallback<void(
       const std::vector<blink::mojom::PermissionStatus>&)>;
+  using PairCallback = base::OnceCallback<void(base::Value::Dict)>;
   using RequestHandler = base::RepeatingCallback<void(content::WebContents*,
                                                       blink::PermissionType,
                                                       StatusCallback,
@@ -50,11 +52,14 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
 
   using DeviceCheckHandler =
       base::RepeatingCallback<bool(const v8::Local<v8::Object>&)>;
+  using BluetoothPairingHandler =
+      base::RepeatingCallback<void(gin_helper::Dictionary, PairCallback)>;
 
   // Handler to dispatch permission requests in JS.
   void SetPermissionRequestHandler(const RequestHandler& handler);
   void SetPermissionCheckHandler(const CheckHandler& handler);
   void SetDevicePermissionHandler(const DeviceCheckHandler& handler);
+  void SetBluetoothPairingHandler(const BluetoothPairingHandler& handler);
 
   // content::PermissionControllerDelegate:
   void RequestPermission(blink::PermissionType permission,
@@ -81,6 +86,9 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
       base::Value::Dict details,
       StatusesCallback callback);
 
+  void CheckBluetoothDevicePair(gin_helper::Dictionary details,
+                                PairCallback pair_callback) const;
+
   bool CheckPermissionWithDetails(blink::PermissionType permission,
                                   content::RenderFrameHost* render_frame_host,
                                   const GURL& requesting_origin,
@@ -147,6 +155,7 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
   RequestHandler request_handler_;
   CheckHandler check_handler_;
   DeviceCheckHandler device_permission_handler_;
+  BluetoothPairingHandler bluetooth_pairing_handler_;
 
   PendingRequestsMap pending_requests_;
 };

From d3b678a03e523708bfe5ca3721cbd1e8bc4151be Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 11:02:36 -0700
Subject: [PATCH 755/811] Bump v21.0.0

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 4e769dc94ad4e..2ad7925f6fb87 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0-beta.8
\ No newline at end of file
+21.0.0
\ No newline at end of file
diff --git a/package.json b/package.json
index 3b417c1fa169f..ee8a88b7eb3fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0-beta.8",
+  "version": "21.0.0",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index b422eaf79de86..33f71d1f56e71 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,8
- PRODUCTVERSION 21,0,0,8
+ FILEVERSION 21,0,0,0
+ PRODUCTVERSION 21,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

From c21da5431107cfce73c1face28a0dffe05227349 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 17:39:09 -0400
Subject: [PATCH 756/811] fix: Handle an electron.d.ts file in a custom build
 (#35822)

fix: Handle an electron.d.ts file in a custom build (#33979)

* Handle an electron.d.ts file in a custom build

* Fix linter issues

Co-authored-by: Felix Rieseberg <felixr@stripe.com>

Co-authored-by: Felix Rieseberg <felix@felixrieseberg.com>
Co-authored-by: Felix Rieseberg <felixr@stripe.com>
---
 npm/install.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/npm/install.js b/npm/install.js
index 069701adee67a..864ca633fd30f 100755
--- a/npm/install.js
+++ b/npm/install.js
@@ -70,8 +70,30 @@ function isInstalled () {
 
 // unzips and makes path.txt point at the correct executable
 function extractFile (zipPath) {
-  return extract(zipPath, { dir: path.join(__dirname, 'dist') })
-    .then(() => fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath));
+  return new Promise((resolve, reject) => {
+    const distPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist');
+
+    extract(zipPath, { dir: path.join(__dirname, 'dist') })
+      .then(() => {
+        // If the zip contains an "electron.d.ts" file,
+        // move that up
+        const srcTypeDefPath = path.join(distPath, 'electron.d.ts');
+        const targetTypeDefPath = path.join(__dirname, 'electron.d.ts');
+        const hasTypeDefinitions = fs.existsSync(srcTypeDefPath);
+
+        if (hasTypeDefinitions) {
+          try {
+            fs.renameSync(srcTypeDefPath, targetTypeDefPath);
+          } catch (err) {
+            reject(err);
+          }
+        }
+
+        // Write a "path.txt" file.
+        return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath);
+      })
+      .catch((err) => reject(err));
+  });
 }
 
 function getPlatformPath () {

From a183995b09b76423e0fe2a1e2c649cf54df7812e Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:50:51 -0400
Subject: [PATCH 757/811] chore: bump chromium to 106.0.5249.61 (21-x-y)
 (#35833)

* chore: bump chromium in DEPS to 106.0.5249.61

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 DEPS                                                            | 2 +-
 ..._maximized_parameter_to_linuxui_getwindowframeprovider.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index b730762315bc2..463fd8ef72352 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.51',
+    '106.0.5249.61',
   'node_version':
     'v16.16.0',
   'nan_version':
diff --git a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
index cf013cc6850e6..372cd21f99c5c 100644
--- a/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
+++ b/patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
@@ -8,7 +8,7 @@ decorations in maximized mode where needed, preventing empty space caused
 by decoration shadows and rounded titlebars around the window while maximized.
 
 diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
-index 1fbb58152c19193d480b437aea123abdd61c24fe..2b7e305d643aa2e0afef4c578688897c3a8832bf 100644
+index dd42b1e87cf30413f96fdcfed9d8dc8c04fd537a..6c0612fb0f0dca32486d04491f9cd49a428836d1 100644
 --- a/ui/gtk/gtk_ui.cc
 +++ b/ui/gtk/gtk_ui.cc
 @@ -500,13 +500,15 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {

From 78ffd4f6045ad718eb164b5ad8df19cdc96992ad Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 27 Sep 2022 14:31:39 -0700
Subject: [PATCH 758/811] build: fix deps workflow tag comparison (#35844)

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>
---
 .github/workflows/release_dependency_versions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 .github/workflows/release_dependency_versions.yml

diff --git a/.github/workflows/release_dependency_versions.yml b/.github/workflows/release_dependency_versions.yml
old mode 100644
new mode 100755
index d270b6a21bbac..00db1ba079d59
--- a/.github/workflows/release_dependency_versions.yml
+++ b/.github/workflows/release_dependency_versions.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Check Tag
       run: |
-        if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+\.0\.0$ ]]; then
+        if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.0\.0$ ]]; then
           echo ::set-output name=should_release::true
         fi
   trigger:

From cb22573c3e76e09df9fbad36dc372080c04d349e Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 08:31:01 -0700
Subject: [PATCH 759/811] Bump v21.0.1

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 2ad7925f6fb87..51d2144bcd0a8 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.0
\ No newline at end of file
+21.0.1
\ No newline at end of file
diff --git a/package.json b/package.json
index ee8a88b7eb3fe..a4df233c6a1e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.0",
+  "version": "21.0.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 33f71d1f56e71..ba908b1e11981 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,0,0
- PRODUCTVERSION 21,0,0,0
+ FILEVERSION 21,0,1,0
+ PRODUCTVERSION 21,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "21.0.0"
+            VALUE "FileVersion", "21.0.1"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "21.0.0"
+            VALUE "ProductVersion", "21.0.1"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 32b64170b99591aa02843e2b58042597a75e94a5 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 12:55:18 -0400
Subject: [PATCH 760/811] feat: add WebContents.opener and
 webContents.fromFrame() (#35819)

* feat: add WebContents.opener

* feat: add webContents.fromFrame(frame)

* fix: unknown type name

* test: fix and add more fromFrame cases

* docs: clarified terminology

Co-authored-by: Samuel Maddock <smaddock@salesforce.com>
---
 docs/api/web-contents.md                      | 12 ++++
 lib/browser/api/web-contents.ts               |  4 ++
 .../browser/api/electron_api_web_contents.cc  | 16 +++++
 shell/browser/api/electron_api_web_contents.h |  1 +
 spec-main/api-web-contents-spec.ts            | 72 ++++++++++++++++++-
 5 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index 0c7f18d55cd0e..37e5137340a23 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -45,6 +45,13 @@ returns `null`.
 Returns `WebContents` | undefined - A WebContents instance with the given ID, or
 `undefined` if there is no WebContents associated with the given ID.
 
+### `webContents.fromFrame(frame)`
+
+* `frame` WebFrameMain
+
+Returns `WebContents` | undefined - A WebContents instance with the given WebFrameMain, or
+`undefined` if there is no WebContents associated with the given WebFrameMain.
+
 ### `webContents.fromDevToolsTargetId(targetId)`
 
 * `targetId` string - The Chrome DevTools Protocol [TargetID](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) associated with the WebContents instance.
@@ -2079,6 +2086,11 @@ when the page becomes backgrounded. This also affects the Page Visibility API.
 
 A [`WebFrameMain`](web-frame-main.md) property that represents the top frame of the page's frame hierarchy.
 
+#### `contents.opener` _Readonly_
+
+A [`WebFrameMain`](web-frame-main.md) property that represents the frame that opened this WebContents, either
+with open(), or by navigating a link with a target attribute.
+
 [keyboardevent]: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index a0369fc734a14..5b9131fcec003 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -838,6 +838,10 @@ export function fromId (id: string) {
   return binding.fromId(id);
 }
 
+export function fromFrame (frame: Electron.WebFrameMain) {
+  return binding.fromFrame(frame);
+}
+
 export function fromDevToolsTargetId (targetId: string) {
   return binding.fromDevToolsTargetId(targetId);
 }
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index 3340c0e47e357..ec6a24301111c 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -3435,6 +3435,10 @@ content::RenderFrameHost* WebContents::MainFrame() {
   return web_contents()->GetPrimaryMainFrame();
 }
 
+content::RenderFrameHost* WebContents::Opener() {
+  return web_contents()->GetOpener();
+}
+
 void WebContents::NotifyUserActivation() {
   content::RenderFrameHost* frame = web_contents()->GetPrimaryMainFrame();
   if (frame)
@@ -4045,6 +4049,7 @@ v8::Local<v8::ObjectTemplate> WebContents::FillObjectTemplate(
       .SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents)
       .SetProperty("debugger", &WebContents::Debugger)
       .SetProperty("mainFrame", &WebContents::MainFrame)
+      .SetProperty("opener", &WebContents::Opener)
       .Build();
 }
 
@@ -4159,6 +4164,7 @@ namespace {
 
 using electron::api::GetAllWebContents;
 using electron::api::WebContents;
+using electron::api::WebFrameMain;
 
 gin::Handle<WebContents> WebContentsFromID(v8::Isolate* isolate, int32_t id) {
   WebContents* contents = WebContents::FromID(id);
@@ -4166,6 +4172,15 @@ gin::Handle<WebContents> WebContentsFromID(v8::Isolate* isolate, int32_t id) {
                   : gin::Handle<WebContents>();
 }
 
+gin::Handle<WebContents> WebContentsFromFrame(v8::Isolate* isolate,
+                                              WebFrameMain* web_frame) {
+  content::RenderFrameHost* rfh = web_frame->render_frame_host();
+  content::WebContents* source = content::WebContents::FromRenderFrameHost(rfh);
+  WebContents* contents = WebContents::From(source);
+  return contents ? gin::CreateHandle(isolate, contents)
+                  : gin::Handle<WebContents>();
+}
+
 gin::Handle<WebContents> WebContentsFromDevToolsTargetID(
     v8::Isolate* isolate,
     std::string target_id) {
@@ -4194,6 +4209,7 @@ void Initialize(v8::Local<v8::Object> exports,
   gin_helper::Dictionary dict(isolate, exports);
   dict.Set("WebContents", WebContents::GetConstructor(context));
   dict.SetMethod("fromId", &WebContentsFromID);
+  dict.SetMethod("fromFrame", &WebContentsFromFrame);
   dict.SetMethod("fromDevToolsTargetId", &WebContentsFromDevToolsTargetID);
   dict.SetMethod("getAllWebContents", &GetAllWebContentsAsV8);
 }
diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h
index 111984a20c37d..1d7bc0ccb7e34 100644
--- a/shell/browser/api/electron_api_web_contents.h
+++ b/shell/browser/api/electron_api_web_contents.h
@@ -332,6 +332,7 @@ class WebContents : public ExclusiveAccessContext,
   v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
   v8::Local<v8::Value> Debugger(v8::Isolate* isolate);
   content::RenderFrameHost* MainFrame();
+  content::RenderFrameHost* Opener();
 
   WebContentsZoomController* GetZoomController() { return zoom_controller_; }
 
diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts
index 6b326e8008e64..f19fc67d49c70 100644
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -6,7 +6,7 @@ import * as http from 'http';
 import { BrowserWindow, ipcMain, webContents, session, WebContents, app, BrowserView } from 'electron/main';
 import { emittedOnce } from './events-helpers';
 import { closeAllWindows } from './window-helpers';
-import { ifdescribe, delay, defer } from './spec-helpers';
+import { ifdescribe, delay, defer, waitUntil } from './spec-helpers';
 
 const pdfjs = require('pdfjs-dist');
 const fixturesPath = path.resolve(__dirname, '..', 'spec', 'fixtures');
@@ -46,6 +46,28 @@ describe('webContents module', () => {
     });
   });
 
+  describe('fromFrame()', () => {
+    it('returns WebContents for mainFrame', () => {
+      const contents = (webContents as any).create() as WebContents;
+      expect(webContents.fromFrame(contents.mainFrame)).to.equal(contents);
+    });
+    it('returns undefined for disposed frame', async () => {
+      const contents = (webContents as any).create() as WebContents;
+      const { mainFrame } = contents;
+      contents.destroy();
+      await waitUntil(() => typeof webContents.fromFrame(mainFrame) === 'undefined');
+    });
+    it('throws when passing invalid argument', async () => {
+      let errored = false;
+      try {
+        webContents.fromFrame({} as any);
+      } catch {
+        errored = true;
+      }
+      expect(errored).to.be.true();
+    });
+  });
+
   describe('fromDevToolsTargetId()', () => {
     it('returns WebContents for attached DevTools target', async () => {
       const w = new BrowserWindow({ show: false });
@@ -1281,6 +1303,54 @@ describe('webContents module', () => {
     });
   });
 
+  describe('opener api', () => {
+    afterEach(closeAllWindows);
+    it('can get opener with window.open()', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } });
+      await w.loadURL('about:blank');
+      const childPromise = emittedOnce(w.webContents, 'did-create-window');
+      w.webContents.executeJavaScript('window.open("about:blank")', true);
+      const [childWindow] = await childPromise;
+      expect(childWindow.webContents.opener).to.equal(w.webContents.mainFrame);
+    });
+    it('has no opener when using "noopener"', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } });
+      await w.loadURL('about:blank');
+      const childPromise = emittedOnce(w.webContents, 'did-create-window');
+      w.webContents.executeJavaScript('window.open("about:blank", undefined, "noopener")', true);
+      const [childWindow] = await childPromise;
+      expect(childWindow.webContents.opener).to.be.null();
+    });
+    it('can get opener with a[target=_blank][rel=opener]', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } });
+      await w.loadURL('about:blank');
+      const childPromise = emittedOnce(w.webContents, 'did-create-window');
+      w.webContents.executeJavaScript(`(function() {
+        const a = document.createElement('a');
+        a.target = '_blank';
+        a.rel = 'opener';
+        a.href = 'about:blank';
+        a.click();
+      }())`, true);
+      const [childWindow] = await childPromise;
+      expect(childWindow.webContents.opener).to.equal(w.webContents.mainFrame);
+    });
+    it('has no opener with a[target=_blank][rel=noopener]', async () => {
+      const w = new BrowserWindow({ show: false, webPreferences: { sandbox: true } });
+      await w.loadURL('about:blank');
+      const childPromise = emittedOnce(w.webContents, 'did-create-window');
+      w.webContents.executeJavaScript(`(function() {
+        const a = document.createElement('a');
+        a.target = '_blank';
+        a.rel = 'noopener';
+        a.href = 'about:blank';
+        a.click();
+      }())`, true);
+      const [childWindow] = await childPromise;
+      expect(childWindow.webContents.opener).to.be.null();
+    });
+  });
+
   describe('render view deleted events', () => {
     let server: http.Server;
     let serverUrl: string;

From 12d9fe3ab7becd0fce518e84723241e13f69f293 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 22:22:43 +0200
Subject: [PATCH 761/811] fix: set display_id in desktop capturer on Linux
 (#35836)

fix: set display_id in desktop capturer on Linux (#33861)

Previously, display_id was an empty string, pending Chrome support for
sharing individual screens. Now that this has been added, it is
desirable to have this property set correctly.

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

Co-authored-by: James Cash <james.nvc@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 .../api/electron_api_desktop_capturer.cc      | 132 +++++++++++++++++-
 1 file changed, 129 insertions(+), 3 deletions(-)

diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc
index 60a7b31b231ef..63fa340e273bf 100644
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -4,6 +4,7 @@
 
 #include "shell/browser/api/electron_api_desktop_capturer.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -24,12 +25,125 @@
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/buildflags.h"
+#if BUILDFLAG(OZONE_PLATFORM_X11)
+#define USE_OZONE_PLATFORM_X11
+#endif
+#endif
+
 #if BUILDFLAG(IS_WIN)
 #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
 #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
 #include "ui/display/win/display_info.h"
+#elif BUILDFLAG(IS_LINUX)
+#if defined(USE_OZONE_PLATFORM_X11)
+#include "base/logging.h"
+#include "ui/base/x/x11_display_util.h"
+#include "ui/base/x/x11_util.h"
+#include "ui/display/util/edid_parser.h"  // nogncheck
+#include "ui/gfx/x/randr.h"
+#include "ui/gfx/x/x11_atom_cache.h"
+#include "ui/gfx/x/xproto_util.h"
+#endif  // defined(USE_OZONE_PLATFORM_X11)
 #endif  // BUILDFLAG(IS_WIN)
 
+#if BUILDFLAG(IS_LINUX)
+// Private function in ui/base/x/x11_display_util.cc
+std::map<x11::RandR::Output, int> GetMonitors(int version,
+                                              x11::RandR* randr,
+                                              x11::Window window) {
+  std::map<x11::RandR::Output, int> output_to_monitor;
+  if (version >= 105) {
+    if (auto reply = randr->GetMonitors({window}).Sync()) {
+      for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) {
+        for (x11::RandR::Output output : reply->monitors[monitor].outputs)
+          output_to_monitor[output] = monitor;
+      }
+    }
+  }
+  return output_to_monitor;
+}
+// Get the EDID data from the |output| and stores to |edid|.
+// Private function in ui/base/x/x11_display_util.cc
+std::vector<uint8_t> GetEDIDProperty(x11::RandR* randr,
+                                     x11::RandR::Output output) {
+  constexpr const char kRandrEdidProperty[] = "EDID";
+  auto future = randr->GetOutputProperty(x11::RandR::GetOutputPropertyRequest{
+      .output = output,
+      .property = x11::GetAtom(kRandrEdidProperty),
+      .long_length = 128});
+  auto response = future.Sync();
+  std::vector<uint8_t> edid;
+  if (response && response->format == 8 && response->type != x11::Atom::None)
+    edid = std::move(response->data);
+  return edid;
+}
+
+// Find the mapping from monitor name atom to the display identifier
+// that the screen API uses. Based on the logic in BuildDisplaysFromXRandRInfo
+// in ui/base/x/x11_display_util.cc
+std::map<int32_t, uint32_t> MonitorAtomIdToDisplayId() {
+  auto* connection = x11::Connection::Get();
+  auto& randr = connection->randr();
+  auto x_root_window = ui::GetX11RootWindow();
+  int version = ui::GetXrandrVersion();
+
+  std::map<int32_t, uint32_t> monitor_atom_to_display;
+
+  auto resources = randr.GetScreenResourcesCurrent({x_root_window}).Sync();
+  if (!resources) {
+    LOG(ERROR) << "XRandR returned no displays; don't know how to map ids";
+    return monitor_atom_to_display;
+  }
+
+  std::map<x11::RandR::Output, int> output_to_monitor =
+      GetMonitors(version, &randr, x_root_window);
+  auto monitors_reply = randr.GetMonitors({x_root_window}).Sync();
+
+  for (size_t i = 0; i < resources->outputs.size(); i++) {
+    x11::RandR::Output output_id = resources->outputs[i];
+    auto output_info =
+        randr.GetOutputInfo({output_id, resources->config_timestamp}).Sync();
+    if (!output_info)
+      continue;
+
+    if (output_info->connection != x11::RandR::RandRConnection::Connected)
+      continue;
+
+    if (output_info->crtc == static_cast<x11::RandR::Crtc>(0))
+      continue;
+
+    auto crtc =
+        randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp})
+            .Sync();
+    if (!crtc)
+      continue;
+    display::EdidParser edid_parser(
+        GetEDIDProperty(&randr, static_cast<x11::RandR::Output>(output_id)));
+    auto output_32 = static_cast<uint32_t>(output_id);
+    int64_t display_id =
+        output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32);
+    // It isn't ideal, but if we can't parse the EDID data, fall back on the
+    // display number.
+    if (!display_id)
+      display_id = i;
+
+    // Find the mapping between output identifier and the monitor name atom
+    // Note this isn't the atom string, but the numeric atom identifier,
+    // since this is what the WebRTC system uses as the display identifier
+    auto output_monitor_iter = output_to_monitor.find(output_id);
+    if (output_monitor_iter != output_to_monitor.end()) {
+      x11::Atom atom =
+          monitors_reply->monitors[output_monitor_iter->second].name;
+      monitor_atom_to_display[static_cast<int32_t>(atom)] = display_id;
+    }
+  }
+
+  return monitor_atom_to_display;
+}
+#endif
+
 namespace gin {
 
 template <>
@@ -178,10 +292,22 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
     for (auto& source : screen_sources) {
       source.display_id = base::NumberToString(source.media_list_source.id.id);
     }
+#elif BUILDFLAG(IS_LINUX)
+#if defined(USE_OZONE_PLATFORM_X11)
+    // On Linux, with X11, the source id is the numeric value of the
+    // display name atom and the display id is either the EDID or the
+    // loop index when that display was found (see
+    // BuildDisplaysFromXRandRInfo in ui/base/x/x11_display_util.cc)
+    std::map<int32_t, uint32_t> monitor_atom_to_display_id =
+        MonitorAtomIdToDisplayId();
+    for (auto& source : screen_sources) {
+      auto display_id_iter =
+          monitor_atom_to_display_id.find(source.media_list_source.id.id);
+      if (display_id_iter != monitor_atom_to_display_id.end())
+        source.display_id = base::NumberToString(display_id_iter->second);
+    }
+#endif  // defined(USE_OZONE_PLATFORM_X11)
 #endif  // BUILDFLAG(IS_WIN)
-    // TODO(ajmacd): Add Linux support. The IDs across APIs differ but Chrome
-    // only supports capturing the entire desktop on Linux. Revisit this if
-    // individual screen support is added.
     std::move(screen_sources.begin(), screen_sources.end(),
               std::back_inserter(captured_sources_));
   }

From 572a9b16a17fdafaac558f6b453875f814c5a886 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 15:43:19 +0200
Subject: [PATCH 762/811] fix: `TryCatch` scope in node_bindings (#35895)

fix: TryCatch scope in node_bindings

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>
---
 shell/common/node_bindings.cc | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 shell/common/node_bindings.cc

diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
old mode 100644
new mode 100755
index ce03319e87d26..f6b548215fdc6
--- a/shell/common/node_bindings.cc
+++ b/shell/common/node_bindings.cc
@@ -492,19 +492,22 @@ node::Environment* NodeBindings::CreateEnvironment(
     flags |= node::EnvironmentFlags::kNoStartDebugSignalHandler;
   }
 
-  v8::TryCatch try_catch(isolate);
-  env = node::CreateEnvironment(
-      isolate_data_, context, args, exec_args,
-      static_cast<node::EnvironmentFlags::Flags>(flags));
-
-  if (try_catch.HasCaught()) {
-    std::string err_msg =
-        "Failed to initialize node environment in process: " + process_type;
-    v8::Local<v8::Message> message = try_catch.Message();
-    std::string msg;
-    if (!message.IsEmpty() && gin::ConvertFromV8(isolate, message->Get(), &msg))
-      err_msg += " , with error: " + msg;
-    LOG(ERROR) << err_msg;
+  {
+    v8::TryCatch try_catch(isolate);
+    env = node::CreateEnvironment(
+        isolate_data_, context, args, exec_args,
+        static_cast<node::EnvironmentFlags::Flags>(flags));
+
+    if (try_catch.HasCaught()) {
+      std::string err_msg =
+          "Failed to initialize node environment in process: " + process_type;
+      v8::Local<v8::Message> message = try_catch.Message();
+      std::string msg;
+      if (!message.IsEmpty() &&
+          gin::ConvertFromV8(isolate, message->Get(), &msg))
+        err_msg += " , with error: " + msg;
+      LOG(ERROR) << err_msg;
+    }
   }
 
   DCHECK(env);

From 38955998f595c346e73de7268b49874d5bffd574 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:31:25 -0700
Subject: [PATCH 763/811] docs: update bluetooth fiddle example event name to
 trigger correct event (#35907)

Fix event type spelling for bluetooth fiddle example

Co-authored-by: sam <sam.leider@hotmail.com>

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: sam <sam.leider@hotmail.com>
---
 docs/fiddles/features/web-bluetooth/preload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 docs/fiddles/features/web-bluetooth/preload.js

diff --git a/docs/fiddles/features/web-bluetooth/preload.js b/docs/fiddles/features/web-bluetooth/preload.js
old mode 100644
new mode 100755
index 0732ea315ff7f..0c21fcce93881
--- a/docs/fiddles/features/web-bluetooth/preload.js
+++ b/docs/fiddles/features/web-bluetooth/preload.js
@@ -2,5 +2,5 @@ const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electronAPI', {
   bluetoothPairingRequest: (callback) => ipcRenderer.on('bluetooth-pairing-request', callback),
-  bluetoothPairingResponse: (response) => ipcRenderer.send('bluetooth-pairing-respnse', response)
+  bluetoothPairingResponse: (response) => ipcRenderer.send('bluetooth-pairing-response', response)
 })
\ No newline at end of file

From 4cd78dfccc70c103adea6bed213da155f39dfd88 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:31:39 -0700
Subject: [PATCH 764/811] chore: bump chromium to 106.0.5249.91 (21-x-y)
 (#35871)

chore: bump chromium in DEPS to 106.0.5249.91

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 463fd8ef72352..ebbabaa699d71 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.61',
+    '106.0.5249.91',
   'node_version':
     'v16.16.0',
   'nan_version':

From 63beca3002dd0c1ab2d6ef1db08b9d6a1b72c894 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 11:05:59 +0200
Subject: [PATCH 765/811] docs: update supported Mac versions (#35914)

Co-authored-by: VerteDinde <vertedinde@electronjs.org>

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 README.md

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 7bcb3e9253137..dfb49e1e148b5
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ For more installation options and troubleshooting tips, see
 
 Each Electron release provides binaries for macOS, Windows, and Linux.
 
-* macOS (El Capitan and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
+* macOS (High Sierra and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
 * Windows (Windows 7 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8.
 * Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
   * Ubuntu 14.04 and newer

From 2b69b32c1d4581cb7c6ec95c38a37bc4235664bf Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 08:31:26 -0700
Subject: [PATCH 766/811] Bump v21.1.0

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 51d2144bcd0a8..03224ad202d22 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.0.1
\ No newline at end of file
+21.1.0
\ No newline at end of file
diff --git a/package.json b/package.json
index a4df233c6a1e8..080de11515066 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.0.1",
+  "version": "21.1.0",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index ba908b1e11981..27bdf75fe6fca 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,0,1,0
- PRODUCTVERSION 21,0,1,0
+ FILEVERSION 21,1,0,0
+ PRODUCTVERSION 21,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "21.0.1"
+            VALUE "FileVersion", "21.1.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "21.0.1"
+            VALUE "ProductVersion", "21.1.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 0b733793c3fec910f0322f570eb1f37d2a88866d Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 5 Oct 2022 12:11:06 -0700
Subject: [PATCH 767/811] build: fix filesystem permissions from bad trop
 commits

Ref: https://github.com/electron/electron/commit/572a9b16a17fdafaac558f6b453875f814c5a886
Ref: https://github.com/electron/electron/commit/38955998f595c346e73de7268b49874d5bffd574
Ref: https://github.com/electron/electron/commit/63beca3002dd0c1ab2d6ef1db08b9d6a1b72c894
---
 README.md                                      | 0
 docs/fiddles/features/web-bluetooth/preload.js | 0
 shell/common/node_bindings.cc                  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 docs/fiddles/features/web-bluetooth/preload.js
 mode change 100755 => 100644 shell/common/node_bindings.cc

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/docs/fiddles/features/web-bluetooth/preload.js b/docs/fiddles/features/web-bluetooth/preload.js
old mode 100755
new mode 100644
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
old mode 100755
new mode 100644

From 80a4ea2601a5f0d31d89b05e385586c1cd93a8c2 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sam@electronjs.org>
Date: Thu, 6 Oct 2022 04:28:52 -0700
Subject: [PATCH 768/811] chore: cherry-pick c83640db21b5 from chromium
 (#35925)

* chore: cherry-pick c83640db21b5 from chromium

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/.patches                     |   1 +
 .../chromium/cherry-pick-c83640db21b5.patch   | 122 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 patches/chromium/cherry-pick-c83640db21b5.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 6b99ece695061..bd0340c00135a 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -123,3 +123,4 @@ disable_optimization_guide_for_preconnect_feature.patch
 fix_the_gn_gen_for_components_segmentation_platform.patch
 fix_crash_loading_non-standard_schemes_in_iframes.patch
 create_browser_v8_snapshot_file_name_fuse.patch
+cherry-pick-c83640db21b5.patch
diff --git a/patches/chromium/cherry-pick-c83640db21b5.patch b/patches/chromium/cherry-pick-c83640db21b5.patch
new file mode 100644
index 0000000000000..28911679eccf1
--- /dev/null
+++ b/patches/chromium/cherry-pick-c83640db21b5.patch
@@ -0,0 +1,122 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Wed, 5 Oct 2022 06:03:23 +0000
+Subject: build: set DTSDKBuild correctly when generating plist files
+
+Currently we set DTSDKBuild to the version of the SDK used to build
+Chromium.  This value is supposed to be the build version (this is
+what xcode sets it to for instance).  We read this value out of the
+SDK directly and use it instead.
+
+Change-Id: Ieb7990f13095683ad8c026f027b2605ae39523a4
+
+diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni
+index 43577925d2ef9cd79970d8307104e0abc1756583..0819d4cc1b17f216eae8c1a562b0301ba6298d57 100644
+--- a/build/config/mac/mac_sdk.gni
++++ b/build/config/mac/mac_sdk.gni
+@@ -40,6 +40,11 @@ declare_args() {
+   # will fail.
+   mac_sdk_official_version = "12.3"
+ 
++  # The SDK build version used when making official builds.  This is a single
++  # exact version found at "System/Library/CoreServices/SystemVersion.plist"
++  # inside the SDK.
++  mac_sdk_official_build_version = "21E226"
++
+   # Production builds should use hermetic Xcode. If you want to do production
+   # builds with system Xcode to test new SDKs, set this.
+   # Don't set this on any bots.
+@@ -103,11 +108,13 @@ if (use_system_xcode) {
+   find_sdk_args = [
+     "--print_sdk_path",
+     "--print_bin_path",
++    "--print_sdk_build",
+     mac_sdk_min,
+   ]
+   find_sdk_lines =
+       exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines")
+-  mac_sdk_version = find_sdk_lines[2]
++  mac_sdk_version = find_sdk_lines[3]
++  mac_sdk_build_version = find_sdk_lines[2]
+   if (mac_sdk_path == "") {
+     mac_sdk_path = find_sdk_lines[0]
+     mac_bin_path = find_sdk_lines[1]
+@@ -116,6 +123,7 @@ if (use_system_xcode) {
+   }
+ } else {
+   mac_sdk_version = mac_sdk_official_version
++  mac_sdk_build_version = mac_sdk_official_build_version
+   _dev = _hermetic_xcode_path + "/Contents/Developer"
+   _sdk = "MacOSX${mac_sdk_version}.sdk"
+   mac_sdk_path = _dev + "/Platforms/MacOSX.platform/Developer/SDKs/$_sdk"
+diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni
+index 03073f830401c4891376a3b59e2e7a870e3d34b7..04d403054c1a83fcbbc70be7cfd239ecbec315d3 100644
+--- a/build/config/mac/rules.gni
++++ b/build/config/mac/rules.gni
+@@ -41,7 +41,7 @@ template("mac_info_plist") {
+   apple_info_plist(target_name) {
+     format = "xml1"
+     extra_substitutions = [
+-      "MAC_SDK_BUILD=$mac_sdk_version",
++      "MAC_SDK_BUILD=$mac_sdk_build_version",
+       "MAC_SDK_NAME=$mac_sdk_name$mac_sdk_version",
+       "MACOSX_DEPLOYMENT_TARGET=$mac_deployment_target",
+       "CHROMIUM_MIN_SYSTEM_VERSION=$mac_min_system_version",
+diff --git a/build/mac/find_sdk.py b/build/mac/find_sdk.py
+index d86f3109357a9246d570cb02992dc82552ba7c20..b2400c7e8c70957e364444f509880900ce3b641f 100755
+--- a/build/mac/find_sdk.py
++++ b/build/mac/find_sdk.py
+@@ -24,6 +24,7 @@ Sample Output:
+ from __future__ import print_function
+ 
+ import os
++import plistlib
+ import re
+ import subprocess
+ import sys
+@@ -51,6 +52,9 @@ def main():
+   parser.add_option("--print_bin_path",
+                     action="store_true", dest="print_bin_path", default=False,
+                     help="Additionally print the path the toolchain bin dir.")
++  parser.add_option("--print_sdk_build",
++                    action="store_true", dest="print_sdk_build", default=False,
++                    help="Additionally print the build version of the SDK.")
+   options, args = parser.parse_args()
+   if len(args) != 1:
+     parser.error('Please specify a minimum SDK version')
+@@ -80,20 +84,30 @@ def main():
+   if not sdks:
+     raise Exception('No %s+ SDK found' % min_sdk_version)
+   best_sdk = sorted(sdks, key=parse_version)[0]
++  sdk_name = 'MacOSX' + best_sdk + '.sdk'
++  sdk_path = os.path.join(sdk_dir, sdk_name)
+ 
+   if options.print_sdk_path:
+-    sdk_name = 'MacOSX' + best_sdk + '.sdk'
+-    print(os.path.join(sdk_dir, sdk_name))
++    print(sdk_path)
+ 
+   if options.print_bin_path:
+     bin_path = 'Toolchains/XcodeDefault.xctoolchain/usr/bin/'
+     print(os.path.join(dev_dir, bin_path))
+ 
+-  return best_sdk
++  if options.print_sdk_build:
++    system_version_plist = os.path.join(sdk_path,
++      'System/Library/CoreServices/SystemVersion.plist')
++    with open(system_version_plist, 'rb') as f:
++      system_version_info = plistlib.load(f)
++      if 'ProductBuildVersion' not in system_version_info:
++        raise Exception('Failed to determine ProductBuildVersion' +
++                        'for SDK at path %s' % system_version_plist)
++      print(system_version_info['ProductBuildVersion'])
++
++  print(best_sdk)
+ 
+ 
+ if __name__ == '__main__':
+   if sys.platform != 'darwin':
+     raise Exception("This script only runs on Mac")
+-  print(main())
+-  sys.exit(0)
++  sys.exit(main())

From cef4f6a8e7f9675d9ae490b2c60917f82a6073c6 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:56:20 -0400
Subject: [PATCH 769/811] chore: bump chromium to 106.0.5249.103 (21-x-y)
 (#35933)

chore: bump chromium in DEPS to 106.0.5249.103

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index ebbabaa699d71..f4d934a16b53d 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.91',
+    '106.0.5249.103',
   'node_version':
     'v16.16.0',
   'nan_version':

From 9048de7caba212fb48b9b2120f734813a4da2798 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 02:37:18 -0700
Subject: [PATCH 770/811] fix: override
 `content::ContentMainDelegate::CreateContentClient()` (#35965)

* fix: override content::ContentMainDelegate::CreateContentClient()

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

* chore: remove extra call

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>
---
 shell/app/electron_main_delegate.cc | 8 +++++---
 shell/app/electron_main_delegate.h  | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc
index 73d063026ad3e..6111b30a11951 100644
--- a/shell/app/electron_main_delegate.cc
+++ b/shell/app/electron_main_delegate.cc
@@ -316,9 +316,6 @@ absl::optional<int> ElectronMainDelegate::BasicStartupComplete() {
       ::switches::kDisableGpuMemoryBufferCompositorResources);
 #endif
 
-  content_client_ = std::make_unique<ElectronContentClient>();
-  SetContentClient(content_client_.get());
-
   return absl::nullopt;
 }
 
@@ -437,6 +434,11 @@ base::StringPiece ElectronMainDelegate::GetBrowserV8SnapshotFilename() {
   return ContentMainDelegate::GetBrowserV8SnapshotFilename();
 }
 
+content::ContentClient* ElectronMainDelegate::CreateContentClient() {
+  content_client_ = std::make_unique<ElectronContentClient>();
+  return content_client_.get();
+}
+
 content::ContentBrowserClient*
 ElectronMainDelegate::CreateContentBrowserClient() {
   browser_client_ = std::make_unique<ElectronBrowserClient>();
diff --git a/shell/app/electron_main_delegate.h b/shell/app/electron_main_delegate.h
index 0a8363fb7a90b..ca48a02a3b820 100644
--- a/shell/app/electron_main_delegate.h
+++ b/shell/app/electron_main_delegate.h
@@ -38,6 +38,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
   void PreSandboxStartup() override;
   void SandboxInitialized(const std::string& process_type) override;
   absl::optional<int> PreBrowserMain() override;
+  content::ContentClient* CreateContentClient() override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
   content::ContentGpuClient* CreateContentGpuClient() override;
   content::ContentRendererClient* CreateContentRendererClient() override;

From bc27dc4597dc75590010ac08e869d1102daa4b8c Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:32:49 -0400
Subject: [PATCH 771/811] fix: expose the built-in electron module via the ESM
 loader (#35958)

* fix: expose the built-in electron module via the ESM loader

Co-authored-by: Samuel Attard <sattard@salesforce.com>

* Update .patches

* chore: update patches

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@salesforce.com>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/node/.patches                         |  1 +
 ...n_electron_module_via_the_esm_loader.patch | 87 +++++++++++++++++++
 spec-main/modules-spec.ts                     | 12 +++
 3 files changed, 100 insertions(+)
 create mode 100644 patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch

diff --git a/patches/node/.patches b/patches/node/.patches
index 611f1f217aa15..298d3c8426171 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -49,3 +49,4 @@ fix_override_createjob_in_node_platform.patch
 buffer_fix_atob_input_validation.patch
 v8_api_advance_api_deprecation.patch
 enable_-wunqualified-std-cast-call.patch
+fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
diff --git a/patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch b/patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
new file mode 100644
index 0000000000000..ca41bd3391169
--- /dev/null
+++ b/patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Thu, 6 Oct 2022 04:09:16 -0700
+Subject: fix: expose the built-in electron module via the ESM loader
+
+This allows usage of `import { app } from 'electron'` and `import('electron')` natively in the browser + non-sandboxed renderer
+
+diff --git a/lib/internal/modules/esm/get_format.js b/lib/internal/modules/esm/get_format.js
+index 5ae0e17dcfb5e24a1a117c33c4d42891686e693f..619fe6cef3b02eb575410225f41d3e7d51f37b93 100644
+--- a/lib/internal/modules/esm/get_format.js
++++ b/lib/internal/modules/esm/get_format.js
+@@ -31,6 +31,7 @@ const protocolHandlers = ObjectAssign(ObjectCreate(null), {
+   'http:': getHttpProtocolModuleFormat,
+   'https:': getHttpProtocolModuleFormat,
+   'node:'() { return 'builtin'; },
++  'electron:'() { return 'commonjs'; },
+ });
+ 
+ function getDataProtocolModuleFormat(parsed) {
+diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
+index 3576f75f0a40a64dceb7e2649b344b83ebc04b39..314fbb78931eef154a1e47c655e2d4bafe11bac3 100644
+--- a/lib/internal/modules/esm/resolve.js
++++ b/lib/internal/modules/esm/resolve.js
+@@ -888,6 +888,8 @@ function parsePackageName(specifier, base) {
+   return { packageName, packageSubpath, isScoped };
+ }
+ 
++const electronSpecifiers = new SafeSet(['electron', 'electron/main', 'electron/common', 'electron/renderer']);
++
+ /**
+  * @param {string} specifier
+  * @param {string | URL | undefined} base
+@@ -898,6 +900,10 @@ function packageResolve(specifier, base, conditions) {
+   if (NativeModule.canBeRequiredByUsers(specifier))
+     return new URL('node:' + specifier);
+ 
++  if (electronSpecifiers.has(specifier)) {
++    return new URL('electron:electron');
++  }
++
+   const { packageName, packageSubpath, isScoped } =
+     parsePackageName(specifier, base);
+ 
+@@ -1099,7 +1105,7 @@ function checkIfDisallowedImport(specifier, parsed, parsedParentURL) {
+ 
+ function throwIfUnsupportedURLProtocol(url) {
+   if (url.protocol !== 'file:' && url.protocol !== 'data:' &&
+-      url.protocol !== 'node:') {
++      url.protocol !== 'node:' && url.protocol !== 'electron:') {
+     throw new ERR_UNSUPPORTED_ESM_URL_SCHEME(url);
+   }
+ }
+diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
+index d7f4c7edec63d3ce500955a37c6eac00e3e524fd..b97cac53365b121f8e232f0085ff166511c3dda3 100644
+--- a/lib/internal/modules/esm/translators.js
++++ b/lib/internal/modules/esm/translators.js
+@@ -155,7 +155,7 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
+ 
+   if (!cjsParse) await initCJSParse();
+   const { module, exportNames } = cjsPreparseModuleExports(filename);
+-  const namesWithDefault = exportNames.has('default') ?
++  const namesWithDefault = filename === 'electron' ? ['default', ...Object.keys(module.exports)] : exportNames.has('default') ?
+     [...exportNames] : ['default', ...exportNames];
+ 
+   return new ModuleWrap(url, undefined, namesWithDefault, function() {
+@@ -174,7 +174,7 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
+       }
+     }
+ 
+-    for (const exportName of exportNames) {
++    for (const exportName of namesWithDefault) {
+       if (!ObjectPrototypeHasOwnProperty(exports, exportName) ||
+           exportName === 'default')
+         continue;
+diff --git a/lib/internal/url.js b/lib/internal/url.js
+index 939374a495856cf2b9c573fa98dc1895eee5e143..c37258ac29e8b7558c1f9a2af7ba6bdd0eab1355 100644
+--- a/lib/internal/url.js
++++ b/lib/internal/url.js
+@@ -1418,6 +1418,8 @@ function fileURLToPath(path) {
+     path = new URL(path);
+   else if (!isURLInstance(path))
+     throw new ERR_INVALID_ARG_TYPE('path', ['string', 'URL'], path);
++  if (path.protocol === 'electron:')
++    return 'electron';
+   if (path.protocol !== 'file:')
+     throw new ERR_INVALID_URL_SCHEME('file');
+   return isWindows ? getPathFromURLWin32(path) : getPathFromURLPosix(path);
diff --git a/spec-main/modules-spec.ts b/spec-main/modules-spec.ts
index a83797961fcf7..0cebbbeb642d9 100644
--- a/spec-main/modules-spec.ts
+++ b/spec-main/modules-spec.ts
@@ -183,4 +183,16 @@ describe('modules support', () => {
       });
     });
   });
+
+  describe('esm', () => {
+    it('can load the built-in "electron" module via ESM import', async () => {
+      await expect(import('electron')).to.eventually.be.ok();
+    });
+
+    it('the built-in "electron" module loaded via ESM import has the same exports as the CJS module', async () => {
+      const esmElectron = await import('electron');
+      const cjsElectron = require('electron');
+      expect(Object.keys(esmElectron)).to.deep.equal(Object.keys(cjsElectron));
+    });
+  });
 });

From 9f99f4ed0e15d54f6d55496ee41a07102e84a81a Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:55:31 -0700
Subject: [PATCH 772/811] chore: cherry-pick 30a32e6 from chromium (#35370)
 (#35970)

chore: apply chromium commit 30a32e6 (#35370)

chore: Apply Chromium commit 30a32e6
---
 shell/browser/ui/views/win_caption_button.cc |  2 +-
 shell/browser/ui/views/win_icon_painter.cc   | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/shell/browser/ui/views/win_caption_button.cc b/shell/browser/ui/views/win_caption_button.cc
index 9903fecd3146d..9d90fc6a6fd27 100644
--- a/shell/browser/ui/views/win_caption_button.cc
+++ b/shell/browser/ui/views/win_caption_button.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Modified from chrome/browser/ui/views/frame/windows_10_caption_button.cc
+// Modified from chrome/browser/ui/views/frame/windows_caption_button.cc
 
 #include "shell/browser/ui/views/win_caption_button.h"
 
diff --git a/shell/browser/ui/views/win_icon_painter.cc b/shell/browser/ui/views/win_icon_painter.cc
index d61a7970c6705..d89d63d439051 100644
--- a/shell/browser/ui/views/win_icon_painter.cc
+++ b/shell/browser/ui/views/win_icon_painter.cc
@@ -25,7 +25,7 @@ void DrawRect(gfx::Canvas* canvas,
 
 void DrawRoundRect(gfx::Canvas* canvas,
                    const gfx::Rect& rect,
-                   int radius,
+                   float radius,
                    const cc::PaintFlags& flags) {
   gfx::RectF rect_f(rect);
   float stroke_half_width = flags.getStrokeWidth() / 2;
@@ -74,7 +74,7 @@ void WinIconPainter::PaintMaximizeIcon(gfx::Canvas* canvas,
 void WinIconPainter::PaintRestoreIcon(gfx::Canvas* canvas,
                                       const gfx::Rect& symbol_rect,
                                       const cc::PaintFlags& flags) {
-  const int separation = std::floor(2 * canvas->image_scale());
+  const int separation = base::ClampFloor(2 * canvas->image_scale());
   gfx::Rect icon_rect = symbol_rect;
   icon_rect.Inset(gfx::Insets::TLBR(separation, 0, 0, separation));
 
@@ -113,14 +113,14 @@ void Win11IconPainter::PaintMaximizeIcon(gfx::Canvas* canvas,
   cc::PaintFlags paint_flags = flags;
   paint_flags.setAntiAlias(true);
 
-  const float corner_radius = 2 * canvas->image_scale();
+  const float corner_radius = canvas->image_scale();
   DrawRoundRect(canvas, symbol_rect, corner_radius, flags);
 }
 
 void Win11IconPainter::PaintRestoreIcon(gfx::Canvas* canvas,
                                         const gfx::Rect& symbol_rect,
                                         const cc::PaintFlags& flags) {
-  const int separation = std::floor(2 * canvas->image_scale());
+  const int separation = base::ClampFloor(2 * canvas->image_scale());
   gfx::Rect icon_rect = symbol_rect;
   icon_rect.Inset(gfx::Insets::TLBR(separation, 0, 0, separation));
 
@@ -128,14 +128,11 @@ void Win11IconPainter::PaintRestoreIcon(gfx::Canvas* canvas,
   paint_flags.setAntiAlias(true);
 
   // Bottom left ("in front") rounded square.
-  const float bottom_rect_radius = 1 * canvas->image_scale();
+  const float bottom_rect_radius = canvas->image_scale();
   DrawRoundRect(canvas, icon_rect, bottom_rect_radius, flags);
 
   // Top right ("behind") top+right edges of rounded square (2.5x).
   icon_rect.Offset(separation, -separation);
-  // Apply inset to left+bottom edges since we don't draw arcs for those edges
-  constexpr int top_rect_inset = 1;
-  icon_rect.Inset(gfx::Insets::TLBR(0, top_rect_inset, top_rect_inset, 0));
 
   const float top_rect_radius = 2.5f * canvas->image_scale();
   DrawRoundRectEdges(canvas, icon_rect, top_rect_radius, flags);

From 77bc03e051624987a5864e12791c33579aad0fdb Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 23:20:11 +0200
Subject: [PATCH 773/811] fix: on-screen-keyboard hides on input blurred in
 webview (#35982)

* fix: on-screen-keyboard hides on input blurred in webview

Co-authored-by: Kyrylo Hrechykhin <khrechykhin@microsoft.com>

* chore: update patches

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Kyrylo Hrechykhin <khrechykhin@microsoft.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
---
 patches/chromium/.patches                     |  1 +
 ...board_hides_on_input_blur_in_webview.patch | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index bd0340c00135a..5d4cdbaa54944 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -124,3 +124,4 @@ fix_the_gn_gen_for_components_segmentation_platform.patch
 fix_crash_loading_non-standard_schemes_in_iframes.patch
 create_browser_v8_snapshot_file_name_fuse.patch
 cherry-pick-c83640db21b5.patch
+fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
new file mode 100644
index 0000000000000..f501a3b7786e3
--- /dev/null
+++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kyrylo Hrechykhin <khrechykhin@microsoft.com>
+Date: Thu, 6 Oct 2022 18:30:53 +0200
+Subject: fix: on-screen-keyboard hides on input blur in webview
+
+Changes introduced by this patch fix issue where OSK does not hide on
+input rendered inside webview is blurred. This patch should be removed
+when proper fix in chromium repo is available.
+
+Note: the issue still occurs if input rendered in webview blurred due
+to touch outside of webview. It is caused by webview implementation
+details. Specificaly due to webview has its own tree nodes and focused
+node does not change in this case.
+
+chromium-bug: https://crbug.com/1369605
+
+diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
+index 4e6d62be68d59c8a49159fda4d1e68f101a6f0a3..cfd5a01ea84a1f454a5172da3e96e66a50c82939 100644
+--- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc
++++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
+@@ -992,6 +992,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties(
+   return viz::ScopedSurfaceIdAllocator(std::move(allocation_task));
+ }
+ 
++void RenderWidgetHostViewChildFrame::FocusedNodeChanged(
++    bool is_editable_node,
++    const gfx::Rect& node_bounds_in_screen) {
++  NOTREACHED();
++}
++
+ ui::TextInputType RenderWidgetHostViewChildFrame::GetTextInputType() const {
+   if (!text_input_manager_)
+     return ui::TEXT_INPUT_TYPE_NONE;
+diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h
+index 70b151bcb8e3b1964d316bf2e169dbe0f28f24c7..c3857298974a0c2761efcd3924587607997e3117 100644
+--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h
++++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
+@@ -181,6 +181,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
+   void DisableAutoResize(const gfx::Size& new_size) override;
+   viz::ScopedSurfaceIdAllocator DidUpdateVisualProperties(
+       const cc::RenderFrameMetadata& metadata) override;
++  void FocusedNodeChanged(bool is_editable_node,
++      const gfx::Rect& node_bounds_in_screen) override;
+ 
+   // RenderFrameMetadataProvider::Observer implementation.
+   void OnRenderFrameMetadataChangedBeforeActivation(
+diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
+index 74993d461cbd0885a709cf8b663b9c69650aa3cf..940045d9bbb62676811f55f5d30a93a352f43ede 100644
+--- a/content/browser/web_contents/web_contents_impl.cc
++++ b/content/browser/web_contents/web_contents_impl.cc
+@@ -7928,7 +7928,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
+                         "WebContentsImpl::OnFocusedElementChangedInFrame",
+                         "render_frame_host", frame);
+   RenderWidgetHostViewBase* root_view =
+-      static_cast<RenderWidgetHostViewBase*>(GetRenderWidgetHostView());
++      static_cast<RenderWidgetHostViewBase*>(GetTopLevelRenderWidgetHostView());
+   if (!root_view || !frame->GetView())
+     return;
+   // Convert to screen coordinates from window coordinates by adding the

From fd520896359e0f4d70252ebefa43a24fc73db7d2 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 10:02:39 -0400
Subject: [PATCH 774/811] docs: remove references to Widevine (#35990)

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

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 docs/README.md                        |  1 -
 docs/tutorial/testing-widevine-cdm.md | 95 ---------------------------
 2 files changed, 96 deletions(-)
 delete mode 100644 docs/tutorial/testing-widevine-cdm.md

diff --git a/docs/README.md b/docs/README.md
index 40ae2be10c18c..57172020a87d6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -83,7 +83,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
   * [Versioning Policy](tutorial/electron-versioning.md)
   * [Release Timelines](tutorial/electron-timelines.md)
-* [Testing Widevine CDM](tutorial/testing-widevine-cdm.md)
 
 ---
 
diff --git a/docs/tutorial/testing-widevine-cdm.md b/docs/tutorial/testing-widevine-cdm.md
deleted file mode 100644
index b2bcd7cde4a6f..0000000000000
--- a/docs/tutorial/testing-widevine-cdm.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Testing Widevine CDM
-
-In Electron you can use the Widevine CDM library shipped with Chrome browser.
-
-Widevine Content Decryption Modules (CDMs) are how streaming services protect
-content using HTML5 video to web browsers without relying on an NPAPI plugin
-like Flash or Silverlight. Widevine support is an alternative solution for
-streaming services that currently rely on Silverlight for playback of
-DRM-protected video content. It will allow websites to show DRM-protected video
-content in Firefox without the use of NPAPI plugins. The Widevine CDM runs in an
-open-source CDM sandbox providing better user security than NPAPI plugins.
-
-#### Note on VMP
-
-As of [`Electron v1.8.0 (Chrome v59)`](https://electronjs.org/releases#1.8.1),
-the below steps are may only be some of the necessary steps to enable Widevine;
-any app on or after that version intending to use the Widevine CDM may need to
-be signed using a license obtained from [Widevine](https://www.widevine.com/)
-itself.
-
-Per [Widevine](https://www.widevine.com/):
-
-> Chrome 59 (and later) includes support for Verified Media Path (VMP). VMP
-> provides a method to verify the authenticity of a device platform. For browser
-> deployments, this will provide an additional signal to determine if a
-> browser-based implementation is reliable and secure.
->
-> The proxy integration guide has been updated with information about VMP and
-> how to issue licenses.
->
-> Widevine recommends our browser-based integrations (vendors and browser-based
-> applications) add support for VMP.
-
-To enable video playback with this new restriction,
-[castLabs](https://castlabs.com/open-source/downstream/) has created a
-[fork](https://github.com/castlabs/electron-releases) that has implemented the
-necessary changes to enable Widevine to be played in an Electron application if
-one has obtained the necessary licenses from widevine.
-
-## Getting the library
-
-Open `chrome://components/` in Chrome browser, find `Widevine Content Decryption Module`
-and make sure it is up to date, then you can find the library files from the
-application directory.
-
-### On Windows
-
-The library file `widevinecdm.dll` will be under
-`Program Files(x86)/Google/Chrome/Application/CHROME_VERSION/WidevineCdm/_platform_specific/win_(x86|x64)/`
-directory.
-
-### On macOS
-
-The library file `libwidevinecdm.dylib` will be under
-`/Applications/Google Chrome.app/Contents/Versions/CHROME_VERSION/Google Chrome Framework.framework/Versions/A/Libraries/WidevineCdm/_platform_specific/mac_(x86|x64)/`
-directory.
-
-**Note:** Make sure that chrome version used by Electron is greater than or
-equal to the `min_chrome_version` value of Chrome's widevine cdm component.
-The value can be found in `manifest.json` under `WidevineCdm` directory.
-
-## Using the library
-
-After getting the library files, you should pass the path to the file
-with `--widevine-cdm-path` command line switch, and the library's version
-with `--widevine-cdm-version` switch. The command line switches have to be
-passed before the `ready` event of `app` module gets emitted.
-
-Example code:
-
-```javascript
-const { app, BrowserWindow } = require('electron')
-
-// You have to pass the directory that contains widevine library here, it is
-// * `libwidevinecdm.dylib` on macOS,
-// * `widevinecdm.dll` on Windows.
-app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevine_library')
-// The version of plugin can be got from `chrome://components` page in Chrome.
-app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866')
-
-let win = null
-app.whenReady().then(() => {
-  win = new BrowserWindow()
-  win.show()
-})
-```
-
-## Verifying Widevine CDM support
-
-To verify whether widevine works, you can use following ways:
-
-* Open https://shaka-player-demo.appspot.com/ and load a manifest that uses
-`Widevine`.
-* Open http://www.dash-player.com/demo/drm-test-area/, check whether the page
-says `bitdash uses Widevine in your browser`, then play the video.

From 595ed3e128a2585edcdf9732ee7c988cdc25aee9 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 10:05:10 -0400
Subject: [PATCH 775/811] fix: `webContents.printToPDF` option plumbing
 (#35992)

fix: contents.printToPDF option plumbing

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>
---
 lib/browser/api/web-contents.ts                | 14 +++++++-------
 shell/browser/api/electron_api_web_contents.cc | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 5b9131fcec003..1890bdb018509 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -173,13 +173,13 @@ WebContents.prototype.printToPDF = async function (options) {
     headerTemplate: '',
     footerTemplate: '',
     printBackground: false,
-    scale: 1,
+    scale: 1.0,
     paperWidth: 8.5,
-    paperHeight: 11,
-    marginTop: 0,
-    marginBottom: 0,
-    marginLeft: 0,
-    marginRight: 0,
+    paperHeight: 11.0,
+    marginTop: 0.0,
+    marginBottom: 0.0,
+    marginLeft: 0.0,
+    marginRight: 0.0,
     pageRanges: '',
     preferCSSPageSize: false
   };
@@ -209,7 +209,7 @@ WebContents.prototype.printToPDF = async function (options) {
     if (typeof options.scale !== 'number') {
       return Promise.reject(new Error('scale must be a Number'));
     }
-    printSettings.scaleFactor = options.scale;
+    printSettings.scale = options.scale;
   }
 
   const { pageSize } = options;
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
index ec6a24301111c..e12bc087c693f 100644
--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -2821,12 +2821,12 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
       settings.GetDict().FindBool("displayHeaderFooter");
   auto print_background = settings.GetDict().FindBool("shouldPrintBackgrounds");
   auto scale = settings.GetDict().FindDouble("scale");
-  auto paper_width = settings.GetDict().FindInt("paperWidth");
-  auto paper_height = settings.GetDict().FindInt("paperHeight");
-  auto margin_top = settings.GetDict().FindIntByDottedPath("margins.top");
-  auto margin_bottom = settings.GetDict().FindIntByDottedPath("margins.bottom");
-  auto margin_left = settings.GetDict().FindIntByDottedPath("margins.left");
-  auto margin_right = settings.GetDict().FindIntByDottedPath("margins.right");
+  auto paper_width = settings.GetDict().FindDouble("paperWidth");
+  auto paper_height = settings.GetDict().FindDouble("paperHeight");
+  auto margin_top = settings.GetDict().FindDouble("marginTop");
+  auto margin_bottom = settings.GetDict().FindDouble("marginBottom");
+  auto margin_left = settings.GetDict().FindDouble("marginLeft");
+  auto margin_right = settings.GetDict().FindDouble("marginRight");
   auto page_ranges = *settings.GetDict().FindString("pageRanges");
   auto header_template = *settings.GetDict().FindString("headerTemplate");
   auto footer_template = *settings.GetDict().FindString("footerTemplate");

From 7727b7ecba4fc788c38dc67b0d2f133951ada4b3 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 11:15:33 -0400
Subject: [PATCH 776/811] fix: drag and drop should copy on macOS (#35977)

fix: drag and drop should copy on macOS (#35963)

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>
---
 shell/browser/ui/drag_util_mac.mm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shell/browser/ui/drag_util_mac.mm b/shell/browser/ui/drag_util_mac.mm
index 4c4649c6cb434..36656ea362941 100644
--- a/shell/browser/ui/drag_util_mac.mm
+++ b/shell/browser/ui/drag_util_mac.mm
@@ -20,7 +20,8 @@ @implementation DragDownloadItemSource
 
 - (NSDragOperation)draggingSession:(NSDraggingSession*)session
     sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
-  return NSDragOperationEvery;
+  return context == NSDraggingContextOutsideApplication ? NSDragOperationCopy
+                                                        : NSDragOperationEvery;
 }
 
 @end
@@ -70,7 +71,7 @@ void DragFileItems(const std::vector<base::FilePath>& files,
   NSEvent* dragEvent =
       [NSEvent mouseEventWithType:NSEventTypeLeftMouseDragged
                          location:position
-                    modifierFlags:NSEventMaskLeftMouseDragged
+                    modifierFlags:0
                         timestamp:eventTime
                      windowNumber:[[native_view window] windowNumber]
                           context:nil

From 16a3a456a6a7d8bf970ea2b86ba41ce6e09f095a Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 08:31:33 -0700
Subject: [PATCH 777/811] Bump v21.1.1

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index 03224ad202d22..c8c4861230ac9 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.1.0
\ No newline at end of file
+21.1.1
\ No newline at end of file
diff --git a/package.json b/package.json
index 080de11515066..22967c2bb058a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.1.0",
+  "version": "21.1.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 27bdf75fe6fca..2d1bc47134c40 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,1,0,0
- PRODUCTVERSION 21,1,0,0
+ FILEVERSION 21,1,1,0
+ PRODUCTVERSION 21,1,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "21.1.0"
+            VALUE "FileVersion", "21.1.1"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "21.1.0"
+            VALUE "ProductVersion", "21.1.1"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 1cb0a98f6cc5aa19ea873e46e4aa6c4ae96f3e96 Mon Sep 17 00:00:00 2001
From: "electron-roller[bot]"
 <84116207+electron-roller[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 13:10:16 -0400
Subject: [PATCH 778/811] chore: bump chromium to 106.0.5249.119 (21-x-y)
 (#36001)

chore: bump chromium in DEPS to 106.0.5249.119

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index f4d934a16b53d..af2db8b965485 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '106.0.5249.103',
+    '106.0.5249.119',
   'node_version':
     'v16.16.0',
   'nan_version':

From 0874e61e4fb0121e9c54e3ddd677cdc6cfd7dbaf Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:00:29 -0400
Subject: [PATCH 779/811] build: fix building with enable_ppapi = false
 (#36006)

Co-authored-by: Milan Burda <milan.burda@gmail.com>

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
---
 BUILD.gn              | 11 ++++++++---
 chromium_src/BUILD.gn | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index e1a99dfadb4d9..6966cd3c5c9fd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -404,9 +404,6 @@ source_set("electron_lib") {
     "//media/mojo/mojom",
     "//net:extras",
     "//net:net_resources",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/shared_impl",
     "//printing/buildflags",
     "//services/device/public/cpp/geolocation",
     "//services/device/public/cpp/hid",
@@ -625,6 +622,14 @@ source_set("electron_lib") {
     ]
   }
 
+  if (enable_ppapi) {
+    deps += [
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/shared_impl",
+    ]
+  }
+
   if (enable_run_as_node) {
     sources += [
       "shell/app/node_main.cc",
diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn
index c07fb721a8484..33e7b62541d72 100644
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
+import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 
@@ -372,15 +373,20 @@ source_set("plugins") {
   deps += [
     "//components/strings",
     "//media:media_buildflags",
-    "//ppapi/buildflags",
-    "//ppapi/host",
-    "//ppapi/proxy",
-    "//ppapi/proxy:ipc",
-    "//ppapi/shared_impl",
     "//services/device/public/mojom",
     "//skia",
     "//storage/browser",
   ]
+
+  if (enable_ppapi) {
+    deps += [
+      "//ppapi/buildflags",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
+    ]
+  }
 }
 
 # This source set is just so we don't have to depend on all of //chrome/browser

From a86510b30cae0ff016a5ea95b314c5e5ad73f6bf Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 17:06:06 -0400
Subject: [PATCH 780/811] fix: disable `nodeIntegrationInWorker` for certain
 Worker types (#36009)

fix: disable nodeIntegrationInWorker for certain Worker types

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>
---
 docs/tutorial/multithreading.md               |  2 +
 shell/renderer/electron_renderer_client.cc    | 16 +++++-
 spec-main/chromium-spec.ts                    | 49 +++++++++++--------
 spec/fixtures/pages/service-worker/empty.html |  0
 .../pages/service-worker/worker-no-node.js    |  6 +++
 spec/fixtures/pages/shared_worker.html        | 12 -----
 6 files changed, 51 insertions(+), 34 deletions(-)
 create mode 100644 spec/fixtures/pages/service-worker/empty.html
 create mode 100644 spec/fixtures/pages/service-worker/worker-no-node.js
 delete mode 100644 spec/fixtures/pages/shared_worker.html

diff --git a/docs/tutorial/multithreading.md b/docs/tutorial/multithreading.md
index 222db8337005e..d42350e2c73a3 100644
--- a/docs/tutorial/multithreading.md
+++ b/docs/tutorial/multithreading.md
@@ -20,6 +20,8 @@ const win = new BrowserWindow({
 The `nodeIntegrationInWorker` can be used independent of `nodeIntegration`, but
 `sandbox` must not be set to `true`.
 
+**Note:** This option is not available in [`SharedWorker`s](https://developer.mozilla.org/en-US/docs/Web/API/SharedWorker) or [`Service Worker`s](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker) owing to incompatibilities in sandboxing policies.
+
 ## Available APIs
 
 All built-in modules of Node.js are supported in Web Workers, and `asar`
diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
index 24c5bc9f7613c..c3884cb6ba191 100644
--- a/shell/renderer/electron_renderer_client.cc
+++ b/shell/renderer/electron_renderer_client.cc
@@ -21,6 +21,7 @@
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/core/execution_context/execution_context.h"  // nogncheck
 
 namespace electron {
 
@@ -156,8 +157,15 @@ void ElectronRendererClient::WillReleaseScriptContext(
 
 void ElectronRendererClient::WorkerScriptReadyForEvaluationOnWorkerThread(
     v8::Local<v8::Context> context) {
-  // TODO(loc): Note that this will not be correct for in-process child windows
-  // with webPreferences that have a different value for nodeIntegrationInWorker
+  // We do not create a Node.js environment in service or shared workers
+  // owing to an inability to customize sandbox policies in these workers
+  // given that they're run out-of-process.
+  auto* ec = blink::ExecutionContext::From(context);
+  if (ec->IsServiceWorkerGlobalScope() || ec->IsSharedWorkerGlobalScope())
+    return;
+
+  // This won't be correct for in-process child windows with webPreferences
+  // that have a different value for nodeIntegrationInWorker
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNodeIntegrationInWorker)) {
     WebWorkerObserver::GetCurrent()->WorkerScriptReadyForEvaluation(context);
@@ -166,6 +174,10 @@ void ElectronRendererClient::WorkerScriptReadyForEvaluationOnWorkerThread(
 
 void ElectronRendererClient::WillDestroyWorkerContextOnWorkerThread(
     v8::Local<v8::Context> context) {
+  auto* ec = blink::ExecutionContext::From(context);
+  if (ec->IsServiceWorkerGlobalScope() || ec->IsSharedWorkerGlobalScope())
+    return;
+
   // TODO(loc): Note that this will not be correct for in-process child windows
   // with webPreferences that have a different value for nodeIntegrationInWorker
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 0427588893f64..75181a8ffda20 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -652,7 +652,7 @@ describe('chromium features', () => {
       w.loadFile(path.join(fixturesPath, 'pages', 'service-worker', 'custom-scheme-index.html'));
     });
 
-    it('should not crash when nodeIntegration is enabled', (done) => {
+    it('should not allow nodeIntegrationInWorker', async () => {
       const w = new BrowserWindow({
         show: false,
         webPreferences: {
@@ -663,21 +663,19 @@ describe('chromium features', () => {
         }
       });
 
-      w.webContents.on('ipc-message', (event, channel, message) => {
-        if (channel === 'reload') {
-          w.webContents.reload();
-        } else if (channel === 'error') {
-          done(`unexpected error : ${message}`);
-        } else if (channel === 'response') {
-          expect(message).to.equal('Hello from serviceWorker!');
-          session.fromPartition('sw-file-scheme-worker-spec').clearStorageData({
-            storages: ['serviceworkers']
-          }).then(() => done());
-        }
-      });
+      await w.loadURL(`file://${fixturesPath}/pages/service-worker/empty.html`);
 
-      w.webContents.on('crashed', () => done(new Error('WebContents crashed.')));
-      w.loadFile(path.join(fixturesPath, 'pages', 'service-worker', 'index.html'));
+      const data = await w.webContents.executeJavaScript(`
+        navigator.serviceWorker.register('worker-no-node.js', {
+          scope: './'
+        }).then(() => navigator.serviceWorker.ready)
+
+        new Promise((resolve) => {
+          navigator.serviceWorker.onmessage = event => resolve(event.data);
+        });
+      `);
+
+      expect(data).to.equal('undefined undefined undefined undefined');
     });
   });
 
@@ -789,11 +787,22 @@ describe('chromium features', () => {
         expect(data).to.equal('undefined undefined undefined undefined');
       });
 
-      it('has node integration with nodeIntegrationInWorker', async () => {
-        const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, nodeIntegrationInWorker: true, contextIsolation: false } });
-        w.loadURL(`file://${fixturesPath}/pages/shared_worker.html`);
-        const [, data] = await emittedOnce(ipcMain, 'worker-result');
-        expect(data).to.equal('object function object function');
+      it('does not have node integration with nodeIntegrationInWorker', async () => {
+        const w = new BrowserWindow({
+          show: false,
+          webPreferences: {
+            nodeIntegration: true,
+            nodeIntegrationInWorker: true,
+            contextIsolation: false
+          }
+        });
+
+        await w.loadURL(`file://${fixturesPath}/pages/blank.html`);
+        const data = await w.webContents.executeJavaScript(`
+          const worker = new SharedWorker('../workers/shared_worker_node.js');
+          new Promise((resolve) => { worker.port.onmessage = e => resolve(e.data); })
+        `);
+        expect(data).to.equal('undefined undefined undefined undefined');
       });
     });
   });
diff --git a/spec/fixtures/pages/service-worker/empty.html b/spec/fixtures/pages/service-worker/empty.html
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/spec/fixtures/pages/service-worker/worker-no-node.js b/spec/fixtures/pages/service-worker/worker-no-node.js
new file mode 100644
index 0000000000000..e22b7ca012cd8
--- /dev/null
+++ b/spec/fixtures/pages/service-worker/worker-no-node.js
@@ -0,0 +1,6 @@
+self.clients.matchAll({ includeUncontrolled: true }).then((clients) => {
+  if (!clients?.length) return;
+
+  const msg = [typeof process, typeof setImmediate, typeof global, typeof Buffer].join(' ');
+  clients[0].postMessage(msg);
+});
diff --git a/spec/fixtures/pages/shared_worker.html b/spec/fixtures/pages/shared_worker.html
deleted file mode 100644
index 5bd409d857b93..0000000000000
--- a/spec/fixtures/pages/shared_worker.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body>
-<script type="text/javascript" charset="utf-8">
-  const {ipcRenderer} = require('electron')
-  // Pass a random parameter to create independent worker.
-  let worker = new SharedWorker(`../workers/shared_worker_node.js?a={Math.random()}`)
-  worker.port.onmessage = function (event) {
-    ipcRenderer.send('worker-result', event.data)
-  }
-</script>
-</body>
-</html>

From 17d8889e4120948fc8ee6fc79dfc2dce82d6399a Mon Sep 17 00:00:00 2001
From: Keeley Hammond <vertedinde@electronjs.org>
Date: Sun, 16 Oct 2022 16:20:41 -0700
Subject: [PATCH 781/811] ci: use AppVeyor workflows (#36028)

* ci: use AppVeyor workflows (#35377)

* ci: use AppVeyor workflows

* fixup for skipping test on pr jobs

* ci: clean up appveyor.yml to match main

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 appveyor.yml | 456 +++++++++++++++++++++++++++++----------------------
 1 file changed, 262 insertions(+), 194 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b4593261bde6b..574e5edf0419b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,213 +34,281 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-build_script:
-  - ps: >-
-      if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-        Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-      } else {
-        node script/yarn.js install --frozen-lockfile
 
-        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-        Write-Output $result
-        if ($result.ExitCode -eq 0) {
-          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
+  matrix:
+
+  - job_name: Build
+
+  - job_name: Test
+    job_depends_on: Build
+
+clone_folder: C:\projects\src\electron
+
+# the first failed job cancels other jobs and fails entire build
+matrix:
+  fast_finish: true
+
+for:
+
+  -
+    matrix:
+      only:
+        - job_name: Build
+
+    init:
+    - ps: >-
+        if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
+          Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
         }
-      }
-  - echo "Building $env:GN_CONFIG build"
-  - git config --global core.longpaths true
-  - cd ..
-  - mkdir src
-  - update_depot_tools.bat
-  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
-  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
-      }
-  - git clone https://github.com/electron/build-tools.git
-  - cd build-tools
-  - npm install
-  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-  - cd ..
-  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
-        if ($goma_login -eq 'Login as Fermi Planck') {
-          Write-warning "Goma authentication is correct";
-        } else {
-          Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
-          $host.SetShouldExit(1)
+
+    build_script:
+    - ps: |
+        node script/yarn.js install --frozen-lockfile
+        node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
+        if ($LASTEXITCODE -eq 0) {
+          Write-warning "Skipping tests for doc only change"; Exit-AppveyorBuild
+        }
+        $global:LASTEXITCODE = 0
+    - cd ..
+    - ps: Write-Host "Building $env:GN_CONFIG build"
+    - git config --global core.longpaths true
+    - update_depot_tools.bat
+    - ps: >-
+        if (Test-Path 'env:RAW_GOMA_AUTH') {
+          $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+          $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
         }
-      }
-  - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-  - ps: >-
-      if ($env:GN_CONFIG -ne 'release') {
-        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-      }
-  - >-
-      gclient config
-      --name "src\electron"
-      --unmanaged
-      %GCLIENT_EXTRA_ARGS%
-      "https://github.com/electron/electron"
-  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        $env:RUN_GCLIENT_SYNC="true"
-      } else {
-        cd src\electron
-        node script\generate-deps-hash.js
-        $depshash = Get-Content .\.depshash -Raw 
-        $zipfile = "Z:\$depshash.7z"
-        cd ..\..
-        if (Test-Path -Path $zipfile) {
-          # file exists, unzip and then gclient sync
-          7z x -y $zipfile -mmt=30 -aoa
-          if (-not (Test-Path -Path "src\buildtools")) {
-            # the zip file must be corrupt - resync
+    - git clone https://github.com/electron/build-tools.git
+    - cd build-tools
+    - npm install
+    - mkdir third_party
+    - ps: >-
+        node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+    - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+    - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+    - cd ..\..
+    - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
+    - ps: >-
+        if (Test-Path 'env:RAW_GOMA_AUTH') {
+          $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
+          if ($goma_login -eq 'Login as Fermi Planck') {
+            Write-warning "Goma authentication is correct";
+          } else {
+            Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
+            $host.SetShouldExit(1)
+          }
+        }
+    - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
+    - ps: >-
+        if ($env:GN_CONFIG -ne 'release') {
+          $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+        }
+    - >-
+        gclient config
+        --name "src\electron"
+        --unmanaged
+        %GCLIENT_EXTRA_ARGS%
+        "https://github.com/electron/electron"
+    - ps: >-
+        if ($env:GN_CONFIG -eq 'release') {
+          $env:RUN_GCLIENT_SYNC="true"
+        } else {
+          cd src\electron
+          node script\generate-deps-hash.js
+          $depshash = Get-Content .\.depshash -Raw 
+          $zipfile = "Z:\$depshash.7z"
+          cd ..\..
+          if (Test-Path -Path $zipfile) {
+            # file exists, unzip and then gclient sync
+            7z x -y $zipfile -mmt=14 -aoa
+            if (-not (Test-Path -Path "src\buildtools")) {
+              # the zip file must be corrupt - resync
+              $env:RUN_GCLIENT_SYNC="true"
+              if ($env:TARGET_ARCH -ne 'ia32') {
+                # only save on x64/woa to avoid contention saving
+                $env:SAVE_GCLIENT_SRC="true"
+              }
+            } else {
+              # update angle
+              cd src\third_party\angle
+              git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+              git fetch
+              cd ..\..\..
+            }
+          } else {    
+            # file does not exist, gclient sync, then zip
             $env:RUN_GCLIENT_SYNC="true"
             if ($env:TARGET_ARCH -ne 'ia32') {
               # only save on x64/woa to avoid contention saving
               $env:SAVE_GCLIENT_SRC="true"
             }
-          } else {
-            # update angle
-            cd src\third_party\angle
-            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
-            git fetch
-            cd ..\..\..
           }
-        } else {    
-          # file does not exist, gclient sync, then zip
-          $env:RUN_GCLIENT_SYNC="true"
-          if ($env:TARGET_ARCH -ne 'ia32') {
-            # only save on x64/woa to avoid contention saving
-            $env:SAVE_GCLIENT_SRC="true"
+        }
+    - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync )
+    - ps: >-
+        if ($env:SAVE_GCLIENT_SRC -eq 'true') {
+          # archive current source for future use 
+          # only run on x64/woa to avoid contention saving
+          $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
+          if ($LASTEXITCODE -ne 0) {
+            Write-warning "Could not save source to shared drive; continuing anyway"
+          }
+          # build time generation of file gen/angle/angle_commit.h depends on
+          # third_party/angle/.git
+          # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
+          $(7z a $zipfile src\third_party\angle\.git)
+          if ($LASTEXITCODE -ne 0) {
+            Write-warning "Failed to add third_party\angle\.git; continuing anyway"
+          }
+          # build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
+          # https://dawn-review.googlesource.com/c/dawn/+/83901        
+          $(7z a $zipfile src\third_party\dawn\.git)
+          if ($LASTEXITCODE -ne 0) {
+            Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
+          }
+        }
+    - cd src
+    - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
+    - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
+    - gn check out/Default //electron:electron_lib
+    - gn check out/Default //electron:electron_app
+    - gn check out/Default //electron/shell/common/api:mojo
+    - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
+    - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
+    - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
+    - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
+    - ninja -C out/Default electron:electron_dist_zip
+    - ninja -C out/Default shell_browser_ui_unittests
+    - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+    - ninja -C out/Default electron:electron_mksnapshot_zip
+    - cd out\Default
+    - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
+    - cd ..\..
+    - ninja -C out/Default electron:hunspell_dictionaries_zip
+    - ninja -C out/Default electron:electron_chromedriver_zip
+    - ninja -C out/Default third_party/electron_node:headers
+    - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
+    - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+    - 7z a node_headers.zip out\Default\gen\node_headers
+    - 7z a builtins-pgo.zip v8\tools\builtins-pgo
+    - ps: >-
+        if ($env:GN_CONFIG -eq 'release') {
+          # Needed for msdia140.dll on 64-bit windows
+          $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+          ninja -C out/Default electron:electron_symbols
+        }
+    - ps: >-
+        if ($env:GN_CONFIG -eq 'release') {
+          python electron\script\zip-symbols.py
+          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        } else {
+          # It's useful to have pdb files when debugging testing builds that are
+          # built on CI.
+          7z a pdb.zip out\Default\*.pdb
+        }
+    - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+   
+    deploy_script:
+      - cd electron
+      - ps: >-
+          if (Test-Path Env:\ELECTRON_RELEASE) {
+            if (Test-Path Env:\UPLOAD_TO_STORAGE) {
+              Write-Output "Uploading Electron release distribution to azure"
+              & python script\release\uploaders\upload.py --verbose --upload_to_storage
+            } else {
+              Write-Output "Uploading Electron release distribution to github releases"
+              & python script\release\uploaders\upload.py --verbose
+            }
+          } elseif (Test-Path Env:\TEST_WOA) {
+            node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
           }
+    on_finish:
+      # Uncomment this lines to enable RDP
+      #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+      - cd C:\projects\src
+      - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
+      - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
+      - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
+      - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
+      - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
+      - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
+      - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
+      - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
+      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
+      - if exist builtins-pgo.zip (appveyor-retry appveyor PushArtifact builtins-pgo.zip)
+      - ps: >-
+          if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
+            appveyor-retry appveyor PushArtifact pdb.zip
+          }        
+
+  -
+    matrix:
+      only:
+        - job_name: Test
+
+    init:
+    - ps: |
+        if ($env:RUN_TESTS -ne 'true') {
+          Write-warning "Skipping tests for $env:APPVEYOR_PROJECT_NAME"; Exit-AppveyorBuild
         }
-      }
-  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync )
-  - ps: >-
-      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
-        # archive current source for future use 
-        # only run on x64/woa to avoid contention saving
-        $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
-        if ($LASTEXITCODE -ne 0) {
-          Write-warning "Could not save source to shared drive; continuing anyway"
+        if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
+          Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
         }
-        # build time generation of file gen/angle/angle_commit.h depends on
-        # third_party/angle/.git
-        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
-        $(7z a $zipfile src\third_party\angle\.git)
-        if ($LASTEXITCODE -ne 0) {
-          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
+    build_script:
+    - ps: |
+        node script/yarn.js install --frozen-lockfile
+        node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
+        if ($LASTEXITCODE -eq 0) {
+          Write-warning "Skipping tests for doc only change"; Exit-AppveyorBuild
         }
-        # build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
-        # https://dawn-review.googlesource.com/c/dawn/+/83901        
-        $(7z a $zipfile src\third_party\dawn\.git)
-        if ($LASTEXITCODE -ne 0) {
-          Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
+        $global:LASTEXITCODE = 0
+    - ps: |
+        cd ..
+        mkdir out\Default
+        cd ..
+        # Download build artifacts
+        $apiUrl = 'https://ci.appveyor.com/api'             
+        $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
+        $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','builtins-pgo.zip')
+        foreach ($job in $build_info.build.jobs) {
+          if ($job.name -eq "Build") {
+            $jobId = $job.jobId
+            foreach($artifact_name in $artifacts_to_download) {
+              if ($artifact_name -eq 'shell_browser_ui_unittests.exe' -Or $artifact_name -eq 'electron.lib') {
+                $outfile = "src\out\Default\$artifact_name"
+              } else {
+                $outfile = $artifact_name
+              }
+              Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
+            }
+          }
         }
-      }
-  - cd src
-  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
-  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
-  - gn check out/Default //electron:electron_lib
-  - gn check out/Default //electron:electron_app
-  - gn check out/Default //electron/shell/common/api:mojo
-  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
-  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
-  - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
-  - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
-  - ninja -C out/Default electron:electron_dist_zip
-  - ninja -C out/Default shell_browser_ui_unittests
-  - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-  - ninja -C out/Default electron:electron_mksnapshot_zip
-  - cd out\Default
-  - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
-  - cd ..\..
-  - ninja -C out/Default electron:hunspell_dictionaries_zip
-  - ninja -C out/Default electron:electron_chromedriver_zip
-  - ninja -C out/Default third_party/electron_node:headers
-  - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
-  - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-  - 7z a node_headers.zip out\Default\gen\node_headers
-  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        # Needed for msdia140.dll on 64-bit windows
-        $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
-        ninja -C out/Default electron:electron_symbols
-      }
-  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        python electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
-      } else {
-        # It's useful to have pdb files when debugging testing builds that are
-        # built on CI.
-        7z a pdb.zip out\Default\*.pdb
-      }
-  - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-test_script:
-  # Workaround for https://github.com/appveyor/ci/issues/2420
-  - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
-  - ps: >-
-      if ((-Not (Test-Path Env:\TEST_WOA)) -And (-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
-        $env:RUN_TESTS="true"
-      }
-  - ps: >-
-      if ($env:RUN_TESTS -eq 'true') {
-        New-Item .\out\Default\gen\node_headers\Release -Type directory
-        Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
-      } else {
-        echo "Skipping tests for $env:GN_CONFIG build"
-      }
-  - cd electron
-  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log )
-  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeparately --enable-logging=file --log-file=%cd%\electron.log )
-  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log )  
-  - cd ..
-  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
-  - echo "About to verify mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
-  - echo "Done verifying mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
-  - echo "Done verifying chromedriver"
-deploy_script:
-  - cd electron
-  - ps: >-
-      if (Test-Path Env:\ELECTRON_RELEASE) {
-        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-          Write-Output "Uploading Electron release distribution to azure"
-          & python script\release\uploaders\upload.py --verbose --upload_to_storage
-        } else {
-          Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py --verbose
+    - ps: |
+        $out_default_zips = @('dist.zip','chromedriver.zip','mksnapshot.zip')
+        foreach($zip_name in $out_default_zips) {
+          7z x -y -osrc\out\Default $zip_name
         }
-      } elseif (Test-Path Env:\TEST_WOA) {
-        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
-      }
-on_finish:
-  # Uncomment this lines to enable RDP
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  - cd ..
-  - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
-  - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
-  - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
-  - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
-  - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
-  - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
-  - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
-  - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-  - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
-  - ps: >-
-      if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-        appveyor-retry appveyor PushArtifact pdb.zip
-      }
+    - ps: 7z x -y -osrc\out\ffmpeg ffmpeg.zip
+    - ps: 7z x -y -osrc node_headers.zip
+    - ps: 7z x -y -osrc builtins-pgo.zip
 
-  - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+    test_script:
+      # Workaround for https://github.com/appveyor/ci/issues/2420
+      - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
+      - ps: |
+          cd src
+          New-Item .\out\Default\gen\node_headers\Release -Type directory
+          Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
+      - cd electron
+      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
+      - echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log
+      - cd ..
+      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+      - echo "About to verify mksnapshot"
+      - echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
+      - echo "Done verifying mksnapshot"
+      - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
+      - echo "Done verifying chromedriver"
+    
+    on_finish:
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
\ No newline at end of file

From cef7f6f99b21a497bbb2b149d17a79831beb9dde Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:25:54 +0900
Subject: [PATCH 782/811] test: re-enable power monitor tests on arm64 (#36022)

test: re-enable powermonitor on arm64

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

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
---
 spec-main/api-power-monitor-spec.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec-main/api-power-monitor-spec.ts b/spec-main/api-power-monitor-spec.ts
index c1f55fc5606ae..1867e8f97b0e3 100644
--- a/spec-main/api-power-monitor-spec.ts
+++ b/spec-main/api-power-monitor-spec.ts
@@ -14,8 +14,7 @@ import { promisify } from 'util';
 describe('powerMonitor', () => {
   let logindMock: any, dbusMockPowerMonitor: any, getCalls: any, emitSignal: any, reset: any;
 
-  // TODO(deepak1556): Enable on arm64 after upgrade, it crashes at the moment.
-  ifdescribe(process.platform === 'linux' && process.arch !== 'arm64' && process.env.DBUS_SYSTEM_BUS_ADDRESS != null)('when powerMonitor module is loaded with dbus mock', () => {
+  ifdescribe(process.platform === 'linux' && process.env.DBUS_SYSTEM_BUS_ADDRESS != null)('when powerMonitor module is loaded with dbus mock', () => {
     before(async () => {
       const systemBus = dbus.systemBus();
       const loginService = systemBus.getService('org.freedesktop.login1');

From 8dcdf5c26ddd7c0f0373571b3ff82a23d6265777 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 09:51:15 +0200
Subject: [PATCH 783/811] fix: remove extra dot in extension (#36027)

* fix: remove extra period of extension

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

* update comment

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

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: mlaurencin <mlaurencin@electronjs.org>
Co-authored-by: Michaela Laurencin <35157522+mlaurencin@users.noreply.github.com>
---
 shell/browser/electron_download_manager_delegate.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc
index e2a0c8896c547..88fcc373c3383 100644
--- a/shell/browser/electron_download_manager_delegate.cc
+++ b/shell/browser/electron_download_manager_delegate.cc
@@ -99,14 +99,14 @@ bool GetRegistryDescriptionFromExtension(const std::string& file_ext,
 // Set up a filter for a Save/Open dialog, |ext_desc| as the text descriptions
 // of the |file_ext| types (optional), and (optionally) the default 'All Files'
 // view. The purpose of the filter is to show only files of a particular type in
-// a Windows Save/Open dialog box. The resulting filter is returned. The filter
+// a Windows Save/Open dialog box. The resulting filter is returned. The filters
 // created here are:
 //   1. only files that have 'file_ext' as their extension
 //   2. all files (only added if 'include_all_files' is true)
 // If a description is not provided for a file extension, it will be retrieved
 // from the registry. If the file extension does not exist in the registry, a
 // default description will be created (e.g. "qqq" yields "QQQ File").
-// Copied from ui/shell_dialogs/select_file_dialog_win.cc
+// Modified from ui/shell_dialogs/select_file_dialog_win.cc
 file_dialog::Filters FormatFilterForExtensions(
     const std::vector<std::string>& file_ext,
     const std::vector<std::string>& ext_desc,
@@ -168,6 +168,10 @@ file_dialog::Filters FormatFilterForExtensions(
       base::ReplaceChars(desc, "*", base::StringPiece(), &desc);
     }
 
+    // Remove the preceeding '.' character from the extension.
+    size_t ext_index = ext.find_first_not_of('.');
+    if (ext_index != std::string::npos)
+      ext = ext.substr(ext_index);
     result.push_back({desc, {ext}});
   }
 

From 27944d805bc2efbee409150607eda61511bd22f4 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 13:35:26 +0200
Subject: [PATCH 784/811] fix: override app's desktop name and v8 flags in
 default-app (#36050)

Co-authored-by: Piroro-hs <Piroro-hs@users.noreply.github.com>

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Piroro-hs <Piroro-hs@users.noreply.github.com>
---
 default_app/main.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/default_app/main.ts b/default_app/main.ts
index f2834624f7430..7defe97f3ecf3 100644
--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -83,7 +83,7 @@ function loadApplicationPackage (packagePath: string) {
   });
 
   try {
-    // Override app name and version.
+    // Override app's package.json data.
     packagePath = path.resolve(packagePath);
     const packageJsonPath = path.join(packagePath, 'package.json');
     let appPath;
@@ -104,6 +104,16 @@ function loadApplicationPackage (packagePath: string) {
       } else if (packageJson.name) {
         app.name = packageJson.name;
       }
+      if (packageJson.desktopName) {
+        app.setDesktopName(packageJson.desktopName);
+      } else {
+        app.setDesktopName(`${app.name}.desktop`);
+      }
+      // Set v8 flags, deliberately lazy load so that apps that do not use this
+      // feature do not pay the price
+      if (packageJson.v8Flags) {
+        require('v8').setFlagsFromString(packageJson.v8Flags);
+      }
       appPath = packagePath;
     }
 

From de9889e78ab0a55dc7504517c82934b63df9e194 Mon Sep 17 00:00:00 2001
From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 14:17:48 -0400
Subject: [PATCH 785/811] docs: update VS Code debugger types to remove "pwa-"
 prefix (#36053)

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>
---
 docs/tutorial/tutorial-2-first-app.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/tutorial/tutorial-2-first-app.md b/docs/tutorial/tutorial-2-first-app.md
index 75d94d618e014..072cb5a843430 100644
--- a/docs/tutorial/tutorial-2-first-app.md
+++ b/docs/tutorial/tutorial-2-first-app.md
@@ -369,12 +369,12 @@ run. Create a launch.json configuration in a new `.vscode` folder in your projec
       "name": "Renderer",
       "port": 9222,
       "request": "attach",
-      "type": "pwa-chrome",
+      "type": "chrome",
       "webRoot": "${workspaceFolder}"
     },
     {
       "name": "Main",
-      "type": "pwa-node",
+      "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
@@ -398,11 +398,11 @@ What we have done in the `launch.json` file is to create 3 configurations:
 - `Main` is used to start the main process and also expose port 9222 for remote debugging
   (`--remote-debugging-port=9222`). This is the port that we will use to attach the debugger
   for the `Renderer`. Because the main process is a Node.js process, the type is set to
-  `pwa-node` (`pwa-` is the prefix that tells VS Code to use the latest JavaScript debugger).
+  `node`.
 - `Renderer` is used to debug the renderer process. Because the main process is the one
   that creates the process, we have to "attach" to it (`"request": "attach"`) instead of
   creating a new one.
-  The renderer process is a web one, so the debugger we have to use is `pwa-chrome`.
+  The renderer process is a web one, so the debugger we have to use is `chrome`.
 - `Main + renderer` is a [compound task] that executes the previous ones simultaneously.
 
 :::caution

From c8c335874a89736127f41fcd147ce61e1a1f2a3f Mon Sep 17 00:00:00 2001
From: Sudowoodo Release Bot
 <88427002+sudowoodo-release-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 08:31:10 -0700
Subject: [PATCH 786/811] Bump v21.2.0

---
 ELECTRON_VERSION                        | 2 +-
 package.json                            | 2 +-
 shell/browser/resources/win/electron.rc | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ELECTRON_VERSION b/ELECTRON_VERSION
index c8c4861230ac9..ab3add4d87bc7 100644
--- a/ELECTRON_VERSION
+++ b/ELECTRON_VERSION
@@ -1 +1 @@
-21.1.1
\ No newline at end of file
+21.2.0
\ No newline at end of file
diff --git a/package.json b/package.json
index 22967c2bb058a..3a5ba0eaadaad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "21.1.1",
+  "version": "21.2.0",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
diff --git a/shell/browser/resources/win/electron.rc b/shell/browser/resources/win/electron.rc
index 2d1bc47134c40..55164305f4d69 100644
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,1,1,0
- PRODUCTVERSION 21,1,1,0
+ FILEVERSION 21,2,0,0
+ PRODUCTVERSION 21,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "21.1.1"
+            VALUE "FileVersion", "21.2.0"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "21.1.1"
+            VALUE "ProductVersion", "21.2.0"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

From 55f4a1dcbd82fc5b62af5639f46a475eff3b850a Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Mon, 24 Oct 2022 19:34:40 -0400
Subject: [PATCH 787/811] copied electronite files from older version.

---
 .../Electronite/ElectroniteBuildNotes.md      |    45 +
 .../ElectroniteCurrentVersionBuildNotes.md    |    85 +
 .../Electronite/LinuxBuildNotes.md            |   177 +
 .../Electronite/LinuxBuildNotesChromeTools.md |    37 +
 docs/development/Electronite/MacBuildNotes.md |   123 +
 .../Electronite/MacBuildNotesChromeTools.md   |    37 +
 .../Electronite/WindowsBuildNotes.md          |   168 +
 .../WindowsBuildNotesChromeTools.md           |    37 +
 docs/development/Electronite/electron.d.ts    | 18122 ++++++++++++++++
 .../Electronite/electronite-tools.bat         |   148 +
 .../Electronite/electronite-tools.sh          |   130 +
 .../development/Electronite/electronite.patch |   288 +
 docs/development/Electronite/step.bat         |   155 +
 docs/development/Electronite/step.sh          |   133 +
 patches/chromium/add_graphite.patch           |   217 +
 15 files changed, 19902 insertions(+)
 create mode 100644 docs/development/Electronite/ElectroniteBuildNotes.md
 create mode 100644 docs/development/Electronite/ElectroniteCurrentVersionBuildNotes.md
 create mode 100644 docs/development/Electronite/LinuxBuildNotes.md
 create mode 100644 docs/development/Electronite/LinuxBuildNotesChromeTools.md
 create mode 100644 docs/development/Electronite/MacBuildNotes.md
 create mode 100644 docs/development/Electronite/MacBuildNotesChromeTools.md
 create mode 100644 docs/development/Electronite/WindowsBuildNotes.md
 create mode 100644 docs/development/Electronite/WindowsBuildNotesChromeTools.md
 create mode 100644 docs/development/Electronite/electron.d.ts
 create mode 100755 docs/development/Electronite/electronite-tools.bat
 create mode 100755 docs/development/Electronite/electronite-tools.sh
 create mode 100644 docs/development/Electronite/electronite.patch
 create mode 100755 docs/development/Electronite/step.bat
 create mode 100755 docs/development/Electronite/step.sh
 create mode 100644 patches/chromium/add_graphite.patch

diff --git a/docs/development/Electronite/ElectroniteBuildNotes.md b/docs/development/Electronite/ElectroniteBuildNotes.md
new file mode 100644
index 0000000000000..8081c88273f3e
--- /dev/null
+++ b/docs/development/Electronite/ElectroniteBuildNotes.md
@@ -0,0 +1,45 @@
+# Electronite Build Notes
+
+Electronite is a version of Electron that is patched to support rendering [graphite](https://github.com/silnrsi/graphite) enabled fonts.
+
+Based on wiki notes for `electronite-v12.0.5` from: https://github.com/unfoldingWord/electronite/wiki
+
+# Updating
+
+When updating the code, the standard is to create new branches like `electronite-v12.0.5`. These eventually get pushed up to the server and tagged for the release.
+
+## Graphite
+
+For minor graphite updates you can simply change the version of graphite needed in `/DEPS`.
+
+For example, this updates graphite from [1.3.13](https://github.com/silnrsi/graphite/releases/tag/1.3.13) to [1.3.14](https://github.com/silnrsi/graphite/releases/tag/1.3.14).
+```diff
+-'graphite_version': 'b45f9b271214b95f3b42e5c9863eae4b0bfb7fd7',
++'graphite_version': '92f59dcc52f73ce747f1cdc831579ed2546884aa',
+```
+
+If there are larger changes to the graphite API you may need to do some patching in the Electron code see [[Graphite Patch]].
+
+## Patching Electron
+
+The simplest way to update Electronite is to pull down the branch from upstream and re-apply the [[Graphite Patch]]. This avoids merge conflicts and an ugly commit history.
+
+Updating Electronite is pretty straight forward.
+1. Get the version of Electron that you want to update to, e.g. `git checkout upstream v12.0.5`.
+2. Branch from Electron `git checkout -b electronite-12.0.5`
+3. Apply the [Graphite Patch](https://github.com/unfoldingWord/electronite/wiki/Graphite-Patch) `git am add-graphite-to-electron.patch` (you might need to manually apply it if there are conflicting changes from upstream).
+4. Build and test the Electronite branch (see below).
+5. If everything is working properly, push the branch and tag the release using the proper naming convention, and create a new release based on your new tag with the compiled binaries attached to it.
+6. Upload a patched version of `electron.d.ts` to the release as well for easy reference. See https://github.com/unfoldingWord-dev/electronite-cli/blob/master/README.md#development for details.
+
+# Building
+
+[Build Notes](ElectroniteCurrentVersionBuildNotes.md)
+
+# Other Electronite Steps
+
+Will need to update and publish these packages:
+- https://github.com/unfoldingWord-dev/electronite-cli
+    - look at the README.md
+- https://github.com/unfoldingWord-box3/electronite-packager
+    - this doesn't have notes yet - for now just merged in master branch from Electron to update version to latest `15.4.0`
diff --git a/docs/development/Electronite/ElectroniteCurrentVersionBuildNotes.md b/docs/development/Electronite/ElectroniteCurrentVersionBuildNotes.md
new file mode 100644
index 0000000000000..e65ddab30cbe8
--- /dev/null
+++ b/docs/development/Electronite/ElectroniteCurrentVersionBuildNotes.md
@@ -0,0 +1,85 @@
+# Electronite Build Notes
+
+Electronite is a version of Electron that is patched to support rendering [graphite](https://github.com/silnrsi/graphite) enabled fonts.
+
+Based on wiki notes for `electronite-v12.0.5` from: https://github.com/unfoldingWord/electronite/wiki
+
+# Building
+
+- [Windows build notes](WindowsBuildNotes.md)
+- [MacOS build notes](MacBuildNotes.md)
+- [Linux build notes](LinuxBuildNotes.md)
+
+Running the scripts without arguments will display the following commands which you will generally want to execute in order:
+1. `get <ref>` fetches all of the code. Where `<ref>` is a branch or tag.
+2. `build [target]` compiles Electronite for target (default is x64)
+3. `release [target]` creates the distributable (default is x64)
+
+Also, you'll want to build code from a properly tagged release because [other tooling](https://github.com/topics/electronite) expects a specific naming convention.
+When tagging a new release of Electronite use the same naming convention as Electron with the addition of a `-graphite` suffix. For example if Electron has a `v7.2.3` release, Electronite will have a corresponding `v7.2.3-graphite` release.
+
+> Note: When building Electronite you will need to download about 20 gb of source code.
+
+After running the above commands you will have a zipped file at `./electron-gn/src/out/Release/dist.zip`. You can rename this file and  upload it as an artifact to the proper release on Github. Here's the naming convention:
+
+* `electronite-<version>-win32-x64.zip`
+* `electronite-<version>-win32-ia32.zip`
+* `electronite-<version>-linux-x64.zip`
+* `electronite-<version>-darwin-x64.zip`
+
+Where `<version>` is the tagged release without the `-graphite` suffix. e.g. `electronite-v7.2.3-linux-x64.zip`
+
+> You must compile Electronite on a Linux, Windows, and macOS in order to generate the three distributables above.
+>  Cross compilation for different OS is not possible.
+
+## Troubleshooting
+
+#### Delete cached repository
+If you encounter errors while fetching the source code (this includes chromium) you may need to delete one of the cached repositories, or a lock file. Look through the console output to identify the repository that was being fetched when the download failed. Delete the identified repository from your `.git_cache` and also delete any `.lock` files. Re-run the download and it should succeed.
+
+#### Disable your VPN
+This problem has only been seen on some Linux systems.
+It is necessary to disable any active VPNs on the computer in order to successfully download the source code. If you do not, you may get errors about not being able to reach one of the source code servers. If this occurs, delete the affected cached repository if any and try again after turning off your VPN.
+
+#### Select Xcode build tools
+
+If you get an error like the following:
+```
+xcode-select: error: tool 'xcodebuild' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance
+```
+
+You need to select the Xcode application
+```
+sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+```
+
+## Help!
+
+Check out this [Electronite playlist](https://www.youtube.com/playlist?list=PLf7IRQ2kP73kmC8y8gLQoHs4I26LzrRrq) on YouTube if you need some help using the scripts.
+
+# Testing
+
+Once you have a compiled Electronite binary you can test it by visiting this page https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo.
+
+* Run Electronite
+* Open the developer console in the running Electronite instance.
+* execute `window.location="the test url above"`
+* Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
+
+## Troubleshooting
+
+Some font elements need to be enabled via css flags, and these flags are specific to each browser.
+On the test page mentioned above, the padauk font uses a Mozilla specific css flag, but since Electronite is based on chromium those don't work. Therefore, it is necessary to tweak the css a little.
+
+
+```diff
+.padauk_ttf {
+  font-family: PadaukT, sans-serif;     
+  font-size: 150%;
+-  -moz-font-feature-settings: "wtri=1";
+-  -moz-font-feature-settings: "wtri" 1;
++  font-feature-settings: "wtri" 1;
+}
+```
+
+See [this issue](https://github.com/unfoldingWord/translationCore/issues/6879#issuecomment-624429380) for a detailed explaination.
\ No newline at end of file
diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
new file mode 100644
index 0000000000000..4284871af36a6
--- /dev/null
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -0,0 +1,177 @@
+## Building Electronite on Linux
+### Setup on Clean Linux VM
+- Configured my VM using these notes as a reference: [build-instructions-linux](../build-instructions-linux.md)
+- Make sure the VM has a lot of disk space - I ran out of disk space with 60GB of storage configured.  Rather than starting over with a new VM.  I added a second Virtual Hard Drive with 100GB and then used that drive for the builds.
+- if you have trouble building with these notes, you could try the older Chromium Build tools: [LinuxBuildNotesChromeTools](LinuxBuildNotesChromeTools.md)
+- if you get warning that you need to upgrade to newer g++, here's an example of how to upgrade to g++ 10:
+```
+sudo apt install build-essential
+sudo apt -y install g++-10
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
+g++ --version
+```
+- to create `arm64` and `arm` builds, you must have installed the arm dependencies mentioned in the Linux build instructions above.  Then run:
+- install and configure python:
+```
+sudo apt install python python3.9
+pip3 install --user --upgrade pip
+pip3 install --user pyobjc
+```
+
+- installed electron build-tools (https://github.com/electron/build-tools):
+```
+npm i -g @electron/build-tools
+```
+- if e commands don’t work, try this and then initialization seemed to work:
+```
+git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd ~/.electron_build_tools && npm install)
+``` 
+
+#### Monitoring Goma status
+- if you browse to http://localhost:8088 on your local machine you can monitor compile jobs as they flow through the goma system.
+
+
+### Build Electronite
+#### Build x64
+- open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~/.electron_build_tools/configs/evm.x64.json`
+  and add option to args:       `"target_cpu = \"x64\""`
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd ~/Develop/Electronite-Build/src/electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ../..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Test the build.
+    - Do `e start`.
+    - Open the developer console by typing`Control-Shift-I`.
+    - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
+    - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
+    - The example for Padauk from server will not be correct with the triangles.  So need to:
+      Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
+
+- Make the release to ~/Develop/Electronite-Build/src/out/x64/dist.zip
+```
+./src/electron/script/strip-binaries.py -d src/out/x64
+e build electron:dist
+```
+
+#### Build x86
+- open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+sudo apt-get install ia32-libs-gtk ia32-libs
+e init --root=~/Develop/Electronite-Build -o x86 x86 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~/.electron_build_tools/configs/evm.x86.json`
+  and add option to args:       `"target_cpu = \"x86\""`
+
+- if Electronite source already checked out, then skip to `Build Init` step:
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd ~/Develop/Electronite-Build/src/electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ../..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Build Init: to create `x86` builds, you must have installed the x86 dependencies mentioned in the Linux build instructions above.  Then run:
+```
+cd ./src
+build/linux/sysroot_scripts/install-sysroot.py --arch=x86
+cd ..
+```
+
+- Do build (takes a long time)
+```
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Make the release to ~/Develop/Electronite-Build/src/out/x86/dist.zip
+```
+./src/electron/script/strip-binaries.py --target-cpu=x86 -d src/out/x86
+e build electron:dist
+```
+
+#### Build Arm64
+- open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+sudo apt-get install binutils-aarch64-linux-gnu
+e init --root=~/Develop/Electronite-Build -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~/.electron_build_tools/configs/evm.arm64.json`
+  and add option to args:       `"target_cpu = \"arm64\""`
+
+- if Electronite source already checked out, then skip to `Build Init` step:
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd ~/Develop/Electronite-Build/src/electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ../..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Build Init: to create `arm64` builds, you must have installed the arm64 dependencies mentioned in the Linux build instructions above.  Then run:
+```
+cd ./src
+build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
+cd ..
+```
+
+- Do build (takes a long time)
+```
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Make the release to ~/Develop/Electronite-Build/src/out/arm64/dist.zip
+```
+./src/electron/script/strip-binaries.py --target-cpu=arm64 -d src/out/arm64
+e build electron:dist
+```
diff --git a/docs/development/Electronite/LinuxBuildNotesChromeTools.md b/docs/development/Electronite/LinuxBuildNotesChromeTools.md
new file mode 100644
index 0000000000000..ad4847d8a560d
--- /dev/null
+++ b/docs/development/Electronite/LinuxBuildNotesChromeTools.md
@@ -0,0 +1,37 @@
+## Building Electronite on Linux
+### Setup on Linux VM
+- Configured my VM using these notes as a reference: [build-instructions-linux](../build-instructions-linux.md){
+- Make sure the VM has a lot of disk space - I ran out of disk space with 60GB of storage configured.  Rather than starting over with a new VM.  I added a second Virtual Hard Drive with 100GB and then used that drive for the builds.
+
+### Build Electronite
+- open terminal and cd to the folder you will use for build
+- install the depot_tools here: `git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git`
+- download build script to this folder from: [electronite-tools](electronite-tools.sh)
+- set execute permission on script: `chmod +x ./electronite-tools.sh`
+- before build do: `export PATH=/path/to/depot_tools:$PATH`
+- get source files (this can take several hours the first time as the git cache is loaded): `./electronite-tools.sh get <<build-tag>>`
+- to create `arm64` builds, you must have installed the arm64 dependencies mentioned in the Linux build instructions above.  After doing `e sync` run:
+```
+cd electron-gn/src
+build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
+cd ../..
+```
+- to create `arm` builds, you must have installed the arm dependencies mentioned in the Linux build instructions above.  After doing `e sync` run:
+```
+cd electron-gn/src
+build/linux/sysroot_scripts/install-sysroot.py --arch=arm
+cd ../..
+```
+- builds can take over 20 hours on a VM.
+- build Electronite for Intel 64-bit:
+    - build for 64-bit: `./electronite-tools.sh build x64`
+    - create release for 32-bit: `./electronite-tools.sh release x64`
+
+- build Electronite for Arm 64-bit:
+    - build for arm 64-bit: `./electronite-tools.sh build arm64`
+    - create release for arm 64-bit: `./electronite-tools.sh release arm64`
+
+- build Electronite for Arm:
+    - build for arm: `./electronite-tools.sh build arm`
+    - create release for arm: `./electronite-tools.sh release arm`
+   
\ No newline at end of file
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
new file mode 100644
index 0000000000000..01786fdb9c3d3
--- /dev/null
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -0,0 +1,123 @@
+## Building Electronite on MacOS
+### Setup on MacOS Big Sur
+- Configured using these notes as a reference: [build-instructions-macos](../build-instructions-macos.md)
+- Can build on Catalina by changing the build config. Change `~/Develop/Electronite-Build/src/electron/.circleci/config/base.yml` by setting `macos/parameters/xcode/default` to 12.4.0 (but will not get any speed up from goma, so probably best to set goma to `none`)
+- Building for x64 does not work on M1 Silicon Macs, only for Arm64.  On Intel based Macs can build for both Arm64 and Intel x64
+- Make sure you have a lot of free disk space - need over 150GB free.
+- if you have trouble building with these notes, you could try the older Chromium Build tools: [MacBuildNotesChromeTools](MacBuildNotesChromeTools.md)
+
+- installed node using nvm
+  - install nvm: `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash`
+  - restart terminal
+  - install latest stable node:
+```
+nvm install --lts
+nvm use --lts
+node --version
+```
+- installed homebrew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"`
+- Installed Python 3.9 (Python 3.10 has breaking changes that broke the compile) `brew install python@3.9`
+- configured Python:
+```
+pip3 install --user --upgrade pip
+pip3 install --user pyobjc
+```
+- installed electron build-tools (https://github.com/electron/build-tools):
+``` 
+sudo npm i -g @electron/build-tools
+```
+
+- if e commands don’t work, try this and then initialization seemed to work:
+```
+git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd ~/.electron_build_tools && npm install)
+``` 
+
+#### Monitoring Goma status
+- if you browse to http://localhost:8088 on your local machine you can monitor compile jobs as they flow through the goma system.
+
+
+### Build Electronite
+#### Build Intel x64
+- open terminal and initialize build (on M1 Mac, had to use `--goma none`):
+```
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~/.electron_build_tools/configs/evm.x64.json`
+  and add option to args:       `"target_cpu = \"x64\""`
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd ~/Develop/Electronite-Build/src/electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ../..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Test the build. 
+  - Do `e start`.
+  - Open the developer console by typing`Command-Shift-I`.
+  - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
+  - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
+  - The example for Padauk from server will not be correct with the triangles.  So need to:
+Open elements tab, select body of html, do command-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
+
+- Make the release to ~/Develop/Electronite-Build/src/out/x64/dist.zip
+```
+e build electron:dist
+```
+
+#### Build Arm64
+- open terminal and initialize build (on M1 Mac, had to use `--goma none`, and it may be faster if you have a slow or unreliable internet connection):
+```
+e init --root=~/Develop/Electronite-Build -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~/.electron_build_tools/configs/evm.arm64.json`
+and add option to args:       `"target_cpu = \"arm64\""`
+
+- if Electronite source already checked out, then skip to `Do build` step:
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd ~/Develop/Electronite-Build/src/electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ../..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Make the release to ~/Develop/Electronite-Build/src/out/arm64/dist.zip
+```
+e build electron:dist
+```
diff --git a/docs/development/Electronite/MacBuildNotesChromeTools.md b/docs/development/Electronite/MacBuildNotesChromeTools.md
new file mode 100644
index 0000000000000..9558db03dc1a6
--- /dev/null
+++ b/docs/development/Electronite/MacBuildNotesChromeTools.md
@@ -0,0 +1,37 @@
+## Building Electronite on MacOS
+### Setup on MacOS Catalina VM
+- Configured my VM using these notes as a reference: [build-instructions-macos](../build-instructions-macos.md)
+- Make sure the VM has a lot of disk space - I was able to build with 120GB of storage configured.  But only had 13GB of space at end of build, so that may not be enough in the future.
+- Installed xcode 12.4.
+- installed node using nvm
+    - install nvm: `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash`
+    - restart terminal
+    - install latest node:
+```
+nvm install --lts
+nvm use --lts
+node --version
+```
+- installed homebrew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"`
+- Installed Python 3.9 (Python 3.10 has breaking changes that broke compile) `brew install python@3.9`
+- configured Python:
+```
+pip3 install --user --upgrade pip
+pip3 install --user pyobjc
+```
+
+### Build Electronite
+- open terminal and cd to the folder you will use for build
+- install the depot_tools here: `git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git`
+- download build script to this folder from: [electronite-tools](electronite-tools.sh)
+- set execute permission on script: `chmod +x ./electronite-tools.sh`
+- before build do: `export PATH=/path/to/depot_tools:$PATH`
+- get source files (this can take several hours the first time as the git cache is loaded): `./electronite-tools.sh get <<build-tag>>`
+- builds can take over 15 hours on a VM.
+- build Electronite for MacOS Intel 64-bit:
+    - build for 64-bit: `./electronite-tools.sh build x64`
+    - create release for 32-bit: `./electronite-tools.sh release x64`
+- build Electronite for MacOS Arm 64-bit:
+    - build for arm 64-bit: `./electronite-tools.sh build arm64`
+    - create release for arm 64-bit: `./electronite-tools.sh release arm64`
+
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
new file mode 100644
index 0000000000000..351473bd21a87
--- /dev/null
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -0,0 +1,168 @@
+## Building Electronite on Windows
+### Setup on Clean Windows 10 VM
+- Configured my VM using these notes as a reference:
+  - https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#visual-studio
+  - [build-instructions-windows](../build-instructions-windows.md)
+- Make sure the VM has a lot of disk space - I configured with 220GB of storage.
+- if you have trouble building with these notes, you could try the older Chromium Build tools: [WindowsBuildNotesChromeTools](WindowsBuildNotesChromeTools.md) 
+- Make sure to add exception to the build folder for Windows defender, or it will delete a couple of the build files.
+  - Go to Start button > Settings > Update & Security > Windows Security > Virus & threat protection.
+  - Under Virus & threat protection settings, select Manage settings, and then under Exclusions, select Add or remove exclusions.
+  - Add folder `.\Build-Electron` (which is the default build folder used below, or the build folder you actually use).
+- Add to git support for long file names: `git config --system core.longpaths true`
+- Installed VS 2019 Community edition and Windows SDK 10.0.19041.0.
+- Installed Python 3.9.11 (Python 3.10 has breaking changes that broke compile) from https://www.python.org/downloads/windows/
+- configured Python:
+```
+python3 -m pip install --upgrade pip setuptools wheel
+python3 -m pip install pywin32
+```
+- installed node LTS
+- Added environment variables:
+```
+2019_install=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
+WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10
+```
+
+- installed: https://chocolatey.org/install
+	
+- Setup Build tools (using command prompt, not powershell).  Install using didn't work for me:
+```
+npm i -g @electron/build-tools
+C:
+cd %HOMEPATH%
+git clone https://github.com/electron/build-tools .electron_build_tools
+cd .electron_build_tools
+npm i
+```
+
+#### Monitoring Goma status
+- if you browse to http://localhost:8088 on your local machine you can monitor compile jobs as they flow through the goma system.
+
+### Build Electronite
+#### Build Intel x64
+- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+e init --root=.\Build-Electron -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~\.electron_build_tools\configs\evm.x64.json`
+and add option to args:       `"target_cpu = \"x64\""`
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd .\Build-Electron\src\electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ..\..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Test the build.
+    - Do `e start`.
+    - Open the developer console by typing`Control-Shift-I`.
+    - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
+    - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
+    - The example for Padauk from server will not be correct with the triangles.  So need to:
+      Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
+
+- Make the release to .\Build-Electron\src\out\x64\dist.zip
+```
+e build electron:dist
+```
+
+#### Build Intel x86 (32 bit)
+- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+e init --root=.\Build-Electron -o x86 x86 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~\.electron_build_tools\configs\evm.x86.json`
+  and add option to args:       `"target_cpu = \"x86\""`
+
+- if Electronite source already checked out, then skip to `Do build` step:
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd .\Build-Electron\src\electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ..\..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Make the release to .\Build-Electron\src\out\x86\dist.zip
+```
+e build electron:dist
+```
+
+#### Build Intel arm64
+- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+```
+e init --root=.\Build-Electron -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+```
+
+- edit `~\.electron_build_tools\configs\evm.arm64.json`
+  and add option to args:       `"target_cpu = \"arm64\""`
+
+- if Electronite source already checked out, then skip to `Do build` step:
+
+- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+```
+e sync
+```
+
+- checkout the correct Electronite tag
+```
+cd .\Build-Electron\src\electron
+git fetch --all
+git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
+cd ..\..
+```
+
+- now get the Electronite sources
+```
+e sync
+```
+
+- Do build (takes a long time)
+```
+set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+e build electron
+```
+
+- Make the release to .\Build-Electron\src\out\arm64\dist.zip
+```
+e build electron:dist
+```
+
diff --git a/docs/development/Electronite/WindowsBuildNotesChromeTools.md b/docs/development/Electronite/WindowsBuildNotesChromeTools.md
new file mode 100644
index 0000000000000..94affab40bb12
--- /dev/null
+++ b/docs/development/Electronite/WindowsBuildNotesChromeTools.md
@@ -0,0 +1,37 @@
+## Building Electronite on Windows
+### Setup on Clean Windows 10 VM
+- Configured my VM using these notes as a reference:
+    - https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#visual-studio
+    - [build-instructions-windows](../build-instructions-windows.md)
+- Make sure the VM has a lot of disk space - I ran out of disk space with 120GB of storage configured.  Rather than starting over with a new VM.  I added a second Virtual Hard Drive with 100GB and then used that drive for the builds.
+- Make sure to add exception to the build folder for Windows defender, or it will delete a couple of the build files.
+- Add to git support for long file names: `git config --system core.longpaths true`
+- Installed VS 2019 Community edition and Windows SDK 10.0.19041.0.
+- Installed Python 3.9.11 (Python 3.10 has breaking changes that broke compile) from https://www.python.org/downloads/windows/
+- configured Python:
+```
+python3 -m pip install --upgrade pip setuptools wheel
+python3 -m pip install pywin32
+```
+- installed node
+- Added environment variables:
+```
+2019_install=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community
+WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10
+```
+
+### Build Electronite
+- _**Note:** Use command prompt, not powershell as it will cause problems._
+- cd to the folder you will use for build
+- unzip the depot_tools here
+- download build script to this folder from: [electronite-tools](electronite-tools.bat)
+- before build do: `set PATH=%cd%\depot_tools;%PATH%`
+- get source files (this can take several hours the first time as the git cache is loaded): `.\electronite-tools.bat get <<build-tag>>`
+- builds can take over 20 hours on a VM.
+- build Electronite for 32-bit Windows:
+    - build for 32-bit: `.\electronite-tools.bat build x86`
+    - create release for 32-bit: `.\electronite-tools.bat release x86`
+- build Electronite for 64-bit Windows:
+    - build for 64-bit: `.\electronite-tools.bat build x64`
+    - create release for 64-bit: `.\electronite-tools.bat release x64`
+
diff --git a/docs/development/Electronite/electron.d.ts b/docs/development/Electronite/electron.d.ts
new file mode 100644
index 0000000000000..4cbe4b615c14a
--- /dev/null
+++ b/docs/development/Electronite/electron.d.ts
@@ -0,0 +1,18122 @@
+// Type definitions for Electron 21.2.0
+// Project: http://electronjs.org/
+// Definitions by: The Electron Team <https://github.com/electron/electron>
+// Definitions: https://github.com/electron/electron-typescript-definitions
+
+/// <reference types="node" />
+
+type GlobalEvent = Event & { returnValue: any };
+
+declare namespace Electron {
+  const NodeEventEmitter: typeof import('events').EventEmitter;
+
+  class Accelerator extends String {
+
+  }
+  interface App extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/app
+
+    /**
+     * Emitted when Chrome's accessibility support changes. This event fires when
+     * assistive technologies, such as screen readers, are enabled or disabled. See
+     * https://www.chromium.org/developers/design-documents/accessibility for more
+     * details.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'accessibility-support-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` when Chrome's accessibility support is enabled, `false` otherwise.
+                                                           */
+                                                          accessibilitySupportEnabled: boolean) => void): this;
+    once(event: 'accessibility-support-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` when Chrome's accessibility support is enabled, `false` otherwise.
+                                                           */
+                                                          accessibilitySupportEnabled: boolean) => void): this;
+    addListener(event: 'accessibility-support-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` when Chrome's accessibility support is enabled, `false` otherwise.
+                                                           */
+                                                          accessibilitySupportEnabled: boolean) => void): this;
+    removeListener(event: 'accessibility-support-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` when Chrome's accessibility support is enabled, `false` otherwise.
+                                                           */
+                                                          accessibilitySupportEnabled: boolean) => void): this;
+    /**
+     * Emitted when the application is activated. Various actions can trigger this
+     * event, such as launching the application for the first time, attempting to
+     * re-launch the application when it's already running, or clicking on the
+     * application's dock or taskbar icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'activate', listener: (event: Event,
+                                     hasVisibleWindows: boolean) => void): this;
+    once(event: 'activate', listener: (event: Event,
+                                     hasVisibleWindows: boolean) => void): this;
+    addListener(event: 'activate', listener: (event: Event,
+                                     hasVisibleWindows: boolean) => void): this;
+    removeListener(event: 'activate', listener: (event: Event,
+                                     hasVisibleWindows: boolean) => void): this;
+    /**
+     * Emitted during Handoff after an activity from this device was successfully
+     * resumed on another one.
+     *
+     * @platform darwin
+     */
+    on(event: 'activity-was-continued', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string,
+                                                   /**
+                                                    * Contains app-specific state stored by the activity.
+                                                    */
+                                                   userInfo: unknown) => void): this;
+    once(event: 'activity-was-continued', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string,
+                                                   /**
+                                                    * Contains app-specific state stored by the activity.
+                                                    */
+                                                   userInfo: unknown) => void): this;
+    addListener(event: 'activity-was-continued', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string,
+                                                   /**
+                                                    * Contains app-specific state stored by the activity.
+                                                    */
+                                                   userInfo: unknown) => void): this;
+    removeListener(event: 'activity-was-continued', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string,
+                                                   /**
+                                                    * Contains app-specific state stored by the activity.
+                                                    */
+                                                   userInfo: unknown) => void): this;
+    /**
+     * Emitted before the application starts closing its windows. Calling
+     * `event.preventDefault()` will prevent the default behavior, which is terminating
+     * the application.
+     *
+     * **Note:** If application quit was initiated by `autoUpdater.quitAndInstall()`,
+     * then `before-quit` is emitted *after* emitting `close` event on all windows and
+     * closing them.
+     *
+     * **Note:** On Windows, this event will not be emitted if the app is closed due to
+     * a shutdown/restart of the system or a user logout.
+     */
+    on(event: 'before-quit', listener: (event: Event) => void): this;
+    once(event: 'before-quit', listener: (event: Event) => void): this;
+    addListener(event: 'before-quit', listener: (event: Event) => void): this;
+    removeListener(event: 'before-quit', listener: (event: Event) => void): this;
+    /**
+     * Emitted when a browserWindow gets blurred.
+     */
+    on(event: 'browser-window-blur', listener: (event: Event,
+                                                window: BrowserWindow) => void): this;
+    once(event: 'browser-window-blur', listener: (event: Event,
+                                                window: BrowserWindow) => void): this;
+    addListener(event: 'browser-window-blur', listener: (event: Event,
+                                                window: BrowserWindow) => void): this;
+    removeListener(event: 'browser-window-blur', listener: (event: Event,
+                                                window: BrowserWindow) => void): this;
+    /**
+     * Emitted when a new browserWindow is created.
+     */
+    on(event: 'browser-window-created', listener: (event: Event,
+                                                   window: BrowserWindow) => void): this;
+    once(event: 'browser-window-created', listener: (event: Event,
+                                                   window: BrowserWindow) => void): this;
+    addListener(event: 'browser-window-created', listener: (event: Event,
+                                                   window: BrowserWindow) => void): this;
+    removeListener(event: 'browser-window-created', listener: (event: Event,
+                                                   window: BrowserWindow) => void): this;
+    /**
+     * Emitted when a browserWindow gets focused.
+     */
+    on(event: 'browser-window-focus', listener: (event: Event,
+                                                 window: BrowserWindow) => void): this;
+    once(event: 'browser-window-focus', listener: (event: Event,
+                                                 window: BrowserWindow) => void): this;
+    addListener(event: 'browser-window-focus', listener: (event: Event,
+                                                 window: BrowserWindow) => void): this;
+    removeListener(event: 'browser-window-focus', listener: (event: Event,
+                                                 window: BrowserWindow) => void): this;
+    /**
+     * Emitted when failed to verify the `certificate` for `url`, to trust the
+     * certificate you should prevent the default behavior with
+     * `event.preventDefault()` and call `callback(true)`.
+     */
+    on(event: 'certificate-error', listener: (event: Event,
+                                              webContents: WebContents,
+                                              url: string,
+                                              /**
+                                               * The error code
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    once(event: 'certificate-error', listener: (event: Event,
+                                              webContents: WebContents,
+                                              url: string,
+                                              /**
+                                               * The error code
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    addListener(event: 'certificate-error', listener: (event: Event,
+                                              webContents: WebContents,
+                                              url: string,
+                                              /**
+                                               * The error code
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    removeListener(event: 'certificate-error', listener: (event: Event,
+                                              webContents: WebContents,
+                                              url: string,
+                                              /**
+                                               * The error code
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    /**
+     * Emitted when the child process unexpectedly disappears. This is normally because
+     * it was crashed or killed. It does not include renderer processes.
+     */
+    on(event: 'child-process-gone', listener: (event: Event,
+                                               details: Details) => void): this;
+    once(event: 'child-process-gone', listener: (event: Event,
+                                               details: Details) => void): this;
+    addListener(event: 'child-process-gone', listener: (event: Event,
+                                               details: Details) => void): this;
+    removeListener(event: 'child-process-gone', listener: (event: Event,
+                                               details: Details) => void): this;
+    /**
+     * Emitted during Handoff when an activity from a different device wants to be
+     * resumed. You should call `event.preventDefault()` if you want to handle this
+     * event.
+     *
+     * A user activity can be continued only in an app that has the same developer Team
+     * ID as the activity's source app and that supports the activity's type. Supported
+     * activity types are specified in the app's `Info.plist` under the
+     * `NSUserActivityTypes` key.
+     *
+     * @platform darwin
+     */
+    on(event: 'continue-activity', listener: (event: Event,
+                                              /**
+                                               * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                               */
+                                              type: string,
+                                              /**
+                                               * Contains app-specific state stored by the activity on another device.
+                                               */
+                                              userInfo: unknown,
+                                              details: ContinueActivityDetails) => void): this;
+    once(event: 'continue-activity', listener: (event: Event,
+                                              /**
+                                               * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                               */
+                                              type: string,
+                                              /**
+                                               * Contains app-specific state stored by the activity on another device.
+                                               */
+                                              userInfo: unknown,
+                                              details: ContinueActivityDetails) => void): this;
+    addListener(event: 'continue-activity', listener: (event: Event,
+                                              /**
+                                               * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                               */
+                                              type: string,
+                                              /**
+                                               * Contains app-specific state stored by the activity on another device.
+                                               */
+                                              userInfo: unknown,
+                                              details: ContinueActivityDetails) => void): this;
+    removeListener(event: 'continue-activity', listener: (event: Event,
+                                              /**
+                                               * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                               */
+                                              type: string,
+                                              /**
+                                               * Contains app-specific state stored by the activity on another device.
+                                               */
+                                              userInfo: unknown,
+                                              details: ContinueActivityDetails) => void): this;
+    /**
+     * Emitted during Handoff when an activity from a different device fails to be
+     * resumed.
+     *
+     * @platform darwin
+     */
+    on(event: 'continue-activity-error', listener: (event: Event,
+                                                    /**
+                                                     * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                     */
+                                                    type: string,
+                                                    /**
+                                                     * A string with the error's localized description.
+                                                     */
+                                                    error: string) => void): this;
+    once(event: 'continue-activity-error', listener: (event: Event,
+                                                    /**
+                                                     * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                     */
+                                                    type: string,
+                                                    /**
+                                                     * A string with the error's localized description.
+                                                     */
+                                                    error: string) => void): this;
+    addListener(event: 'continue-activity-error', listener: (event: Event,
+                                                    /**
+                                                     * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                     */
+                                                    type: string,
+                                                    /**
+                                                     * A string with the error's localized description.
+                                                     */
+                                                    error: string) => void): this;
+    removeListener(event: 'continue-activity-error', listener: (event: Event,
+                                                    /**
+                                                     * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                     */
+                                                    type: string,
+                                                    /**
+                                                     * A string with the error's localized description.
+                                                     */
+                                                    error: string) => void): this;
+    /**
+     * Emitted when mac application become active. Difference from `activate` event is
+     * that `did-become-active` is emitted every time the app becomes active, not only
+     * when Dock icon is clicked or application is re-launched.
+     *
+     * @platform darwin
+     */
+    on(event: 'did-become-active', listener: (event: Event) => void): this;
+    once(event: 'did-become-active', listener: (event: Event) => void): this;
+    addListener(event: 'did-become-active', listener: (event: Event) => void): this;
+    removeListener(event: 'did-become-active', listener: (event: Event) => void): this;
+    /**
+     * Emitted whenever there is a GPU info update.
+     */
+    on(event: 'gpu-info-update', listener: Function): this;
+    once(event: 'gpu-info-update', listener: Function): this;
+    addListener(event: 'gpu-info-update', listener: Function): this;
+    removeListener(event: 'gpu-info-update', listener: Function): this;
+    /**
+     * Emitted when the GPU process crashes or is killed.
+     *
+     * **Deprecated:** This event is superceded by the `child-process-gone` event which
+     * contains more information about why the child process disappeared. It isn't
+     * always because it crashed. The `killed` boolean can be replaced by checking
+     * `reason === 'killed'` when you switch to that event.
+     *
+     * @deprecated
+     */
+    on(event: 'gpu-process-crashed', listener: (event: Event,
+                                                killed: boolean) => void): this;
+    once(event: 'gpu-process-crashed', listener: (event: Event,
+                                                killed: boolean) => void): this;
+    addListener(event: 'gpu-process-crashed', listener: (event: Event,
+                                                killed: boolean) => void): this;
+    removeListener(event: 'gpu-process-crashed', listener: (event: Event,
+                                                killed: boolean) => void): this;
+    /**
+     * Emitted when `webContents` wants to do basic auth.
+     *
+     * The default behavior is to cancel all authentications. To override this you
+     * should prevent the default behavior with `event.preventDefault()` and call
+     * `callback(username, password)` with the credentials.
+     *
+     * If `callback` is called without a username or password, the authentication
+     * request will be cancelled and the authentication error will be returned to the
+     * page.
+     */
+    on(event: 'login', listener: (event: Event,
+                                  webContents: WebContents,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    once(event: 'login', listener: (event: Event,
+                                  webContents: WebContents,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    addListener(event: 'login', listener: (event: Event,
+                                  webContents: WebContents,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    removeListener(event: 'login', listener: (event: Event,
+                                  webContents: WebContents,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    /**
+     * Emitted when the user clicks the native macOS new tab button. The new tab button
+     * is only visible if the current `BrowserWindow` has a `tabbingIdentifier`
+     *
+     * @platform darwin
+     */
+    on(event: 'new-window-for-tab', listener: (event: Event) => void): this;
+    once(event: 'new-window-for-tab', listener: (event: Event) => void): this;
+    addListener(event: 'new-window-for-tab', listener: (event: Event) => void): this;
+    removeListener(event: 'new-window-for-tab', listener: (event: Event) => void): this;
+    /**
+     * Emitted when the user wants to open a file with the application. The `open-file`
+     * event is usually emitted when the application is already open and the OS wants
+     * to reuse the application to open the file. `open-file` is also emitted when a
+     * file is dropped onto the dock and the application is not yet running. Make sure
+     * to listen for the `open-file` event very early in your application startup to
+     * handle this case (even before the `ready` event is emitted).
+     *
+     * You should call `event.preventDefault()` if you want to handle this event.
+     *
+     * On Windows, you have to parse `process.argv` (in the main process) to get the
+     * filepath.
+     *
+     * @platform darwin
+     */
+    on(event: 'open-file', listener: (event: Event,
+                                      path: string) => void): this;
+    once(event: 'open-file', listener: (event: Event,
+                                      path: string) => void): this;
+    addListener(event: 'open-file', listener: (event: Event,
+                                      path: string) => void): this;
+    removeListener(event: 'open-file', listener: (event: Event,
+                                      path: string) => void): this;
+    /**
+     * Emitted when the user wants to open a URL with the application. Your
+     * application's `Info.plist` file must define the URL scheme within the
+     * `CFBundleURLTypes` key, and set `NSPrincipalClass` to `AtomApplication`.
+     *
+     * You should call `event.preventDefault()` if you want to handle this event.
+     *
+     * As with the `open-file` event, be sure to register a listener for the `open-url`
+     * event early in your application startup to detect if the the application being
+     * is being opened to handle a URL. If you register the listener in response to a
+     * `ready` event, you'll miss URLs that trigger the launch of your application.
+     *
+     * @platform darwin
+     */
+    on(event: 'open-url', listener: (event: Event,
+                                     url: string) => void): this;
+    once(event: 'open-url', listener: (event: Event,
+                                     url: string) => void): this;
+    addListener(event: 'open-url', listener: (event: Event,
+                                     url: string) => void): this;
+    removeListener(event: 'open-url', listener: (event: Event,
+                                     url: string) => void): this;
+    /**
+     * Emitted when the application is quitting.
+     *
+     * **Note:** On Windows, this event will not be emitted if the app is closed due to
+     * a shutdown/restart of the system or a user logout.
+     */
+    on(event: 'quit', listener: (event: Event,
+                                 exitCode: number) => void): this;
+    once(event: 'quit', listener: (event: Event,
+                                 exitCode: number) => void): this;
+    addListener(event: 'quit', listener: (event: Event,
+                                 exitCode: number) => void): this;
+    removeListener(event: 'quit', listener: (event: Event,
+                                 exitCode: number) => void): this;
+    /**
+     * Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
+     * holds the `userInfo` of the `NSUserNotification` or information from
+     * `UNNotificationResponse` that was used to open the application, if it was
+     * launched from Notification Center. You can also call `app.isReady()` to check if
+     * this event has already fired and `app.whenReady()` to get a Promise that is
+     * fulfilled when Electron is initialized.
+     */
+    on(event: 'ready', listener: (event: Event,
+                                  launchInfo: (Record<string, any>) | (NotificationResponse)) => void): this;
+    once(event: 'ready', listener: (event: Event,
+                                  launchInfo: (Record<string, any>) | (NotificationResponse)) => void): this;
+    addListener(event: 'ready', listener: (event: Event,
+                                  launchInfo: (Record<string, any>) | (NotificationResponse)) => void): this;
+    removeListener(event: 'ready', listener: (event: Event,
+                                  launchInfo: (Record<string, any>) | (NotificationResponse)) => void): this;
+    /**
+     * Emitted when the renderer process unexpectedly disappears.  This is normally
+     * because it was crashed or killed.
+     */
+    on(event: 'render-process-gone', listener: (event: Event,
+                                                webContents: WebContents,
+                                                details: RenderProcessGoneDetails) => void): this;
+    once(event: 'render-process-gone', listener: (event: Event,
+                                                webContents: WebContents,
+                                                details: RenderProcessGoneDetails) => void): this;
+    addListener(event: 'render-process-gone', listener: (event: Event,
+                                                webContents: WebContents,
+                                                details: RenderProcessGoneDetails) => void): this;
+    removeListener(event: 'render-process-gone', listener: (event: Event,
+                                                webContents: WebContents,
+                                                details: RenderProcessGoneDetails) => void): this;
+    /**
+     * Emitted when the renderer process of `webContents` crashes or is killed.
+     *
+     * **Deprecated:** This event is superceded by the `render-process-gone` event
+     * which contains more information about why the render process disappeared. It
+     * isn't always because it crashed.  The `killed` boolean can be replaced by
+     * checking `reason === 'killed'` when you switch to that event.
+     *
+     * @deprecated
+     */
+    on(event: 'renderer-process-crashed', listener: (event: Event,
+                                                     webContents: WebContents,
+                                                     killed: boolean) => void): this;
+    once(event: 'renderer-process-crashed', listener: (event: Event,
+                                                     webContents: WebContents,
+                                                     killed: boolean) => void): this;
+    addListener(event: 'renderer-process-crashed', listener: (event: Event,
+                                                     webContents: WebContents,
+                                                     killed: boolean) => void): this;
+    removeListener(event: 'renderer-process-crashed', listener: (event: Event,
+                                                     webContents: WebContents,
+                                                     killed: boolean) => void): this;
+    /**
+     * This event will be emitted inside the primary instance of your application when
+     * a second instance has been executed and calls `app.requestSingleInstanceLock()`.
+     *
+     * `argv` is an Array of the second instance's command line arguments, and
+     * `workingDirectory` is its current working directory. Usually applications
+     * respond to this by making their primary window focused and non-minimized.
+     *
+     * **Note:** If the second instance is started by a different user than the first,
+     * the `argv` array will not include the arguments.
+     *
+     * This event is guaranteed to be emitted after the `ready` event of `app` gets
+     * emitted.
+     *
+     * **Note:** Extra command line arguments might be added by Chromium, such as
+     * `--original-process-start-time`.
+     */
+    on(event: 'second-instance', listener: (event: Event,
+                                            /**
+                                             * An array of the second instance's command line arguments
+                                             */
+                                            argv: string[],
+                                            /**
+                                             * The second instance's working directory
+                                             */
+                                            workingDirectory: string,
+                                            /**
+                                             * A JSON object of additional data passed from the second instance
+                                             */
+                                            additionalData: unknown) => void): this;
+    once(event: 'second-instance', listener: (event: Event,
+                                            /**
+                                             * An array of the second instance's command line arguments
+                                             */
+                                            argv: string[],
+                                            /**
+                                             * The second instance's working directory
+                                             */
+                                            workingDirectory: string,
+                                            /**
+                                             * A JSON object of additional data passed from the second instance
+                                             */
+                                            additionalData: unknown) => void): this;
+    addListener(event: 'second-instance', listener: (event: Event,
+                                            /**
+                                             * An array of the second instance's command line arguments
+                                             */
+                                            argv: string[],
+                                            /**
+                                             * The second instance's working directory
+                                             */
+                                            workingDirectory: string,
+                                            /**
+                                             * A JSON object of additional data passed from the second instance
+                                             */
+                                            additionalData: unknown) => void): this;
+    removeListener(event: 'second-instance', listener: (event: Event,
+                                            /**
+                                             * An array of the second instance's command line arguments
+                                             */
+                                            argv: string[],
+                                            /**
+                                             * The second instance's working directory
+                                             */
+                                            workingDirectory: string,
+                                            /**
+                                             * A JSON object of additional data passed from the second instance
+                                             */
+                                            additionalData: unknown) => void): this;
+    /**
+     * Emitted when a client certificate is requested.
+     *
+     * The `url` corresponds to the navigation entry requesting the client certificate
+     * and `callback` can be called with an entry filtered from the list. Using
+     * `event.preventDefault()` prevents the application from using the first
+     * certificate from the store.
+     */
+    on(event: 'select-client-certificate', listener: (event: Event,
+                                                      webContents: WebContents,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate?: Certificate) => void) => void): this;
+    once(event: 'select-client-certificate', listener: (event: Event,
+                                                      webContents: WebContents,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate?: Certificate) => void) => void): this;
+    addListener(event: 'select-client-certificate', listener: (event: Event,
+                                                      webContents: WebContents,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate?: Certificate) => void) => void): this;
+    removeListener(event: 'select-client-certificate', listener: (event: Event,
+                                                      webContents: WebContents,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate?: Certificate) => void) => void): this;
+    /**
+     * Emitted when Electron has created a new `session`.
+     */
+    on(event: 'session-created', listener: (session: Session) => void): this;
+    once(event: 'session-created', listener: (session: Session) => void): this;
+    addListener(event: 'session-created', listener: (session: Session) => void): this;
+    removeListener(event: 'session-created', listener: (session: Session) => void): this;
+    /**
+     * Emitted when Handoff is about to be resumed on another device. If you need to
+     * update the state to be transferred, you should call `event.preventDefault()`
+     * immediately, construct a new `userInfo` dictionary and call
+     * `app.updateCurrentActivity()` in a timely manner. Otherwise, the operation will
+     * fail and `continue-activity-error` will be called.
+     *
+     * @platform darwin
+     */
+    on(event: 'update-activity-state', listener: (event: Event,
+                                                  /**
+                                                   * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                   */
+                                                  type: string,
+                                                  /**
+                                                   * Contains app-specific state stored by the activity.
+                                                   */
+                                                  userInfo: unknown) => void): this;
+    once(event: 'update-activity-state', listener: (event: Event,
+                                                  /**
+                                                   * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                   */
+                                                  type: string,
+                                                  /**
+                                                   * Contains app-specific state stored by the activity.
+                                                   */
+                                                  userInfo: unknown) => void): this;
+    addListener(event: 'update-activity-state', listener: (event: Event,
+                                                  /**
+                                                   * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                   */
+                                                  type: string,
+                                                  /**
+                                                   * Contains app-specific state stored by the activity.
+                                                   */
+                                                  userInfo: unknown) => void): this;
+    removeListener(event: 'update-activity-state', listener: (event: Event,
+                                                  /**
+                                                   * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                   */
+                                                  type: string,
+                                                  /**
+                                                   * Contains app-specific state stored by the activity.
+                                                   */
+                                                  userInfo: unknown) => void): this;
+    /**
+     * Emitted when a new webContents is created.
+     */
+    on(event: 'web-contents-created', listener: (event: Event,
+                                                 webContents: WebContents) => void): this;
+    once(event: 'web-contents-created', listener: (event: Event,
+                                                 webContents: WebContents) => void): this;
+    addListener(event: 'web-contents-created', listener: (event: Event,
+                                                 webContents: WebContents) => void): this;
+    removeListener(event: 'web-contents-created', listener: (event: Event,
+                                                 webContents: WebContents) => void): this;
+    /**
+     * Emitted during Handoff before an activity from a different device wants to be
+     * resumed. You should call `event.preventDefault()` if you want to handle this
+     * event.
+     *
+     * @platform darwin
+     */
+    on(event: 'will-continue-activity', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string) => void): this;
+    once(event: 'will-continue-activity', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string) => void): this;
+    addListener(event: 'will-continue-activity', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string) => void): this;
+    removeListener(event: 'will-continue-activity', listener: (event: Event,
+                                                   /**
+                                                    * A string identifying the activity. Maps to `NSUserActivity.activityType`.
+                                                    */
+                                                   type: string) => void): this;
+    /**
+     * Emitted when the application has finished basic startup. On Windows and Linux,
+     * the `will-finish-launching` event is the same as the `ready` event; on macOS,
+     * this event represents the `applicationWillFinishLaunching` notification of
+     * `NSApplication`. You would usually set up listeners for the `open-file` and
+     * `open-url` events here, and start the crash reporter and auto updater.
+     *
+     * In most cases, you should do everything in the `ready` event handler.
+     */
+    on(event: 'will-finish-launching', listener: Function): this;
+    once(event: 'will-finish-launching', listener: Function): this;
+    addListener(event: 'will-finish-launching', listener: Function): this;
+    removeListener(event: 'will-finish-launching', listener: Function): this;
+    /**
+     * Emitted when all windows have been closed and the application will quit. Calling
+     * `event.preventDefault()` will prevent the default behavior, which is terminating
+     * the application.
+     *
+     * See the description of the `window-all-closed` event for the differences between
+     * the `will-quit` and `window-all-closed` events.
+     *
+     * **Note:** On Windows, this event will not be emitted if the app is closed due to
+     * a shutdown/restart of the system or a user logout.
+     */
+    on(event: 'will-quit', listener: (event: Event) => void): this;
+    once(event: 'will-quit', listener: (event: Event) => void): this;
+    addListener(event: 'will-quit', listener: (event: Event) => void): this;
+    removeListener(event: 'will-quit', listener: (event: Event) => void): this;
+    /**
+     * Emitted when all windows have been closed.
+     *
+     * If you do not subscribe to this event and all windows are closed, the default
+     * behavior is to quit the app; however, if you subscribe, you control whether the
+     * app quits or not. If the user pressed `Cmd + Q`, or the developer called
+     * `app.quit()`, Electron will first try to close all the windows and then emit the
+     * `will-quit` event, and in this case the `window-all-closed` event would not be
+     * emitted.
+     */
+    on(event: 'window-all-closed', listener: Function): this;
+    once(event: 'window-all-closed', listener: Function): this;
+    addListener(event: 'window-all-closed', listener: Function): this;
+    removeListener(event: 'window-all-closed', listener: Function): this;
+    /**
+     * Adds `path` to the recent documents list.
+     *
+     * This list is managed by the OS. On Windows, you can visit the list from the task
+     * bar, and on macOS, you can visit it from dock menu.
+     *
+     * @platform darwin,win32
+     */
+    addRecentDocument(path: string): void;
+    /**
+     * Clears the recent documents list.
+     *
+     * @platform darwin,win32
+     */
+    clearRecentDocuments(): void;
+    /**
+     * Configures host resolution (DNS and DNS-over-HTTPS). By default, the following
+     * resolvers will be used, in order:
+     *
+     * * DNS-over-HTTPS, if the DNS provider supports it, then
+     * * the built-in resolver (enabled on macOS only by default), then
+     * * the system's resolver (e.g. `getaddrinfo`).
+     *
+     * This can be configured to either restrict usage of non-encrypted DNS
+     * (`secureDnsMode: "secure"`), or disable DNS-over-HTTPS (`secureDnsMode: "off"`).
+     * It is also possible to enable or disable the built-in resolver.
+     *
+     * To disable insecure DNS, you can specify a `secureDnsMode` of `"secure"`. If you
+     * do so, you should make sure to provide a list of DNS-over-HTTPS servers to use,
+     * in case the user's DNS configuration does not include a provider that supports
+     * DoH.
+     *
+     * This API must be called after the `ready` event is emitted.
+     */
+    configureHostResolver(options: ConfigureHostResolverOptions): void;
+    /**
+     * By default, Chromium disables 3D APIs (e.g. WebGL) until restart on a per domain
+     * basis if the GPU processes crashes too frequently. This function disables that
+     * behavior.
+     *
+     * This method can only be called before app is ready.
+     */
+    disableDomainBlockingFor3DAPIs(): void;
+    /**
+     * Disables hardware acceleration for current app.
+     *
+     * This method can only be called before app is ready.
+     */
+    disableHardwareAcceleration(): void;
+    /**
+     * Enables full sandbox mode on the app. This means that all renderers will be
+     * launched sandboxed, regardless of the value of the `sandbox` flag in
+     * WebPreferences.
+     *
+     * This method can only be called before app is ready.
+     */
+    enableSandbox(): void;
+    /**
+     * Exits immediately with `exitCode`. `exitCode` defaults to 0.
+     *
+     * All windows will be closed immediately without asking the user, and the
+     * `before-quit` and `will-quit` events will not be emitted.
+     */
+    exit(exitCode?: number): void;
+    /**
+     * On Linux, focuses on the first visible window. On macOS, makes the application
+     * the active app. On Windows, focuses on the application's first window.
+     *
+     * You should seek to use the `steal` option as sparingly as possible.
+     */
+    focus(options?: FocusOptions): void;
+    /**
+     * Resolve with an object containing the following:
+     *
+     * * `icon` NativeImage - the display icon of the app handling the protocol.
+     * * `path` string  - installation path of the app handling the protocol.
+     * * `name` string - display name of the app handling the protocol.
+     *
+     * This method returns a promise that contains the application name, icon and path
+     * of the default handler for the protocol (aka URI scheme) of a URL.
+     *
+     * @platform darwin,win32
+     */
+    getApplicationInfoForProtocol(url: string): Promise<Electron.ApplicationInfoForProtocolReturnValue>;
+    /**
+     * Name of the application handling the protocol, or an empty string if there is no
+     * handler. For instance, if Electron is the default handler of the URL, this could
+     * be `Electron` on Windows and Mac. However, don't rely on the precise format
+     * which is not guaranteed to remain unchanged. Expect a different format on Linux,
+     * possibly with a `.desktop` suffix.
+     *
+     * This method returns the application name of the default handler for the protocol
+     * (aka URI scheme) of a URL.
+     */
+    getApplicationNameForProtocol(url: string): string;
+    /**
+     * Array of `ProcessMetric` objects that correspond to memory and CPU usage
+     * statistics of all the processes associated with the app.
+     */
+    getAppMetrics(): ProcessMetric[];
+    /**
+     * The current application directory.
+     */
+    getAppPath(): string;
+    /**
+     * The current value displayed in the counter badge.
+     *
+     * @platform linux,darwin
+     */
+    getBadgeCount(): number;
+    /**
+     * The type of the currently running activity.
+     *
+     * @platform darwin
+     */
+    getCurrentActivityType(): string;
+    /**
+     * fulfilled with the app's icon, which is a NativeImage.
+     *
+     * Fetches a path's associated icon.
+     *
+     * On _Windows_, there a 2 kinds of icons:
+     *
+     * * Icons associated with certain file extensions, like `.mp3`, `.png`, etc.
+     * * Icons inside the file itself, like `.exe`, `.dll`, `.ico`.
+     *
+     * On _Linux_ and _macOS_, icons depend on the application associated with file
+     * mime type.
+     */
+    getFileIcon(path: string, options?: FileIconOptions): Promise<Electron.NativeImage>;
+    /**
+     * The Graphics Feature Status from `chrome://gpu/`.
+     *
+     * **Note:** This information is only usable after the `gpu-info-update` event is
+     * emitted.
+     */
+    getGPUFeatureStatus(): GPUFeatureStatus;
+    /**
+     * For `infoType` equal to `complete`: Promise is fulfilled with `Object`
+     * containing all the GPU Information as in chromium's GPUInfo object. This
+     * includes the version and driver information that's shown on `chrome://gpu` page.
+     *
+     * For `infoType` equal to `basic`: Promise is fulfilled with `Object` containing
+     * fewer attributes than when requested with `complete`. Here's an example of basic
+     * response:
+     *
+     * Using `basic` should be preferred if only basic information like `vendorId` or
+     * `driverId` is needed.
+     */
+    getGPUInfo(infoType: 'basic' | 'complete'): Promise<unknown>;
+    /**
+     * * `minItems` Integer - The minimum number of items that will be shown in the
+     * Jump List (for a more detailed description of this value see the MSDN docs).
+     * * `removedItems` JumpListItem[] - Array of `JumpListItem` objects that
+     * correspond to items that the user has explicitly removed from custom categories
+     * in the Jump List. These items must not be re-added to the Jump List in the
+     * **next** call to `app.setJumpList()`, Windows will not display any custom
+     * category that contains any of the removed items.
+     *
+     * @platform win32
+     */
+    getJumpListSettings(): JumpListSettings;
+    /**
+     * The current application locale, fetched using Chromium's `l10n_util` library.
+     * Possible return values are documented here.
+     *
+     * To set the locale, you'll want to use a command line switch at app startup,
+     * which may be found here.
+     *
+     * **Note:** When distributing your packaged app, you have to also ship the
+     * `locales` folder.
+     *
+     * **Note:** This API must be called after the `ready` event is emitted.
+     */
+    getLocale(): string;
+    /**
+     * User operating system's locale two-letter ISO 3166 country code. The value is
+     * taken from native OS APIs.
+     *
+     * **Note:** When unable to detect locale country code, it returns empty string.
+     */
+    getLocaleCountryCode(): string;
+    /**
+     * If you provided `path` and `args` options to `app.setLoginItemSettings`, then
+     * you need to pass the same arguments here for `openAtLogin` to be set correctly.
+     *
+     *
+     * * `openAtLogin` boolean - `true` if the app is set to open at login.
+     * * `openAsHidden` boolean _macOS_ - `true` if the app is set to open as hidden at
+     * login. This setting is not available on MAS builds.
+     * * `wasOpenedAtLogin` boolean _macOS_ - `true` if the app was opened at login
+     * automatically. This setting is not available on MAS builds.
+     * * `wasOpenedAsHidden` boolean _macOS_ - `true` if the app was opened as a hidden
+     * login item. This indicates that the app should not open any windows at startup.
+     * This setting is not available on MAS builds.
+     * * `restoreState` boolean _macOS_ - `true` if the app was opened as a login item
+     * that should restore the state from the previous session. This indicates that the
+     * app should restore the windows that were open the last time the app was closed.
+     * This setting is not available on MAS builds.
+     * * `executableWillLaunchAtLogin` boolean _Windows_ - `true` if app is set to open
+     * at login and its run key is not deactivated. This differs from `openAtLogin` as
+     * it ignores the `args` option, this property will be true if the given executable
+     * would be launched at login with **any** arguments.
+     * * `launchItems` Object[] _Windows_
+     *   * `name` string _Windows_ - name value of a registry entry.
+     *   * `path` string _Windows_ - The executable to an app that corresponds to a
+     * registry entry.
+     *   * `args` string[] _Windows_ - the command-line arguments to pass to the
+     * executable.
+     *   * `scope` string _Windows_ - one of `user` or `machine`. Indicates whether the
+     * registry entry is under `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
+     *   * `enabled` boolean _Windows_ - `true` if the app registry key is startup
+     * approved and therefore shows as `enabled` in Task Manager and Windows settings.
+     *
+     * @platform darwin,win32
+     */
+    getLoginItemSettings(options?: LoginItemSettingsOptions): LoginItemSettings;
+    /**
+     * The current application's name, which is the name in the application's
+     * `package.json` file.
+     *
+     * Usually the `name` field of `package.json` is a short lowercase name, according
+     * to the npm modules spec. You should usually also specify a `productName` field,
+     * which is your application's full capitalized name, and which will be preferred
+     * over `name` by Electron.
+     */
+    getName(): string;
+    /**
+     * A path to a special directory or file associated with `name`. On failure, an
+     * `Error` is thrown.
+     *
+     * If `app.getPath('logs')` is called without called `app.setAppLogsPath()` being
+     * called first, a default log directory will be created equivalent to calling
+     * `app.setAppLogsPath()` without a `path` parameter.
+     */
+    getPath(name: 'home' | 'appData' | 'userData' | 'sessionData' | 'temp' | 'exe' | 'module' | 'desktop' | 'documents' | 'downloads' | 'music' | 'pictures' | 'videos' | 'recent' | 'logs' | 'crashDumps'): string;
+    /**
+     * The current system locale. On Windows and Linux, it is fetched using Chromium's
+     * `i18n` library. On macOS, the `NSLocale` object is used instead.
+     *
+     * **Note:** This API must be called after the `ready` event is emitted.
+     */
+    getSystemLocale(): string;
+    /**
+     * The version of the loaded application. If no version is found in the
+     * application's `package.json` file, the version of the current bundle or
+     * executable is returned.
+     */
+    getVersion(): string;
+    /**
+     * This method returns whether or not this instance of your app is currently
+     * holding the single instance lock.  You can request the lock with
+     * `app.requestSingleInstanceLock()` and release with
+     * `app.releaseSingleInstanceLock()`
+     */
+    hasSingleInstanceLock(): boolean;
+    /**
+     * Hides all application windows without minimizing them.
+     *
+     * @platform darwin
+     */
+    hide(): void;
+    /**
+     * Imports the certificate in pkcs12 format into the platform certificate store.
+     * `callback` is called with the `result` of import operation, a value of `0`
+     * indicates success while any other value indicates failure according to Chromium
+     * net_error_list.
+     *
+     * @platform linux
+     */
+    importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
+    /**
+     * Invalidates the current Handoff user activity.
+     *
+     * @platform darwin
+     */
+    invalidateCurrentActivity(): void;
+    /**
+     * `true` if Chrome's accessibility support is enabled, `false` otherwise. This API
+     * will return `true` if the use of assistive technologies, such as screen readers,
+     * has been detected. See
+     * https://www.chromium.org/developers/design-documents/accessibility for more
+     * details.
+     *
+     * @platform darwin,win32
+     */
+    isAccessibilitySupportEnabled(): boolean;
+    /**
+     * Whether the current executable is the default handler for a protocol (aka URI
+     * scheme).
+     *
+     * **Note:** On macOS, you can use this method to check if the app has been
+     * registered as the default protocol handler for a protocol. You can also verify
+     * this by checking `~/Library/Preferences/com.apple.LaunchServices.plist` on the
+     * macOS machine. Please refer to Apple's documentation for details.
+     *
+     * The API uses the Windows Registry and `LSCopyDefaultHandlerForURLScheme`
+     * internally.
+     */
+    isDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
+    /**
+     * whether or not the current OS version allows for native emoji pickers.
+     */
+    isEmojiPanelSupported(): boolean;
+    /**
+     * `true` if the application—including all of its windows—is hidden (e.g. with
+     * `Command-H`), `false` otherwise.
+     *
+     * @platform darwin
+     */
+    isHidden(): boolean;
+    /**
+     * Whether the application is currently running from the systems Application
+     * folder. Use in combination with `app.moveToApplicationsFolder()`
+     *
+     * @platform darwin
+     */
+    isInApplicationsFolder(): boolean;
+    /**
+     * `true` if Electron has finished initializing, `false` otherwise. See also
+     * `app.whenReady()`.
+     */
+    isReady(): boolean;
+    /**
+     * whether `Secure Keyboard Entry` is enabled.
+     *
+     * By default this API will return `false`.
+     *
+     * @platform darwin
+     */
+    isSecureKeyboardEntryEnabled(): boolean;
+    /**
+     * Whether the current desktop environment is Unity launcher.
+     *
+     * @platform linux
+     */
+    isUnityRunning(): boolean;
+    /**
+     * Whether the move was successful. Please note that if the move is successful,
+     * your application will quit and relaunch.
+     *
+     * No confirmation dialog will be presented by default. If you wish to allow the
+     * user to confirm the operation, you may do so using the `dialog` API.
+     *
+     * **NOTE:** This method throws errors if anything other than the user causes the
+     * move to fail. For instance if the user cancels the authorization dialog, this
+     * method returns false. If we fail to perform the copy, then this method will
+     * throw an error. The message in the error should be informative and tell you
+     * exactly what went wrong.
+     *
+     * By default, if an app of the same name as the one being moved exists in the
+     * Applications directory and is _not_ running, the existing app will be trashed
+     * and the active app moved into its place. If it _is_ running, the preexisting
+     * running app will assume focus and the previously active app will quit itself.
+     * This behavior can be changed by providing the optional conflict handler, where
+     * the boolean returned by the handler determines whether or not the move conflict
+     * is resolved with default behavior.  i.e. returning `false` will ensure no
+     * further action is taken, returning `true` will result in the default behavior
+     * and the method continuing.
+     *
+     * For example:
+     *
+     * Would mean that if an app already exists in the user directory, if the user
+     * chooses to 'Continue Move' then the function would continue with its default
+     * behavior and the existing app will be trashed and the active app moved into its
+     * place.
+     *
+     * @platform darwin
+     */
+    moveToApplicationsFolder(options?: MoveToApplicationsFolderOptions): boolean;
+    /**
+     * Try to close all windows. The `before-quit` event will be emitted first. If all
+     * windows are successfully closed, the `will-quit` event will be emitted and by
+     * default the application will terminate.
+     *
+     * This method guarantees that all `beforeunload` and `unload` event handlers are
+     * correctly executed. It is possible that a window cancels the quitting by
+     * returning `false` in the `beforeunload` event handler.
+     */
+    quit(): void;
+    /**
+     * Relaunches the app when current instance exits.
+     *
+     * By default, the new instance will use the same working directory and command
+     * line arguments with current instance. When `args` is specified, the `args` will
+     * be passed as command line arguments instead. When `execPath` is specified, the
+     * `execPath` will be executed for relaunch instead of current app.
+     *
+     * Note that this method does not quit the app when executed, you have to call
+     * `app.quit` or `app.exit` after calling `app.relaunch` to make the app restart.
+     *
+     * When `app.relaunch` is called for multiple times, multiple instances will be
+     * started after current instance exited.
+     *
+     * An example of restarting current instance immediately and adding a new command
+     * line argument to the new instance:
+     */
+    relaunch(options?: RelaunchOptions): void;
+    /**
+     * Releases all locks that were created by `requestSingleInstanceLock`. This will
+     * allow multiple instances of the application to once again run side by side.
+     */
+    releaseSingleInstanceLock(): void;
+    /**
+     * Whether the call succeeded.
+     *
+     * This method checks if the current executable as the default handler for a
+     * protocol (aka URI scheme). If so, it will remove the app as the default handler.
+     *
+     * @platform darwin,win32
+     */
+    removeAsDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
+    /**
+     * The return value of this method indicates whether or not this instance of your
+     * application successfully obtained the lock.  If it failed to obtain the lock,
+     * you can assume that another instance of your application is already running with
+     * the lock and exit immediately.
+     *
+     * I.e. This method returns `true` if your process is the primary instance of your
+     * application and your app should continue loading.  It returns `false` if your
+     * process should immediately quit as it has sent its parameters to another
+     * instance that has already acquired the lock.
+     *
+     * On macOS, the system enforces single instance automatically when users try to
+     * open a second instance of your app in Finder, and the `open-file` and `open-url`
+     * events will be emitted for that. However when users start your app in command
+     * line, the system's single instance mechanism will be bypassed, and you have to
+     * use this method to ensure single instance.
+     *
+     * An example of activating the window of primary instance when a second instance
+     * starts:
+     */
+    requestSingleInstanceLock(additionalData?: Record<any, any>): boolean;
+    /**
+     * Marks the current Handoff user activity as inactive without invalidating it.
+     *
+     * @platform darwin
+     */
+    resignCurrentActivity(): void;
+    /**
+     * Set the about panel options. This will override the values defined in the app's
+     * `.plist` file on macOS. See the Apple docs for more details. On Linux, values
+     * must be set in order to be shown; there are no defaults.
+     *
+     * If you do not set `credits` but still wish to surface them in your app, AppKit
+     * will look for a file named "Credits.html", "Credits.rtf", and "Credits.rtfd", in
+     * that order, in the bundle returned by the NSBundle class method main. The first
+     * file found is used, and if none is found, the info area is left blank. See Apple
+     * documentation for more information.
+     */
+    setAboutPanelOptions(options: AboutPanelOptionsOptions): void;
+    /**
+     * Manually enables Chrome's accessibility support, allowing to expose
+     * accessibility switch to users in application settings. See Chromium's
+     * accessibility docs for more details. Disabled by default.
+     *
+     * This API must be called after the `ready` event is emitted.
+     *
+     * **Note:** Rendering accessibility tree can significantly affect the performance
+     * of your app. It should not be enabled by default.
+     *
+     * @platform darwin,win32
+     */
+    setAccessibilitySupportEnabled(enabled: boolean): void;
+    /**
+     * Sets the activation policy for a given app.
+     *
+     * Activation policy types:
+     *
+     * * 'regular' - The application is an ordinary app that appears in the Dock and
+     * may have a user interface.
+     * * 'accessory' - The application doesn’t appear in the Dock and doesn’t have a
+     * menu bar, but it may be activated programmatically or by clicking on one of its
+     * windows.
+     * * 'prohibited' - The application doesn’t appear in the Dock and may not create
+     * windows or be activated.
+     *
+     * @platform darwin
+     */
+    setActivationPolicy(policy: 'regular' | 'accessory' | 'prohibited'): void;
+    /**
+     * Sets or creates a directory your app's logs which can then be manipulated with
+     * `app.getPath()` or `app.setPath(pathName, newPath)`.
+     *
+     * Calling `app.setAppLogsPath()` without a `path` parameter will result in this
+     * directory being set to `~/Library/Logs/YourAppName` on _macOS_, and inside the
+     * `userData` directory on _Linux_ and _Windows_.
+     */
+    setAppLogsPath(path?: string): void;
+    /**
+     * Changes the Application User Model ID to `id`.
+     *
+     * @platform win32
+     */
+    setAppUserModelId(id: string): void;
+    /**
+     * Whether the call succeeded.
+     *
+     * Sets the current executable as the default handler for a protocol (aka URI
+     * scheme). It allows you to integrate your app deeper into the operating system.
+     * Once registered, all links with `your-protocol://` will be opened with the
+     * current executable. The whole link, including protocol, will be passed to your
+     * application as a parameter.
+     *
+     * **Note:** On macOS, you can only register protocols that have been added to your
+     * app's `info.plist`, which cannot be modified at runtime. However, you can change
+     * the file during build time via Electron Forge, Electron Packager, or by editing
+     * `info.plist` with a text editor. Please refer to Apple's documentation for
+     * details.
+     *
+     * **Note:** In a Windows Store environment (when packaged as an `appx`) this API
+     * will return `true` for all calls but the registry key it sets won't be
+     * accessible by other applications.  In order to register your Windows Store
+     * application as a default protocol handler you must declare the protocol in your
+     * manifest.
+     *
+     * The API uses the Windows Registry and `LSSetDefaultHandlerForURLScheme`
+     * internally.
+     */
+    setAsDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
+    /**
+     * Whether the call succeeded.
+     *
+     * Sets the counter badge for current app. Setting the count to `0` will hide the
+     * badge.
+     *
+     * On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
+     *
+     * **Note:** Unity launcher requires a `.desktop` file to work. For more
+     * information, please read the Unity integration documentation.
+     *
+     * @platform linux,darwin
+     */
+    setBadgeCount(count?: number): boolean;
+    /**
+     * Sets or removes a custom Jump List for the application, and returns one of the
+     * following strings:
+     *
+     * * `ok` - Nothing went wrong.
+     * * `error` - One or more errors occurred, enable runtime logging to figure out
+     * the likely cause.
+     * * `invalidSeparatorError` - An attempt was made to add a separator to a custom
+     * category in the Jump List. Separators are only allowed in the standard `Tasks`
+     * category.
+     * * `fileTypeRegistrationError` - An attempt was made to add a file link to the
+     * Jump List for a file type the app isn't registered to handle.
+     * * `customCategoryAccessDeniedError` - Custom categories can't be added to the
+     * Jump List due to user privacy or group policy settings.
+     *
+     * If `categories` is `null` the previously set custom Jump List (if any) will be
+     * replaced by the standard Jump List for the app (managed by Windows).
+     *
+     * **Note:** If a `JumpListCategory` object has neither the `type` nor the `name`
+     * property set then its `type` is assumed to be `tasks`. If the `name` property is
+     * set but the `type` property is omitted then the `type` is assumed to be
+     * `custom`.
+     *
+     * **Note:** Users can remove items from custom categories, and Windows will not
+     * allow a removed item to be added back into a custom category until **after** the
+     * next successful call to `app.setJumpList(categories)`. Any attempt to re-add a
+     * removed item to a custom category earlier than that will result in the entire
+     * custom category being omitted from the Jump List. The list of removed items can
+     * be obtained using `app.getJumpListSettings()`.
+     *
+     * **Note:** The maximum length of a Jump List item's `description` property is 260
+     * characters. Beyond this limit, the item will not be added to the Jump List, nor
+     * will it be displayed.
+     *
+     * Here's a very simple example of creating a custom Jump List:
+     *
+     * @platform win32
+     */
+    setJumpList(categories: (JumpListCategory[]) | (null)): ('ok' | 'error' | 'invalidSeparatorError' | 'fileTypeRegistrationError' | 'customCategoryAccessDeniedError');
+    /**
+     * To work with Electron's `autoUpdater` on Windows, which uses Squirrel, you'll
+     * want to set the launch path to Update.exe, and pass arguments that specify your
+     * application name. For example:
+     *
+     * @platform darwin,win32
+     */
+    setLoginItemSettings(settings: Settings): void;
+    /**
+     * Overrides the current application's name.
+     *
+     * **Note:** This function overrides the name used internally by Electron; it does
+     * not affect the name that the OS uses.
+     */
+    setName(name: string): void;
+    /**
+     * Overrides the `path` to a special directory or file associated with `name`. If
+     * the path specifies a directory that does not exist, an `Error` is thrown. In
+     * that case, the directory should be created with `fs.mkdirSync` or similar.
+     *
+     * You can only override paths of a `name` defined in `app.getPath`.
+     *
+     * By default, web pages' cookies and caches will be stored under the `sessionData`
+     * directory. If you want to change this location, you have to override the
+     * `sessionData` path before the `ready` event of the `app` module is emitted.
+     */
+    setPath(name: string, path: string): void;
+    /**
+     * Set the `Secure Keyboard Entry` is enabled in your application.
+     *
+     * By using this API, important information such as password and other sensitive
+     * information can be prevented from being intercepted by other processes.
+     *
+     * See Apple's documentation for more details.
+     *
+     * **Note:** Enable `Secure Keyboard Entry` only when it is needed and disable it
+     * when it is no longer needed.
+     *
+     * @platform darwin
+     */
+    setSecureKeyboardEntryEnabled(enabled: boolean): void;
+    /**
+     * Creates an `NSUserActivity` and sets it as the current activity. The activity is
+     * eligible for Handoff to another device afterward.
+     *
+     * @platform darwin
+     */
+    setUserActivity(type: string, userInfo: any, webpageURL?: string): void;
+    /**
+     * Adds `tasks` to the Tasks category of the Jump List on Windows.
+     *
+     * `tasks` is an array of `Task` objects.
+     *
+     * Whether the call succeeded.
+     *
+     * **Note:** If you'd like to customize the Jump List even more use
+     * `app.setJumpList(categories)` instead.
+     *
+     * @platform win32
+     */
+    setUserTasks(tasks: Task[]): boolean;
+    /**
+     * Shows application windows after they were hidden. Does not automatically focus
+     * them.
+     *
+     * @platform darwin
+     */
+    show(): void;
+    /**
+     * Show the app's about panel options. These options can be overridden with
+     * `app.setAboutPanelOptions(options)`.
+     */
+    showAboutPanel(): void;
+    /**
+     * Show the platform's native emoji picker.
+     *
+     * @platform darwin,win32
+     */
+    showEmojiPanel(): void;
+    /**
+     * This function **must** be called once you have finished accessing the security
+     * scoped file. If you do not remember to stop accessing the bookmark, kernel
+     * resources will be leaked and your app will lose its ability to reach outside the
+     * sandbox completely, until your app is restarted.
+     *
+     * Start accessing a security scoped resource. With this method Electron
+     * applications that are packaged for the Mac App Store may reach outside their
+     * sandbox to access files chosen by the user. See Apple's documentation for a
+     * description of how this system works.
+     *
+     * @platform mas
+     */
+    startAccessingSecurityScopedResource(bookmarkData: string): Function;
+    /**
+     * Updates the current activity if its type matches `type`, merging the entries
+     * from `userInfo` into its current `userInfo` dictionary.
+     *
+     * @platform darwin
+     */
+    updateCurrentActivity(type: string, userInfo: any): void;
+    /**
+     * fulfilled when Electron is initialized. May be used as a convenient alternative
+     * to checking `app.isReady()` and subscribing to the `ready` event if the app is
+     * not ready yet.
+     */
+    whenReady(): Promise<void>;
+    /**
+     * A `boolean` property that's `true` if Chrome's accessibility support is enabled,
+     * `false` otherwise. This property will be `true` if the use of assistive
+     * technologies, such as screen readers, has been detected. Setting this property
+     * to `true` manually enables Chrome's accessibility support, allowing developers
+     * to expose accessibility switch to users in application settings.
+     *
+     * See Chromium's accessibility docs for more details. Disabled by default.
+     *
+     * This API must be called after the `ready` event is emitted.
+     *
+     * **Note:** Rendering accessibility tree can significantly affect the performance
+     * of your app. It should not be enabled by default.
+     *
+     * @platform darwin,win32
+     */
+    accessibilitySupportEnabled: boolean;
+    /**
+     * A `Menu | null` property that returns `Menu` if one has been set and `null`
+     * otherwise. Users can pass a Menu to set this property.
+     */
+    applicationMenu: (Menu) | (null);
+    /**
+     * An `Integer` property that returns the badge count for current app. Setting the
+     * count to `0` will hide the badge.
+     *
+     * On macOS, setting this with any nonzero integer shows on the dock icon. On
+     * Linux, this property only works for Unity launcher.
+     *
+     * **Note:** Unity launcher requires a `.desktop` file to work. For more
+     * information, please read the Unity integration documentation.
+     *
+     * **Note:** On macOS, you need to ensure that your application has the permission
+     * to display notifications for this property to take effect.
+     *
+     * @platform linux,darwin
+     */
+    badgeCount: number;
+    /**
+     * A `CommandLine` object that allows you to read and manipulate the command line
+     * arguments that Chromium uses.
+     *
+     */
+    readonly commandLine: CommandLine;
+    /**
+     * A `Dock` `| undefined` object that allows you to perform actions on your app
+     * icon in the user's dock on macOS.
+     *
+     * @platform darwin
+     */
+    readonly dock: Dock;
+    /**
+     * A `boolean` property that returns  `true` if the app is packaged, `false`
+     * otherwise. For many apps, this property can be used to distinguish development
+     * and production environments.
+     *
+     */
+    readonly isPackaged: boolean;
+    /**
+     * A `string` property that indicates the current application's name, which is the
+     * name in the application's `package.json` file.
+     *
+     * Usually the `name` field of `package.json` is a short lowercase name, according
+     * to the npm modules spec. You should usually also specify a `productName` field,
+     * which is your application's full capitalized name, and which will be preferred
+     * over `name` by Electron.
+     */
+    name: string;
+    /**
+     * A `boolean` which when `true` indicates that the app is currently running under
+     * an ARM64 translator (like the macOS Rosetta Translator Environment or Windows
+     * WOW).
+     *
+     * You can use this property to prompt users to download the arm64 version of your
+     * application when they are running the x64 version under Rosetta incorrectly.
+     *
+     * @platform darwin,win32
+     */
+    readonly runningUnderARM64Translation: boolean;
+    /**
+     * A `boolean` which when `true` indicates that the app is currently running under
+     * the Rosetta Translator Environment.
+     *
+     * You can use this property to prompt users to download the arm64 version of your
+     * application when they are running the x64 version under Rosetta incorrectly.
+     *
+     * **Deprecated:** This property is superceded by the
+     * `runningUnderARM64Translation` property which detects when the app is being
+     * translated to ARM64 in both macOS and Windows.
+     *
+     * @deprecated
+     * @platform darwin
+     */
+    readonly runningUnderRosettaTranslation: boolean;
+    /**
+     * A `string` which is the user agent string Electron will use as a global
+     * fallback.
+     *
+     * This is the user agent that will be used when no user agent is set at the
+     * `webContents` or `session` level.  It is useful for ensuring that your entire
+     * app has the same user agent.  Set to a custom value as early as possible in your
+     * app's initialization to ensure that your overridden value is used.
+     */
+    userAgentFallback: string;
+  }
+
+  interface AutoUpdater extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/auto-updater
+
+    /**
+     * This event is emitted after a user calls `quitAndInstall()`.
+     *
+     * When this API is called, the `before-quit` event is not emitted before all
+     * windows are closed. As a result you should listen to this event if you wish to
+     * perform actions before the windows are closed while a process is quitting, as
+     * well as listening to `before-quit`.
+     */
+    on(event: 'before-quit-for-update', listener: Function): this;
+    once(event: 'before-quit-for-update', listener: Function): this;
+    addListener(event: 'before-quit-for-update', listener: Function): this;
+    removeListener(event: 'before-quit-for-update', listener: Function): this;
+    /**
+     * Emitted when checking if an update has started.
+     */
+    on(event: 'checking-for-update', listener: Function): this;
+    once(event: 'checking-for-update', listener: Function): this;
+    addListener(event: 'checking-for-update', listener: Function): this;
+    removeListener(event: 'checking-for-update', listener: Function): this;
+    /**
+     * Emitted when there is an error while updating.
+     */
+    on(event: 'error', listener: (error: Error) => void): this;
+    once(event: 'error', listener: (error: Error) => void): this;
+    addListener(event: 'error', listener: (error: Error) => void): this;
+    removeListener(event: 'error', listener: (error: Error) => void): this;
+    /**
+     * Emitted when there is an available update. The update is downloaded
+     * automatically.
+     */
+    on(event: 'update-available', listener: Function): this;
+    once(event: 'update-available', listener: Function): this;
+    addListener(event: 'update-available', listener: Function): this;
+    removeListener(event: 'update-available', listener: Function): this;
+    /**
+     * Emitted when an update has been downloaded.
+     *
+     * On Windows only `releaseName` is available.
+     *
+     * **Note:** It is not strictly necessary to handle this event. A successfully
+     * downloaded update will still be applied the next time the application starts.
+     */
+    on(event: 'update-downloaded', listener: (event: Event,
+                                              releaseNotes: string,
+                                              releaseName: string,
+                                              releaseDate: Date,
+                                              updateURL: string) => void): this;
+    once(event: 'update-downloaded', listener: (event: Event,
+                                              releaseNotes: string,
+                                              releaseName: string,
+                                              releaseDate: Date,
+                                              updateURL: string) => void): this;
+    addListener(event: 'update-downloaded', listener: (event: Event,
+                                              releaseNotes: string,
+                                              releaseName: string,
+                                              releaseDate: Date,
+                                              updateURL: string) => void): this;
+    removeListener(event: 'update-downloaded', listener: (event: Event,
+                                              releaseNotes: string,
+                                              releaseName: string,
+                                              releaseDate: Date,
+                                              updateURL: string) => void): this;
+    /**
+     * Emitted when there is no available update.
+     */
+    on(event: 'update-not-available', listener: Function): this;
+    once(event: 'update-not-available', listener: Function): this;
+    addListener(event: 'update-not-available', listener: Function): this;
+    removeListener(event: 'update-not-available', listener: Function): this;
+    /**
+     * Asks the server whether there is an update. You must call `setFeedURL` before
+     * using this API.
+     *
+     * **Note:** If an update is available it will be downloaded automatically. Calling
+     * `autoUpdater.checkForUpdates()` twice will download the update two times.
+     */
+    checkForUpdates(): void;
+    /**
+     * The current update feed URL.
+     */
+    getFeedURL(): string;
+    /**
+     * Restarts the app and installs the update after it has been downloaded. It should
+     * only be called after `update-downloaded` has been emitted.
+     *
+     * Under the hood calling `autoUpdater.quitAndInstall()` will close all application
+     * windows first, and automatically call `app.quit()` after all windows have been
+     * closed.
+     *
+     * **Note:** It is not strictly necessary to call this function to apply an update,
+     * as a successfully downloaded update will always be applied the next time the
+     * application starts.
+     */
+    quitAndInstall(): void;
+    /**
+     * Sets the `url` and initialize the auto updater.
+     */
+    setFeedURL(options: FeedURLOptions): void;
+  }
+
+  interface BluetoothDevice {
+
+    // Docs: https://electronjs.org/docs/api/structures/bluetooth-device
+
+    deviceId: string;
+    deviceName: string;
+  }
+
+  class BrowserView {
+
+    // Docs: https://electronjs.org/docs/api/browser-view
+
+    /**
+     * BrowserView
+     */
+    constructor(options?: BrowserViewConstructorOptions);
+    /**
+     * The `bounds` of this BrowserView instance as `Object`.
+     *
+     * @experimental
+     */
+    getBounds(): Rectangle;
+    setAutoResize(options: AutoResizeOptions): void;
+    /**
+     * Examples of valid `color` values:
+     *
+     * * Hex
+     *   * #fff (RGB)
+     *   * #ffff (ARGB)
+     *   * #ffffff (RRGGBB)
+     *   * #ffffffff (AARRGGBB)
+     * * RGB
+     *   * rgb(([\d]+),\s*([\d]+),\s*([\d]+))
+     *     * e.g. rgb(255, 255, 255)
+     * * RGBA
+     *   * rgba(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+))
+     *     * e.g. rgba(255, 255, 255, 1.0)
+     * * HSL
+     *   * hsl((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%)
+     *     * e.g. hsl(200, 20%, 50%)
+     * * HSLA
+     *   * hsla((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+))
+     *     * e.g. hsla(200, 20%, 50%, 0.5)
+     * * Color name
+     *   * Options are listed in SkParseColor.cpp
+     *   * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
+     *     * e.g. `blueviolet` or `red`
+     *
+     * **Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBA` or
+     * `RGA`.
+     *
+     * @experimental
+     */
+    setBackgroundColor(color: string): void;
+    /**
+     * Resizes and moves the view to the supplied bounds relative to the window.
+     *
+     * @experimental
+     */
+    setBounds(bounds: Rectangle): void;
+    /**
+     * A `WebContents` object owned by this view.
+     *
+     * @experimental
+     */
+    webContents: WebContents;
+  }
+
+  class BrowserWindow extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/browser-window
+
+    /**
+     * Emitted when the window is set or unset to show always on top of other windows.
+     */
+    on(event: 'always-on-top-changed', listener: (event: Event,
+                                                  isAlwaysOnTop: boolean) => void): this;
+    once(event: 'always-on-top-changed', listener: (event: Event,
+                                                  isAlwaysOnTop: boolean) => void): this;
+    addListener(event: 'always-on-top-changed', listener: (event: Event,
+                                                  isAlwaysOnTop: boolean) => void): this;
+    removeListener(event: 'always-on-top-changed', listener: (event: Event,
+                                                  isAlwaysOnTop: boolean) => void): this;
+    /**
+     * Emitted when an App Command is invoked. These are typically related to keyboard
+     * media keys or browser commands, as well as the "Back" button built into some
+     * mice on Windows.
+     *
+     * Commands are lowercased, underscores are replaced with hyphens, and the
+     * `APPCOMMAND_` prefix is stripped off. e.g. `APPCOMMAND_BROWSER_BACKWARD` is
+     * emitted as `browser-backward`.
+     *
+     * The following app commands are explicitly supported on Linux:
+     *
+     * * `browser-backward`
+     * * `browser-forward`
+     *
+     * @platform win32,linux
+     */
+    on(event: 'app-command', listener: (event: Event,
+                                        command: string) => void): this;
+    once(event: 'app-command', listener: (event: Event,
+                                        command: string) => void): this;
+    addListener(event: 'app-command', listener: (event: Event,
+                                        command: string) => void): this;
+    removeListener(event: 'app-command', listener: (event: Event,
+                                        command: string) => void): this;
+    /**
+     * Emitted when the window loses focus.
+     */
+    on(event: 'blur', listener: Function): this;
+    once(event: 'blur', listener: Function): this;
+    addListener(event: 'blur', listener: Function): this;
+    removeListener(event: 'blur', listener: Function): this;
+    /**
+     * Emitted when the window is going to be closed. It's emitted before the
+     * `beforeunload` and `unload` event of the DOM. Calling `event.preventDefault()`
+     * will cancel the close.
+     *
+     * Usually you would want to use the `beforeunload` handler to decide whether the
+     * window should be closed, which will also be called when the window is reloaded.
+     * In Electron, returning any value other than `undefined` would cancel the close.
+     * For example:
+     *
+     * _**Note**: There is a subtle difference between the behaviors of
+     * `window.onbeforeunload = handler` and `window.addEventListener('beforeunload',
+     * handler)`. It is recommended to always set the `event.returnValue` explicitly,
+     * instead of only returning a value, as the former works more consistently within
+     * Electron._
+     */
+    on(event: 'close', listener: (event: Event) => void): this;
+    once(event: 'close', listener: (event: Event) => void): this;
+    addListener(event: 'close', listener: (event: Event) => void): this;
+    removeListener(event: 'close', listener: (event: Event) => void): this;
+    /**
+     * Emitted when the window is closed. After you have received this event you should
+     * remove the reference to the window and avoid using it any more.
+     */
+    on(event: 'closed', listener: Function): this;
+    once(event: 'closed', listener: Function): this;
+    addListener(event: 'closed', listener: Function): this;
+    removeListener(event: 'closed', listener: Function): this;
+    /**
+     * Emitted when the window enters a full-screen state.
+     */
+    on(event: 'enter-full-screen', listener: Function): this;
+    once(event: 'enter-full-screen', listener: Function): this;
+    addListener(event: 'enter-full-screen', listener: Function): this;
+    removeListener(event: 'enter-full-screen', listener: Function): this;
+    /**
+     * Emitted when the window enters a full-screen state triggered by HTML API.
+     */
+    on(event: 'enter-html-full-screen', listener: Function): this;
+    once(event: 'enter-html-full-screen', listener: Function): this;
+    addListener(event: 'enter-html-full-screen', listener: Function): this;
+    removeListener(event: 'enter-html-full-screen', listener: Function): this;
+    /**
+     * Emitted when the window gains focus.
+     */
+    on(event: 'focus', listener: Function): this;
+    once(event: 'focus', listener: Function): this;
+    addListener(event: 'focus', listener: Function): this;
+    removeListener(event: 'focus', listener: Function): this;
+    /**
+     * Emitted when the window is hidden.
+     */
+    on(event: 'hide', listener: Function): this;
+    once(event: 'hide', listener: Function): this;
+    addListener(event: 'hide', listener: Function): this;
+    removeListener(event: 'hide', listener: Function): this;
+    /**
+     * Emitted when the window leaves a full-screen state.
+     */
+    on(event: 'leave-full-screen', listener: Function): this;
+    once(event: 'leave-full-screen', listener: Function): this;
+    addListener(event: 'leave-full-screen', listener: Function): this;
+    removeListener(event: 'leave-full-screen', listener: Function): this;
+    /**
+     * Emitted when the window leaves a full-screen state triggered by HTML API.
+     */
+    on(event: 'leave-html-full-screen', listener: Function): this;
+    once(event: 'leave-html-full-screen', listener: Function): this;
+    addListener(event: 'leave-html-full-screen', listener: Function): this;
+    removeListener(event: 'leave-html-full-screen', listener: Function): this;
+    /**
+     * Emitted when window is maximized.
+     */
+    on(event: 'maximize', listener: Function): this;
+    once(event: 'maximize', listener: Function): this;
+    addListener(event: 'maximize', listener: Function): this;
+    removeListener(event: 'maximize', listener: Function): this;
+    /**
+     * Emitted when the window is minimized.
+     */
+    on(event: 'minimize', listener: Function): this;
+    once(event: 'minimize', listener: Function): this;
+    addListener(event: 'minimize', listener: Function): this;
+    removeListener(event: 'minimize', listener: Function): this;
+    /**
+     * Emitted when the window is being moved to a new position.
+     */
+    on(event: 'move', listener: Function): this;
+    once(event: 'move', listener: Function): this;
+    addListener(event: 'move', listener: Function): this;
+    removeListener(event: 'move', listener: Function): this;
+    /**
+     * Emitted once when the window is moved to a new position.
+     *
+     * __Note__: On macOS this event is an alias of `move`.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'moved', listener: Function): this;
+    once(event: 'moved', listener: Function): this;
+    addListener(event: 'moved', listener: Function): this;
+    removeListener(event: 'moved', listener: Function): this;
+    /**
+     * Emitted when the native new tab button is clicked.
+     *
+     * @platform darwin
+     */
+    on(event: 'new-window-for-tab', listener: Function): this;
+    once(event: 'new-window-for-tab', listener: Function): this;
+    addListener(event: 'new-window-for-tab', listener: Function): this;
+    removeListener(event: 'new-window-for-tab', listener: Function): this;
+    /**
+     * Emitted when the document changed its title, calling `event.preventDefault()`
+     * will prevent the native window's title from changing. `explicitSet` is false
+     * when title is synthesized from file URL.
+     */
+    on(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    once(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    addListener(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    removeListener(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    /**
+     * Emitted when the web page has been rendered (while not being shown) and window
+     * can be displayed without a visual flash.
+     *
+     * Please note that using this event implies that the renderer will be considered
+     * "visible" and paint even though `show` is false.  This event will never fire if
+     * you use `paintWhenInitiallyHidden: false`
+     */
+    on(event: 'ready-to-show', listener: Function): this;
+    once(event: 'ready-to-show', listener: Function): this;
+    addListener(event: 'ready-to-show', listener: Function): this;
+    removeListener(event: 'ready-to-show', listener: Function): this;
+    /**
+     * Emitted after the window has been resized.
+     */
+    on(event: 'resize', listener: Function): this;
+    once(event: 'resize', listener: Function): this;
+    addListener(event: 'resize', listener: Function): this;
+    removeListener(event: 'resize', listener: Function): this;
+    /**
+     * Emitted once when the window has finished being resized.
+     *
+     * This is usually emitted when the window has been resized manually. On macOS,
+     * resizing the window with `setBounds`/`setSize` and setting the `animate`
+     * parameter to `true` will also emit this event once resizing has finished.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'resized', listener: Function): this;
+    once(event: 'resized', listener: Function): this;
+    addListener(event: 'resized', listener: Function): this;
+    removeListener(event: 'resized', listener: Function): this;
+    /**
+     * Emitted when the unresponsive web page becomes responsive again.
+     */
+    on(event: 'responsive', listener: Function): this;
+    once(event: 'responsive', listener: Function): this;
+    addListener(event: 'responsive', listener: Function): this;
+    removeListener(event: 'responsive', listener: Function): this;
+    /**
+     * Emitted when the window is restored from a minimized state.
+     */
+    on(event: 'restore', listener: Function): this;
+    once(event: 'restore', listener: Function): this;
+    addListener(event: 'restore', listener: Function): this;
+    removeListener(event: 'restore', listener: Function): this;
+    /**
+     * Emitted on trackpad rotation gesture. Continually emitted until rotation gesture
+     * is ended. The `rotation` value on each emission is the angle in degrees rotated
+     * since the last emission. The last emitted event upon a rotation gesture will
+     * always be of value `0`. Counter-clockwise rotation values are positive, while
+     * clockwise ones are negative.
+     *
+     * @platform darwin
+     */
+    on(event: 'rotate-gesture', listener: (event: Event,
+                                           rotation: number) => void): this;
+    once(event: 'rotate-gesture', listener: (event: Event,
+                                           rotation: number) => void): this;
+    addListener(event: 'rotate-gesture', listener: (event: Event,
+                                           rotation: number) => void): this;
+    removeListener(event: 'rotate-gesture', listener: (event: Event,
+                                           rotation: number) => void): this;
+    /**
+     * Emitted when scroll wheel event phase has begun.
+     *
+     * @platform darwin
+     */
+    on(event: 'scroll-touch-begin', listener: Function): this;
+    once(event: 'scroll-touch-begin', listener: Function): this;
+    addListener(event: 'scroll-touch-begin', listener: Function): this;
+    removeListener(event: 'scroll-touch-begin', listener: Function): this;
+    /**
+     * Emitted when scroll wheel event phase filed upon reaching the edge of element.
+     *
+     * @platform darwin
+     */
+    on(event: 'scroll-touch-edge', listener: Function): this;
+    once(event: 'scroll-touch-edge', listener: Function): this;
+    addListener(event: 'scroll-touch-edge', listener: Function): this;
+    removeListener(event: 'scroll-touch-edge', listener: Function): this;
+    /**
+     * Emitted when scroll wheel event phase has ended.
+     *
+     * @platform darwin
+     */
+    on(event: 'scroll-touch-end', listener: Function): this;
+    once(event: 'scroll-touch-end', listener: Function): this;
+    addListener(event: 'scroll-touch-end', listener: Function): this;
+    removeListener(event: 'scroll-touch-end', listener: Function): this;
+    /**
+     * Emitted when window session is going to end due to force shutdown or machine
+     * restart or session log off.
+     *
+     * @platform win32
+     */
+    on(event: 'session-end', listener: Function): this;
+    once(event: 'session-end', listener: Function): this;
+    addListener(event: 'session-end', listener: Function): this;
+    removeListener(event: 'session-end', listener: Function): this;
+    /**
+     * Emitted when the window opens a sheet.
+     *
+     * @platform darwin
+     */
+    on(event: 'sheet-begin', listener: Function): this;
+    once(event: 'sheet-begin', listener: Function): this;
+    addListener(event: 'sheet-begin', listener: Function): this;
+    removeListener(event: 'sheet-begin', listener: Function): this;
+    /**
+     * Emitted when the window has closed a sheet.
+     *
+     * @platform darwin
+     */
+    on(event: 'sheet-end', listener: Function): this;
+    once(event: 'sheet-end', listener: Function): this;
+    addListener(event: 'sheet-end', listener: Function): this;
+    removeListener(event: 'sheet-end', listener: Function): this;
+    /**
+     * Emitted when the window is shown.
+     */
+    on(event: 'show', listener: Function): this;
+    once(event: 'show', listener: Function): this;
+    addListener(event: 'show', listener: Function): this;
+    removeListener(event: 'show', listener: Function): this;
+    /**
+     * Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`,
+     * `left`.
+     *
+     * The method underlying this event is built to handle older macOS-style trackpad
+     * swiping, where the content on the screen doesn't move with the swipe. Most macOS
+     * trackpads are not configured to allow this kind of swiping anymore, so in order
+     * for it to emit properly the 'Swipe between pages' preference in `System
+     * Preferences > Trackpad > More Gestures` must be set to 'Swipe with two or three
+     * fingers'.
+     *
+     * @platform darwin
+     */
+    on(event: 'swipe', listener: (event: Event,
+                                  direction: string) => void): this;
+    once(event: 'swipe', listener: (event: Event,
+                                  direction: string) => void): this;
+    addListener(event: 'swipe', listener: (event: Event,
+                                  direction: string) => void): this;
+    removeListener(event: 'swipe', listener: (event: Event,
+                                  direction: string) => void): this;
+    /**
+     * Emitted when the system context menu is triggered on the window, this is
+     * normally only triggered when the user right clicks on the non-client area of
+     * your window.  This is the window titlebar or any area you have declared as
+     * `-webkit-app-region: drag` in a frameless window.
+     *
+     * Calling `event.preventDefault()` will prevent the menu from being displayed.
+     *
+     * @platform win32
+     */
+    on(event: 'system-context-menu', listener: (event: Event,
+                                                /**
+                                                 * The screen coordinates the context menu was triggered at
+                                                 */
+                                                point: Point) => void): this;
+    once(event: 'system-context-menu', listener: (event: Event,
+                                                /**
+                                                 * The screen coordinates the context menu was triggered at
+                                                 */
+                                                point: Point) => void): this;
+    addListener(event: 'system-context-menu', listener: (event: Event,
+                                                /**
+                                                 * The screen coordinates the context menu was triggered at
+                                                 */
+                                                point: Point) => void): this;
+    removeListener(event: 'system-context-menu', listener: (event: Event,
+                                                /**
+                                                 * The screen coordinates the context menu was triggered at
+                                                 */
+                                                point: Point) => void): this;
+    /**
+     * Emitted when the window exits from a maximized state.
+     */
+    on(event: 'unmaximize', listener: Function): this;
+    once(event: 'unmaximize', listener: Function): this;
+    addListener(event: 'unmaximize', listener: Function): this;
+    removeListener(event: 'unmaximize', listener: Function): this;
+    /**
+     * Emitted when the web page becomes unresponsive.
+     */
+    on(event: 'unresponsive', listener: Function): this;
+    once(event: 'unresponsive', listener: Function): this;
+    addListener(event: 'unresponsive', listener: Function): this;
+    removeListener(event: 'unresponsive', listener: Function): this;
+    /**
+     * Emitted before the window is moved. On Windows, calling `event.preventDefault()`
+     * will prevent the window from being moved.
+     *
+     * Note that this is only emitted when the window is being moved manually. Moving
+     * the window with `setPosition`/`setBounds`/`center` will not emit this event.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'will-move', listener: (event: Event,
+                                      /**
+                                       * Location the window is being moved to.
+                                       */
+                                      newBounds: Rectangle) => void): this;
+    once(event: 'will-move', listener: (event: Event,
+                                      /**
+                                       * Location the window is being moved to.
+                                       */
+                                      newBounds: Rectangle) => void): this;
+    addListener(event: 'will-move', listener: (event: Event,
+                                      /**
+                                       * Location the window is being moved to.
+                                       */
+                                      newBounds: Rectangle) => void): this;
+    removeListener(event: 'will-move', listener: (event: Event,
+                                      /**
+                                       * Location the window is being moved to.
+                                       */
+                                      newBounds: Rectangle) => void): this;
+    /**
+     * Emitted before the window is resized. Calling `event.preventDefault()` will
+     * prevent the window from being resized.
+     *
+     * Note that this is only emitted when the window is being resized manually.
+     * Resizing the window with `setBounds`/`setSize` will not emit this event.
+     *
+     * The possible values and behaviors of the `edge` option are platform dependent.
+     * Possible values are:
+     *
+     * * On Windows, possible values are `bottom`, `top`, `left`, `right`, `top-left`,
+     * `top-right`, `bottom-left`, `bottom-right`.
+     * * On macOS, possible values are `bottom` and `right`.
+     *   * The value `bottom` is used to denote vertical resizing.
+     *   * The value `right` is used to denote horizontal resizing.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'will-resize', listener: (event: Event,
+                                        /**
+                                         * Size the window is being resized to.
+                                         */
+                                        newBounds: Rectangle,
+                                        details: WillResizeDetails) => void): this;
+    once(event: 'will-resize', listener: (event: Event,
+                                        /**
+                                         * Size the window is being resized to.
+                                         */
+                                        newBounds: Rectangle,
+                                        details: WillResizeDetails) => void): this;
+    addListener(event: 'will-resize', listener: (event: Event,
+                                        /**
+                                         * Size the window is being resized to.
+                                         */
+                                        newBounds: Rectangle,
+                                        details: WillResizeDetails) => void): this;
+    removeListener(event: 'will-resize', listener: (event: Event,
+                                        /**
+                                         * Size the window is being resized to.
+                                         */
+                                        newBounds: Rectangle,
+                                        details: WillResizeDetails) => void): this;
+    /**
+     * BrowserWindow
+     */
+    constructor(options?: BrowserWindowConstructorOptions);
+    /**
+     * The window that owns the given `browserView`. If the given view is not attached
+     * to any window, returns `null`.
+     */
+    static fromBrowserView(browserView: BrowserView): (BrowserWindow) | (null);
+    /**
+     * The window with the given `id`.
+     */
+    static fromId(id: number): (BrowserWindow) | (null);
+    /**
+     * The window that owns the given `webContents` or `null` if the contents are not
+     * owned by a window.
+     */
+    static fromWebContents(webContents: WebContents): (BrowserWindow) | (null);
+    /**
+     * An array of all opened browser windows.
+     */
+    static getAllWindows(): BrowserWindow[];
+    /**
+     * The window that is focused in this application, otherwise returns `null`.
+     */
+    static getFocusedWindow(): (BrowserWindow) | (null);
+    /**
+     * Replacement API for setBrowserView supporting work with multi browser views.
+     *
+     * @experimental
+     */
+    addBrowserView(browserView: BrowserView): void;
+    /**
+     * Adds a window as a tab on this window, after the tab for the window instance.
+     *
+     * @platform darwin
+     */
+    addTabbedWindow(browserWindow: BrowserWindow): void;
+    /**
+     * Removes focus from the window.
+     */
+    blur(): void;
+    blurWebView(): void;
+    /**
+     * Resolves with a NativeImage
+     *
+     * Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
+     * whole visible page. If the page is not visible, `rect` may be empty.
+     */
+    capturePage(rect?: Rectangle): Promise<Electron.NativeImage>;
+    /**
+     * Moves window to the center of the screen.
+     */
+    center(): void;
+    /**
+     * Try to close the window. This has the same effect as a user manually clicking
+     * the close button of the window. The web page may cancel the close though. See
+     * the close event.
+     */
+    close(): void;
+    /**
+     * Closes the currently open Quick Look panel.
+     *
+     * @platform darwin
+     */
+    closeFilePreview(): void;
+    /**
+     * Force closing the window, the `unload` and `beforeunload` event won't be emitted
+     * for the web page, and `close` event will also not be emitted for this window,
+     * but it guarantees the `closed` event will be emitted.
+     */
+    destroy(): void;
+    /**
+     * Starts or stops flashing the window to attract user's attention.
+     */
+    flashFrame(flag: boolean): void;
+    /**
+     * Focuses on the window.
+     */
+    focus(): void;
+    focusOnWebView(): void;
+    /**
+     * Gets the background color of the window in Hex (`#RRGGBB`) format.
+     *
+     * See Setting `backgroundColor`.
+     *
+     * **Note:** The alpha value is _not_ returned alongside the red, green, and blue
+     * values.
+     */
+    getBackgroundColor(): string;
+    /**
+     * The `bounds` of the window as `Object`.
+     */
+    getBounds(): Rectangle;
+    /**
+     * The `BrowserView` attached to `win`. Returns `null` if one is not attached.
+     * Throws an error if multiple `BrowserView`s are attached.
+     *
+     * @experimental
+     */
+    getBrowserView(): (BrowserView) | (null);
+    /**
+     * an array of all BrowserViews that have been attached with `addBrowserView` or
+     * `setBrowserView`.
+     *
+     * **Note:** The BrowserView API is currently experimental and may change or be
+     * removed in future Electron releases.
+     *
+     * @experimental
+     */
+    getBrowserViews(): BrowserView[];
+    /**
+     * All child windows.
+     */
+    getChildWindows(): BrowserWindow[];
+    /**
+     * The `bounds` of the window's client area as `Object`.
+     */
+    getContentBounds(): Rectangle;
+    /**
+     * Contains the window's client area's width and height.
+     */
+    getContentSize(): number[];
+    /**
+     * Contains the window's maximum width and height.
+     */
+    getMaximumSize(): number[];
+    /**
+     * Window id in the format of DesktopCapturerSource's id. For example
+     * "window:1324:0".
+     *
+     * More precisely the format is `window:id:other_id` where `id` is `HWND` on
+     * Windows, `CGWindowID` (`uint64_t`) on macOS and `Window` (`unsigned long`) on
+     * Linux. `other_id` is used to identify web contents (tabs) so within the same top
+     * level window.
+     */
+    getMediaSourceId(): string;
+    /**
+     * Contains the window's minimum width and height.
+     */
+    getMinimumSize(): number[];
+    /**
+     * The platform-specific handle of the window.
+     *
+     * The native type of the handle is `HWND` on Windows, `NSView*` on macOS, and
+     * `Window` (`unsigned long`) on Linux.
+     */
+    getNativeWindowHandle(): Buffer;
+    /**
+     * Contains the window bounds of the normal state
+     *
+     * **Note:** whatever the current state of the window : maximized, minimized or in
+     * fullscreen, this function always returns the position and size of the window in
+     * normal state. In normal state, getBounds and getNormalBounds returns the same
+     * `Rectangle`.
+     */
+    getNormalBounds(): Rectangle;
+    /**
+     * between 0.0 (fully transparent) and 1.0 (fully opaque). On Linux, always returns
+     * 1.
+     */
+    getOpacity(): number;
+    /**
+     * The parent window or `null` if there is no parent.
+     */
+    getParentWindow(): (BrowserWindow) | (null);
+    /**
+     * Contains the window's current position.
+     */
+    getPosition(): number[];
+    /**
+     * The pathname of the file the window represents.
+     *
+     * @platform darwin
+     */
+    getRepresentedFilename(): string;
+    /**
+     * Contains the window's width and height.
+     */
+    getSize(): number[];
+    /**
+     * The title of the native window.
+     *
+     * **Note:** The title of the web page can be different from the title of the
+     * native window.
+     */
+    getTitle(): string;
+    /**
+     * The custom position for the traffic light buttons in frameless window.
+     *
+     * @platform darwin
+     */
+    getTrafficLightPosition(): Point;
+    /**
+     * Whether the window has a shadow.
+     */
+    hasShadow(): boolean;
+    /**
+     * Hides the window.
+     */
+    hide(): void;
+    /**
+     * Hooks a windows message. The `callback` is called when the message is received
+     * in the WndProc.
+     *
+     * @platform win32
+     */
+    hookWindowMessage(message: number, callback: (wParam: any, lParam: any) => void): void;
+    /**
+     * Whether the window is always on top of other windows.
+     */
+    isAlwaysOnTop(): boolean;
+    /**
+     * Whether the window can be manually closed by user.
+     *
+     * On Linux always returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    isClosable(): boolean;
+    /**
+     * Whether the window is destroyed.
+     */
+    isDestroyed(): boolean;
+    /**
+     * Whether the window's document has been edited.
+     *
+     * @platform darwin
+     */
+    isDocumentEdited(): boolean;
+    /**
+     * whether the window is enabled.
+     */
+    isEnabled(): boolean;
+    /**
+     * Returns whether the window can be focused.
+     *
+     * @platform darwin,win32
+     */
+    isFocusable(): void;
+    /**
+     * Whether the window is focused.
+     */
+    isFocused(): boolean;
+    /**
+     * Whether the window is in fullscreen mode.
+     */
+    isFullScreen(): boolean;
+    /**
+     * Whether the maximize/zoom window button toggles fullscreen mode or maximizes the
+     * window.
+     */
+    isFullScreenable(): boolean;
+    /**
+     * Whether the window is in kiosk mode.
+     */
+    isKiosk(): boolean;
+    /**
+     * Whether the window can be manually maximized by user.
+     *
+     * On Linux always returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    isMaximizable(): boolean;
+    /**
+     * Whether the window is maximized.
+     */
+    isMaximized(): boolean;
+    /**
+     * Whether menu bar automatically hides itself.
+     *
+     * @platform win32,linux
+     */
+    isMenuBarAutoHide(): boolean;
+    /**
+     * Whether the menu bar is visible.
+     *
+     * @platform win32,linux
+     */
+    isMenuBarVisible(): boolean;
+    /**
+     * Whether the window can be manually minimized by the user.
+     *
+     * On Linux always returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    isMinimizable(): boolean;
+    /**
+     * Whether the window is minimized.
+     */
+    isMinimized(): boolean;
+    /**
+     * Whether current window is a modal window.
+     */
+    isModal(): boolean;
+    /**
+     * Whether the window can be moved by user.
+     *
+     * On Linux always returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    isMovable(): boolean;
+    /**
+     * Whether the window is in normal state (not maximized, not minimized, not in
+     * fullscreen mode).
+     */
+    isNormal(): boolean;
+    /**
+     * Whether the window can be manually resized by the user.
+     */
+    isResizable(): boolean;
+    /**
+     * Whether the window is in simple (pre-Lion) fullscreen mode.
+     *
+     * @platform darwin
+     */
+    isSimpleFullScreen(): boolean;
+    /**
+     * Whether the window is in Windows 10 tablet mode.
+     *
+     * Since Windows 10 users can use their PC as tablet, under this mode apps can
+     * choose to optimize their UI for tablets, such as enlarging the titlebar and
+     * hiding titlebar buttons.
+     *
+     * This API returns whether the window is in tablet mode, and the `resize` event
+     * can be be used to listen to changes to tablet mode.
+     *
+     * @platform win32
+     */
+    isTabletMode(): boolean;
+    /**
+     * Whether the window is visible to the user.
+     */
+    isVisible(): boolean;
+    /**
+     * Whether the window is visible on all workspaces.
+     *
+     * **Note:** This API always returns false on Windows.
+     *
+     * @platform darwin,linux
+     */
+    isVisibleOnAllWorkspaces(): boolean;
+    /**
+     * `true` or `false` depending on whether the message is hooked.
+     *
+     * @platform win32
+     */
+    isWindowMessageHooked(message: number): boolean;
+    /**
+     * the promise will resolve when the page has finished loading (see
+     * `did-finish-load`), and rejects if the page fails to load (see `did-fail-load`).
+     *
+     * Same as `webContents.loadFile`, `filePath` should be a path to an HTML file
+     * relative to the root of your application.  See the `webContents` docs for more
+     * information.
+     */
+    loadFile(filePath: string, options?: LoadFileOptions): Promise<void>;
+    /**
+     * the promise will resolve when the page has finished loading (see
+     * `did-finish-load`), and rejects if the page fails to load (see `did-fail-load`).
+     *
+     * Same as `webContents.loadURL(url[, options])`.
+     *
+     * The `url` can be a remote address (e.g. `http://`) or a path to a local HTML
+     * file using the `file://` protocol.
+     *
+     * To ensure that file URLs are properly formatted, it is recommended to use Node's
+     * `url.format` method:
+     *
+     * You can load a URL using a `POST` request with URL-encoded data by doing the
+     * following:
+     */
+    loadURL(url: string, options?: LoadURLOptions): Promise<void>;
+    /**
+     * Maximizes the window. This will also show (but not focus) the window if it isn't
+     * being displayed already.
+     */
+    maximize(): void;
+    /**
+     * Merges all windows into one window with multiple tabs when native tabs are
+     * enabled and there is more than one open window.
+     *
+     * @platform darwin
+     */
+    mergeAllWindows(): void;
+    /**
+     * Minimizes the window. On some platforms the minimized window will be shown in
+     * the Dock.
+     */
+    minimize(): void;
+    /**
+     * Moves window above the source window in the sense of z-order. If the
+     * `mediaSourceId` is not of type window or if the window does not exist then this
+     * method throws an error.
+     */
+    moveAbove(mediaSourceId: string): void;
+    /**
+     * Moves the current tab into a new window if native tabs are enabled and there is
+     * more than one tab in the current window.
+     *
+     * @platform darwin
+     */
+    moveTabToNewWindow(): void;
+    /**
+     * Moves window to top(z-order) regardless of focus
+     */
+    moveTop(): void;
+    /**
+     * Uses Quick Look to preview a file at a given path.
+     *
+     * @platform darwin
+     */
+    previewFile(path: string, displayName?: string): void;
+    /**
+     * Same as `webContents.reload`.
+     */
+    reload(): void;
+    removeBrowserView(browserView: BrowserView): void;
+    /**
+     * Remove the window's menu bar.
+     *
+     * @platform linux,win32
+     */
+    removeMenu(): void;
+    /**
+     * Restores the window from minimized state to its previous state.
+     */
+    restore(): void;
+    /**
+     * Selects the next tab when native tabs are enabled and there are other tabs in
+     * the window.
+     *
+     * @platform darwin
+     */
+    selectNextTab(): void;
+    /**
+     * Selects the previous tab when native tabs are enabled and there are other tabs
+     * in the window.
+     *
+     * @platform darwin
+     */
+    selectPreviousTab(): void;
+    /**
+     * Sets whether the window should show always on top of other windows. After
+     * setting this, the window is still a normal window, not a toolbox window which
+     * can not be focused on.
+     */
+    setAlwaysOnTop(flag: boolean, level?: 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver', relativeLevel?: number): void;
+    /**
+     * Sets the properties for the window's taskbar button.
+     *
+     * **Note:** `relaunchCommand` and `relaunchDisplayName` must always be set
+     * together. If one of those properties is not set, then neither will be used.
+     *
+     * @platform win32
+     */
+    setAppDetails(options: AppDetailsOptions): void;
+    /**
+     * This will make a window maintain an aspect ratio. The extra size allows a
+     * developer to have space, specified in pixels, not included within the aspect
+     * ratio calculations. This API already takes into account the difference between a
+     * window's size and its content size.
+     *
+     * Consider a normal window with an HD video player and associated controls.
+     * Perhaps there are 15 pixels of controls on the left edge, 25 pixels of controls
+     * on the right edge and 50 pixels of controls below the player. In order to
+     * maintain a 16:9 aspect ratio (standard aspect ratio for HD @1920x1080) within
+     * the player itself we would call this function with arguments of 16/9 and {
+     * width: 40, height: 50 }. The second argument doesn't care where the extra width
+     * and height are within the content view--only that they exist. Sum any extra
+     * width and height areas you have within the overall content view.
+     *
+     * The aspect ratio is not respected when window is resized programmatically with
+     * APIs like `win.setSize`.
+     */
+    setAspectRatio(aspectRatio: number, extraSize?: Size): void;
+    /**
+     * Controls whether to hide cursor when typing.
+     *
+     * @platform darwin
+     */
+    setAutoHideCursor(autoHide: boolean): void;
+    /**
+     * Sets whether the window menu bar should hide itself automatically. Once set the
+     * menu bar will only show when users press the single `Alt` key.
+     *
+     * If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't
+     * hide it immediately.
+     *
+     * @platform win32,linux
+     */
+    setAutoHideMenuBar(hide: boolean): void;
+    /**
+     * Examples of valid `backgroundColor` values:
+     *
+     * * Hex
+     *   * #fff (shorthand RGB)
+     *   * #ffff (shorthand ARGB)
+     *   * #ffffff (RGB)
+     *   * #ffffffff (ARGB)
+     * * RGB
+     *   * rgb(([\d]+),\s*([\d]+),\s*([\d]+))
+     *     * e.g. rgb(255, 255, 255)
+     * * RGBA
+     *   * rgba(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+))
+     *     * e.g. rgba(255, 255, 255, 1.0)
+     * * HSL
+     *   * hsl((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%)
+     *     * e.g. hsl(200, 20%, 50%)
+     * * HSLA
+     *   * hsla((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+))
+     *     * e.g. hsla(200, 20%, 50%, 0.5)
+     * * Color name
+     *   * Options are listed in SkParseColor.cpp
+     *   * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
+     *     * e.g. `blueviolet` or `red`
+     *
+     * Sets the background color of the window. See Setting `backgroundColor`.
+     */
+    setBackgroundColor(backgroundColor: string): void;
+    /**
+     * Resizes and moves the window to the supplied bounds. Any properties that are not
+     * supplied will default to their current values.
+     */
+    setBounds(bounds: Partial<Rectangle>, animate?: boolean): void;
+    setBrowserView(browserView: (BrowserView) | (null)): void;
+    /**
+     * Sets whether the window can be manually closed by user. On Linux does nothing.
+     *
+     * @platform darwin,win32
+     */
+    setClosable(closable: boolean): void;
+    /**
+     * Resizes and moves the window's client area (e.g. the web page) to the supplied
+     * bounds.
+     */
+    setContentBounds(bounds: Rectangle, animate?: boolean): void;
+    /**
+     * Prevents the window contents from being captured by other apps.
+     *
+     * On macOS it sets the NSWindow's sharingType to NSWindowSharingNone. On Windows
+     * it calls SetWindowDisplayAffinity with `WDA_EXCLUDEFROMCAPTURE`. For Windows 10
+     * version 2004 and up the window will be removed from capture entirely, older
+     * Windows versions behave as if `WDA_MONITOR` is applied capturing a black window.
+     *
+     * @platform darwin,win32
+     */
+    setContentProtection(enable: boolean): void;
+    /**
+     * Resizes the window's client area (e.g. the web page) to `width` and `height`.
+     */
+    setContentSize(width: number, height: number, animate?: boolean): void;
+    /**
+     * Specifies whether the window’s document has been edited, and the icon in title
+     * bar will become gray when set to `true`.
+     *
+     * @platform darwin
+     */
+    setDocumentEdited(edited: boolean): void;
+    /**
+     * Disable or enable the window.
+     */
+    setEnabled(enable: boolean): void;
+    /**
+     * Changes whether the window can be focused.
+     *
+     * On macOS it does not remove the focus from the window.
+     *
+     * @platform darwin,win32
+     */
+    setFocusable(focusable: boolean): void;
+    /**
+     * Sets whether the window should be in fullscreen mode.
+     */
+    setFullScreen(flag: boolean): void;
+    /**
+     * Sets whether the maximize/zoom window button toggles fullscreen mode or
+     * maximizes the window.
+     */
+    setFullScreenable(fullscreenable: boolean): void;
+    /**
+     * Sets whether the window should have a shadow.
+     */
+    setHasShadow(hasShadow: boolean): void;
+    /**
+     * Changes window icon.
+     *
+     * @platform win32,linux
+     */
+    setIcon(icon: (NativeImage) | (string)): void;
+    /**
+     * Makes the window ignore all mouse events.
+     *
+     * All mouse events happened in this window will be passed to the window below this
+     * window, but if this window has focus, it will still receive keyboard events.
+     */
+    setIgnoreMouseEvents(ignore: boolean, options?: IgnoreMouseEventsOptions): void;
+    /**
+     * Enters or leaves kiosk mode.
+     */
+    setKiosk(flag: boolean): void;
+    /**
+     * Sets whether the window can be manually maximized by user. On Linux does
+     * nothing.
+     *
+     * @platform darwin,win32
+     */
+    setMaximizable(maximizable: boolean): void;
+    /**
+     * Sets the maximum size of window to `width` and `height`.
+     */
+    setMaximumSize(width: number, height: number): void;
+    /**
+     * Sets the `menu` as the window's menu bar.
+     *
+     * @platform linux,win32
+     */
+    setMenu(menu: (Menu) | (null)): void;
+    /**
+     * Sets whether the menu bar should be visible. If the menu bar is auto-hide, users
+     * can still bring up the menu bar by pressing the single `Alt` key.
+     *
+     * @platform win32,linux
+     */
+    setMenuBarVisibility(visible: boolean): void;
+    /**
+     * Sets whether the window can be manually minimized by user. On Linux does
+     * nothing.
+     *
+     * @platform darwin,win32
+     */
+    setMinimizable(minimizable: boolean): void;
+    /**
+     * Sets the minimum size of window to `width` and `height`.
+     */
+    setMinimumSize(width: number, height: number): void;
+    /**
+     * Sets whether the window can be moved by user. On Linux does nothing.
+     *
+     * @platform darwin,win32
+     */
+    setMovable(movable: boolean): void;
+    /**
+     * Sets the opacity of the window. On Linux, does nothing. Out of bound number
+     * values are clamped to the [0, 1] range.
+     *
+     * @platform win32,darwin
+     */
+    setOpacity(opacity: number): void;
+    /**
+     * Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
+     * convey some sort of application status or to passively notify the user.
+     *
+     * @platform win32
+     */
+    setOverlayIcon(overlay: (NativeImage) | (null), description: string): void;
+    /**
+     * Sets `parent` as current window's parent window, passing `null` will turn
+     * current window into a top-level window.
+     */
+    setParentWindow(parent: (BrowserWindow) | (null)): void;
+    /**
+     * Moves window to `x` and `y`.
+     */
+    setPosition(x: number, y: number, animate?: boolean): void;
+    /**
+     * Sets progress value in progress bar. Valid range is [0, 1.0].
+     *
+     * Remove progress bar when progress < 0; Change to indeterminate mode when
+     * progress > 1.
+     *
+     * On Linux platform, only supports Unity desktop environment, you need to specify
+     * the `*.desktop` file name to `desktopName` field in `package.json`. By default,
+     * it will assume `{app.name}.desktop`.
+     *
+     * On Windows, a mode can be passed. Accepted values are `none`, `normal`,
+     * `indeterminate`, `error`, and `paused`. If you call `setProgressBar` without a
+     * mode set (but with a value within the valid range), `normal` will be assumed.
+     */
+    setProgressBar(progress: number, options?: ProgressBarOptions): void;
+    /**
+     * Sets the pathname of the file the window represents, and the icon of the file
+     * will show in window's title bar.
+     *
+     * @platform darwin
+     */
+    setRepresentedFilename(filename: string): void;
+    /**
+     * Sets whether the window can be manually resized by the user.
+     */
+    setResizable(resizable: boolean): void;
+    /**
+     * Setting a window shape determines the area within the window where the system
+     * permits drawing and user interaction. Outside of the given region, no pixels
+     * will be drawn and no mouse events will be registered. Mouse events outside of
+     * the region will not be received by that window, but will fall through to
+     * whatever is behind the window.
+     *
+     * @experimental
+     * @platform win32,linux
+     */
+    setShape(rects: Rectangle[]): void;
+    /**
+     * Changes the attachment point for sheets on macOS. By default, sheets are
+     * attached just below the window frame, but you may want to display them beneath a
+     * HTML-rendered toolbar. For example:
+     *
+     * @platform darwin
+     */
+    setSheetOffset(offsetY: number, offsetX?: number): void;
+    /**
+     * Enters or leaves simple fullscreen mode.
+     *
+     * Simple fullscreen mode emulates the native fullscreen behavior found in versions
+     * of macOS prior to Lion (10.7).
+     *
+     * @platform darwin
+     */
+    setSimpleFullScreen(flag: boolean): void;
+    /**
+     * Resizes the window to `width` and `height`. If `width` or `height` are below any
+     * set minimum size constraints the window will snap to its minimum size.
+     */
+    setSize(width: number, height: number, animate?: boolean): void;
+    /**
+     * Makes the window not show in the taskbar.
+     *
+     * @platform darwin,win32
+     */
+    setSkipTaskbar(skip: boolean): void;
+    /**
+     * Whether the buttons were added successfully
+     *
+     * Add a thumbnail toolbar with a specified set of buttons to the thumbnail image
+     * of a window in a taskbar button layout. Returns a `boolean` object indicates
+     * whether the thumbnail has been added successfully.
+     *
+     * The number of buttons in thumbnail toolbar should be no greater than 7 due to
+     * the limited room. Once you setup the thumbnail toolbar, the toolbar cannot be
+     * removed due to the platform's limitation. But you can call the API with an empty
+     * array to clean the buttons.
+     *
+     * The `buttons` is an array of `Button` objects:
+     *
+     * * `Button` Object
+     *   * `icon` NativeImage - The icon showing in thumbnail toolbar.
+     *   * `click` Function
+     *   * `tooltip` string (optional) - The text of the button's tooltip.
+     *   * `flags` string[] (optional) - Control specific states and behaviors of the
+     * button. By default, it is `['enabled']`.
+     *
+     * The `flags` is an array that can include following `string`s:
+     *
+     * * `enabled` - The button is active and available to the user.
+     * * `disabled` - The button is disabled. It is present, but has a visual state
+     * indicating it will not respond to user action.
+     * * `dismissonclick` - When the button is clicked, the thumbnail window closes
+     * immediately.
+     * * `nobackground` - Do not draw a button border, use only the image.
+     * * `hidden` - The button is not shown to the user.
+     * * `noninteractive` - The button is enabled but not interactive; no pressed
+     * button state is drawn. This value is intended for instances where the button is
+     * used in a notification.
+     *
+     * @platform win32
+     */
+    setThumbarButtons(buttons: ThumbarButton[]): boolean;
+    /**
+     * Sets the region of the window to show as the thumbnail image displayed when
+     * hovering over the window in the taskbar. You can reset the thumbnail to be the
+     * entire window by specifying an empty region: `{ x: 0, y: 0, width: 0, height: 0
+     * }`.
+     *
+     * @platform win32
+     */
+    setThumbnailClip(region: Rectangle): void;
+    /**
+     * Sets the toolTip that is displayed when hovering over the window thumbnail in
+     * the taskbar.
+     *
+     * @platform win32
+     */
+    setThumbnailToolTip(toolTip: string): void;
+    /**
+     * Changes the title of native window to `title`.
+     */
+    setTitle(title: string): void;
+    /**
+     * On a Window with Window Controls Overlay already enabled, this method updates
+     * the style of the title bar overlay.
+     *
+     * @platform win32
+     */
+    setTitleBarOverlay(options: TitleBarOverlayOptions): void;
+    /**
+     * Raises `browserView` above other `BrowserView`s attached to `win`. Throws an
+     * error if `browserView` is not attached to `win`.
+     *
+     * @experimental
+     */
+    setTopBrowserView(browserView: BrowserView): void;
+    /**
+     * Sets the touchBar layout for the current window. Specifying `null` or
+     * `undefined` clears the touch bar. This method only has an effect if the machine
+     * has a touch bar and is running on macOS 10.12.1+.
+     *
+     * **Note:** The TouchBar API is currently experimental and may change or be
+     * removed in future Electron releases.
+     *
+     * @platform darwin
+     */
+    setTouchBar(touchBar: (TouchBar) | (null)): void;
+    /**
+     * Set a custom position for the traffic light buttons in frameless window.
+     *
+     * @platform darwin
+     */
+    setTrafficLightPosition(position: Point): void;
+    /**
+     * Adds a vibrancy effect to the browser window. Passing `null` or an empty string
+     * will remove the vibrancy effect on the window.
+     *
+     * Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark`
+     * have been deprecated and will be removed in an upcoming version of macOS.
+     *
+     * @platform darwin
+     */
+    setVibrancy(type: (('appearance-based' | 'light' | 'dark' | 'titlebar' | 'selection' | 'menu' | 'popover' | 'sidebar' | 'medium-light' | 'ultra-dark' | 'header' | 'sheet' | 'window' | 'hud' | 'fullscreen-ui' | 'tooltip' | 'content' | 'under-window' | 'under-page')) | (null)): void;
+    /**
+     * Sets whether the window should be visible on all workspaces.
+     *
+     * **Note:** This API does nothing on Windows.
+     *
+     * @platform darwin,linux
+     */
+    setVisibleOnAllWorkspaces(visible: boolean, options?: VisibleOnAllWorkspacesOptions): void;
+    /**
+     * Sets whether the window traffic light buttons should be visible.
+     *
+     * @platform darwin
+     */
+    setWindowButtonVisibility(visible: boolean): void;
+    /**
+     * Shows and gives focus to the window.
+     */
+    show(): void;
+    /**
+     * Same as `webContents.showDefinitionForSelection()`.
+     *
+     * @platform darwin
+     */
+    showDefinitionForSelection(): void;
+    /**
+     * Shows the window but doesn't focus on it.
+     */
+    showInactive(): void;
+    /**
+     * Toggles the visibility of the tab bar if native tabs are enabled and there is
+     * only one tab in the current window.
+     *
+     * @platform darwin
+     */
+    toggleTabBar(): void;
+    /**
+     * Unhooks all of the window messages.
+     *
+     * @platform win32
+     */
+    unhookAllWindowMessages(): void;
+    /**
+     * Unhook the window message.
+     *
+     * @platform win32
+     */
+    unhookWindowMessage(message: number): void;
+    /**
+     * Unmaximizes the window.
+     */
+    unmaximize(): void;
+    /**
+     * A `string` property that defines an alternative title provided only to
+     * accessibility tools such as screen readers. This string is not directly visible
+     * to users.
+     */
+    accessibleTitle: string;
+    /**
+     * A `boolean` property that determines whether the window menu bar should hide
+     * itself automatically. Once set, the menu bar will only show when users press the
+     * single `Alt` key.
+     *
+     * If the menu bar is already visible, setting this property to `true` won't hide
+     * it immediately.
+     */
+    autoHideMenuBar: boolean;
+    /**
+     * A `boolean` property that determines whether the window can be manually closed
+     * by user.
+     *
+     * On Linux the setter is a no-op, although the getter returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    closable: boolean;
+    /**
+     * A `boolean` property that specifies whether the window’s document has been
+     * edited.
+     *
+     * The icon in title bar will become gray when set to `true`.
+     *
+     * @platform darwin
+     */
+    documentEdited: boolean;
+    /**
+     * A `boolean` property that determines whether the window is excluded from the
+     * application’s Windows menu. `false` by default.
+     *
+     * @platform darwin
+     */
+    excludedFromShownWindowsMenu: boolean;
+    /**
+     * A `boolean` property that determines whether the window is focusable.
+     *
+     * @platform win32,darwin
+     */
+    focusable: boolean;
+    /**
+     * A `boolean` property that determines whether the window is in fullscreen mode.
+     */
+    fullScreen: boolean;
+    /**
+     * A `boolean` property that determines whether the maximize/zoom window button
+     * toggles fullscreen mode or maximizes the window.
+     */
+    fullScreenable: boolean;
+    /**
+     * A `Integer` property representing the unique ID of the window. Each ID is unique
+     * among all `BrowserWindow` instances of the entire Electron application.
+     *
+     */
+    readonly id: number;
+    /**
+     * A `boolean` property that determines whether the window is in kiosk mode.
+     */
+    kiosk: boolean;
+    /**
+     * A `boolean` property that determines whether the window can be manually
+     * maximized by user.
+     *
+     * On Linux the setter is a no-op, although the getter returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    maximizable: boolean;
+    /**
+     * A `boolean` property that determines whether the menu bar should be visible.
+     *
+     * **Note:** If the menu bar is auto-hide, users can still bring up the menu bar by
+     * pressing the single `Alt` key.
+     *
+     * @platform win32,linux
+     */
+    menuBarVisible: boolean;
+    /**
+     * A `boolean` property that determines whether the window can be manually
+     * minimized by user.
+     *
+     * On Linux the setter is a no-op, although the getter returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    minimizable: boolean;
+    /**
+     * A `boolean` property that determines Whether the window can be moved by user.
+     *
+     * On Linux the setter is a no-op, although the getter returns `true`.
+     *
+     * @platform darwin,win32
+     */
+    movable: boolean;
+    /**
+     * A `string` property that determines the pathname of the file the window
+     * represents, and the icon of the file will show in window's title bar.
+     *
+     * @platform darwin
+     */
+    representedFilename: string;
+    /**
+     * A `boolean` property that determines whether the window can be manually resized
+     * by user.
+     */
+    resizable: boolean;
+    /**
+     * A `boolean` property that determines whether the window has a shadow.
+     */
+    shadow: boolean;
+    /**
+     * A `boolean` property that determines whether the window is in simple (pre-Lion)
+     * fullscreen mode.
+     */
+    simpleFullScreen: boolean;
+    /**
+     * A `string` property that determines the title of the native window.
+     *
+     * **Note:** The title of the web page can be different from the title of the
+     * native window.
+     */
+    title: string;
+    /**
+     * A `boolean` property that determines whether the window is visible on all
+     * workspaces.
+     *
+     * **Note:** Always returns false on Windows.
+     *
+     * @platform darwin,linux
+     */
+    visibleOnAllWorkspaces: boolean;
+    /**
+     * A `WebContents` object this window owns. All web page related events and
+     * operations will be done via it.
+     *
+     * See the `webContents` documentation for its methods and events.
+     *
+     */
+    readonly webContents: WebContents;
+  }
+
+  interface Certificate {
+
+    // Docs: https://electronjs.org/docs/api/structures/certificate
+
+    /**
+     * PEM encoded data
+     */
+    data: string;
+    /**
+     * Fingerprint of the certificate
+     */
+    fingerprint: string;
+    /**
+     * Issuer principal
+     */
+    issuer: CertificatePrincipal;
+    /**
+     * Issuer certificate (if not self-signed)
+     */
+    issuerCert: Certificate;
+    /**
+     * Issuer's Common Name
+     */
+    issuerName: string;
+    /**
+     * Hex value represented string
+     */
+    serialNumber: string;
+    /**
+     * Subject principal
+     */
+    subject: CertificatePrincipal;
+    /**
+     * Subject's Common Name
+     */
+    subjectName: string;
+    /**
+     * End date of the certificate being valid in seconds
+     */
+    validExpiry: number;
+    /**
+     * Start date of the certificate being valid in seconds
+     */
+    validStart: number;
+  }
+
+  interface CertificatePrincipal {
+
+    // Docs: https://electronjs.org/docs/api/structures/certificate-principal
+
+    /**
+     * Common Name.
+     */
+    commonName: string;
+    /**
+     * Country or region.
+     */
+    country: string;
+    /**
+     * Locality.
+     */
+    locality: string;
+    /**
+     * Organization names.
+     */
+    organizations: string[];
+    /**
+     * Organization Unit names.
+     */
+    organizationUnits: string[];
+    /**
+     * State or province.
+     */
+    state: string;
+  }
+
+  class ClientRequest extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/client-request
+
+    /**
+     * Emitted when the `request` is aborted. The `abort` event will not be fired if
+     * the `request` is already closed.
+     */
+    on(event: 'abort', listener: Function): this;
+    once(event: 'abort', listener: Function): this;
+    addListener(event: 'abort', listener: Function): this;
+    removeListener(event: 'abort', listener: Function): this;
+    /**
+     * Emitted as the last event in the HTTP request-response transaction. The `close`
+     * event indicates that no more events will be emitted on either the `request` or
+     * `response` objects.
+     */
+    on(event: 'close', listener: Function): this;
+    once(event: 'close', listener: Function): this;
+    addListener(event: 'close', listener: Function): this;
+    removeListener(event: 'close', listener: Function): this;
+    /**
+     * Emitted when the `net` module fails to issue a network request. Typically when
+     * the `request` object emits an `error` event, a `close` event will subsequently
+     * follow and no response object will be provided.
+     */
+    on(event: 'error', listener: (
+                                  /**
+                                   * an error object providing some information about the failure.
+                                   */
+                                  error: Error) => void): this;
+    once(event: 'error', listener: (
+                                  /**
+                                   * an error object providing some information about the failure.
+                                   */
+                                  error: Error) => void): this;
+    addListener(event: 'error', listener: (
+                                  /**
+                                   * an error object providing some information about the failure.
+                                   */
+                                  error: Error) => void): this;
+    removeListener(event: 'error', listener: (
+                                  /**
+                                   * an error object providing some information about the failure.
+                                   */
+                                  error: Error) => void): this;
+    /**
+     * Emitted just after the last chunk of the `request`'s data has been written into
+     * the `request` object.
+     */
+    on(event: 'finish', listener: Function): this;
+    once(event: 'finish', listener: Function): this;
+    addListener(event: 'finish', listener: Function): this;
+    removeListener(event: 'finish', listener: Function): this;
+    /**
+     * Emitted when an authenticating proxy is asking for user credentials.
+     *
+     * The `callback` function is expected to be called back with user credentials:
+     *
+     * * `username` string
+     * * `password` string
+     *
+     * Providing empty credentials will cancel the request and report an authentication
+     * error on the response object:
+     */
+    on(event: 'login', listener: (authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    once(event: 'login', listener: (authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    addListener(event: 'login', listener: (authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    removeListener(event: 'login', listener: (authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    /**
+     * Emitted when the server returns a redirect response (e.g. 301 Moved
+     * Permanently). Calling `request.followRedirect` will continue with the
+     * redirection.  If this event is handled, `request.followRedirect` must be called
+     * **synchronously**, otherwise the request will be cancelled.
+     */
+    on(event: 'redirect', listener: (statusCode: number,
+                                     method: string,
+                                     redirectUrl: string,
+                                     responseHeaders: Record<string, string[]>) => void): this;
+    once(event: 'redirect', listener: (statusCode: number,
+                                     method: string,
+                                     redirectUrl: string,
+                                     responseHeaders: Record<string, string[]>) => void): this;
+    addListener(event: 'redirect', listener: (statusCode: number,
+                                     method: string,
+                                     redirectUrl: string,
+                                     responseHeaders: Record<string, string[]>) => void): this;
+    removeListener(event: 'redirect', listener: (statusCode: number,
+                                     method: string,
+                                     redirectUrl: string,
+                                     responseHeaders: Record<string, string[]>) => void): this;
+    on(event: 'response', listener: (
+                                     /**
+                                      * An object representing the HTTP response message.
+                                      */
+                                     response: IncomingMessage) => void): this;
+    once(event: 'response', listener: (
+                                     /**
+                                      * An object representing the HTTP response message.
+                                      */
+                                     response: IncomingMessage) => void): this;
+    addListener(event: 'response', listener: (
+                                     /**
+                                      * An object representing the HTTP response message.
+                                      */
+                                     response: IncomingMessage) => void): this;
+    removeListener(event: 'response', listener: (
+                                     /**
+                                      * An object representing the HTTP response message.
+                                      */
+                                     response: IncomingMessage) => void): this;
+    /**
+     * ClientRequest
+     */
+    constructor(options: (ClientRequestConstructorOptions) | (string));
+    /**
+     * Cancels an ongoing HTTP transaction. If the request has already emitted the
+     * `close` event, the abort operation will have no effect. Otherwise an ongoing
+     * event will emit `abort` and `close` events. Additionally, if there is an ongoing
+     * response object,it will emit the `aborted` event.
+     */
+    abort(): void;
+    /**
+     * Sends the last chunk of the request data. Subsequent write or end operations
+     * will not be allowed. The `finish` event is emitted just after the end operation.
+     */
+    end(chunk?: (string) | (Buffer), encoding?: string, callback?: () => void): void;
+    /**
+     * Continues any pending redirection. Can only be called during a `'redirect'`
+     * event.
+     */
+    followRedirect(): void;
+    /**
+     * The value of a previously set extra header name.
+     */
+    getHeader(name: string): string;
+    /**
+     * * `active` boolean - Whether the request is currently active. If this is false
+     * no other properties will be set
+     * * `started` boolean - Whether the upload has started. If this is false both
+     * `current` and `total` will be set to 0.
+     * * `current` Integer - The number of bytes that have been uploaded so far
+     * * `total` Integer - The number of bytes that will be uploaded this request
+     *
+     * You can use this method in conjunction with `POST` requests to get the progress
+     * of a file upload or other data transfer.
+     */
+    getUploadProgress(): UploadProgress;
+    /**
+     * Removes a previously set extra header name. This method can be called only
+     * before first write. Trying to call it after the first write will throw an error.
+     */
+    removeHeader(name: string): void;
+    /**
+     * Adds an extra HTTP header. The header name will be issued as-is without
+     * lowercasing. It can be called only before first write. Calling this method after
+     * the first write will throw an error. If the passed value is not a `string`, its
+     * `toString()` method will be called to obtain the final value.
+     *
+     * Certain headers are restricted from being set by apps. These headers are listed
+     * below. More information on restricted headers can be found in Chromium's header
+     * utils.
+     *
+     * * `Content-Length`
+     * * `Host`
+     * * `Trailer` or `Te`
+     * * `Upgrade`
+     * * `Cookie2`
+     * * `Keep-Alive`
+     * * `Transfer-Encoding`
+     *
+     * Additionally, setting the `Connection` header to the value `upgrade` is also
+     * disallowed.
+     */
+    setHeader(name: string, value: string): void;
+    /**
+     * `callback` is essentially a dummy function introduced in the purpose of keeping
+     * similarity with the Node.js API. It is called asynchronously in the next tick
+     * after `chunk` content have been delivered to the Chromium networking layer.
+     * Contrary to the Node.js implementation, it is not guaranteed that `chunk`
+     * content have been flushed on the wire before `callback` is called.
+     *
+     * Adds a chunk of data to the request body. The first write operation may cause
+     * the request headers to be issued on the wire. After the first write operation,
+     * it is not allowed to add or remove a custom header.
+     */
+    write(chunk: (string) | (Buffer), encoding?: string, callback?: () => void): void;
+    /**
+     * A `boolean` specifying whether the request will use HTTP chunked transfer
+     * encoding or not. Defaults to false. The property is readable and writable,
+     * however it can be set only before the first write operation as the HTTP headers
+     * are not yet put on the wire. Trying to set the `chunkedEncoding` property after
+     * the first write will throw an error.
+     *
+     * Using chunked encoding is strongly recommended if you need to send a large
+     * request body as data will be streamed in small chunks instead of being
+     * internally buffered inside Electron process memory.
+     */
+    chunkedEncoding: boolean;
+  }
+
+  interface Clipboard {
+
+    // Docs: https://electronjs.org/docs/api/clipboard
+
+    /**
+     * An array of supported formats for the clipboard `type`.
+     */
+    availableFormats(type?: 'selection' | 'clipboard'): string[];
+    /**
+     * Clears the clipboard content.
+     */
+    clear(type?: 'selection' | 'clipboard'): void;
+    /**
+     * Whether the clipboard supports the specified `format`.
+     *
+     * @experimental
+     */
+    has(format: string, type?: 'selection' | 'clipboard'): boolean;
+    /**
+     * Reads `format` type from the clipboard.
+     *
+     * `format` should contain valid ASCII characters and have `/` separator. `a/c`,
+     * `a/bc` are valid formats while `/abc`, `abc/`, `a/`, `/a`, `a` are not valid.
+     *
+     * @experimental
+     */
+    read(format: string): string;
+    /**
+     * * `title` string
+     * * `url` string
+     *
+     * Returns an Object containing `title` and `url` keys representing the bookmark in
+     * the clipboard. The `title` and `url` values will be empty strings when the
+     * bookmark is unavailable.  The `title` value will always be empty on Windows.
+     *
+     * @platform darwin,win32
+     */
+    readBookmark(): ReadBookmark;
+    /**
+     * Reads `format` type from the clipboard.
+     *
+     * @experimental
+     */
+    readBuffer(format: string): Buffer;
+    /**
+     * The text on the find pasteboard, which is the pasteboard that holds information
+     * about the current state of the active application’s find panel.
+     *
+     * This method uses synchronous IPC when called from the renderer process. The
+     * cached value is reread from the find pasteboard whenever the application is
+     * activated.
+     *
+     * @platform darwin
+     */
+    readFindText(): string;
+    /**
+     * The content in the clipboard as markup.
+     */
+    readHTML(type?: 'selection' | 'clipboard'): string;
+    /**
+     * The image content in the clipboard.
+     */
+    readImage(type?: 'selection' | 'clipboard'): NativeImage;
+    /**
+     * The content in the clipboard as RTF.
+     */
+    readRTF(type?: 'selection' | 'clipboard'): string;
+    /**
+     * The content in the clipboard as plain text.
+     */
+    readText(type?: 'selection' | 'clipboard'): string;
+    /**
+     * Writes `data` to the clipboard.
+     */
+    write(data: Data, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes the `title` (macOS only) and `url` into the clipboard as a bookmark.
+     *
+     * **Note:** Most apps on Windows don't support pasting bookmarks into them so you
+     * can use `clipboard.write` to write both a bookmark and fallback text to the
+     * clipboard.
+     *
+     * @platform darwin,win32
+     */
+    writeBookmark(title: string, url: string, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes the `buffer` into the clipboard as `format`.
+     *
+     * @experimental
+     */
+    writeBuffer(format: string, buffer: Buffer, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes the `text` into the find pasteboard (the pasteboard that holds
+     * information about the current state of the active application’s find panel) as
+     * plain text. This method uses synchronous IPC when called from the renderer
+     * process.
+     *
+     * @platform darwin
+     */
+    writeFindText(text: string): void;
+    /**
+     * Writes `markup` to the clipboard.
+     */
+    writeHTML(markup: string, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes `image` to the clipboard.
+     */
+    writeImage(image: NativeImage, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes the `text` into the clipboard in RTF.
+     */
+    writeRTF(text: string, type?: 'selection' | 'clipboard'): void;
+    /**
+     * Writes the `text` into the clipboard as plain text.
+     */
+    writeText(text: string, type?: 'selection' | 'clipboard'): void;
+  }
+
+  class CommandLine {
+
+    // Docs: https://electronjs.org/docs/api/command-line
+
+    /**
+     * Append an argument to Chromium's command line. The argument will be quoted
+     * correctly. Switches will precede arguments regardless of appending order.
+     *
+     * If you're appending an argument like `--switch=value`, consider using
+     * `appendSwitch('switch', 'value')` instead.
+     *
+     * **Note:** This will not affect `process.argv`. The intended usage of this
+     * function is to control Chromium's behavior.
+     */
+    appendArgument(value: string): void;
+    /**
+     * Append a switch (with optional `value`) to Chromium's command line.
+     *
+     * **Note:** This will not affect `process.argv`. The intended usage of this
+     * function is to control Chromium's behavior.
+     */
+    appendSwitch(the_switch: string, value?: string): void;
+    /**
+     * The command-line switch value.
+     *
+     * **Note:** When the switch is not present or has no value, it returns empty
+     * string.
+     */
+    getSwitchValue(the_switch: string): string;
+    /**
+     * Whether the command-line switch is present.
+     */
+    hasSwitch(the_switch: string): boolean;
+    /**
+     * Removes the specified switch from Chromium's command line.
+     *
+     * **Note:** This will not affect `process.argv`. The intended usage of this
+     * function is to control Chromium's behavior.
+     */
+    removeSwitch(the_switch: string): void;
+  }
+
+  interface ContentTracing {
+
+    // Docs: https://electronjs.org/docs/api/content-tracing
+
+    /**
+     * resolves with an array of category groups once all child processes have
+     * acknowledged the `getCategories` request
+     *
+     * Get a set of category groups. The category groups can change as new code paths
+     * are reached. See also the list of built-in tracing categories.
+     *
+     * > **NOTE:** Electron adds a non-default tracing category called `"electron"`.
+     * This category can be used to capture Electron-specific tracing events.
+     */
+    getCategories(): Promise<string[]>;
+    /**
+     * Resolves with an object containing the `value` and `percentage` of trace buffer
+     * maximum usage
+     *
+     * * `value` number
+     * * `percentage` number
+     *
+     * Get the maximum usage across processes of trace buffer as a percentage of the
+     * full state.
+     */
+    getTraceBufferUsage(): Promise<Electron.TraceBufferUsageReturnValue>;
+    /**
+     * resolved once all child processes have acknowledged the `startRecording`
+     * request.
+     *
+     * Start recording on all processes.
+     *
+     * Recording begins immediately locally and asynchronously on child processes as
+     * soon as they receive the EnableRecording request.
+     *
+     * If a recording is already running, the promise will be immediately resolved, as
+     * only one trace operation can be in progress at a time.
+     */
+    startRecording(options: (TraceConfig) | (TraceCategoriesAndOptions)): Promise<void>;
+    /**
+     * resolves with a path to a file that contains the traced data once all child
+     * processes have acknowledged the `stopRecording` request
+     *
+     * Stop recording on all processes.
+     *
+     * Child processes typically cache trace data and only rarely flush and send trace
+     * data back to the main process. This helps to minimize the runtime overhead of
+     * tracing since sending trace data over IPC can be an expensive operation. So, to
+     * end tracing, Chromium asynchronously asks all child processes to flush any
+     * pending trace data.
+     *
+     * Trace data will be written into `resultFilePath`. If `resultFilePath` is empty
+     * or not provided, trace data will be written to a temporary file, and the path
+     * will be returned in the promise.
+     */
+    stopRecording(resultFilePath?: string): Promise<string>;
+  }
+
+  interface ContextBridge {
+
+    // Docs: https://electronjs.org/docs/api/context-bridge
+
+    exposeInMainWorld(apiKey: string, api: any): void;
+  }
+
+  interface Cookie {
+
+    // Docs: https://electronjs.org/docs/api/structures/cookie
+
+    /**
+     * The domain of the cookie; this will be normalized with a preceding dot so that
+     * it's also valid for subdomains.
+     */
+    domain?: string;
+    /**
+     * The expiration date of the cookie as the number of seconds since the UNIX epoch.
+     * Not provided for session cookies.
+     */
+    expirationDate?: number;
+    /**
+     * Whether the cookie is a host-only cookie; this will only be `true` if no domain
+     * was passed.
+     */
+    hostOnly?: boolean;
+    /**
+     * Whether the cookie is marked as HTTP only.
+     */
+    httpOnly?: boolean;
+    /**
+     * The name of the cookie.
+     */
+    name: string;
+    /**
+     * The path of the cookie.
+     */
+    path?: string;
+    /**
+     * The Same Site policy applied to this cookie.  Can be `unspecified`,
+     * `no_restriction`, `lax` or `strict`.
+     */
+    sameSite: ('unspecified' | 'no_restriction' | 'lax' | 'strict');
+    /**
+     * Whether the cookie is marked as secure.
+     */
+    secure?: boolean;
+    /**
+     * Whether the cookie is a session cookie or a persistent cookie with an expiration
+     * date.
+     */
+    session?: boolean;
+    /**
+     * The value of the cookie.
+     */
+    value: string;
+  }
+
+  class Cookies extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/cookies
+
+    /**
+     * Emitted when a cookie is changed because it was added, edited, removed, or
+     * expired.
+     */
+    on(event: 'changed', listener: (event: Event,
+                                    /**
+                                     * The cookie that was changed.
+                                     */
+                                    cookie: Cookie,
+                                    /**
+                                     * The cause of the change with one of the following values:
+                                     */
+                                    cause: ('explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite'),
+                                    /**
+                                     * `true` if the cookie was removed, `false` otherwise.
+                                     */
+                                    removed: boolean) => void): this;
+    once(event: 'changed', listener: (event: Event,
+                                    /**
+                                     * The cookie that was changed.
+                                     */
+                                    cookie: Cookie,
+                                    /**
+                                     * The cause of the change with one of the following values:
+                                     */
+                                    cause: ('explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite'),
+                                    /**
+                                     * `true` if the cookie was removed, `false` otherwise.
+                                     */
+                                    removed: boolean) => void): this;
+    addListener(event: 'changed', listener: (event: Event,
+                                    /**
+                                     * The cookie that was changed.
+                                     */
+                                    cookie: Cookie,
+                                    /**
+                                     * The cause of the change with one of the following values:
+                                     */
+                                    cause: ('explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite'),
+                                    /**
+                                     * `true` if the cookie was removed, `false` otherwise.
+                                     */
+                                    removed: boolean) => void): this;
+    removeListener(event: 'changed', listener: (event: Event,
+                                    /**
+                                     * The cookie that was changed.
+                                     */
+                                    cookie: Cookie,
+                                    /**
+                                     * The cause of the change with one of the following values:
+                                     */
+                                    cause: ('explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite'),
+                                    /**
+                                     * `true` if the cookie was removed, `false` otherwise.
+                                     */
+                                    removed: boolean) => void): this;
+    /**
+     * A promise which resolves when the cookie store has been flushed
+     *
+     * Writes any unwritten cookies data to disk.
+     */
+    flushStore(): Promise<void>;
+    /**
+     * A promise which resolves an array of cookie objects.
+     *
+     * Sends a request to get all cookies matching `filter`, and resolves a promise
+     * with the response.
+     */
+    get(filter: CookiesGetFilter): Promise<Electron.Cookie[]>;
+    /**
+     * A promise which resolves when the cookie has been removed
+     *
+     * Removes the cookies matching `url` and `name`
+     */
+    remove(url: string, name: string): Promise<void>;
+    /**
+     * A promise which resolves when the cookie has been set
+     *
+     * Sets a cookie with `details`.
+     */
+    set(details: CookiesSetDetails): Promise<void>;
+  }
+
+  interface CPUUsage {
+
+    // Docs: https://electronjs.org/docs/api/structures/cpu-usage
+
+    /**
+     * The number of average idle CPU wakeups per second since the last call to
+     * getCPUUsage. First call returns 0. Will always return 0 on Windows.
+     */
+    idleWakeupsPerSecond: number;
+    /**
+     * Percentage of CPU used since the last call to getCPUUsage. First call returns 0.
+     */
+    percentCPUUsage: number;
+  }
+
+  interface CrashReport {
+
+    // Docs: https://electronjs.org/docs/api/structures/crash-report
+
+    date: Date;
+    id: string;
+  }
+
+  interface CrashReporter {
+
+    // Docs: https://electronjs.org/docs/api/crash-reporter
+
+    /**
+     * Set an extra parameter to be sent with the crash report. The values specified
+     * here will be sent in addition to any values set via the `extra` option when
+     * `start` was called.
+     *
+     * Parameters added in this fashion (or via the `extra` parameter to
+     * `crashReporter.start`) are specific to the calling process. Adding extra
+     * parameters in the main process will not cause those parameters to be sent along
+     * with crashes from renderer or other child processes. Similarly, adding extra
+     * parameters in a renderer process will not result in those parameters being sent
+     * with crashes that occur in other renderer processes or in the main process.
+     *
+     * **Note:** Parameters have limits on the length of the keys and values. Key names
+     * must be no longer than 39 bytes, and values must be no longer than 20320 bytes.
+     * Keys with names longer than the maximum will be silently ignored. Key values
+     * longer than the maximum length will be truncated.
+     */
+    addExtraParameter(key: string, value: string): void;
+    /**
+     * The date and ID of the last crash report. Only crash reports that have been
+     * uploaded will be returned; even if a crash report is present on disk it will not
+     * be returned until it is uploaded. In the case that there are no uploaded
+     * reports, `null` is returned.
+     *
+     * **Note:** This method is only available in the main process.
+     */
+    getLastCrashReport(): CrashReport;
+    /**
+     * The current 'extra' parameters of the crash reporter.
+     */
+    getParameters(): Record<string, string>;
+    /**
+     * Returns all uploaded crash reports. Each report contains the date and uploaded
+     * ID.
+     *
+     * **Note:** This method is only available in the main process.
+     */
+    getUploadedReports(): CrashReport[];
+    /**
+     * Whether reports should be submitted to the server. Set through the `start`
+     * method or `setUploadToServer`.
+     *
+     * **Note:** This method is only available in the main process.
+     */
+    getUploadToServer(): boolean;
+    /**
+     * Remove an extra parameter from the current set of parameters. Future crashes
+     * will not include this parameter.
+     */
+    removeExtraParameter(key: string): void;
+    /**
+     * This would normally be controlled by user preferences. This has no effect if
+     * called before `start` is called.
+     *
+     * **Note:** This method is only available in the main process.
+     */
+    setUploadToServer(uploadToServer: boolean): void;
+    /**
+     * This method must be called before using any other `crashReporter` APIs. Once
+     * initialized this way, the crashpad handler collects crashes from all
+     * subsequently created processes. The crash reporter cannot be disabled once
+     * started.
+     *
+     * This method should be called as early as possible in app startup, preferably
+     * before `app.on('ready')`. If the crash reporter is not initialized at the time a
+     * renderer process is created, then that renderer process will not be monitored by
+     * the crash reporter.
+     *
+     * **Note:** You can test out the crash reporter by generating a crash using
+     * `process.crash()`.
+     *
+     * **Note:** If you need to send additional/updated `extra` parameters after your
+     * first call `start` you can call `addExtraParameter`.
+     *
+     * **Note:** Parameters passed in `extra`, `globalExtra` or set with
+     * `addExtraParameter` have limits on the length of the keys and values. Key names
+     * must be at most 39 bytes long, and values must be no longer than 127 bytes. Keys
+     * with names longer than the maximum will be silently ignored. Key values longer
+     * than the maximum length will be truncated.
+     *
+     * **Note:** This method is only available in the main process.
+     */
+    start(options: CrashReporterStartOptions): void;
+  }
+
+  interface CustomScheme {
+
+    // Docs: https://electronjs.org/docs/api/structures/custom-scheme
+
+    privileges?: Privileges;
+    /**
+     * Custom schemes to be registered with options.
+     */
+    scheme: string;
+  }
+
+  class Debugger extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/debugger
+
+    /**
+     * Emitted when the debugging session is terminated. This happens either when
+     * `webContents` is closed or devtools is invoked for the attached `webContents`.
+     */
+    on(event: 'detach', listener: (event: Event,
+                                   /**
+                                    * Reason for detaching debugger.
+                                    */
+                                   reason: string) => void): this;
+    once(event: 'detach', listener: (event: Event,
+                                   /**
+                                    * Reason for detaching debugger.
+                                    */
+                                   reason: string) => void): this;
+    addListener(event: 'detach', listener: (event: Event,
+                                   /**
+                                    * Reason for detaching debugger.
+                                    */
+                                   reason: string) => void): this;
+    removeListener(event: 'detach', listener: (event: Event,
+                                   /**
+                                    * Reason for detaching debugger.
+                                    */
+                                   reason: string) => void): this;
+    /**
+     * Emitted whenever the debugging target issues an instrumentation event.
+     */
+    on(event: 'message', listener: (event: Event,
+                                    /**
+                                     * Method name.
+                                     */
+                                    method: string,
+                                    /**
+                                     * Event parameters defined by the 'parameters' attribute in the remote debugging
+                                     * protocol.
+                                     */
+                                    params: any,
+                                    /**
+                                     * Unique identifier of attached debugging session, will match the value sent from
+                                     * `debugger.sendCommand`.
+                                     */
+                                    sessionId: string) => void): this;
+    once(event: 'message', listener: (event: Event,
+                                    /**
+                                     * Method name.
+                                     */
+                                    method: string,
+                                    /**
+                                     * Event parameters defined by the 'parameters' attribute in the remote debugging
+                                     * protocol.
+                                     */
+                                    params: any,
+                                    /**
+                                     * Unique identifier of attached debugging session, will match the value sent from
+                                     * `debugger.sendCommand`.
+                                     */
+                                    sessionId: string) => void): this;
+    addListener(event: 'message', listener: (event: Event,
+                                    /**
+                                     * Method name.
+                                     */
+                                    method: string,
+                                    /**
+                                     * Event parameters defined by the 'parameters' attribute in the remote debugging
+                                     * protocol.
+                                     */
+                                    params: any,
+                                    /**
+                                     * Unique identifier of attached debugging session, will match the value sent from
+                                     * `debugger.sendCommand`.
+                                     */
+                                    sessionId: string) => void): this;
+    removeListener(event: 'message', listener: (event: Event,
+                                    /**
+                                     * Method name.
+                                     */
+                                    method: string,
+                                    /**
+                                     * Event parameters defined by the 'parameters' attribute in the remote debugging
+                                     * protocol.
+                                     */
+                                    params: any,
+                                    /**
+                                     * Unique identifier of attached debugging session, will match the value sent from
+                                     * `debugger.sendCommand`.
+                                     */
+                                    sessionId: string) => void): this;
+    /**
+     * Attaches the debugger to the `webContents`.
+     */
+    attach(protocolVersion?: string): void;
+    /**
+     * Detaches the debugger from the `webContents`.
+     */
+    detach(): void;
+    /**
+     * Whether a debugger is attached to the `webContents`.
+     */
+    isAttached(): boolean;
+    /**
+     * A promise that resolves with the response defined by the 'returns' attribute of
+     * the command description in the remote debugging protocol or is rejected
+     * indicating the failure of the command.
+     *
+     * Send given command to the debugging target.
+     */
+    sendCommand(method: string, commandParams?: any, sessionId?: string): Promise<any>;
+  }
+
+  interface DesktopCapturer {
+
+    // Docs: https://electronjs.org/docs/api/desktop-capturer
+
+    /**
+     * Resolves with an array of `DesktopCapturerSource` objects, each
+     * `DesktopCapturerSource` represents a screen or an individual window that can be
+     * captured.
+     *
+     * **Note** Capturing the screen contents requires user consent on macOS 10.15
+     * Catalina or higher, which can detected by
+     * `systemPreferences.getMediaAccessStatus`.
+     */
+    getSources(options: SourcesOptions): Promise<Electron.DesktopCapturerSource[]>;
+  }
+
+  interface DesktopCapturerSource {
+
+    // Docs: https://electronjs.org/docs/api/structures/desktop-capturer-source
+
+    /**
+     * An icon image of the application that owns the window or null if the source has
+     * a type screen. The size of the icon is not known in advance and depends on what
+     * the application provides.
+     */
+    appIcon: NativeImage;
+    /**
+     * A unique identifier that will correspond to the `id` of the matching Display
+     * returned by the Screen API. On some platforms, this is equivalent to the `XX`
+     * portion of the `id` field above and on others it will differ. It will be an
+     * empty string if not available.
+     */
+    display_id: string;
+    /**
+     * The identifier of a window or screen that can be used as a `chromeMediaSourceId`
+     * constraint when calling [`navigator.webkitGetUserMedia`]. The format of the
+     * identifier will be `window:XX:YY` or `screen:ZZ:0`. XX is the windowID/handle.
+     * YY is 1 for the current process, and 0 for all others. ZZ is a sequential number
+     * that represents the screen, and it does not equal to the index in the source's
+     * name.
+     */
+    id: string;
+    /**
+     * A screen source will be named either `Entire Screen` or `Screen <index>`, while
+     * the name of a window source will match the window title.
+     */
+    name: string;
+    /**
+     * A thumbnail image. **Note:** There is no guarantee that the size of the
+     * thumbnail is the same as the `thumbnailSize` specified in the `options` passed
+     * to `desktopCapturer.getSources`. The actual size depends on the scale of the
+     * screen or window.
+     */
+    thumbnail: NativeImage;
+  }
+
+  interface Dialog {
+
+    // Docs: https://electronjs.org/docs/api/dialog
+
+    /**
+     * resolves when the certificate trust dialog is shown.
+     *
+     * On macOS, this displays a modal dialog that shows a message and certificate
+     * information, and gives the user the option of trusting/importing the
+     * certificate. If you provide a `browserWindow` argument the dialog will be
+     * attached to the parent window, making it modal.
+     *
+     * On Windows the options are more limited, due to the Win32 APIs used:
+     *
+     * * The `message` argument is not used, as the OS provides its own confirmation
+     * dialog.
+     * * The `browserWindow` argument is ignored since it is not possible to make this
+     * confirmation dialog modal.
+     *
+     * @platform darwin,win32
+     */
+    showCertificateTrustDialog(browserWindow: BrowserWindow, options: CertificateTrustDialogOptions): Promise<void>;
+    /**
+     * resolves when the certificate trust dialog is shown.
+     *
+     * On macOS, this displays a modal dialog that shows a message and certificate
+     * information, and gives the user the option of trusting/importing the
+     * certificate. If you provide a `browserWindow` argument the dialog will be
+     * attached to the parent window, making it modal.
+     *
+     * On Windows the options are more limited, due to the Win32 APIs used:
+     *
+     * * The `message` argument is not used, as the OS provides its own confirmation
+     * dialog.
+     * * The `browserWindow` argument is ignored since it is not possible to make this
+     * confirmation dialog modal.
+     *
+     * @platform darwin,win32
+     */
+    showCertificateTrustDialog(options: CertificateTrustDialogOptions): Promise<void>;
+    /**
+     * Displays a modal dialog that shows an error message.
+     *
+     * This API can be called safely before the `ready` event the `app` module emits,
+     * it is usually used to report errors in early stage of startup. If called before
+     * the app `ready`event on Linux, the message will be emitted to stderr, and no GUI
+     * dialog will appear.
+     */
+    showErrorBox(title: string, content: string): void;
+    /**
+     * resolves with a promise containing the following properties:
+     *
+     * * `response` number - The index of the clicked button.
+     * * `checkboxChecked` boolean - The checked state of the checkbox if
+     * `checkboxLabel` was set. Otherwise `false`.
+     *
+     * Shows a message box.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     */
+    showMessageBox(browserWindow: BrowserWindow, options: MessageBoxOptions): Promise<Electron.MessageBoxReturnValue>;
+    /**
+     * resolves with a promise containing the following properties:
+     *
+     * * `response` number - The index of the clicked button.
+     * * `checkboxChecked` boolean - The checked state of the checkbox if
+     * `checkboxLabel` was set. Otherwise `false`.
+     *
+     * Shows a message box.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     */
+    showMessageBox(options: MessageBoxOptions): Promise<Electron.MessageBoxReturnValue>;
+    /**
+     * the index of the clicked button.
+     *
+     * Shows a message box, it will block the process until the message box is closed.
+     * It returns the index of the clicked button.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal. If `browserWindow` is not shown dialog will not be
+     * attached to it. In such case it will be displayed as an independent window.
+     */
+    showMessageBoxSync(browserWindow: BrowserWindow, options: MessageBoxSyncOptions): number;
+    /**
+     * the index of the clicked button.
+     *
+     * Shows a message box, it will block the process until the message box is closed.
+     * It returns the index of the clicked button.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal. If `browserWindow` is not shown dialog will not be
+     * attached to it. In such case it will be displayed as an independent window.
+     */
+    showMessageBoxSync(options: MessageBoxSyncOptions): number;
+    /**
+     * Resolve with an object containing the following:
+     *
+     * * `canceled` boolean - whether or not the dialog was canceled.
+     * * `filePaths` string[] - An array of file paths chosen by the user. If the
+     * dialog is cancelled this will be an empty array.
+     * * `bookmarks` string[] (optional) _macOS_ _mas_ - An array matching the
+     * `filePaths` array of base64 encoded strings which contains security scoped
+     * bookmark data. `securityScopedBookmarks` must be enabled for this to be
+     * populated. (For return values, see table here.)
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed or selected
+     * when you want to limit the user to a specific type. For example:
+     *
+     * The `extensions` array should contain extensions without wildcards or dots (e.g.
+     * `'png'` is good but `'.png'` and `'*.png'` are bad). To show all files, use the
+     * `'*'` wildcard (no other wildcard is supported).
+     *
+     * **Note:** On Windows and Linux an open dialog can not be both a file selector
+     * and a directory selector, so if you set `properties` to `['openFile',
+     * 'openDirectory']` on these platforms, a directory selector will be shown.
+     */
+    showOpenDialog(browserWindow: BrowserWindow, options: OpenDialogOptions): Promise<Electron.OpenDialogReturnValue>;
+    /**
+     * Resolve with an object containing the following:
+     *
+     * * `canceled` boolean - whether or not the dialog was canceled.
+     * * `filePaths` string[] - An array of file paths chosen by the user. If the
+     * dialog is cancelled this will be an empty array.
+     * * `bookmarks` string[] (optional) _macOS_ _mas_ - An array matching the
+     * `filePaths` array of base64 encoded strings which contains security scoped
+     * bookmark data. `securityScopedBookmarks` must be enabled for this to be
+     * populated. (For return values, see table here.)
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed or selected
+     * when you want to limit the user to a specific type. For example:
+     *
+     * The `extensions` array should contain extensions without wildcards or dots (e.g.
+     * `'png'` is good but `'.png'` and `'*.png'` are bad). To show all files, use the
+     * `'*'` wildcard (no other wildcard is supported).
+     *
+     * **Note:** On Windows and Linux an open dialog can not be both a file selector
+     * and a directory selector, so if you set `properties` to `['openFile',
+     * 'openDirectory']` on these platforms, a directory selector will be shown.
+     */
+    showOpenDialog(options: OpenDialogOptions): Promise<Electron.OpenDialogReturnValue>;
+    /**
+     * the file paths chosen by the user; if the dialog is cancelled it returns
+     * `undefined`.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed or selected
+     * when you want to limit the user to a specific type. For example:
+     *
+     * The `extensions` array should contain extensions without wildcards or dots (e.g.
+     * `'png'` is good but `'.png'` and `'*.png'` are bad). To show all files, use the
+     * `'*'` wildcard (no other wildcard is supported).
+     *
+     * **Note:** On Windows and Linux an open dialog can not be both a file selector
+     * and a directory selector, so if you set `properties` to `['openFile',
+     * 'openDirectory']` on these platforms, a directory selector will be shown.
+     */
+    showOpenDialogSync(browserWindow: BrowserWindow, options: OpenDialogSyncOptions): (string[]) | (undefined);
+    /**
+     * the file paths chosen by the user; if the dialog is cancelled it returns
+     * `undefined`.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed or selected
+     * when you want to limit the user to a specific type. For example:
+     *
+     * The `extensions` array should contain extensions without wildcards or dots (e.g.
+     * `'png'` is good but `'.png'` and `'*.png'` are bad). To show all files, use the
+     * `'*'` wildcard (no other wildcard is supported).
+     *
+     * **Note:** On Windows and Linux an open dialog can not be both a file selector
+     * and a directory selector, so if you set `properties` to `['openFile',
+     * 'openDirectory']` on these platforms, a directory selector will be shown.
+     */
+    showOpenDialogSync(options: OpenDialogSyncOptions): (string[]) | (undefined);
+    /**
+     * Resolve with an object containing the following:
+     *
+     * * `canceled` boolean - whether or not the dialog was canceled.
+     * * `filePath` string (optional) - If the dialog is canceled, this will be
+     * `undefined`.
+     * * `bookmark` string (optional) _macOS_ _mas_ - Base64 encoded string which
+     * contains the security scoped bookmark data for the saved file.
+     * `securityScopedBookmarks` must be enabled for this to be present. (For return
+     * values, see table here.)
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed, see
+     * `dialog.showOpenDialog` for an example.
+     *
+     * **Note:** On macOS, using the asynchronous version is recommended to avoid
+     * issues when expanding and collapsing the dialog.
+     */
+    showSaveDialog(browserWindow: BrowserWindow, options: SaveDialogOptions): Promise<Electron.SaveDialogReturnValue>;
+    /**
+     * Resolve with an object containing the following:
+     *
+     * * `canceled` boolean - whether or not the dialog was canceled.
+     * * `filePath` string (optional) - If the dialog is canceled, this will be
+     * `undefined`.
+     * * `bookmark` string (optional) _macOS_ _mas_ - Base64 encoded string which
+     * contains the security scoped bookmark data for the saved file.
+     * `securityScopedBookmarks` must be enabled for this to be present. (For return
+     * values, see table here.)
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed, see
+     * `dialog.showOpenDialog` for an example.
+     *
+     * **Note:** On macOS, using the asynchronous version is recommended to avoid
+     * issues when expanding and collapsing the dialog.
+     */
+    showSaveDialog(options: SaveDialogOptions): Promise<Electron.SaveDialogReturnValue>;
+    /**
+     * the path of the file chosen by the user; if the dialog is cancelled it returns
+     * `undefined`.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed, see
+     * `dialog.showOpenDialog` for an example.
+     */
+    showSaveDialogSync(browserWindow: BrowserWindow, options: SaveDialogSyncOptions): (string) | (undefined);
+    /**
+     * the path of the file chosen by the user; if the dialog is cancelled it returns
+     * `undefined`.
+     *
+     * The `browserWindow` argument allows the dialog to attach itself to a parent
+     * window, making it modal.
+     *
+     * The `filters` specifies an array of file types that can be displayed, see
+     * `dialog.showOpenDialog` for an example.
+     */
+    showSaveDialogSync(options: SaveDialogSyncOptions): (string) | (undefined);
+  }
+
+  interface Display {
+
+    // Docs: https://electronjs.org/docs/api/structures/display
+
+    /**
+     * Can be `available`, `unavailable`, `unknown`.
+     */
+    accelerometerSupport: ('available' | 'unavailable' | 'unknown');
+    /**
+     * the bounds of the display in DIP points.
+     */
+    bounds: Rectangle;
+    /**
+     * The number of bits per pixel.
+     */
+    colorDepth: number;
+    /**
+     *  represent a color space (three-dimensional object which contains all realizable
+     * color combinations) for the purpose of color conversions
+     */
+    colorSpace: string;
+    /**
+     * The number of bits per color component.
+     */
+    depthPerComponent: number;
+    /**
+     * The display refresh rate.
+     */
+    displayFrequency: number;
+    /**
+     * Unique identifier associated with the display.
+     */
+    id: number;
+    /**
+     * `true` for an internal display and `false` for an external display
+     */
+    internal: boolean;
+    /**
+     * Whether or not the display is a monochrome display.
+     */
+    monochrome: boolean;
+    /**
+     * Can be 0, 90, 180, 270, represents screen rotation in clock-wise degrees.
+     */
+    rotation: number;
+    /**
+     * Output device's pixel scale factor.
+     */
+    scaleFactor: number;
+    size: Size;
+    /**
+     * Can be `available`, `unavailable`, `unknown`.
+     */
+    touchSupport: ('available' | 'unavailable' | 'unknown');
+    /**
+     * the work area of the display in DIP points.
+     */
+    workArea: Rectangle;
+    workAreaSize: Size;
+  }
+
+  class Dock {
+
+    // Docs: https://electronjs.org/docs/api/dock
+
+    /**
+     * an ID representing the request.
+     *
+     * When `critical` is passed, the dock icon will bounce until either the
+     * application becomes active or the request is canceled.
+     *
+     * When `informational` is passed, the dock icon will bounce for one second.
+     * However, the request remains active until either the application becomes active
+     * or the request is canceled.
+     *
+     * **Note:** This method can only be used while the app is not focused; when the
+     * app is focused it will return -1.
+     *
+     * @platform darwin
+     */
+    bounce(type?: 'critical' | 'informational'): number;
+    /**
+     * Cancel the bounce of `id`.
+     *
+     * @platform darwin
+     */
+    cancelBounce(id: number): void;
+    /**
+     * Bounces the Downloads stack if the filePath is inside the Downloads folder.
+     *
+     * @platform darwin
+     */
+    downloadFinished(filePath: string): void;
+    /**
+     * The badge string of the dock.
+     *
+     * @platform darwin
+     */
+    getBadge(): string;
+    /**
+     * The application's [dock menu][dock-menu].
+     *
+     * @platform darwin
+     */
+    getMenu(): (Menu) | (null);
+    /**
+     * Hides the dock icon.
+     *
+     * @platform darwin
+     */
+    hide(): void;
+    /**
+     * Whether the dock icon is visible.
+     *
+     * @platform darwin
+     */
+    isVisible(): boolean;
+    /**
+     * Sets the string to be displayed in the dock’s badging area.
+     *
+     * @platform darwin
+     */
+    setBadge(text: string): void;
+    /**
+     * Sets the `image` associated with this dock icon.
+     *
+     * @platform darwin
+     */
+    setIcon(image: (NativeImage) | (string)): void;
+    /**
+     * Sets the application's [dock menu][dock-menu].
+     *
+     * @platform darwin
+     */
+    setMenu(menu: Menu): void;
+    /**
+     * Resolves when the dock icon is shown.
+     *
+     * @platform darwin
+     */
+    show(): Promise<void>;
+  }
+
+  class DownloadItem extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/download-item
+
+    /**
+     * Emitted when the download is in a terminal state. This includes a completed
+     * download, a cancelled download (via `downloadItem.cancel()`), and interrupted
+     * download that can't be resumed.
+     *
+     * The `state` can be one of following:
+     *
+     * * `completed` - The download completed successfully.
+     * * `cancelled` - The download has been cancelled.
+     * * `interrupted` - The download has interrupted and can not resume.
+     */
+    on(event: 'done', listener: (event: Event,
+                                 /**
+                                  * Can be `completed`, `cancelled` or `interrupted`.
+                                  */
+                                 state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
+    once(event: 'done', listener: (event: Event,
+                                 /**
+                                  * Can be `completed`, `cancelled` or `interrupted`.
+                                  */
+                                 state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
+    addListener(event: 'done', listener: (event: Event,
+                                 /**
+                                  * Can be `completed`, `cancelled` or `interrupted`.
+                                  */
+                                 state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
+    removeListener(event: 'done', listener: (event: Event,
+                                 /**
+                                  * Can be `completed`, `cancelled` or `interrupted`.
+                                  */
+                                 state: ('completed' | 'cancelled' | 'interrupted')) => void): this;
+    /**
+     * Emitted when the download has been updated and is not done.
+     *
+     * The `state` can be one of following:
+     *
+     * * `progressing` - The download is in-progress.
+     * * `interrupted` - The download has interrupted and can be resumed.
+     */
+    on(event: 'updated', listener: (event: Event,
+                                    /**
+                                     * Can be `progressing` or `interrupted`.
+                                     */
+                                    state: ('progressing' | 'interrupted')) => void): this;
+    once(event: 'updated', listener: (event: Event,
+                                    /**
+                                     * Can be `progressing` or `interrupted`.
+                                     */
+                                    state: ('progressing' | 'interrupted')) => void): this;
+    addListener(event: 'updated', listener: (event: Event,
+                                    /**
+                                     * Can be `progressing` or `interrupted`.
+                                     */
+                                    state: ('progressing' | 'interrupted')) => void): this;
+    removeListener(event: 'updated', listener: (event: Event,
+                                    /**
+                                     * Can be `progressing` or `interrupted`.
+                                     */
+                                    state: ('progressing' | 'interrupted')) => void): this;
+    /**
+     * Cancels the download operation.
+     */
+    cancel(): void;
+    /**
+     * Whether the download can resume.
+     */
+    canResume(): boolean;
+    /**
+     * The Content-Disposition field from the response header.
+     */
+    getContentDisposition(): string;
+    /**
+     * ETag header value.
+     */
+    getETag(): string;
+    /**
+     * The file name of the download item.
+     *
+     * **Note:** The file name is not always the same as the actual one saved in local
+     * disk. If user changes the file name in a prompted download saving dialog, the
+     * actual name of saved file will be different.
+     */
+    getFilename(): string;
+    /**
+     * Last-Modified header value.
+     */
+    getLastModifiedTime(): string;
+    /**
+     * The files mime type.
+     */
+    getMimeType(): string;
+    /**
+     * The received bytes of the download item.
+     */
+    getReceivedBytes(): number;
+    /**
+     * Returns the object previously set by
+     * `downloadItem.setSaveDialogOptions(options)`.
+     */
+    getSaveDialogOptions(): SaveDialogOptions;
+    /**
+     * The save path of the download item. This will be either the path set via
+     * `downloadItem.setSavePath(path)` or the path selected from the shown save
+     * dialog.
+     */
+    getSavePath(): string;
+    /**
+     * Number of seconds since the UNIX epoch when the download was started.
+     */
+    getStartTime(): number;
+    /**
+     * The current state. Can be `progressing`, `completed`, `cancelled` or
+     * `interrupted`.
+     *
+     * **Note:** The following methods are useful specifically to resume a `cancelled`
+     * item when session is restarted.
+     */
+    getState(): ('progressing' | 'completed' | 'cancelled' | 'interrupted');
+    /**
+     * The total size in bytes of the download item.
+     *
+     * If the size is unknown, it returns 0.
+     */
+    getTotalBytes(): number;
+    /**
+     * The origin URL where the item is downloaded from.
+     */
+    getURL(): string;
+    /**
+     * The complete URL chain of the item including any redirects.
+     */
+    getURLChain(): string[];
+    /**
+     * Whether the download has user gesture.
+     */
+    hasUserGesture(): boolean;
+    /**
+     * Whether the download is paused.
+     */
+    isPaused(): boolean;
+    /**
+     * Pauses the download.
+     */
+    pause(): void;
+    /**
+     * Resumes the download that has been paused.
+     *
+     * **Note:** To enable resumable downloads the server you are downloading from must
+     * support range requests and provide both `Last-Modified` and `ETag` header
+     * values. Otherwise `resume()` will dismiss previously received bytes and restart
+     * the download from the beginning.
+     */
+    resume(): void;
+    /**
+     * This API allows the user to set custom options for the save dialog that opens
+     * for the download item by default. The API is only available in session's
+     * `will-download` callback function.
+     */
+    setSaveDialogOptions(options: SaveDialogOptions): void;
+    /**
+     * The API is only available in session's `will-download` callback function. If
+     * `path` doesn't exist, Electron will try to make the directory recursively. If
+     * user doesn't set the save path via the API, Electron will use the original
+     * routine to determine the save path; this usually prompts a save dialog.
+     */
+    setSavePath(path: string): void;
+    /**
+     * A `string` property that determines the save file path of the download item.
+     *
+     * The property is only available in session's `will-download` callback function.
+     * If user doesn't set the save path via the property, Electron will use the
+     * original routine to determine the save path; this usually prompts a save dialog.
+     */
+    savePath: string;
+  }
+
+  interface Event extends GlobalEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/event
+
+    preventDefault: (() => void);
+  }
+
+  interface Extension {
+
+    // Docs: https://electronjs.org/docs/api/structures/extension
+
+    id: string;
+    /**
+     * Copy of the extension's manifest data.
+     */
+    manifest: any;
+    name: string;
+    /**
+     * The extension's file path.
+     */
+    path: string;
+    /**
+     * The extension's `chrome-extension://` URL.
+     */
+    url: string;
+    version: string;
+  }
+
+  interface ExtensionInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/extension-info
+
+    name: string;
+    version: string;
+  }
+
+  interface FileFilter {
+
+    // Docs: https://electronjs.org/docs/api/structures/file-filter
+
+    extensions: string[];
+    name: string;
+  }
+
+  interface FilePathWithHeaders {
+
+    // Docs: https://electronjs.org/docs/api/structures/file-path-with-headers
+
+    /**
+     * Additional headers to be sent.
+     */
+    headers?: Record<string, string>;
+    /**
+     * The path to the file to send.
+     */
+    path: string;
+  }
+
+  interface GlobalShortcut {
+
+    // Docs: https://electronjs.org/docs/api/global-shortcut
+
+    /**
+     * Whether this application has registered `accelerator`.
+     *
+     * When the accelerator is already taken by other applications, this call will
+     * still return `false`. This behavior is intended by operating systems, since they
+     * don't want applications to fight for global shortcuts.
+     */
+    isRegistered(accelerator: Accelerator): boolean;
+    /**
+     * Whether or not the shortcut was registered successfully.
+     *
+     * Registers a global shortcut of `accelerator`. The `callback` is called when the
+     * registered shortcut is pressed by the user.
+     *
+     * When the accelerator is already taken by other applications, this call will
+     * silently fail. This behavior is intended by operating systems, since they don't
+     * want applications to fight for global shortcuts.
+     *
+     * The following accelerators will not be registered successfully on macOS 10.14
+     * Mojave unless the app has been authorized as a trusted accessibility client:
+     *
+     * * "Media Play/Pause"
+     * * "Media Next Track"
+     * * "Media Previous Track"
+     * * "Media Stop"
+     */
+    register(accelerator: Accelerator, callback: () => void): boolean;
+    /**
+     * Registers a global shortcut of all `accelerator` items in `accelerators`. The
+     * `callback` is called when any of the registered shortcuts are pressed by the
+     * user.
+     *
+     * When a given accelerator is already taken by other applications, this call will
+     * silently fail. This behavior is intended by operating systems, since they don't
+     * want applications to fight for global shortcuts.
+     *
+     * The following accelerators will not be registered successfully on macOS 10.14
+     * Mojave unless the app has been authorized as a trusted accessibility client:
+     *
+     * * "Media Play/Pause"
+     * * "Media Next Track"
+     * * "Media Previous Track"
+     * * "Media Stop"
+     */
+    registerAll(accelerators: string[], callback: () => void): void;
+    /**
+     * Unregisters the global shortcut of `accelerator`.
+     */
+    unregister(accelerator: Accelerator): void;
+    /**
+     * Unregisters all of the global shortcuts.
+     */
+    unregisterAll(): void;
+  }
+
+  interface GPUFeatureStatus {
+
+    // Docs: https://electronjs.org/docs/api/structures/gpu-feature-status
+
+    /**
+     * Canvas.
+     */
+    '2d_canvas': string;
+    /**
+     * Flash.
+     */
+    flash_3d: string;
+    /**
+     * Flash Stage3D.
+     */
+    flash_stage3d: string;
+    /**
+     * Flash Stage3D Baseline profile.
+     */
+    flash_stage3d_baseline: string;
+    /**
+     * Compositing.
+     */
+    gpu_compositing: string;
+    /**
+     * Multiple Raster Threads.
+     */
+    multiple_raster_threads: string;
+    /**
+     * Native GpuMemoryBuffers.
+     */
+    native_gpu_memory_buffers: string;
+    /**
+     * Rasterization.
+     */
+    rasterization: string;
+    /**
+     * Video Decode.
+     */
+    video_decode: string;
+    /**
+     * Video Encode.
+     */
+    video_encode: string;
+    /**
+     * VPx Video Decode.
+     */
+    vpx_decode: string;
+    /**
+     * WebGL.
+     */
+    webgl: string;
+    /**
+     * WebGL2.
+     */
+    webgl2: string;
+  }
+
+  interface HIDDevice {
+
+    // Docs: https://electronjs.org/docs/api/structures/hid-device
+
+    /**
+     * Unique identifier for the device.
+     */
+    deviceId: string;
+    /**
+     * Unique identifier for the HID interface.  A device may have multiple HID
+     * interfaces.
+     */
+    guid?: string;
+    /**
+     * Name of the device.
+     */
+    name: string;
+    /**
+     * The USB product ID.
+     */
+    productId: number;
+    /**
+     * The USB device serial number.
+     */
+    serialNumber?: string;
+    /**
+     * The USB vendor ID.
+     */
+    vendorId: number;
+  }
+
+  interface InAppPurchase extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/in-app-purchase
+
+    on(event: 'transactions-updated', listener: Function): this;
+    once(event: 'transactions-updated', listener: Function): this;
+    addListener(event: 'transactions-updated', listener: Function): this;
+    removeListener(event: 'transactions-updated', listener: Function): this;
+    /**
+     * whether a user can make a payment.
+     */
+    canMakePayments(): boolean;
+    /**
+     * Completes all pending transactions.
+     */
+    finishAllTransactions(): void;
+    /**
+     * Completes the pending transactions corresponding to the date.
+     */
+    finishTransactionByDate(date: string): void;
+    /**
+     * Resolves with an array of `Product` objects.
+     *
+     * Retrieves the product descriptions.
+     */
+    getProducts(productIDs: string[]): Promise<Electron.Product[]>;
+    /**
+     * the path to the receipt.
+     */
+    getReceiptURL(): string;
+    /**
+     * Returns `true` if the product is valid and added to the payment queue.
+     *
+     * You should listen for the `transactions-updated` event as soon as possible and
+     * certainly before you call `purchaseProduct`.
+     */
+    purchaseProduct(productID: string, quantity?: number): Promise<boolean>;
+    /**
+     * Restores finished transactions. This method can be called either to install
+     * purchases on additional devices, or to restore purchases for an application that
+     * the user deleted and reinstalled.
+     *
+     * The payment queue delivers a new transaction for each previously completed
+     * transaction that can be restored. Each transaction includes a copy of the
+     * original transaction.
+     */
+    restoreCompletedTransactions(): void;
+  }
+
+  class IncomingMessage extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/incoming-message
+
+    /**
+     * Emitted when a request has been canceled during an ongoing HTTP transaction.
+     */
+    on(event: 'aborted', listener: Function): this;
+    once(event: 'aborted', listener: Function): this;
+    addListener(event: 'aborted', listener: Function): this;
+    removeListener(event: 'aborted', listener: Function): this;
+    /**
+     * The `data` event is the usual method of transferring response data into
+     * applicative code.
+     */
+    on(event: 'data', listener: (
+                                 /**
+                                  * A chunk of response body's data.
+                                  */
+                                 chunk: Buffer) => void): this;
+    once(event: 'data', listener: (
+                                 /**
+                                  * A chunk of response body's data.
+                                  */
+                                 chunk: Buffer) => void): this;
+    addListener(event: 'data', listener: (
+                                 /**
+                                  * A chunk of response body's data.
+                                  */
+                                 chunk: Buffer) => void): this;
+    removeListener(event: 'data', listener: (
+                                 /**
+                                  * A chunk of response body's data.
+                                  */
+                                 chunk: Buffer) => void): this;
+    /**
+     * Indicates that response body has ended. Must be placed before 'data' event.
+     */
+    on(event: 'end', listener: Function): this;
+    once(event: 'end', listener: Function): this;
+    addListener(event: 'end', listener: Function): this;
+    removeListener(event: 'end', listener: Function): this;
+    /**
+     * Returns:
+     *
+     * `error` Error - Typically holds an error string identifying failure root cause.
+     *
+     * Emitted when an error was encountered while streaming response data events. For
+     * instance, if the server closes the underlying while the response is still
+     * streaming, an `error` event will be emitted on the response object and a `close`
+     * event will subsequently follow on the request object.
+     */
+    on(event: 'error', listener: Function): this;
+    once(event: 'error', listener: Function): this;
+    addListener(event: 'error', listener: Function): this;
+    removeListener(event: 'error', listener: Function): this;
+    /**
+     * A `Record<string, string | string[]>` representing the HTTP response headers.
+     * The `headers` object is formatted as follows:
+     *
+     * * All header names are lowercased.
+     * * Duplicates of `age`, `authorization`, `content-length`, `content-type`,
+     * `etag`, `expires`, `from`, `host`, `if-modified-since`, `if-unmodified-since`,
+     * `last-modified`, `location`, `max-forwards`, `proxy-authorization`, `referer`,
+     * `retry-after`, `server`, or `user-agent` are discarded.
+     * * `set-cookie` is always an array. Duplicates are added to the array.
+     * * For duplicate `cookie` headers, the values are joined together with '; '.
+     * * For all other headers, the values are joined together with ', '.
+     */
+    headers: Record<string, (string) | (string[])>;
+    /**
+     * A `string` indicating the HTTP protocol version number. Typical values are '1.0'
+     * or '1.1'. Additionally `httpVersionMajor` and `httpVersionMinor` are two
+     * Integer-valued readable properties that return respectively the HTTP major and
+     * minor version numbers.
+     */
+    httpVersion: string;
+    /**
+     * An `Integer` indicating the HTTP protocol major version number.
+     */
+    httpVersionMajor: number;
+    /**
+     * An `Integer` indicating the HTTP protocol minor version number.
+     */
+    httpVersionMinor: number;
+    /**
+     * A `string[]` containing the raw HTTP response headers exactly as they were
+     * received. The keys and values are in the same list. It is not a list of tuples.
+     * So, the even-numbered offsets are key values, and the odd-numbered offsets are
+     * the associated values. Header names are not lowercased, and duplicates are not
+     * merged.
+     */
+    rawHeaders: string[];
+    /**
+     * An `Integer` indicating the HTTP response status code.
+     */
+    statusCode: number;
+    /**
+     * A `string` representing the HTTP status message.
+     */
+    statusMessage: string;
+  }
+
+  interface InputEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/input-event
+
+    /**
+     * An array of modifiers of the event, can be `shift`, `control`, `ctrl`, `alt`,
+     * `meta`, `command`, `cmd`, `isKeypad`, `isAutoRepeat`, `leftButtonDown`,
+     * `middleButtonDown`, `rightButtonDown`, `capsLock`, `numLock`, `left`, `right`.
+     */
+    modifiers?: Array<'shift' | 'control' | 'ctrl' | 'alt' | 'meta' | 'command' | 'cmd' | 'isKeypad' | 'isAutoRepeat' | 'leftButtonDown' | 'middleButtonDown' | 'rightButtonDown' | 'capsLock' | 'numLock' | 'left' | 'right'>;
+  }
+
+  interface IOCounters {
+
+    // Docs: https://electronjs.org/docs/api/structures/io-counters
+
+    /**
+     * Then number of I/O other operations.
+     */
+    otherOperationCount: number;
+    /**
+     * Then number of I/O other transfers.
+     */
+    otherTransferCount: number;
+    /**
+     * The number of I/O read operations.
+     */
+    readOperationCount: number;
+    /**
+     * The number of I/O read transfers.
+     */
+    readTransferCount: number;
+    /**
+     * The number of I/O write operations.
+     */
+    writeOperationCount: number;
+    /**
+     * The number of I/O write transfers.
+     */
+    writeTransferCount: number;
+  }
+
+  interface IpcMain extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/ipc-main
+
+    /**
+     * Adds a handler for an `invoke`able IPC. This handler will be called whenever a
+     * renderer calls `ipcRenderer.invoke(channel, ...args)`.
+     *
+     * If `listener` returns a Promise, the eventual result of the promise will be
+     * returned as a reply to the remote caller. Otherwise, the return value of the
+     * listener will be used as the value of the reply.
+     *
+     * The `event` that is passed as the first argument to the handler is the same as
+     * that passed to a regular event listener. It includes information about which
+     * WebContents is the source of the invoke request.
+     *
+     * Errors thrown through `handle` in the main process are not transparent as they
+     * are serialized and only the `message` property from the original error is
+     * provided to the renderer process. Please refer to #24427 for details.
+     */
+    handle(channel: string, listener: (event: IpcMainInvokeEvent, ...args: any[]) => (Promise<void>) | (any)): void;
+    /**
+     * Handles a single `invoke`able IPC message, then removes the listener. See
+     * `ipcMain.handle(channel, listener)`.
+     */
+    handleOnce(channel: string, listener: (event: IpcMainInvokeEvent, ...args: any[]) => (Promise<void>) | (any)): void;
+    /**
+     * Listens to `channel`, when a new message arrives `listener` would be called with
+     * `listener(event, args...)`.
+     */
+    on(channel: string, listener: (event: IpcMainEvent, ...args: any[]) => void): this;
+    /**
+     * Adds a one time `listener` function for the event. This `listener` is invoked
+     * only the next time a message is sent to `channel`, after which it is removed.
+     */
+    once(channel: string, listener: (event: IpcMainEvent, ...args: any[]) => void): this;
+    /**
+     * Removes listeners of the specified `channel`.
+     */
+    removeAllListeners(channel?: string): this;
+    /**
+     * Removes any handler for `channel`, if present.
+     */
+    removeHandler(channel: string): void;
+    /**
+     * Removes the specified `listener` from the listener array for the specified
+     * `channel`.
+     */
+    removeListener(channel: string, listener: (...args: any[]) => void): this;
+  }
+
+  interface IpcMainEvent extends Event {
+
+    // Docs: https://electronjs.org/docs/api/structures/ipc-main-event
+
+    /**
+     * The ID of the renderer frame that sent this message
+     */
+    frameId: number;
+    /**
+     * A list of MessagePorts that were transferred with this message
+     */
+    ports: MessagePortMain[];
+    /**
+     * The internal ID of the renderer process that sent this message
+     */
+    processId: number;
+    /**
+     * A function that will send an IPC message to the renderer frame that sent the
+     * original message that you are currently handling.  You should use this method to
+     * "reply" to the sent message in order to guarantee the reply will go to the
+     * correct process and frame.
+     */
+    reply: Function;
+    /**
+     * Set this to the value to be returned in a synchronous message
+     */
+    returnValue: any;
+    /**
+     * Returns the `webContents` that sent the message
+     */
+    sender: WebContents;
+    /**
+     * The frame that sent this message
+     *
+     */
+    readonly senderFrame: WebFrameMain;
+  }
+
+  interface IpcMainInvokeEvent extends Event {
+
+    // Docs: https://electronjs.org/docs/api/structures/ipc-main-invoke-event
+
+    /**
+     * The ID of the renderer frame that sent this message
+     */
+    frameId: number;
+    /**
+     * The internal ID of the renderer process that sent this message
+     */
+    processId: number;
+    /**
+     * Returns the `webContents` that sent the message
+     */
+    sender: WebContents;
+    /**
+     * The frame that sent this message
+     *
+     */
+    readonly senderFrame: WebFrameMain;
+  }
+
+  interface IpcRenderer extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/ipc-renderer
+
+    /**
+     * Resolves with the response from the main process.
+     *
+     * Send a message to the main process via `channel` and expect a result
+     * asynchronously. Arguments will be serialized with the Structured Clone
+     * Algorithm, just like `window.postMessage`, so prototype chains will not be
+     * included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw
+     * an exception.
+     *
+     * > **NOTE:** Sending non-standard JavaScript types such as DOM objects or special
+     * Electron objects will throw an exception.
+     *
+     * Since the main process does not have support for DOM objects such as
+     * `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+     * Electron's IPC to the main process, as the main process would have no way to
+     * decode them. Attempting to send such objects over IPC will result in an error.
+     *
+     * The main process should listen for `channel` with `ipcMain.handle()`.
+     *
+     * For example:
+     *
+     * If you need to transfer a `MessagePort` to the main process, use
+     * `ipcRenderer.postMessage`.
+     *
+     * If you do not need a response to the message, consider using `ipcRenderer.send`.
+     */
+    invoke(channel: string, ...args: any[]): Promise<any>;
+    /**
+     * Listens to `channel`, when a new message arrives `listener` would be called with
+     * `listener(event, args...)`.
+     */
+    on(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): this;
+    /**
+     * Adds a one time `listener` function for the event. This `listener` is invoked
+     * only the next time a message is sent to `channel`, after which it is removed.
+     */
+    once(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): this;
+    /**
+     * Send a message to the main process, optionally transferring ownership of zero or
+     * more `MessagePort` objects.
+     *
+     * The transferred `MessagePort` objects will be available in the main process as
+     * `MessagePortMain` objects by accessing the `ports` property of the emitted
+     * event.
+     *
+     * For example:
+     *
+     * For more information on using `MessagePort` and `MessageChannel`, see the MDN
+     * documentation.
+     */
+    postMessage(channel: string, message: any, transfer?: MessagePort[]): void;
+    /**
+     * Removes all listeners, or those of the specified `channel`.
+     */
+    removeAllListeners(channel: string): this;
+    /**
+     * Removes the specified `listener` from the listener array for the specified
+     * `channel`.
+     */
+    removeListener(channel: string, listener: (...args: any[]) => void): this;
+    /**
+     * Send an asynchronous message to the main process via `channel`, along with
+     * arguments. Arguments will be serialized with the Structured Clone Algorithm,
+     * just like `window.postMessage`, so prototype chains will not be included.
+     * Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an
+     * exception.
+     *
+     * > **NOTE:** Sending non-standard JavaScript types such as DOM objects or special
+     * Electron objects will throw an exception.
+     *
+     * Since the main process does not have support for DOM objects such as
+     * `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+     * Electron's IPC to the main process, as the main process would have no way to
+     * decode them. Attempting to send such objects over IPC will result in an error.
+     *
+     * The main process handles it by listening for `channel` with the `ipcMain`
+     * module.
+     *
+     * If you need to transfer a `MessagePort` to the main process, use
+     * `ipcRenderer.postMessage`.
+     *
+     * If you want to receive a single response from the main process, like the result
+     * of a method call, consider using `ipcRenderer.invoke`.
+     */
+    send(channel: string, ...args: any[]): void;
+    /**
+     * The value sent back by the `ipcMain` handler.
+     *
+     * Send a message to the main process via `channel` and expect a result
+     * synchronously. Arguments will be serialized with the Structured Clone Algorithm,
+     * just like `window.postMessage`, so prototype chains will not be included.
+     * Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an
+     * exception.
+     *
+     * > **NOTE:** Sending non-standard JavaScript types such as DOM objects or special
+     * Electron objects will throw an exception.
+     *
+     * Since the main process does not have support for DOM objects such as
+     * `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+     * Electron's IPC to the main process, as the main process would have no way to
+     * decode them. Attempting to send such objects over IPC will result in an error.
+     *
+     * The main process handles it by listening for `channel` with `ipcMain` module,
+     * and replies by setting `event.returnValue`.
+     *
+     * > :warning: **WARNING**: Sending a synchronous message will block the whole
+     * renderer process until the reply is received, so use this method only as a last
+     * resort. It's much better to use the asynchronous version, `invoke()`.
+     */
+    sendSync(channel: string, ...args: any[]): any;
+    /**
+     * Sends a message to a window with `webContentsId` via `channel`.
+     */
+    sendTo(webContentsId: number, channel: string, ...args: any[]): void;
+    /**
+     * Like `ipcRenderer.send` but the event will be sent to the `<webview>` element in
+     * the host page instead of the main process.
+     */
+    sendToHost(channel: string, ...args: any[]): void;
+  }
+
+  interface IpcRendererEvent extends Event {
+
+    // Docs: https://electronjs.org/docs/api/structures/ipc-renderer-event
+
+    /**
+     * A list of MessagePorts that were transferred with this message
+     */
+    ports: MessagePort[];
+    /**
+     * The `IpcRenderer` instance that emitted the event originally
+     */
+    sender: IpcRenderer;
+    /**
+     * The `webContents.id` that sent the message, you can call
+     * `event.sender.sendTo(event.senderId, ...)` to reply to the message, see
+     * ipcRenderer.sendTo for more information. This only applies to messages sent from
+     * a different renderer. Messages sent directly from the main process set
+     * `event.senderId` to `0`.
+     */
+    senderId: number;
+  }
+
+  interface JumpListCategory {
+
+    // Docs: https://electronjs.org/docs/api/structures/jump-list-category
+
+    /**
+     * Array of `JumpListItem` objects if `type` is `tasks` or `custom`, otherwise it
+     * should be omitted.
+     */
+    items?: JumpListItem[];
+    /**
+     * Must be set if `type` is `custom`, otherwise it should be omitted.
+     */
+    name?: string;
+    /**
+     * One of the following:
+     */
+    type?: ('tasks' | 'frequent' | 'recent' | 'custom');
+  }
+
+  interface JumpListItem {
+
+    // Docs: https://electronjs.org/docs/api/structures/jump-list-item
+
+    /**
+     * The command line arguments when `program` is executed. Should only be set if
+     * `type` is `task`.
+     */
+    args?: string;
+    /**
+     * Description of the task (displayed in a tooltip). Should only be set if `type`
+     * is `task`. Maximum length 260 characters.
+     */
+    description?: string;
+    /**
+     * The index of the icon in the resource file. If a resource file contains multiple
+     * icons this value can be used to specify the zero-based index of the icon that
+     * should be displayed for this task. If a resource file contains only one icon,
+     * this property should be set to zero.
+     */
+    iconIndex?: number;
+    /**
+     * The absolute path to an icon to be displayed in a Jump List, which can be an
+     * arbitrary resource file that contains an icon (e.g. `.ico`, `.exe`, `.dll`). You
+     * can usually specify `process.execPath` to show the program icon.
+     */
+    iconPath?: string;
+    /**
+     * Path of the file to open, should only be set if `type` is `file`.
+     */
+    path?: string;
+    /**
+     * Path of the program to execute, usually you should specify `process.execPath`
+     * which opens the current program. Should only be set if `type` is `task`.
+     */
+    program?: string;
+    /**
+     * The text to be displayed for the item in the Jump List. Should only be set if
+     * `type` is `task`.
+     */
+    title?: string;
+    /**
+     * One of the following:
+     */
+    type?: ('task' | 'separator' | 'file');
+    /**
+     * The working directory. Default is empty.
+     */
+    workingDirectory?: string;
+  }
+
+  interface KeyboardEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/keyboard-event
+
+    /**
+     * whether an Alt key was used in an accelerator to trigger the Event
+     */
+    altKey?: boolean;
+    /**
+     * whether the Control key was used in an accelerator to trigger the Event
+     */
+    ctrlKey?: boolean;
+    /**
+     * whether a meta key was used in an accelerator to trigger the Event
+     */
+    metaKey?: boolean;
+    /**
+     * whether a Shift key was used in an accelerator to trigger the Event
+     */
+    shiftKey?: boolean;
+    /**
+     * whether an accelerator was used to trigger the event as opposed to another user
+     * gesture like mouse click
+     */
+    triggeredByAccelerator?: boolean;
+  }
+
+  interface KeyboardInputEvent extends InputEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/keyboard-input-event
+
+    /**
+     * The character that will be sent as the keyboard event. Should only use the valid
+     * key codes in Accelerator.
+     */
+    keyCode: string;
+    /**
+     * The type of the event, can be `keyDown`, `keyUp` or `char`.
+     */
+    type: ('keyDown' | 'keyUp' | 'char');
+  }
+
+  interface MemoryInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/memory-info
+
+    /**
+     * The maximum amount of memory that has ever been pinned to actual physical RAM.
+     */
+    peakWorkingSetSize: number;
+    /**
+     * The amount of memory not shared by other processes, such as JS heap or HTML
+     * content.
+     *
+     * @platform win32
+     */
+    privateBytes?: number;
+    /**
+     * The amount of memory currently pinned to actual physical RAM.
+     */
+    workingSetSize: number;
+  }
+
+  interface MemoryUsageDetails {
+
+    // Docs: https://electronjs.org/docs/api/structures/memory-usage-details
+
+    count: number;
+    liveSize: number;
+    size: number;
+  }
+
+  class Menu {
+
+    // Docs: https://electronjs.org/docs/api/menu
+
+    /**
+     * Emitted when a popup is closed either manually or with `menu.closePopup()`.
+     */
+    on(event: 'menu-will-close', listener: (event: Event) => void): this;
+    once(event: 'menu-will-close', listener: (event: Event) => void): this;
+    addListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+    removeListener(event: 'menu-will-close', listener: (event: Event) => void): this;
+    /**
+     * Emitted when `menu.popup()` is called.
+     */
+    on(event: 'menu-will-show', listener: (event: Event) => void): this;
+    once(event: 'menu-will-show', listener: (event: Event) => void): this;
+    addListener(event: 'menu-will-show', listener: (event: Event) => void): this;
+    removeListener(event: 'menu-will-show', listener: (event: Event) => void): this;
+    /**
+     * Menu
+     */
+    constructor();
+    /**
+     * Generally, the `template` is an array of `options` for constructing a MenuItem.
+     * The usage can be referenced above.
+     *
+     * You can also attach other fields to the element of the `template` and they will
+     * become properties of the constructed menu items.
+     */
+    static buildFromTemplate(template: Array<(MenuItemConstructorOptions) | (MenuItem)>): Menu;
+    /**
+     * The application menu, if set, or `null`, if not set.
+     *
+     * **Note:** The returned `Menu` instance doesn't support dynamic addition or
+     * removal of menu items. Instance properties can still be dynamically modified.
+     */
+    static getApplicationMenu(): (Menu) | (null);
+    /**
+     * Sends the `action` to the first responder of application. This is used for
+     * emulating default macOS menu behaviors. Usually you would use the `role`
+     * property of a `MenuItem`.
+     *
+     * See the macOS Cocoa Event Handling Guide for more information on macOS' native
+     * actions.
+     *
+     * @platform darwin
+     */
+    static sendActionToFirstResponder(action: string): void;
+    /**
+     * Sets `menu` as the application menu on macOS. On Windows and Linux, the `menu`
+     * will be set as each window's top menu.
+     *
+     * Also on Windows and Linux, you can use a `&` in the top-level item name to
+     * indicate which letter should get a generated accelerator. For example, using
+     * `&File` for the file menu would result in a generated `Alt-F` accelerator that
+     * opens the associated menu. The indicated character in the button label then gets
+     * an underline, and the `&` character is not displayed on the button label.
+     *
+     * In order to escape the `&` character in an item name, add a proceeding `&`. For
+     * example, `&&File` would result in `&File` displayed on the button label.
+     *
+     * Passing `null` will suppress the default menu. On Windows and Linux, this has
+     * the additional effect of removing the menu bar from the window.
+     *
+     * **Note:** The default menu will be created automatically if the app does not set
+     * one. It contains standard items such as `File`, `Edit`, `View`, `Window` and
+     * `Help`.
+     */
+    static setApplicationMenu(menu: (Menu) | (null)): void;
+    /**
+     * Appends the `menuItem` to the menu.
+     */
+    append(menuItem: MenuItem): void;
+    /**
+     * Closes the context menu in the `browserWindow`.
+     */
+    closePopup(browserWindow?: BrowserWindow): void;
+    /**
+     * the item with the specified `id`
+     */
+    getMenuItemById(id: string): (MenuItem) | (null);
+    /**
+     * Inserts the `menuItem` to the `pos` position of the menu.
+     */
+    insert(pos: number, menuItem: MenuItem): void;
+    /**
+     * Pops up this menu as a context menu in the `BrowserWindow`.
+     */
+    popup(options?: PopupOptions): void;
+    /**
+     * A `MenuItem[]` array containing the menu's items.
+     *
+     * Each `Menu` consists of multiple `MenuItem`s and each `MenuItem` can have a
+     * submenu.
+     */
+    items: MenuItem[];
+  }
+
+  class MenuItem {
+
+    // Docs: https://electronjs.org/docs/api/menu-item
+
+    /**
+     * MenuItem
+     */
+    constructor(options: MenuItemConstructorOptions);
+    /**
+     * An `Accelerator` (optional) indicating the item's accelerator, if set.
+     */
+    accelerator?: Accelerator;
+    /**
+     * A `boolean` indicating whether the item is checked, this property can be
+     * dynamically changed.
+     *
+     * A `checkbox` menu item will toggle the `checked` property on and off when
+     * selected.
+     *
+     * A `radio` menu item will turn on its `checked` property when clicked, and will
+     * turn off that property for all adjacent items in the same menu.
+     *
+     * You can add a `click` function for additional behavior.
+     */
+    checked: boolean;
+    /**
+     * A `Function` that is fired when the MenuItem receives a click event. It can be
+     * called with `menuItem.click(event, focusedWindow, focusedWebContents)`.
+     *
+     * * `event` KeyboardEvent
+     * * `focusedWindow` BrowserWindow
+     * * `focusedWebContents` WebContents
+     */
+    click: Function;
+    /**
+     * A `number` indicating an item's sequential unique id.
+     */
+    commandId: number;
+    /**
+     * A `boolean` indicating whether the item is enabled, this property can be
+     * dynamically changed.
+     */
+    enabled: boolean;
+    /**
+     * A `NativeImage | string` (optional) indicating the item's icon, if set.
+     */
+    icon?: (NativeImage) | (string);
+    /**
+     * A `string` indicating the item's unique id, this property can be dynamically
+     * changed.
+     */
+    id: string;
+    /**
+     * A `string` indicating the item's visible label.
+     */
+    label: string;
+    /**
+     * A `Menu` that the item is a part of.
+     */
+    menu: Menu;
+    /**
+     * A `boolean` indicating if the accelerator should be registered with the system
+     * or just displayed.
+     *
+     * This property can be dynamically changed.
+     */
+    registerAccelerator: boolean;
+    /**
+     * A `string` (optional) indicating the item's role, if set. Can be `undo`, `redo`,
+     * `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`,
+     * `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`,
+     * `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`,
+     * `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`,
+     * `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`,
+     * `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`,
+     * `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`,
+     * `moveTabToNewWindow` or `windowMenu`
+     */
+    role?: ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteAndMatchStyle' | 'delete' | 'selectAll' | 'reload' | 'forceReload' | 'toggleDevTools' | 'resetZoom' | 'zoomIn' | 'zoomOut' | 'toggleSpellChecker' | 'togglefullscreen' | 'window' | 'minimize' | 'close' | 'help' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit' | 'startSpeaking' | 'stopSpeaking' | 'zoom' | 'front' | 'appMenu' | 'fileMenu' | 'editMenu' | 'viewMenu' | 'shareMenu' | 'recentDocuments' | 'toggleTabBar' | 'selectNextTab' | 'selectPreviousTab' | 'mergeAllWindows' | 'clearRecentDocuments' | 'moveTabToNewWindow' | 'windowMenu');
+    /**
+     * A `SharingItem` indicating the item to share when the `role` is `shareMenu`.
+     *
+     * This property can be dynamically changed.
+     *
+     * @platform darwin
+     */
+    sharingItem: SharingItem;
+    /**
+     * A `string` indicating the item's sublabel.
+     */
+    sublabel: string;
+    /**
+     * A `Menu` (optional) containing the menu item's submenu, if present.
+     */
+    submenu?: Menu;
+    /**
+     * A `string` indicating the item's hover text.
+     *
+     * @platform darwin
+     */
+    toolTip: string;
+    /**
+     * A `string` indicating the type of the item. Can be `normal`, `separator`,
+     * `submenu`, `checkbox` or `radio`.
+     */
+    type: ('normal' | 'separator' | 'submenu' | 'checkbox' | 'radio');
+    /**
+     * An `Accelerator | null` indicating the item's user-assigned accelerator for the
+     * menu item.
+     *
+     * **Note:** This property is only initialized after the `MenuItem` has been added
+     * to a `Menu`. Either via `Menu.buildFromTemplate` or via
+     * `Menu.append()/insert()`.  Accessing before initialization will just return
+     * `null`.
+     *
+     * @platform darwin
+     */
+    readonly userAccelerator: (Accelerator) | (null);
+    /**
+     * A `boolean` indicating whether the item is visible, this property can be
+     * dynamically changed.
+     */
+    visible: boolean;
+  }
+
+  class MessageChannelMain extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/message-channel-main
+
+    /**
+     * A `MessagePortMain` property.
+     */
+    port1: MessagePortMain;
+    /**
+     * A `MessagePortMain` property.
+     */
+    port2: MessagePortMain;
+  }
+
+  class MessagePortMain extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/message-port-main
+
+    /**
+     * Emitted when the remote end of a MessagePortMain object becomes disconnected.
+     */
+    on(event: 'close', listener: Function): this;
+    once(event: 'close', listener: Function): this;
+    addListener(event: 'close', listener: Function): this;
+    removeListener(event: 'close', listener: Function): this;
+    /**
+     * Emitted when a MessagePortMain object receives a message.
+     */
+    on(event: 'message', listener: (messageEvent: MessageEvent) => void): this;
+    once(event: 'message', listener: (messageEvent: MessageEvent) => void): this;
+    addListener(event: 'message', listener: (messageEvent: MessageEvent) => void): this;
+    removeListener(event: 'message', listener: (messageEvent: MessageEvent) => void): this;
+    /**
+     * Disconnects the port, so it is no longer active.
+     */
+    close(): void;
+    /**
+     * Sends a message from the port, and optionally, transfers ownership of objects to
+     * other browsing contexts.
+     */
+    postMessage(message: any, transfer?: MessagePortMain[]): void;
+    /**
+     * Starts the sending of messages queued on the port. Messages will be queued until
+     * this method is called.
+     */
+    start(): void;
+  }
+
+  interface MimeTypedBuffer {
+
+    // Docs: https://electronjs.org/docs/api/structures/mime-typed-buffer
+
+    /**
+     * Charset of the buffer.
+     */
+    charset?: string;
+    /**
+     * The actual Buffer content.
+     */
+    data: Buffer;
+    /**
+     * MIME type of the buffer.
+     */
+    mimeType?: string;
+  }
+
+  interface MouseInputEvent extends InputEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/mouse-input-event
+
+    /**
+     * The button pressed, can be `left`, `middle`, `right`.
+     */
+    button?: ('left' | 'middle' | 'right');
+    clickCount?: number;
+    globalX?: number;
+    globalY?: number;
+    movementX?: number;
+    movementY?: number;
+    /**
+     * The type of the event, can be `mouseDown`, `mouseUp`, `mouseEnter`,
+     * `mouseLeave`, `contextMenu`, `mouseWheel` or `mouseMove`.
+     */
+    type: ('mouseDown' | 'mouseUp' | 'mouseEnter' | 'mouseLeave' | 'contextMenu' | 'mouseWheel' | 'mouseMove');
+    x: number;
+    y: number;
+  }
+
+  interface MouseWheelInputEvent extends MouseInputEvent {
+
+    // Docs: https://electronjs.org/docs/api/structures/mouse-wheel-input-event
+
+    accelerationRatioX?: number;
+    accelerationRatioY?: number;
+    canScroll?: boolean;
+    deltaX?: number;
+    deltaY?: number;
+    hasPreciseScrollingDeltas?: boolean;
+    /**
+     * The type of the event, can be `mouseWheel`.
+     */
+    type: ('mouseWheel');
+    wheelTicksX?: number;
+    wheelTicksY?: number;
+  }
+
+  class NativeImage {
+
+    // Docs: https://electronjs.org/docs/api/native-image
+
+    /**
+     * Creates an empty `NativeImage` instance.
+     */
+    static createEmpty(): NativeImage;
+    /**
+     * Creates a new `NativeImage` instance from `buffer` that contains the raw bitmap
+     * pixel data returned by `toBitmap()`. The specific format is platform-dependent.
+     */
+    static createFromBitmap(buffer: Buffer, options: CreateFromBitmapOptions): NativeImage;
+    /**
+     * Creates a new `NativeImage` instance from `buffer`. Tries to decode as PNG or
+     * JPEG first.
+     */
+    static createFromBuffer(buffer: Buffer, options?: CreateFromBufferOptions): NativeImage;
+    /**
+     * Creates a new `NativeImage` instance from `dataURL`.
+     */
+    static createFromDataURL(dataURL: string): NativeImage;
+    /**
+     * Creates a new `NativeImage` instance from the NSImage that maps to the given
+     * image name. See `System Icons` for a list of possible values.
+     *
+     * The `hslShift` is applied to the image with the following rules:
+     *
+     * * `hsl_shift[0]` (hue): The absolute hue value for the image - 0 and 1 map to 0
+     * and 360 on the hue color wheel (red).
+     * * `hsl_shift[1]` (saturation): A saturation shift for the image, with the
+     * following key values: 0 = remove all color. 0.5 = leave unchanged. 1 = fully
+     * saturate the image.
+     * * `hsl_shift[2]` (lightness): A lightness shift for the image, with the
+     * following key values: 0 = remove all lightness (make all pixels black). 0.5 =
+     * leave unchanged. 1 = full lightness (make all pixels white).
+     *
+     * This means that `[-1, 0, 1]` will make the image completely white and `[-1, 1,
+     * 0]` will make the image completely black.
+     *
+     * In some cases, the `NSImageName` doesn't match its string representation; one
+     * example of this is `NSFolderImageName`, whose string representation would
+     * actually be `NSFolder`. Therefore, you'll need to determine the correct string
+     * representation for your image before passing it in. This can be done with the
+     * following:
+     *
+     * `echo -e '#import <Cocoa/Cocoa.h>\nint main() { NSLog(@"%@", SYSTEM_IMAGE_NAME);
+     * }' | clang -otest -x objective-c -framework Cocoa - && ./test`
+     *
+     * where `SYSTEM_IMAGE_NAME` should be replaced with any value from this list.
+     *
+     * @platform darwin
+     */
+    static createFromNamedImage(imageName: string, hslShift?: number[]): NativeImage;
+    /**
+     * Creates a new `NativeImage` instance from a file located at `path`. This method
+     * returns an empty image if the `path` does not exist, cannot be read, or is not a
+     * valid image.
+     */
+    static createFromPath(path: string): NativeImage;
+    /**
+     * fulfilled with the file's thumbnail preview image, which is a NativeImage.
+     *
+     * @platform darwin,win32
+     */
+    static createThumbnailFromPath(path: string, maxSize: Size): Promise<Electron.NativeImage>;
+    /**
+     * Add an image representation for a specific scale factor. This can be used to
+     * explicitly add different scale factor representations to an image. This can be
+     * called on empty images.
+     */
+    addRepresentation(options: AddRepresentationOptions): void;
+    /**
+     * The cropped image.
+     */
+    crop(rect: Rectangle): NativeImage;
+    /**
+     * The image's aspect ratio.
+     *
+     * If `scaleFactor` is passed, this will return the aspect ratio corresponding to
+     * the image representation most closely matching the passed value.
+     */
+    getAspectRatio(scaleFactor?: number): number;
+    /**
+     * A Buffer that contains the image's raw bitmap pixel data.
+     *
+     * The difference between `getBitmap()` and `toBitmap()` is that `getBitmap()` does
+     * not copy the bitmap data, so you have to use the returned Buffer immediately in
+     * current event loop tick; otherwise the data might be changed or destroyed.
+     */
+    getBitmap(options?: BitmapOptions): Buffer;
+    /**
+     * A Buffer that stores C pointer to underlying native handle of the image. On
+     * macOS, a pointer to `NSImage` instance would be returned.
+     *
+     * Notice that the returned pointer is a weak pointer to the underlying native
+     * image instead of a copy, so you _must_ ensure that the associated `nativeImage`
+     * instance is kept around.
+     *
+     * @platform darwin
+     */
+    getNativeHandle(): Buffer;
+    /**
+     * An array of all scale factors corresponding to representations for a given
+     * nativeImage.
+     */
+    getScaleFactors(): number[];
+    /**
+     * If `scaleFactor` is passed, this will return the size corresponding to the image
+     * representation most closely matching the passed value.
+     */
+    getSize(scaleFactor?: number): Size;
+    /**
+     * Whether the image is empty.
+     */
+    isEmpty(): boolean;
+    /**
+     * Whether the image is a template image.
+     */
+    isTemplateImage(): boolean;
+    /**
+     * The resized image.
+     *
+     * If only the `height` or the `width` are specified then the current aspect ratio
+     * will be preserved in the resized image.
+     */
+    resize(options: ResizeOptions): NativeImage;
+    /**
+     * Marks the image as a template image.
+     */
+    setTemplateImage(option: boolean): void;
+    /**
+     * A Buffer that contains a copy of the image's raw bitmap pixel data.
+     */
+    toBitmap(options?: ToBitmapOptions): Buffer;
+    /**
+     * The data URL of the image.
+     */
+    toDataURL(options?: ToDataURLOptions): string;
+    /**
+     * A Buffer that contains the image's `JPEG` encoded data.
+     */
+    toJPEG(quality: number): Buffer;
+    /**
+     * A Buffer that contains the image's `PNG` encoded data.
+     */
+    toPNG(options?: ToPNGOptions): Buffer;
+    /**
+     * A `boolean` property that determines whether the image is considered a template
+     * image.
+     *
+     * Please note that this property only has an effect on macOS.
+     *
+     * @platform darwin
+     */
+    isMacTemplateImage: boolean;
+  }
+
+  interface NativeTheme extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/native-theme
+
+    /**
+     * Emitted when something in the underlying NativeTheme has changed. This normally
+     * means that either the value of `shouldUseDarkColors`,
+     * `shouldUseHighContrastColors` or `shouldUseInvertedColorScheme` has changed. You
+     * will have to check them to determine which one has changed.
+     */
+    on(event: 'updated', listener: Function): this;
+    once(event: 'updated', listener: Function): this;
+    addListener(event: 'updated', listener: Function): this;
+    removeListener(event: 'updated', listener: Function): this;
+    /**
+     * A `boolean` indicating whether Chromium is in forced colors mode, controlled by
+     * system accessibility settings. Currently, Windows high contrast is the only
+     * system setting that triggers forced colors mode.
+     *
+     * @platform win32
+     */
+    readonly inForcedColorsMode: boolean;
+    /**
+     * A `boolean` for if the OS / Chromium currently has a dark mode enabled or is
+     * being instructed to show a dark-style UI.  If you want to modify this value you
+     * should use `themeSource` below.
+     *
+     */
+    readonly shouldUseDarkColors: boolean;
+    /**
+     * A `boolean` for if the OS / Chromium currently has high-contrast mode enabled or
+     * is being instructed to show a high-contrast UI.
+     *
+     * @platform darwin,win32
+     */
+    readonly shouldUseHighContrastColors: boolean;
+    /**
+     * A `boolean` for if the OS / Chromium currently has an inverted color scheme or
+     * is being instructed to use an inverted color scheme.
+     *
+     * @platform darwin,win32
+     */
+    readonly shouldUseInvertedColorScheme: boolean;
+    /**
+     * A `string` property that can be `system`, `light` or `dark`.  It is used to
+     * override and supersede the value that Chromium has chosen to use internally.
+     *
+     * Setting this property to `system` will remove the override and everything will
+     * be reset to the OS default.  By default `themeSource` is `system`.
+     *
+     * Settings this property to `dark` will have the following effects:
+     *
+     * * `nativeTheme.shouldUseDarkColors` will be `true` when accessed
+     * * Any UI Electron renders on Linux and Windows including context menus,
+     * devtools, etc. will use the dark UI.
+     * * Any UI the OS renders on macOS including menus, window frames, etc. will use
+     * the dark UI.
+     * * The `prefers-color-scheme` CSS query will match `dark` mode.
+     * * The `updated` event will be emitted
+     *
+     * Settings this property to `light` will have the following effects:
+     *
+     * * `nativeTheme.shouldUseDarkColors` will be `false` when accessed
+     * * Any UI Electron renders on Linux and Windows including context menus,
+     * devtools, etc. will use the light UI.
+     * * Any UI the OS renders on macOS including menus, window frames, etc. will use
+     * the light UI.
+     * * The `prefers-color-scheme` CSS query will match `light` mode.
+     * * The `updated` event will be emitted
+     *
+     * The usage of this property should align with a classic "dark mode" state machine
+     * in your application where the user has three options.
+     *
+     * * `Follow OS` --> `themeSource = 'system'`
+     * * `Dark Mode` --> `themeSource = 'dark'`
+     * * `Light Mode` --> `themeSource = 'light'`
+     *
+     * Your application should then always use `shouldUseDarkColors` to determine what
+     * CSS to apply.
+     */
+    themeSource: ('system' | 'light' | 'dark');
+  }
+
+  interface Net {
+
+    // Docs: https://electronjs.org/docs/api/net
+
+    /**
+     * Whether there is currently internet connection.
+     *
+     * A return value of `false` is a pretty strong indicator that the user won't be
+     * able to connect to remote sites. However, a return value of `true` is
+     * inconclusive; even if some link is up, it is uncertain whether a particular
+     * connection attempt to a particular remote site will be successful.
+     */
+    isOnline(): boolean;
+    /**
+     * Creates a `ClientRequest` instance using the provided `options` which are
+     * directly forwarded to the `ClientRequest` constructor. The `net.request` method
+     * would be used to issue both secure and insecure HTTP requests according to the
+     * specified protocol scheme in the `options` object.
+     */
+    request(options: (ClientRequestConstructorOptions) | (string)): ClientRequest;
+    /**
+     * A `boolean` property. Whether there is currently internet connection.
+     *
+     * A return value of `false` is a pretty strong indicator that the user won't be
+     * able to connect to remote sites. However, a return value of `true` is
+     * inconclusive; even if some link is up, it is uncertain whether a particular
+     * connection attempt to a particular remote site will be successful.
+     *
+     */
+    readonly online: boolean;
+  }
+
+  interface NetLog {
+
+    // Docs: https://electronjs.org/docs/api/net-log
+
+    /**
+     * resolves when the net log has begun recording.
+     *
+     * Starts recording network events to `path`.
+     */
+    startLogging(path: string, options?: StartLoggingOptions): Promise<void>;
+    /**
+     * resolves when the net log has been flushed to disk.
+     *
+     * Stops recording network events. If not called, net logging will automatically
+     * end when app quits.
+     */
+    stopLogging(): Promise<void>;
+    /**
+     * A `boolean` property that indicates whether network logs are currently being
+     * recorded.
+     *
+     */
+    readonly currentlyLogging: boolean;
+  }
+
+  interface NewWindowWebContentsEvent extends Event {
+
+    // Docs: https://electronjs.org/docs/api/structures/new-window-web-contents-event
+
+    newGuest?: BrowserWindow;
+  }
+
+  class Notification extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/notification
+
+    on(event: 'action', listener: (event: Event,
+                                   /**
+                                    * The index of the action that was activated.
+                                    */
+                                   index: number) => void): this;
+    once(event: 'action', listener: (event: Event,
+                                   /**
+                                    * The index of the action that was activated.
+                                    */
+                                   index: number) => void): this;
+    addListener(event: 'action', listener: (event: Event,
+                                   /**
+                                    * The index of the action that was activated.
+                                    */
+                                   index: number) => void): this;
+    removeListener(event: 'action', listener: (event: Event,
+                                   /**
+                                    * The index of the action that was activated.
+                                    */
+                                   index: number) => void): this;
+    /**
+     * Emitted when the notification is clicked by the user.
+     */
+    on(event: 'click', listener: (event: Event) => void): this;
+    once(event: 'click', listener: (event: Event) => void): this;
+    addListener(event: 'click', listener: (event: Event) => void): this;
+    removeListener(event: 'click', listener: (event: Event) => void): this;
+    /**
+     * Emitted when the notification is closed by manual intervention from the user.
+     *
+     * This event is not guaranteed to be emitted in all cases where the notification
+     * is closed.
+     */
+    on(event: 'close', listener: (event: Event) => void): this;
+    once(event: 'close', listener: (event: Event) => void): this;
+    addListener(event: 'close', listener: (event: Event) => void): this;
+    removeListener(event: 'close', listener: (event: Event) => void): this;
+    /**
+     * Emitted when an error is encountered while creating and showing the native
+     * notification.
+     *
+     * @platform win32
+     */
+    on(event: 'failed', listener: (event: Event,
+                                   /**
+                                    * The error encountered during execution of the `show()` method.
+                                    */
+                                   error: string) => void): this;
+    once(event: 'failed', listener: (event: Event,
+                                   /**
+                                    * The error encountered during execution of the `show()` method.
+                                    */
+                                   error: string) => void): this;
+    addListener(event: 'failed', listener: (event: Event,
+                                   /**
+                                    * The error encountered during execution of the `show()` method.
+                                    */
+                                   error: string) => void): this;
+    removeListener(event: 'failed', listener: (event: Event,
+                                   /**
+                                    * The error encountered during execution of the `show()` method.
+                                    */
+                                   error: string) => void): this;
+    /**
+     * Emitted when the user clicks the "Reply" button on a notification with
+     * `hasReply: true`.
+     *
+     * @platform darwin
+     */
+    on(event: 'reply', listener: (event: Event,
+                                  /**
+                                   * The string the user entered into the inline reply field.
+                                   */
+                                  reply: string) => void): this;
+    once(event: 'reply', listener: (event: Event,
+                                  /**
+                                   * The string the user entered into the inline reply field.
+                                   */
+                                  reply: string) => void): this;
+    addListener(event: 'reply', listener: (event: Event,
+                                  /**
+                                   * The string the user entered into the inline reply field.
+                                   */
+                                  reply: string) => void): this;
+    removeListener(event: 'reply', listener: (event: Event,
+                                  /**
+                                   * The string the user entered into the inline reply field.
+                                   */
+                                  reply: string) => void): this;
+    /**
+     * Emitted when the notification is shown to the user, note this could be fired
+     * multiple times as a notification can be shown multiple times through the
+     * `show()` method.
+     */
+    on(event: 'show', listener: (event: Event) => void): this;
+    once(event: 'show', listener: (event: Event) => void): this;
+    addListener(event: 'show', listener: (event: Event) => void): this;
+    removeListener(event: 'show', listener: (event: Event) => void): this;
+    /**
+     * Notification
+     */
+    constructor(options?: NotificationConstructorOptions);
+    /**
+     * Whether or not desktop notifications are supported on the current system
+     */
+    static isSupported(): boolean;
+    /**
+     * Dismisses the notification.
+     */
+    close(): void;
+    /**
+     * Immediately shows the notification to the user, please note this means unlike
+     * the HTML5 Notification implementation, instantiating a `new Notification` does
+     * not immediately show it to the user, you need to call this method before the OS
+     * will display it.
+     *
+     * If the notification has been shown before, this method will dismiss the
+     * previously shown notification and create a new one with identical properties.
+     */
+    show(): void;
+    /**
+     * A `NotificationAction[]` property representing the actions of the notification.
+     */
+    actions: NotificationAction[];
+    /**
+     * A `string` property representing the body of the notification.
+     */
+    body: string;
+    /**
+     * A `string` property representing the close button text of the notification.
+     */
+    closeButtonText: string;
+    /**
+     * A `boolean` property representing whether the notification has a reply action.
+     */
+    hasReply: boolean;
+    /**
+     * A `string` property representing the reply placeholder of the notification.
+     */
+    replyPlaceholder: string;
+    /**
+     * A `boolean` property representing whether the notification is silent.
+     */
+    silent: boolean;
+    /**
+     * A `string` property representing the sound of the notification.
+     */
+    sound: string;
+    /**
+     * A `string` property representing the subtitle of the notification.
+     */
+    subtitle: string;
+    /**
+     * A `string` property representing the type of timeout duration for the
+     * notification. Can be 'default' or 'never'.
+     *
+     * If `timeoutType` is set to 'never', the notification never expires. It stays
+     * open until closed by the calling API or the user.
+     *
+     * @platform linux,win32
+     */
+    timeoutType: ('default' | 'never');
+    /**
+     * A `string` property representing the title of the notification.
+     */
+    title: string;
+    /**
+     * A `string` property representing the custom Toast XML of the notification.
+     *
+     * @platform win32
+     */
+    toastXml: string;
+    /**
+     * A `string` property representing the urgency level of the notification. Can be
+     * 'normal', 'critical', or 'low'.
+     *
+     * Default is 'low' - see NotifyUrgency for more information.
+     *
+     * @platform linux
+     */
+    urgency: ('normal' | 'critical' | 'low');
+  }
+
+  interface NotificationAction {
+
+    // Docs: https://electronjs.org/docs/api/structures/notification-action
+
+    /**
+     * The label for the given action.
+     */
+    text?: string;
+    /**
+     * The type of action, can be `button`.
+     */
+    type: ('button');
+  }
+
+  interface NotificationResponse {
+
+    // Docs: https://electronjs.org/docs/api/structures/notification-response
+
+    /**
+     * The identifier string of the action that the user selected.
+     */
+    actionIdentifier: string;
+    /**
+     * The delivery date of the notification.
+     */
+    date: number;
+    /**
+     * The unique identifier for this notification request.
+     */
+    identifier: string;
+    /**
+     * A dictionary of custom information associated with the notification.
+     */
+    userInfo: Record<string, any>;
+    /**
+     * The text entered or chosen by the user.
+     */
+    userText?: string;
+  }
+
+  interface PaymentDiscount {
+
+    // Docs: https://electronjs.org/docs/api/structures/payment-discount
+
+    /**
+     * A string used to uniquely identify a discount offer for a product.
+     */
+    identifier: string;
+    /**
+     * A string that identifies the key used to generate the signature.
+     */
+    keyIdentifier: string;
+    /**
+     * A universally unique ID (UUID) value that you define.
+     */
+    nonce: string;
+    /**
+     * A UTF-8 string representing the properties of a specific discount offer,
+     * cryptographically signed.
+     */
+    signature: string;
+    /**
+     * The date and time of the signature's creation in milliseconds, formatted in Unix
+     * epoch time.
+     */
+    timestamp: number;
+  }
+
+  interface Point {
+
+    // Docs: https://electronjs.org/docs/api/structures/point
+
+    x: number;
+    y: number;
+  }
+
+  interface PostBody {
+
+    // Docs: https://electronjs.org/docs/api/structures/post-body
+
+    /**
+     * The boundary used to separate multiple parts of the message. Only valid when
+     * `contentType` is `multipart/form-data`.
+     */
+    boundary?: string;
+    /**
+     * The `content-type` header used for the data. One of
+     * `application/x-www-form-urlencoded` or `multipart/form-data`. Corresponds to the
+     * `enctype` attribute of the submitted HTML form.
+     */
+    contentType: string;
+    /**
+     * The post data to be sent to the new window.
+     */
+    data: Array<(UploadRawData) | (UploadFile)>;
+  }
+
+  interface PowerMonitor extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/power-monitor
+
+    /**
+     * Emitted when the system is about to lock the screen.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'lock-screen', listener: Function): this;
+    once(event: 'lock-screen', listener: Function): this;
+    addListener(event: 'lock-screen', listener: Function): this;
+    removeListener(event: 'lock-screen', listener: Function): this;
+    /**
+     * Emitted when the system changes to AC power.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'on-ac', listener: Function): this;
+    once(event: 'on-ac', listener: Function): this;
+    addListener(event: 'on-ac', listener: Function): this;
+    removeListener(event: 'on-ac', listener: Function): this;
+    /**
+     * Emitted when system changes to battery power.
+     *
+     * @platform darwin
+     */
+    on(event: 'on-battery', listener: Function): this;
+    once(event: 'on-battery', listener: Function): this;
+    addListener(event: 'on-battery', listener: Function): this;
+    removeListener(event: 'on-battery', listener: Function): this;
+    /**
+     * Emitted when system is resuming.
+     */
+    on(event: 'resume', listener: Function): this;
+    once(event: 'resume', listener: Function): this;
+    addListener(event: 'resume', listener: Function): this;
+    removeListener(event: 'resume', listener: Function): this;
+    /**
+     * Emitted when the system is about to reboot or shut down. If the event handler
+     * invokes `e.preventDefault()`, Electron will attempt to delay system shutdown in
+     * order for the app to exit cleanly. If `e.preventDefault()` is called, the app
+     * should exit as soon as possible by calling something like `app.quit()`.
+     *
+     * @platform linux,darwin
+     */
+    on(event: 'shutdown', listener: Function): this;
+    once(event: 'shutdown', listener: Function): this;
+    addListener(event: 'shutdown', listener: Function): this;
+    removeListener(event: 'shutdown', listener: Function): this;
+    /**
+     * Emitted when the system is suspending.
+     */
+    on(event: 'suspend', listener: Function): this;
+    once(event: 'suspend', listener: Function): this;
+    addListener(event: 'suspend', listener: Function): this;
+    removeListener(event: 'suspend', listener: Function): this;
+    /**
+     * Emitted as soon as the systems screen is unlocked.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'unlock-screen', listener: Function): this;
+    once(event: 'unlock-screen', listener: Function): this;
+    addListener(event: 'unlock-screen', listener: Function): this;
+    removeListener(event: 'unlock-screen', listener: Function): this;
+    /**
+     * Emitted when a login session is activated. See documentation for more
+     * information.
+     *
+     * @platform darwin
+     */
+    on(event: 'user-did-become-active', listener: Function): this;
+    once(event: 'user-did-become-active', listener: Function): this;
+    addListener(event: 'user-did-become-active', listener: Function): this;
+    removeListener(event: 'user-did-become-active', listener: Function): this;
+    /**
+     * Emitted when a login session is deactivated. See documentation for more
+     * information.
+     *
+     * @platform darwin
+     */
+    on(event: 'user-did-resign-active', listener: Function): this;
+    once(event: 'user-did-resign-active', listener: Function): this;
+    addListener(event: 'user-did-resign-active', listener: Function): this;
+    removeListener(event: 'user-did-resign-active', listener: Function): this;
+    /**
+     * The system's current state. Can be `active`, `idle`, `locked` or `unknown`.
+     *
+     * Calculate the system idle state. `idleThreshold` is the amount of time (in
+     * seconds) before considered idle.  `locked` is available on supported systems
+     * only.
+     */
+    getSystemIdleState(idleThreshold: number): ('active' | 'idle' | 'locked' | 'unknown');
+    /**
+     * Idle time in seconds
+     *
+     * Calculate system idle time in seconds.
+     */
+    getSystemIdleTime(): number;
+    /**
+     * Whether the system is on battery power.
+     *
+     * To monitor for changes in this property, use the `on-battery` and `on-ac`
+     * events.
+     */
+    isOnBatteryPower(): boolean;
+    /**
+     * A `boolean` property. True if the system is on battery power.
+     *
+     * See `powerMonitor.isOnBatteryPower()`.
+     */
+    onBatteryPower: boolean;
+  }
+
+  interface PowerSaveBlocker {
+
+    // Docs: https://electronjs.org/docs/api/power-save-blocker
+
+    /**
+     * Whether the corresponding `powerSaveBlocker` has started.
+     */
+    isStarted(id: number): boolean;
+    /**
+     * The blocker ID that is assigned to this power blocker.
+     *
+     * Starts preventing the system from entering lower-power mode. Returns an integer
+     * identifying the power save blocker.
+     *
+     * **Note:** `prevent-display-sleep` has higher precedence over
+     * `prevent-app-suspension`. Only the highest precedence type takes effect. In
+     * other words, `prevent-display-sleep` always takes precedence over
+     * `prevent-app-suspension`.
+     *
+     * For example, an API calling A requests for `prevent-app-suspension`, and another
+     * calling B requests for `prevent-display-sleep`. `prevent-display-sleep` will be
+     * used until B stops its request. After that, `prevent-app-suspension` is used.
+     */
+    start(type: 'prevent-app-suspension' | 'prevent-display-sleep'): number;
+    /**
+     * Stops the specified power save blocker.
+     */
+    stop(id: number): void;
+  }
+
+  interface PrinterInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/printer-info
+
+    /**
+     * a longer description of the printer's type.
+     */
+    description: string;
+    /**
+     * the name of the printer as shown in Print Preview.
+     */
+    displayName: string;
+    /**
+     * whether or not a given printer is set as the default printer on the OS.
+     */
+    isDefault: boolean;
+    /**
+     * the name of the printer as understood by the OS.
+     */
+    name: string;
+    /**
+     * an object containing a variable number of platform-specific printer information.
+     */
+    options: Options;
+    /**
+     * the current status of the printer.
+     */
+    status: number;
+  }
+
+  interface ProcessMemoryInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/process-memory-info
+
+    /**
+     * The amount of memory not shared by other processes, such as JS heap or HTML
+     * content in Kilobytes.
+     */
+    private: number;
+    /**
+     * The amount of memory currently pinned to actual physical RAM in Kilobytes.
+     *
+     * @platform linux,win32
+     */
+    residentSet: number;
+    /**
+     * The amount of memory shared between processes, typically memory consumed by the
+     * Electron code itself in Kilobytes.
+     */
+    shared: number;
+  }
+
+  interface ProcessMetric {
+
+    // Docs: https://electronjs.org/docs/api/structures/process-metric
+
+    /**
+     * CPU usage of the process.
+     */
+    cpu: CPUUsage;
+    /**
+     * Creation time for this process. The time is represented as number of
+     * milliseconds since epoch. Since the `pid` can be reused after a process dies, it
+     * is useful to use both the `pid` and the `creationTime` to uniquely identify a
+     * process.
+     */
+    creationTime: number;
+    /**
+     * One of the following values:
+     *
+     * @platform win32
+     */
+    integrityLevel?: ('untrusted' | 'low' | 'medium' | 'high' | 'unknown');
+    /**
+     * Memory information for the process.
+     */
+    memory: MemoryInfo;
+    /**
+     * The name of the process. Examples for utility: `Audio Service`, `Content
+     * Decryption Module Service`, `Network Service`, `Video Capture`, etc.
+     */
+    name?: string;
+    /**
+     * Process id of the process.
+     */
+    pid: number;
+    /**
+     * Whether the process is sandboxed on OS level.
+     *
+     * @platform darwin,win32
+     */
+    sandboxed?: boolean;
+    /**
+     * The non-localized name of the process.
+     */
+    serviceName?: string;
+    /**
+     * Process type. One of the following values:
+     */
+    type: ('Browser' | 'Tab' | 'Utility' | 'Zygote' | 'Sandbox helper' | 'GPU' | 'Pepper Plugin' | 'Pepper Plugin Broker' | 'Unknown');
+  }
+
+  interface Product {
+
+    // Docs: https://electronjs.org/docs/api/structures/product
+
+    /**
+     * The total size of the content, in bytes.
+     */
+    contentLengths: number[];
+    /**
+     * A string that identifies the version of the content.
+     */
+    contentVersion: string;
+    /**
+     * 3 character code presenting a product's currency based on the ISO 4217 standard.
+     */
+    currencyCode: string;
+    /**
+     * An array of discount offers
+     */
+    discounts: ProductDiscount[];
+    /**
+     * The total size of the content, in bytes.
+     */
+    downloadContentLengths: number[];
+    /**
+     * A string that identifies the version of the content.
+     */
+    downloadContentVersion: string;
+    /**
+     * The locale formatted price of the product.
+     */
+    formattedPrice: string;
+    /**
+     * The object containing introductory price information for the product. available
+     * for the product.
+     */
+    introductoryPrice?: ProductDiscount;
+    /**
+     * A boolean value that indicates whether the App Store has downloadable content
+     * for this product. `true` if at least one file has been associated with the
+     * product.
+     */
+    isDownloadable: boolean;
+    /**
+     * A description of the product.
+     */
+    localizedDescription: string;
+    /**
+     * The name of the product.
+     */
+    localizedTitle: string;
+    /**
+     * The cost of the product in the local currency.
+     */
+    price: number;
+    /**
+     * The string that identifies the product to the Apple App Store.
+     */
+    productIdentifier: string;
+    /**
+     * The identifier of the subscription group to which the subscription belongs.
+     */
+    subscriptionGroupIdentifier: string;
+    /**
+     * The period details for products that are subscriptions.
+     */
+    subscriptionPeriod?: ProductSubscriptionPeriod;
+  }
+
+  interface ProductDiscount {
+
+    // Docs: https://electronjs.org/docs/api/structures/product-discount
+
+    /**
+     * A string used to uniquely identify a discount offer for a product.
+     */
+    identifier: string;
+    /**
+     * An integer that indicates the number of periods the product discount is
+     * available.
+     */
+    numberOfPeriods: number;
+    /**
+     * The payment mode for this product discount. Can be `payAsYouGo`, `payUpFront`,
+     * or `freeTrial`.
+     */
+    paymentMode: ('payAsYouGo' | 'payUpFront' | 'freeTrial');
+    /**
+     * The discount price of the product in the local currency.
+     */
+    price: number;
+    /**
+     * The locale used to format the discount price of the product.
+     */
+    priceLocale: string;
+    /**
+     * An object that defines the period for the product discount.
+     */
+    subscriptionPeriod?: ProductSubscriptionPeriod;
+    /**
+     * The type of discount offer.
+     */
+    type: number;
+  }
+
+  interface ProductSubscriptionPeriod {
+
+    // Docs: https://electronjs.org/docs/api/structures/product-subscription-period
+
+    /**
+     * The number of units per subscription period.
+     */
+    numberOfUnits: number;
+    /**
+     * The increment of time that a subscription period is specified in. Can be `day`,
+     * `week`, `month`, `year`.
+     */
+    unit: ('day' | 'week' | 'month' | 'year');
+  }
+
+  interface Protocol {
+
+    // Docs: https://electronjs.org/docs/api/protocol
+
+    /**
+     * Whether the protocol was successfully intercepted
+     *
+     * Intercepts `scheme` protocol and uses `handler` as the protocol's new handler
+     * which sends a `Buffer` as a response.
+     */
+    interceptBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (Buffer) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully intercepted
+     *
+     * Intercepts `scheme` protocol and uses `handler` as the protocol's new handler
+     * which sends a file as a response.
+     */
+    interceptFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (string) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully intercepted
+     *
+     * Intercepts `scheme` protocol and uses `handler` as the protocol's new handler
+     * which sends a new HTTP request as a response.
+     */
+    interceptHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: ProtocolResponse) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully intercepted
+     *
+     * Same as `protocol.registerStreamProtocol`, except that it replaces an existing
+     * protocol handler.
+     */
+    interceptStreamProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (NodeJS.ReadableStream) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully intercepted
+     *
+     * Intercepts `scheme` protocol and uses `handler` as the protocol's new handler
+     * which sends a `string` as a response.
+     */
+    interceptStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (string) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether `scheme` is already intercepted.
+     */
+    isProtocolIntercepted(scheme: string): boolean;
+    /**
+     * Whether `scheme` is already registered.
+     */
+    isProtocolRegistered(scheme: string): boolean;
+    /**
+     * Whether the protocol was successfully registered
+     *
+     * Registers a protocol of `scheme` that will send a `Buffer` as a response.
+     *
+     * The usage is the same with `registerFileProtocol`, except that the `callback`
+     * should be called with either a `Buffer` object or an object that has the `data`
+     * property.
+     *
+     * Example:
+     */
+    registerBufferProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (Buffer) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully registered
+     *
+     * Registers a protocol of `scheme` that will send a file as the response. The
+     * `handler` will be called with `request` and `callback` where `request` is an
+     * incoming request for the `scheme`.
+     *
+     * To handle the `request`, the `callback` should be called with either the file's
+     * path or an object that has a `path` property, e.g. `callback(filePath)` or
+     * `callback({ path: filePath })`. The `filePath` must be an absolute path.
+     *
+     * By default the `scheme` is treated like `http:`, which is parsed differently
+     * from protocols that follow the "generic URI syntax" like `file:`.
+     */
+    registerFileProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (string) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully registered
+     *
+     * Registers a protocol of `scheme` that will send an HTTP request as a response.
+     *
+     * The usage is the same with `registerFileProtocol`, except that the `callback`
+     * should be called with an object that has the `url` property.
+     */
+    registerHttpProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: ProtocolResponse) => void) => void): boolean;
+    /**
+     * **Note:** This method can only be used before the `ready` event of the `app`
+     * module gets emitted and can be called only once.
+     *
+     * Registers the `scheme` as standard, secure, bypasses content security policy for
+     * resources, allows registering ServiceWorker, supports fetch API, and streaming
+     * video/audio. Specify a privilege with the value of `true` to enable the
+     * capability.
+     *
+     * An example of registering a privileged scheme, that bypasses Content Security
+     * Policy:
+     *
+     * A standard scheme adheres to what RFC 3986 calls generic URI syntax. For example
+     * `http` and `https` are standard schemes, while `file` is not.
+     *
+     * Registering a scheme as standard allows relative and absolute resources to be
+     * resolved correctly when served. Otherwise the scheme will behave like the `file`
+     * protocol, but without the ability to resolve relative URLs.
+     *
+     * For example when you load following page with custom protocol without
+     * registering it as standard scheme, the image will not be loaded because
+     * non-standard schemes can not recognize relative URLs:
+     *
+     * Registering a scheme as standard will allow access to files through the
+     * FileSystem API. Otherwise the renderer will throw a security error for the
+     * scheme.
+     *
+     * By default web storage apis (localStorage, sessionStorage, webSQL, indexedDB,
+     * cookies) are disabled for non standard schemes. So in general if you want to
+     * register a custom protocol to replace the `http` protocol, you have to register
+     * it as a standard scheme.
+     *
+     * Protocols that use streams (http and stream protocols) should set `stream:
+     * true`. The `<video>` and `<audio>` HTML elements expect protocols to buffer
+     * their responses by default. The `stream` flag configures those elements to
+     * correctly expect streaming responses.
+     */
+    registerSchemesAsPrivileged(customSchemes: CustomScheme[]): void;
+    /**
+     * Whether the protocol was successfully registered
+     *
+     * Registers a protocol of `scheme` that will send a stream as a response.
+     *
+     * The usage is the same with `registerFileProtocol`, except that the `callback`
+     * should be called with either a `ReadableStream` object or an object that has the
+     * `data` property.
+     *
+     * Example:
+     *
+     * It is possible to pass any object that implements the readable stream API (emits
+     * `data`/`end`/`error` events). For example, here's how a file could be returned:
+     */
+    registerStreamProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (NodeJS.ReadableStream) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully registered
+     *
+     * Registers a protocol of `scheme` that will send a `string` as a response.
+     *
+     * The usage is the same with `registerFileProtocol`, except that the `callback`
+     * should be called with either a `string` or an object that has the `data`
+     * property.
+     */
+    registerStringProtocol(scheme: string, handler: (request: ProtocolRequest, callback: (response: (string) | (ProtocolResponse)) => void) => void): boolean;
+    /**
+     * Whether the protocol was successfully unintercepted
+     *
+     * Remove the interceptor installed for `scheme` and restore its original handler.
+     */
+    uninterceptProtocol(scheme: string): boolean;
+    /**
+     * Whether the protocol was successfully unregistered
+     *
+     * Unregisters the custom protocol of `scheme`.
+     */
+    unregisterProtocol(scheme: string): boolean;
+  }
+
+  interface ProtocolRequest {
+
+    // Docs: https://electronjs.org/docs/api/structures/protocol-request
+
+    headers: Record<string, string>;
+    method: string;
+    referrer: string;
+    uploadData?: UploadData[];
+    url: string;
+  }
+
+  interface ProtocolResponse {
+
+    // Docs: https://electronjs.org/docs/api/structures/protocol-response
+
+    /**
+     * The charset of response body, default is `"utf-8"`.
+     */
+    charset?: string;
+    /**
+     * The response body. When returning stream as response, this is a Node.js readable
+     * stream representing the response body. When returning `Buffer` as response, this
+     * is a `Buffer`. When returning `string` as response, this is a `string`. This is
+     * ignored for other types of responses.
+     */
+    data?: (Buffer) | (string) | (NodeJS.ReadableStream);
+    /**
+     * When assigned, the `request` will fail with the `error` number . For the
+     * available error numbers you can use, please see the net error list.
+     */
+    error?: number;
+    /**
+     * An object containing the response headers. The keys must be string, and values
+     * must be either string or Array of string.
+     */
+    headers?: Record<string, (string) | (string[])>;
+    /**
+     * The HTTP `method`. This is only used for file and URL responses.
+     */
+    method?: string;
+    /**
+     * The MIME type of response body, default is `"text/html"`. Setting `mimeType`
+     * would implicitly set the `content-type` header in response, but if
+     * `content-type` is already set in `headers`, the `mimeType` would be ignored.
+     */
+    mimeType?: string;
+    /**
+     * Path to the file which would be sent as response body. This is only used for
+     * file responses.
+     */
+    path?: string;
+    /**
+     * The `referrer` URL. This is only used for file and URL responses.
+     */
+    referrer?: string;
+    /**
+     * The session used for requesting URL, by default the HTTP request will reuse the
+     * current session. Setting `session` to `null` would use a random independent
+     * session. This is only used for URL responses.
+     */
+    session?: Session;
+    /**
+     * The HTTP response code, default is 200.
+     */
+    statusCode?: number;
+    /**
+     * The data used as upload data. This is only used for URL responses when `method`
+     * is `"POST"`.
+     */
+    uploadData?: ProtocolResponseUploadData;
+    /**
+     * Download the `url` and pipe the result as response body. This is only used for
+     * URL responses.
+     */
+    url?: string;
+  }
+
+  interface ProtocolResponseUploadData {
+
+    // Docs: https://electronjs.org/docs/api/structures/protocol-response-upload-data
+
+    /**
+     * MIME type of the content.
+     */
+    contentType: string;
+    /**
+     * Content to be sent.
+     */
+    data: (string) | (Buffer);
+  }
+
+  interface PushNotifications extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/push-notifications
+
+    /**
+     * Emitted when the app receives a remote notification while running. See:
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     * com/documentation/appkit/nsapplicationdelegate/1428430-application?language=objc
+     *
+     * @platform darwin
+     */
+    on(event: 'received-apns-notification', listener: (userInfo: Record<string, any>) => void): this;
+    once(event: 'received-apns-notification', listener: (userInfo: Record<string, any>) => void): this;
+    addListener(event: 'received-apns-notification', listener: (userInfo: Record<string, any>) => void): this;
+    removeListener(event: 'received-apns-notification', listener: (userInfo: Record<string, any>) => void): this;
+    /**
+     * Registers the app with Apple Push Notification service (APNS) to receive Badge,
+     * Sound, and Alert notifications. If registration is successful, the promise will
+     * be resolved with the APNS device token. Otherwise, the promise will be rejected
+     * with an error message. See:
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     * tion/appkit/nsapplication/1428476-registerforremotenotificationtyp?language=objc
+     *
+     * @platform darwin
+     */
+    registerForAPNSNotifications(): Promise<string>;
+    /**
+     * Unregisters the app from notifications received from APNS. See:
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     * tion/appkit/nsapplication/1428747-unregisterforremotenotifications?language=objc
+     *
+     * @platform darwin
+     */
+    unregisterForAPNSNotifications(): void;
+  }
+
+  interface Rectangle {
+
+    // Docs: https://electronjs.org/docs/api/structures/rectangle
+
+    /**
+     * The height of the rectangle (must be an integer).
+     */
+    height: number;
+    /**
+     * The width of the rectangle (must be an integer).
+     */
+    width: number;
+    /**
+     * The x coordinate of the origin of the rectangle (must be an integer).
+     */
+    x: number;
+    /**
+     * The y coordinate of the origin of the rectangle (must be an integer).
+     */
+    y: number;
+  }
+
+  interface Referrer {
+
+    // Docs: https://electronjs.org/docs/api/structures/referrer
+
+    /**
+     * Can be `default`, `unsafe-url`, `no-referrer-when-downgrade`, `no-referrer`,
+     * `origin`, `strict-origin-when-cross-origin`, `same-origin` or `strict-origin`.
+     * See the Referrer-Policy spec for more details on the meaning of these values.
+     */
+    policy: ('default' | 'unsafe-url' | 'no-referrer-when-downgrade' | 'no-referrer' | 'origin' | 'strict-origin-when-cross-origin' | 'same-origin' | 'strict-origin');
+    /**
+     * HTTP Referrer URL.
+     */
+    url: string;
+  }
+
+  interface SafeStorage extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/safe-storage
+
+    /**
+     * the decrypted string. Decrypts the encrypted buffer obtained  with
+     * `safeStorage.encryptString` back into a string.
+     *
+     * This function will throw an error if decryption fails.
+     */
+    decryptString(encrypted: Buffer): string;
+    /**
+     * An array of bytes representing the encrypted string.
+     *
+     * This function will throw an error if encryption fails.
+     */
+    encryptString(plainText: string): Buffer;
+    /**
+     * Whether encryption is available.
+     *
+     * On Linux, returns true if the app has emitted the `ready` event and the secret
+     * key is available. On MacOS, returns true if Keychain is available. On Windows,
+     * returns true once the app has emitted the `ready` event.
+     */
+    isEncryptionAvailable(): boolean;
+  }
+
+  interface Screen extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/screen
+
+    /**
+     * Emitted when `newDisplay` has been added.
+     */
+    on(event: 'display-added', listener: (event: Event,
+                                          newDisplay: Display) => void): this;
+    once(event: 'display-added', listener: (event: Event,
+                                          newDisplay: Display) => void): this;
+    addListener(event: 'display-added', listener: (event: Event,
+                                          newDisplay: Display) => void): this;
+    removeListener(event: 'display-added', listener: (event: Event,
+                                          newDisplay: Display) => void): this;
+    /**
+     * Emitted when one or more metrics change in a `display`. The `changedMetrics` is
+     * an array of strings that describe the changes. Possible changes are `bounds`,
+     * `workArea`, `scaleFactor` and `rotation`.
+     */
+    on(event: 'display-metrics-changed', listener: (event: Event,
+                                                    display: Display,
+                                                    changedMetrics: string[]) => void): this;
+    once(event: 'display-metrics-changed', listener: (event: Event,
+                                                    display: Display,
+                                                    changedMetrics: string[]) => void): this;
+    addListener(event: 'display-metrics-changed', listener: (event: Event,
+                                                    display: Display,
+                                                    changedMetrics: string[]) => void): this;
+    removeListener(event: 'display-metrics-changed', listener: (event: Event,
+                                                    display: Display,
+                                                    changedMetrics: string[]) => void): this;
+    /**
+     * Emitted when `oldDisplay` has been removed.
+     */
+    on(event: 'display-removed', listener: (event: Event,
+                                            oldDisplay: Display) => void): this;
+    once(event: 'display-removed', listener: (event: Event,
+                                            oldDisplay: Display) => void): this;
+    addListener(event: 'display-removed', listener: (event: Event,
+                                            oldDisplay: Display) => void): this;
+    removeListener(event: 'display-removed', listener: (event: Event,
+                                            oldDisplay: Display) => void): this;
+    /**
+     * Converts a screen DIP point to a screen physical point. The DPI scale is
+     * performed relative to the display containing the DIP point.
+     *
+     * @platform win32
+     */
+    dipToScreenPoint(point: Point): Point;
+    /**
+     * Converts a screen DIP rect to a screen physical rect. The DPI scale is performed
+     * relative to the display nearest to `window`. If `window` is null, scaling will
+     * be performed to the display nearest to `rect`.
+     *
+     * @platform win32
+     */
+    dipToScreenRect(window: (BrowserWindow) | (null), rect: Rectangle): Rectangle;
+    /**
+     * An array of displays that are currently available.
+     */
+    getAllDisplays(): Display[];
+    /**
+     * The current absolute position of the mouse pointer.
+     *
+     * **Note:** The return value is a DIP point, not a screen physical point.
+     */
+    getCursorScreenPoint(): Point;
+    /**
+     * The display that most closely intersects the provided bounds.
+     */
+    getDisplayMatching(rect: Rectangle): Display;
+    /**
+     * The display nearest the specified point.
+     */
+    getDisplayNearestPoint(point: Point): Display;
+    /**
+     * The primary display.
+     */
+    getPrimaryDisplay(): Display;
+    /**
+     * Converts a screen physical point to a screen DIP point. The DPI scale is
+     * performed relative to the display containing the physical point.
+     *
+     * @platform win32
+     */
+    screenToDipPoint(point: Point): Point;
+    /**
+     * Converts a screen physical rect to a screen DIP rect. The DPI scale is performed
+     * relative to the display nearest to `window`. If `window` is null, scaling will
+     * be performed to the display nearest to `rect`.
+     *
+     * @platform win32
+     */
+    screenToDipRect(window: (BrowserWindow) | (null), rect: Rectangle): Rectangle;
+  }
+
+  interface ScrubberItem {
+
+    // Docs: https://electronjs.org/docs/api/structures/scrubber-item
+
+    /**
+     * The image to appear in this item.
+     */
+    icon?: NativeImage;
+    /**
+     * The text to appear in this item.
+     */
+    label?: string;
+  }
+
+  interface SegmentedControlSegment {
+
+    // Docs: https://electronjs.org/docs/api/structures/segmented-control-segment
+
+    /**
+     * Whether this segment is selectable. Default: true.
+     */
+    enabled?: boolean;
+    /**
+     * The image to appear in this segment.
+     */
+    icon?: NativeImage;
+    /**
+     * The text to appear in this segment.
+     */
+    label?: string;
+  }
+
+  interface SerialPort {
+
+    // Docs: https://electronjs.org/docs/api/structures/serial-port
+
+    /**
+     * A stable identifier on Windows that can be used for device permissions.
+     */
+    deviceInstanceId?: string;
+    /**
+     * A string suitable for display to the user for describing this device.
+     */
+    displayName: string;
+    /**
+     * Unique identifier for the port.
+     */
+    portId: string;
+    /**
+     * Name of the port.
+     */
+    portName: string;
+    /**
+     * Optional USB product ID.
+     */
+    productId: string;
+    /**
+     * The USB device serial number.
+     */
+    serialNumber: string;
+    /**
+     * Represents a single serial port on macOS can be enumerated by multiple drivers.
+     */
+    usbDriverName?: string;
+    /**
+     * Optional USB vendor ID.
+     */
+    vendorId: string;
+  }
+
+  interface ServiceWorkerInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/service-worker-info
+
+    /**
+     * The virtual ID of the process that this service worker is running in.  This is
+     * not an OS level PID.  This aligns with the ID set used for
+     * `webContents.getProcessId()`.
+     */
+    renderProcessId: number;
+    /**
+     * The base URL that this service worker is active for.
+     */
+    scope: string;
+    /**
+     * The full URL to the script that this service worker runs
+     */
+    scriptUrl: string;
+  }
+
+  class ServiceWorkers extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/service-workers
+
+    /**
+     * Emitted when a service worker logs something to the console.
+     */
+    on(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * Information about the console message
+                                             */
+                                            messageDetails: MessageDetails) => void): this;
+    once(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * Information about the console message
+                                             */
+                                            messageDetails: MessageDetails) => void): this;
+    addListener(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * Information about the console message
+                                             */
+                                            messageDetails: MessageDetails) => void): this;
+    removeListener(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * Information about the console message
+                                             */
+                                            messageDetails: MessageDetails) => void): this;
+    /**
+     * Emitted when a service worker has been registered. Can occur after a call to
+     * `navigator.serviceWorker.register('/sw.js')` successfully resolves or when a
+     * Chrome extension is loaded.
+     */
+    on(event: 'registration-completed', listener: (event: Event,
+                                                   /**
+                                                    * Information about the registered service worker
+                                                    */
+                                                   details: RegistrationCompletedDetails) => void): this;
+    once(event: 'registration-completed', listener: (event: Event,
+                                                   /**
+                                                    * Information about the registered service worker
+                                                    */
+                                                   details: RegistrationCompletedDetails) => void): this;
+    addListener(event: 'registration-completed', listener: (event: Event,
+                                                   /**
+                                                    * Information about the registered service worker
+                                                    */
+                                                   details: RegistrationCompletedDetails) => void): this;
+    removeListener(event: 'registration-completed', listener: (event: Event,
+                                                   /**
+                                                    * Information about the registered service worker
+                                                    */
+                                                   details: RegistrationCompletedDetails) => void): this;
+    /**
+     * A ServiceWorkerInfo object where the keys are the service worker version ID and
+     * the values are the information about that service worker.
+     */
+    getAllRunning(): Record<number, ServiceWorkerInfo>;
+    /**
+     * Information about this service worker
+     *
+     * If the service worker does not exist or is not running this method will throw an
+     * exception.
+     */
+    getFromVersionID(versionId: number): ServiceWorkerInfo;
+  }
+
+  class Session extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/session
+
+    /**
+     * A session instance from `partition` string. When there is an existing `Session`
+     * with the same `partition`, it will be returned; otherwise a new `Session`
+     * instance will be created with `options`.
+     *
+     * If `partition` starts with `persist:`, the page will use a persistent session
+     * available to all pages in the app with the same `partition`. if there is no
+     * `persist:` prefix, the page will use an in-memory session. If the `partition` is
+     * empty then default session of the app will be returned.
+     *
+     * To create a `Session` with `options`, you have to ensure the `Session` with the
+     * `partition` has never been used before. There is no way to change the `options`
+     * of an existing `Session` object.
+     */
+    static fromPartition(partition: string, options?: FromPartitionOptions): Session;
+    /**
+     * A `Session` object, the default session object of the app.
+     */
+    static defaultSession: Session;
+    /**
+     * Emitted after an extension is loaded. This occurs whenever an extension is added
+     * to the "enabled" set of extensions. This includes:
+     *
+     * * Extensions being loaded from `Session.loadExtension`.
+     * * Extensions being reloaded:
+     *   * from a crash.
+     *   * if the extension requested it (`chrome.runtime.reload()`).
+     */
+    on(event: 'extension-loaded', listener: (event: Event,
+                                             extension: Extension) => void): this;
+    once(event: 'extension-loaded', listener: (event: Event,
+                                             extension: Extension) => void): this;
+    addListener(event: 'extension-loaded', listener: (event: Event,
+                                             extension: Extension) => void): this;
+    removeListener(event: 'extension-loaded', listener: (event: Event,
+                                             extension: Extension) => void): this;
+    /**
+     * Emitted after an extension is loaded and all necessary browser state is
+     * initialized to support the start of the extension's background page.
+     */
+    on(event: 'extension-ready', listener: (event: Event,
+                                            extension: Extension) => void): this;
+    once(event: 'extension-ready', listener: (event: Event,
+                                            extension: Extension) => void): this;
+    addListener(event: 'extension-ready', listener: (event: Event,
+                                            extension: Extension) => void): this;
+    removeListener(event: 'extension-ready', listener: (event: Event,
+                                            extension: Extension) => void): this;
+    /**
+     * Emitted after an extension is unloaded. This occurs when
+     * `Session.removeExtension` is called.
+     */
+    on(event: 'extension-unloaded', listener: (event: Event,
+                                               extension: Extension) => void): this;
+    once(event: 'extension-unloaded', listener: (event: Event,
+                                               extension: Extension) => void): this;
+    addListener(event: 'extension-unloaded', listener: (event: Event,
+                                               extension: Extension) => void): this;
+    removeListener(event: 'extension-unloaded', listener: (event: Event,
+                                               extension: Extension) => void): this;
+    /**
+     * Emitted after `navigator.hid.requestDevice` has been called and
+     * `select-hid-device` has fired if a new device becomes available before the
+     * callback from `select-hid-device` is called.  This event is intended for use
+     * when using a UI to ask users to pick a device so that the UI can be updated with
+     * the newly added device.
+     */
+    on(event: 'hid-device-added', listener: (event: Event,
+                                             details: HidDeviceAddedDetails) => void): this;
+    once(event: 'hid-device-added', listener: (event: Event,
+                                             details: HidDeviceAddedDetails) => void): this;
+    addListener(event: 'hid-device-added', listener: (event: Event,
+                                             details: HidDeviceAddedDetails) => void): this;
+    removeListener(event: 'hid-device-added', listener: (event: Event,
+                                             details: HidDeviceAddedDetails) => void): this;
+    /**
+     * Emitted after `navigator.hid.requestDevice` has been called and
+     * `select-hid-device` has fired if a device has been removed before the callback
+     * from `select-hid-device` is called.  This event is intended for use when using a
+     * UI to ask users to pick a device so that the UI can be updated to remove the
+     * specified device.
+     */
+    on(event: 'hid-device-removed', listener: (event: Event,
+                                               details: HidDeviceRemovedDetails) => void): this;
+    once(event: 'hid-device-removed', listener: (event: Event,
+                                               details: HidDeviceRemovedDetails) => void): this;
+    addListener(event: 'hid-device-removed', listener: (event: Event,
+                                               details: HidDeviceRemovedDetails) => void): this;
+    removeListener(event: 'hid-device-removed', listener: (event: Event,
+                                               details: HidDeviceRemovedDetails) => void): this;
+    /**
+     * Emitted after `HIDDevice.forget()` has been called.  This event can be used to
+     * help maintain persistent storage of permissions when
+     * `setDevicePermissionHandler` is used.
+     */
+    on(event: 'hid-device-revoked', listener: (event: Event,
+                                               details: HidDeviceRevokedDetails) => void): this;
+    once(event: 'hid-device-revoked', listener: (event: Event,
+                                               details: HidDeviceRevokedDetails) => void): this;
+    addListener(event: 'hid-device-revoked', listener: (event: Event,
+                                               details: HidDeviceRevokedDetails) => void): this;
+    removeListener(event: 'hid-device-revoked', listener: (event: Event,
+                                               details: HidDeviceRevokedDetails) => void): this;
+    /**
+     * Emitted when a render process requests preconnection to a URL, generally due to
+     * a resource hint.
+     */
+    on(event: 'preconnect', listener: (event: Event,
+                                       /**
+                                        * The URL being requested for preconnection by the renderer.
+                                        */
+                                       preconnectUrl: string,
+                                       /**
+                                        * True if the renderer is requesting that the connection include credentials (see
+                                        * the spec for more details.)
+                                        */
+                                       allowCredentials: boolean) => void): this;
+    once(event: 'preconnect', listener: (event: Event,
+                                       /**
+                                        * The URL being requested for preconnection by the renderer.
+                                        */
+                                       preconnectUrl: string,
+                                       /**
+                                        * True if the renderer is requesting that the connection include credentials (see
+                                        * the spec for more details.)
+                                        */
+                                       allowCredentials: boolean) => void): this;
+    addListener(event: 'preconnect', listener: (event: Event,
+                                       /**
+                                        * The URL being requested for preconnection by the renderer.
+                                        */
+                                       preconnectUrl: string,
+                                       /**
+                                        * True if the renderer is requesting that the connection include credentials (see
+                                        * the spec for more details.)
+                                        */
+                                       allowCredentials: boolean) => void): this;
+    removeListener(event: 'preconnect', listener: (event: Event,
+                                       /**
+                                        * The URL being requested for preconnection by the renderer.
+                                        */
+                                       preconnectUrl: string,
+                                       /**
+                                        * True if the renderer is requesting that the connection include credentials (see
+                                        * the spec for more details.)
+                                        */
+                                       allowCredentials: boolean) => void): this;
+    /**
+     * Emitted when a HID device needs to be selected when a call to
+     * `navigator.hid.requestDevice` is made. `callback` should be called with
+     * `deviceId` to be selected; passing no arguments to `callback` will cancel the
+     * request.  Additionally, permissioning on `navigator.hid` can be further managed
+     * by using ses.setPermissionCheckHandler(handler) and
+     * ses.setDevicePermissionHandler(handler)`.
+     */
+    on(event: 'select-hid-device', listener: (event: Event,
+                                              details: SelectHidDeviceDetails,
+                                              callback: (deviceId?: (string) | (null)) => void) => void): this;
+    once(event: 'select-hid-device', listener: (event: Event,
+                                              details: SelectHidDeviceDetails,
+                                              callback: (deviceId?: (string) | (null)) => void) => void): this;
+    addListener(event: 'select-hid-device', listener: (event: Event,
+                                              details: SelectHidDeviceDetails,
+                                              callback: (deviceId?: (string) | (null)) => void) => void): this;
+    removeListener(event: 'select-hid-device', listener: (event: Event,
+                                              details: SelectHidDeviceDetails,
+                                              callback: (deviceId?: (string) | (null)) => void) => void): this;
+    /**
+     * Emitted when a serial port needs to be selected when a call to
+     * `navigator.serial.requestPort` is made. `callback` should be called with
+     * `portId` to be selected, passing an empty string to `callback` will cancel the
+     * request.  Additionally, permissioning on `navigator.serial` can be managed by
+     * using ses.setPermissionCheckHandler(handler) with the `serial` permission.
+     */
+    on(event: 'select-serial-port', listener: (event: Event,
+                                               portList: SerialPort[],
+                                               webContents: WebContents,
+                                               callback: (portId: string) => void) => void): this;
+    once(event: 'select-serial-port', listener: (event: Event,
+                                               portList: SerialPort[],
+                                               webContents: WebContents,
+                                               callback: (portId: string) => void) => void): this;
+    addListener(event: 'select-serial-port', listener: (event: Event,
+                                               portList: SerialPort[],
+                                               webContents: WebContents,
+                                               callback: (portId: string) => void) => void): this;
+    removeListener(event: 'select-serial-port', listener: (event: Event,
+                                               portList: SerialPort[],
+                                               webContents: WebContents,
+                                               callback: (portId: string) => void) => void): this;
+    /**
+     * Emitted after `navigator.serial.requestPort` has been called and
+     * `select-serial-port` has fired if a new serial port becomes available before the
+     * callback from `select-serial-port` is called.  This event is intended for use
+     * when using a UI to ask users to pick a port so that the UI can be updated with
+     * the newly added port.
+     */
+    on(event: 'serial-port-added', listener: (event: Event,
+                                              port: SerialPort,
+                                              webContents: WebContents) => void): this;
+    once(event: 'serial-port-added', listener: (event: Event,
+                                              port: SerialPort,
+                                              webContents: WebContents) => void): this;
+    addListener(event: 'serial-port-added', listener: (event: Event,
+                                              port: SerialPort,
+                                              webContents: WebContents) => void): this;
+    removeListener(event: 'serial-port-added', listener: (event: Event,
+                                              port: SerialPort,
+                                              webContents: WebContents) => void): this;
+    /**
+     * Emitted after `navigator.serial.requestPort` has been called and
+     * `select-serial-port` has fired if a serial port has been removed before the
+     * callback from `select-serial-port` is called.  This event is intended for use
+     * when using a UI to ask users to pick a port so that the UI can be updated to
+     * remove the specified port.
+     */
+    on(event: 'serial-port-removed', listener: (event: Event,
+                                                port: SerialPort,
+                                                webContents: WebContents) => void): this;
+    once(event: 'serial-port-removed', listener: (event: Event,
+                                                port: SerialPort,
+                                                webContents: WebContents) => void): this;
+    addListener(event: 'serial-port-removed', listener: (event: Event,
+                                                port: SerialPort,
+                                                webContents: WebContents) => void): this;
+    removeListener(event: 'serial-port-removed', listener: (event: Event,
+                                                port: SerialPort,
+                                                webContents: WebContents) => void): this;
+    /**
+     * Emitted when a hunspell dictionary file starts downloading
+     */
+    on(event: 'spellcheck-dictionary-download-begin', listener: (event: Event,
+                                                                 /**
+                                                                  * The language code of the dictionary file
+                                                                  */
+                                                                 languageCode: string) => void): this;
+    once(event: 'spellcheck-dictionary-download-begin', listener: (event: Event,
+                                                                 /**
+                                                                  * The language code of the dictionary file
+                                                                  */
+                                                                 languageCode: string) => void): this;
+    addListener(event: 'spellcheck-dictionary-download-begin', listener: (event: Event,
+                                                                 /**
+                                                                  * The language code of the dictionary file
+                                                                  */
+                                                                 languageCode: string) => void): this;
+    removeListener(event: 'spellcheck-dictionary-download-begin', listener: (event: Event,
+                                                                 /**
+                                                                  * The language code of the dictionary file
+                                                                  */
+                                                                 languageCode: string) => void): this;
+    /**
+     * Emitted when a hunspell dictionary file download fails.  For details on the
+     * failure you should collect a netlog and inspect the download request.
+     */
+    on(event: 'spellcheck-dictionary-download-failure', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    once(event: 'spellcheck-dictionary-download-failure', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    addListener(event: 'spellcheck-dictionary-download-failure', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    removeListener(event: 'spellcheck-dictionary-download-failure', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    /**
+     * Emitted when a hunspell dictionary file has been successfully downloaded
+     */
+    on(event: 'spellcheck-dictionary-download-success', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    once(event: 'spellcheck-dictionary-download-success', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    addListener(event: 'spellcheck-dictionary-download-success', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    removeListener(event: 'spellcheck-dictionary-download-success', listener: (event: Event,
+                                                                   /**
+                                                                    * The language code of the dictionary file
+                                                                    */
+                                                                   languageCode: string) => void): this;
+    /**
+     * Emitted when a hunspell dictionary file has been successfully initialized. This
+     * occurs after the file has been downloaded.
+     */
+    on(event: 'spellcheck-dictionary-initialized', listener: (event: Event,
+                                                              /**
+                                                               * The language code of the dictionary file
+                                                               */
+                                                              languageCode: string) => void): this;
+    once(event: 'spellcheck-dictionary-initialized', listener: (event: Event,
+                                                              /**
+                                                               * The language code of the dictionary file
+                                                               */
+                                                              languageCode: string) => void): this;
+    addListener(event: 'spellcheck-dictionary-initialized', listener: (event: Event,
+                                                              /**
+                                                               * The language code of the dictionary file
+                                                               */
+                                                              languageCode: string) => void): this;
+    removeListener(event: 'spellcheck-dictionary-initialized', listener: (event: Event,
+                                                              /**
+                                                               * The language code of the dictionary file
+                                                               */
+                                                              languageCode: string) => void): this;
+    /**
+     * Emitted when Electron is about to download `item` in `webContents`.
+     *
+     * Calling `event.preventDefault()` will cancel the download and `item` will not be
+     * available from next tick of the process.
+     */
+    on(event: 'will-download', listener: (event: Event,
+                                          item: DownloadItem,
+                                          webContents: WebContents) => void): this;
+    once(event: 'will-download', listener: (event: Event,
+                                          item: DownloadItem,
+                                          webContents: WebContents) => void): this;
+    addListener(event: 'will-download', listener: (event: Event,
+                                          item: DownloadItem,
+                                          webContents: WebContents) => void): this;
+    removeListener(event: 'will-download', listener: (event: Event,
+                                          item: DownloadItem,
+                                          webContents: WebContents) => void): this;
+    /**
+     * Whether the word was successfully written to the custom dictionary. This API
+     * will not work on non-persistent (in-memory) sessions.
+     *
+     * **Note:** On macOS and Windows 10 this word will be written to the OS custom
+     * dictionary as well
+     */
+    addWordToSpellCheckerDictionary(word: string): boolean;
+    /**
+     * Dynamically sets whether to always send credentials for HTTP NTLM or Negotiate
+     * authentication.
+     */
+    allowNTLMCredentialsForDomains(domains: string): void;
+    /**
+     * resolves when the session’s HTTP authentication cache has been cleared.
+     */
+    clearAuthCache(): Promise<void>;
+    /**
+     * resolves when the cache clear operation is complete.
+     *
+     * Clears the session’s HTTP cache.
+     */
+    clearCache(): Promise<void>;
+    /**
+     * resolves when the code cache clear operation is complete.
+     */
+    clearCodeCaches(options: ClearCodeCachesOptions): Promise<void>;
+    /**
+     * Resolves when the operation is complete.
+     *
+     * Clears the host resolver cache.
+     */
+    clearHostResolverCache(): Promise<void>;
+    /**
+     * resolves when the storage data has been cleared.
+     */
+    clearStorageData(options?: ClearStorageDataOptions): Promise<void>;
+    /**
+     * Resolves when all connections are closed.
+     *
+     * **Note:** It will terminate / fail all requests currently in flight.
+     */
+    closeAllConnections(): Promise<void>;
+    /**
+     * Allows resuming `cancelled` or `interrupted` downloads from previous `Session`.
+     * The API will generate a DownloadItem that can be accessed with the will-download
+     * event. The DownloadItem will not have any `WebContents` associated with it and
+     * the initial state will be `interrupted`. The download will start only when the
+     * `resume` API is called on the DownloadItem.
+     */
+    createInterruptedDownload(options: CreateInterruptedDownloadOptions): void;
+    /**
+     * Disables any network emulation already active for the `session`. Resets to the
+     * original network configuration.
+     */
+    disableNetworkEmulation(): void;
+    /**
+     * Initiates a download of the resource at `url`. The API will generate a
+     * DownloadItem that can be accessed with the will-download event.
+     *
+     * **Note:** This does not perform any security checks that relate to a page's
+     * origin, unlike `webContents.downloadURL`.
+     */
+    downloadURL(url: string): void;
+    /**
+     * Emulates network with the given configuration for the `session`.
+     */
+    enableNetworkEmulation(options: EnableNetworkEmulationOptions): void;
+    /**
+     * Writes any unwritten DOMStorage data to disk.
+     */
+    flushStorageData(): void;
+    /**
+     * Resolves when the all internal states of proxy service is reset and the latest
+     * proxy configuration is reapplied if it's already available. The pac script will
+     * be fetched from `pacScript` again if the proxy mode is `pac_script`.
+     */
+    forceReloadProxyConfig(): Promise<void>;
+    /**
+     * A list of all loaded extensions.
+     *
+     * **Note:** This API cannot be called before the `ready` event of the `app` module
+     * is emitted.
+     */
+    getAllExtensions(): Extension[];
+    /**
+     * resolves with blob data.
+     */
+    getBlobData(identifier: string): Promise<Buffer>;
+    /**
+     * the session's current cache size, in bytes.
+     */
+    getCacheSize(): Promise<number>;
+    /**
+     * | `null` - The loaded extension with the given ID.
+     *
+     * **Note:** This API cannot be called before the `ready` event of the `app` module
+     * is emitted.
+     */
+    getExtension(extensionId: string): Extension;
+    /**
+     * an array of paths to preload scripts that have been registered.
+     */
+    getPreloads(): string[];
+    /**
+     * An array of language codes the spellchecker is enabled for.  If this list is
+     * empty the spellchecker will fallback to using `en-US`.  By default on launch if
+     * this setting is an empty list Electron will try to populate this setting with
+     * the current OS locale.  This setting is persisted across restarts.
+     *
+     * **Note:** On macOS the OS spellchecker is used and has its own list of
+     * languages. On macOS, this API will return whichever languages have been
+     * configured by the OS.
+     */
+    getSpellCheckerLanguages(): string[];
+    /**
+     * The absolute file system path where data for this session is persisted on disk.
+     * For in memory sessions this returns `null`.
+     */
+    getStoragePath(): (string) | (null);
+    /**
+     * The user agent for this session.
+     */
+    getUserAgent(): string;
+    /**
+     * Whether or not this session is a persistent one. The default `webContents`
+     * session of a `BrowserWindow` is persistent. When creating a session from a
+     * partition, session prefixed with `persist:` will be persistent, while others
+     * will be temporary.
+     */
+    isPersistent(): boolean;
+    /**
+     * Whether the builtin spell checker is enabled.
+     */
+    isSpellCheckerEnabled(): boolean;
+    /**
+     * An array of all words in app's custom dictionary. Resolves when the full
+     * dictionary is loaded from disk.
+     */
+    listWordsInSpellCheckerDictionary(): Promise<string[]>;
+    /**
+     * resolves when the extension is loaded.
+     *
+     * This method will raise an exception if the extension could not be loaded. If
+     * there are warnings when installing the extension (e.g. if the extension requests
+     * an API that Electron does not support) then they will be logged to the console.
+     *
+     * Note that Electron does not support the full range of Chrome extensions APIs.
+     * See Supported Extensions APIs for more details on what is supported.
+     *
+     * Note that in previous versions of Electron, extensions that were loaded would be
+     * remembered for future runs of the application. This is no longer the case:
+     * `loadExtension` must be called on every boot of your app if you want the
+     * extension to be loaded.
+     *
+     * This API does not support loading packed (.crx) extensions.
+     *
+     * **Note:** This API cannot be called before the `ready` event of the `app` module
+     * is emitted.
+     *
+     * **Note:** Loading extensions into in-memory (non-persistent) sessions is not
+     * supported and will throw an error.
+     */
+    loadExtension(path: string, options?: LoadExtensionOptions): Promise<Electron.Extension>;
+    /**
+     * Preconnects the given number of sockets to an origin.
+     */
+    preconnect(options: PreconnectOptions): void;
+    /**
+     * Unloads an extension.
+     *
+     * **Note:** This API cannot be called before the `ready` event of the `app` module
+     * is emitted.
+     */
+    removeExtension(extensionId: string): void;
+    /**
+     * Whether the word was successfully removed from the custom dictionary. This API
+     * will not work on non-persistent (in-memory) sessions.
+     *
+     * **Note:** On macOS and Windows 10 this word will be removed from the OS custom
+     * dictionary as well
+     */
+    removeWordFromSpellCheckerDictionary(word: string): boolean;
+    /**
+     * Resolves with the proxy information for `url`.
+     */
+    resolveProxy(url: string): Promise<string>;
+    /**
+     * Sets a handler to respond to Bluetooth pairing requests. This handler allows
+     * developers to handle devices that require additional validation before pairing.
+     * When a handler is not defined, any pairing on Linux or Windows that requires
+     * additional validation will be automatically cancelled. macOS does not require a
+     * handler because macOS handles the pairing automatically.  To clear the handler,
+     * call `setBluetoothPairingHandler(null)`.
+     *
+     * @platform win32,linux
+     */
+    setBluetoothPairingHandler(handler: ((details: BluetoothPairingHandlerHandlerDetails, callback: (response: Response) => void) => void) | (null)): void;
+    /**
+     * Sets the certificate verify proc for `session`, the `proc` will be called with
+     * `proc(request, callback)` whenever a server certificate verification is
+     * requested. Calling `callback(0)` accepts the certificate, calling `callback(-2)`
+     * rejects it.
+     *
+     * Calling `setCertificateVerifyProc(null)` will revert back to default certificate
+     * verify proc.
+     *
+     * > **NOTE:** The result of this procedure is cached by the network service.
+     */
+    setCertificateVerifyProc(proc: ((request: Request, callback: (verificationResult: number) => void) => void) | (null)): void;
+    /**
+     * Sets the directory to store the generated JS code cache for this session. The
+     * directory is not required to be created by the user before this call, the
+     * runtime will create if it does not exist otherwise will use the existing
+     * directory. If directory cannot be created, then code cache will not be used and
+     * all operations related to code cache will fail silently inside the runtime. By
+     * default, the directory will be `Code Cache` under the respective user data
+     * folder.
+     */
+    setCodeCachePath(path: string): void;
+    /**
+     * Sets the handler which can be used to respond to device permission checks for
+     * the `session`. Returning `true` will allow the device to be permitted and
+     * `false` will reject it. To clear the handler, call
+     * `setDevicePermissionHandler(null)`. This handler can be used to provide default
+     * permissioning to devices without first calling for permission to devices (eg via
+     * `navigator.hid.requestDevice`).  If this handler is not defined, the default
+     * device permissions as granted through device selection (eg via
+     * `navigator.hid.requestDevice`) will be used. Additionally, the default behavior
+     * of Electron is to store granted device permision in memory. If longer term
+     * storage is needed, a developer can store granted device permissions (eg when
+     * handling the `select-hid-device` event) and then read from that storage with
+     * `setDevicePermissionHandler`.
+     */
+    setDevicePermissionHandler(handler: ((details: DevicePermissionHandlerHandlerDetails) => boolean) | (null)): void;
+    /**
+     * Sets download saving directory. By default, the download directory will be the
+     * `Downloads` under the respective app folder.
+     */
+    setDownloadPath(path: string): void;
+    /**
+     * Sets the handler which can be used to respond to permission checks for the
+     * `session`. Returning `true` will allow the permission and `false` will reject
+     * it.  Please note that you must also implement `setPermissionRequestHandler` to
+     * get complete permission handling. Most web APIs do a permission check and then
+     * make a permission request if the check is denied. To clear the handler, call
+     * `setPermissionCheckHandler(null)`.
+     */
+    setPermissionCheckHandler(handler: ((webContents: (WebContents) | (null), permission: string, requestingOrigin: string, details: PermissionCheckHandlerHandlerDetails) => boolean) | (null)): void;
+    /**
+     * Sets the handler which can be used to respond to permission requests for the
+     * `session`. Calling `callback(true)` will allow the permission and
+     * `callback(false)` will reject it. To clear the handler, call
+     * `setPermissionRequestHandler(null)`.  Please note that you must also implement
+     * `setPermissionCheckHandler` to get complete permission handling. Most web APIs
+     * do a permission check and then make a permission request if the check is denied.
+     */
+    setPermissionRequestHandler(handler: ((webContents: WebContents, permission: 'clipboard-read' | 'media' | 'display-capture' | 'mediaKeySystem' | 'geolocation' | 'notifications' | 'midi' | 'midiSysex' | 'pointerLock' | 'fullscreen' | 'openExternal' | 'unknown', callback: (permissionGranted: boolean) => void, details: PermissionRequestHandlerHandlerDetails) => void) | (null)): void;
+    /**
+     * Adds scripts that will be executed on ALL web contents that are associated with
+     * this session just before normal `preload` scripts run.
+     */
+    setPreloads(preloads: string[]): void;
+    /**
+     * Resolves when the proxy setting process is complete.
+     *
+     * Sets the proxy settings.
+     *
+     * When `mode` is unspecified, `pacScript` and `proxyRules` are provided together,
+     * the `proxyRules` option is ignored and `pacScript` configuration is applied.
+     *
+     * You may need `ses.closeAllConnections` to close currently in flight connections
+     * to prevent pooled sockets using previous proxy from being reused by future
+     * requests.
+     *
+     * The `proxyRules` has to follow the rules below:
+     *
+     * For example:
+     *
+     * * `http=foopy:80;ftp=foopy2` - Use HTTP proxy `foopy:80` for `http://` URLs, and
+     * HTTP proxy `foopy2:80` for `ftp://` URLs.
+     * * `foopy:80` - Use HTTP proxy `foopy:80` for all URLs.
+     * * `foopy:80,bar,direct://` - Use HTTP proxy `foopy:80` for all URLs, failing
+     * over to `bar` if `foopy:80` is unavailable, and after that using no proxy.
+     * * `socks4://foopy` - Use SOCKS v4 proxy `foopy:1080` for all URLs.
+     * * `http=foopy,socks5://bar.com` - Use HTTP proxy `foopy` for http URLs, and fail
+     * over to the SOCKS5 proxy `bar.com` if `foopy` is unavailable.
+     * * `http=foopy,direct://` - Use HTTP proxy `foopy` for http URLs, and use no
+     * proxy if `foopy` is unavailable.
+     * * `http=foopy;socks=foopy2` - Use HTTP proxy `foopy` for http URLs, and use
+     * `socks4://foopy2` for all other URLs.
+     *
+     * The `proxyBypassRules` is a comma separated list of rules described below:
+     *
+     * * `[ URL_SCHEME "://" ] HOSTNAME_PATTERN [ ":" <port> ]`
+     *
+     * Match all hostnames that match the pattern HOSTNAME_PATTERN.
+     *
+     * Examples: "foobar.com", "*foobar.com", "*.foobar.com", "*foobar.com:99",
+     * "https://x.*.y.com:99"
+     * * `"." HOSTNAME_SUFFIX_PATTERN [ ":" PORT ]`
+     *
+     * Match a particular domain suffix.
+     *
+     * Examples: ".google.com", ".com", "http://.google.com"
+     * * `[ SCHEME "://" ] IP_LITERAL [ ":" PORT ]`
+     *
+     * Match URLs which are IP address literals.
+     *
+     * Examples: "127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"
+     * * `IP_LITERAL "/" PREFIX_LENGTH_IN_BITS`
+     *
+     * Match any URL that is to an IP literal that falls between the given range. IP
+     * range is specified using CIDR notation.
+     *
+     * Examples: "192.168.1.1/16", "fefe:13::abc/33".
+     * * `<local>`
+     *
+     * Match local addresses. The meaning of `<local>` is whether the host matches one
+     * of: "127.0.0.1", "::1", "localhost".
+     */
+    setProxy(config: Config): Promise<void>;
+    /**
+     * By default Electron will download hunspell dictionaries from the Chromium CDN.
+     * If you want to override this behavior you can use this API to point the
+     * dictionary downloader at your own hosted version of the hunspell dictionaries.
+     * We publish a `hunspell_dictionaries.zip` file with each release which contains
+     * the files you need to host here.
+     *
+     * The file server must be **case insensitive**. If you cannot do this, you must
+     * upload each file twice: once with the case it has in the ZIP file and once with
+     * the filename as all lowercase.
+     *
+     * If the files present in `hunspell_dictionaries.zip` are available at
+     * `https://example.com/dictionaries/language-code.bdic` then you should call this
+     * api with
+     * `ses.setSpellCheckerDictionaryDownloadURL('https://example.com/dictionaries/')`.
+     *  Please note the trailing slash.  The URL to the dictionaries is formed as
+     * `${url}${filename}`.
+     *
+     * **Note:** On macOS the OS spellchecker is used and therefore we do not download
+     * any dictionary files.  This API is a no-op on macOS.
+     */
+    setSpellCheckerDictionaryDownloadURL(url: string): void;
+    /**
+     * Sets whether to enable the builtin spell checker.
+     */
+    setSpellCheckerEnabled(enable: boolean): void;
+    /**
+     * The built in spellchecker does not automatically detect what language a user is
+     * typing in.  In order for the spell checker to correctly check their words you
+     * must call this API with an array of language codes.  You can get the list of
+     * supported language codes with the `ses.availableSpellCheckerLanguages` property.
+     *
+     * **Note:** On macOS the OS spellchecker is used and will detect your language
+     * automatically.  This API is a no-op on macOS.
+     */
+    setSpellCheckerLanguages(languages: string[]): void;
+    /**
+     * Sets the SSL configuration for the session. All subsequent network requests will
+     * use the new configuration. Existing network connections (such as WebSocket
+     * connections) will not be terminated, but old sockets in the pool will not be
+     * reused for new connections.
+     */
+    setSSLConfig(config: SSLConfigConfig): void;
+    /**
+     * Overrides the `userAgent` and `acceptLanguages` for this session.
+     *
+     * The `acceptLanguages` must a comma separated ordered list of language codes, for
+     * example `"en-US,fr,de,ko,zh-CN,ja"`.
+     *
+     * This doesn't affect existing `WebContents`, and each `WebContents` can use
+     * `webContents.setUserAgent` to override the session-wide user agent.
+     */
+    setUserAgent(userAgent: string, acceptLanguages?: string): void;
+    /**
+     * A `string[]` array which consists of all the known available spell checker
+     * languages.  Providing a language code to the `setSpellCheckerLanguages` API that
+     * isn't in this array will result in an error.
+     *
+     */
+    readonly availableSpellCheckerLanguages: string[];
+    /**
+     * A `Cookies` object for this session.
+     *
+     */
+    readonly cookies: Cookies;
+    /**
+     * A `NetLog` object for this session.
+     *
+     */
+    readonly netLog: NetLog;
+    /**
+     * A `Protocol` object for this session.
+     *
+     */
+    readonly protocol: Protocol;
+    /**
+     * A `ServiceWorkers` object for this session.
+     *
+     */
+    readonly serviceWorkers: ServiceWorkers;
+    /**
+     * A `boolean` indicating whether builtin spell checker is enabled.
+     */
+    spellCheckerEnabled: boolean;
+    /**
+     * A `string | null` indicating the absolute file system path where data for this
+     * session is persisted on disk.  For in memory sessions this returns `null`.
+     *
+     */
+    readonly storagePath: (string) | (null);
+    /**
+     * A `WebRequest` object for this session.
+     *
+     */
+    readonly webRequest: WebRequest;
+  }
+
+  interface SharedWorkerInfo {
+
+    // Docs: https://electronjs.org/docs/api/structures/shared-worker-info
+
+    /**
+     * The unique id of the shared worker.
+     */
+    id: string;
+    /**
+     * The url of the shared worker.
+     */
+    url: string;
+  }
+
+  class ShareMenu extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/share-menu
+
+    /**
+     * ShareMenu
+     */
+    constructor(sharingItem: SharingItem);
+    /**
+     * Closes the context menu in the `browserWindow`.
+     */
+    closePopup(browserWindow?: BrowserWindow): void;
+    /**
+     * Pops up this menu as a context menu in the `BrowserWindow`.
+     */
+    popup(options?: PopupOptions): void;
+  }
+
+  interface SharingItem {
+
+    // Docs: https://electronjs.org/docs/api/structures/sharing-item
+
+    /**
+     * An array of files to share.
+     */
+    filePaths?: string[];
+    /**
+     * An array of text to share.
+     */
+    texts?: string[];
+    /**
+     * An array of URLs to share.
+     */
+    urls?: string[];
+  }
+
+  interface Shell {
+
+    // Docs: https://electronjs.org/docs/api/shell
+
+    /**
+     * Play the beep sound.
+     */
+    beep(): void;
+    /**
+     * Open the given external protocol URL in the desktop's default manner. (For
+     * example, mailto: URLs in the user's default mail agent).
+     */
+    openExternal(url: string, options?: OpenExternalOptions): Promise<void>;
+    /**
+     * Resolves with a string containing the error message corresponding to the failure
+     * if a failure occurred, otherwise "".
+     *
+     * Open the given file in the desktop's default manner.
+     */
+    openPath(path: string): Promise<string>;
+    /**
+     * Resolves the shortcut link at `shortcutPath`.
+     *
+     * An exception will be thrown when any error happens.
+     *
+     * @platform win32
+     */
+    readShortcutLink(shortcutPath: string): ShortcutDetails;
+    /**
+     * Show the given file in a file manager. If possible, select the file.
+     */
+    showItemInFolder(fullPath: string): void;
+    /**
+     * Resolves when the operation has been completed. Rejects if there was an error
+     * while deleting the requested item.
+     *
+     * This moves a path to the OS-specific trash location (Trash on macOS, Recycle Bin
+     * on Windows, and a desktop-environment-specific location on Linux).
+     */
+    trashItem(path: string): Promise<void>;
+    /**
+     * Whether the shortcut was created successfully.
+     *
+     * Creates or updates a shortcut link at `shortcutPath`.
+     *
+     * @platform win32
+     */
+    writeShortcutLink(shortcutPath: string, operation: 'create' | 'update' | 'replace', options: ShortcutDetails): boolean;
+    /**
+     * Whether the shortcut was created successfully.
+     *
+     * Creates or updates a shortcut link at `shortcutPath`.
+     *
+     * @platform win32
+     */
+    writeShortcutLink(shortcutPath: string, options: ShortcutDetails): boolean;
+  }
+
+  interface ShortcutDetails {
+
+    // Docs: https://electronjs.org/docs/api/structures/shortcut-details
+
+    /**
+     * The Application User Model ID. Default is empty.
+     */
+    appUserModelId?: string;
+    /**
+     * The arguments to be applied to `target` when launching from this shortcut.
+     * Default is empty.
+     */
+    args?: string;
+    /**
+     * The working directory. Default is empty.
+     */
+    cwd?: string;
+    /**
+     * The description of the shortcut. Default is empty.
+     */
+    description?: string;
+    /**
+     * The path to the icon, can be a DLL or EXE. `icon` and `iconIndex` have to be set
+     * together. Default is empty, which uses the target's icon.
+     */
+    icon?: string;
+    /**
+     * The resource ID of icon when `icon` is a DLL or EXE. Default is 0.
+     */
+    iconIndex?: number;
+    /**
+     * The target to launch from this shortcut.
+     */
+    target: string;
+    /**
+     * The Application Toast Activator CLSID. Needed for participating in Action
+     * Center.
+     */
+    toastActivatorClsid?: string;
+  }
+
+  interface Size {
+
+    // Docs: https://electronjs.org/docs/api/structures/size
+
+    height: number;
+    width: number;
+  }
+
+  interface SystemPreferences extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/system-preferences
+
+    on(event: 'accent-color-changed', listener: (event: Event,
+                                                 /**
+                                                  * The new RGBA color the user assigned to be their system accent color.
+                                                  */
+                                                 newColor: string) => void): this;
+    once(event: 'accent-color-changed', listener: (event: Event,
+                                                 /**
+                                                  * The new RGBA color the user assigned to be their system accent color.
+                                                  */
+                                                 newColor: string) => void): this;
+    addListener(event: 'accent-color-changed', listener: (event: Event,
+                                                 /**
+                                                  * The new RGBA color the user assigned to be their system accent color.
+                                                  */
+                                                 newColor: string) => void): this;
+    removeListener(event: 'accent-color-changed', listener: (event: Event,
+                                                 /**
+                                                  * The new RGBA color the user assigned to be their system accent color.
+                                                  */
+                                                 newColor: string) => void): this;
+    on(event: 'color-changed', listener: (event: Event) => void): this;
+    once(event: 'color-changed', listener: (event: Event) => void): this;
+    addListener(event: 'color-changed', listener: (event: Event) => void): this;
+    removeListener(event: 'color-changed', listener: (event: Event) => void): this;
+    /**
+     * **Deprecated:** Should use the new `updated` event on the `nativeTheme` module.
+     *
+     * @deprecated
+     * @platform win32
+     */
+    on(event: 'high-contrast-color-scheme-changed', listener: (event: Event,
+                                                               /**
+                                                                * `true` if a high contrast theme is being used, `false` otherwise.
+                                                                */
+                                                               highContrastColorScheme: boolean) => void): this;
+    once(event: 'high-contrast-color-scheme-changed', listener: (event: Event,
+                                                               /**
+                                                                * `true` if a high contrast theme is being used, `false` otherwise.
+                                                                */
+                                                               highContrastColorScheme: boolean) => void): this;
+    addListener(event: 'high-contrast-color-scheme-changed', listener: (event: Event,
+                                                               /**
+                                                                * `true` if a high contrast theme is being used, `false` otherwise.
+                                                                */
+                                                               highContrastColorScheme: boolean) => void): this;
+    removeListener(event: 'high-contrast-color-scheme-changed', listener: (event: Event,
+                                                               /**
+                                                                * `true` if a high contrast theme is being used, `false` otherwise.
+                                                                */
+                                                               highContrastColorScheme: boolean) => void): this;
+    /**
+     * **Deprecated:** Should use the new `updated` event on the `nativeTheme` module.
+     *
+     * @deprecated
+     * @platform win32
+     */
+    on(event: 'inverted-color-scheme-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` if an inverted color scheme (a high contrast color scheme with light text
+                                                           * and dark backgrounds) is being used, `false` otherwise.
+                                                           */
+                                                          invertedColorScheme: boolean) => void): this;
+    once(event: 'inverted-color-scheme-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` if an inverted color scheme (a high contrast color scheme with light text
+                                                           * and dark backgrounds) is being used, `false` otherwise.
+                                                           */
+                                                          invertedColorScheme: boolean) => void): this;
+    addListener(event: 'inverted-color-scheme-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` if an inverted color scheme (a high contrast color scheme with light text
+                                                           * and dark backgrounds) is being used, `false` otherwise.
+                                                           */
+                                                          invertedColorScheme: boolean) => void): this;
+    removeListener(event: 'inverted-color-scheme-changed', listener: (event: Event,
+                                                          /**
+                                                           * `true` if an inverted color scheme (a high contrast color scheme with light text
+                                                           * and dark backgrounds) is being used, `false` otherwise.
+                                                           */
+                                                          invertedColorScheme: boolean) => void): this;
+    /**
+     * A promise that resolves with `true` if consent was granted and `false` if it was
+     * denied. If an invalid `mediaType` is passed, the promise will be rejected. If an
+     * access request was denied and later is changed through the System Preferences
+     * pane, a restart of the app will be required for the new permissions to take
+     * effect. If access has already been requested and denied, it _must_ be changed
+     * through the preference pane; an alert will not pop up and the promise will
+     * resolve with the existing access status.
+     *
+     * **Important:** In order to properly leverage this API, you must set the
+     * `NSMicrophoneUsageDescription` and `NSCameraUsageDescription` strings in your
+     * app's `Info.plist` file. The values for these keys will be used to populate the
+     * permission dialogs so that the user will be properly informed as to the purpose
+     * of the permission request. See Electron Application Distribution for more
+     * information about how to set these in the context of Electron.
+     *
+     * This user consent was not required until macOS 10.14 Mojave, so this method will
+     * always return `true` if your system is running 10.13 High Sierra or lower.
+     *
+     * @platform darwin
+     */
+    askForMediaAccess(mediaType: 'microphone' | 'camera'): Promise<boolean>;
+    /**
+     * whether or not this device has the ability to use Touch ID.
+     *
+     * **NOTE:** This API will return `false` on macOS systems older than Sierra
+     * 10.12.2.
+     *
+     * @platform darwin
+     */
+    canPromptTouchID(): boolean;
+    /**
+     * The users current system wide accent color preference in RGBA hexadecimal form.
+     *
+     * This API is only available on macOS 10.14 Mojave or newer.
+     *
+     * @platform win32,darwin
+     */
+    getAccentColor(): string;
+    /**
+     * * `shouldRenderRichAnimation` boolean - Returns true if rich animations should
+     * be rendered. Looks at session type (e.g. remote desktop) and accessibility
+     * settings to give guidance for heavy animations.
+     * * `scrollAnimationsEnabledBySystem` boolean - Determines on a per-platform basis
+     * whether scroll animations (e.g. produced by home/end key) should be enabled.
+     * * `prefersReducedMotion` boolean - Determines whether the user desires reduced
+     * motion based on platform APIs.
+     *
+     * Returns an object with system animation settings.
+     */
+    getAnimationSettings(): AnimationSettings;
+    /**
+     * | `null` - Can be `dark`, `light` or `unknown`.
+     *
+     * Gets the macOS appearance setting that you have declared you want for your
+     * application, maps to NSApplication.appearance. You can use the
+     * `setAppLevelAppearance` API to set this value.
+     *
+     * @deprecated
+     * @platform darwin
+     */
+    getAppLevelAppearance(): ('dark' | 'light' | 'unknown');
+    /**
+     * The system color setting in RGB hexadecimal form (`#ABCDEF`). See the Windows
+     * docs and the macOS docs for more details.
+     *
+     * The following colors are only available on macOS 10.14: `find-highlight`,
+     * `selected-content-background`, `separator`,
+     * `unemphasized-selected-content-background`,
+     * `unemphasized-selected-text-background`, and `unemphasized-selected-text`.
+     *
+     * @platform win32,darwin
+     */
+    getColor(color: '3d-dark-shadow' | '3d-face' | '3d-highlight' | '3d-light' | '3d-shadow' | 'active-border' | 'active-caption' | 'active-caption-gradient' | 'app-workspace' | 'button-text' | 'caption-text' | 'desktop' | 'disabled-text' | 'highlight' | 'highlight-text' | 'hotlight' | 'inactive-border' | 'inactive-caption' | 'inactive-caption-gradient' | 'inactive-caption-text' | 'info-background' | 'info-text' | 'menu' | 'menu-highlight' | 'menubar' | 'menu-text' | 'scrollbar' | 'window' | 'window-frame' | 'window-text' | 'alternate-selected-control-text' | 'control-background' | 'control' | 'control-text' | 'disabled-control-text' | 'find-highlight' | 'grid' | 'header-text' | 'highlight' | 'keyboard-focus-indicator' | 'label' | 'link' | 'placeholder-text' | 'quaternary-label' | 'scrubber-textured-background' | 'secondary-label' | 'selected-content-background' | 'selected-control' | 'selected-control-text' | 'selected-menu-item-text' | 'selected-text-background' | 'selected-text' | 'separator' | 'shadow' | 'tertiary-label' | 'text-background' | 'text' | 'under-page-background' | 'unemphasized-selected-content-background' | 'unemphasized-selected-text-background' | 'unemphasized-selected-text' | 'window-background' | 'window-frame-text'): string;
+    /**
+     * Can be `dark`, `light` or `unknown`.
+     *
+     * Gets the macOS appearance setting that is currently applied to your application,
+     * maps to NSApplication.effectiveAppearance
+     *
+     * @platform darwin
+     */
+    getEffectiveAppearance(): ('dark' | 'light' | 'unknown');
+    /**
+     * Can be `not-determined`, `granted`, `denied`, `restricted` or `unknown`.
+     *
+     * This user consent was not required on macOS 10.13 High Sierra or lower so this
+     * method will always return `granted`. macOS 10.14 Mojave or higher requires
+     * consent for `microphone` and `camera` access. macOS 10.15 Catalina or higher
+     * requires consent for `screen` access.
+     *
+     * Windows 10 has a global setting controlling `microphone` and `camera` access for
+     * all win32 applications. It will always return `granted` for `screen` and for all
+     * media types on older versions of Windows.
+     *
+     * @platform win32,darwin
+     */
+    getMediaAccessStatus(mediaType: 'microphone' | 'camera' | 'screen'): ('not-determined' | 'granted' | 'denied' | 'restricted' | 'unknown');
+    /**
+     * The standard system color formatted as `#RRGGBBAA`.
+     *
+     * Returns one of several standard system colors that automatically adapt to
+     * vibrancy and changes in accessibility settings like 'Increase contrast' and
+     * 'Reduce transparency'. See Apple Documentation for  more details.
+     *
+     * @platform darwin
+     */
+    getSystemColor(color: 'blue' | 'brown' | 'gray' | 'green' | 'orange' | 'pink' | 'purple' | 'red' | 'yellow'): string;
+    /**
+     * The value of `key` in `NSUserDefaults`.
+     *
+     * Some popular `key` and `type`s are:
+     *
+     * * `AppleInterfaceStyle`: `string`
+     * * `AppleAquaColorVariant`: `integer`
+     * * `AppleHighlightColor`: `string`
+     * * `AppleShowScrollBars`: `string`
+     * * `NSNavRecentPlaces`: `array`
+     * * `NSPreferredWebServices`: `dictionary`
+     * * `NSUserDictionaryReplacementItems`: `array`
+     *
+     * @platform darwin
+     */
+    getUserDefault<Type extends keyof UserDefaultTypes>(key: string, type: Type): UserDefaultTypes[Type];
+    /**
+     * `true` if DWM composition (Aero Glass) is enabled, and `false` otherwise.
+     *
+     * An example of using it to determine if you should create a transparent window or
+     * not (transparent windows won't work correctly when DWM composition is disabled):
+     *
+     * @platform win32
+     */
+    isAeroGlassEnabled(): boolean;
+    /**
+     * Whether the system is in Dark Mode.
+     *
+     * **Deprecated:** Should use the new `nativeTheme.shouldUseDarkColors` API.
+     *
+     * @deprecated
+     * @platform darwin,win32
+     */
+    isDarkMode(): boolean;
+    /**
+     * `true` if a high contrast theme is active, `false` otherwise.
+     *
+     * **Deprecated:** Should use the new `nativeTheme.shouldUseHighContrastColors`
+     * API.
+     *
+     * @deprecated
+     * @platform darwin,win32
+     */
+    isHighContrastColorScheme(): boolean;
+    /**
+     * `true` if an inverted color scheme (a high contrast color scheme with light text
+     * and dark backgrounds) is active, `false` otherwise.
+     *
+     * **Deprecated:** Should use the new `nativeTheme.shouldUseInvertedColorScheme`
+     * API.
+     *
+     * @deprecated
+     * @platform win32
+     */
+    isInvertedColorScheme(): boolean;
+    /**
+     * Whether the Swipe between pages setting is on.
+     *
+     * @platform darwin
+     */
+    isSwipeTrackingFromScrollEventsEnabled(): boolean;
+    /**
+     * `true` if the current process is a trusted accessibility client and `false` if
+     * it is not.
+     *
+     * @platform darwin
+     */
+    isTrustedAccessibilityClient(prompt: boolean): boolean;
+    /**
+     * Posts `event` as native notifications of macOS. The `userInfo` is an Object that
+     * contains the user information dictionary sent along with the notification.
+     *
+     * @platform darwin
+     */
+    postLocalNotification(event: string, userInfo: Record<string, any>): void;
+    /**
+     * Posts `event` as native notifications of macOS. The `userInfo` is an Object that
+     * contains the user information dictionary sent along with the notification.
+     *
+     * @platform darwin
+     */
+    postNotification(event: string, userInfo: Record<string, any>, deliverImmediately?: boolean): void;
+    /**
+     * Posts `event` as native notifications of macOS. The `userInfo` is an Object that
+     * contains the user information dictionary sent along with the notification.
+     *
+     * @platform darwin
+     */
+    postWorkspaceNotification(event: string, userInfo: Record<string, any>): void;
+    /**
+     * resolves if the user has successfully authenticated with Touch ID.
+     *
+     * This API itself will not protect your user data; rather, it is a mechanism to
+     * allow you to do so. Native apps will need to set Access Control Constants like
+     * `kSecAccessControlUserPresence` on their keychain entry so that reading it would
+     * auto-prompt for Touch ID biometric consent. This could be done with
+     * `node-keytar`, such that one would store an encryption key with `node-keytar`
+     * and only fetch it if `promptTouchID()` resolves.
+     *
+     * **NOTE:** This API will return a rejected Promise on macOS systems older than
+     * Sierra 10.12.2.
+     *
+     * @platform darwin
+     */
+    promptTouchID(reason: string): Promise<void>;
+    /**
+     * Add the specified defaults to your application's `NSUserDefaults`.
+     *
+     * @platform darwin
+     */
+    registerDefaults(defaults: Record<string, (string) | (boolean) | (number)>): void;
+    /**
+     * Removes the `key` in `NSUserDefaults`. This can be used to restore the default
+     * or global value of a `key` previously set with `setUserDefault`.
+     *
+     * @platform darwin
+     */
+    removeUserDefault(key: string): void;
+    /**
+     * Sets the appearance setting for your application, this should override the
+     * system default and override the value of `getEffectiveAppearance`.
+     *
+     * @deprecated
+     * @platform darwin
+     */
+    setAppLevelAppearance(appearance: (('dark' | 'light')) | (null)): void;
+    /**
+     * Set the value of `key` in `NSUserDefaults`.
+     *
+     * Note that `type` should match actual type of `value`. An exception is thrown if
+     * they don't.
+     *
+     * Some popular `key` and `type`s are:
+     *
+     * * `ApplePressAndHoldEnabled`: `boolean`
+     *
+     * @platform darwin
+     */
+    setUserDefault<Type extends keyof UserDefaultTypes>(key: string, type: Type, value: UserDefaultTypes[Type]): void;
+    /**
+     * The ID of this subscription
+     *
+     * Same as `subscribeNotification`, but uses `NSNotificationCenter` for local
+     * defaults. This is necessary for events such as
+     * `NSUserDefaultsDidChangeNotification`.
+     *
+     * If `event` is null, the `NSNotificationCenter` doesn’t use it as criteria for
+     * delivery to the observer. See docs for more information.
+     *
+     * @platform darwin
+     */
+    subscribeLocalNotification(event: (string) | (null), callback: (event: string, userInfo: Record<string, unknown>, object: string) => void): number;
+    /**
+     * The ID of this subscription
+     *
+     * Subscribes to native notifications of macOS, `callback` will be called with
+     * `callback(event, userInfo)` when the corresponding `event` happens. The
+     * `userInfo` is an Object that contains the user information dictionary sent along
+     * with the notification. The `object` is the sender of the notification, and only
+     * supports `NSString` values for now.
+     *
+     * The `id` of the subscriber is returned, which can be used to unsubscribe the
+     * `event`.
+     *
+     * Under the hood this API subscribes to `NSDistributedNotificationCenter`, example
+     * values of `event` are:
+     *
+     * * `AppleInterfaceThemeChangedNotification`
+     * * `AppleAquaColorVariantChanged`
+     * * `AppleColorPreferencesChangedNotification`
+     * * `AppleShowScrollBarsSettingChanged`
+     *
+     * If `event` is null, the `NSDistributedNotificationCenter` doesn’t use it as
+     * criteria for delivery to the observer. See docs  for more information.
+     *
+     * @platform darwin
+     */
+    subscribeNotification(event: (string) | (null), callback: (event: string, userInfo: Record<string, unknown>, object: string) => void): number;
+    /**
+     * The ID of this subscription
+     *
+     * Same as `subscribeNotification`, but uses
+     * `NSWorkspace.sharedWorkspace.notificationCenter`. This is necessary for events
+     * such as `NSWorkspaceDidActivateApplicationNotification`.
+     *
+     * If `event` is null, the `NSWorkspaceNotificationCenter` doesn’t use it as
+     * criteria for delivery to the observer. See docs for more information.
+     *
+     * @platform darwin
+     */
+    subscribeWorkspaceNotification(event: (string) | (null), callback: (event: string, userInfo: Record<string, unknown>, object: string) => void): number;
+    /**
+     * Same as `unsubscribeNotification`, but removes the subscriber from
+     * `NSNotificationCenter`.
+     *
+     * @platform darwin
+     */
+    unsubscribeLocalNotification(id: number): void;
+    /**
+     * Removes the subscriber with `id`.
+     *
+     * @platform darwin
+     */
+    unsubscribeNotification(id: number): void;
+    /**
+     * Same as `unsubscribeNotification`, but removes the subscriber from
+     * `NSWorkspace.sharedWorkspace.notificationCenter`.
+     *
+     * @platform darwin
+     */
+    unsubscribeWorkspaceNotification(id: number): void;
+    /**
+     * A `string` property that can be `dark`, `light` or `unknown`. It determines the
+     * macOS appearance setting for your application. This maps to values in:
+     * NSApplication.appearance. Setting this will override the system default as well
+     * as the value of `getEffectiveAppearance`.
+     *
+     * Possible values that can be set are `dark` and `light`, and possible return
+     * values are `dark`, `light`, and `unknown`.
+     *
+     * This property is only available on macOS 10.14 Mojave or newer.
+     *
+     * @platform darwin
+     */
+    appLevelAppearance: ('dark' | 'light' | 'unknown');
+    /**
+     * A `string` property that can be `dark`, `light` or `unknown`.
+     *
+     * Returns the macOS appearance setting that is currently applied to your
+     * application, maps to NSApplication.effectiveAppearance
+     *
+     * @platform darwin
+     */
+    readonly effectiveAppearance: ('dark' | 'light' | 'unknown');
+  }
+
+  interface Task {
+
+    // Docs: https://electronjs.org/docs/api/structures/task
+
+    /**
+     * The command line arguments when `program` is executed.
+     */
+    arguments: string;
+    /**
+     * Description of this task.
+     */
+    description: string;
+    /**
+     * The icon index in the icon file. If an icon file consists of two or more icons,
+     * set this value to identify the icon. If an icon file consists of one icon, this
+     * value is 0.
+     */
+    iconIndex: number;
+    /**
+     * The absolute path to an icon to be displayed in a JumpList, which can be an
+     * arbitrary resource file that contains an icon. You can usually specify
+     * `process.execPath` to show the icon of the program.
+     */
+    iconPath: string;
+    /**
+     * Path of the program to execute, usually you should specify `process.execPath`
+     * which opens the current program.
+     */
+    program: string;
+    /**
+     * The string to be displayed in a JumpList.
+     */
+    title: string;
+    /**
+     * The working directory. Default is empty.
+     */
+    workingDirectory?: string;
+  }
+
+  interface ThumbarButton {
+
+    // Docs: https://electronjs.org/docs/api/structures/thumbar-button
+
+    click: Function;
+    /**
+     * Control specific states and behaviors of the button. By default, it is
+     * `['enabled']`.
+     */
+    flags?: string[];
+    /**
+     * The icon showing in thumbnail toolbar.
+     */
+    icon: NativeImage;
+    /**
+     * The text of the button's tooltip.
+     */
+    tooltip?: string;
+  }
+
+  class TouchBar {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar
+
+    /**
+     * TouchBar
+     */
+    constructor(options: TouchBarConstructorOptions);
+    /**
+     * A `TouchBarItem` that will replace the "esc" button on the touch bar when set.
+     * Setting to `null` restores the default "esc" button. Changing this value
+     * immediately updates the escape item in the touch bar.
+     */
+    escapeItem: (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer | null);
+    /**
+     * A `typeof TouchBarButton` reference to the `TouchBarButton` class.
+     */
+    static TouchBarButton: typeof TouchBarButton;
+    /**
+     * A `typeof TouchBarColorPicker` reference to the `TouchBarColorPicker` class.
+     */
+    static TouchBarColorPicker: typeof TouchBarColorPicker;
+    /**
+     * A `typeof TouchBarGroup` reference to the `TouchBarGroup` class.
+     */
+    static TouchBarGroup: typeof TouchBarGroup;
+    /**
+     * A `typeof TouchBarLabel` reference to the `TouchBarLabel` class.
+     */
+    static TouchBarLabel: typeof TouchBarLabel;
+    /**
+     * A `typeof TouchBarOtherItemsProxy` reference to the `TouchBarOtherItemsProxy`
+     * class.
+     */
+    static TouchBarOtherItemsProxy: typeof TouchBarOtherItemsProxy;
+    /**
+     * A `typeof TouchBarPopover` reference to the `TouchBarPopover` class.
+     */
+    static TouchBarPopover: typeof TouchBarPopover;
+    /**
+     * A `typeof TouchBarScrubber` reference to the `TouchBarScrubber` class.
+     */
+    static TouchBarScrubber: typeof TouchBarScrubber;
+    /**
+     * A `typeof TouchBarSegmentedControl` reference to the `TouchBarSegmentedControl`
+     * class.
+     */
+    static TouchBarSegmentedControl: typeof TouchBarSegmentedControl;
+    /**
+     * A `typeof TouchBarSlider` reference to the `TouchBarSlider` class.
+     */
+    static TouchBarSlider: typeof TouchBarSlider;
+    /**
+     * A `typeof TouchBarSpacer` reference to the `TouchBarSpacer` class.
+     */
+    static TouchBarSpacer: typeof TouchBarSpacer;
+  }
+
+  class TouchBarButton {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-button
+
+    /**
+     * TouchBarButton
+     */
+    constructor(options: TouchBarButtonConstructorOptions);
+    /**
+     * A `string` representing the description of the button to be read by a screen
+     * reader. Will only be read by screen readers if no label is set.
+     */
+    accessibilityLabel: string;
+    /**
+     * A `string` hex code representing the button's current background color. Changing
+     * this value immediately updates the button in the touch bar.
+     */
+    backgroundColor: string;
+    /**
+     * A `boolean` representing whether the button is in an enabled state.
+     */
+    enabled: boolean;
+    /**
+     * A `NativeImage` representing the button's current icon. Changing this value
+     * immediately updates the button in the touch bar.
+     */
+    icon: NativeImage;
+    /**
+     * A `string` - Can be `left`, `right` or `overlay`.  Defaults to `overlay`.
+     */
+    iconPosition: ('left' | 'right' | 'overlay');
+    /**
+     * A `string` representing the button's current text. Changing this value
+     * immediately updates the button in the touch bar.
+     */
+    label: string;
+  }
+
+  class TouchBarColorPicker extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-color-picker
+
+    /**
+     * TouchBarColorPicker
+     */
+    constructor(options: TouchBarColorPickerConstructorOptions);
+    /**
+     * A `string[]` array representing the color picker's available colors to select.
+     * Changing this value immediately updates the color picker in the touch bar.
+     */
+    availableColors: string[];
+    /**
+     * A `string` hex code representing the color picker's currently selected color.
+     * Changing this value immediately updates the color picker in the touch bar.
+     */
+    selectedColor: string;
+  }
+
+  class TouchBarGroup extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-group
+
+    /**
+     * TouchBarGroup
+     */
+    constructor(options: TouchBarGroupConstructorOptions);
+  }
+
+  class TouchBarLabel extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-label
+
+    /**
+     * TouchBarLabel
+     */
+    constructor(options: TouchBarLabelConstructorOptions);
+    /**
+     * A `string` representing the description of the label to be read by a screen
+     * reader.
+     */
+    accessibilityLabel: string;
+    /**
+     * A `string` representing the label's current text. Changing this value
+     * immediately updates the label in the touch bar.
+     */
+    label: string;
+    /**
+     * A `string` hex code representing the label's current text color. Changing this
+     * value immediately updates the label in the touch bar.
+     */
+    textColor: string;
+  }
+
+  class TouchBarOtherItemsProxy extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-other-items-proxy
+
+    /**
+     * TouchBarOtherItemsProxy
+     */
+    constructor();
+  }
+
+  class TouchBarPopover extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-popover
+
+    /**
+     * TouchBarPopover
+     */
+    constructor(options: TouchBarPopoverConstructorOptions);
+    /**
+     * A `NativeImage` representing the popover's current button icon. Changing this
+     * value immediately updates the popover in the touch bar.
+     */
+    icon: NativeImage;
+    /**
+     * A `string` representing the popover's current button text. Changing this value
+     * immediately updates the popover in the touch bar.
+     */
+    label: string;
+  }
+
+  class TouchBarScrubber extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-scrubber
+
+    /**
+     * TouchBarScrubber
+     */
+    constructor(options: TouchBarScrubberConstructorOptions);
+    /**
+     * A `boolean` representing whether this scrubber is continuous or not. Updating
+     * this value immediately updates the control in the touch bar.
+     */
+    continuous: boolean;
+    /**
+     * A `ScrubberItem[]` array representing the items in this scrubber. Updating this
+     * value immediately updates the control in the touch bar. Updating deep properties
+     * inside this array **does not update the touch bar**.
+     */
+    items: ScrubberItem[];
+    /**
+     * A `string` representing the mode of this scrubber. Updating this value
+     * immediately updates the control in the touch bar. Possible values:
+     *
+     * * `fixed` - Maps to `NSScrubberModeFixed`.
+     * * `free` - Maps to `NSScrubberModeFree`.
+     */
+    mode: ('fixed' | 'free');
+    /**
+     * A `string` representing the style that selected items in the scrubber should
+     * have. This style is overlayed on top of the scrubber item instead of being
+     * placed behind it. Updating this value immediately updates the control in the
+     * touch bar. Possible values:
+     *
+     * * `background` - Maps to `[NSScrubberSelectionStyle roundedBackgroundStyle]`.
+     * * `outline` - Maps to `[NSScrubberSelectionStyle outlineOverlayStyle]`.
+     * * `none` - Removes all styles.
+     */
+    overlayStyle: ('background' | 'outline' | 'none');
+    /**
+     * A `string` representing the style that selected items in the scrubber should
+     * have. Updating this value immediately updates the control in the touch bar.
+     * Possible values:
+     *
+     * * `background` - Maps to `[NSScrubberSelectionStyle roundedBackgroundStyle]`.
+     * * `outline` - Maps to `[NSScrubberSelectionStyle outlineOverlayStyle]`.
+     * * `none` - Removes all styles.
+     */
+    selectedStyle: ('background' | 'outline' | 'none');
+    /**
+     * A `boolean` representing whether to show the left / right selection arrows in
+     * this scrubber. Updating this value immediately updates the control in the touch
+     * bar.
+     */
+    showArrowButtons: boolean;
+  }
+
+  class TouchBarSegmentedControl extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-segmented-control
+
+    /**
+     * TouchBarSegmentedControl
+     */
+    constructor(options: TouchBarSegmentedControlConstructorOptions);
+    /**
+     * A `string` representing the current selection mode of the control.  Can be
+     * `single`, `multiple` or `buttons`.
+     */
+    mode: ('single' | 'multiple' | 'buttons');
+    /**
+     * A `SegmentedControlSegment[]` array representing the segments in this control.
+     * Updating this value immediately updates the control in the touch bar. Updating
+     * deep properties inside this array **does not update the touch bar**.
+     */
+    segments: SegmentedControlSegment[];
+    /**
+     * A `string` representing the controls current segment style. Updating this value
+     * immediately updates the control in the touch bar.
+     */
+    segmentStyle: string;
+    /**
+     * An `Integer` representing the currently selected segment. Changing this value
+     * immediately updates the control in the touch bar. User interaction with the
+     * touch bar will update this value automatically.
+     */
+    selectedIndex: number;
+  }
+
+  class TouchBarSlider extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-slider
+
+    /**
+     * TouchBarSlider
+     */
+    constructor(options: TouchBarSliderConstructorOptions);
+    /**
+     * A `string` representing the slider's current text. Changing this value
+     * immediately updates the slider in the touch bar.
+     */
+    label: string;
+    /**
+     * A `number` representing the slider's current maximum value. Changing this value
+     * immediately updates the slider in the touch bar.
+     */
+    maxValue: number;
+    /**
+     * A `number` representing the slider's current minimum value. Changing this value
+     * immediately updates the slider in the touch bar.
+     */
+    minValue: number;
+    /**
+     * A `number` representing the slider's current value. Changing this value
+     * immediately updates the slider in the touch bar.
+     */
+    value: number;
+  }
+
+  class TouchBarSpacer extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/touch-bar-spacer
+
+    /**
+     * TouchBarSpacer
+     */
+    constructor(options: TouchBarSpacerConstructorOptions);
+    /**
+     * A `string` representing the size of the spacer.  Can be `small`, `large` or
+     * `flexible`.
+     */
+    size: ('small' | 'large' | 'flexible');
+  }
+
+  interface TraceCategoriesAndOptions {
+
+    // Docs: https://electronjs.org/docs/api/structures/trace-categories-and-options
+
+    /**
+     * A filter to control what category groups should be traced. A filter can have an
+     * optional '-' prefix to exclude category groups that contain a matching category.
+     * Having both included and excluded category patterns in the same list is not
+     * supported. Examples: `test_MyTest*`, `test_MyTest*,test_OtherStuff`,
+     * `-excluded_category1,-excluded_category2`.
+     */
+    categoryFilter: string;
+    /**
+     * Controls what kind of tracing is enabled, it is a comma-delimited sequence of
+     * the following strings: `record-until-full`, `record-continuously`,
+     * `trace-to-console`, `enable-sampling`, `enable-systrace`, e.g.
+     * `'record-until-full,enable-sampling'`. The first 3 options are trace recording
+     * modes and hence mutually exclusive. If more than one trace recording modes
+     * appear in the `traceOptions` string, the last one takes precedence. If none of
+     * the trace recording modes are specified, recording mode is `record-until-full`.
+     * The trace option will first be reset to the default option (`record_mode` set to
+     * `record-until-full`, `enable_sampling` and `enable_systrace` set to `false`)
+     * before options parsed from `traceOptions` are applied on it.
+     */
+    traceOptions: string;
+  }
+
+  interface TraceConfig {
+
+    // Docs: https://electronjs.org/docs/api/structures/trace-config
+
+    /**
+     * if true, filter event data according to a specific list of events that have been
+     * manually vetted to not include any PII. See the implementation in Chromium for
+     * specifics.
+     */
+    enable_argument_filter?: boolean;
+    /**
+     * a list of tracing categories to exclude. Can include glob-like patterns using
+     * `*` at the end of the category name. See tracing categories for the list of
+     * categories.
+     */
+    excluded_categories?: string[];
+    /**
+     * a list of histogram names to report with the trace.
+     */
+    histogram_names?: string[];
+    /**
+     * a list of tracing categories to include. Can include glob-like patterns using
+     * `*` at the end of the category name. See tracing categories for the list of
+     * categories.
+     */
+    included_categories?: string[];
+    /**
+     * a list of process IDs to include in the trace. If not specified, trace all
+     * processes.
+     */
+    included_process_ids?: number[];
+    /**
+     * if the `disabled-by-default-memory-infra` category is enabled, this contains
+     * optional additional configuration for data collection. See the Chromium
+     * memory-infra docs for more information.
+     */
+    memory_dump_config?: Record<string, any>;
+    /**
+     * Can be `record-until-full`, `record-continuously`, `record-as-much-as-possible`
+     * or `trace-to-console`. Defaults to `record-until-full`.
+     */
+    recording_mode?: ('record-until-full' | 'record-continuously' | 'record-as-much-as-possible' | 'trace-to-console');
+    /**
+     * maximum size of the trace recording buffer in events.
+     */
+    trace_buffer_size_in_events?: number;
+    /**
+     * maximum size of the trace recording buffer in kilobytes. Defaults to 100MB.
+     */
+    trace_buffer_size_in_kb?: number;
+  }
+
+  interface Transaction {
+
+    // Docs: https://electronjs.org/docs/api/structures/transaction
+
+    /**
+     * The error code if an error occurred while processing the transaction.
+     */
+    errorCode: number;
+    /**
+     * The error message if an error occurred while processing the transaction.
+     */
+    errorMessage: string;
+    /**
+     * The identifier of the restored transaction by the App Store.
+     */
+    originalTransactionIdentifier: string;
+    payment: Payment;
+    /**
+     * The date the transaction was added to the App Store’s payment queue.
+     */
+    transactionDate: string;
+    /**
+     * A string that uniquely identifies a successful payment transaction.
+     */
+    transactionIdentifier: string;
+    /**
+     * The transaction state, can be `purchasing`, `purchased`, `failed`, `restored` or
+     * `deferred`.
+     */
+    transactionState: ('purchasing' | 'purchased' | 'failed' | 'restored' | 'deferred');
+  }
+
+  class Tray extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/tray
+
+    /**
+     * Emitted when the tray balloon is clicked.
+     *
+     * @platform win32
+     */
+    on(event: 'balloon-click', listener: Function): this;
+    once(event: 'balloon-click', listener: Function): this;
+    addListener(event: 'balloon-click', listener: Function): this;
+    removeListener(event: 'balloon-click', listener: Function): this;
+    /**
+     * Emitted when the tray balloon is closed because of timeout or user manually
+     * closes it.
+     *
+     * @platform win32
+     */
+    on(event: 'balloon-closed', listener: Function): this;
+    once(event: 'balloon-closed', listener: Function): this;
+    addListener(event: 'balloon-closed', listener: Function): this;
+    removeListener(event: 'balloon-closed', listener: Function): this;
+    /**
+     * Emitted when the tray balloon shows.
+     *
+     * @platform win32
+     */
+    on(event: 'balloon-show', listener: Function): this;
+    once(event: 'balloon-show', listener: Function): this;
+    addListener(event: 'balloon-show', listener: Function): this;
+    removeListener(event: 'balloon-show', listener: Function): this;
+    /**
+     * Emitted when the tray icon is clicked.
+     */
+    on(event: 'click', listener: (event: KeyboardEvent,
+                                  /**
+                                   * The bounds of tray icon.
+                                   */
+                                  bounds: Rectangle,
+                                  /**
+                                   * The position of the event.
+                                   */
+                                  position: Point) => void): this;
+    once(event: 'click', listener: (event: KeyboardEvent,
+                                  /**
+                                   * The bounds of tray icon.
+                                   */
+                                  bounds: Rectangle,
+                                  /**
+                                   * The position of the event.
+                                   */
+                                  position: Point) => void): this;
+    addListener(event: 'click', listener: (event: KeyboardEvent,
+                                  /**
+                                   * The bounds of tray icon.
+                                   */
+                                  bounds: Rectangle,
+                                  /**
+                                   * The position of the event.
+                                   */
+                                  position: Point) => void): this;
+    removeListener(event: 'click', listener: (event: KeyboardEvent,
+                                  /**
+                                   * The bounds of tray icon.
+                                   */
+                                  bounds: Rectangle,
+                                  /**
+                                   * The position of the event.
+                                   */
+                                  position: Point) => void): this;
+    /**
+     * Emitted when the tray icon is double clicked.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'double-click', listener: (event: KeyboardEvent,
+                                         /**
+                                          * The bounds of tray icon.
+                                          */
+                                         bounds: Rectangle) => void): this;
+    once(event: 'double-click', listener: (event: KeyboardEvent,
+                                         /**
+                                          * The bounds of tray icon.
+                                          */
+                                         bounds: Rectangle) => void): this;
+    addListener(event: 'double-click', listener: (event: KeyboardEvent,
+                                         /**
+                                          * The bounds of tray icon.
+                                          */
+                                         bounds: Rectangle) => void): this;
+    removeListener(event: 'double-click', listener: (event: KeyboardEvent,
+                                         /**
+                                          * The bounds of tray icon.
+                                          */
+                                         bounds: Rectangle) => void): this;
+    /**
+     * Emitted when a drag operation ends on the tray or ends at another location.
+     *
+     * @platform darwin
+     */
+    on(event: 'drag-end', listener: Function): this;
+    once(event: 'drag-end', listener: Function): this;
+    addListener(event: 'drag-end', listener: Function): this;
+    removeListener(event: 'drag-end', listener: Function): this;
+    /**
+     * Emitted when a drag operation enters the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'drag-enter', listener: Function): this;
+    once(event: 'drag-enter', listener: Function): this;
+    addListener(event: 'drag-enter', listener: Function): this;
+    removeListener(event: 'drag-enter', listener: Function): this;
+    /**
+     * Emitted when a drag operation exits the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'drag-leave', listener: Function): this;
+    once(event: 'drag-leave', listener: Function): this;
+    addListener(event: 'drag-leave', listener: Function): this;
+    removeListener(event: 'drag-leave', listener: Function): this;
+    /**
+     * Emitted when any dragged items are dropped on the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'drop', listener: Function): this;
+    once(event: 'drop', listener: Function): this;
+    addListener(event: 'drop', listener: Function): this;
+    removeListener(event: 'drop', listener: Function): this;
+    /**
+     * Emitted when dragged files are dropped in the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'drop-files', listener: (event: Event,
+                                       /**
+                                        * The paths of the dropped files.
+                                        */
+                                       files: string[]) => void): this;
+    once(event: 'drop-files', listener: (event: Event,
+                                       /**
+                                        * The paths of the dropped files.
+                                        */
+                                       files: string[]) => void): this;
+    addListener(event: 'drop-files', listener: (event: Event,
+                                       /**
+                                        * The paths of the dropped files.
+                                        */
+                                       files: string[]) => void): this;
+    removeListener(event: 'drop-files', listener: (event: Event,
+                                       /**
+                                        * The paths of the dropped files.
+                                        */
+                                       files: string[]) => void): this;
+    /**
+     * Emitted when dragged text is dropped in the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'drop-text', listener: (event: Event,
+                                      /**
+                                       * the dropped text string.
+                                       */
+                                      text: string) => void): this;
+    once(event: 'drop-text', listener: (event: Event,
+                                      /**
+                                       * the dropped text string.
+                                       */
+                                      text: string) => void): this;
+    addListener(event: 'drop-text', listener: (event: Event,
+                                      /**
+                                       * the dropped text string.
+                                       */
+                                      text: string) => void): this;
+    removeListener(event: 'drop-text', listener: (event: Event,
+                                      /**
+                                       * the dropped text string.
+                                       */
+                                      text: string) => void): this;
+    /**
+     * Emitted when the mouse clicks the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'mouse-down', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    once(event: 'mouse-down', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    addListener(event: 'mouse-down', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    removeListener(event: 'mouse-down', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    /**
+     * Emitted when the mouse enters the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'mouse-enter', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    once(event: 'mouse-enter', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    addListener(event: 'mouse-enter', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    removeListener(event: 'mouse-enter', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    /**
+     * Emitted when the mouse exits the tray icon.
+     *
+     * @platform darwin
+     */
+    on(event: 'mouse-leave', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    once(event: 'mouse-leave', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    addListener(event: 'mouse-leave', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    removeListener(event: 'mouse-leave', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The position of the event.
+                                         */
+                                        position: Point) => void): this;
+    /**
+     * Emitted when the mouse moves in the tray icon.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'mouse-move', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    once(event: 'mouse-move', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    addListener(event: 'mouse-move', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    removeListener(event: 'mouse-move', listener: (event: KeyboardEvent,
+                                       /**
+                                        * The position of the event.
+                                        */
+                                       position: Point) => void): this;
+    /**
+     * Emitted when the mouse is released from clicking the tray icon.
+     *
+     * Note: This will not be emitted if you have set a context menu for your Tray
+     * using `tray.setContextMenu`, as a result of macOS-level constraints.
+     *
+     * @platform darwin
+     */
+    on(event: 'mouse-up', listener: (event: KeyboardEvent,
+                                     /**
+                                      * The position of the event.
+                                      */
+                                     position: Point) => void): this;
+    once(event: 'mouse-up', listener: (event: KeyboardEvent,
+                                     /**
+                                      * The position of the event.
+                                      */
+                                     position: Point) => void): this;
+    addListener(event: 'mouse-up', listener: (event: KeyboardEvent,
+                                     /**
+                                      * The position of the event.
+                                      */
+                                     position: Point) => void): this;
+    removeListener(event: 'mouse-up', listener: (event: KeyboardEvent,
+                                     /**
+                                      * The position of the event.
+                                      */
+                                     position: Point) => void): this;
+    /**
+     * Emitted when the tray icon is right clicked.
+     *
+     * @platform darwin,win32
+     */
+    on(event: 'right-click', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The bounds of tray icon.
+                                         */
+                                        bounds: Rectangle) => void): this;
+    once(event: 'right-click', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The bounds of tray icon.
+                                         */
+                                        bounds: Rectangle) => void): this;
+    addListener(event: 'right-click', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The bounds of tray icon.
+                                         */
+                                        bounds: Rectangle) => void): this;
+    removeListener(event: 'right-click', listener: (event: KeyboardEvent,
+                                        /**
+                                         * The bounds of tray icon.
+                                         */
+                                        bounds: Rectangle) => void): this;
+    /**
+     * Tray
+     */
+    constructor(image: (NativeImage) | (string), guid?: string);
+    /**
+     * Closes an open context menu, as set by `tray.setContextMenu()`.
+     *
+     * @platform darwin,win32
+     */
+    closeContextMenu(): void;
+    /**
+     * Destroys the tray icon immediately.
+     */
+    destroy(): void;
+    /**
+     * Displays a tray balloon.
+     *
+     * @platform win32
+     */
+    displayBalloon(options: DisplayBalloonOptions): void;
+    /**
+     * Returns focus to the taskbar notification area. Notification area icons should
+     * use this message when they have completed their UI operation. For example, if
+     * the icon displays a shortcut menu, but the user presses ESC to cancel it, use
+     * `tray.focus()` to return focus to the notification area.
+     *
+     * @platform win32
+     */
+    focus(): void;
+    /**
+     * The `bounds` of this tray icon as `Object`.
+     *
+     * @platform darwin,win32
+     */
+    getBounds(): Rectangle;
+    /**
+     * Whether double click events will be ignored.
+     *
+     * @platform darwin
+     */
+    getIgnoreDoubleClickEvents(): boolean;
+    /**
+     * the title displayed next to the tray icon in the status bar
+     *
+     * @platform darwin
+     */
+    getTitle(): string;
+    /**
+     * Whether the tray icon is destroyed.
+     */
+    isDestroyed(): boolean;
+    /**
+     * Pops up the context menu of the tray icon. When `menu` is passed, the `menu`
+     * will be shown instead of the tray icon's context menu.
+     *
+     * The `position` is only available on Windows, and it is (0, 0) by default.
+     *
+     * @platform darwin,win32
+     */
+    popUpContextMenu(menu?: Menu, position?: Point): void;
+    /**
+     * Removes a tray balloon.
+     *
+     * @platform win32
+     */
+    removeBalloon(): void;
+    /**
+     * Sets the context menu for this icon.
+     */
+    setContextMenu(menu: (Menu) | (null)): void;
+    /**
+     * Sets the option to ignore double click events. Ignoring these events allows you
+     * to detect every individual click of the tray icon.
+     *
+     * This value is set to false by default.
+     *
+     * @platform darwin
+     */
+    setIgnoreDoubleClickEvents(ignore: boolean): void;
+    /**
+     * Sets the `image` associated with this tray icon.
+     */
+    setImage(image: (NativeImage) | (string)): void;
+    /**
+     * Sets the `image` associated with this tray icon when pressed on macOS.
+     *
+     * @platform darwin
+     */
+    setPressedImage(image: (NativeImage) | (string)): void;
+    /**
+     * Sets the title displayed next to the tray icon in the status bar (Support ANSI
+     * colors).
+     *
+     * @platform darwin
+     */
+    setTitle(title: string, options?: TitleOptions): void;
+    /**
+     * Sets the hover text for this tray icon.
+     */
+    setToolTip(toolTip: string): void;
+  }
+
+  interface UploadData {
+
+    // Docs: https://electronjs.org/docs/api/structures/upload-data
+
+    /**
+     * UUID of blob data. Use ses.getBlobData method to retrieve the data.
+     */
+    blobUUID?: string;
+    /**
+     * Content being sent.
+     */
+    bytes: Buffer;
+    /**
+     * Path of file being uploaded.
+     */
+    file?: string;
+  }
+
+  interface UploadFile {
+
+    // Docs: https://electronjs.org/docs/api/structures/upload-file
+
+    /**
+     * Path of file to be uploaded.
+     */
+    filePath: string;
+    /**
+     * Number of bytes to read from `offset`. Defaults to `0`.
+     */
+    length: number;
+    /**
+     * Last Modification time in number of seconds since the UNIX epoch.
+     */
+    modificationTime: number;
+    /**
+     * Defaults to `0`.
+     */
+    offset: number;
+    /**
+     * `file`.
+     */
+    type: 'file';
+  }
+
+  interface UploadRawData {
+
+    // Docs: https://electronjs.org/docs/api/structures/upload-raw-data
+
+    /**
+     * Data to be uploaded.
+     */
+    bytes: Buffer;
+    /**
+     * `rawData`.
+     */
+    type: 'rawData';
+  }
+
+  interface UserDefaultTypes {
+
+    // Docs: https://electronjs.org/docs/api/structures/user-default-types
+
+    array: Array<unknown>;
+    boolean: boolean;
+    dictionary: Record<string, unknown>;
+    double: number;
+    float: number;
+    integer: number;
+    string: string;
+    url: string;
+  }
+
+  class WebContents extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/web-contents
+
+    /**
+     * | undefined - A WebContents instance with the given TargetID, or `undefined` if
+     * there is no WebContents associated with the given TargetID.
+     *
+     * When communicating with the Chrome DevTools Protocol, it can be useful to lookup
+     * a WebContents instance based on its assigned TargetID.
+     */
+    static fromDevToolsTargetId(targetId: string): WebContents;
+    /**
+     * | undefined - A WebContents instance with the given WebFrameMain, or `undefined`
+     * if there is no WebContents associated with the given WebFrameMain.
+     */
+    static fromFrame(frame: WebFrameMain): WebContents;
+    /**
+     * | undefined - A WebContents instance with the given ID, or `undefined` if there
+     * is no WebContents associated with the given ID.
+     */
+    static fromId(id: number): WebContents;
+    /**
+     * An array of all `WebContents` instances. This will contain web contents for all
+     * windows, webviews, opened devtools, and devtools extension background pages.
+     */
+    static getAllWebContents(): WebContents[];
+    /**
+     * | null - The web contents that is focused in this application, otherwise returns
+     * `null`.
+     */
+    static getFocusedWebContents(): WebContents;
+    /**
+     * Emitted before dispatching the `keydown` and `keyup` events in the page. Calling
+     * `event.preventDefault` will prevent the page `keydown`/`keyup` events and the
+     * menu shortcuts.
+     *
+     * To only prevent the menu shortcuts, use `setIgnoreMenuShortcuts`:
+     */
+    on(event: 'before-input-event', listener: (event: Event,
+                                               /**
+                                                * Input properties.
+                                                */
+                                               input: Input) => void): this;
+    once(event: 'before-input-event', listener: (event: Event,
+                                               /**
+                                                * Input properties.
+                                                */
+                                               input: Input) => void): this;
+    addListener(event: 'before-input-event', listener: (event: Event,
+                                               /**
+                                                * Input properties.
+                                                */
+                                               input: Input) => void): this;
+    removeListener(event: 'before-input-event', listener: (event: Event,
+                                               /**
+                                                * Input properties.
+                                                */
+                                               input: Input) => void): this;
+    /**
+     * Emitted when the `WebContents` loses focus.
+     */
+    on(event: 'blur', listener: Function): this;
+    once(event: 'blur', listener: Function): this;
+    addListener(event: 'blur', listener: Function): this;
+    removeListener(event: 'blur', listener: Function): this;
+    /**
+     * Emitted when failed to verify the `certificate` for `url`.
+     *
+     * The usage is the same with the `certificate-error` event of `app`.
+     */
+    on(event: 'certificate-error', listener: (event: Event,
+                                              url: string,
+                                              /**
+                                               * The error code.
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    once(event: 'certificate-error', listener: (event: Event,
+                                              url: string,
+                                              /**
+                                               * The error code.
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    addListener(event: 'certificate-error', listener: (event: Event,
+                                              url: string,
+                                              /**
+                                               * The error code.
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    removeListener(event: 'certificate-error', listener: (event: Event,
+                                              url: string,
+                                              /**
+                                               * The error code.
+                                               */
+                                              error: string,
+                                              certificate: Certificate,
+                                              callback: (isTrusted: boolean) => void,
+                                              isMainFrame: boolean) => void): this;
+    /**
+     * Emitted when the associated window logs a console message.
+     */
+    on(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+                                             * `error`.
+                                             */
+                                            level: number,
+                                            /**
+                                             * The actual console message
+                                             */
+                                            message: string,
+                                            /**
+                                             * The line number of the source that triggered this console message
+                                             */
+                                            line: number,
+                                            sourceId: string) => void): this;
+    once(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+                                             * `error`.
+                                             */
+                                            level: number,
+                                            /**
+                                             * The actual console message
+                                             */
+                                            message: string,
+                                            /**
+                                             * The line number of the source that triggered this console message
+                                             */
+                                            line: number,
+                                            sourceId: string) => void): this;
+    addListener(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+                                             * `error`.
+                                             */
+                                            level: number,
+                                            /**
+                                             * The actual console message
+                                             */
+                                            message: string,
+                                            /**
+                                             * The line number of the source that triggered this console message
+                                             */
+                                            line: number,
+                                            sourceId: string) => void): this;
+    removeListener(event: 'console-message', listener: (event: Event,
+                                            /**
+                                             * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+                                             * `error`.
+                                             */
+                                            level: number,
+                                            /**
+                                             * The actual console message
+                                             */
+                                            message: string,
+                                            /**
+                                             * The line number of the source that triggered this console message
+                                             */
+                                            line: number,
+                                            sourceId: string) => void): this;
+    /**
+     * Emitted when there is a new context menu that needs to be handled.
+     */
+    on(event: 'context-menu', listener: (event: Event,
+                                         params: ContextMenuParams) => void): this;
+    once(event: 'context-menu', listener: (event: Event,
+                                         params: ContextMenuParams) => void): this;
+    addListener(event: 'context-menu', listener: (event: Event,
+                                         params: ContextMenuParams) => void): this;
+    removeListener(event: 'context-menu', listener: (event: Event,
+                                         params: ContextMenuParams) => void): this;
+    /**
+     * Emitted when the renderer process crashes or is killed.
+     *
+     * **Deprecated:** This event is superceded by the `render-process-gone` event
+     * which contains more information about why the render process disappeared. It
+     * isn't always because it crashed.  The `killed` boolean can be replaced by
+     * checking `reason === 'killed'` when you switch to that event.
+     *
+     * @deprecated
+     */
+    on(event: 'crashed', listener: (event: Event,
+                                    killed: boolean) => void): this;
+    once(event: 'crashed', listener: (event: Event,
+                                    killed: boolean) => void): this;
+    addListener(event: 'crashed', listener: (event: Event,
+                                    killed: boolean) => void): this;
+    removeListener(event: 'crashed', listener: (event: Event,
+                                    killed: boolean) => void): this;
+    /**
+     * Emitted when the cursor's type changes. The `type` parameter can be `default`,
+     * `crosshair`, `pointer`, `text`, `wait`, `help`, `e-resize`, `n-resize`,
+     * `ne-resize`, `nw-resize`, `s-resize`, `se-resize`, `sw-resize`, `w-resize`,
+     * `ns-resize`, `ew-resize`, `nesw-resize`, `nwse-resize`, `col-resize`,
+     * `row-resize`, `m-panning`, `e-panning`, `n-panning`, `ne-panning`, `nw-panning`,
+     * `s-panning`, `se-panning`, `sw-panning`, `w-panning`, `move`, `vertical-text`,
+     * `cell`, `context-menu`, `alias`, `progress`, `nodrop`, `copy`, `none`,
+     * `not-allowed`, `zoom-in`, `zoom-out`, `grab`, `grabbing` or `custom`.
+     *
+     * If the `type` parameter is `custom`, the `image` parameter will hold the custom
+     * cursor image in a `NativeImage`, and `scale`, `size` and `hotspot` will hold
+     * additional information about the custom cursor.
+     */
+    on(event: 'cursor-changed', listener: (event: Event,
+                                           type: string,
+                                           image: NativeImage,
+                                           /**
+                                            * scaling factor for the custom cursor.
+                                            */
+                                           scale: number,
+                                           /**
+                                            * the size of the `image`.
+                                            */
+                                           size: Size,
+                                           /**
+                                            * coordinates of the custom cursor's hotspot.
+                                            */
+                                           hotspot: Point) => void): this;
+    once(event: 'cursor-changed', listener: (event: Event,
+                                           type: string,
+                                           image: NativeImage,
+                                           /**
+                                            * scaling factor for the custom cursor.
+                                            */
+                                           scale: number,
+                                           /**
+                                            * the size of the `image`.
+                                            */
+                                           size: Size,
+                                           /**
+                                            * coordinates of the custom cursor's hotspot.
+                                            */
+                                           hotspot: Point) => void): this;
+    addListener(event: 'cursor-changed', listener: (event: Event,
+                                           type: string,
+                                           image: NativeImage,
+                                           /**
+                                            * scaling factor for the custom cursor.
+                                            */
+                                           scale: number,
+                                           /**
+                                            * the size of the `image`.
+                                            */
+                                           size: Size,
+                                           /**
+                                            * coordinates of the custom cursor's hotspot.
+                                            */
+                                           hotspot: Point) => void): this;
+    removeListener(event: 'cursor-changed', listener: (event: Event,
+                                           type: string,
+                                           image: NativeImage,
+                                           /**
+                                            * scaling factor for the custom cursor.
+                                            */
+                                           scale: number,
+                                           /**
+                                            * the size of the `image`.
+                                            */
+                                           size: Size,
+                                           /**
+                                            * coordinates of the custom cursor's hotspot.
+                                            */
+                                           hotspot: Point) => void): this;
+    /**
+     * Emitted when `webContents` is destroyed.
+     */
+    on(event: 'destroyed', listener: Function): this;
+    once(event: 'destroyed', listener: Function): this;
+    addListener(event: 'destroyed', listener: Function): this;
+    removeListener(event: 'destroyed', listener: Function): this;
+    /**
+     * Emitted when DevTools is closed.
+     */
+    on(event: 'devtools-closed', listener: Function): this;
+    once(event: 'devtools-closed', listener: Function): this;
+    addListener(event: 'devtools-closed', listener: Function): this;
+    removeListener(event: 'devtools-closed', listener: Function): this;
+    /**
+     * Emitted when DevTools is focused / opened.
+     */
+    on(event: 'devtools-focused', listener: Function): this;
+    once(event: 'devtools-focused', listener: Function): this;
+    addListener(event: 'devtools-focused', listener: Function): this;
+    removeListener(event: 'devtools-focused', listener: Function): this;
+    /**
+     * Emitted when DevTools is opened.
+     */
+    on(event: 'devtools-opened', listener: Function): this;
+    once(event: 'devtools-opened', listener: Function): this;
+    addListener(event: 'devtools-opened', listener: Function): this;
+    removeListener(event: 'devtools-opened', listener: Function): this;
+    /**
+     * Emitted when the devtools window instructs the webContents to reload
+     */
+    on(event: 'devtools-reload-page', listener: Function): this;
+    once(event: 'devtools-reload-page', listener: Function): this;
+    addListener(event: 'devtools-reload-page', listener: Function): this;
+    removeListener(event: 'devtools-reload-page', listener: Function): this;
+    /**
+     * Emitted when a `<webview>` has been attached to this web contents.
+     */
+    on(event: 'did-attach-webview', listener: (event: Event,
+                                               /**
+                                                * The guest web contents that is used by the `<webview>`.
+                                                */
+                                               webContents: WebContents) => void): this;
+    once(event: 'did-attach-webview', listener: (event: Event,
+                                               /**
+                                                * The guest web contents that is used by the `<webview>`.
+                                                */
+                                               webContents: WebContents) => void): this;
+    addListener(event: 'did-attach-webview', listener: (event: Event,
+                                               /**
+                                                * The guest web contents that is used by the `<webview>`.
+                                                */
+                                               webContents: WebContents) => void): this;
+    removeListener(event: 'did-attach-webview', listener: (event: Event,
+                                               /**
+                                                * The guest web contents that is used by the `<webview>`.
+                                                */
+                                               webContents: WebContents) => void): this;
+    /**
+     * Emitted when a page's theme color changes. This is usually due to encountering a
+     * meta tag:
+     */
+    on(event: 'did-change-theme-color', listener: (event: Event,
+                                                   /**
+                                                    * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+                                                    */
+                                                   color: (string) | (null)) => void): this;
+    once(event: 'did-change-theme-color', listener: (event: Event,
+                                                   /**
+                                                    * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+                                                    */
+                                                   color: (string) | (null)) => void): this;
+    addListener(event: 'did-change-theme-color', listener: (event: Event,
+                                                   /**
+                                                    * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+                                                    */
+                                                   color: (string) | (null)) => void): this;
+    removeListener(event: 'did-change-theme-color', listener: (event: Event,
+                                                   /**
+                                                    * Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
+                                                    */
+                                                   color: (string) | (null)) => void): this;
+    /**
+     * Emitted _after_ successful creation of a window via `window.open` in the
+     * renderer. Not emitted if the creation of the window is canceled from
+     * `webContents.setWindowOpenHandler`.
+     *
+     * See `window.open()` for more details and how to use this in conjunction with
+     * `webContents.setWindowOpenHandler`.
+     */
+    on(event: 'did-create-window', listener: (window: BrowserWindow,
+                                              details: DidCreateWindowDetails) => void): this;
+    once(event: 'did-create-window', listener: (window: BrowserWindow,
+                                              details: DidCreateWindowDetails) => void): this;
+    addListener(event: 'did-create-window', listener: (window: BrowserWindow,
+                                              details: DidCreateWindowDetails) => void): this;
+    removeListener(event: 'did-create-window', listener: (window: BrowserWindow,
+                                              details: DidCreateWindowDetails) => void): this;
+    /**
+     * This event is like `did-finish-load` but emitted when the load failed. The full
+     * list of error codes and their meaning is available here.
+     */
+    on(event: 'did-fail-load', listener: (event: Event,
+                                          errorCode: number,
+                                          errorDescription: string,
+                                          validatedURL: string,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    once(event: 'did-fail-load', listener: (event: Event,
+                                          errorCode: number,
+                                          errorDescription: string,
+                                          validatedURL: string,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    addListener(event: 'did-fail-load', listener: (event: Event,
+                                          errorCode: number,
+                                          errorDescription: string,
+                                          validatedURL: string,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    removeListener(event: 'did-fail-load', listener: (event: Event,
+                                          errorCode: number,
+                                          errorDescription: string,
+                                          validatedURL: string,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    /**
+     * This event is like `did-fail-load` but emitted when the load was cancelled (e.g.
+     * `window.stop()` was invoked).
+     */
+    on(event: 'did-fail-provisional-load', listener: (event: Event,
+                                                      errorCode: number,
+                                                      errorDescription: string,
+                                                      validatedURL: string,
+                                                      isMainFrame: boolean,
+                                                      frameProcessId: number,
+                                                      frameRoutingId: number) => void): this;
+    once(event: 'did-fail-provisional-load', listener: (event: Event,
+                                                      errorCode: number,
+                                                      errorDescription: string,
+                                                      validatedURL: string,
+                                                      isMainFrame: boolean,
+                                                      frameProcessId: number,
+                                                      frameRoutingId: number) => void): this;
+    addListener(event: 'did-fail-provisional-load', listener: (event: Event,
+                                                      errorCode: number,
+                                                      errorDescription: string,
+                                                      validatedURL: string,
+                                                      isMainFrame: boolean,
+                                                      frameProcessId: number,
+                                                      frameRoutingId: number) => void): this;
+    removeListener(event: 'did-fail-provisional-load', listener: (event: Event,
+                                                      errorCode: number,
+                                                      errorDescription: string,
+                                                      validatedURL: string,
+                                                      isMainFrame: boolean,
+                                                      frameProcessId: number,
+                                                      frameRoutingId: number) => void): this;
+    /**
+     * Emitted when the navigation is done, i.e. the spinner of the tab has stopped
+     * spinning, and the `onload` event was dispatched.
+     */
+    on(event: 'did-finish-load', listener: Function): this;
+    once(event: 'did-finish-load', listener: Function): this;
+    addListener(event: 'did-finish-load', listener: Function): this;
+    removeListener(event: 'did-finish-load', listener: Function): this;
+    /**
+     * Emitted when a frame has done navigation.
+     */
+    on(event: 'did-frame-finish-load', listener: (event: Event,
+                                                  isMainFrame: boolean,
+                                                  frameProcessId: number,
+                                                  frameRoutingId: number) => void): this;
+    once(event: 'did-frame-finish-load', listener: (event: Event,
+                                                  isMainFrame: boolean,
+                                                  frameProcessId: number,
+                                                  frameRoutingId: number) => void): this;
+    addListener(event: 'did-frame-finish-load', listener: (event: Event,
+                                                  isMainFrame: boolean,
+                                                  frameProcessId: number,
+                                                  frameRoutingId: number) => void): this;
+    removeListener(event: 'did-frame-finish-load', listener: (event: Event,
+                                                  isMainFrame: boolean,
+                                                  frameProcessId: number,
+                                                  frameRoutingId: number) => void): this;
+    /**
+     * Emitted when any frame navigation is done.
+     *
+     * This event is not emitted for in-page navigations, such as clicking anchor links
+     * or updating the `window.location.hash`. Use `did-navigate-in-page` event for
+     * this purpose.
+     */
+    on(event: 'did-frame-navigate', listener: (event: Event,
+                                               url: string,
+                                               /**
+                                                * -1 for non HTTP navigations
+                                                */
+                                               httpResponseCode: number,
+                                               /**
+                                                * empty for non HTTP navigations,
+                                                */
+                                               httpStatusText: string,
+                                               isMainFrame: boolean,
+                                               frameProcessId: number,
+                                               frameRoutingId: number) => void): this;
+    once(event: 'did-frame-navigate', listener: (event: Event,
+                                               url: string,
+                                               /**
+                                                * -1 for non HTTP navigations
+                                                */
+                                               httpResponseCode: number,
+                                               /**
+                                                * empty for non HTTP navigations,
+                                                */
+                                               httpStatusText: string,
+                                               isMainFrame: boolean,
+                                               frameProcessId: number,
+                                               frameRoutingId: number) => void): this;
+    addListener(event: 'did-frame-navigate', listener: (event: Event,
+                                               url: string,
+                                               /**
+                                                * -1 for non HTTP navigations
+                                                */
+                                               httpResponseCode: number,
+                                               /**
+                                                * empty for non HTTP navigations,
+                                                */
+                                               httpStatusText: string,
+                                               isMainFrame: boolean,
+                                               frameProcessId: number,
+                                               frameRoutingId: number) => void): this;
+    removeListener(event: 'did-frame-navigate', listener: (event: Event,
+                                               url: string,
+                                               /**
+                                                * -1 for non HTTP navigations
+                                                */
+                                               httpResponseCode: number,
+                                               /**
+                                                * empty for non HTTP navigations,
+                                                */
+                                               httpStatusText: string,
+                                               isMainFrame: boolean,
+                                               frameProcessId: number,
+                                               frameRoutingId: number) => void): this;
+    /**
+     * Emitted when a main frame navigation is done.
+     *
+     * This event is not emitted for in-page navigations, such as clicking anchor links
+     * or updating the `window.location.hash`. Use `did-navigate-in-page` event for
+     * this purpose.
+     */
+    on(event: 'did-navigate', listener: (event: Event,
+                                         url: string,
+                                         /**
+                                          * -1 for non HTTP navigations
+                                          */
+                                         httpResponseCode: number,
+                                         /**
+                                          * empty for non HTTP navigations
+                                          */
+                                         httpStatusText: string) => void): this;
+    once(event: 'did-navigate', listener: (event: Event,
+                                         url: string,
+                                         /**
+                                          * -1 for non HTTP navigations
+                                          */
+                                         httpResponseCode: number,
+                                         /**
+                                          * empty for non HTTP navigations
+                                          */
+                                         httpStatusText: string) => void): this;
+    addListener(event: 'did-navigate', listener: (event: Event,
+                                         url: string,
+                                         /**
+                                          * -1 for non HTTP navigations
+                                          */
+                                         httpResponseCode: number,
+                                         /**
+                                          * empty for non HTTP navigations
+                                          */
+                                         httpStatusText: string) => void): this;
+    removeListener(event: 'did-navigate', listener: (event: Event,
+                                         url: string,
+                                         /**
+                                          * -1 for non HTTP navigations
+                                          */
+                                         httpResponseCode: number,
+                                         /**
+                                          * empty for non HTTP navigations
+                                          */
+                                         httpStatusText: string) => void): this;
+    /**
+     * Emitted when an in-page navigation happened in any frame.
+     *
+     * When in-page navigation happens, the page URL changes but does not cause
+     * navigation outside of the page. Examples of this occurring are when anchor links
+     * are clicked or when the DOM `hashchange` event is triggered.
+     */
+    on(event: 'did-navigate-in-page', listener: (event: Event,
+                                                 url: string,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    once(event: 'did-navigate-in-page', listener: (event: Event,
+                                                 url: string,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    addListener(event: 'did-navigate-in-page', listener: (event: Event,
+                                                 url: string,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    removeListener(event: 'did-navigate-in-page', listener: (event: Event,
+                                                 url: string,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    /**
+     * Emitted after a server side redirect occurs during navigation.  For example a
+     * 302 redirect.
+     *
+     * This event cannot be prevented, if you want to prevent redirects you should
+     * checkout out the `will-redirect` event above.
+     */
+    on(event: 'did-redirect-navigation', listener: (event: Event,
+                                                    url: string,
+                                                    isInPlace: boolean,
+                                                    isMainFrame: boolean,
+                                                    frameProcessId: number,
+                                                    frameRoutingId: number) => void): this;
+    once(event: 'did-redirect-navigation', listener: (event: Event,
+                                                    url: string,
+                                                    isInPlace: boolean,
+                                                    isMainFrame: boolean,
+                                                    frameProcessId: number,
+                                                    frameRoutingId: number) => void): this;
+    addListener(event: 'did-redirect-navigation', listener: (event: Event,
+                                                    url: string,
+                                                    isInPlace: boolean,
+                                                    isMainFrame: boolean,
+                                                    frameProcessId: number,
+                                                    frameRoutingId: number) => void): this;
+    removeListener(event: 'did-redirect-navigation', listener: (event: Event,
+                                                    url: string,
+                                                    isInPlace: boolean,
+                                                    isMainFrame: boolean,
+                                                    frameProcessId: number,
+                                                    frameRoutingId: number) => void): this;
+    /**
+     * Corresponds to the points in time when the spinner of the tab started spinning.
+     */
+    on(event: 'did-start-loading', listener: Function): this;
+    once(event: 'did-start-loading', listener: Function): this;
+    addListener(event: 'did-start-loading', listener: Function): this;
+    removeListener(event: 'did-start-loading', listener: Function): this;
+    /**
+     * Emitted when any frame (including main) starts navigating. `isInPlace` will be
+     * `true` for in-page navigations.
+     */
+    on(event: 'did-start-navigation', listener: (event: Event,
+                                                 url: string,
+                                                 isInPlace: boolean,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    once(event: 'did-start-navigation', listener: (event: Event,
+                                                 url: string,
+                                                 isInPlace: boolean,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    addListener(event: 'did-start-navigation', listener: (event: Event,
+                                                 url: string,
+                                                 isInPlace: boolean,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    removeListener(event: 'did-start-navigation', listener: (event: Event,
+                                                 url: string,
+                                                 isInPlace: boolean,
+                                                 isMainFrame: boolean,
+                                                 frameProcessId: number,
+                                                 frameRoutingId: number) => void): this;
+    /**
+     * Corresponds to the points in time when the spinner of the tab stopped spinning.
+     */
+    on(event: 'did-stop-loading', listener: Function): this;
+    once(event: 'did-stop-loading', listener: Function): this;
+    addListener(event: 'did-stop-loading', listener: Function): this;
+    removeListener(event: 'did-stop-loading', listener: Function): this;
+    /**
+     * Emitted when the document in the top-level frame is loaded.
+     */
+    on(event: 'dom-ready', listener: (event: Event) => void): this;
+    once(event: 'dom-ready', listener: (event: Event) => void): this;
+    addListener(event: 'dom-ready', listener: (event: Event) => void): this;
+    removeListener(event: 'dom-ready', listener: (event: Event) => void): this;
+    /**
+     * Emitted when the window enters a full-screen state triggered by HTML API.
+     */
+    on(event: 'enter-html-full-screen', listener: Function): this;
+    once(event: 'enter-html-full-screen', listener: Function): this;
+    addListener(event: 'enter-html-full-screen', listener: Function): this;
+    removeListener(event: 'enter-html-full-screen', listener: Function): this;
+    /**
+     * Emitted when the `WebContents` gains focus.
+     *
+     * Note that on macOS, having focus means the `WebContents` is the first responder
+     * of window, so switching focus between windows would not trigger the `focus` and
+     * `blur` events of `WebContents`, as the first responder of each window is not
+     * changed.
+     *
+     * The `focus` and `blur` events of `WebContents` should only be used to detect
+     * focus change between different `WebContents` and `BrowserView` in the same
+     * window.
+     */
+    on(event: 'focus', listener: Function): this;
+    once(event: 'focus', listener: Function): this;
+    addListener(event: 'focus', listener: Function): this;
+    removeListener(event: 'focus', listener: Function): this;
+    /**
+     * Emitted when a result is available for [`webContents.findInPage`] request.
+     */
+    on(event: 'found-in-page', listener: (event: Event,
+                                          result: Result) => void): this;
+    once(event: 'found-in-page', listener: (event: Event,
+                                          result: Result) => void): this;
+    addListener(event: 'found-in-page', listener: (event: Event,
+                                          result: Result) => void): this;
+    removeListener(event: 'found-in-page', listener: (event: Event,
+                                          result: Result) => void): this;
+    /**
+     * Emitted when the mainFrame, an `<iframe>`, or a nested `<iframe>` is loaded
+     * within the page.
+     */
+    on(event: 'frame-created', listener: (event: Event,
+                                          details: FrameCreatedDetails) => void): this;
+    once(event: 'frame-created', listener: (event: Event,
+                                          details: FrameCreatedDetails) => void): this;
+    addListener(event: 'frame-created', listener: (event: Event,
+                                          details: FrameCreatedDetails) => void): this;
+    removeListener(event: 'frame-created', listener: (event: Event,
+                                          details: FrameCreatedDetails) => void): this;
+    /**
+     * Emitted when the renderer process sends an asynchronous message via
+     * `ipcRenderer.send()`.
+     *
+     * See also `webContents.ipc`, which provides an `IpcMain`-like interface for
+     * responding to IPC messages specifically from this WebContents.
+     */
+    on(event: 'ipc-message', listener: (event: Event,
+                                        channel: string,
+                                        ...args: any[]) => void): this;
+    once(event: 'ipc-message', listener: (event: Event,
+                                        channel: string,
+                                        ...args: any[]) => void): this;
+    addListener(event: 'ipc-message', listener: (event: Event,
+                                        channel: string,
+                                        ...args: any[]) => void): this;
+    removeListener(event: 'ipc-message', listener: (event: Event,
+                                        channel: string,
+                                        ...args: any[]) => void): this;
+    /**
+     * Emitted when the renderer process sends a synchronous message via
+     * `ipcRenderer.sendSync()`.
+     *
+     * See also `webContents.ipc`, which provides an `IpcMain`-like interface for
+     * responding to IPC messages specifically from this WebContents.
+     */
+    on(event: 'ipc-message-sync', listener: (event: Event,
+                                             channel: string,
+                                             ...args: any[]) => void): this;
+    once(event: 'ipc-message-sync', listener: (event: Event,
+                                             channel: string,
+                                             ...args: any[]) => void): this;
+    addListener(event: 'ipc-message-sync', listener: (event: Event,
+                                             channel: string,
+                                             ...args: any[]) => void): this;
+    removeListener(event: 'ipc-message-sync', listener: (event: Event,
+                                             channel: string,
+                                             ...args: any[]) => void): this;
+    /**
+     * Emitted when the window leaves a full-screen state triggered by HTML API.
+     */
+    on(event: 'leave-html-full-screen', listener: Function): this;
+    once(event: 'leave-html-full-screen', listener: Function): this;
+    addListener(event: 'leave-html-full-screen', listener: Function): this;
+    removeListener(event: 'leave-html-full-screen', listener: Function): this;
+    /**
+     * Emitted when `webContents` wants to do basic auth.
+     *
+     * The usage is the same with the `login` event of `app`.
+     */
+    on(event: 'login', listener: (event: Event,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    once(event: 'login', listener: (event: Event,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    addListener(event: 'login', listener: (event: Event,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    removeListener(event: 'login', listener: (event: Event,
+                                  authenticationResponseDetails: AuthenticationResponseDetails,
+                                  authInfo: AuthInfo,
+                                  callback: (username?: string, password?: string) => void) => void): this;
+    /**
+     * Emitted when media is paused or done playing.
+     */
+    on(event: 'media-paused', listener: Function): this;
+    once(event: 'media-paused', listener: Function): this;
+    addListener(event: 'media-paused', listener: Function): this;
+    removeListener(event: 'media-paused', listener: Function): this;
+    /**
+     * Emitted when media starts playing.
+     */
+    on(event: 'media-started-playing', listener: Function): this;
+    once(event: 'media-started-playing', listener: Function): this;
+    addListener(event: 'media-started-playing', listener: Function): this;
+    removeListener(event: 'media-started-playing', listener: Function): this;
+    /**
+     * Deprecated in favor of `webContents.setWindowOpenHandler`.
+     *
+     * Emitted when the page requests to open a new window for a `url`. It could be
+     * requested by `window.open` or an external link like `<a target='_blank'>`.
+     *
+     * By default a new `BrowserWindow` will be created for the `url`.
+     *
+     * Calling `event.preventDefault()` will prevent Electron from automatically
+     * creating a new `BrowserWindow`. If you call `event.preventDefault()` and
+     * manually create a new `BrowserWindow` then you must set `event.newGuest` to
+     * reference the new `BrowserWindow` instance, failing to do so may result in
+     * unexpected behavior. For example:
+     *
+     * @deprecated
+     */
+    on(event: 'new-window', listener: (event: NewWindowWebContentsEvent,
+                                       url: string,
+                                       frameName: string,
+                                       /**
+                                        * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+                                        * `save-to-disk` and `other`.
+                                        */
+                                       disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
+                                       /**
+                                        * The options which will be used for creating the new `BrowserWindow`.
+                                        */
+                                       options: BrowserWindowConstructorOptions,
+                                       /**
+                                        * The non-standard features (features not handled by Chromium or Electron) given
+                                        * to `window.open()`. Deprecated, and will now always be the empty array `[]`.
+                                        */
+                                       additionalFeatures: string[],
+                                       /**
+                                        * The referrer that will be passed to the new window. May or may not result in the
+                                        * `Referer` header being sent, depending on the referrer policy.
+                                        */
+                                       referrer: Referrer,
+                                       /**
+                                        * The post data that will be sent to the new window, along with the appropriate
+                                        * headers that will be set. If no post data is to be sent, the value will be
+                                        * `null`. Only defined when the window is being created by a form that set
+                                        * `target=_blank`.
+                                        */
+                                       postBody: PostBody) => void): this;
+    once(event: 'new-window', listener: (event: NewWindowWebContentsEvent,
+                                       url: string,
+                                       frameName: string,
+                                       /**
+                                        * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+                                        * `save-to-disk` and `other`.
+                                        */
+                                       disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
+                                       /**
+                                        * The options which will be used for creating the new `BrowserWindow`.
+                                        */
+                                       options: BrowserWindowConstructorOptions,
+                                       /**
+                                        * The non-standard features (features not handled by Chromium or Electron) given
+                                        * to `window.open()`. Deprecated, and will now always be the empty array `[]`.
+                                        */
+                                       additionalFeatures: string[],
+                                       /**
+                                        * The referrer that will be passed to the new window. May or may not result in the
+                                        * `Referer` header being sent, depending on the referrer policy.
+                                        */
+                                       referrer: Referrer,
+                                       /**
+                                        * The post data that will be sent to the new window, along with the appropriate
+                                        * headers that will be set. If no post data is to be sent, the value will be
+                                        * `null`. Only defined when the window is being created by a form that set
+                                        * `target=_blank`.
+                                        */
+                                       postBody: PostBody) => void): this;
+    addListener(event: 'new-window', listener: (event: NewWindowWebContentsEvent,
+                                       url: string,
+                                       frameName: string,
+                                       /**
+                                        * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+                                        * `save-to-disk` and `other`.
+                                        */
+                                       disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
+                                       /**
+                                        * The options which will be used for creating the new `BrowserWindow`.
+                                        */
+                                       options: BrowserWindowConstructorOptions,
+                                       /**
+                                        * The non-standard features (features not handled by Chromium or Electron) given
+                                        * to `window.open()`. Deprecated, and will now always be the empty array `[]`.
+                                        */
+                                       additionalFeatures: string[],
+                                       /**
+                                        * The referrer that will be passed to the new window. May or may not result in the
+                                        * `Referer` header being sent, depending on the referrer policy.
+                                        */
+                                       referrer: Referrer,
+                                       /**
+                                        * The post data that will be sent to the new window, along with the appropriate
+                                        * headers that will be set. If no post data is to be sent, the value will be
+                                        * `null`. Only defined when the window is being created by a form that set
+                                        * `target=_blank`.
+                                        */
+                                       postBody: PostBody) => void): this;
+    removeListener(event: 'new-window', listener: (event: NewWindowWebContentsEvent,
+                                       url: string,
+                                       frameName: string,
+                                       /**
+                                        * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+                                        * `save-to-disk` and `other`.
+                                        */
+                                       disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'),
+                                       /**
+                                        * The options which will be used for creating the new `BrowserWindow`.
+                                        */
+                                       options: BrowserWindowConstructorOptions,
+                                       /**
+                                        * The non-standard features (features not handled by Chromium or Electron) given
+                                        * to `window.open()`. Deprecated, and will now always be the empty array `[]`.
+                                        */
+                                       additionalFeatures: string[],
+                                       /**
+                                        * The referrer that will be passed to the new window. May or may not result in the
+                                        * `Referer` header being sent, depending on the referrer policy.
+                                        */
+                                       referrer: Referrer,
+                                       /**
+                                        * The post data that will be sent to the new window, along with the appropriate
+                                        * headers that will be set. If no post data is to be sent, the value will be
+                                        * `null`. Only defined when the window is being created by a form that set
+                                        * `target=_blank`.
+                                        */
+                                       postBody: PostBody) => void): this;
+    /**
+     * Emitted when page receives favicon urls.
+     */
+    on(event: 'page-favicon-updated', listener: (event: Event,
+                                                 /**
+                                                  * Array of URLs.
+                                                  */
+                                                 favicons: string[]) => void): this;
+    once(event: 'page-favicon-updated', listener: (event: Event,
+                                                 /**
+                                                  * Array of URLs.
+                                                  */
+                                                 favicons: string[]) => void): this;
+    addListener(event: 'page-favicon-updated', listener: (event: Event,
+                                                 /**
+                                                  * Array of URLs.
+                                                  */
+                                                 favicons: string[]) => void): this;
+    removeListener(event: 'page-favicon-updated', listener: (event: Event,
+                                                 /**
+                                                  * Array of URLs.
+                                                  */
+                                                 favicons: string[]) => void): this;
+    /**
+     * Fired when page title is set during navigation. `explicitSet` is false when
+     * title is synthesized from file url.
+     */
+    on(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    once(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    addListener(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    removeListener(event: 'page-title-updated', listener: (event: Event,
+                                               title: string,
+                                               explicitSet: boolean) => void): this;
+    /**
+     * Emitted when a new frame is generated. Only the dirty area is passed in the
+     * buffer.
+     */
+    on(event: 'paint', listener: (event: Event,
+                                  dirtyRect: Rectangle,
+                                  /**
+                                   * The image data of the whole frame.
+                                   */
+                                  image: NativeImage) => void): this;
+    once(event: 'paint', listener: (event: Event,
+                                  dirtyRect: Rectangle,
+                                  /**
+                                   * The image data of the whole frame.
+                                   */
+                                  image: NativeImage) => void): this;
+    addListener(event: 'paint', listener: (event: Event,
+                                  dirtyRect: Rectangle,
+                                  /**
+                                   * The image data of the whole frame.
+                                   */
+                                  image: NativeImage) => void): this;
+    removeListener(event: 'paint', listener: (event: Event,
+                                  dirtyRect: Rectangle,
+                                  /**
+                                   * The image data of the whole frame.
+                                   */
+                                  image: NativeImage) => void): this;
+    /**
+     * Emitted when a plugin process has crashed.
+     */
+    on(event: 'plugin-crashed', listener: (event: Event,
+                                           name: string,
+                                           version: string) => void): this;
+    once(event: 'plugin-crashed', listener: (event: Event,
+                                           name: string,
+                                           version: string) => void): this;
+    addListener(event: 'plugin-crashed', listener: (event: Event,
+                                           name: string,
+                                           version: string) => void): this;
+    removeListener(event: 'plugin-crashed', listener: (event: Event,
+                                           name: string,
+                                           version: string) => void): this;
+    /**
+     * Emitted when the `WebContents` preferred size has changed.
+     *
+     * This event will only be emitted when `enablePreferredSizeMode` is set to `true`
+     * in `webPreferences`.
+     */
+    on(event: 'preferred-size-changed', listener: (event: Event,
+                                                   /**
+                                                    * The minimum size needed to contain the layout of the document—without requiring
+                                                    * scrolling.
+                                                    */
+                                                   preferredSize: Size) => void): this;
+    once(event: 'preferred-size-changed', listener: (event: Event,
+                                                   /**
+                                                    * The minimum size needed to contain the layout of the document—without requiring
+                                                    * scrolling.
+                                                    */
+                                                   preferredSize: Size) => void): this;
+    addListener(event: 'preferred-size-changed', listener: (event: Event,
+                                                   /**
+                                                    * The minimum size needed to contain the layout of the document—without requiring
+                                                    * scrolling.
+                                                    */
+                                                   preferredSize: Size) => void): this;
+    removeListener(event: 'preferred-size-changed', listener: (event: Event,
+                                                   /**
+                                                    * The minimum size needed to contain the layout of the document—without requiring
+                                                    * scrolling.
+                                                    */
+                                                   preferredSize: Size) => void): this;
+    /**
+     * Emitted when the preload script `preloadPath` throws an unhandled exception
+     * `error`.
+     */
+    on(event: 'preload-error', listener: (event: Event,
+                                          preloadPath: string,
+                                          error: Error) => void): this;
+    once(event: 'preload-error', listener: (event: Event,
+                                          preloadPath: string,
+                                          error: Error) => void): this;
+    addListener(event: 'preload-error', listener: (event: Event,
+                                          preloadPath: string,
+                                          error: Error) => void): this;
+    removeListener(event: 'preload-error', listener: (event: Event,
+                                          preloadPath: string,
+                                          error: Error) => void): this;
+    /**
+     * Emitted when the renderer process unexpectedly disappears.  This is normally
+     * because it was crashed or killed.
+     */
+    on(event: 'render-process-gone', listener: (event: Event,
+                                                details: RenderProcessGoneDetails) => void): this;
+    once(event: 'render-process-gone', listener: (event: Event,
+                                                details: RenderProcessGoneDetails) => void): this;
+    addListener(event: 'render-process-gone', listener: (event: Event,
+                                                details: RenderProcessGoneDetails) => void): this;
+    removeListener(event: 'render-process-gone', listener: (event: Event,
+                                                details: RenderProcessGoneDetails) => void): this;
+    /**
+     * Emitted when the unresponsive web page becomes responsive again.
+     */
+    on(event: 'responsive', listener: Function): this;
+    once(event: 'responsive', listener: Function): this;
+    addListener(event: 'responsive', listener: Function): this;
+    removeListener(event: 'responsive', listener: Function): this;
+    /**
+     * Emitted when bluetooth device needs to be selected on call to
+     * `navigator.bluetooth.requestDevice`. To use `navigator.bluetooth` api
+     * `webBluetooth` should be enabled. If `event.preventDefault` is not called, first
+     * available device will be selected. `callback` should be called with `deviceId`
+     * to be selected, passing empty string to `callback` will cancel the request.
+     *
+     * If no event listener is added for this event, all bluetooth requests will be
+     * cancelled.
+     */
+    on(event: 'select-bluetooth-device', listener: (event: Event,
+                                                    devices: BluetoothDevice[],
+                                                    callback: (deviceId: string) => void) => void): this;
+    once(event: 'select-bluetooth-device', listener: (event: Event,
+                                                    devices: BluetoothDevice[],
+                                                    callback: (deviceId: string) => void) => void): this;
+    addListener(event: 'select-bluetooth-device', listener: (event: Event,
+                                                    devices: BluetoothDevice[],
+                                                    callback: (deviceId: string) => void) => void): this;
+    removeListener(event: 'select-bluetooth-device', listener: (event: Event,
+                                                    devices: BluetoothDevice[],
+                                                    callback: (deviceId: string) => void) => void): this;
+    /**
+     * Emitted when a client certificate is requested.
+     *
+     * The usage is the same with the `select-client-certificate` event of `app`.
+     */
+    on(event: 'select-client-certificate', listener: (event: Event,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate: Certificate) => void) => void): this;
+    once(event: 'select-client-certificate', listener: (event: Event,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate: Certificate) => void) => void): this;
+    addListener(event: 'select-client-certificate', listener: (event: Event,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate: Certificate) => void) => void): this;
+    removeListener(event: 'select-client-certificate', listener: (event: Event,
+                                                      url: string,
+                                                      certificateList: Certificate[],
+                                                      callback: (certificate: Certificate) => void) => void): this;
+    /**
+     * Emitted when the web page becomes unresponsive.
+     */
+    on(event: 'unresponsive', listener: Function): this;
+    once(event: 'unresponsive', listener: Function): this;
+    addListener(event: 'unresponsive', listener: Function): this;
+    removeListener(event: 'unresponsive', listener: Function): this;
+    /**
+     * Emitted when mouse moves over a link or the keyboard moves the focus to a link.
+     */
+    on(event: 'update-target-url', listener: (event: Event,
+                                              url: string) => void): this;
+    once(event: 'update-target-url', listener: (event: Event,
+                                              url: string) => void): this;
+    addListener(event: 'update-target-url', listener: (event: Event,
+                                              url: string) => void): this;
+    removeListener(event: 'update-target-url', listener: (event: Event,
+                                              url: string) => void): this;
+    /**
+     * Emitted when a `<webview>`'s web contents is being attached to this web
+     * contents. Calling `event.preventDefault()` will destroy the guest page.
+     *
+     * This event can be used to configure `webPreferences` for the `webContents` of a
+     * `<webview>` before it's loaded, and provides the ability to set settings that
+     * can't be set via `<webview>` attributes.
+     */
+    on(event: 'will-attach-webview', listener: (event: Event,
+                                                /**
+                                                 * The web preferences that will be used by the guest page. This object can be
+                                                 * modified to adjust the preferences for the guest page.
+                                                 */
+                                                webPreferences: WebPreferences,
+                                                /**
+                                                 * The other `<webview>` parameters such as the `src` URL. This object can be
+                                                 * modified to adjust the parameters of the guest page.
+                                                 */
+                                                params: Record<string, string>) => void): this;
+    once(event: 'will-attach-webview', listener: (event: Event,
+                                                /**
+                                                 * The web preferences that will be used by the guest page. This object can be
+                                                 * modified to adjust the preferences for the guest page.
+                                                 */
+                                                webPreferences: WebPreferences,
+                                                /**
+                                                 * The other `<webview>` parameters such as the `src` URL. This object can be
+                                                 * modified to adjust the parameters of the guest page.
+                                                 */
+                                                params: Record<string, string>) => void): this;
+    addListener(event: 'will-attach-webview', listener: (event: Event,
+                                                /**
+                                                 * The web preferences that will be used by the guest page. This object can be
+                                                 * modified to adjust the preferences for the guest page.
+                                                 */
+                                                webPreferences: WebPreferences,
+                                                /**
+                                                 * The other `<webview>` parameters such as the `src` URL. This object can be
+                                                 * modified to adjust the parameters of the guest page.
+                                                 */
+                                                params: Record<string, string>) => void): this;
+    removeListener(event: 'will-attach-webview', listener: (event: Event,
+                                                /**
+                                                 * The web preferences that will be used by the guest page. This object can be
+                                                 * modified to adjust the preferences for the guest page.
+                                                 */
+                                                webPreferences: WebPreferences,
+                                                /**
+                                                 * The other `<webview>` parameters such as the `src` URL. This object can be
+                                                 * modified to adjust the parameters of the guest page.
+                                                 */
+                                                params: Record<string, string>) => void): this;
+    /**
+     * Emitted when a user or the page wants to start navigation. It can happen when
+     * the `window.location` object is changed or a user clicks a link in the page.
+     *
+     * This event will not emit when the navigation is started programmatically with
+     * APIs like `webContents.loadURL` and `webContents.back`.
+     *
+     * It is also not emitted for in-page navigations, such as clicking anchor links or
+     * updating the `window.location.hash`. Use `did-navigate-in-page` event for this
+     * purpose.
+     *
+     * Calling `event.preventDefault()` will prevent the navigation.
+     */
+    on(event: 'will-navigate', listener: (event: Event,
+                                          url: string) => void): this;
+    once(event: 'will-navigate', listener: (event: Event,
+                                          url: string) => void): this;
+    addListener(event: 'will-navigate', listener: (event: Event,
+                                          url: string) => void): this;
+    removeListener(event: 'will-navigate', listener: (event: Event,
+                                          url: string) => void): this;
+    /**
+     * Emitted when a `beforeunload` event handler is attempting to cancel a page
+     * unload.
+     *
+     * Calling `event.preventDefault()` will ignore the `beforeunload` event handler
+     * and allow the page to be unloaded.
+     *
+     * **Note:** This will be emitted for `BrowserViews` but will _not_ be respected -
+     * this is because we have chosen not to tie the `BrowserView` lifecycle to its
+     * owning BrowserWindow should one exist per the specification.
+     */
+    on(event: 'will-prevent-unload', listener: (event: Event) => void): this;
+    once(event: 'will-prevent-unload', listener: (event: Event) => void): this;
+    addListener(event: 'will-prevent-unload', listener: (event: Event) => void): this;
+    removeListener(event: 'will-prevent-unload', listener: (event: Event) => void): this;
+    /**
+     * Emitted when a server side redirect occurs during navigation.  For example a 302
+     * redirect.
+     *
+     * This event will be emitted after `did-start-navigation` and always before the
+     * `did-redirect-navigation` event for the same navigation.
+     *
+     * Calling `event.preventDefault()` will prevent the navigation (not just the
+     * redirect).
+     */
+    on(event: 'will-redirect', listener: (event: Event,
+                                          url: string,
+                                          isInPlace: boolean,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    once(event: 'will-redirect', listener: (event: Event,
+                                          url: string,
+                                          isInPlace: boolean,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    addListener(event: 'will-redirect', listener: (event: Event,
+                                          url: string,
+                                          isInPlace: boolean,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    removeListener(event: 'will-redirect', listener: (event: Event,
+                                          url: string,
+                                          isInPlace: boolean,
+                                          isMainFrame: boolean,
+                                          frameProcessId: number,
+                                          frameRoutingId: number) => void): this;
+    /**
+     * Emitted when the user is requesting to change the zoom level using the mouse
+     * wheel.
+     */
+    on(event: 'zoom-changed', listener: (event: Event,
+                                         /**
+                                          * Can be `in` or `out`.
+                                          */
+                                         zoomDirection: ('in' | 'out')) => void): this;
+    once(event: 'zoom-changed', listener: (event: Event,
+                                         /**
+                                          * Can be `in` or `out`.
+                                          */
+                                         zoomDirection: ('in' | 'out')) => void): this;
+    addListener(event: 'zoom-changed', listener: (event: Event,
+                                         /**
+                                          * Can be `in` or `out`.
+                                          */
+                                         zoomDirection: ('in' | 'out')) => void): this;
+    removeListener(event: 'zoom-changed', listener: (event: Event,
+                                         /**
+                                          * Can be `in` or `out`.
+                                          */
+                                         zoomDirection: ('in' | 'out')) => void): this;
+    /**
+     * Adds the specified path to DevTools workspace. Must be used after DevTools
+     * creation:
+     */
+    addWorkSpace(path: string): void;
+    /**
+     * Begin subscribing for presentation events and captured frames, the `callback`
+     * will be called with `callback(image, dirtyRect)` when there is a presentation
+     * event.
+     *
+     * The `image` is an instance of NativeImage that stores the captured frame.
+     *
+     * The `dirtyRect` is an object with `x, y, width, height` properties that
+     * describes which part of the page was repainted. If `onlyDirty` is set to `true`,
+     * `image` will only contain the repainted area. `onlyDirty` defaults to `false`.
+     */
+    beginFrameSubscription(onlyDirty: boolean, callback: (image: NativeImage, dirtyRect: Rectangle) => void): void;
+    /**
+     * Begin subscribing for presentation events and captured frames, the `callback`
+     * will be called with `callback(image, dirtyRect)` when there is a presentation
+     * event.
+     *
+     * The `image` is an instance of NativeImage that stores the captured frame.
+     *
+     * The `dirtyRect` is an object with `x, y, width, height` properties that
+     * describes which part of the page was repainted. If `onlyDirty` is set to `true`,
+     * `image` will only contain the repainted area. `onlyDirty` defaults to `false`.
+     */
+    beginFrameSubscription(callback: (image: NativeImage, dirtyRect: Rectangle) => void): void;
+    /**
+     * Whether the browser can go back to previous web page.
+     */
+    canGoBack(): boolean;
+    /**
+     * Whether the browser can go forward to next web page.
+     */
+    canGoForward(): boolean;
+    /**
+     * Whether the web page can go to `offset`.
+     */
+    canGoToOffset(offset: number): boolean;
+    /**
+     * Resolves with a NativeImage
+     *
+     * Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
+     * whole visible page.
+     */
+    capturePage(rect?: Rectangle): Promise<Electron.NativeImage>;
+    /**
+     * Clears the navigation history.
+     */
+    clearHistory(): void;
+    /**
+     * Closes the devtools.
+     */
+    closeDevTools(): void;
+    /**
+     * Executes the editing command `copy` in web page.
+     */
+    copy(): void;
+    /**
+     * Copy the image at the given position to the clipboard.
+     */
+    copyImageAt(x: number, y: number): void;
+    /**
+     * Executes the editing command `cut` in web page.
+     */
+    cut(): void;
+    /**
+     * Decrease the capturer count by one. The page will be set to hidden or occluded
+     * state when its browser window is hidden or occluded and the capturer count
+     * reaches zero. If you want to decrease the hidden capturer count instead you
+     * should set `stayHidden` to true.
+     */
+    decrementCapturerCount(stayHidden?: boolean, stayAwake?: boolean): void;
+    /**
+     * Executes the editing command `delete` in web page.
+     */
+    delete(): void;
+    /**
+     * Disable device emulation enabled by `webContents.enableDeviceEmulation`.
+     */
+    disableDeviceEmulation(): void;
+    /**
+     * Initiates a download of the resource at `url` without navigating. The
+     * `will-download` event of `session` will be triggered.
+     */
+    downloadURL(url: string): void;
+    /**
+     * Enable device emulation with the given parameters.
+     */
+    enableDeviceEmulation(parameters: Parameters): void;
+    /**
+     * End subscribing for frame presentation events.
+     */
+    endFrameSubscription(): void;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * the result of the code is a rejected promise.
+     *
+     * Evaluates `code` in page.
+     *
+     * In the browser window some HTML APIs like `requestFullScreen` can only be
+     * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
+     * this limitation.
+     *
+     * Code execution will be suspended until web page stop loading.
+     */
+    executeJavaScript(code: string, userGesture?: boolean): Promise<any>;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * the result of the code is a rejected promise.
+     *
+     * Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
+     */
+    executeJavaScriptInIsolatedWorld(worldId: number, scripts: WebSource[], userGesture?: boolean): Promise<any>;
+    /**
+     * The request id used for the request.
+     *
+     * Starts a request to find all matches for the `text` in the web page. The result
+     * of the request can be obtained by subscribing to `found-in-page` event.
+     */
+    findInPage(text: string, options?: FindInPageOptions): number;
+    /**
+     * Focuses the web page.
+     */
+    focus(): void;
+    /**
+     * Forcefully terminates the renderer process that is currently hosting this
+     * `webContents`. This will cause the `render-process-gone` event to be emitted
+     * with the `reason=killed || reason=crashed`. Please note that some webContents
+     * share renderer processes and therefore calling this method may also crash the
+     * host process for other webContents as well.
+     *
+     * Calling `reload()` immediately after calling this method will force the reload
+     * to occur in a new process. This should be used when this process is unstable or
+     * unusable, for instance in order to recover from the `unresponsive` event.
+     */
+    forcefullyCrashRenderer(): void;
+    /**
+     * Information about all Shared Workers.
+     */
+    getAllSharedWorkers(): SharedWorkerInfo[];
+    /**
+     * whether or not this WebContents will throttle animations and timers when the
+     * page becomes backgrounded. This also affects the Page Visibility API.
+     */
+    getBackgroundThrottling(): boolean;
+    /**
+     * If *offscreen rendering* is enabled returns the current frame rate.
+     */
+    getFrameRate(): number;
+    /**
+     * The identifier of a WebContents stream. This identifier can be used with
+     * `navigator.mediaDevices.getUserMedia` using a `chromeMediaSource` of `tab`. The
+     * identifier is restricted to the web contents that it is registered to and is
+     * only valid for 10 seconds.
+     */
+    getMediaSourceId(requestWebContents: WebContents): string;
+    /**
+     * The operating system `pid` of the associated renderer process.
+     */
+    getOSProcessId(): number;
+    /**
+     * Get the system printer list.
+     *
+     *
+     * **Deprecated:** Should use the new `contents.getPrintersAsync` API.
+     *
+     * @deprecated
+     */
+    getPrinters(): PrinterInfo[];
+    /**
+     * Get the system printer list.
+     *
+     * Resolves with a `PrinterInfo[]`
+     */
+    getPrintersAsync(): Promise<Electron.PrinterInfo[]>;
+    /**
+     * The Chromium internal `pid` of the associated renderer. Can be compared to the
+     * `frameProcessId` passed by frame specific navigation events (e.g.
+     * `did-frame-navigate`)
+     */
+    getProcessId(): number;
+    /**
+     * The title of the current web page.
+     */
+    getTitle(): string;
+    /**
+     * the type of the webContent. Can be `backgroundPage`, `window`, `browserView`,
+     * `remote`, `webview` or `offscreen`.
+     */
+    getType(): ('backgroundPage' | 'window' | 'browserView' | 'remote' | 'webview' | 'offscreen');
+    /**
+     * The URL of the current web page.
+     */
+    getURL(): string;
+    /**
+     * The user agent for this web page.
+     */
+    getUserAgent(): string;
+    /**
+     * Returns the WebRTC IP Handling Policy.
+     */
+    getWebRTCIPHandlingPolicy(): string;
+    /**
+     * the current zoom factor.
+     */
+    getZoomFactor(): number;
+    /**
+     * the current zoom level.
+     */
+    getZoomLevel(): number;
+    /**
+     * Makes the browser go back a web page.
+     */
+    goBack(): void;
+    /**
+     * Makes the browser go forward a web page.
+     */
+    goForward(): void;
+    /**
+     * Navigates browser to the specified absolute web page index.
+     */
+    goToIndex(index: number): void;
+    /**
+     * Navigates to the specified offset from the "current entry".
+     */
+    goToOffset(offset: number): void;
+    /**
+     * Increase the capturer count by one. The page is considered visible when its
+     * browser window is hidden and the capturer count is non-zero. If you would like
+     * the page to stay hidden, you should ensure that `stayHidden` is set to true.
+     *
+     * This also affects the Page Visibility API.
+     */
+    incrementCapturerCount(size?: Size, stayHidden?: boolean, stayAwake?: boolean): void;
+    /**
+     * A promise that resolves with a key for the inserted CSS that can later be used
+     * to remove the CSS via `contents.removeInsertedCSS(key)`.
+     *
+     * Injects CSS into the current web page and returns a unique key for the inserted
+     * stylesheet.
+     */
+    insertCSS(css: string, options?: InsertCSSOptions): Promise<string>;
+    /**
+     * Inserts `text` to the focused element.
+     */
+    insertText(text: string): Promise<void>;
+    /**
+     * Starts inspecting element at position (`x`, `y`).
+     */
+    inspectElement(x: number, y: number): void;
+    /**
+     * Opens the developer tools for the service worker context.
+     */
+    inspectServiceWorker(): void;
+    /**
+     * Opens the developer tools for the shared worker context.
+     */
+    inspectSharedWorker(): void;
+    /**
+     * Inspects the shared worker based on its ID.
+     */
+    inspectSharedWorkerById(workerId: string): void;
+    /**
+     * Schedules a full repaint of the window this web contents is in.
+     *
+     * If *offscreen rendering* is enabled invalidates the frame and generates a new
+     * one through the `'paint'` event.
+     */
+    invalidate(): void;
+    /**
+     * Whether this page has been muted.
+     */
+    isAudioMuted(): boolean;
+    /**
+     * Whether this page is being captured. It returns true when the capturer count is
+     * large then 0.
+     */
+    isBeingCaptured(): boolean;
+    /**
+     * Whether the renderer process has crashed.
+     */
+    isCrashed(): boolean;
+    /**
+     * Whether audio is currently playing.
+     */
+    isCurrentlyAudible(): boolean;
+    /**
+     * Whether the web page is destroyed.
+     */
+    isDestroyed(): boolean;
+    /**
+     * Whether the devtools view is focused .
+     */
+    isDevToolsFocused(): boolean;
+    /**
+     * Whether the devtools is opened.
+     */
+    isDevToolsOpened(): boolean;
+    /**
+     * Whether the web page is focused.
+     */
+    isFocused(): boolean;
+    /**
+     * Whether web page is still loading resources.
+     */
+    isLoading(): boolean;
+    /**
+     * Whether the main frame (and not just iframes or frames within it) is still
+     * loading.
+     */
+    isLoadingMainFrame(): boolean;
+    /**
+     * Indicates whether *offscreen rendering* is enabled.
+     */
+    isOffscreen(): boolean;
+    /**
+     * If *offscreen rendering* is enabled returns whether it is currently painting.
+     */
+    isPainting(): boolean;
+    /**
+     * Whether the web page is waiting for a first-response from the main resource of
+     * the page.
+     */
+    isWaitingForResponse(): boolean;
+    /**
+     * the promise will resolve when the page has finished loading (see
+     * `did-finish-load`), and rejects if the page fails to load (see `did-fail-load`).
+     *
+     * Loads the given file in the window, `filePath` should be a path to an HTML file
+     * relative to the root of your application.  For instance an app structure like
+     * this:
+     *
+     * Would require code like this
+     */
+    loadFile(filePath: string, options?: LoadFileOptions): Promise<void>;
+    /**
+     * the promise will resolve when the page has finished loading (see
+     * `did-finish-load`), and rejects if the page fails to load (see `did-fail-load`).
+     * A noop rejection handler is already attached, which avoids unhandled rejection
+     * errors.
+     *
+     * Loads the `url` in the window. The `url` must contain the protocol prefix, e.g.
+     * the `http://` or `file://`. If the load should bypass http cache then use the
+     * `pragma` header to achieve it.
+     */
+    loadURL(url: string, options?: LoadURLOptions): Promise<void>;
+    /**
+     * Opens the devtools.
+     *
+     * When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
+     * explicitly passing an empty `mode` can force using last used dock state.
+     *
+     * On Windows, if Windows Control Overlay is enabled, Devtools will be opened with
+     * `mode: 'detach'`.
+     */
+    openDevTools(options?: OpenDevToolsOptions): void;
+    /**
+     * Executes the editing command `paste` in web page.
+     */
+    paste(): void;
+    /**
+     * Executes the editing command `pasteAndMatchStyle` in web page.
+     */
+    pasteAndMatchStyle(): void;
+    /**
+     * Send a message to the renderer process, optionally transferring ownership of
+     * zero or more [`MessagePortMain`][] objects.
+     *
+     * The transferred `MessagePortMain` objects will be available in the renderer
+     * process by accessing the `ports` property of the emitted event. When they arrive
+     * in the renderer, they will be native DOM `MessagePort` objects.
+     *
+     * For example:
+     */
+    postMessage(channel: string, message: any, transfer?: MessagePortMain[]): void;
+    /**
+     * When a custom `pageSize` is passed, Chromium attempts to validate platform
+     * specific minimum values for `width_microns` and `height_microns`. Width and
+     * height must both be minimum 353 microns but may be higher on some operating
+     * systems.
+     *
+     * Prints window's web page. When `silent` is set to `true`, Electron will pick the
+     * system's default printer if `deviceName` is empty and the default settings for
+     * printing.
+     *
+     * Use `page-break-before: always;` CSS style to force to print to a new page.
+     *
+     * Example usage:
+     */
+    print(options?: WebContentsPrintOptions, callback?: (success: boolean, failureReason: string) => void): void;
+    /**
+     * Resolves with the generated PDF data.
+     *
+     * Prints the window's web page as PDF.
+     *
+     * The `landscape` will be ignored if `@page` CSS at-rule is used in the web page.
+     *
+     * An example of `webContents.printToPDF`:
+     *
+     * See Page.printToPdf for more information.
+     */
+    printToPDF(options: PrintToPDFOptions): Promise<Buffer>;
+    /**
+     * Executes the editing command `redo` in web page.
+     */
+    redo(): void;
+    /**
+     * Reloads the current web page.
+     */
+    reload(): void;
+    /**
+     * Reloads current page and ignores cache.
+     */
+    reloadIgnoringCache(): void;
+    /**
+     * Resolves if the removal was successful.
+     *
+     * Removes the inserted CSS from the current web page. The stylesheet is identified
+     * by its key, which is returned from `contents.insertCSS(css)`.
+     */
+    removeInsertedCSS(key: string): Promise<void>;
+    /**
+     * Removes the specified path from DevTools workspace.
+     */
+    removeWorkSpace(path: string): void;
+    /**
+     * Executes the editing command `replace` in web page.
+     */
+    replace(text: string): void;
+    /**
+     * Executes the editing command `replaceMisspelling` in web page.
+     */
+    replaceMisspelling(text: string): void;
+    /**
+     * resolves if the page is saved.
+     */
+    savePage(fullPath: string, saveType: 'HTMLOnly' | 'HTMLComplete' | 'MHTML'): Promise<void>;
+    /**
+     * Executes the editing command `selectAll` in web page.
+     */
+    selectAll(): void;
+    /**
+     * Send an asynchronous message to the renderer process via `channel`, along with
+     * arguments. Arguments will be serialized with the Structured Clone Algorithm,
+     * just like `postMessage`, so prototype chains will not be included. Sending
+     * Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an exception.
+     *
+     * > **NOTE**: Sending non-standard JavaScript types such as DOM objects or special
+     * Electron objects will throw an exception.
+     *
+     * The renderer process can handle the message by listening to `channel` with the
+     * `ipcRenderer` module.
+     *
+     * An example of sending messages from the main process to the renderer process:
+     */
+    send(channel: string, ...args: any[]): void;
+    /**
+     * Sends an input `event` to the page. **Note:** The `BrowserWindow` containing the
+     * contents needs to be focused for `sendInputEvent()` to work.
+     */
+    sendInputEvent(inputEvent: (MouseInputEvent) | (MouseWheelInputEvent) | (KeyboardInputEvent)): void;
+    /**
+     * Send an asynchronous message to a specific frame in a renderer process via
+     * `channel`, along with arguments. Arguments will be serialized with the
+     * Structured Clone Algorithm, just like `postMessage`, so prototype chains will
+     * not be included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets
+     * will throw an exception.
+     *
+     * > **NOTE:** Sending non-standard JavaScript types such as DOM objects or special
+     * Electron objects will throw an exception.
+     *
+     * The renderer process can handle the message by listening to `channel` with the
+     * `ipcRenderer` module.
+     *
+     * If you want to get the `frameId` of a given renderer context you should use the
+     * `webFrame.routingId` value.  E.g.
+     *
+     * You can also read `frameId` from all incoming IPC messages in the main process.
+     */
+    sendToFrame(frameId: (number) | ([number, number]), channel: string, ...args: any[]): void;
+    /**
+     * Mute the audio on the current web page.
+     */
+    setAudioMuted(muted: boolean): void;
+    /**
+     * Controls whether or not this WebContents will throttle animations and timers
+     * when the page becomes backgrounded. This also affects the Page Visibility API.
+     */
+    setBackgroundThrottling(allowed: boolean): void;
+    /**
+     * Uses the `devToolsWebContents` as the target `WebContents` to show devtools.
+     *
+     * The `devToolsWebContents` must not have done any navigation, and it should not
+     * be used for other purposes after the call.
+     *
+     * By default Electron manages the devtools by creating an internal `WebContents`
+     * with native view, which developers have very limited control of. With the
+     * `setDevToolsWebContents` method, developers can use any `WebContents` to show
+     * the devtools in it, including `BrowserWindow`, `BrowserView` and `<webview>`
+     * tag.
+     *
+     * Note that closing the devtools does not destroy the `devToolsWebContents`, it is
+     * caller's responsibility to destroy `devToolsWebContents`.
+     *
+     * An example of showing devtools in a `<webview>` tag:
+     *
+     * An example of showing devtools in a `BrowserWindow`:
+     */
+    setDevToolsWebContents(devToolsWebContents: WebContents): void;
+    /**
+     * If *offscreen rendering* is enabled sets the frame rate to the specified number.
+     * Only values between 1 and 240 are accepted.
+     */
+    setFrameRate(fps: number): void;
+    /**
+     * Ignore application menu shortcuts while this web contents is focused.
+     */
+    setIgnoreMenuShortcuts(ignore: boolean): void;
+    /**
+     * Sets the image animation policy for this webContents.  The policy only affects
+     * _new_ images, existing images that are currently being animated are unaffected.
+     * This is a known limitation in Chromium, you can force image animation to be
+     * recalculated with `img.src = img.src` which will result in no network traffic
+     * but will update the animation policy.
+     *
+     * This corresponds to the animationPolicy accessibility feature in Chromium.
+     */
+    setImageAnimationPolicy(policy: 'animate' | 'animateOnce' | 'noAnimation'): void;
+    /**
+     * Overrides the user agent for this web page.
+     */
+    setUserAgent(userAgent: string): void;
+    /**
+     * Sets the maximum and minimum pinch-to-zoom level.
+     *
+     * > **NOTE**: Visual zoom is disabled by default in Electron. To re-enable it,
+     * call:
+     */
+    setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): Promise<void>;
+    /**
+     * Setting the WebRTC IP handling policy allows you to control which IPs are
+     * exposed via WebRTC. See BrowserLeaks for more details.
+     */
+    setWebRTCIPHandlingPolicy(policy: 'default' | 'default_public_interface_only' | 'default_public_and_private_interfaces' | 'disable_non_proxied_udp'): void;
+    /**
+     * Called before creating a window a new window is requested by the renderer, e.g.
+     * by `window.open()`, a link with `target="_blank"`, shift+clicking on a link, or
+     * submitting a form with `<form target="_blank">`. See `window.open()` for more
+     * details and how to use this in conjunction with `did-create-window`.
+     */
+    setWindowOpenHandler(handler: (details: HandlerDetails) => ({action: 'deny'}) | ({action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions})): void;
+    /**
+     * Changes the zoom factor to the specified factor. Zoom factor is zoom percent
+     * divided by 100, so 300% = 3.0.
+     *
+     * The factor must be greater than 0.0.
+     */
+    setZoomFactor(factor: number): void;
+    /**
+     * Changes the zoom level to the specified level. The original size is 0 and each
+     * increment above or below represents zooming 20% larger or smaller to default
+     * limits of 300% and 50% of original size, respectively. The formula for this is
+     * `scale := 1.2 ^ level`.
+     *
+     * > **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that
+     * the zoom level for a specific domain propagates across all instances of windows
+     * with the same domain. Differentiating the window URLs will make zoom work
+     * per-window.
+     */
+    setZoomLevel(level: number): void;
+    /**
+     * Shows pop-up dictionary that searches the selected word on the page.
+     *
+     * @platform darwin
+     */
+    showDefinitionForSelection(): void;
+    /**
+     * Sets the `item` as dragging item for current drag-drop operation, `file` is the
+     * absolute path of the file to be dragged, and `icon` is the image showing under
+     * the cursor when dragging.
+     */
+    startDrag(item: Item): void;
+    /**
+     * If *offscreen rendering* is enabled and not painting, start painting.
+     */
+    startPainting(): void;
+    /**
+     * Stops any pending navigation.
+     */
+    stop(): void;
+    /**
+     * Stops any `findInPage` request for the `webContents` with the provided `action`.
+     */
+    stopFindInPage(action: 'clearSelection' | 'keepSelection' | 'activateSelection'): void;
+    /**
+     * If *offscreen rendering* is enabled and painting, stop painting.
+     */
+    stopPainting(): void;
+    /**
+     * Indicates whether the snapshot has been created successfully.
+     *
+     * Takes a V8 heap snapshot and saves it to `filePath`.
+     */
+    takeHeapSnapshot(filePath: string): Promise<void>;
+    /**
+     * Toggles the developer tools.
+     */
+    toggleDevTools(): void;
+    /**
+     * Executes the editing command `undo` in web page.
+     */
+    undo(): void;
+    /**
+     * Executes the editing command `unselect` in web page.
+     */
+    unselect(): void;
+    /**
+     * A `boolean` property that determines whether this page is muted.
+     */
+    audioMuted: boolean;
+    /**
+     * A `boolean` property that determines whether or not this WebContents will
+     * throttle animations and timers when the page becomes backgrounded. This also
+     * affects the Page Visibility API.
+     */
+    backgroundThrottling: boolean;
+    /**
+     * A `Debugger` instance for this webContents.
+     *
+     */
+    readonly debugger: Debugger;
+    /**
+     * A `WebContents | null` property that represents the of DevTools `WebContents`
+     * associated with a given `WebContents`.
+     *
+     * **Note:** Users should never store this object because it may become `null` when
+     * the DevTools has been closed.
+     *
+     */
+    readonly devToolsWebContents: (WebContents) | (null);
+    /**
+     * An `Integer` property that sets the frame rate of the web contents to the
+     * specified number. Only values between 1 and 240 are accepted.
+     *
+     * Only applicable if *offscreen rendering* is enabled.
+     */
+    frameRate: number;
+    /**
+     * A `WebContents` instance that might own this `WebContents`.
+     *
+     */
+    readonly hostWebContents: WebContents;
+    /**
+     * A `Integer` representing the unique ID of this WebContents. Each ID is unique
+     * among all `WebContents` instances of the entire Electron application.
+     *
+     */
+    readonly id: number;
+    /**
+     * An `IpcMain` scoped to just IPC messages sent from this WebContents.
+     *
+     * IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
+     * `ipcRenderer.postMessage` will be delivered in the following order:
+     *
+     * * `contents.on('ipc-message')`
+     * * `contents.mainFrame.on(channel)`
+     * * `contents.ipc.on(channel)`
+     * * `ipcMain.on(channel)`
+     *
+     * Handlers registered with `invoke` will be checked in the following order. The
+     * first one that is defined will be called, the rest will be ignored.
+     *
+     * * `contents.mainFrame.handle(channel)`
+     * * `contents.handle(channel)`
+     * * `ipcMain.handle(channel)`
+     *
+     * A handler or event listener registered on the WebContents will receive IPC
+     * messages sent from any frame, including child frames. In most cases, only the
+     * main frame can send IPC messages. However, if the `nodeIntegrationInSubFrames`
+     * option is enabled, it is possible for child frames to send IPC messages also. In
+     * that case, handlers should check the `senderFrame` property of the IPC event to
+     * ensure that the message is coming from the expected frame. Alternatively,
+     * register handlers on the appropriate frame directly using the `WebFrameMain.ipc`
+     * interface.
+     *
+     */
+    readonly ipc: IpcMain;
+    /**
+     * A `WebFrameMain` property that represents the top frame of the page's frame
+     * hierarchy.
+     *
+     */
+    readonly mainFrame: WebFrameMain;
+    /**
+     * A `WebFrameMain` property that represents the frame that opened this
+     * WebContents, either with open(), or by navigating a link with a target
+     * attribute.
+     *
+     */
+    readonly opener: WebFrameMain;
+    /**
+     * A `Session` used by this webContents.
+     *
+     */
+    readonly session: Session;
+    /**
+     * A `string` property that determines the user agent for this web page.
+     */
+    userAgent: string;
+    /**
+     * A `number` property that determines the zoom factor for this web contents.
+     *
+     * The zoom factor is the zoom percent divided by 100, so 300% = 3.0.
+     */
+    zoomFactor: number;
+    /**
+     * A `number` property that determines the zoom level for this web contents.
+     *
+     * The original size is 0 and each increment above or below represents zooming 20%
+     * larger or smaller to default limits of 300% and 50% of original size,
+     * respectively. The formula for this is `scale := 1.2 ^ level`.
+     */
+    zoomLevel: number;
+  }
+
+  interface WebFrame extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/web-frame
+
+    /**
+     * Attempts to free memory that is no longer being used (like images from a
+     * previous navigation).
+     *
+     * Note that blindly calling this method probably makes Electron slower since it
+     * will have to refill these emptied caches, you should only call it if an event in
+     * your app has occurred that makes you think your page is actually using less
+     * memory (i.e. you have navigated from a super heavy page to a mostly empty one,
+     * and intend to stay there).
+     */
+    clearCache(): void;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * execution throws or results in a rejected promise.
+     *
+     * Evaluates `code` in page.
+     *
+     * In the browser window some HTML APIs like `requestFullScreen` can only be
+     * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
+     * this limitation.
+     */
+    executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any, error: Error) => void): Promise<any>;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * execution could not start.
+     *
+     * Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
+     *
+     * Note that when the execution of script fails, the returned promise will not
+     * reject and the `result` would be `undefined`. This is because Chromium does not
+     * dispatch errors of isolated worlds to foreign worlds.
+     */
+    executeJavaScriptInIsolatedWorld(worldId: number, scripts: WebSource[], userGesture?: boolean, callback?: (result: any, error: Error) => void): Promise<any>;
+    /**
+     * A child of `webFrame` with the supplied `name`, `null` would be returned if
+     * there's no such frame or if the frame is not in the current renderer process.
+     */
+    findFrameByName(name: string): WebFrame;
+    /**
+     * that has the supplied `routingId`, `null` if not found.
+     */
+    findFrameByRoutingId(routingId: number): WebFrame;
+    /**
+     * The frame element in `webFrame's` document selected by `selector`, `null` would
+     * be returned if `selector` does not select a frame or if the frame is not in the
+     * current renderer process.
+     */
+    getFrameForSelector(selector: string): WebFrame;
+    /**
+     * * `images` MemoryUsageDetails
+     * * `scripts` MemoryUsageDetails
+     * * `cssStyleSheets` MemoryUsageDetails
+     * * `xslStyleSheets` MemoryUsageDetails
+     * * `fonts` MemoryUsageDetails
+     * * `other` MemoryUsageDetails
+     *
+     * Returns an object describing usage information of Blink's internal memory
+     * caches.
+     *
+     * This will generate:
+     */
+    getResourceUsage(): ResourceUsage;
+    /**
+     * A list of suggested words for a given word. If the word is spelled correctly,
+     * the result will be empty.
+     */
+    getWordSuggestions(word: string): string[];
+    /**
+     * The current zoom factor.
+     */
+    getZoomFactor(): number;
+    /**
+     * The current zoom level.
+     */
+    getZoomLevel(): number;
+    /**
+     * A key for the inserted CSS that can later be used to remove the CSS via
+     * `webFrame.removeInsertedCSS(key)`.
+     *
+     * Injects CSS into the current web page and returns a unique key for the inserted
+     * stylesheet.
+     */
+    insertCSS(css: string, options?: InsertCSSOptions): string;
+    /**
+     * Inserts `text` to the focused element.
+     */
+    insertText(text: string): void;
+    /**
+     * True if the word is misspelled according to the built in spellchecker, false
+     * otherwise. If no dictionary is loaded, always return false.
+     */
+    isWordMisspelled(word: string): boolean;
+    /**
+     * Removes the inserted CSS from the current web page. The stylesheet is identified
+     * by its key, which is returned from `webFrame.insertCSS(css)`.
+     */
+    removeInsertedCSS(key: string): void;
+    /**
+     * Set the security origin, content security policy and name of the isolated world.
+     * Note: If the `csp` is specified, then the `securityOrigin` also has to be
+     * specified.
+     */
+    setIsolatedWorldInfo(worldId: number, info: Info): void;
+    /**
+     * Sets a provider for spell checking in input fields and text areas.
+     *
+     * If you want to use this method you must disable the builtin spellchecker when
+     * you construct the window.
+     *
+     * The `provider` must be an object that has a `spellCheck` method that accepts an
+     * array of individual words for spellchecking. The `spellCheck` function runs
+     * asynchronously and calls the `callback` function with an array of misspelt words
+     * when complete.
+     *
+     * An example of using node-spellchecker as provider:
+     */
+    setSpellCheckProvider(language: string, provider: Provider): void;
+    /**
+     * Sets the maximum and minimum pinch-to-zoom level.
+     *
+     * > **NOTE**: Visual zoom is disabled by default in Electron. To re-enable it,
+     * call:
+     *
+     * > **NOTE**: Visual zoom only applies to pinch-to-zoom behavior. Cmd+/-/0 zoom
+     * shortcuts are controlled by the 'zoomIn', 'zoomOut', and 'resetZoom' MenuItem
+     * roles in the application Menu. To disable shortcuts, manually define the Menu
+     * and omit zoom roles from the definition.
+     */
+    setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): void;
+    /**
+     * Changes the zoom factor to the specified factor. Zoom factor is zoom percent
+     * divided by 100, so 300% = 3.0.
+     *
+     * The factor must be greater than 0.0.
+     */
+    setZoomFactor(factor: number): void;
+    /**
+     * Changes the zoom level to the specified level. The original size is 0 and each
+     * increment above or below represents zooming 20% larger or smaller to default
+     * limits of 300% and 50% of original size, respectively.
+     *
+     * > **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that
+     * the zoom level for a specific domain propagates across all instances of windows
+     * with the same domain. Differentiating the window URLs will make zoom work
+     * per-window.
+     */
+    setZoomLevel(level: number): void;
+    /**
+     * A `WebFrame | null` representing the first child frame of `webFrame`, the
+     * property would be `null` if `webFrame` has no children or if first child is not
+     * in the current renderer process.
+     *
+     */
+    readonly firstChild: (WebFrame) | (null);
+    /**
+     * A `WebFrame | null` representing next sibling frame, the property would be
+     * `null` if `webFrame` is the last frame in its parent or if the next sibling is
+     * not in the current renderer process.
+     *
+     */
+    readonly nextSibling: (WebFrame) | (null);
+    /**
+     * A `WebFrame | null` representing the frame which opened `webFrame`, the property
+     * would be `null` if there's no opener or opener is not in the current renderer
+     * process.
+     *
+     */
+    readonly opener: (WebFrame) | (null);
+    /**
+     * A `WebFrame | null` representing parent frame of `webFrame`, the property would
+     * be `null` if `webFrame` is top or parent is not in the current renderer process.
+     *
+     */
+    readonly parent: (WebFrame) | (null);
+    /**
+     * An `Integer` representing the unique frame id in the current renderer process.
+     * Distinct WebFrame instances that refer to the same underlying frame will have
+     * the same `routingId`.
+     *
+     */
+    readonly routingId: number;
+    /**
+     * A `WebFrame | null` representing top frame in frame hierarchy to which
+     * `webFrame` belongs, the property would be `null` if top frame is not in the
+     * current renderer process.
+     *
+     */
+    readonly top: (WebFrame) | (null);
+  }
+
+  class WebFrameMain extends NodeEventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/web-frame-main
+
+    /**
+     * A frame with the given process and routing IDs, or `undefined` if there is no
+     * WebFrameMain associated with the given IDs.
+     */
+    static fromId(processId: number, routingId: number): (WebFrameMain) | (undefined);
+    /**
+     * Emitted when the document is loaded.
+     */
+    on(event: 'dom-ready', listener: Function): this;
+    once(event: 'dom-ready', listener: Function): this;
+    addListener(event: 'dom-ready', listener: Function): this;
+    removeListener(event: 'dom-ready', listener: Function): this;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * execution throws or results in a rejected promise.
+     *
+     * Evaluates `code` in page.
+     *
+     * In the browser window some HTML APIs like `requestFullScreen` can only be
+     * invoked by a gesture from the user. Setting `userGesture` to `true` will remove
+     * this limitation.
+     */
+    executeJavaScript(code: string, userGesture?: boolean): Promise<unknown>;
+    /**
+     * Send a message to the renderer process, optionally transferring ownership of
+     * zero or more [`MessagePortMain`][] objects.
+     *
+     * The transferred `MessagePortMain` objects will be available in the renderer
+     * process by accessing the `ports` property of the emitted event. When they arrive
+     * in the renderer, they will be native DOM `MessagePort` objects.
+     *
+     * For example:
+     */
+    postMessage(channel: string, message: any, transfer?: MessagePortMain[]): void;
+    /**
+     * Whether the reload was initiated successfully. Only results in `false` when the
+     * frame has no history.
+     */
+    reload(): boolean;
+    /**
+     * Send an asynchronous message to the renderer process via `channel`, along with
+     * arguments. Arguments will be serialized with the Structured Clone Algorithm,
+     * just like `postMessage`, so prototype chains will not be included. Sending
+     * Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an exception.
+     *
+     * The renderer process can handle the message by listening to `channel` with the
+     * `ipcRenderer` module.
+     */
+    send(channel: string, ...args: any[]): void;
+    /**
+     * A `WebFrameMain[]` collection containing the direct descendents of `frame`.
+     *
+     */
+    readonly frames: WebFrameMain[];
+    /**
+     * A `WebFrameMain[]` collection containing every frame in the subtree of `frame`,
+     * including itself. This can be useful when traversing through all frames.
+     *
+     */
+    readonly framesInSubtree: WebFrameMain[];
+    /**
+     * An `Integer` representing the id of the frame's internal FrameTreeNode instance.
+     * This id is browser-global and uniquely identifies a frame that hosts content.
+     * The identifier is fixed at the creation of the frame and stays constant for the
+     * lifetime of the frame. When the frame is removed, the id is not used again.
+     *
+     */
+    readonly frameTreeNodeId: number;
+    /**
+     * An `IpcMain` instance scoped to the frame.
+     *
+     * IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
+     * `ipcRenderer.postMessage` will be delivered in the following order:
+     *
+     * * `contents.on('ipc-message')`
+     * * `contents.mainFrame.on(channel)`
+     * * `contents.ipc.on(channel)`
+     * * `ipcMain.on(channel)`
+     *
+     * Handlers registered with `invoke` will be checked in the following order. The
+     * first one that is defined will be called, the rest will be ignored.
+     *
+     * * `contents.mainFrame.handle(channel)`
+     * * `contents.handle(channel)`
+     * * `ipcMain.handle(channel)`
+     *
+     * In most cases, only the main frame of a WebContents can send or receive IPC
+     * messages. However, if the `nodeIntegrationInSubFrames` option is enabled, it is
+     * possible for child frames to send and receive IPC messages also. The
+     * `WebContents.ipc` interface may be more convenient when
+     * `nodeIntegrationInSubFrames` is not enabled.
+     *
+     */
+    readonly ipc: IpcMain;
+    /**
+     * A `string` representing the frame name.
+     *
+     */
+    readonly name: string;
+    /**
+     * A `string` representing the current origin of the frame, serialized according to
+     * RFC 6454. This may be different from the URL. For instance, if the frame is a
+     * child window opened to `about:blank`, then `frame.origin` will return the parent
+     * frame's origin, while `frame.url` will return the empty string. Pages without a
+     * scheme/host/port triple origin will have the serialized origin of `"null"` (that
+     * is, the string containing the letters n, u, l, l).
+     *
+     */
+    readonly origin: string;
+    /**
+     * An `Integer` representing the operating system `pid` of the process which owns
+     * this frame.
+     *
+     */
+    readonly osProcessId: number;
+    /**
+     * A `WebFrameMain | null` representing parent frame of `frame`, the property would
+     * be `null` if `frame` is the top frame in the frame hierarchy.
+     *
+     */
+    readonly parent: (WebFrameMain) | (null);
+    /**
+     * An `Integer` representing the Chromium internal `pid` of the process which owns
+     * this frame. This is not the same as the OS process ID; to read that use
+     * `frame.osProcessId`.
+     *
+     */
+    readonly processId: number;
+    /**
+     * An `Integer` representing the unique frame id in the current renderer process.
+     * Distinct `WebFrameMain` instances that refer to the same underlying frame will
+     * have the same `routingId`.
+     *
+     */
+    readonly routingId: number;
+    /**
+     * A `WebFrameMain | null` representing top frame in the frame hierarchy to which
+     * `frame` belongs.
+     *
+     */
+    readonly top: (WebFrameMain) | (null);
+    /**
+     * A `string` representing the current URL of the frame.
+     *
+     */
+    readonly url: string;
+    /**
+     * A `string` representing the visibility state of the frame.
+     *
+     * See also how the Page Visibility API is affected by other Electron APIs.
+     *
+     */
+    readonly visibilityState: string;
+  }
+
+  class WebRequest {
+
+    // Docs: https://electronjs.org/docs/api/web-request
+
+    /**
+     * The `listener` will be called with `listener(details)` when a server initiated
+     * redirect is about to occur.
+     */
+    onBeforeRedirect(filter: WebRequestFilter, listener: ((details: OnBeforeRedirectListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when a server initiated
+     * redirect is about to occur.
+     */
+    onBeforeRedirect(listener: ((details: OnBeforeRedirectListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` when a request
+     * is about to occur.
+     *
+     * The `uploadData` is an array of `UploadData` objects.
+     *
+     * The `callback` has to be called with an `response` object.
+     *
+     * Some examples of valid `urls`:
+     */
+    onBeforeRequest(filter: WebRequestFilter, listener: ((details: OnBeforeRequestListenerDetails, callback: (response: CallbackResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` when a request
+     * is about to occur.
+     *
+     * The `uploadData` is an array of `UploadData` objects.
+     *
+     * The `callback` has to be called with an `response` object.
+     *
+     * Some examples of valid `urls`:
+     */
+    onBeforeRequest(listener: ((details: OnBeforeRequestListenerDetails, callback: (response: CallbackResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` before sending
+     * an HTTP request, once the request headers are available. This may occur after a
+     * TCP connection is made to the server, but before any http data is sent.
+     *
+     * The `callback` has to be called with a `response` object.
+     */
+    onBeforeSendHeaders(filter: WebRequestFilter, listener: ((details: OnBeforeSendHeadersListenerDetails, callback: (beforeSendResponse: BeforeSendResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` before sending
+     * an HTTP request, once the request headers are available. This may occur after a
+     * TCP connection is made to the server, but before any http data is sent.
+     *
+     * The `callback` has to be called with a `response` object.
+     */
+    onBeforeSendHeaders(listener: ((details: OnBeforeSendHeadersListenerDetails, callback: (beforeSendResponse: BeforeSendResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when a request is
+     * completed.
+     */
+    onCompleted(filter: WebRequestFilter, listener: ((details: OnCompletedListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when a request is
+     * completed.
+     */
+    onCompleted(listener: ((details: OnCompletedListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when an error occurs.
+     */
+    onErrorOccurred(filter: WebRequestFilter, listener: ((details: OnErrorOccurredListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when an error occurs.
+     */
+    onErrorOccurred(listener: ((details: OnErrorOccurredListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` when HTTP
+     * response headers of a request have been received.
+     *
+     * The `callback` has to be called with a `response` object.
+     */
+    onHeadersReceived(filter: WebRequestFilter, listener: ((details: OnHeadersReceivedListenerDetails, callback: (headersReceivedResponse: HeadersReceivedResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details, callback)` when HTTP
+     * response headers of a request have been received.
+     *
+     * The `callback` has to be called with a `response` object.
+     */
+    onHeadersReceived(listener: ((details: OnHeadersReceivedListenerDetails, callback: (headersReceivedResponse: HeadersReceivedResponse) => void) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when first byte of the
+     * response body is received. For HTTP requests, this means that the status line
+     * and response headers are available.
+     */
+    onResponseStarted(filter: WebRequestFilter, listener: ((details: OnResponseStartedListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` when first byte of the
+     * response body is received. For HTTP requests, this means that the status line
+     * and response headers are available.
+     */
+    onResponseStarted(listener: ((details: OnResponseStartedListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` just before a request is
+     * going to be sent to the server, modifications of previous `onBeforeSendHeaders`
+     * response are visible by the time this listener is fired.
+     */
+    onSendHeaders(filter: WebRequestFilter, listener: ((details: OnSendHeadersListenerDetails) => void) | (null)): void;
+    /**
+     * The `listener` will be called with `listener(details)` just before a request is
+     * going to be sent to the server, modifications of previous `onBeforeSendHeaders`
+     * response are visible by the time this listener is fired.
+     */
+    onSendHeaders(listener: ((details: OnSendHeadersListenerDetails) => void) | (null)): void;
+  }
+
+  interface WebRequestFilter {
+
+    // Docs: https://electronjs.org/docs/api/structures/web-request-filter
+
+    /**
+     * Array of URL patterns that will be used to filter out the requests that do not
+     * match the URL patterns.
+     */
+    urls: string[];
+  }
+
+  interface WebSource {
+
+    // Docs: https://electronjs.org/docs/api/structures/web-source
+
+    code: string;
+    url?: string;
+  }
+
+  interface WebviewTag extends HTMLElement {
+
+    // Docs: https://electronjs.org/docs/api/webview-tag
+
+    /**
+     * Fired when a load has committed. This includes navigation within the current
+     * document as well as subframe document-level loads, but does not include
+     * asynchronous resource loads.
+     */
+    addEventListener(event: 'load-commit', listener: (event: LoadCommitEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'load-commit', listener: (event: LoadCommitEvent) => void): this;
+    /**
+     * Fired when the navigation is done, i.e. the spinner of the tab will stop
+     * spinning, and the `onload` event is dispatched.
+     */
+    addEventListener(event: 'did-finish-load', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-finish-load', listener: (event: Event) => void): this;
+    /**
+     * This event is like `did-finish-load`, but fired when the load failed or was
+     * cancelled, e.g. `window.stop()` is invoked.
+     */
+    addEventListener(event: 'did-fail-load', listener: (event: DidFailLoadEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-fail-load', listener: (event: DidFailLoadEvent) => void): this;
+    /**
+     * Fired when a frame has done navigation.
+     */
+    addEventListener(event: 'did-frame-finish-load', listener: (event: DidFrameFinishLoadEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-frame-finish-load', listener: (event: DidFrameFinishLoadEvent) => void): this;
+    /**
+     * Corresponds to the points in time when the spinner of the tab starts spinning.
+     */
+    addEventListener(event: 'did-start-loading', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-start-loading', listener: (event: Event) => void): this;
+    /**
+     * Corresponds to the points in time when the spinner of the tab stops spinning.
+     */
+    addEventListener(event: 'did-stop-loading', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-stop-loading', listener: (event: Event) => void): this;
+    /**
+     * Fired when attached to the embedder web contents.
+     */
+    addEventListener(event: 'did-attach', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-attach', listener: (event: Event) => void): this;
+    /**
+     * Fired when document in the given frame is loaded.
+     */
+    addEventListener(event: 'dom-ready', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'dom-ready', listener: (event: Event) => void): this;
+    /**
+     * Fired when page title is set during navigation. `explicitSet` is false when
+     * title is synthesized from file url.
+     */
+    addEventListener(event: 'page-title-updated', listener: (event: PageTitleUpdatedEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'page-title-updated', listener: (event: PageTitleUpdatedEvent) => void): this;
+    /**
+     * Fired when page receives favicon urls.
+     */
+    addEventListener(event: 'page-favicon-updated', listener: (event: PageFaviconUpdatedEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'page-favicon-updated', listener: (event: PageFaviconUpdatedEvent) => void): this;
+    /**
+     * Fired when page enters fullscreen triggered by HTML API.
+     */
+    addEventListener(event: 'enter-html-full-screen', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'enter-html-full-screen', listener: (event: Event) => void): this;
+    /**
+     * Fired when page leaves fullscreen triggered by HTML API.
+     */
+    addEventListener(event: 'leave-html-full-screen', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'leave-html-full-screen', listener: (event: Event) => void): this;
+    /**
+     * Fired when the guest window logs a console message.
+     *
+     * The following example code forwards all log messages to the embedder's console
+     * without regard for log level or other properties.
+     */
+    addEventListener(event: 'console-message', listener: (event: ConsoleMessageEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'console-message', listener: (event: ConsoleMessageEvent) => void): this;
+    /**
+     * Fired when a result is available for `webview.findInPage` request.
+     */
+    addEventListener(event: 'found-in-page', listener: (event: FoundInPageEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'found-in-page', listener: (event: FoundInPageEvent) => void): this;
+    /**
+     * Fired when the guest page attempts to open a new browser window.
+     *
+     * The following example code opens the new url in system's default browser.
+     */
+    addEventListener(event: 'new-window', listener: (event: NewWindowEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'new-window', listener: (event: NewWindowEvent) => void): this;
+    /**
+     * Emitted when a user or the page wants to start navigation. It can happen when
+     * the `window.location` object is changed or a user clicks a link in the page.
+     *
+     * This event will not emit when the navigation is started programmatically with
+     * APIs like `<webview>.loadURL` and `<webview>.back`.
+     *
+     * It is also not emitted during in-page navigation, such as clicking anchor links
+     * or updating the `window.location.hash`. Use `did-navigate-in-page` event for
+     * this purpose.
+     *
+     * Calling `event.preventDefault()` does __NOT__ have any effect.
+     */
+    addEventListener(event: 'will-navigate', listener: (event: WillNavigateEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'will-navigate', listener: (event: WillNavigateEvent) => void): this;
+    /**
+     * Emitted when any frame (including main) starts navigating. `isInPlace` will be
+     * `true` for in-page navigations.
+     */
+    addEventListener(event: 'did-start-navigation', listener: (event: DidStartNavigationEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-start-navigation', listener: (event: DidStartNavigationEvent) => void): this;
+    /**
+     * Emitted after a server side redirect occurs during navigation. For example a 302
+     * redirect.
+     */
+    addEventListener(event: 'did-redirect-navigation', listener: (event: DidRedirectNavigationEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-redirect-navigation', listener: (event: DidRedirectNavigationEvent) => void): this;
+    /**
+     * Emitted when a navigation is done.
+     *
+     * This event is not emitted for in-page navigations, such as clicking anchor links
+     * or updating the `window.location.hash`. Use `did-navigate-in-page` event for
+     * this purpose.
+     */
+    addEventListener(event: 'did-navigate', listener: (event: DidNavigateEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-navigate', listener: (event: DidNavigateEvent) => void): this;
+    /**
+     * Emitted when any frame navigation is done.
+     *
+     * This event is not emitted for in-page navigations, such as clicking anchor links
+     * or updating the `window.location.hash`. Use `did-navigate-in-page` event for
+     * this purpose.
+     */
+    addEventListener(event: 'did-frame-navigate', listener: (event: DidFrameNavigateEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-frame-navigate', listener: (event: DidFrameNavigateEvent) => void): this;
+    /**
+     * Emitted when an in-page navigation happened.
+     *
+     * When in-page navigation happens, the page URL changes but does not cause
+     * navigation outside of the page. Examples of this occurring are when anchor links
+     * are clicked or when the DOM `hashchange` event is triggered.
+     */
+    addEventListener(event: 'did-navigate-in-page', listener: (event: DidNavigateInPageEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-navigate-in-page', listener: (event: DidNavigateInPageEvent) => void): this;
+    /**
+     * Fired when the guest page attempts to close itself.
+     *
+     * The following example code navigates the `webview` to `about:blank` when the
+     * guest attempts to close itself.
+     */
+    addEventListener(event: 'close', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'close', listener: (event: Event) => void): this;
+    /**
+     * Fired when the guest page has sent an asynchronous message to embedder page.
+     *
+     * With `sendToHost` method and `ipc-message` event you can communicate between
+     * guest page and embedder page:
+     */
+    addEventListener(event: 'ipc-message', listener: (event: IpcMessageEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'ipc-message', listener: (event: IpcMessageEvent) => void): this;
+    /**
+     * Fired when the renderer process is crashed.
+     */
+    addEventListener(event: 'crashed', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'crashed', listener: (event: Event) => void): this;
+    /**
+     * Fired when a plugin process is crashed.
+     */
+    addEventListener(event: 'plugin-crashed', listener: (event: PluginCrashedEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'plugin-crashed', listener: (event: PluginCrashedEvent) => void): this;
+    /**
+     * Fired when the WebContents is destroyed.
+     */
+    addEventListener(event: 'destroyed', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'destroyed', listener: (event: Event) => void): this;
+    /**
+     * Emitted when media starts playing.
+     */
+    addEventListener(event: 'media-started-playing', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'media-started-playing', listener: (event: Event) => void): this;
+    /**
+     * Emitted when media is paused or done playing.
+     */
+    addEventListener(event: 'media-paused', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'media-paused', listener: (event: Event) => void): this;
+    /**
+     * Emitted when a page's theme color changes. This is usually due to encountering a
+     * meta tag:
+     */
+    addEventListener(event: 'did-change-theme-color', listener: (event: DidChangeThemeColorEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'did-change-theme-color', listener: (event: DidChangeThemeColorEvent) => void): this;
+    /**
+     * Emitted when mouse moves over a link or the keyboard moves the focus to a link.
+     */
+    addEventListener(event: 'update-target-url', listener: (event: UpdateTargetUrlEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'update-target-url', listener: (event: UpdateTargetUrlEvent) => void): this;
+    /**
+     * Emitted when DevTools is opened.
+     */
+    addEventListener(event: 'devtools-opened', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'devtools-opened', listener: (event: Event) => void): this;
+    /**
+     * Emitted when DevTools is closed.
+     */
+    addEventListener(event: 'devtools-closed', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'devtools-closed', listener: (event: Event) => void): this;
+    /**
+     * Emitted when DevTools is focused / opened.
+     */
+    addEventListener(event: 'devtools-focused', listener: (event: Event) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'devtools-focused', listener: (event: Event) => void): this;
+    /**
+     * Emitted when there is a new context menu that needs to be handled.
+     */
+    addEventListener(event: 'context-menu', listener: (event: ContextMenuEvent) => void, useCapture?: boolean): this;
+    removeEventListener(event: 'context-menu', listener: (event: ContextMenuEvent) => void): this;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    /**
+     * Whether the guest page can go back.
+     */
+    canGoBack(): boolean;
+    /**
+     * Whether the guest page can go forward.
+     */
+    canGoForward(): boolean;
+    /**
+     * Whether the guest page can go to `offset`.
+     */
+    canGoToOffset(offset: number): boolean;
+    /**
+     * Resolves with a NativeImage
+     *
+     * Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
+     * whole visible page.
+     */
+    capturePage(rect?: Rectangle): Promise<Electron.NativeImage>;
+    /**
+     * Clears the navigation history.
+     */
+    clearHistory(): void;
+    /**
+     * Closes the DevTools window of guest page.
+     */
+    closeDevTools(): void;
+    /**
+     * Executes editing command `copy` in page.
+     */
+    copy(): void;
+    /**
+     * Executes editing command `cut` in page.
+     */
+    cut(): void;
+    /**
+     * Executes editing command `delete` in page.
+     */
+    delete(): void;
+    /**
+     * Initiates a download of the resource at `url` without navigating.
+     */
+    downloadURL(url: string): void;
+    /**
+     * A promise that resolves with the result of the executed code or is rejected if
+     * the result of the code is a rejected promise.
+     *
+     * Evaluates `code` in page. If `userGesture` is set, it will create the user
+     * gesture context in the page. HTML APIs like `requestFullScreen`, which require
+     * user action, can take advantage of this option for automation.
+     */
+    executeJavaScript(code: string, userGesture?: boolean): Promise<any>;
+    /**
+     * The request id used for the request.
+     *
+     * Starts a request to find all matches for the `text` in the web page. The result
+     * of the request can be obtained by subscribing to `found-in-page` event.
+     */
+    findInPage(text: string, options?: FindInPageOptions): number;
+    /**
+     * The title of guest page.
+     */
+    getTitle(): string;
+    /**
+     * The URL of guest page.
+     */
+    getURL(): string;
+    /**
+     * The user agent for guest page.
+     */
+    getUserAgent(): string;
+    /**
+     * The WebContents ID of this `webview`.
+     */
+    getWebContentsId(): number;
+    /**
+     * the current zoom factor.
+     */
+    getZoomFactor(): number;
+    /**
+     * the current zoom level.
+     */
+    getZoomLevel(): number;
+    /**
+     * Makes the guest page go back.
+     */
+    goBack(): void;
+    /**
+     * Makes the guest page go forward.
+     */
+    goForward(): void;
+    /**
+     * Navigates to the specified absolute index.
+     */
+    goToIndex(index: number): void;
+    /**
+     * Navigates to the specified offset from the "current entry".
+     */
+    goToOffset(offset: number): void;
+    /**
+     * A promise that resolves with a key for the inserted CSS that can later be used
+     * to remove the CSS via `<webview>.removeInsertedCSS(key)`.
+     *
+     * Injects CSS into the current web page and returns a unique key for the inserted
+     * stylesheet.
+     */
+    insertCSS(css: string): Promise<string>;
+    /**
+     * Inserts `text` to the focused element.
+     */
+    insertText(text: string): Promise<void>;
+    /**
+     * Starts inspecting element at position (`x`, `y`) of guest page.
+     */
+    inspectElement(x: number, y: number): void;
+    /**
+     * Opens the DevTools for the service worker context present in the guest page.
+     */
+    inspectServiceWorker(): void;
+    /**
+     * Opens the DevTools for the shared worker context present in the guest page.
+     */
+    inspectSharedWorker(): void;
+    /**
+     * Whether guest page has been muted.
+     */
+    isAudioMuted(): boolean;
+    /**
+     * Whether the renderer process has crashed.
+     */
+    isCrashed(): boolean;
+    /**
+     * Whether audio is currently playing.
+     */
+    isCurrentlyAudible(): boolean;
+    /**
+     * Whether DevTools window of guest page is focused.
+     */
+    isDevToolsFocused(): boolean;
+    /**
+     * Whether guest page has a DevTools window attached.
+     */
+    isDevToolsOpened(): boolean;
+    /**
+     * Whether guest page is still loading resources.
+     */
+    isLoading(): boolean;
+    /**
+     * Whether the main frame (and not just iframes or frames within it) is still
+     * loading.
+     */
+    isLoadingMainFrame(): boolean;
+    /**
+     * Whether the guest page is waiting for a first-response for the main resource of
+     * the page.
+     */
+    isWaitingForResponse(): boolean;
+    /**
+     * The promise will resolve when the page has finished loading (see
+     * `did-finish-load`), and rejects if the page fails to load (see `did-fail-load`).
+     *
+     * Loads the `url` in the webview, the `url` must contain the protocol prefix, e.g.
+     * the `http://` or `file://`.
+     */
+    loadURL(url: string, options?: LoadURLOptions): Promise<void>;
+    /**
+     * Opens a DevTools window for guest page.
+     */
+    openDevTools(): void;
+    /**
+     * Executes editing command `paste` in page.
+     */
+    paste(): void;
+    /**
+     * Executes editing command `pasteAndMatchStyle` in page.
+     */
+    pasteAndMatchStyle(): void;
+    /**
+     * Prints `webview`'s web page. Same as `webContents.print([options])`.
+     */
+    print(options?: WebviewTagPrintOptions): Promise<void>;
+    /**
+     * Resolves with the generated PDF data.
+     *
+     * Prints `webview`'s web page as PDF, Same as `webContents.printToPDF(options)`.
+     */
+    printToPDF(options: PrintToPDFOptions): Promise<Uint8Array>;
+    /**
+     * Executes editing command `redo` in page.
+     */
+    redo(): void;
+    /**
+     * Reloads the guest page.
+     */
+    reload(): void;
+    /**
+     * Reloads the guest page and ignores cache.
+     */
+    reloadIgnoringCache(): void;
+    /**
+     * Resolves if the removal was successful.
+     *
+     * Removes the inserted CSS from the current web page. The stylesheet is identified
+     * by its key, which is returned from `<webview>.insertCSS(css)`.
+     */
+    removeInsertedCSS(key: string): Promise<void>;
+    /**
+     * Executes editing command `replace` in page.
+     */
+    replace(text: string): void;
+    /**
+     * Executes editing command `replaceMisspelling` in page.
+     */
+    replaceMisspelling(text: string): void;
+    /**
+     * Executes editing command `selectAll` in page.
+     */
+    selectAll(): void;
+    /**
+     * Send an asynchronous message to renderer process via `channel`, you can also
+     * send arbitrary arguments. The renderer process can handle the message by
+     * listening to the `channel` event with the `ipcRenderer` module.
+     *
+     * See webContents.send for examples.
+     */
+    send(channel: string, ...args: any[]): Promise<void>;
+    /**
+     * Sends an input `event` to the page.
+     *
+     * See webContents.sendInputEvent for detailed description of `event` object.
+     */
+    sendInputEvent(event: (MouseInputEvent) | (MouseWheelInputEvent) | (KeyboardInputEvent)): Promise<void>;
+    /**
+     * Send an asynchronous message to renderer process via `channel`, you can also
+     * send arbitrary arguments. The renderer process can handle the message by
+     * listening to the `channel` event with the `ipcRenderer` module.
+     *
+     * See webContents.sendToFrame for examples.
+     */
+    sendToFrame(frameId: [number, number], channel: string, ...args: any[]): Promise<void>;
+    /**
+     * Set guest page muted.
+     */
+    setAudioMuted(muted: boolean): void;
+    /**
+     * Overrides the user agent for the guest page.
+     */
+    setUserAgent(userAgent: string): void;
+    /**
+     * Sets the maximum and minimum pinch-to-zoom level.
+     */
+    setVisualZoomLevelLimits(minimumLevel: number, maximumLevel: number): Promise<void>;
+    /**
+     * Changes the zoom factor to the specified factor. Zoom factor is zoom percent
+     * divided by 100, so 300% = 3.0.
+     */
+    setZoomFactor(factor: number): void;
+    /**
+     * Changes the zoom level to the specified level. The original size is 0 and each
+     * increment above or below represents zooming 20% larger or smaller to default
+     * limits of 300% and 50% of original size, respectively. The formula for this is
+     * `scale := 1.2 ^ level`.
+     *
+     * > **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that
+     * the zoom level for a specific domain propagates across all instances of windows
+     * with the same domain. Differentiating the window URLs will make zoom work
+     * per-window.
+     */
+    setZoomLevel(level: number): void;
+    /**
+     * Shows pop-up dictionary that searches the selected word on the page.
+     *
+     * @platform darwin
+     */
+    showDefinitionForSelection(): void;
+    /**
+     * Stops any pending navigation.
+     */
+    stop(): void;
+    /**
+     * Stops any `findInPage` request for the `webview` with the provided `action`.
+     */
+    stopFindInPage(action: 'clearSelection' | 'keepSelection' | 'activateSelection'): void;
+    /**
+     * Executes editing command `undo` in page.
+     */
+    undo(): void;
+    /**
+     * Executes editing command `unselect` in page.
+     */
+    unselect(): void;
+    /**
+     * A `boolean`. When this attribute is present the guest page will be allowed to
+     * open new windows. Popups are disabled by default.
+     */
+    allowpopups: boolean;
+    /**
+     * A `string` which is a list of strings which specifies the blink features to be
+     * disabled separated by `,`. The full list of supported feature strings can be
+     * found in the RuntimeEnabledFeatures.json5 file.
+     */
+    disableblinkfeatures: string;
+    /**
+     * A `boolean`. When this attribute is present the guest page will have web
+     * security disabled. Web security is enabled by default.
+     */
+    disablewebsecurity: boolean;
+    /**
+     * A `string` which is a list of strings which specifies the blink features to be
+     * enabled separated by `,`. The full list of supported feature strings can be
+     * found in the RuntimeEnabledFeatures.json5 file.
+     */
+    enableblinkfeatures: string;
+    /**
+     * A `string` that sets the referrer URL for the guest page.
+     */
+    httpreferrer: string;
+    /**
+     * A `boolean`. When this attribute is present the guest page in `webview` will
+     * have node integration and can use node APIs like `require` and `process` to
+     * access low level system resources. Node integration is disabled by default in
+     * the guest page.
+     */
+    nodeintegration: boolean;
+    /**
+     * A `boolean` for the experimental option for enabling NodeJS support in
+     * sub-frames such as iframes inside the `webview`. All your preloads will load for
+     * every iframe, you can use `process.isMainFrame` to determine if you are in the
+     * main frame or not. This option is disabled by default in the guest page.
+     */
+    nodeintegrationinsubframes: boolean;
+    /**
+     * A `string` that sets the session used by the page. If `partition` starts with
+     * `persist:`, the page will use a persistent session available to all pages in the
+     * app with the same `partition`. if there is no `persist:` prefix, the page will
+     * use an in-memory session. By assigning the same `partition`, multiple pages can
+     * share the same session. If the `partition` is unset then default session of the
+     * app will be used.
+     *
+     * This value can only be modified before the first navigation, since the session
+     * of an active renderer process cannot change. Subsequent attempts to modify the
+     * value will fail with a DOM exception.
+     */
+    partition: string;
+    /**
+     * A `boolean`. When this attribute is present the guest page in `webview` will be
+     * able to use browser plugins. Plugins are disabled by default.
+     */
+    plugins: boolean;
+    /**
+     * A `string` that specifies a script that will be loaded before other scripts run
+     * in the guest page. The protocol of script's URL must be `file:` (even when using
+     * `asar:` archives) because it will be loaded by Node's `require` under the hood,
+     * which treats `asar:` archives as virtual directories.
+     *
+     * When the guest page doesn't have node integration this script will still have
+     * access to all Node APIs, but global objects injected by Node will be deleted
+     * after this script has finished executing.
+     */
+    preload: string;
+    /**
+     * A `string` representing the visible URL. Writing to this attribute initiates
+     * top-level navigation.
+     *
+     * Assigning `src` its own value will reload the current page.
+     *
+     * The `src` attribute can also accept data URLs, such as `data:text/plain,Hello,
+     * world!`.
+     */
+    src: string;
+    /**
+     * A `string` that sets the user agent for the guest page before the page is
+     * navigated to. Once the page is loaded, use the `setUserAgent` method to change
+     * the user agent.
+     */
+    useragent: string;
+    /**
+     * A `string` which is a comma separated list of strings which specifies the web
+     * preferences to be set on the webview. The full list of supported preference
+     * strings can be found in BrowserWindow.
+     *
+     * The string follows the same format as the features string in `window.open`. A
+     * name by itself is given a `true` boolean value. A preference can be set to
+     * another value by including an `=`, followed by the value. Special values `yes`
+     * and `1` are interpreted as `true`, while `no` and `0` are interpreted as
+     * `false`.
+     */
+    webpreferences: string;
+  }
+
+  interface AboutPanelOptionsOptions {
+    /**
+     * The app's name.
+     */
+    applicationName?: string;
+    /**
+     * The app's version.
+     */
+    applicationVersion?: string;
+    /**
+     * Copyright information.
+     */
+    copyright?: string;
+    /**
+     * The app's build version number.
+     *
+     * @platform darwin
+     */
+    version?: string;
+    /**
+     * Credit information.
+     *
+     * @platform darwin,win32
+     */
+    credits?: string;
+    /**
+     * List of app authors.
+     *
+     * @platform linux
+     */
+    authors?: string[];
+    /**
+     * The app's website.
+     *
+     * @platform linux
+     */
+    website?: string;
+    /**
+     * Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as
+     * 64x64 pixels while retaining aspect ratio.
+     *
+     * @platform linux,win32
+     */
+    iconPath?: string;
+  }
+
+  interface AddRepresentationOptions {
+    /**
+     * The scale factor to add the image representation for.
+     */
+    scaleFactor?: number;
+    /**
+     * Defaults to 0. Required if a bitmap buffer is specified as `buffer`.
+     */
+    width?: number;
+    /**
+     * Defaults to 0. Required if a bitmap buffer is specified as `buffer`.
+     */
+    height?: number;
+    /**
+     * The buffer containing the raw image data.
+     */
+    buffer?: Buffer;
+    /**
+     * The data URL containing either a base 64 encoded PNG or JPEG image.
+     */
+    dataURL?: string;
+  }
+
+  interface AnimationSettings {
+    /**
+     * Returns true if rich animations should be rendered. Looks at session type (e.g.
+     * remote desktop) and accessibility settings to give guidance for heavy
+     * animations.
+     */
+    shouldRenderRichAnimation: boolean;
+    /**
+     * Determines on a per-platform basis whether scroll animations (e.g. produced by
+     * home/end key) should be enabled.
+     */
+    scrollAnimationsEnabledBySystem: boolean;
+    /**
+     * Determines whether the user desires reduced motion based on platform APIs.
+     */
+    prefersReducedMotion: boolean;
+  }
+
+  interface AppDetailsOptions {
+    /**
+     * Window's App User Model ID. It has to be set, otherwise the other options will
+     * have no effect.
+     */
+    appId?: string;
+    /**
+     * Window's Relaunch Icon.
+     */
+    appIconPath?: string;
+    /**
+     * Index of the icon in `appIconPath`. Ignored when `appIconPath` is not set.
+     * Default is `0`.
+     */
+    appIconIndex?: number;
+    /**
+     * Window's Relaunch Command.
+     */
+    relaunchCommand?: string;
+    /**
+     * Window's Relaunch Display Name.
+     */
+    relaunchDisplayName?: string;
+  }
+
+  interface ApplicationInfoForProtocolReturnValue {
+    /**
+     * the display icon of the app handling the protocol.
+     */
+    icon: NativeImage;
+    /**
+     * installation path of the app handling the protocol.
+     */
+    path: string;
+    /**
+     * display name of the app handling the protocol.
+     */
+    name: string;
+  }
+
+  interface AuthenticationResponseDetails {
+    url: string;
+  }
+
+  interface AuthInfo {
+    isProxy: boolean;
+    scheme: string;
+    host: string;
+    port: number;
+    realm: string;
+  }
+
+  interface AutoResizeOptions {
+    /**
+     * If `true`, the view's width will grow and shrink together with the window.
+     * `false` by default.
+     */
+    width?: boolean;
+    /**
+     * If `true`, the view's height will grow and shrink together with the window.
+     * `false` by default.
+     */
+    height?: boolean;
+    /**
+     * If `true`, the view's x position and width will grow and shrink proportionally
+     * with the window. `false` by default.
+     */
+    horizontal?: boolean;
+    /**
+     * If `true`, the view's y position and height will grow and shrink proportionally
+     * with the window. `false` by default.
+     */
+    vertical?: boolean;
+  }
+
+  interface BeforeSendResponse {
+    cancel?: boolean;
+    /**
+     * When provided, request will be made with these headers.
+     */
+    requestHeaders?: Record<string, (string) | (string[])>;
+  }
+
+  interface BitmapOptions {
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface BlinkMemoryInfo {
+    /**
+     * Size of all allocated objects in Kilobytes.
+     */
+    allocated: number;
+    /**
+     * Total allocated space in Kilobytes.
+     */
+    total: number;
+  }
+
+  interface BluetoothPairingHandlerHandlerDetails {
+    deviceId: string;
+    /**
+     * The type of pairing prompt being requested. One of the following values:
+     */
+    pairingKind: ('confirm' | 'confirmPin' | 'providePin');
+    frame: WebFrameMain;
+    /**
+     * The pin value to verify if `pairingKind` is `confirmPin`.
+     */
+    pin?: string;
+  }
+
+  interface BrowserViewConstructorOptions {
+    /**
+     * See BrowserWindow.
+     */
+    webPreferences?: WebPreferences;
+  }
+
+  interface BrowserWindowConstructorOptions {
+    /**
+     * Window's width in pixels. Default is `800`.
+     */
+    width?: number;
+    /**
+     * Window's height in pixels. Default is `600`.
+     */
+    height?: number;
+    /**
+     * (**required** if y is used) Window's left offset from screen. Default is to
+     * center the window.
+     */
+    x?: number;
+    /**
+     * (**required** if x is used) Window's top offset from screen. Default is to
+     * center the window.
+     */
+    y?: number;
+    /**
+     * The `width` and `height` would be used as web page's size, which means the
+     * actual window's size will include window frame's size and be slightly larger.
+     * Default is `false`.
+     */
+    useContentSize?: boolean;
+    /**
+     * Show window in the center of the screen. Default is `false`.
+     */
+    center?: boolean;
+    /**
+     * Window's minimum width. Default is `0`.
+     */
+    minWidth?: number;
+    /**
+     * Window's minimum height. Default is `0`.
+     */
+    minHeight?: number;
+    /**
+     * Window's maximum width. Default is no limit.
+     */
+    maxWidth?: number;
+    /**
+     * Window's maximum height. Default is no limit.
+     */
+    maxHeight?: number;
+    /**
+     * Whether window is resizable. Default is `true`.
+     */
+    resizable?: boolean;
+    /**
+     * Whether window is movable. This is not implemented on Linux. Default is `true`.
+     *
+     * @platform darwin,win32
+     */
+    movable?: boolean;
+    /**
+     * Whether window is minimizable. This is not implemented on Linux. Default is
+     * `true`.
+     *
+     * @platform darwin,win32
+     */
+    minimizable?: boolean;
+    /**
+     * Whether window is maximizable. This is not implemented on Linux. Default is
+     * `true`.
+     *
+     * @platform darwin,win32
+     */
+    maximizable?: boolean;
+    /**
+     * Whether window is closable. This is not implemented on Linux. Default is `true`.
+     *
+     * @platform darwin,win32
+     */
+    closable?: boolean;
+    /**
+     * Whether the window can be focused. Default is `true`. On Windows setting
+     * `focusable: false` also implies setting `skipTaskbar: true`. On Linux setting
+     * `focusable: false` makes the window stop interacting with wm, so the window will
+     * always stay on top in all workspaces.
+     */
+    focusable?: boolean;
+    /**
+     * Whether the window should always stay on top of other windows. Default is
+     * `false`.
+     */
+    alwaysOnTop?: boolean;
+    /**
+     * Whether the window should show in fullscreen. When explicitly set to `false` the
+     * fullscreen button will be hidden or disabled on macOS. Default is `false`.
+     */
+    fullscreen?: boolean;
+    /**
+     * Whether the window can be put into fullscreen mode. On macOS, also whether the
+     * maximize/zoom button should toggle full screen mode or maximize window. Default
+     * is `true`.
+     */
+    fullscreenable?: boolean;
+    /**
+     * Use pre-Lion fullscreen on macOS. Default is `false`.
+     *
+     * @platform darwin
+     */
+    simpleFullscreen?: boolean;
+    /**
+     * Whether to show the window in taskbar. Default is `false`.
+     *
+     * @platform darwin,win32
+     */
+    skipTaskbar?: boolean;
+    /**
+     * Whether the window is in kiosk mode. Default is `false`.
+     */
+    kiosk?: boolean;
+    /**
+     * Default window title. Default is `"Electron"`. If the HTML tag `<title>` is
+     * defined in the HTML file loaded by `loadURL()`, this property will be ignored.
+     */
+    title?: string;
+    /**
+     * The window icon. On Windows it is recommended to use `ICO` icons to get best
+     * visual effects, you can also leave it undefined so the executable's icon will be
+     * used.
+     */
+    icon?: (NativeImage) | (string);
+    /**
+     * Whether window should be shown when created. Default is `true`.
+     */
+    show?: boolean;
+    /**
+     * Whether the renderer should be active when `show` is `false` and it has just
+     * been created.  In order for `document.visibilityState` to work correctly on
+     * first load with `show: false` you should set this to `false`.  Setting this to
+     * `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
+     */
+    paintWhenInitiallyHidden?: boolean;
+    /**
+     * Specify `false` to create a frameless window. Default is `true`.
+     */
+    frame?: boolean;
+    /**
+     * Specify parent window. Default is `null`.
+     */
+    parent?: BrowserWindow;
+    /**
+     * Whether this is a modal window. This only works when the window is a child
+     * window. Default is `false`.
+     */
+    modal?: boolean;
+    /**
+     * Whether clicking an inactive window will also click through to the web contents.
+     * Default is `false` on macOS. This option is not configurable on other platforms.
+     *
+     * @platform darwin
+     */
+    acceptFirstMouse?: boolean;
+    /**
+     * Whether to hide cursor when typing. Default is `false`.
+     */
+    disableAutoHideCursor?: boolean;
+    /**
+     * Auto hide the menu bar unless the `Alt` key is pressed. Default is `false`.
+     */
+    autoHideMenuBar?: boolean;
+    /**
+     * Enable the window to be resized larger than screen. Only relevant for macOS, as
+     * other OSes allow larger-than-screen windows by default. Default is `false`.
+     *
+     * @platform darwin
+     */
+    enableLargerThanScreen?: boolean;
+    /**
+     * The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color
+     * format. Alpha in #AARRGGBB format is supported if `transparent` is set to
+     * `true`. Default is `#FFF` (white). See win.setBackgroundColor for more
+     * information.
+     */
+    backgroundColor?: string;
+    /**
+     * Whether window should have a shadow. Default is `true`.
+     */
+    hasShadow?: boolean;
+    /**
+     * Set the initial opacity of the window, between 0.0 (fully transparent) and 1.0
+     * (fully opaque). This is only implemented on Windows and macOS.
+     *
+     * @platform darwin,win32
+     */
+    opacity?: number;
+    /**
+     * Forces using dark theme for the window, only works on some GTK+3 desktop
+     * environments. Default is `false`.
+     */
+    darkTheme?: boolean;
+    /**
+     * Makes the window transparent. Default is `false`. On Windows, does not work
+     * unless the window is frameless.
+     */
+    transparent?: boolean;
+    /**
+     * The type of window, default is normal window. See more about this below.
+     */
+    type?: string;
+    /**
+     * Specify how the material appearance should reflect window activity state on
+     * macOS. Must be used with the `vibrancy` property. Possible values are:
+     *
+     * @platform darwin
+     */
+    visualEffectState?: ('followWindow' | 'active' | 'inactive');
+    /**
+     * The style of window title bar. Default is `default`. Possible values are:
+     *
+     * @platform darwin,win32
+     */
+    titleBarStyle?: ('default' | 'hidden' | 'hiddenInset' | 'customButtonsOnHover');
+    /**
+     * Set a custom position for the traffic light buttons in frameless windows.
+     *
+     * @platform darwin
+     */
+    trafficLightPosition?: Point;
+    /**
+     * Whether frameless window should have rounded corners on macOS. Default is
+     * `true`. Setting this property to `false` will prevent the window from being
+     * fullscreenable.
+     *
+     * @platform darwin
+     */
+    roundedCorners?: boolean;
+    /**
+     * Shows the title in the title bar in full screen mode on macOS for `hiddenInset`
+     * titleBarStyle. Default is `false`.
+     *
+     * @deprecated
+     * @platform darwin
+     */
+    fullscreenWindowTitle?: boolean;
+    /**
+     * Use `WS_THICKFRAME` style for frameless windows on Windows, which adds standard
+     * window frame. Setting it to `false` will remove window shadow and window
+     * animations. Default is `true`.
+     */
+    thickFrame?: boolean;
+    /**
+     * Add a type of vibrancy effect to the window, only on macOS. Can be
+     * `appearance-based`, `light`, `dark`, `titlebar`, `selection`, `menu`, `popover`,
+     * `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`,
+     * `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. Please
+     * note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark`
+     * are deprecated and have been removed in macOS Catalina (10.15).
+     *
+     * @platform darwin
+     */
+    vibrancy?: ('appearance-based' | 'light' | 'dark' | 'titlebar' | 'selection' | 'menu' | 'popover' | 'sidebar' | 'medium-light' | 'ultra-dark' | 'header' | 'sheet' | 'window' | 'hud' | 'fullscreen-ui' | 'tooltip' | 'content' | 'under-window' | 'under-page');
+    /**
+     * Controls the behavior on macOS when option-clicking the green stoplight button
+     * on the toolbar or by clicking the Window > Zoom menu item. If `true`, the window
+     * will grow to the preferred width of the web page when zoomed, `false` will cause
+     * it to zoom to the width of the screen. This will also affect the behavior when
+     * calling `maximize()` directly. Default is `false`.
+     *
+     * @platform darwin
+     */
+    zoomToPageWidth?: boolean;
+    /**
+     * Tab group name, allows opening the window as a native tab on macOS 10.12+.
+     * Windows with the same tabbing identifier will be grouped together. This also
+     * adds a native new tab button to your window's tab bar and allows your `app` and
+     * window to receive the `new-window-for-tab` event.
+     *
+     * @platform darwin
+     */
+    tabbingIdentifier?: string;
+    /**
+     * Settings of web page's features.
+     */
+    webPreferences?: WebPreferences;
+    /**
+     *  When using a frameless window in conjunction with
+     * `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so
+     * that the standard window controls ("traffic lights" on macOS) are visible, this
+     * property enables the Window Controls Overlay JavaScript APIs and CSS Environment
+     * Variables. Specifying `true` will result in an overlay with default system
+     * colors. Default is `false`.
+     */
+    titleBarOverlay?: (TitleBarOverlay) | (boolean);
+  }
+
+  interface CallbackResponse {
+    cancel?: boolean;
+    /**
+     * The original request is prevented from being sent or completed and is instead
+     * redirected to the given URL.
+     */
+    redirectURL?: string;
+  }
+
+  interface CertificateTrustDialogOptions {
+    /**
+     * The certificate to trust/import.
+     */
+    certificate: Certificate;
+    /**
+     * The message to display to the user.
+     */
+    message: string;
+  }
+
+  interface ClearCodeCachesOptions {
+    /**
+     * An array of url corresponding to the resource whose generated code cache needs
+     * to be removed. If the list is empty then all entries in the cache directory will
+     * be removed.
+     */
+    urls?: string[];
+  }
+
+  interface ClearStorageDataOptions {
+    /**
+     * Should follow `window.location.origin`’s representation `scheme://host:port`.
+     */
+    origin?: string;
+    /**
+     * The types of storages to clear, can contain: `appcache`, `cookies`,
+     * `filesystem`, `indexdb`, `localstorage`, `shadercache`, `websql`,
+     * `serviceworkers`, `cachestorage`. If not specified, clear all storage types.
+     */
+    storages?: string[];
+    /**
+     * The types of quotas to clear, can contain: `temporary`, `persistent`,
+     * `syncable`. If not specified, clear all quotas.
+     */
+    quotas?: string[];
+  }
+
+  interface ClientRequestConstructorOptions {
+    /**
+     * The HTTP request method. Defaults to the GET method.
+     */
+    method?: string;
+    /**
+     * The request URL. Must be provided in the absolute form with the protocol scheme
+     * specified as http or https.
+     */
+    url?: string;
+    /**
+     * The `Session` instance with which the request is associated.
+     */
+    session?: Session;
+    /**
+     * The name of the `partition` with which the request is associated. Defaults to
+     * the empty string. The `session` option supersedes `partition`. Thus if a
+     * `session` is explicitly specified, `partition` is ignored.
+     */
+    partition?: string;
+    /**
+     * Can be `include` or `omit`. Whether to send credentials with this request. If
+     * set to `include`, credentials from the session associated with the request will
+     * be used. If set to `omit`, credentials will not be sent with the request (and
+     * the `'login'` event will not be triggered in the event of a 401). This matches
+     * the behavior of the fetch option of the same name. If this option is not
+     * specified, authentication data from the session will be sent, and cookies will
+     * not be sent (unless `useSessionCookies` is set).
+     */
+    credentials?: ('include' | 'omit');
+    /**
+     * Whether to send cookies with this request from the provided session. If
+     * `credentials` is specified, this option has no effect. Default is `false`.
+     */
+    useSessionCookies?: boolean;
+    /**
+     * Can be `http:` or `https:`. The protocol scheme in the form 'scheme:'. Defaults
+     * to 'http:'.
+     */
+    protocol?: string;
+    /**
+     * The server host provided as a concatenation of the hostname and the port number
+     * 'hostname:port'.
+     */
+    host?: string;
+    /**
+     * The server host name.
+     */
+    hostname?: string;
+    /**
+     * The server's listening port number.
+     */
+    port?: number;
+    /**
+     * The path part of the request URL.
+     */
+    path?: string;
+    /**
+     * Can be `follow`, `error` or `manual`. The redirect mode for this request. When
+     * mode is `error`, any redirection will be aborted. When mode is `manual` the
+     * redirection will be cancelled unless `request.followRedirect` is invoked
+     * synchronously during the `redirect` event.  Defaults to `follow`.
+     */
+    redirect?: ('follow' | 'error' | 'manual');
+    /**
+     * The origin URL of the request.
+     */
+    origin?: string;
+  }
+
+  interface Config {
+    /**
+     * The proxy mode. Should be one of `direct`, `auto_detect`, `pac_script`,
+     * `fixed_servers` or `system`. If it's unspecified, it will be automatically
+     * determined based on other specified options.
+     */
+    mode?: ('direct' | 'auto_detect' | 'pac_script' | 'fixed_servers' | 'system');
+    /**
+     * The URL associated with the PAC file.
+     */
+    pacScript?: string;
+    /**
+     * Rules indicating which proxies to use.
+     */
+    proxyRules?: string;
+    /**
+     * Rules indicating which URLs should bypass the proxy settings.
+     */
+    proxyBypassRules?: string;
+  }
+
+  interface ConfigureHostResolverOptions {
+    /**
+     * Whether the built-in host resolver is used in preference to getaddrinfo. When
+     * enabled, the built-in resolver will attempt to use the system's DNS settings to
+     * do DNS lookups itself. Enabled by default on macOS, disabled by default on
+     * Windows and Linux.
+     */
+    enableBuiltInResolver?: boolean;
+    /**
+     * Can be "off", "automatic" or "secure". Configures the DNS-over-HTTP mode. When
+     * "off", no DoH lookups will be performed. When "automatic", DoH lookups will be
+     * performed first if DoH is available, and insecure DNS lookups will be performed
+     * as a fallback. When "secure", only DoH lookups will be performed. Defaults to
+     * "automatic".
+     */
+    secureDnsMode?: string;
+    /**
+     * A list of DNS-over-HTTP server templates. See RFC8484 § 3 for details on the
+     * template format. Most servers support the POST method; the template for such
+     * servers is simply a URI. Note that for some DNS providers, the resolver will
+     * automatically upgrade to DoH unless DoH is explicitly disabled, even if there
+     * are no DoH servers provided in this list.
+     */
+    secureDnsServers?: string[];
+    /**
+     * Controls whether additional DNS query types, e.g. HTTPS (DNS type 65) will be
+     * allowed besides the traditional A and AAAA queries when a request is being made
+     * via insecure DNS. Has no effect on Secure DNS which always allows additional
+     * types. Defaults to true.
+     */
+    enableAdditionalDnsQueryTypes?: boolean;
+  }
+
+  interface ConsoleMessageEvent extends Event {
+    /**
+     * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+     * `error`.
+     */
+    level: number;
+    /**
+     * The actual console message
+     */
+    message: string;
+    /**
+     * The line number of the source that triggered this console message
+     */
+    line: number;
+    sourceId: string;
+  }
+
+  interface ContextMenuEvent extends Event {
+    params: Params;
+  }
+
+  interface ContextMenuParams {
+    /**
+     * x coordinate.
+     */
+    x: number;
+    /**
+     * y coordinate.
+     */
+    y: number;
+    /**
+     * Frame from which the context menu was invoked.
+     */
+    frame: WebFrameMain;
+    /**
+     * URL of the link that encloses the node the context menu was invoked on.
+     */
+    linkURL: string;
+    /**
+     * Text associated with the link. May be an empty string if the contents of the
+     * link are an image.
+     */
+    linkText: string;
+    /**
+     * URL of the top level page that the context menu was invoked on.
+     */
+    pageURL: string;
+    /**
+     * URL of the subframe that the context menu was invoked on.
+     */
+    frameURL: string;
+    /**
+     * Source URL for the element that the context menu was invoked on. Elements with
+     * source URLs are images, audio and video.
+     */
+    srcURL: string;
+    /**
+     * Type of the node the context menu was invoked on. Can be `none`, `image`,
+     * `audio`, `video`, `canvas`, `file` or `plugin`.
+     */
+    mediaType: ('none' | 'image' | 'audio' | 'video' | 'canvas' | 'file' | 'plugin');
+    /**
+     * Whether the context menu was invoked on an image which has non-empty contents.
+     */
+    hasImageContents: boolean;
+    /**
+     * Whether the context is editable.
+     */
+    isEditable: boolean;
+    /**
+     * Text of the selection that the context menu was invoked on.
+     */
+    selectionText: string;
+    /**
+     * Title text of the selection that the context menu was invoked on.
+     */
+    titleText: string;
+    /**
+     * Alt text of the selection that the context menu was invoked on.
+     */
+    altText: string;
+    /**
+     * Suggested filename to be used when saving file through 'Save Link As' option of
+     * context menu.
+     */
+    suggestedFilename: string;
+    /**
+     * Rect representing the coordinates in the document space of the selection.
+     */
+    selectionRect: Rectangle;
+    /**
+     * Start position of the selection text.
+     */
+    selectionStartOffset: number;
+    /**
+     * The referrer policy of the frame on which the menu is invoked.
+     */
+    referrerPolicy: Referrer;
+    /**
+     * The misspelled word under the cursor, if any.
+     */
+    misspelledWord: string;
+    /**
+     * An array of suggested words to show the user to replace the `misspelledWord`.
+     * Only available if there is a misspelled word and spellchecker is enabled.
+     */
+    dictionarySuggestions: string[];
+    /**
+     * The character encoding of the frame on which the menu was invoked.
+     */
+    frameCharset: string;
+    /**
+     * If the context menu was invoked on an input field, the type of that field.
+     * Possible values are `none`, `plainText`, `password`, `other`.
+     */
+    inputFieldType: string;
+    /**
+     * If the context is editable, whether or not spellchecking is enabled.
+     */
+    spellcheckEnabled: boolean;
+    /**
+     * Input source that invoked the context menu. Can be `none`, `mouse`, `keyboard`,
+     * `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`,
+     * `adjustSelection`, or `adjustSelectionReset`.
+     */
+    menuSourceType: ('none' | 'mouse' | 'keyboard' | 'touch' | 'touchMenu' | 'longPress' | 'longTap' | 'touchHandle' | 'stylus' | 'adjustSelection' | 'adjustSelectionReset');
+    /**
+     * The flags for the media element the context menu was invoked on.
+     */
+    mediaFlags: MediaFlags;
+    /**
+     * These flags indicate whether the renderer believes it is able to perform the
+     * corresponding action.
+     */
+    editFlags: EditFlags;
+  }
+
+  interface ContinueActivityDetails {
+    /**
+     * A string identifying the URL of the webpage accessed by the activity on another
+     * device, if available.
+     */
+    webpageURL?: string;
+  }
+
+  interface CookiesGetFilter {
+    /**
+     * Retrieves cookies which are associated with `url`. Empty implies retrieving
+     * cookies of all URLs.
+     */
+    url?: string;
+    /**
+     * Filters cookies by name.
+     */
+    name?: string;
+    /**
+     * Retrieves cookies whose domains match or are subdomains of `domains`.
+     */
+    domain?: string;
+    /**
+     * Retrieves cookies whose path matches `path`.
+     */
+    path?: string;
+    /**
+     * Filters cookies by their Secure property.
+     */
+    secure?: boolean;
+    /**
+     * Filters out session or persistent cookies.
+     */
+    session?: boolean;
+  }
+
+  interface CookiesSetDetails {
+    /**
+     * The URL to associate the cookie with. The promise will be rejected if the URL is
+     * invalid.
+     */
+    url: string;
+    /**
+     * The name of the cookie. Empty by default if omitted.
+     */
+    name?: string;
+    /**
+     * The value of the cookie. Empty by default if omitted.
+     */
+    value?: string;
+    /**
+     * The domain of the cookie; this will be normalized with a preceding dot so that
+     * it's also valid for subdomains. Empty by default if omitted.
+     */
+    domain?: string;
+    /**
+     * The path of the cookie. Empty by default if omitted.
+     */
+    path?: string;
+    /**
+     * Whether the cookie should be marked as Secure. Defaults to false unless Same
+     * Site=None attribute is used.
+     */
+    secure?: boolean;
+    /**
+     * Whether the cookie should be marked as HTTP only. Defaults to false.
+     */
+    httpOnly?: boolean;
+    /**
+     * The expiration date of the cookie as the number of seconds since the UNIX epoch.
+     * If omitted then the cookie becomes a session cookie and will not be retained
+     * between sessions.
+     */
+    expirationDate?: number;
+    /**
+     * The Same Site policy to apply to this cookie.  Can be `unspecified`,
+     * `no_restriction`, `lax` or `strict`.  Default is `lax`.
+     */
+    sameSite?: ('unspecified' | 'no_restriction' | 'lax' | 'strict');
+  }
+
+  interface CrashReporterStartOptions {
+    /**
+     * URL that crash reports will be sent to as POST. Required unless `uploadToServer`
+     * is `false`.
+     */
+    submitURL?: string;
+    /**
+     * Defaults to `app.name`.
+     */
+    productName?: string;
+    /**
+     * Deprecated alias for `{ globalExtra: { _companyName: ... } }`.
+     *
+     * @deprecated
+     */
+    companyName?: string;
+    /**
+     * Whether crash reports should be sent to the server. If false, crash reports will
+     * be collected and stored in the crashes directory, but not uploaded. Default is
+     * `true`.
+     */
+    uploadToServer?: boolean;
+    /**
+     * If true, crashes generated in the main process will not be forwarded to the
+     * system crash handler. Default is `false`.
+     */
+    ignoreSystemCrashHandler?: boolean;
+    /**
+     * If true, limit the number of crashes uploaded to 1/hour. Default is `false`.
+     *
+     * @platform darwin,win32
+     */
+    rateLimit?: boolean;
+    /**
+     * If true, crash reports will be compressed and uploaded with `Content-Encoding:
+     * gzip`. Default is `true`.
+     */
+    compress?: boolean;
+    /**
+     * Extra string key/value annotations that will be sent along with crash reports
+     * that are generated in the main process. Only string values are supported.
+     * Crashes generated in child processes will not contain these extra parameters to
+     * crash reports generated from child processes, call `addExtraParameter` from the
+     * child process.
+     */
+    extra?: Record<string, string>;
+    /**
+     * Extra string key/value annotations that will be sent along with any crash
+     * reports generated in any process. These annotations cannot be changed once the
+     * crash reporter has been started. If a key is present in both the global extra
+     * parameters and the process-specific extra parameters, then the global one will
+     * take precedence. By default, `productName` and the app version are included, as
+     * well as the Electron version.
+     */
+    globalExtra?: Record<string, string>;
+  }
+
+  interface CreateFromBitmapOptions {
+    width: number;
+    height: number;
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface CreateFromBufferOptions {
+    /**
+     * Required for bitmap buffers.
+     */
+    width?: number;
+    /**
+     * Required for bitmap buffers.
+     */
+    height?: number;
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface CreateInterruptedDownloadOptions {
+    /**
+     * Absolute path of the download.
+     */
+    path: string;
+    /**
+     * Complete URL chain for the download.
+     */
+    urlChain: string[];
+    mimeType?: string;
+    /**
+     * Start range for the download.
+     */
+    offset: number;
+    /**
+     * Total length of the download.
+     */
+    length: number;
+    /**
+     * Last-Modified header value.
+     */
+    lastModified?: string;
+    /**
+     * ETag header value.
+     */
+    eTag?: string;
+    /**
+     * Time when download was started in number of seconds since UNIX epoch.
+     */
+    startTime?: number;
+  }
+
+  interface Data {
+    text?: string;
+    html?: string;
+    image?: NativeImage;
+    rtf?: string;
+    /**
+     * The title of the URL at `text`.
+     */
+    bookmark?: string;
+  }
+
+  interface Details {
+    /**
+     * Process type. One of the following values:
+     */
+    type: ('Utility' | 'Zygote' | 'Sandbox helper' | 'GPU' | 'Pepper Plugin' | 'Pepper Plugin Broker' | 'Unknown');
+    /**
+     * The reason the child process is gone. Possible values:
+     */
+    reason: ('clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure');
+    /**
+     * The exit code for the process (e.g. status from waitpid if on posix, from
+     * GetExitCodeProcess on Windows).
+     */
+    exitCode: number;
+    /**
+     * The non-localized name of the process.
+     */
+    serviceName?: string;
+    /**
+     * The name of the process. Examples for utility: `Audio Service`, `Content
+     * Decryption Module Service`, `Network Service`, `Video Capture`, etc.
+     */
+    name?: string;
+  }
+
+  interface DevicePermissionHandlerHandlerDetails {
+    /**
+     * The type of device that permission is being requested on, can be `hid` or
+     * `serial`.
+     */
+    deviceType: ('hid' | 'serial');
+    /**
+     * The origin URL of the device permission check.
+     */
+    origin: string;
+    /**
+     * the device that permission is being requested for.
+     */
+    device: (HIDDevice) | (SerialPort);
+  }
+
+  interface DidChangeThemeColorEvent extends Event {
+    themeColor: string;
+  }
+
+  interface DidCreateWindowDetails {
+    /**
+     * URL for the created window.
+     */
+    url: string;
+    /**
+     * Name given to the created window in the `window.open()` call.
+     */
+    frameName: string;
+    /**
+     * The options used to create the BrowserWindow. They are merged in increasing
+     * precedence: parsed options from the `features` string from `window.open()`,
+     * security-related webPreferences inherited from the parent, and options given by
+     * `webContents.setWindowOpenHandler`. Unrecognized options are not filtered out.
+     */
+    options: BrowserWindowConstructorOptions;
+    /**
+     * The referrer that will be passed to the new window. May or may not result in the
+     * `Referer` header being sent, depending on the referrer policy.
+     */
+    referrer: Referrer;
+    /**
+     * The post data that will be sent to the new window, along with the appropriate
+     * headers that will be set. If no post data is to be sent, the value will be
+     * `null`. Only defined when the window is being created by a form that set
+     * `target=_blank`.
+     */
+    postBody?: PostBody;
+    /**
+     * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+     * `save-to-disk` and `other`.
+     */
+    disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other');
+  }
+
+  interface DidFailLoadEvent extends Event {
+    errorCode: number;
+    errorDescription: string;
+    validatedURL: string;
+    isMainFrame: boolean;
+  }
+
+  interface DidFrameFinishLoadEvent extends Event {
+    isMainFrame: boolean;
+  }
+
+  interface DidFrameNavigateEvent extends Event {
+    url: string;
+    /**
+     * -1 for non HTTP navigations
+     */
+    httpResponseCode: number;
+    /**
+     * empty for non HTTP navigations,
+     */
+    httpStatusText: string;
+    isMainFrame: boolean;
+    frameProcessId: number;
+    frameRoutingId: number;
+  }
+
+  interface DidNavigateEvent extends Event {
+    url: string;
+  }
+
+  interface DidNavigateInPageEvent extends Event {
+    isMainFrame: boolean;
+    url: string;
+  }
+
+  interface DidRedirectNavigationEvent extends Event {
+    url: string;
+    isInPlace: boolean;
+    isMainFrame: boolean;
+    frameProcessId: number;
+    frameRoutingId: number;
+  }
+
+  interface DidStartNavigationEvent extends Event {
+    url: string;
+    isInPlace: boolean;
+    isMainFrame: boolean;
+    frameProcessId: number;
+    frameRoutingId: number;
+  }
+
+  interface DisplayBalloonOptions {
+    /**
+     * Icon to use when `iconType` is `custom`.
+     */
+    icon?: (NativeImage) | (string);
+    /**
+     * Can be `none`, `info`, `warning`, `error` or `custom`. Default is `custom`.
+     */
+    iconType?: ('none' | 'info' | 'warning' | 'error' | 'custom');
+    title: string;
+    content: string;
+    /**
+     * The large version of the icon should be used. Default is `true`. Maps to
+     * `NIIF_LARGE_ICON`.
+     */
+    largeIcon?: boolean;
+    /**
+     * Do not play the associated sound. Default is `false`. Maps to `NIIF_NOSOUND`.
+     */
+    noSound?: boolean;
+    /**
+     * Do not display the balloon notification if the current user is in "quiet time".
+     * Default is `false`. Maps to `NIIF_RESPECT_QUIET_TIME`.
+     */
+    respectQuietTime?: boolean;
+  }
+
+  interface EnableNetworkEmulationOptions {
+    /**
+     * Whether to emulate network outage. Defaults to false.
+     */
+    offline?: boolean;
+    /**
+     * RTT in ms. Defaults to 0 which will disable latency throttling.
+     */
+    latency?: number;
+    /**
+     * Download rate in Bps. Defaults to 0 which will disable download throttling.
+     */
+    downloadThroughput?: number;
+    /**
+     * Upload rate in Bps. Defaults to 0 which will disable upload throttling.
+     */
+    uploadThroughput?: number;
+  }
+
+  interface FeedURLOptions {
+    url: string;
+    /**
+     * HTTP request headers.
+     *
+     * @platform darwin
+     */
+    headers?: Record<string, string>;
+    /**
+     * Can be `json` or `default`, see the Squirrel.Mac README for more information.
+     *
+     * @platform darwin
+     */
+    serverType?: ('json' | 'default');
+  }
+
+  interface FileIconOptions {
+    size: ('small' | 'normal' | 'large');
+  }
+
+  interface FindInPageOptions {
+    /**
+     * Whether to search forward or backward, defaults to `true`.
+     */
+    forward?: boolean;
+    /**
+     * Whether to begin a new text finding session with this request. Should be `true`
+     * for initial requests, and `false` for follow-up requests. Defaults to `false`.
+     */
+    findNext?: boolean;
+    /**
+     * Whether search should be case-sensitive, defaults to `false`.
+     */
+    matchCase?: boolean;
+  }
+
+  interface FocusOptions {
+    /**
+     * Make the receiver the active app even if another app is currently active.
+     *
+     * @platform darwin
+     */
+    steal: boolean;
+  }
+
+  interface FoundInPageEvent extends Event {
+    result: FoundInPageResult;
+  }
+
+  interface FrameCreatedDetails {
+    frame: WebFrameMain;
+  }
+
+  interface FromPartitionOptions {
+    /**
+     * Whether to enable cache.
+     */
+    cache: boolean;
+  }
+
+  interface HandlerDetails {
+    /**
+     * The _resolved_ version of the URL passed to `window.open()`. e.g. opening a
+     * window with `window.open('foo')` will yield something like
+     * `https://the-origin/the/current/path/foo`.
+     */
+    url: string;
+    /**
+     * Name of the window provided in `window.open()`
+     */
+    frameName: string;
+    /**
+     * Comma separated list of window features provided to `window.open()`.
+     */
+    features: string;
+    /**
+     * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+     * `save-to-disk` or `other`.
+     */
+    disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other');
+    /**
+     * The referrer that will be passed to the new window. May or may not result in the
+     * `Referer` header being sent, depending on the referrer policy.
+     */
+    referrer: Referrer;
+    /**
+     * The post data that will be sent to the new window, along with the appropriate
+     * headers that will be set. If no post data is to be sent, the value will be
+     * `null`. Only defined when the window is being created by a form that set
+     * `target=_blank`.
+     */
+    postBody?: PostBody;
+  }
+
+  interface HeadersReceivedResponse {
+    cancel?: boolean;
+    /**
+     * When provided, the server is assumed to have responded with these headers.
+     */
+    responseHeaders?: Record<string, (string) | (string[])>;
+    /**
+     * Should be provided when overriding `responseHeaders` to change header status
+     * otherwise original response header's status will be used.
+     */
+    statusLine?: string;
+  }
+
+  interface HeapStatistics {
+    totalHeapSize: number;
+    totalHeapSizeExecutable: number;
+    totalPhysicalSize: number;
+    totalAvailableSize: number;
+    usedHeapSize: number;
+    heapSizeLimit: number;
+    mallocedMemory: number;
+    peakMallocedMemory: number;
+    doesZapGarbage: boolean;
+  }
+
+  interface HidDeviceAddedDetails {
+    device: HIDDevice[];
+    frame: WebFrameMain;
+  }
+
+  interface HidDeviceRemovedDetails {
+    device: HIDDevice[];
+    frame: WebFrameMain;
+  }
+
+  interface HidDeviceRevokedDetails {
+    device: HIDDevice[];
+    /**
+     * The origin that the device has been revoked from.
+     */
+    origin?: string;
+  }
+
+  interface IgnoreMouseEventsOptions {
+    /**
+     * If true, forwards mouse move messages to Chromium, enabling mouse related events
+     * such as `mouseleave`. Only used when `ignore` is true. If `ignore` is false,
+     * forwarding is always disabled regardless of this value.
+     *
+     * @platform darwin,win32
+     */
+    forward?: boolean;
+  }
+
+  interface ImportCertificateOptions {
+    /**
+     * Path for the pkcs12 file.
+     */
+    certificate: string;
+    /**
+     * Passphrase for the certificate.
+     */
+    password: string;
+  }
+
+  interface Info {
+    /**
+     * Security origin for the isolated world.
+     */
+    securityOrigin?: string;
+    /**
+     * Content Security Policy for the isolated world.
+     */
+    csp?: string;
+    /**
+     * Name for isolated world. Useful in devtools.
+     */
+    name?: string;
+  }
+
+  interface Input {
+    /**
+     * Either `keyUp` or `keyDown`.
+     */
+    type: string;
+    /**
+     * Equivalent to KeyboardEvent.key.
+     */
+    key: string;
+    /**
+     * Equivalent to KeyboardEvent.code.
+     */
+    code: string;
+    /**
+     * Equivalent to KeyboardEvent.repeat.
+     */
+    isAutoRepeat: boolean;
+    /**
+     * Equivalent to KeyboardEvent.isComposing.
+     */
+    isComposing: boolean;
+    /**
+     * Equivalent to KeyboardEvent.shiftKey.
+     */
+    shift: boolean;
+    /**
+     * Equivalent to KeyboardEvent.controlKey.
+     */
+    control: boolean;
+    /**
+     * Equivalent to KeyboardEvent.altKey.
+     */
+    alt: boolean;
+    /**
+     * Equivalent to KeyboardEvent.metaKey.
+     */
+    meta: boolean;
+    /**
+     * Equivalent to KeyboardEvent.location.
+     */
+    location: number;
+    /**
+     * See InputEvent.modifiers.
+     */
+    modifiers: string[];
+  }
+
+  interface InsertCSSOptions {
+    /**
+     * Can be either 'user' or 'author'. Sets the cascade origin of the inserted
+     * stylesheet. Default is 'author'.
+     */
+    cssOrigin?: string;
+  }
+
+  interface IpcMessageEvent extends Event {
+    /**
+     * pair of `[processId, frameId]`.
+     */
+    frameId: [number, number];
+    channel: string;
+    args: any[];
+  }
+
+  interface Item {
+    /**
+     * The path to the file being dragged.
+     */
+    file: string;
+    /**
+     * The paths to the files being dragged. (`files` will override `file` field)
+     */
+    files?: string[];
+    /**
+     * The image must be non-empty on macOS.
+     */
+    icon: (NativeImage) | (string);
+  }
+
+  interface JumpListSettings {
+    /**
+     * The minimum number of items that will be shown in the Jump List (for a more
+     * detailed description of this value see the MSDN docs).
+     */
+    minItems: number;
+    /**
+     * Array of `JumpListItem` objects that correspond to items that the user has
+     * explicitly removed from custom categories in the Jump List. These items must not
+     * be re-added to the Jump List in the **next** call to `app.setJumpList()`,
+     * Windows will not display any custom category that contains any of the removed
+     * items.
+     */
+    removedItems: JumpListItem[];
+  }
+
+  interface LoadCommitEvent extends Event {
+    url: string;
+    isMainFrame: boolean;
+  }
+
+  interface LoadExtensionOptions {
+    /**
+     * Whether to allow the extension to read local files over `file://` protocol and
+     * inject content scripts into `file://` pages. This is required e.g. for loading
+     * devtools extensions on `file://` URLs. Defaults to false.
+     */
+    allowFileAccess: boolean;
+  }
+
+  interface LoadFileOptions {
+    /**
+     * Passed to `url.format()`.
+     */
+    query?: Record<string, string>;
+    /**
+     * Passed to `url.format()`.
+     */
+    search?: string;
+    /**
+     * Passed to `url.format()`.
+     */
+    hash?: string;
+  }
+
+  interface LoadURLOptions {
+    /**
+     * An HTTP Referrer url.
+     */
+    httpReferrer?: (string) | (Referrer);
+    /**
+     * A user agent originating the request.
+     */
+    userAgent?: string;
+    /**
+     * Extra headers separated by "\n"
+     */
+    extraHeaders?: string;
+    postData?: Array<(UploadRawData) | (UploadFile)>;
+    /**
+     * Base url (with trailing path separator) for files to be loaded by the data url.
+     * This is needed only if the specified `url` is a data url and needs to load other
+     * files.
+     */
+    baseURLForDataURL?: string;
+  }
+
+  interface LoginItemSettings {
+    /**
+     * `true` if the app is set to open at login.
+     */
+    openAtLogin: boolean;
+    /**
+     * `true` if the app is set to open as hidden at login. This setting is not
+     * available on MAS builds.
+     *
+     * @platform darwin
+     */
+    openAsHidden: boolean;
+    /**
+     * `true` if the app was opened at login automatically. This setting is not
+     * available on MAS builds.
+     *
+     * @platform darwin
+     */
+    wasOpenedAtLogin: boolean;
+    /**
+     * `true` if the app was opened as a hidden login item. This indicates that the app
+     * should not open any windows at startup. This setting is not available on MAS
+     * builds.
+     *
+     * @platform darwin
+     */
+    wasOpenedAsHidden: boolean;
+    /**
+     * `true` if the app was opened as a login item that should restore the state from
+     * the previous session. This indicates that the app should restore the windows
+     * that were open the last time the app was closed. This setting is not available
+     * on MAS builds.
+     *
+     * @platform darwin
+     */
+    restoreState: boolean;
+    /**
+     * `true` if app is set to open at login and its run key is not deactivated. This
+     * differs from `openAtLogin` as it ignores the `args` option, this property will
+     * be true if the given executable would be launched at login with **any**
+     * arguments.
+     *
+     * @platform win32
+     */
+    executableWillLaunchAtLogin: boolean;
+    launchItems: LaunchItems[];
+  }
+
+  interface LoginItemSettingsOptions {
+    /**
+     * The executable path to compare against. Defaults to `process.execPath`.
+     *
+     * @platform win32
+     */
+    path?: string;
+    /**
+     * The command-line arguments to compare against. Defaults to an empty array.
+     *
+     * @platform win32
+     */
+    args?: string[];
+  }
+
+  interface MenuItemConstructorOptions {
+    /**
+     * Will be called with `click(menuItem, browserWindow, event)` when the menu item
+     * is clicked.
+     */
+    click?: (menuItem: MenuItem, browserWindow: (BrowserWindow) | (undefined), event: KeyboardEvent) => void;
+    /**
+     * Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`,
+     * `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`,
+     * `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`,
+     * `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`,
+     * 'showSubstitutions', 'toggleSmartQuotes', 'toggleSmartDashes',
+     * 'toggleTextReplacement', `startSpeaking`, `stopSpeaking`, `zoom`, `front`,
+     * `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`,
+     * `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`,
+     * `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action
+     * of the menu item, when specified the `click` property will be ignored. See
+     * roles.
+     */
+    role?: ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteAndMatchStyle' | 'delete' | 'selectAll' | 'reload' | 'forceReload' | 'toggleDevTools' | 'resetZoom' | 'zoomIn' | 'zoomOut' | 'toggleSpellChecker' | 'togglefullscreen' | 'window' | 'minimize' | 'close' | 'help' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit' | 'showSubstitutions' | 'toggleSmartQuotes' | 'toggleSmartDashes' | 'toggleTextReplacement' | 'startSpeaking' | 'stopSpeaking' | 'zoom' | 'front' | 'appMenu' | 'fileMenu' | 'editMenu' | 'viewMenu' | 'shareMenu' | 'recentDocuments' | 'toggleTabBar' | 'selectNextTab' | 'selectPreviousTab' | 'mergeAllWindows' | 'clearRecentDocuments' | 'moveTabToNewWindow' | 'windowMenu');
+    /**
+     * Can be `normal`, `separator`, `submenu`, `checkbox` or `radio`.
+     */
+    type?: ('normal' | 'separator' | 'submenu' | 'checkbox' | 'radio');
+    label?: string;
+    sublabel?: string;
+    /**
+     * Hover text for this menu item.
+     *
+     * @platform darwin
+     */
+    toolTip?: string;
+    accelerator?: Accelerator;
+    icon?: (NativeImage) | (string);
+    /**
+     * If false, the menu item will be greyed out and unclickable.
+     */
+    enabled?: boolean;
+    /**
+     * default is `true`, and when `false` will prevent the accelerator from triggering
+     * the item if the item is not visible`.
+     *
+     * @platform darwin
+     */
+    acceleratorWorksWhenHidden?: boolean;
+    /**
+     * If false, the menu item will be entirely hidden.
+     */
+    visible?: boolean;
+    /**
+     * Should only be specified for `checkbox` or `radio` type menu items.
+     */
+    checked?: boolean;
+    /**
+     * If false, the accelerator won't be registered with the system, but it will still
+     * be displayed. Defaults to true.
+     *
+     * @platform linux,win32
+     */
+    registerAccelerator?: boolean;
+    /**
+     * The item to share when the `role` is `shareMenu`.
+     *
+     * @platform darwin
+     */
+    sharingItem?: SharingItem;
+    /**
+     * Should be specified for `submenu` type menu items. If `submenu` is specified,
+     * the `type: 'submenu'` can be omitted. If the value is not a `Menu` then it will
+     * be automatically converted to one using `Menu.buildFromTemplate`.
+     */
+    submenu?: (MenuItemConstructorOptions[]) | (Menu);
+    /**
+     * Unique within a single menu. If defined then it can be used as a reference to
+     * this item by the position attribute.
+     */
+    id?: string;
+    /**
+     * Inserts this item before the item with the specified label. If the referenced
+     * item doesn't exist the item will be inserted at the end of  the menu. Also
+     * implies that the menu item in question should be placed in the same “group” as
+     * the item.
+     */
+    before?: string[];
+    /**
+     * Inserts this item after the item with the specified label. If the referenced
+     * item doesn't exist the item will be inserted at the end of the menu.
+     */
+    after?: string[];
+    /**
+     * Provides a means for a single context menu to declare the placement of their
+     * containing group before the containing group of the item with the specified
+     * label.
+     */
+    beforeGroupContaining?: string[];
+    /**
+     * Provides a means for a single context menu to declare the placement of their
+     * containing group after the containing group of the item with the specified
+     * label.
+     */
+    afterGroupContaining?: string[];
+  }
+
+  interface MessageBoxOptions {
+    /**
+     * Content of the message box.
+     */
+    message: string;
+    /**
+     * Can be `"none"`, `"info"`, `"error"`, `"question"` or `"warning"`. On Windows,
+     * `"question"` displays the same icon as `"info"`, unless you set an icon using
+     * the `"icon"` option. On macOS, both `"warning"` and `"error"` display the same
+     * warning icon.
+     */
+    type?: string;
+    /**
+     * Array of texts for buttons. On Windows, an empty array will result in one button
+     * labeled "OK".
+     */
+    buttons?: string[];
+    /**
+     * Index of the button in the buttons array which will be selected by default when
+     * the message box opens.
+     */
+    defaultId?: number;
+    /**
+     * Pass an instance of AbortSignal to optionally close the message box, the message
+     * box will behave as if it was cancelled by the user. On macOS, `signal` does not
+     * work with message boxes that do not have a parent window, since those message
+     * boxes run synchronously due to platform limitations.
+     */
+    signal?: AbortSignal;
+    /**
+     * Title of the message box, some platforms will not show it.
+     */
+    title?: string;
+    /**
+     * Extra information of the message.
+     */
+    detail?: string;
+    /**
+     * If provided, the message box will include a checkbox with the given label.
+     */
+    checkboxLabel?: string;
+    /**
+     * Initial checked state of the checkbox. `false` by default.
+     */
+    checkboxChecked?: boolean;
+    icon?: (NativeImage) | (string);
+    /**
+     * Custom width of the text in the message box.
+     *
+     * @platform darwin
+     */
+    textWidth?: number;
+    /**
+     * The index of the button to be used to cancel the dialog, via the `Esc` key. By
+     * default this is assigned to the first button with "cancel" or "no" as the label.
+     * If no such labeled buttons exist and this option is not set, `0` will be used as
+     * the return value.
+     */
+    cancelId?: number;
+    /**
+     * On Windows Electron will try to figure out which one of the `buttons` are common
+     * buttons (like "Cancel" or "Yes"), and show the others as command links in the
+     * dialog. This can make the dialog appear in the style of modern Windows apps. If
+     * you don't like this behavior, you can set `noLink` to `true`.
+     */
+    noLink?: boolean;
+    /**
+     * Normalize the keyboard access keys across platforms. Default is `false`.
+     * Enabling this assumes `&` is used in the button labels for the placement of the
+     * keyboard shortcut access key and labels will be converted so they work correctly
+     * on each platform, `&` characters are removed on macOS, converted to `_` on
+     * Linux, and left untouched on Windows. For example, a button label of `Vie&w`
+     * will be converted to `Vie_w` on Linux and `View` on macOS and can be selected
+     * via `Alt-W` on Windows and Linux.
+     */
+    normalizeAccessKeys?: boolean;
+  }
+
+  interface MessageBoxReturnValue {
+    /**
+     * The index of the clicked button.
+     */
+    response: number;
+    /**
+     * The checked state of the checkbox if `checkboxLabel` was set. Otherwise `false`.
+     */
+    checkboxChecked: boolean;
+  }
+
+  interface MessageBoxSyncOptions {
+    /**
+     * Content of the message box.
+     */
+    message: string;
+    /**
+     * Can be `"none"`, `"info"`, `"error"`, `"question"` or `"warning"`. On Windows,
+     * `"question"` displays the same icon as `"info"`, unless you set an icon using
+     * the `"icon"` option. On macOS, both `"warning"` and `"error"` display the same
+     * warning icon.
+     */
+    type?: string;
+    /**
+     * Array of texts for buttons. On Windows, an empty array will result in one button
+     * labeled "OK".
+     */
+    buttons?: string[];
+    /**
+     * Index of the button in the buttons array which will be selected by default when
+     * the message box opens.
+     */
+    defaultId?: number;
+    /**
+     * Title of the message box, some platforms will not show it.
+     */
+    title?: string;
+    /**
+     * Extra information of the message.
+     */
+    detail?: string;
+    icon?: (NativeImage) | (string);
+    /**
+     * Custom width of the text in the message box.
+     *
+     * @platform darwin
+     */
+    textWidth?: number;
+    /**
+     * The index of the button to be used to cancel the dialog, via the `Esc` key. By
+     * default this is assigned to the first button with "cancel" or "no" as the label.
+     * If no such labeled buttons exist and this option is not set, `0` will be used as
+     * the return value.
+     */
+    cancelId?: number;
+    /**
+     * On Windows Electron will try to figure out which one of the `buttons` are common
+     * buttons (like "Cancel" or "Yes"), and show the others as command links in the
+     * dialog. This can make the dialog appear in the style of modern Windows apps. If
+     * you don't like this behavior, you can set `noLink` to `true`.
+     */
+    noLink?: boolean;
+    /**
+     * Normalize the keyboard access keys across platforms. Default is `false`.
+     * Enabling this assumes `&` is used in the button labels for the placement of the
+     * keyboard shortcut access key and labels will be converted so they work correctly
+     * on each platform, `&` characters are removed on macOS, converted to `_` on
+     * Linux, and left untouched on Windows. For example, a button label of `Vie&w`
+     * will be converted to `Vie_w` on Linux and `View` on macOS and can be selected
+     * via `Alt-W` on Windows and Linux.
+     */
+    normalizeAccessKeys?: boolean;
+  }
+
+  interface MessageDetails {
+    /**
+     * The actual console message
+     */
+    message: string;
+    /**
+     * The version ID of the service worker that sent the log message
+     */
+    versionId: number;
+    /**
+     * The type of source for this message.  Can be `javascript`, `xml`, `network`,
+     * `console-api`, `storage`, `rendering`, `security`, `deprecation`, `worker`,
+     * `violation`, `intervention`, `recommendation` or `other`.
+     */
+    source: ('javascript' | 'xml' | 'network' | 'console-api' | 'storage' | 'rendering' | 'security' | 'deprecation' | 'worker' | 'violation' | 'intervention' | 'recommendation' | 'other');
+    /**
+     * The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and
+     * `error`.
+     */
+    level: number;
+    /**
+     * The URL the message came from
+     */
+    sourceUrl: string;
+    /**
+     * The line number of the source that triggered this console message
+     */
+    lineNumber: number;
+  }
+
+  interface MessageEvent {
+    data: any;
+    ports: MessagePortMain[];
+  }
+
+  interface MoveToApplicationsFolderOptions {
+    /**
+     * A handler for potential conflict in move failure.
+     */
+    conflictHandler?: (conflictType: 'exists' | 'existsAndRunning') => boolean;
+  }
+
+  interface NewWindowEvent extends Event {
+    url: string;
+    frameName: string;
+    /**
+     * Can be `default`, `foreground-tab`, `background-tab`, `new-window`,
+     * `save-to-disk` and `other`.
+     */
+    disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other');
+    /**
+     * The options which should be used for creating the new `BrowserWindow`.
+     */
+    options: BrowserWindowConstructorOptions;
+  }
+
+  interface NotificationConstructorOptions {
+    /**
+     * A title for the notification, which will be shown at the top of the notification
+     * window when it is shown.
+     */
+    title?: string;
+    /**
+     * A subtitle for the notification, which will be displayed below the title.
+     *
+     * @platform darwin
+     */
+    subtitle?: string;
+    /**
+     * The body text of the notification, which will be displayed below the title or
+     * subtitle.
+     */
+    body?: string;
+    /**
+     * Whether or not to emit an OS notification noise when showing the notification.
+     */
+    silent?: boolean;
+    /**
+     * An icon to use in the notification.
+     */
+    icon?: (string) | (NativeImage);
+    /**
+     * Whether or not to add an inline reply option to the notification.
+     *
+     * @platform darwin
+     */
+    hasReply?: boolean;
+    /**
+     * The timeout duration of the notification. Can be 'default' or 'never'.
+     *
+     * @platform linux,win32
+     */
+    timeoutType?: ('default' | 'never');
+    /**
+     * The placeholder to write in the inline reply input field.
+     *
+     * @platform darwin
+     */
+    replyPlaceholder?: string;
+    /**
+     * The name of the sound file to play when the notification is shown.
+     *
+     * @platform darwin
+     */
+    sound?: string;
+    /**
+     * The urgency level of the notification. Can be 'normal', 'critical', or 'low'.
+     *
+     * @platform linux
+     */
+    urgency?: ('normal' | 'critical' | 'low');
+    /**
+     * Actions to add to the notification. Please read the available actions and
+     * limitations in the `NotificationAction` documentation.
+     *
+     * @platform darwin
+     */
+    actions?: NotificationAction[];
+    /**
+     * A custom title for the close button of an alert. An empty string will cause the
+     * default localized text to be used.
+     *
+     * @platform darwin
+     */
+    closeButtonText?: string;
+    /**
+     * A custom description of the Notification on Windows superseding all properties
+     * above. Provides full customization of design and behavior of the notification.
+     *
+     * @platform win32
+     */
+    toastXml?: string;
+  }
+
+  interface OnBeforeRedirectListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    redirectURL: string;
+    statusCode: number;
+    statusLine: string;
+    /**
+     * The server IP address that the request was actually sent to.
+     */
+    ip?: string;
+    fromCache: boolean;
+    responseHeaders?: Record<string, string[]>;
+  }
+
+  interface OnBeforeRequestListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    uploadData: UploadData[];
+  }
+
+  interface OnBeforeSendHeadersListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    uploadData?: UploadData[];
+    requestHeaders: Record<string, string>;
+  }
+
+  interface OnCompletedListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    responseHeaders?: Record<string, string[]>;
+    fromCache: boolean;
+    statusCode: number;
+    statusLine: string;
+    error: string;
+  }
+
+  interface OnErrorOccurredListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    fromCache: boolean;
+    /**
+     * The error description.
+     */
+    error: string;
+  }
+
+  interface OnHeadersReceivedListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    statusLine: string;
+    statusCode: number;
+    responseHeaders?: Record<string, string[]>;
+  }
+
+  interface OnResponseStartedListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    responseHeaders?: Record<string, string[]>;
+    /**
+     * Indicates whether the response was fetched from disk cache.
+     */
+    fromCache: boolean;
+    statusCode: number;
+    statusLine: string;
+  }
+
+  interface OnSendHeadersListenerDetails {
+    id: number;
+    url: string;
+    method: string;
+    webContentsId?: number;
+    webContents?: WebContents;
+    frame?: WebFrameMain;
+    /**
+     * Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`,
+     * `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
+     */
+    resourceType: ('mainFrame' | 'subFrame' | 'stylesheet' | 'script' | 'image' | 'font' | 'object' | 'xhr' | 'ping' | 'cspReport' | 'media' | 'webSocket' | 'other');
+    referrer: string;
+    timestamp: number;
+    requestHeaders: Record<string, string>;
+  }
+
+  interface OpenDevToolsOptions {
+    /**
+     * Opens the devtools with specified dock state, can be `left`, `right`, `bottom`,
+     * `undocked`, `detach`. Defaults to last used dock state. In `undocked` mode it's
+     * possible to dock back. In `detach` mode it's not.
+     */
+    mode: ('left' | 'right' | 'bottom' | 'undocked' | 'detach');
+    /**
+     * Whether to bring the opened devtools window to the foreground. The default is
+     * `true`.
+     */
+    activate?: boolean;
+  }
+
+  interface OpenDialogOptions {
+    title?: string;
+    defaultPath?: string;
+    /**
+     * Custom label for the confirmation button, when left empty the default label will
+     * be used.
+     */
+    buttonLabel?: string;
+    filters?: FileFilter[];
+    /**
+     * Contains which features the dialog should use. The following values are
+     * supported:
+     */
+    properties?: Array<'openFile' | 'openDirectory' | 'multiSelections' | 'showHiddenFiles' | 'createDirectory' | 'promptToCreate' | 'noResolveAliases' | 'treatPackageAsDirectory' | 'dontAddToRecent'>;
+    /**
+     * Message to display above input boxes.
+     *
+     * @platform darwin
+     */
+    message?: string;
+    /**
+     * Create security scoped bookmarks when packaged for the Mac App Store.
+     *
+     * @platform darwin,mas
+     */
+    securityScopedBookmarks?: boolean;
+  }
+
+  interface OpenDialogReturnValue {
+    /**
+     * whether or not the dialog was canceled.
+     */
+    canceled: boolean;
+    /**
+     * An array of file paths chosen by the user. If the dialog is cancelled this will
+     * be an empty array.
+     */
+    filePaths: string[];
+    /**
+     * An array matching the `filePaths` array of base64 encoded strings which contains
+     * security scoped bookmark data. `securityScopedBookmarks` must be enabled for
+     * this to be populated. (For return values, see table here.)
+     *
+     * @platform darwin,mas
+     */
+    bookmarks?: string[];
+  }
+
+  interface OpenDialogSyncOptions {
+    title?: string;
+    defaultPath?: string;
+    /**
+     * Custom label for the confirmation button, when left empty the default label will
+     * be used.
+     */
+    buttonLabel?: string;
+    filters?: FileFilter[];
+    /**
+     * Contains which features the dialog should use. The following values are
+     * supported:
+     */
+    properties?: Array<'openFile' | 'openDirectory' | 'multiSelections' | 'showHiddenFiles' | 'createDirectory' | 'promptToCreate' | 'noResolveAliases' | 'treatPackageAsDirectory' | 'dontAddToRecent'>;
+    /**
+     * Message to display above input boxes.
+     *
+     * @platform darwin
+     */
+    message?: string;
+    /**
+     * Create security scoped bookmarks when packaged for the Mac App Store.
+     *
+     * @platform darwin,mas
+     */
+    securityScopedBookmarks?: boolean;
+  }
+
+  interface OpenExternalOptions {
+    /**
+     * `true` to bring the opened application to the foreground. The default is `true`.
+     *
+     * @platform darwin
+     */
+    activate?: boolean;
+    /**
+     * The working directory.
+     *
+     * @platform win32
+     */
+    workingDirectory?: string;
+  }
+
+  interface Options {
+  }
+
+  interface PageFaviconUpdatedEvent extends Event {
+    /**
+     * Array of URLs.
+     */
+    favicons: string[];
+  }
+
+  interface PageTitleUpdatedEvent extends Event {
+    title: string;
+    explicitSet: boolean;
+  }
+
+  interface Parameters {
+    /**
+     * Specify the screen type to emulate (default: `desktop`):
+     */
+    screenPosition: ('desktop' | 'mobile');
+    /**
+     * Set the emulated screen size (screenPosition == mobile).
+     */
+    screenSize: Size;
+    /**
+     * Position the view on the screen (screenPosition == mobile) (default: `{ x: 0, y:
+     * 0 }`).
+     */
+    viewPosition: Point;
+    /**
+     * Set the device scale factor (if zero defaults to original device scale factor)
+     * (default: `0`).
+     */
+    deviceScaleFactor: number;
+    /**
+     * Set the emulated view size (empty means no override)
+     */
+    viewSize: Size;
+    /**
+     * Scale of emulated view inside available space (not in fit to view mode)
+     * (default: `1`).
+     */
+    scale: number;
+  }
+
+  interface Payment {
+    /**
+     * The identifier of the purchased product.
+     */
+    productIdentifier: string;
+    /**
+     * The quantity purchased.
+     */
+    quantity: number;
+    /**
+     * An opaque identifier for the user’s account on your system.
+     */
+    applicationUsername: string;
+    /**
+     * The details of the discount offer to apply to the payment.
+     */
+    paymentDiscount?: PaymentDiscount;
+  }
+
+  interface PermissionCheckHandlerHandlerDetails {
+    /**
+     * The origin of the frame embedding the frame that made the permission check.
+     * Only set for cross-origin sub frames making permission checks.
+     */
+    embeddingOrigin?: string;
+    /**
+     * The security origin of the `media` check.
+     */
+    securityOrigin?: string;
+    /**
+     * The type of media access being requested, can be `video`, `audio` or `unknown`
+     */
+    mediaType?: ('video' | 'audio' | 'unknown');
+    /**
+     * The last URL the requesting frame loaded.  This is not provided for cross-origin
+     * sub frames making permission checks.
+     */
+    requestingUrl?: string;
+    /**
+     * Whether the frame making the request is the main frame
+     */
+    isMainFrame: boolean;
+  }
+
+  interface PermissionRequestHandlerHandlerDetails {
+    /**
+     * The url of the `openExternal` request.
+     */
+    externalURL?: string;
+    /**
+     * The security origin of the `media` request.
+     */
+    securityOrigin?: string;
+    /**
+     * The types of media access being requested, elements can be `video` or `audio`
+     */
+    mediaTypes?: Array<'video' | 'audio'>;
+    /**
+     * The last URL the requesting frame loaded
+     */
+    requestingUrl: string;
+    /**
+     * Whether the frame making the request is the main frame
+     */
+    isMainFrame: boolean;
+  }
+
+  interface PluginCrashedEvent extends Event {
+    name: string;
+    version: string;
+  }
+
+  interface PopupOptions {
+    /**
+     * Default is the focused window.
+     */
+    window?: BrowserWindow;
+    /**
+     * Default is the current mouse cursor position. Must be declared if `y` is
+     * declared.
+     */
+    x?: number;
+    /**
+     * Default is the current mouse cursor position. Must be declared if `x` is
+     * declared.
+     */
+    y?: number;
+    /**
+     * The index of the menu item to be positioned under the mouse cursor at the
+     * specified coordinates. Default is -1.
+     *
+     * @platform darwin
+     */
+    positioningItem?: number;
+    /**
+     * Called when menu is closed.
+     */
+    callback?: () => void;
+  }
+
+  interface PreconnectOptions {
+    /**
+     * URL for preconnect. Only the origin is relevant for opening the socket.
+     */
+    url: string;
+    /**
+     * number of sockets to preconnect. Must be between 1 and 6. Defaults to 1.
+     */
+    numSockets?: number;
+  }
+
+  interface PrintToPDFOptions {
+    /**
+     * Paper orientation.`true` for landscape, `false` for portrait. Defaults to false.
+     */
+    landscape?: boolean;
+    /**
+     * Whether to display header and footer. Defaults to false.
+     */
+    displayHeaderFooter?: boolean;
+    /**
+     * Whether to print background graphics. Defaults to false.
+     */
+    printBackground?: boolean;
+    /**
+     * Scale of the webpage rendering. Defaults to 1.
+     */
+    scale?: number;
+    /**
+     * Specify page size of the generated PDF. Can be `A0`, `A1`, `A2`, `A3`, `A4`,
+     * `A5`, `A6`, `Legal`, `Letter`, `Tabloid`, `Ledger`, or an Object containing
+     * `height` and `width` in inches. Defaults to `Letter`.
+     */
+    pageSize?: (string) | (Size);
+    margins?: Margins;
+    /**
+     * Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string,
+     * which means print all pages.
+     */
+    pageRanges?: string;
+    /**
+     * HTML template for the print header. Should be valid HTML markup with following
+     * classes used to inject printing values into them: `date` (formatted print date),
+     * `title` (document title), `url` (document location), `pageNumber` (current page
+     * number) and `totalPages` (total pages in the document). For example, `<span
+     * class=title></span>` would generate span containing the title.
+     */
+    headerTemplate?: string;
+    /**
+     * HTML template for the print footer. Should use the same format as the
+     * `headerTemplate`.
+     */
+    footerTemplate?: string;
+    /**
+     * Whether or not to prefer page size as defined by css. Defaults to false, in
+     * which case the content will be scaled to fit the paper size.
+     */
+    preferCSSPageSize?: boolean;
+  }
+
+  interface Privileges {
+    /**
+     * Default false.
+     */
+    standard?: boolean;
+    /**
+     * Default false.
+     */
+    secure?: boolean;
+    /**
+     * Default false.
+     */
+    bypassCSP?: boolean;
+    /**
+     * Default false.
+     */
+    allowServiceWorkers?: boolean;
+    /**
+     * Default false.
+     */
+    supportFetchAPI?: boolean;
+    /**
+     * Default false.
+     */
+    corsEnabled?: boolean;
+    /**
+     * Default false.
+     */
+    stream?: boolean;
+  }
+
+  interface ProgressBarOptions {
+    /**
+     * Mode for the progress bar. Can be `none`, `normal`, `indeterminate`, `error` or
+     * `paused`.
+     *
+     * @platform win32
+     */
+    mode: ('none' | 'normal' | 'indeterminate' | 'error' | 'paused');
+  }
+
+  interface Provider {
+    spellCheck: (words: string[], callback: (misspeltWords: string[]) => void) => void;
+  }
+
+  interface ReadBookmark {
+    title: string;
+    url: string;
+  }
+
+  interface RegistrationCompletedDetails {
+    /**
+     * The base URL that a service worker is registered for
+     */
+    scope: string;
+  }
+
+  interface RelaunchOptions {
+    args?: string[];
+    execPath?: string;
+  }
+
+  interface RenderProcessGoneDetails {
+    /**
+     * The reason the render process is gone.  Possible values:
+     */
+    reason: ('clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure');
+    /**
+     * The exit code of the process, unless `reason` is `launch-failed`, in which case
+     * `exitCode` will be a platform-specific launch failure error code.
+     */
+    exitCode: number;
+  }
+
+  interface Request {
+    hostname: string;
+    certificate: Certificate;
+    validatedCertificate: Certificate;
+    /**
+     * `true` if Chromium recognises the root CA as a standard root. If it isn't then
+     * it's probably the case that this certificate was generated by a MITM proxy whose
+     * root has been installed locally (for example, by a corporate proxy). This should
+     * not be trusted if the `verificationResult` is not `OK`.
+     */
+    isIssuedByKnownRoot: boolean;
+    /**
+     * `OK` if the certificate is trusted, otherwise an error like `CERT_REVOKED`.
+     */
+    verificationResult: string;
+    /**
+     * Error code.
+     */
+    errorCode: number;
+  }
+
+  interface ResizeOptions {
+    /**
+     * Defaults to the image's width.
+     */
+    width?: number;
+    /**
+     * Defaults to the image's height.
+     */
+    height?: number;
+    /**
+     * The desired quality of the resize image. Possible values are `good`, `better`,
+     * or `best`. The default is `best`. These values express a desired quality/speed
+     * tradeoff. They are translated into an algorithm-specific method that depends on
+     * the capabilities (CPU, GPU) of the underlying platform. It is possible for all
+     * three methods to be mapped to the same algorithm on a given platform.
+     */
+    quality?: string;
+  }
+
+  interface ResourceUsage {
+    images: MemoryUsageDetails;
+    scripts: MemoryUsageDetails;
+    cssStyleSheets: MemoryUsageDetails;
+    xslStyleSheets: MemoryUsageDetails;
+    fonts: MemoryUsageDetails;
+    other: MemoryUsageDetails;
+  }
+
+  interface Response {
+    /**
+     * `false` should be passed in if the dialog is canceled. If the `pairingKind` is
+     * `confirm` or `confirmPin`, this value should indicate if the pairing is
+     * confirmed.  If the `pairingKind` is `providePin` the value should be `true` when
+     * a value is provided.
+     */
+    confirmed: boolean;
+    /**
+     * When the `pairingKind` is `providePin` this value should be the required pin for
+     * the Bluetooth device.
+     */
+    pin?: (string) | (null);
+  }
+
+  interface Result {
+    requestId: number;
+    /**
+     * Position of the active match.
+     */
+    activeMatchOrdinal: number;
+    /**
+     * Number of Matches.
+     */
+    matches: number;
+    /**
+     * Coordinates of first match region.
+     */
+    selectionArea: Rectangle;
+    finalUpdate: boolean;
+  }
+
+  interface SaveDialogOptions {
+    /**
+     * The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+     */
+    title?: string;
+    /**
+     * Absolute directory path, absolute file path, or file name to use by default.
+     */
+    defaultPath?: string;
+    /**
+     * Custom label for the confirmation button, when left empty the default label will
+     * be used.
+     */
+    buttonLabel?: string;
+    filters?: FileFilter[];
+    /**
+     * Message to display above text fields.
+     *
+     * @platform darwin
+     */
+    message?: string;
+    /**
+     * Custom label for the text displayed in front of the filename text field.
+     *
+     * @platform darwin
+     */
+    nameFieldLabel?: string;
+    /**
+     * Show the tags input box, defaults to `true`.
+     *
+     * @platform darwin
+     */
+    showsTagField?: boolean;
+    properties?: Array<'showHiddenFiles' | 'createDirectory' | 'treatPackageAsDirectory' | 'showOverwriteConfirmation' | 'dontAddToRecent'>;
+    /**
+     * Create a security scoped bookmark when packaged for the Mac App Store. If this
+     * option is enabled and the file doesn't already exist a blank file will be
+     * created at the chosen path.
+     *
+     * @platform darwin,mas
+     */
+    securityScopedBookmarks?: boolean;
+  }
+
+  interface SaveDialogReturnValue {
+    /**
+     * whether or not the dialog was canceled.
+     */
+    canceled: boolean;
+    /**
+     * If the dialog is canceled, this will be `undefined`.
+     */
+    filePath?: string;
+    /**
+     * Base64 encoded string which contains the security scoped bookmark data for the
+     * saved file. `securityScopedBookmarks` must be enabled for this to be present.
+     * (For return values, see table here.)
+     *
+     * @platform darwin,mas
+     */
+    bookmark?: string;
+  }
+
+  interface SaveDialogSyncOptions {
+    /**
+     * The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+     */
+    title?: string;
+    /**
+     * Absolute directory path, absolute file path, or file name to use by default.
+     */
+    defaultPath?: string;
+    /**
+     * Custom label for the confirmation button, when left empty the default label will
+     * be used.
+     */
+    buttonLabel?: string;
+    filters?: FileFilter[];
+    /**
+     * Message to display above text fields.
+     *
+     * @platform darwin
+     */
+    message?: string;
+    /**
+     * Custom label for the text displayed in front of the filename text field.
+     *
+     * @platform darwin
+     */
+    nameFieldLabel?: string;
+    /**
+     * Show the tags input box, defaults to `true`.
+     *
+     * @platform darwin
+     */
+    showsTagField?: boolean;
+    properties?: Array<'showHiddenFiles' | 'createDirectory' | 'treatPackageAsDirectory' | 'showOverwriteConfirmation' | 'dontAddToRecent'>;
+    /**
+     * Create a security scoped bookmark when packaged for the Mac App Store. If this
+     * option is enabled and the file doesn't already exist a blank file will be
+     * created at the chosen path.
+     *
+     * @platform darwin,mas
+     */
+    securityScopedBookmarks?: boolean;
+  }
+
+  interface SelectHidDeviceDetails {
+    deviceList: HIDDevice[];
+    frame: WebFrameMain;
+  }
+
+  interface Settings {
+    /**
+     * `true` to open the app at login, `false` to remove the app as a login item.
+     * Defaults to `false`.
+     */
+    openAtLogin?: boolean;
+    /**
+     * `true` to open the app as hidden. Defaults to `false`. The user can edit this
+     * setting from the System Preferences so
+     * `app.getLoginItemSettings().wasOpenedAsHidden` should be checked when the app is
+     * opened to know the current value. This setting is not available on MAS builds.
+     *
+     * @platform darwin
+     */
+    openAsHidden?: boolean;
+    /**
+     * The executable to launch at login. Defaults to `process.execPath`.
+     *
+     * @platform win32
+     */
+    path?: string;
+    /**
+     * The command-line arguments to pass to the executable. Defaults to an empty
+     * array. Take care to wrap paths in quotes.
+     *
+     * @platform win32
+     */
+    args?: string[];
+    /**
+     * `true` will change the startup approved registry key and `enable / disable` the
+     * App in Task Manager and Windows Settings. Defaults to `true`.
+     *
+     * @platform win32
+     */
+    enabled?: boolean;
+    /**
+     * value name to write into registry. Defaults to the app's AppUserModelId(). Set
+     * the app's login item settings.
+     *
+     * @platform win32
+     */
+    name?: string;
+  }
+
+  interface SourcesOptions {
+    /**
+     * An array of strings that lists the types of desktop sources to be captured,
+     * available types are `screen` and `window`.
+     */
+    types: string[];
+    /**
+     * The size that the media source thumbnail should be scaled to. Default is `150` x
+     * `150`. Set width or height to 0 when you do not need the thumbnails. This will
+     * save the processing time required for capturing the content of each window and
+     * screen.
+     */
+    thumbnailSize?: Size;
+    /**
+     * Set to true to enable fetching window icons. The default value is false. When
+     * false the appIcon property of the sources return null. Same if a source has the
+     * type screen.
+     */
+    fetchWindowIcons?: boolean;
+  }
+
+  interface SSLConfigConfig {
+    /**
+     * Can be `tls1`, `tls1.1`, `tls1.2` or `tls1.3`. The minimum SSL version to allow
+     * when connecting to remote servers. Defaults to `tls1`.
+     */
+    minVersion?: string;
+    /**
+     * Can be `tls1.2` or `tls1.3`. The maximum SSL version to allow when connecting to
+     * remote servers. Defaults to `tls1.3`.
+     */
+    maxVersion?: string;
+    /**
+     * List of cipher suites which should be explicitly prevented from being used in
+     * addition to those disabled by the net built-in policy. Supported literal forms:
+     * 0xAABB, where AA is `cipher_suite[0]` and BB is `cipher_suite[1]`, as defined in
+     * RFC 2246, Section 7.4.1.2. Unrecognized but parsable cipher suites in this form
+     * will not return an error. Ex: To disable TLS_RSA_WITH_RC4_128_MD5, specify
+     * 0x0004, while to disable TLS_ECDH_ECDSA_WITH_RC4_128_SHA, specify 0xC002. Note
+     * that TLSv1.3 ciphers cannot be disabled using this mechanism.
+     */
+    disabledCipherSuites?: number[];
+  }
+
+  interface StartLoggingOptions {
+    /**
+     * What kinds of data should be captured. By default, only metadata about requests
+     * will be captured. Setting this to `includeSensitive` will include cookies and
+     * authentication data. Setting it to `everything` will include all bytes
+     * transferred on sockets. Can be `default`, `includeSensitive` or `everything`.
+     */
+    captureMode?: ('default' | 'includeSensitive' | 'everything');
+    /**
+     * When the log grows beyond this size, logging will automatically stop. Defaults
+     * to unlimited.
+     */
+    maxFileSize?: number;
+  }
+
+  interface SystemMemoryInfo {
+    /**
+     * The total amount of physical memory in Kilobytes available to the system.
+     */
+    total: number;
+    /**
+     * The total amount of memory not being used by applications or disk cache.
+     */
+    free: number;
+    /**
+     * The total amount of swap memory in Kilobytes available to the system.
+     *
+     * @platform win32,linux
+     */
+    swapTotal: number;
+    /**
+     * The free amount of swap memory in Kilobytes available to the system.
+     *
+     * @platform win32,linux
+     */
+    swapFree: number;
+  }
+
+  interface TitleBarOverlayOptions {
+    /**
+     * The CSS color of the Window Controls Overlay when enabled.
+     *
+     * @platform win32
+     */
+    color?: string;
+    /**
+     * The CSS color of the symbols on the Window Controls Overlay when enabled.
+     *
+     * @platform win32
+     */
+    symbolColor?: string;
+    /**
+     * The height of the title bar and Window Controls Overlay in pixels.
+     *
+     * @platform win32
+     */
+    height?: number;
+  }
+
+  interface TitleOptions {
+    /**
+     * The font family variant to display, can be `monospaced` or `monospacedDigit`.
+     * `monospaced` is available in macOS 10.15+ and `monospacedDigit` is available in
+     * macOS 10.11+.  When left blank, the title uses the default system font.
+     */
+    fontType?: ('monospaced' | 'monospacedDigit');
+  }
+
+  interface ToBitmapOptions {
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface ToDataURLOptions {
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface ToPNGOptions {
+    /**
+     * Defaults to 1.0.
+     */
+    scaleFactor?: number;
+  }
+
+  interface TouchBarButtonConstructorOptions {
+    /**
+     * Button text.
+     */
+    label?: string;
+    /**
+     * A short description of the button for use by screenreaders like VoiceOver.
+     */
+    accessibilityLabel?: string;
+    /**
+     * Button background color in hex format, i.e `#ABCDEF`.
+     */
+    backgroundColor?: string;
+    /**
+     * Button icon.
+     */
+    icon?: (NativeImage) | (string);
+    /**
+     * Can be `left`, `right` or `overlay`. Defaults to `overlay`.
+     */
+    iconPosition?: ('left' | 'right' | 'overlay');
+    /**
+     * Function to call when the button is clicked.
+     */
+    click?: () => void;
+    /**
+     * Whether the button is in an enabled state.  Default is `true`.
+     */
+    enabled?: boolean;
+  }
+
+  interface TouchBarColorPickerConstructorOptions {
+    /**
+     * Array of hex color strings to appear as possible colors to select.
+     */
+    availableColors?: string[];
+    /**
+     * The selected hex color in the picker, i.e `#ABCDEF`.
+     */
+    selectedColor?: string;
+    /**
+     * Function to call when a color is selected.
+     */
+    change?: (color: string) => void;
+  }
+
+  interface TouchBarConstructorOptions {
+    items?: Array<(TouchBarButton) | (TouchBarColorPicker) | (TouchBarGroup) | (TouchBarLabel) | (TouchBarPopover) | (TouchBarScrubber) | (TouchBarSegmentedControl) | (TouchBarSlider) | (TouchBarSpacer)>;
+    escapeItem?: (TouchBarButton) | (TouchBarColorPicker) | (TouchBarGroup) | (TouchBarLabel) | (TouchBarPopover) | (TouchBarScrubber) | (TouchBarSegmentedControl) | (TouchBarSlider) | (TouchBarSpacer) | (null);
+  }
+
+  interface TouchBarGroupConstructorOptions {
+    /**
+     * Items to display as a group.
+     */
+    items: TouchBar;
+  }
+
+  interface TouchBarLabelConstructorOptions {
+    /**
+     * Text to display.
+     */
+    label?: string;
+    /**
+     * A short description of the button for use by screenreaders like VoiceOver.
+     */
+    accessibilityLabel?: string;
+    /**
+     * Hex color of text, i.e `#ABCDEF`.
+     */
+    textColor?: string;
+  }
+
+  interface TouchBarPopoverConstructorOptions {
+    /**
+     * Popover button text.
+     */
+    label?: string;
+    /**
+     * Popover button icon.
+     */
+    icon?: NativeImage;
+    /**
+     * Items to display in the popover.
+     */
+    items: TouchBar;
+    /**
+     * `true` to display a close button on the left of the popover, `false` to not show
+     * it. Default is `true`.
+     */
+    showCloseButton?: boolean;
+  }
+
+  interface TouchBarScrubberConstructorOptions {
+    /**
+     * An array of items to place in this scrubber.
+     */
+    items: ScrubberItem[];
+    /**
+     * Called when the user taps an item that was not the last tapped item.
+     */
+    select?: (selectedIndex: number) => void;
+    /**
+     * Called when the user taps any item.
+     */
+    highlight?: (highlightedIndex: number) => void;
+    /**
+     * Selected item style. Can be `background`, `outline` or `none`. Defaults to
+     * `none`.
+     */
+    selectedStyle?: ('background' | 'outline' | 'none');
+    /**
+     * Selected overlay item style. Can be `background`, `outline` or `none`. Defaults
+     * to `none`.
+     */
+    overlayStyle?: ('background' | 'outline' | 'none');
+    /**
+     * Whether to show arrow buttons. Defaults to `false` and is only shown if `items`
+     * is non-empty.
+     */
+    showArrowButtons?: boolean;
+    /**
+     * Can be `fixed` or `free`. The default is `free`.
+     */
+    mode?: ('fixed' | 'free');
+    /**
+     * Defaults to `true`.
+     */
+    continuous?: boolean;
+  }
+
+  interface TouchBarSegmentedControlConstructorOptions {
+    /**
+     * Style of the segments:
+     */
+    segmentStyle?: ('automatic' | 'rounded' | 'textured-rounded' | 'round-rect' | 'textured-square' | 'capsule' | 'small-square' | 'separated');
+    /**
+     * The selection mode of the control:
+     */
+    mode?: ('single' | 'multiple' | 'buttons');
+    /**
+     * An array of segments to place in this control.
+     */
+    segments: SegmentedControlSegment[];
+    /**
+     * The index of the currently selected segment, will update automatically with user
+     * interaction. When the mode is `multiple` it will be the last selected item.
+     */
+    selectedIndex?: number;
+    /**
+     * Called when the user selects a new segment.
+     */
+    change?: (selectedIndex: number, isSelected: boolean) => void;
+  }
+
+  interface TouchBarSliderConstructorOptions {
+    /**
+     * Label text.
+     */
+    label?: string;
+    /**
+     * Selected value.
+     */
+    value?: number;
+    /**
+     * Minimum value.
+     */
+    minValue?: number;
+    /**
+     * Maximum value.
+     */
+    maxValue?: number;
+    /**
+     * Function to call when the slider is changed.
+     */
+    change?: (newValue: number) => void;
+  }
+
+  interface TouchBarSpacerConstructorOptions {
+    /**
+     * Size of spacer, possible values are:
+     */
+    size?: ('small' | 'large' | 'flexible');
+  }
+
+  interface TraceBufferUsageReturnValue {
+    value: number;
+    percentage: number;
+  }
+
+  interface UpdateTargetUrlEvent extends Event {
+    url: string;
+  }
+
+  interface UploadProgress {
+    /**
+     * Whether the request is currently active. If this is false no other properties
+     * will be set
+     */
+    active: boolean;
+    /**
+     * Whether the upload has started. If this is false both `current` and `total` will
+     * be set to 0.
+     */
+    started: boolean;
+    /**
+     * The number of bytes that have been uploaded so far
+     */
+    current: number;
+    /**
+     * The number of bytes that will be uploaded this request
+     */
+    total: number;
+  }
+
+  interface VisibleOnAllWorkspacesOptions {
+    /**
+     * Sets whether the window should be visible above fullscreen windows.
+     *
+     * @platform darwin
+     */
+    visibleOnFullScreen?: boolean;
+    /**
+     * Calling setVisibleOnAllWorkspaces will by default transform the process type
+     * between UIElementApplication and ForegroundApplication to ensure the correct
+     * behavior. However, this will hide the window and dock for a short time every
+     * time it is called. If your window is already of type UIElementApplication, you
+     * can bypass this transformation by passing true to skipTransformProcessType.
+     *
+     * @platform darwin
+     */
+    skipTransformProcessType?: boolean;
+  }
+
+  interface WebContentsPrintOptions {
+    /**
+     * Don't ask user for print settings. Default is `false`.
+     */
+    silent?: boolean;
+    /**
+     * Prints the background color and image of the web page. Default is `false`.
+     */
+    printBackground?: boolean;
+    /**
+     * Set the printer device name to use. Must be the system-defined name and not the
+     * 'friendly' name, e.g 'Brother_QL_820NWB' and not 'Brother QL-820NWB'.
+     */
+    deviceName?: string;
+    /**
+     * Set whether the printed web page will be in color or grayscale. Default is
+     * `true`.
+     */
+    color?: boolean;
+    margins?: Margins;
+    /**
+     * Whether the web page should be printed in landscape mode. Default is `false`.
+     */
+    landscape?: boolean;
+    /**
+     * The scale factor of the web page.
+     */
+    scaleFactor?: number;
+    /**
+     * The number of pages to print per page sheet.
+     */
+    pagesPerSheet?: number;
+    /**
+     * Whether the web page should be collated.
+     */
+    collate?: boolean;
+    /**
+     * The number of copies of the web page to print.
+     */
+    copies?: number;
+    /**
+     * The page range to print. On macOS, only one range is honored.
+     */
+    pageRanges?: PageRanges[];
+    /**
+     * Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or
+     * `longEdge`.
+     */
+    duplexMode?: ('simplex' | 'shortEdge' | 'longEdge');
+    dpi?: Record<string, number>;
+    /**
+     * string to be printed as page header.
+     */
+    header?: string;
+    /**
+     * string to be printed as page footer.
+     */
+    footer?: string;
+    /**
+     * Specify page size of the printed document. Can be `A3`, `A4`, `A5`, `Legal`,
+     * `Letter`, `Tabloid` or an Object containing `height` and `width`.
+     */
+    pageSize?: (string) | (Size);
+  }
+
+  interface WebviewTagPrintOptions {
+    /**
+     * Don't ask user for print settings. Default is `false`.
+     */
+    silent?: boolean;
+    /**
+     * Prints the background color and image of the web page. Default is `false`.
+     */
+    printBackground?: boolean;
+    /**
+     * Set the printer device name to use. Must be the system-defined name and not the
+     * 'friendly' name, e.g 'Brother_QL_820NWB' and not 'Brother QL-820NWB'.
+     */
+    deviceName?: string;
+    /**
+     * Set whether the printed web page will be in color or grayscale. Default is
+     * `true`.
+     */
+    color?: boolean;
+    margins?: Margins;
+    /**
+     * Whether the web page should be printed in landscape mode. Default is `false`.
+     */
+    landscape?: boolean;
+    /**
+     * The scale factor of the web page.
+     */
+    scaleFactor?: number;
+    /**
+     * The number of pages to print per page sheet.
+     */
+    pagesPerSheet?: number;
+    /**
+     * Whether the web page should be collated.
+     */
+    collate?: boolean;
+    /**
+     * The number of copies of the web page to print.
+     */
+    copies?: number;
+    /**
+     * The page range to print.
+     */
+    pageRanges?: PageRanges[];
+    /**
+     * Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or
+     * `longEdge`.
+     */
+    duplexMode?: ('simplex' | 'shortEdge' | 'longEdge');
+    dpi?: Record<string, number>;
+    /**
+     * string to be printed as page header.
+     */
+    header?: string;
+    /**
+     * string to be printed as page footer.
+     */
+    footer?: string;
+    /**
+     * Specify page size of the printed document. Can be `A3`, `A4`, `A5`, `Legal`,
+     * `Letter`, `Tabloid` or an Object containing `height` in microns.
+     */
+    pageSize?: (string) | (Size);
+  }
+
+  interface WillNavigateEvent extends Event {
+    url: string;
+  }
+
+  interface WillResizeDetails {
+    /**
+     * The edge of the window being dragged for resizing. Can be `bottom`, `left`,
+     * `right`, `top-left`, `top-right`, `bottom-left` or `bottom-right`.
+     */
+    edge: ('bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right');
+  }
+
+  interface EditFlags {
+    /**
+     * Whether the renderer believes it can undo.
+     */
+    canUndo: boolean;
+    /**
+     * Whether the renderer believes it can redo.
+     */
+    canRedo: boolean;
+    /**
+     * Whether the renderer believes it can cut.
+     */
+    canCut: boolean;
+    /**
+     * Whether the renderer believes it can copy.
+     */
+    canCopy: boolean;
+    /**
+     * Whether the renderer believes it can paste.
+     */
+    canPaste: boolean;
+    /**
+     * Whether the renderer believes it can delete.
+     */
+    canDelete: boolean;
+    /**
+     * Whether the renderer believes it can select all.
+     */
+    canSelectAll: boolean;
+    /**
+     * Whether the renderer believes it can edit text richly.
+     */
+    canEditRichly: boolean;
+  }
+
+  interface FoundInPageResult {
+    requestId: number;
+    /**
+     * Position of the active match.
+     */
+    activeMatchOrdinal: number;
+    /**
+     * Number of Matches.
+     */
+    matches: number;
+    /**
+     * Coordinates of first match region.
+     */
+    selectionArea: Rectangle;
+    finalUpdate: boolean;
+  }
+
+  interface LaunchItems {
+    /**
+     * name value of a registry entry.
+     *
+     * @platform win32
+     */
+    name: string;
+    /**
+     * The executable to an app that corresponds to a registry entry.
+     *
+     * @platform win32
+     */
+    path: string;
+    /**
+     * the command-line arguments to pass to the executable.
+     *
+     * @platform win32
+     */
+    args: string[];
+    /**
+     * one of `user` or `machine`. Indicates whether the registry entry is under
+     * `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
+     *
+     * @platform win32
+     */
+    scope: string;
+    /**
+     * `true` if the app registry key is startup approved and therefore shows as
+     * `enabled` in Task Manager and Windows settings.
+     *
+     * @platform win32
+     */
+    enabled: boolean;
+  }
+
+  interface Margins {
+    /**
+     * Can be `default`, `none`, `printableArea`, or `custom`. If `custom` is chosen,
+     * you will also need to specify `top`, `bottom`, `left`, and `right`.
+     */
+    marginType?: ('default' | 'none' | 'printableArea' | 'custom');
+    /**
+     * The top margin of the printed web page, in pixels.
+     */
+    top?: number;
+    /**
+     * The bottom margin of the printed web page, in pixels.
+     */
+    bottom?: number;
+    /**
+     * The left margin of the printed web page, in pixels.
+     */
+    left?: number;
+    /**
+     * The right margin of the printed web page, in pixels.
+     */
+    right?: number;
+  }
+
+  interface MediaFlags {
+    /**
+     * Whether the media element has crashed.
+     */
+    inError: boolean;
+    /**
+     * Whether the media element is paused.
+     */
+    isPaused: boolean;
+    /**
+     * Whether the media element is muted.
+     */
+    isMuted: boolean;
+    /**
+     * Whether the media element has audio.
+     */
+    hasAudio: boolean;
+    /**
+     * Whether the media element is looping.
+     */
+    isLooping: boolean;
+    /**
+     * Whether the media element's controls are visible.
+     */
+    isControlsVisible: boolean;
+    /**
+     * Whether the media element's controls are toggleable.
+     */
+    canToggleControls: boolean;
+    /**
+     * Whether the media element can be printed.
+     */
+    canPrint: boolean;
+    /**
+     * Whether or not the media element can be downloaded.
+     */
+    canSave: boolean;
+    /**
+     * Whether the media element can show picture-in-picture.
+     */
+    canShowPictureInPicture: boolean;
+    /**
+     * Whether the media element is currently showing picture-in-picture.
+     */
+    isShowingPictureInPicture: boolean;
+    /**
+     * Whether the media element can be rotated.
+     */
+    canRotate: boolean;
+    /**
+     * Whether the media element can be looped.
+     */
+    canLoop: boolean;
+  }
+
+  interface PageRanges {
+    /**
+     * Index of the first page to print (0-based).
+     */
+    from: number;
+    /**
+     * Index of the last page to print (inclusive) (0-based).
+     */
+    to: number;
+  }
+
+  interface Params {
+    /**
+     * x coordinate.
+     */
+    x: number;
+    /**
+     * y coordinate.
+     */
+    y: number;
+    /**
+     * URL of the link that encloses the node the context menu was invoked on.
+     */
+    linkURL: string;
+    /**
+     * Text associated with the link. May be an empty string if the contents of the
+     * link are an image.
+     */
+    linkText: string;
+    /**
+     * URL of the top level page that the context menu was invoked on.
+     */
+    pageURL: string;
+    /**
+     * URL of the subframe that the context menu was invoked on.
+     */
+    frameURL: string;
+    /**
+     * Source URL for the element that the context menu was invoked on. Elements with
+     * source URLs are images, audio and video.
+     */
+    srcURL: string;
+    /**
+     * Type of the node the context menu was invoked on. Can be `none`, `image`,
+     * `audio`, `video`, `canvas`, `file` or `plugin`.
+     */
+    mediaType: ('none' | 'image' | 'audio' | 'video' | 'canvas' | 'file' | 'plugin');
+    /**
+     * Whether the context menu was invoked on an image which has non-empty contents.
+     */
+    hasImageContents: boolean;
+    /**
+     * Whether the context is editable.
+     */
+    isEditable: boolean;
+    /**
+     * Text of the selection that the context menu was invoked on.
+     */
+    selectionText: string;
+    /**
+     * Title text of the selection that the context menu was invoked on.
+     */
+    titleText: string;
+    /**
+     * Alt text of the selection that the context menu was invoked on.
+     */
+    altText: string;
+    /**
+     * Suggested filename to be used when saving file through 'Save Link As' option of
+     * context menu.
+     */
+    suggestedFilename: string;
+    /**
+     * Rect representing the coordinates in the document space of the selection.
+     */
+    selectionRect: Rectangle;
+    /**
+     * Start position of the selection text.
+     */
+    selectionStartOffset: number;
+    /**
+     * The referrer policy of the frame on which the menu is invoked.
+     */
+    referrerPolicy: Referrer;
+    /**
+     * The misspelled word under the cursor, if any.
+     */
+    misspelledWord: string;
+    /**
+     * An array of suggested words to show the user to replace the `misspelledWord`.
+     * Only available if there is a misspelled word and spellchecker is enabled.
+     */
+    dictionarySuggestions: string[];
+    /**
+     * The character encoding of the frame on which the menu was invoked.
+     */
+    frameCharset: string;
+    /**
+     * If the context menu was invoked on an input field, the type of that field.
+     * Possible values are `none`, `plainText`, `password`, `other`.
+     */
+    inputFieldType: string;
+    /**
+     * If the context is editable, whether or not spellchecking is enabled.
+     */
+    spellcheckEnabled: boolean;
+    /**
+     * Input source that invoked the context menu. Can be `none`, `mouse`, `keyboard`,
+     * `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`,
+     * `adjustSelection`, or `adjustSelectionReset`.
+     */
+    menuSourceType: ('none' | 'mouse' | 'keyboard' | 'touch' | 'touchMenu' | 'longPress' | 'longTap' | 'touchHandle' | 'stylus' | 'adjustSelection' | 'adjustSelectionReset');
+    /**
+     * The flags for the media element the context menu was invoked on.
+     */
+    mediaFlags: MediaFlags;
+    /**
+     * These flags indicate whether the renderer believes it is able to perform the
+     * corresponding action.
+     */
+    editFlags: EditFlags;
+  }
+
+  interface TitleBarOverlay {
+    /**
+     * The CSS color of the Window Controls Overlay when enabled. Default is the system
+     * color.
+     *
+     * @platform win32
+     */
+    color?: string;
+    /**
+     * The CSS color of the symbols on the Window Controls Overlay when enabled.
+     * Default is the system color.
+     *
+     * @platform win32
+     */
+    symbolColor?: string;
+    /**
+     * The height of the title bar and Window Controls Overlay in pixels. Default is
+     * system height.
+     *
+     * @platform darwin,win32
+     */
+    height?: number;
+  }
+
+  interface WebPreferences {
+    /**
+     * Whether to enable DevTools. If it is set to `false`, can not use
+     * `BrowserWindow.webContents.openDevTools()` to open DevTools. Default is `true`.
+     */
+    devTools?: boolean;
+    /**
+     * Whether node integration is enabled. Default is `false`.
+     */
+    nodeIntegration?: boolean;
+    /**
+     * Whether node integration is enabled in web workers. Default is `false`. More
+     * about this can be found in Multithreading.
+     */
+    nodeIntegrationInWorker?: boolean;
+    /**
+     * Experimental option for enabling Node.js support in sub-frames such as iframes
+     * and child windows. All your preloads will load for every iframe, you can use
+     * `process.isMainFrame` to determine if you are in the main frame or not.
+     */
+    nodeIntegrationInSubFrames?: boolean;
+    /**
+     * Specifies a script that will be loaded before other scripts run in the page.
+     * This script will always have access to node APIs no matter whether node
+     * integration is turned on or off. The value should be the absolute file path to
+     * the script. When node integration is turned off, the preload script can
+     * reintroduce Node global symbols back to the global scope. See example here.
+     */
+    preload?: string;
+    /**
+     * If set, this will sandbox the renderer associated with the window, making it
+     * compatible with the Chromium OS-level sandbox and disabling the Node.js engine.
+     * This is not the same as the `nodeIntegration` option and the APIs available to
+     * the preload script are more limited. Read more about the option here.
+     */
+    sandbox?: boolean;
+    /**
+     * Sets the session used by the page. Instead of passing the Session object
+     * directly, you can also choose to use the `partition` option instead, which
+     * accepts a partition string. When both `session` and `partition` are provided,
+     * `session` will be preferred. Default is the default session.
+     */
+    session?: Session;
+    /**
+     * Sets the session used by the page according to the session's partition string.
+     * If `partition` starts with `persist:`, the page will use a persistent session
+     * available to all pages in the app with the same `partition`. If there is no
+     * `persist:` prefix, the page will use an in-memory session. By assigning the same
+     * `partition`, multiple pages can share the same session. Default is the default
+     * session.
+     */
+    partition?: string;
+    /**
+     * The default zoom factor of the page, `3.0` represents `300%`. Default is `1.0`.
+     */
+    zoomFactor?: number;
+    /**
+     * Enables JavaScript support. Default is `true`.
+     */
+    javascript?: boolean;
+    /**
+     * When `false`, it will disable the same-origin policy (usually using testing
+     * websites by people), and set `allowRunningInsecureContent` to `true` if this
+     * options has not been set by user. Default is `true`.
+     */
+    webSecurity?: boolean;
+    /**
+     * Allow an https page to run JavaScript, CSS or plugins from http URLs. Default is
+     * `false`.
+     */
+    allowRunningInsecureContent?: boolean;
+    /**
+     * Enables image support. Default is `true`.
+     */
+    images?: boolean;
+    /**
+     * Specifies how to run image animations (E.g. GIFs).  Can be `animate`,
+     * `animateOnce` or `noAnimation`.  Default is `animate`.
+     */
+    imageAnimationPolicy?: ('animate' | 'animateOnce' | 'noAnimation');
+    /**
+     * Make TextArea elements resizable. Default is `true`.
+     */
+    textAreasAreResizable?: boolean;
+    /**
+     * Enables WebGL support. Default is `true`.
+     */
+    webgl?: boolean;
+    /**
+     * Whether plugins should be enabled. Default is `false`.
+     */
+    plugins?: boolean;
+    /**
+     * Enables Chromium's experimental features. Default is `false`.
+     */
+    experimentalFeatures?: boolean;
+    /**
+     * Enables scroll bounce (rubber banding) effect on macOS. Default is `false`.
+     *
+     * @platform darwin
+     */
+    scrollBounce?: boolean;
+    /**
+     * A list of feature strings separated by `,`, like `CSSVariables,KeyboardEventKey`
+     * to enable. The full list of supported feature strings can be found in the
+     * RuntimeEnabledFeatures.json5 file.
+     */
+    enableBlinkFeatures?: string;
+    /**
+     * A list of feature strings separated by `,`, like `CSSVariables,KeyboardEventKey`
+     * to disable. The full list of supported feature strings can be found in the
+     * RuntimeEnabledFeatures.json5 file.
+     */
+    disableBlinkFeatures?: string;
+    /**
+     * Sets the default font for the font-family.
+     */
+    defaultFontFamily?: DefaultFontFamily;
+    /**
+     * Defaults to `16`.
+     */
+    defaultFontSize?: number;
+    /**
+     * Defaults to `13`.
+     */
+    defaultMonospaceFontSize?: number;
+    /**
+     * Defaults to `0`.
+     */
+    minimumFontSize?: number;
+    /**
+     * Defaults to `ISO-8859-1`.
+     */
+    defaultEncoding?: string;
+    /**
+     * Whether to throttle animations and timers when the page becomes background. This
+     * also affects the Page Visibility API. Defaults to `true`.
+     */
+    backgroundThrottling?: boolean;
+    /**
+     * Whether to enable offscreen rendering for the browser window. Defaults to
+     * `false`. See the offscreen rendering tutorial for more details.
+     */
+    offscreen?: boolean;
+    /**
+     * Whether to run Electron APIs and the specified `preload` script in a separate
+     * JavaScript context. Defaults to `true`. The context that the `preload` script
+     * runs in will only have access to its own dedicated `document` and `window`
+     * globals, as well as its own set of JavaScript builtins (`Array`, `Object`,
+     * `JSON`, etc.), which are all invisible to the loaded content. The Electron API
+     * will only be available in the `preload` script and not the loaded page. This
+     * option should be used when loading potentially untrusted remote content to
+     * ensure the loaded content cannot tamper with the `preload` script and any
+     * Electron APIs being used.  This option uses the same technique used by Chrome
+     * Content Scripts.  You can access this context in the dev tools by selecting the
+     * 'Electron Isolated Context' entry in the combo box at the top of the Console
+     * tab.
+     */
+    contextIsolation?: boolean;
+    /**
+     * Whether to enable the `<webview>` tag. Defaults to `false`. **Note:** The
+     * `preload` script configured for the `<webview>` will have node integration
+     * enabled when it is executed so you should ensure remote/untrusted content is not
+     * able to create a `<webview>` tag with a possibly malicious `preload` script. You
+     * can use the `will-attach-webview` event on webContents to strip away the
+     * `preload` script and to validate or alter the `<webview>`'s initial settings.
+     */
+    webviewTag?: boolean;
+    /**
+     * A list of strings that will be appended to `process.argv` in the renderer
+     * process of this app.  Useful for passing small bits of data down to renderer
+     * process preload scripts.
+     */
+    additionalArguments?: string[];
+    /**
+     * Whether to enable browser style consecutive dialog protection. Default is
+     * `false`.
+     */
+    safeDialogs?: boolean;
+    /**
+     * The message to display when consecutive dialog protection is triggered. If not
+     * defined the default message would be used, note that currently the default
+     * message is in English and not localized.
+     */
+    safeDialogsMessage?: string;
+    /**
+     * Whether to disable dialogs completely. Overrides `safeDialogs`. Default is
+     * `false`.
+     */
+    disableDialogs?: boolean;
+    /**
+     * Whether dragging and dropping a file or link onto the page causes a navigation.
+     * Default is `false`.
+     */
+    navigateOnDragDrop?: boolean;
+    /**
+     * Autoplay policy to apply to content in the window, can be
+     * `no-user-gesture-required`, `user-gesture-required`,
+     * `document-user-activation-required`. Defaults to `no-user-gesture-required`.
+     */
+    autoplayPolicy?: ('no-user-gesture-required' | 'user-gesture-required' | 'document-user-activation-required');
+    /**
+     * Whether to prevent the window from resizing when entering HTML Fullscreen.
+     * Default is `false`.
+     */
+    disableHtmlFullscreenWindowResize?: boolean;
+    /**
+     * An alternative title string provided only to accessibility tools such as screen
+     * readers. This string is not directly visible to users.
+     */
+    accessibleTitle?: string;
+    /**
+     * Whether to enable the builtin spellchecker. Default is `true`.
+     */
+    spellcheck?: boolean;
+    /**
+     * Whether to enable the WebSQL api. Default is `true`.
+     */
+    enableWebSQL?: boolean;
+    /**
+     * Enforces the v8 code caching policy used by blink. Accepted values are
+     */
+    v8CacheOptions?: ('none' | 'code' | 'bypassHeatCheck' | 'bypassHeatCheckAndEagerCompile');
+    /**
+     * Whether to enable preferred size mode. The preferred size is the minimum size
+     * needed to contain the layout of the document—without requiring scrolling.
+     * Enabling this will cause the `preferred-size-changed` event to be emitted on the
+     * `WebContents` when the preferred size changes. Default is `false`.
+     */
+    enablePreferredSizeMode?: boolean;
+  }
+
+  interface DefaultFontFamily {
+    /**
+     * Defaults to `Times New Roman`.
+     */
+    standard?: string;
+    /**
+     * Defaults to `Times New Roman`.
+     */
+    serif?: string;
+    /**
+     * Defaults to `Arial`.
+     */
+    sansSerif?: string;
+    /**
+     * Defaults to `Courier New`.
+     */
+    monospace?: string;
+    /**
+     * Defaults to `Script`.
+     */
+    cursive?: string;
+    /**
+     * Defaults to `Impact`.
+     */
+    fantasy?: string;
+  }
+
+  interface RemoteMainInterface {
+    app: App;
+    autoUpdater: AutoUpdater;
+    BrowserView: typeof BrowserView;
+    BrowserWindow: typeof BrowserWindow;
+    clipboard: Clipboard;
+    contentTracing: ContentTracing;
+    crashReporter: CrashReporter;
+    desktopCapturer: DesktopCapturer;
+    dialog: Dialog;
+    globalShortcut: GlobalShortcut;
+    inAppPurchase: InAppPurchase;
+    ipcMain: IpcMain;
+    Menu: typeof Menu;
+    MenuItem: typeof MenuItem;
+    MessageChannelMain: typeof MessageChannelMain;
+    nativeImage: typeof NativeImage;
+    nativeTheme: NativeTheme;
+    net: Net;
+    netLog: NetLog;
+    Notification: typeof Notification;
+    powerMonitor: PowerMonitor;
+    powerSaveBlocker: PowerSaveBlocker;
+    protocol: Protocol;
+    pushNotifications: PushNotifications;
+    safeStorage: SafeStorage;
+    screen: Screen;
+    session: typeof Session;
+    ShareMenu: typeof ShareMenu;
+    shell: Shell;
+    systemPreferences: SystemPreferences;
+    TouchBar: typeof TouchBar;
+    Tray: typeof Tray;
+    webContents: typeof WebContents;
+    webFrameMain: typeof WebFrameMain;
+  }
+
+
+
+  namespace Common {
+    const clipboard: Clipboard;
+    type Clipboard = Electron.Clipboard;
+    const crashReporter: CrashReporter;
+    type CrashReporter = Electron.CrashReporter;
+    const nativeImage: typeof NativeImage;
+    type NativeImage = Electron.NativeImage;
+    const shell: Shell;
+    type Shell = Electron.Shell;
+    type AboutPanelOptionsOptions = Electron.AboutPanelOptionsOptions;
+    type AddRepresentationOptions = Electron.AddRepresentationOptions;
+    type AnimationSettings = Electron.AnimationSettings;
+    type AppDetailsOptions = Electron.AppDetailsOptions;
+    type ApplicationInfoForProtocolReturnValue = Electron.ApplicationInfoForProtocolReturnValue;
+    type AuthenticationResponseDetails = Electron.AuthenticationResponseDetails;
+    type AuthInfo = Electron.AuthInfo;
+    type AutoResizeOptions = Electron.AutoResizeOptions;
+    type BeforeSendResponse = Electron.BeforeSendResponse;
+    type BitmapOptions = Electron.BitmapOptions;
+    type BlinkMemoryInfo = Electron.BlinkMemoryInfo;
+    type BluetoothPairingHandlerHandlerDetails = Electron.BluetoothPairingHandlerHandlerDetails;
+    type BrowserViewConstructorOptions = Electron.BrowserViewConstructorOptions;
+    type BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions;
+    type CallbackResponse = Electron.CallbackResponse;
+    type CertificateTrustDialogOptions = Electron.CertificateTrustDialogOptions;
+    type ClearCodeCachesOptions = Electron.ClearCodeCachesOptions;
+    type ClearStorageDataOptions = Electron.ClearStorageDataOptions;
+    type ClientRequestConstructorOptions = Electron.ClientRequestConstructorOptions;
+    type Config = Electron.Config;
+    type ConfigureHostResolverOptions = Electron.ConfigureHostResolverOptions;
+    type ConsoleMessageEvent = Electron.ConsoleMessageEvent;
+    type ContextMenuEvent = Electron.ContextMenuEvent;
+    type ContextMenuParams = Electron.ContextMenuParams;
+    type ContinueActivityDetails = Electron.ContinueActivityDetails;
+    type CookiesGetFilter = Electron.CookiesGetFilter;
+    type CookiesSetDetails = Electron.CookiesSetDetails;
+    type CrashReporterStartOptions = Electron.CrashReporterStartOptions;
+    type CreateFromBitmapOptions = Electron.CreateFromBitmapOptions;
+    type CreateFromBufferOptions = Electron.CreateFromBufferOptions;
+    type CreateInterruptedDownloadOptions = Electron.CreateInterruptedDownloadOptions;
+    type Data = Electron.Data;
+    type Details = Electron.Details;
+    type DevicePermissionHandlerHandlerDetails = Electron.DevicePermissionHandlerHandlerDetails;
+    type DidChangeThemeColorEvent = Electron.DidChangeThemeColorEvent;
+    type DidCreateWindowDetails = Electron.DidCreateWindowDetails;
+    type DidFailLoadEvent = Electron.DidFailLoadEvent;
+    type DidFrameFinishLoadEvent = Electron.DidFrameFinishLoadEvent;
+    type DidFrameNavigateEvent = Electron.DidFrameNavigateEvent;
+    type DidNavigateEvent = Electron.DidNavigateEvent;
+    type DidNavigateInPageEvent = Electron.DidNavigateInPageEvent;
+    type DidRedirectNavigationEvent = Electron.DidRedirectNavigationEvent;
+    type DidStartNavigationEvent = Electron.DidStartNavigationEvent;
+    type DisplayBalloonOptions = Electron.DisplayBalloonOptions;
+    type EnableNetworkEmulationOptions = Electron.EnableNetworkEmulationOptions;
+    type FeedURLOptions = Electron.FeedURLOptions;
+    type FileIconOptions = Electron.FileIconOptions;
+    type FindInPageOptions = Electron.FindInPageOptions;
+    type FocusOptions = Electron.FocusOptions;
+    type FoundInPageEvent = Electron.FoundInPageEvent;
+    type FrameCreatedDetails = Electron.FrameCreatedDetails;
+    type FromPartitionOptions = Electron.FromPartitionOptions;
+    type HandlerDetails = Electron.HandlerDetails;
+    type HeadersReceivedResponse = Electron.HeadersReceivedResponse;
+    type HeapStatistics = Electron.HeapStatistics;
+    type HidDeviceAddedDetails = Electron.HidDeviceAddedDetails;
+    type HidDeviceRemovedDetails = Electron.HidDeviceRemovedDetails;
+    type HidDeviceRevokedDetails = Electron.HidDeviceRevokedDetails;
+    type IgnoreMouseEventsOptions = Electron.IgnoreMouseEventsOptions;
+    type ImportCertificateOptions = Electron.ImportCertificateOptions;
+    type Info = Electron.Info;
+    type Input = Electron.Input;
+    type InsertCSSOptions = Electron.InsertCSSOptions;
+    type IpcMessageEvent = Electron.IpcMessageEvent;
+    type Item = Electron.Item;
+    type JumpListSettings = Electron.JumpListSettings;
+    type LoadCommitEvent = Electron.LoadCommitEvent;
+    type LoadExtensionOptions = Electron.LoadExtensionOptions;
+    type LoadFileOptions = Electron.LoadFileOptions;
+    type LoadURLOptions = Electron.LoadURLOptions;
+    type LoginItemSettings = Electron.LoginItemSettings;
+    type LoginItemSettingsOptions = Electron.LoginItemSettingsOptions;
+    type MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
+    type MessageBoxOptions = Electron.MessageBoxOptions;
+    type MessageBoxReturnValue = Electron.MessageBoxReturnValue;
+    type MessageBoxSyncOptions = Electron.MessageBoxSyncOptions;
+    type MessageDetails = Electron.MessageDetails;
+    type MessageEvent = Electron.MessageEvent;
+    type MoveToApplicationsFolderOptions = Electron.MoveToApplicationsFolderOptions;
+    type NewWindowEvent = Electron.NewWindowEvent;
+    type NotificationConstructorOptions = Electron.NotificationConstructorOptions;
+    type OnBeforeRedirectListenerDetails = Electron.OnBeforeRedirectListenerDetails;
+    type OnBeforeRequestListenerDetails = Electron.OnBeforeRequestListenerDetails;
+    type OnBeforeSendHeadersListenerDetails = Electron.OnBeforeSendHeadersListenerDetails;
+    type OnCompletedListenerDetails = Electron.OnCompletedListenerDetails;
+    type OnErrorOccurredListenerDetails = Electron.OnErrorOccurredListenerDetails;
+    type OnHeadersReceivedListenerDetails = Electron.OnHeadersReceivedListenerDetails;
+    type OnResponseStartedListenerDetails = Electron.OnResponseStartedListenerDetails;
+    type OnSendHeadersListenerDetails = Electron.OnSendHeadersListenerDetails;
+    type OpenDevToolsOptions = Electron.OpenDevToolsOptions;
+    type OpenDialogOptions = Electron.OpenDialogOptions;
+    type OpenDialogReturnValue = Electron.OpenDialogReturnValue;
+    type OpenDialogSyncOptions = Electron.OpenDialogSyncOptions;
+    type OpenExternalOptions = Electron.OpenExternalOptions;
+    type Options = Electron.Options;
+    type PageFaviconUpdatedEvent = Electron.PageFaviconUpdatedEvent;
+    type PageTitleUpdatedEvent = Electron.PageTitleUpdatedEvent;
+    type Parameters = Electron.Parameters;
+    type Payment = Electron.Payment;
+    type PermissionCheckHandlerHandlerDetails = Electron.PermissionCheckHandlerHandlerDetails;
+    type PermissionRequestHandlerHandlerDetails = Electron.PermissionRequestHandlerHandlerDetails;
+    type PluginCrashedEvent = Electron.PluginCrashedEvent;
+    type PopupOptions = Electron.PopupOptions;
+    type PreconnectOptions = Electron.PreconnectOptions;
+    type PrintToPDFOptions = Electron.PrintToPDFOptions;
+    type Privileges = Electron.Privileges;
+    type ProgressBarOptions = Electron.ProgressBarOptions;
+    type Provider = Electron.Provider;
+    type ReadBookmark = Electron.ReadBookmark;
+    type RegistrationCompletedDetails = Electron.RegistrationCompletedDetails;
+    type RelaunchOptions = Electron.RelaunchOptions;
+    type RenderProcessGoneDetails = Electron.RenderProcessGoneDetails;
+    type Request = Electron.Request;
+    type ResizeOptions = Electron.ResizeOptions;
+    type ResourceUsage = Electron.ResourceUsage;
+    type Response = Electron.Response;
+    type Result = Electron.Result;
+    type SaveDialogOptions = Electron.SaveDialogOptions;
+    type SaveDialogReturnValue = Electron.SaveDialogReturnValue;
+    type SaveDialogSyncOptions = Electron.SaveDialogSyncOptions;
+    type SelectHidDeviceDetails = Electron.SelectHidDeviceDetails;
+    type Settings = Electron.Settings;
+    type SourcesOptions = Electron.SourcesOptions;
+    type SSLConfigConfig = Electron.SSLConfigConfig;
+    type StartLoggingOptions = Electron.StartLoggingOptions;
+    type SystemMemoryInfo = Electron.SystemMemoryInfo;
+    type TitleBarOverlayOptions = Electron.TitleBarOverlayOptions;
+    type TitleOptions = Electron.TitleOptions;
+    type ToBitmapOptions = Electron.ToBitmapOptions;
+    type ToDataURLOptions = Electron.ToDataURLOptions;
+    type ToPNGOptions = Electron.ToPNGOptions;
+    type TouchBarButtonConstructorOptions = Electron.TouchBarButtonConstructorOptions;
+    type TouchBarColorPickerConstructorOptions = Electron.TouchBarColorPickerConstructorOptions;
+    type TouchBarConstructorOptions = Electron.TouchBarConstructorOptions;
+    type TouchBarGroupConstructorOptions = Electron.TouchBarGroupConstructorOptions;
+    type TouchBarLabelConstructorOptions = Electron.TouchBarLabelConstructorOptions;
+    type TouchBarPopoverConstructorOptions = Electron.TouchBarPopoverConstructorOptions;
+    type TouchBarScrubberConstructorOptions = Electron.TouchBarScrubberConstructorOptions;
+    type TouchBarSegmentedControlConstructorOptions = Electron.TouchBarSegmentedControlConstructorOptions;
+    type TouchBarSliderConstructorOptions = Electron.TouchBarSliderConstructorOptions;
+    type TouchBarSpacerConstructorOptions = Electron.TouchBarSpacerConstructorOptions;
+    type TraceBufferUsageReturnValue = Electron.TraceBufferUsageReturnValue;
+    type UpdateTargetUrlEvent = Electron.UpdateTargetUrlEvent;
+    type UploadProgress = Electron.UploadProgress;
+    type VisibleOnAllWorkspacesOptions = Electron.VisibleOnAllWorkspacesOptions;
+    type WebContentsPrintOptions = Electron.WebContentsPrintOptions;
+    type WebviewTagPrintOptions = Electron.WebviewTagPrintOptions;
+    type WillNavigateEvent = Electron.WillNavigateEvent;
+    type WillResizeDetails = Electron.WillResizeDetails;
+    type EditFlags = Electron.EditFlags;
+    type FoundInPageResult = Electron.FoundInPageResult;
+    type LaunchItems = Electron.LaunchItems;
+    type Margins = Electron.Margins;
+    type MediaFlags = Electron.MediaFlags;
+    type PageRanges = Electron.PageRanges;
+    type Params = Electron.Params;
+    type TitleBarOverlay = Electron.TitleBarOverlay;
+    type WebPreferences = Electron.WebPreferences;
+    type DefaultFontFamily = Electron.DefaultFontFamily;
+    type BluetoothDevice = Electron.BluetoothDevice;
+    type Certificate = Electron.Certificate;
+    type CertificatePrincipal = Electron.CertificatePrincipal;
+    type Cookie = Electron.Cookie;
+    type CPUUsage = Electron.CPUUsage;
+    type CrashReport = Electron.CrashReport;
+    type CustomScheme = Electron.CustomScheme;
+    type DesktopCapturerSource = Electron.DesktopCapturerSource;
+    type Display = Electron.Display;
+    type Event = Electron.Event;
+    type Extension = Electron.Extension;
+    type ExtensionInfo = Electron.ExtensionInfo;
+    type FileFilter = Electron.FileFilter;
+    type FilePathWithHeaders = Electron.FilePathWithHeaders;
+    type GPUFeatureStatus = Electron.GPUFeatureStatus;
+    type HIDDevice = Electron.HIDDevice;
+    type InputEvent = Electron.InputEvent;
+    type IOCounters = Electron.IOCounters;
+    type IpcMainEvent = Electron.IpcMainEvent;
+    type IpcMainInvokeEvent = Electron.IpcMainInvokeEvent;
+    type IpcRendererEvent = Electron.IpcRendererEvent;
+    type JumpListCategory = Electron.JumpListCategory;
+    type JumpListItem = Electron.JumpListItem;
+    type KeyboardEvent = Electron.KeyboardEvent;
+    type KeyboardInputEvent = Electron.KeyboardInputEvent;
+    type MemoryInfo = Electron.MemoryInfo;
+    type MemoryUsageDetails = Electron.MemoryUsageDetails;
+    type MimeTypedBuffer = Electron.MimeTypedBuffer;
+    type MouseInputEvent = Electron.MouseInputEvent;
+    type MouseWheelInputEvent = Electron.MouseWheelInputEvent;
+    type NewWindowWebContentsEvent = Electron.NewWindowWebContentsEvent;
+    type NotificationAction = Electron.NotificationAction;
+    type NotificationResponse = Electron.NotificationResponse;
+    type PaymentDiscount = Electron.PaymentDiscount;
+    type Point = Electron.Point;
+    type PostBody = Electron.PostBody;
+    type PrinterInfo = Electron.PrinterInfo;
+    type ProcessMemoryInfo = Electron.ProcessMemoryInfo;
+    type ProcessMetric = Electron.ProcessMetric;
+    type Product = Electron.Product;
+    type ProductDiscount = Electron.ProductDiscount;
+    type ProductSubscriptionPeriod = Electron.ProductSubscriptionPeriod;
+    type ProtocolRequest = Electron.ProtocolRequest;
+    type ProtocolResponse = Electron.ProtocolResponse;
+    type ProtocolResponseUploadData = Electron.ProtocolResponseUploadData;
+    type Rectangle = Electron.Rectangle;
+    type Referrer = Electron.Referrer;
+    type ScrubberItem = Electron.ScrubberItem;
+    type SegmentedControlSegment = Electron.SegmentedControlSegment;
+    type SerialPort = Electron.SerialPort;
+    type ServiceWorkerInfo = Electron.ServiceWorkerInfo;
+    type SharedWorkerInfo = Electron.SharedWorkerInfo;
+    type SharingItem = Electron.SharingItem;
+    type ShortcutDetails = Electron.ShortcutDetails;
+    type Size = Electron.Size;
+    type Task = Electron.Task;
+    type ThumbarButton = Electron.ThumbarButton;
+    type TraceCategoriesAndOptions = Electron.TraceCategoriesAndOptions;
+    type TraceConfig = Electron.TraceConfig;
+    type Transaction = Electron.Transaction;
+    type UploadData = Electron.UploadData;
+    type UploadFile = Electron.UploadFile;
+    type UploadRawData = Electron.UploadRawData;
+    type UserDefaultTypes = Electron.UserDefaultTypes;
+    type WebRequestFilter = Electron.WebRequestFilter;
+    type WebSource = Electron.WebSource;
+  }
+
+  namespace Main {
+    const app: App;
+    type App = Electron.App;
+    const autoUpdater: AutoUpdater;
+    type AutoUpdater = Electron.AutoUpdater;
+    class BrowserView extends Electron.BrowserView {}
+    class BrowserWindow extends Electron.BrowserWindow {}
+    type ClientRequest = Electron.ClientRequest;
+    type CommandLine = Electron.CommandLine;
+    const contentTracing: ContentTracing;
+    type ContentTracing = Electron.ContentTracing;
+    type Cookies = Electron.Cookies;
+    type Debugger = Electron.Debugger;
+    const desktopCapturer: DesktopCapturer;
+    type DesktopCapturer = Electron.DesktopCapturer;
+    const dialog: Dialog;
+    type Dialog = Electron.Dialog;
+    type Dock = Electron.Dock;
+    type DownloadItem = Electron.DownloadItem;
+    const globalShortcut: GlobalShortcut;
+    type GlobalShortcut = Electron.GlobalShortcut;
+    const inAppPurchase: InAppPurchase;
+    type InAppPurchase = Electron.InAppPurchase;
+    type IncomingMessage = Electron.IncomingMessage;
+    const ipcMain: IpcMain;
+    type IpcMain = Electron.IpcMain;
+    class Menu extends Electron.Menu {}
+    class MenuItem extends Electron.MenuItem {}
+    class MessageChannelMain extends Electron.MessageChannelMain {}
+    type MessagePortMain = Electron.MessagePortMain;
+    const nativeTheme: NativeTheme;
+    type NativeTheme = Electron.NativeTheme;
+    const net: Net;
+    type Net = Electron.Net;
+    const netLog: NetLog;
+    type NetLog = Electron.NetLog;
+    class Notification extends Electron.Notification {}
+    const powerMonitor: PowerMonitor;
+    type PowerMonitor = Electron.PowerMonitor;
+    const powerSaveBlocker: PowerSaveBlocker;
+    type PowerSaveBlocker = Electron.PowerSaveBlocker;
+    const protocol: Protocol;
+    type Protocol = Electron.Protocol;
+    const pushNotifications: PushNotifications;
+    type PushNotifications = Electron.PushNotifications;
+    const safeStorage: SafeStorage;
+    type SafeStorage = Electron.SafeStorage;
+    const screen: Screen;
+    type Screen = Electron.Screen;
+    type ServiceWorkers = Electron.ServiceWorkers;
+    const session: typeof Session;
+    type Session = Electron.Session;
+    class ShareMenu extends Electron.ShareMenu {}
+    const systemPreferences: SystemPreferences;
+    type SystemPreferences = Electron.SystemPreferences;
+    class TouchBar extends Electron.TouchBar {}
+    type TouchBarButton = Electron.TouchBarButton;
+    type TouchBarColorPicker = Electron.TouchBarColorPicker;
+    type TouchBarGroup = Electron.TouchBarGroup;
+    type TouchBarLabel = Electron.TouchBarLabel;
+    type TouchBarOtherItemsProxy = Electron.TouchBarOtherItemsProxy;
+    type TouchBarPopover = Electron.TouchBarPopover;
+    type TouchBarScrubber = Electron.TouchBarScrubber;
+    type TouchBarSegmentedControl = Electron.TouchBarSegmentedControl;
+    type TouchBarSlider = Electron.TouchBarSlider;
+    type TouchBarSpacer = Electron.TouchBarSpacer;
+    class Tray extends Electron.Tray {}
+    const webContents: typeof WebContents;
+    type WebContents = Electron.WebContents;
+    const webFrameMain: typeof WebFrameMain;
+    type WebFrameMain = Electron.WebFrameMain;
+    type WebRequest = Electron.WebRequest;
+    type AboutPanelOptionsOptions = Electron.AboutPanelOptionsOptions;
+    type AddRepresentationOptions = Electron.AddRepresentationOptions;
+    type AnimationSettings = Electron.AnimationSettings;
+    type AppDetailsOptions = Electron.AppDetailsOptions;
+    type ApplicationInfoForProtocolReturnValue = Electron.ApplicationInfoForProtocolReturnValue;
+    type AuthenticationResponseDetails = Electron.AuthenticationResponseDetails;
+    type AuthInfo = Electron.AuthInfo;
+    type AutoResizeOptions = Electron.AutoResizeOptions;
+    type BeforeSendResponse = Electron.BeforeSendResponse;
+    type BitmapOptions = Electron.BitmapOptions;
+    type BlinkMemoryInfo = Electron.BlinkMemoryInfo;
+    type BluetoothPairingHandlerHandlerDetails = Electron.BluetoothPairingHandlerHandlerDetails;
+    type BrowserViewConstructorOptions = Electron.BrowserViewConstructorOptions;
+    type BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions;
+    type CallbackResponse = Electron.CallbackResponse;
+    type CertificateTrustDialogOptions = Electron.CertificateTrustDialogOptions;
+    type ClearCodeCachesOptions = Electron.ClearCodeCachesOptions;
+    type ClearStorageDataOptions = Electron.ClearStorageDataOptions;
+    type ClientRequestConstructorOptions = Electron.ClientRequestConstructorOptions;
+    type Config = Electron.Config;
+    type ConfigureHostResolverOptions = Electron.ConfigureHostResolverOptions;
+    type ConsoleMessageEvent = Electron.ConsoleMessageEvent;
+    type ContextMenuEvent = Electron.ContextMenuEvent;
+    type ContextMenuParams = Electron.ContextMenuParams;
+    type ContinueActivityDetails = Electron.ContinueActivityDetails;
+    type CookiesGetFilter = Electron.CookiesGetFilter;
+    type CookiesSetDetails = Electron.CookiesSetDetails;
+    type CrashReporterStartOptions = Electron.CrashReporterStartOptions;
+    type CreateFromBitmapOptions = Electron.CreateFromBitmapOptions;
+    type CreateFromBufferOptions = Electron.CreateFromBufferOptions;
+    type CreateInterruptedDownloadOptions = Electron.CreateInterruptedDownloadOptions;
+    type Data = Electron.Data;
+    type Details = Electron.Details;
+    type DevicePermissionHandlerHandlerDetails = Electron.DevicePermissionHandlerHandlerDetails;
+    type DidChangeThemeColorEvent = Electron.DidChangeThemeColorEvent;
+    type DidCreateWindowDetails = Electron.DidCreateWindowDetails;
+    type DidFailLoadEvent = Electron.DidFailLoadEvent;
+    type DidFrameFinishLoadEvent = Electron.DidFrameFinishLoadEvent;
+    type DidFrameNavigateEvent = Electron.DidFrameNavigateEvent;
+    type DidNavigateEvent = Electron.DidNavigateEvent;
+    type DidNavigateInPageEvent = Electron.DidNavigateInPageEvent;
+    type DidRedirectNavigationEvent = Electron.DidRedirectNavigationEvent;
+    type DidStartNavigationEvent = Electron.DidStartNavigationEvent;
+    type DisplayBalloonOptions = Electron.DisplayBalloonOptions;
+    type EnableNetworkEmulationOptions = Electron.EnableNetworkEmulationOptions;
+    type FeedURLOptions = Electron.FeedURLOptions;
+    type FileIconOptions = Electron.FileIconOptions;
+    type FindInPageOptions = Electron.FindInPageOptions;
+    type FocusOptions = Electron.FocusOptions;
+    type FoundInPageEvent = Electron.FoundInPageEvent;
+    type FrameCreatedDetails = Electron.FrameCreatedDetails;
+    type FromPartitionOptions = Electron.FromPartitionOptions;
+    type HandlerDetails = Electron.HandlerDetails;
+    type HeadersReceivedResponse = Electron.HeadersReceivedResponse;
+    type HeapStatistics = Electron.HeapStatistics;
+    type HidDeviceAddedDetails = Electron.HidDeviceAddedDetails;
+    type HidDeviceRemovedDetails = Electron.HidDeviceRemovedDetails;
+    type HidDeviceRevokedDetails = Electron.HidDeviceRevokedDetails;
+    type IgnoreMouseEventsOptions = Electron.IgnoreMouseEventsOptions;
+    type ImportCertificateOptions = Electron.ImportCertificateOptions;
+    type Info = Electron.Info;
+    type Input = Electron.Input;
+    type InsertCSSOptions = Electron.InsertCSSOptions;
+    type IpcMessageEvent = Electron.IpcMessageEvent;
+    type Item = Electron.Item;
+    type JumpListSettings = Electron.JumpListSettings;
+    type LoadCommitEvent = Electron.LoadCommitEvent;
+    type LoadExtensionOptions = Electron.LoadExtensionOptions;
+    type LoadFileOptions = Electron.LoadFileOptions;
+    type LoadURLOptions = Electron.LoadURLOptions;
+    type LoginItemSettings = Electron.LoginItemSettings;
+    type LoginItemSettingsOptions = Electron.LoginItemSettingsOptions;
+    type MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
+    type MessageBoxOptions = Electron.MessageBoxOptions;
+    type MessageBoxReturnValue = Electron.MessageBoxReturnValue;
+    type MessageBoxSyncOptions = Electron.MessageBoxSyncOptions;
+    type MessageDetails = Electron.MessageDetails;
+    type MessageEvent = Electron.MessageEvent;
+    type MoveToApplicationsFolderOptions = Electron.MoveToApplicationsFolderOptions;
+    type NewWindowEvent = Electron.NewWindowEvent;
+    type NotificationConstructorOptions = Electron.NotificationConstructorOptions;
+    type OnBeforeRedirectListenerDetails = Electron.OnBeforeRedirectListenerDetails;
+    type OnBeforeRequestListenerDetails = Electron.OnBeforeRequestListenerDetails;
+    type OnBeforeSendHeadersListenerDetails = Electron.OnBeforeSendHeadersListenerDetails;
+    type OnCompletedListenerDetails = Electron.OnCompletedListenerDetails;
+    type OnErrorOccurredListenerDetails = Electron.OnErrorOccurredListenerDetails;
+    type OnHeadersReceivedListenerDetails = Electron.OnHeadersReceivedListenerDetails;
+    type OnResponseStartedListenerDetails = Electron.OnResponseStartedListenerDetails;
+    type OnSendHeadersListenerDetails = Electron.OnSendHeadersListenerDetails;
+    type OpenDevToolsOptions = Electron.OpenDevToolsOptions;
+    type OpenDialogOptions = Electron.OpenDialogOptions;
+    type OpenDialogReturnValue = Electron.OpenDialogReturnValue;
+    type OpenDialogSyncOptions = Electron.OpenDialogSyncOptions;
+    type OpenExternalOptions = Electron.OpenExternalOptions;
+    type Options = Electron.Options;
+    type PageFaviconUpdatedEvent = Electron.PageFaviconUpdatedEvent;
+    type PageTitleUpdatedEvent = Electron.PageTitleUpdatedEvent;
+    type Parameters = Electron.Parameters;
+    type Payment = Electron.Payment;
+    type PermissionCheckHandlerHandlerDetails = Electron.PermissionCheckHandlerHandlerDetails;
+    type PermissionRequestHandlerHandlerDetails = Electron.PermissionRequestHandlerHandlerDetails;
+    type PluginCrashedEvent = Electron.PluginCrashedEvent;
+    type PopupOptions = Electron.PopupOptions;
+    type PreconnectOptions = Electron.PreconnectOptions;
+    type PrintToPDFOptions = Electron.PrintToPDFOptions;
+    type Privileges = Electron.Privileges;
+    type ProgressBarOptions = Electron.ProgressBarOptions;
+    type Provider = Electron.Provider;
+    type ReadBookmark = Electron.ReadBookmark;
+    type RegistrationCompletedDetails = Electron.RegistrationCompletedDetails;
+    type RelaunchOptions = Electron.RelaunchOptions;
+    type RenderProcessGoneDetails = Electron.RenderProcessGoneDetails;
+    type Request = Electron.Request;
+    type ResizeOptions = Electron.ResizeOptions;
+    type ResourceUsage = Electron.ResourceUsage;
+    type Response = Electron.Response;
+    type Result = Electron.Result;
+    type SaveDialogOptions = Electron.SaveDialogOptions;
+    type SaveDialogReturnValue = Electron.SaveDialogReturnValue;
+    type SaveDialogSyncOptions = Electron.SaveDialogSyncOptions;
+    type SelectHidDeviceDetails = Electron.SelectHidDeviceDetails;
+    type Settings = Electron.Settings;
+    type SourcesOptions = Electron.SourcesOptions;
+    type SSLConfigConfig = Electron.SSLConfigConfig;
+    type StartLoggingOptions = Electron.StartLoggingOptions;
+    type SystemMemoryInfo = Electron.SystemMemoryInfo;
+    type TitleBarOverlayOptions = Electron.TitleBarOverlayOptions;
+    type TitleOptions = Electron.TitleOptions;
+    type ToBitmapOptions = Electron.ToBitmapOptions;
+    type ToDataURLOptions = Electron.ToDataURLOptions;
+    type ToPNGOptions = Electron.ToPNGOptions;
+    type TouchBarButtonConstructorOptions = Electron.TouchBarButtonConstructorOptions;
+    type TouchBarColorPickerConstructorOptions = Electron.TouchBarColorPickerConstructorOptions;
+    type TouchBarConstructorOptions = Electron.TouchBarConstructorOptions;
+    type TouchBarGroupConstructorOptions = Electron.TouchBarGroupConstructorOptions;
+    type TouchBarLabelConstructorOptions = Electron.TouchBarLabelConstructorOptions;
+    type TouchBarPopoverConstructorOptions = Electron.TouchBarPopoverConstructorOptions;
+    type TouchBarScrubberConstructorOptions = Electron.TouchBarScrubberConstructorOptions;
+    type TouchBarSegmentedControlConstructorOptions = Electron.TouchBarSegmentedControlConstructorOptions;
+    type TouchBarSliderConstructorOptions = Electron.TouchBarSliderConstructorOptions;
+    type TouchBarSpacerConstructorOptions = Electron.TouchBarSpacerConstructorOptions;
+    type TraceBufferUsageReturnValue = Electron.TraceBufferUsageReturnValue;
+    type UpdateTargetUrlEvent = Electron.UpdateTargetUrlEvent;
+    type UploadProgress = Electron.UploadProgress;
+    type VisibleOnAllWorkspacesOptions = Electron.VisibleOnAllWorkspacesOptions;
+    type WebContentsPrintOptions = Electron.WebContentsPrintOptions;
+    type WebviewTagPrintOptions = Electron.WebviewTagPrintOptions;
+    type WillNavigateEvent = Electron.WillNavigateEvent;
+    type WillResizeDetails = Electron.WillResizeDetails;
+    type EditFlags = Electron.EditFlags;
+    type FoundInPageResult = Electron.FoundInPageResult;
+    type LaunchItems = Electron.LaunchItems;
+    type Margins = Electron.Margins;
+    type MediaFlags = Electron.MediaFlags;
+    type PageRanges = Electron.PageRanges;
+    type Params = Electron.Params;
+    type TitleBarOverlay = Electron.TitleBarOverlay;
+    type WebPreferences = Electron.WebPreferences;
+    type DefaultFontFamily = Electron.DefaultFontFamily;
+    type BluetoothDevice = Electron.BluetoothDevice;
+    type Certificate = Electron.Certificate;
+    type CertificatePrincipal = Electron.CertificatePrincipal;
+    type Cookie = Electron.Cookie;
+    type CPUUsage = Electron.CPUUsage;
+    type CrashReport = Electron.CrashReport;
+    type CustomScheme = Electron.CustomScheme;
+    type DesktopCapturerSource = Electron.DesktopCapturerSource;
+    type Display = Electron.Display;
+    type Event = Electron.Event;
+    type Extension = Electron.Extension;
+    type ExtensionInfo = Electron.ExtensionInfo;
+    type FileFilter = Electron.FileFilter;
+    type FilePathWithHeaders = Electron.FilePathWithHeaders;
+    type GPUFeatureStatus = Electron.GPUFeatureStatus;
+    type HIDDevice = Electron.HIDDevice;
+    type InputEvent = Electron.InputEvent;
+    type IOCounters = Electron.IOCounters;
+    type IpcMainEvent = Electron.IpcMainEvent;
+    type IpcMainInvokeEvent = Electron.IpcMainInvokeEvent;
+    type IpcRendererEvent = Electron.IpcRendererEvent;
+    type JumpListCategory = Electron.JumpListCategory;
+    type JumpListItem = Electron.JumpListItem;
+    type KeyboardEvent = Electron.KeyboardEvent;
+    type KeyboardInputEvent = Electron.KeyboardInputEvent;
+    type MemoryInfo = Electron.MemoryInfo;
+    type MemoryUsageDetails = Electron.MemoryUsageDetails;
+    type MimeTypedBuffer = Electron.MimeTypedBuffer;
+    type MouseInputEvent = Electron.MouseInputEvent;
+    type MouseWheelInputEvent = Electron.MouseWheelInputEvent;
+    type NewWindowWebContentsEvent = Electron.NewWindowWebContentsEvent;
+    type NotificationAction = Electron.NotificationAction;
+    type NotificationResponse = Electron.NotificationResponse;
+    type PaymentDiscount = Electron.PaymentDiscount;
+    type Point = Electron.Point;
+    type PostBody = Electron.PostBody;
+    type PrinterInfo = Electron.PrinterInfo;
+    type ProcessMemoryInfo = Electron.ProcessMemoryInfo;
+    type ProcessMetric = Electron.ProcessMetric;
+    type Product = Electron.Product;
+    type ProductDiscount = Electron.ProductDiscount;
+    type ProductSubscriptionPeriod = Electron.ProductSubscriptionPeriod;
+    type ProtocolRequest = Electron.ProtocolRequest;
+    type ProtocolResponse = Electron.ProtocolResponse;
+    type ProtocolResponseUploadData = Electron.ProtocolResponseUploadData;
+    type Rectangle = Electron.Rectangle;
+    type Referrer = Electron.Referrer;
+    type ScrubberItem = Electron.ScrubberItem;
+    type SegmentedControlSegment = Electron.SegmentedControlSegment;
+    type SerialPort = Electron.SerialPort;
+    type ServiceWorkerInfo = Electron.ServiceWorkerInfo;
+    type SharedWorkerInfo = Electron.SharedWorkerInfo;
+    type SharingItem = Electron.SharingItem;
+    type ShortcutDetails = Electron.ShortcutDetails;
+    type Size = Electron.Size;
+    type Task = Electron.Task;
+    type ThumbarButton = Electron.ThumbarButton;
+    type TraceCategoriesAndOptions = Electron.TraceCategoriesAndOptions;
+    type TraceConfig = Electron.TraceConfig;
+    type Transaction = Electron.Transaction;
+    type UploadData = Electron.UploadData;
+    type UploadFile = Electron.UploadFile;
+    type UploadRawData = Electron.UploadRawData;
+    type UserDefaultTypes = Electron.UserDefaultTypes;
+    type WebRequestFilter = Electron.WebRequestFilter;
+    type WebSource = Electron.WebSource;
+  }
+
+  namespace Renderer {
+    const contextBridge: ContextBridge;
+    type ContextBridge = Electron.ContextBridge;
+    const ipcRenderer: IpcRenderer;
+    type IpcRenderer = Electron.IpcRenderer;
+    const webFrame: WebFrame;
+    type WebFrame = Electron.WebFrame;
+    type AboutPanelOptionsOptions = Electron.AboutPanelOptionsOptions;
+    type AddRepresentationOptions = Electron.AddRepresentationOptions;
+    type AnimationSettings = Electron.AnimationSettings;
+    type AppDetailsOptions = Electron.AppDetailsOptions;
+    type ApplicationInfoForProtocolReturnValue = Electron.ApplicationInfoForProtocolReturnValue;
+    type AuthenticationResponseDetails = Electron.AuthenticationResponseDetails;
+    type AuthInfo = Electron.AuthInfo;
+    type AutoResizeOptions = Electron.AutoResizeOptions;
+    type BeforeSendResponse = Electron.BeforeSendResponse;
+    type BitmapOptions = Electron.BitmapOptions;
+    type BlinkMemoryInfo = Electron.BlinkMemoryInfo;
+    type BluetoothPairingHandlerHandlerDetails = Electron.BluetoothPairingHandlerHandlerDetails;
+    type BrowserViewConstructorOptions = Electron.BrowserViewConstructorOptions;
+    type BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions;
+    type CallbackResponse = Electron.CallbackResponse;
+    type CertificateTrustDialogOptions = Electron.CertificateTrustDialogOptions;
+    type ClearCodeCachesOptions = Electron.ClearCodeCachesOptions;
+    type ClearStorageDataOptions = Electron.ClearStorageDataOptions;
+    type ClientRequestConstructorOptions = Electron.ClientRequestConstructorOptions;
+    type Config = Electron.Config;
+    type ConfigureHostResolverOptions = Electron.ConfigureHostResolverOptions;
+    type ConsoleMessageEvent = Electron.ConsoleMessageEvent;
+    type ContextMenuEvent = Electron.ContextMenuEvent;
+    type ContextMenuParams = Electron.ContextMenuParams;
+    type ContinueActivityDetails = Electron.ContinueActivityDetails;
+    type CookiesGetFilter = Electron.CookiesGetFilter;
+    type CookiesSetDetails = Electron.CookiesSetDetails;
+    type CrashReporterStartOptions = Electron.CrashReporterStartOptions;
+    type CreateFromBitmapOptions = Electron.CreateFromBitmapOptions;
+    type CreateFromBufferOptions = Electron.CreateFromBufferOptions;
+    type CreateInterruptedDownloadOptions = Electron.CreateInterruptedDownloadOptions;
+    type Data = Electron.Data;
+    type Details = Electron.Details;
+    type DevicePermissionHandlerHandlerDetails = Electron.DevicePermissionHandlerHandlerDetails;
+    type DidChangeThemeColorEvent = Electron.DidChangeThemeColorEvent;
+    type DidCreateWindowDetails = Electron.DidCreateWindowDetails;
+    type DidFailLoadEvent = Electron.DidFailLoadEvent;
+    type DidFrameFinishLoadEvent = Electron.DidFrameFinishLoadEvent;
+    type DidFrameNavigateEvent = Electron.DidFrameNavigateEvent;
+    type DidNavigateEvent = Electron.DidNavigateEvent;
+    type DidNavigateInPageEvent = Electron.DidNavigateInPageEvent;
+    type DidRedirectNavigationEvent = Electron.DidRedirectNavigationEvent;
+    type DidStartNavigationEvent = Electron.DidStartNavigationEvent;
+    type DisplayBalloonOptions = Electron.DisplayBalloonOptions;
+    type EnableNetworkEmulationOptions = Electron.EnableNetworkEmulationOptions;
+    type FeedURLOptions = Electron.FeedURLOptions;
+    type FileIconOptions = Electron.FileIconOptions;
+    type FindInPageOptions = Electron.FindInPageOptions;
+    type FocusOptions = Electron.FocusOptions;
+    type FoundInPageEvent = Electron.FoundInPageEvent;
+    type FrameCreatedDetails = Electron.FrameCreatedDetails;
+    type FromPartitionOptions = Electron.FromPartitionOptions;
+    type HandlerDetails = Electron.HandlerDetails;
+    type HeadersReceivedResponse = Electron.HeadersReceivedResponse;
+    type HeapStatistics = Electron.HeapStatistics;
+    type HidDeviceAddedDetails = Electron.HidDeviceAddedDetails;
+    type HidDeviceRemovedDetails = Electron.HidDeviceRemovedDetails;
+    type HidDeviceRevokedDetails = Electron.HidDeviceRevokedDetails;
+    type IgnoreMouseEventsOptions = Electron.IgnoreMouseEventsOptions;
+    type ImportCertificateOptions = Electron.ImportCertificateOptions;
+    type Info = Electron.Info;
+    type Input = Electron.Input;
+    type InsertCSSOptions = Electron.InsertCSSOptions;
+    type IpcMessageEvent = Electron.IpcMessageEvent;
+    type Item = Electron.Item;
+    type JumpListSettings = Electron.JumpListSettings;
+    type LoadCommitEvent = Electron.LoadCommitEvent;
+    type LoadExtensionOptions = Electron.LoadExtensionOptions;
+    type LoadFileOptions = Electron.LoadFileOptions;
+    type LoadURLOptions = Electron.LoadURLOptions;
+    type LoginItemSettings = Electron.LoginItemSettings;
+    type LoginItemSettingsOptions = Electron.LoginItemSettingsOptions;
+    type MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
+    type MessageBoxOptions = Electron.MessageBoxOptions;
+    type MessageBoxReturnValue = Electron.MessageBoxReturnValue;
+    type MessageBoxSyncOptions = Electron.MessageBoxSyncOptions;
+    type MessageDetails = Electron.MessageDetails;
+    type MessageEvent = Electron.MessageEvent;
+    type MoveToApplicationsFolderOptions = Electron.MoveToApplicationsFolderOptions;
+    type NewWindowEvent = Electron.NewWindowEvent;
+    type NotificationConstructorOptions = Electron.NotificationConstructorOptions;
+    type OnBeforeRedirectListenerDetails = Electron.OnBeforeRedirectListenerDetails;
+    type OnBeforeRequestListenerDetails = Electron.OnBeforeRequestListenerDetails;
+    type OnBeforeSendHeadersListenerDetails = Electron.OnBeforeSendHeadersListenerDetails;
+    type OnCompletedListenerDetails = Electron.OnCompletedListenerDetails;
+    type OnErrorOccurredListenerDetails = Electron.OnErrorOccurredListenerDetails;
+    type OnHeadersReceivedListenerDetails = Electron.OnHeadersReceivedListenerDetails;
+    type OnResponseStartedListenerDetails = Electron.OnResponseStartedListenerDetails;
+    type OnSendHeadersListenerDetails = Electron.OnSendHeadersListenerDetails;
+    type OpenDevToolsOptions = Electron.OpenDevToolsOptions;
+    type OpenDialogOptions = Electron.OpenDialogOptions;
+    type OpenDialogReturnValue = Electron.OpenDialogReturnValue;
+    type OpenDialogSyncOptions = Electron.OpenDialogSyncOptions;
+    type OpenExternalOptions = Electron.OpenExternalOptions;
+    type Options = Electron.Options;
+    type PageFaviconUpdatedEvent = Electron.PageFaviconUpdatedEvent;
+    type PageTitleUpdatedEvent = Electron.PageTitleUpdatedEvent;
+    type Parameters = Electron.Parameters;
+    type Payment = Electron.Payment;
+    type PermissionCheckHandlerHandlerDetails = Electron.PermissionCheckHandlerHandlerDetails;
+    type PermissionRequestHandlerHandlerDetails = Electron.PermissionRequestHandlerHandlerDetails;
+    type PluginCrashedEvent = Electron.PluginCrashedEvent;
+    type PopupOptions = Electron.PopupOptions;
+    type PreconnectOptions = Electron.PreconnectOptions;
+    type PrintToPDFOptions = Electron.PrintToPDFOptions;
+    type Privileges = Electron.Privileges;
+    type ProgressBarOptions = Electron.ProgressBarOptions;
+    type Provider = Electron.Provider;
+    type ReadBookmark = Electron.ReadBookmark;
+    type RegistrationCompletedDetails = Electron.RegistrationCompletedDetails;
+    type RelaunchOptions = Electron.RelaunchOptions;
+    type RenderProcessGoneDetails = Electron.RenderProcessGoneDetails;
+    type Request = Electron.Request;
+    type ResizeOptions = Electron.ResizeOptions;
+    type ResourceUsage = Electron.ResourceUsage;
+    type Response = Electron.Response;
+    type Result = Electron.Result;
+    type SaveDialogOptions = Electron.SaveDialogOptions;
+    type SaveDialogReturnValue = Electron.SaveDialogReturnValue;
+    type SaveDialogSyncOptions = Electron.SaveDialogSyncOptions;
+    type SelectHidDeviceDetails = Electron.SelectHidDeviceDetails;
+    type Settings = Electron.Settings;
+    type SourcesOptions = Electron.SourcesOptions;
+    type SSLConfigConfig = Electron.SSLConfigConfig;
+    type StartLoggingOptions = Electron.StartLoggingOptions;
+    type SystemMemoryInfo = Electron.SystemMemoryInfo;
+    type TitleBarOverlayOptions = Electron.TitleBarOverlayOptions;
+    type TitleOptions = Electron.TitleOptions;
+    type ToBitmapOptions = Electron.ToBitmapOptions;
+    type ToDataURLOptions = Electron.ToDataURLOptions;
+    type ToPNGOptions = Electron.ToPNGOptions;
+    type TouchBarButtonConstructorOptions = Electron.TouchBarButtonConstructorOptions;
+    type TouchBarColorPickerConstructorOptions = Electron.TouchBarColorPickerConstructorOptions;
+    type TouchBarConstructorOptions = Electron.TouchBarConstructorOptions;
+    type TouchBarGroupConstructorOptions = Electron.TouchBarGroupConstructorOptions;
+    type TouchBarLabelConstructorOptions = Electron.TouchBarLabelConstructorOptions;
+    type TouchBarPopoverConstructorOptions = Electron.TouchBarPopoverConstructorOptions;
+    type TouchBarScrubberConstructorOptions = Electron.TouchBarScrubberConstructorOptions;
+    type TouchBarSegmentedControlConstructorOptions = Electron.TouchBarSegmentedControlConstructorOptions;
+    type TouchBarSliderConstructorOptions = Electron.TouchBarSliderConstructorOptions;
+    type TouchBarSpacerConstructorOptions = Electron.TouchBarSpacerConstructorOptions;
+    type TraceBufferUsageReturnValue = Electron.TraceBufferUsageReturnValue;
+    type UpdateTargetUrlEvent = Electron.UpdateTargetUrlEvent;
+    type UploadProgress = Electron.UploadProgress;
+    type VisibleOnAllWorkspacesOptions = Electron.VisibleOnAllWorkspacesOptions;
+    type WebContentsPrintOptions = Electron.WebContentsPrintOptions;
+    type WebviewTagPrintOptions = Electron.WebviewTagPrintOptions;
+    type WillNavigateEvent = Electron.WillNavigateEvent;
+    type WillResizeDetails = Electron.WillResizeDetails;
+    type EditFlags = Electron.EditFlags;
+    type FoundInPageResult = Electron.FoundInPageResult;
+    type LaunchItems = Electron.LaunchItems;
+    type Margins = Electron.Margins;
+    type MediaFlags = Electron.MediaFlags;
+    type PageRanges = Electron.PageRanges;
+    type Params = Electron.Params;
+    type TitleBarOverlay = Electron.TitleBarOverlay;
+    type WebPreferences = Electron.WebPreferences;
+    type DefaultFontFamily = Electron.DefaultFontFamily;
+    type BluetoothDevice = Electron.BluetoothDevice;
+    type Certificate = Electron.Certificate;
+    type CertificatePrincipal = Electron.CertificatePrincipal;
+    type Cookie = Electron.Cookie;
+    type CPUUsage = Electron.CPUUsage;
+    type CrashReport = Electron.CrashReport;
+    type CustomScheme = Electron.CustomScheme;
+    type DesktopCapturerSource = Electron.DesktopCapturerSource;
+    type Display = Electron.Display;
+    type Event = Electron.Event;
+    type Extension = Electron.Extension;
+    type ExtensionInfo = Electron.ExtensionInfo;
+    type FileFilter = Electron.FileFilter;
+    type FilePathWithHeaders = Electron.FilePathWithHeaders;
+    type GPUFeatureStatus = Electron.GPUFeatureStatus;
+    type HIDDevice = Electron.HIDDevice;
+    type InputEvent = Electron.InputEvent;
+    type IOCounters = Electron.IOCounters;
+    type IpcMainEvent = Electron.IpcMainEvent;
+    type IpcMainInvokeEvent = Electron.IpcMainInvokeEvent;
+    type IpcRendererEvent = Electron.IpcRendererEvent;
+    type JumpListCategory = Electron.JumpListCategory;
+    type JumpListItem = Electron.JumpListItem;
+    type KeyboardEvent = Electron.KeyboardEvent;
+    type KeyboardInputEvent = Electron.KeyboardInputEvent;
+    type MemoryInfo = Electron.MemoryInfo;
+    type MemoryUsageDetails = Electron.MemoryUsageDetails;
+    type MimeTypedBuffer = Electron.MimeTypedBuffer;
+    type MouseInputEvent = Electron.MouseInputEvent;
+    type MouseWheelInputEvent = Electron.MouseWheelInputEvent;
+    type NewWindowWebContentsEvent = Electron.NewWindowWebContentsEvent;
+    type NotificationAction = Electron.NotificationAction;
+    type NotificationResponse = Electron.NotificationResponse;
+    type PaymentDiscount = Electron.PaymentDiscount;
+    type Point = Electron.Point;
+    type PostBody = Electron.PostBody;
+    type PrinterInfo = Electron.PrinterInfo;
+    type ProcessMemoryInfo = Electron.ProcessMemoryInfo;
+    type ProcessMetric = Electron.ProcessMetric;
+    type Product = Electron.Product;
+    type ProductDiscount = Electron.ProductDiscount;
+    type ProductSubscriptionPeriod = Electron.ProductSubscriptionPeriod;
+    type ProtocolRequest = Electron.ProtocolRequest;
+    type ProtocolResponse = Electron.ProtocolResponse;
+    type ProtocolResponseUploadData = Electron.ProtocolResponseUploadData;
+    type Rectangle = Electron.Rectangle;
+    type Referrer = Electron.Referrer;
+    type ScrubberItem = Electron.ScrubberItem;
+    type SegmentedControlSegment = Electron.SegmentedControlSegment;
+    type SerialPort = Electron.SerialPort;
+    type ServiceWorkerInfo = Electron.ServiceWorkerInfo;
+    type SharedWorkerInfo = Electron.SharedWorkerInfo;
+    type SharingItem = Electron.SharingItem;
+    type ShortcutDetails = Electron.ShortcutDetails;
+    type Size = Electron.Size;
+    type Task = Electron.Task;
+    type ThumbarButton = Electron.ThumbarButton;
+    type TraceCategoriesAndOptions = Electron.TraceCategoriesAndOptions;
+    type TraceConfig = Electron.TraceConfig;
+    type Transaction = Electron.Transaction;
+    type UploadData = Electron.UploadData;
+    type UploadFile = Electron.UploadFile;
+    type UploadRawData = Electron.UploadRawData;
+    type UserDefaultTypes = Electron.UserDefaultTypes;
+    type WebRequestFilter = Electron.WebRequestFilter;
+    type WebSource = Electron.WebSource;
+  }
+
+  namespace CrossProcessExports {
+    const app: App;
+    type App = Electron.App;
+    const autoUpdater: AutoUpdater;
+    type AutoUpdater = Electron.AutoUpdater;
+    class BrowserView extends Electron.BrowserView {}
+    class BrowserWindow extends Electron.BrowserWindow {}
+    type ClientRequest = Electron.ClientRequest;
+    const clipboard: Clipboard;
+    type Clipboard = Electron.Clipboard;
+    type CommandLine = Electron.CommandLine;
+    const contentTracing: ContentTracing;
+    type ContentTracing = Electron.ContentTracing;
+    const contextBridge: ContextBridge;
+    type ContextBridge = Electron.ContextBridge;
+    type Cookies = Electron.Cookies;
+    const crashReporter: CrashReporter;
+    type CrashReporter = Electron.CrashReporter;
+    type Debugger = Electron.Debugger;
+    const desktopCapturer: DesktopCapturer;
+    type DesktopCapturer = Electron.DesktopCapturer;
+    const dialog: Dialog;
+    type Dialog = Electron.Dialog;
+    type Dock = Electron.Dock;
+    type DownloadItem = Electron.DownloadItem;
+    const globalShortcut: GlobalShortcut;
+    type GlobalShortcut = Electron.GlobalShortcut;
+    const inAppPurchase: InAppPurchase;
+    type InAppPurchase = Electron.InAppPurchase;
+    type IncomingMessage = Electron.IncomingMessage;
+    const ipcMain: IpcMain;
+    type IpcMain = Electron.IpcMain;
+    const ipcRenderer: IpcRenderer;
+    type IpcRenderer = Electron.IpcRenderer;
+    class Menu extends Electron.Menu {}
+    class MenuItem extends Electron.MenuItem {}
+    class MessageChannelMain extends Electron.MessageChannelMain {}
+    type MessagePortMain = Electron.MessagePortMain;
+    const nativeImage: typeof NativeImage;
+    type NativeImage = Electron.NativeImage;
+    const nativeTheme: NativeTheme;
+    type NativeTheme = Electron.NativeTheme;
+    const net: Net;
+    type Net = Electron.Net;
+    const netLog: NetLog;
+    type NetLog = Electron.NetLog;
+    class Notification extends Electron.Notification {}
+    const powerMonitor: PowerMonitor;
+    type PowerMonitor = Electron.PowerMonitor;
+    const powerSaveBlocker: PowerSaveBlocker;
+    type PowerSaveBlocker = Electron.PowerSaveBlocker;
+    const protocol: Protocol;
+    type Protocol = Electron.Protocol;
+    const pushNotifications: PushNotifications;
+    type PushNotifications = Electron.PushNotifications;
+    const safeStorage: SafeStorage;
+    type SafeStorage = Electron.SafeStorage;
+    const screen: Screen;
+    type Screen = Electron.Screen;
+    type ServiceWorkers = Electron.ServiceWorkers;
+    const session: typeof Session;
+    type Session = Electron.Session;
+    class ShareMenu extends Electron.ShareMenu {}
+    const shell: Shell;
+    type Shell = Electron.Shell;
+    const systemPreferences: SystemPreferences;
+    type SystemPreferences = Electron.SystemPreferences;
+    class TouchBar extends Electron.TouchBar {}
+    type TouchBarButton = Electron.TouchBarButton;
+    type TouchBarColorPicker = Electron.TouchBarColorPicker;
+    type TouchBarGroup = Electron.TouchBarGroup;
+    type TouchBarLabel = Electron.TouchBarLabel;
+    type TouchBarOtherItemsProxy = Electron.TouchBarOtherItemsProxy;
+    type TouchBarPopover = Electron.TouchBarPopover;
+    type TouchBarScrubber = Electron.TouchBarScrubber;
+    type TouchBarSegmentedControl = Electron.TouchBarSegmentedControl;
+    type TouchBarSlider = Electron.TouchBarSlider;
+    type TouchBarSpacer = Electron.TouchBarSpacer;
+    class Tray extends Electron.Tray {}
+    const webContents: typeof WebContents;
+    type WebContents = Electron.WebContents;
+    const webFrame: WebFrame;
+    type WebFrame = Electron.WebFrame;
+    const webFrameMain: typeof WebFrameMain;
+    type WebFrameMain = Electron.WebFrameMain;
+    type WebRequest = Electron.WebRequest;
+    type AboutPanelOptionsOptions = Electron.AboutPanelOptionsOptions;
+    type AddRepresentationOptions = Electron.AddRepresentationOptions;
+    type AnimationSettings = Electron.AnimationSettings;
+    type AppDetailsOptions = Electron.AppDetailsOptions;
+    type ApplicationInfoForProtocolReturnValue = Electron.ApplicationInfoForProtocolReturnValue;
+    type AuthenticationResponseDetails = Electron.AuthenticationResponseDetails;
+    type AuthInfo = Electron.AuthInfo;
+    type AutoResizeOptions = Electron.AutoResizeOptions;
+    type BeforeSendResponse = Electron.BeforeSendResponse;
+    type BitmapOptions = Electron.BitmapOptions;
+    type BlinkMemoryInfo = Electron.BlinkMemoryInfo;
+    type BluetoothPairingHandlerHandlerDetails = Electron.BluetoothPairingHandlerHandlerDetails;
+    type BrowserViewConstructorOptions = Electron.BrowserViewConstructorOptions;
+    type BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions;
+    type CallbackResponse = Electron.CallbackResponse;
+    type CertificateTrustDialogOptions = Electron.CertificateTrustDialogOptions;
+    type ClearCodeCachesOptions = Electron.ClearCodeCachesOptions;
+    type ClearStorageDataOptions = Electron.ClearStorageDataOptions;
+    type ClientRequestConstructorOptions = Electron.ClientRequestConstructorOptions;
+    type Config = Electron.Config;
+    type ConfigureHostResolverOptions = Electron.ConfigureHostResolverOptions;
+    type ConsoleMessageEvent = Electron.ConsoleMessageEvent;
+    type ContextMenuEvent = Electron.ContextMenuEvent;
+    type ContextMenuParams = Electron.ContextMenuParams;
+    type ContinueActivityDetails = Electron.ContinueActivityDetails;
+    type CookiesGetFilter = Electron.CookiesGetFilter;
+    type CookiesSetDetails = Electron.CookiesSetDetails;
+    type CrashReporterStartOptions = Electron.CrashReporterStartOptions;
+    type CreateFromBitmapOptions = Electron.CreateFromBitmapOptions;
+    type CreateFromBufferOptions = Electron.CreateFromBufferOptions;
+    type CreateInterruptedDownloadOptions = Electron.CreateInterruptedDownloadOptions;
+    type Data = Electron.Data;
+    type Details = Electron.Details;
+    type DevicePermissionHandlerHandlerDetails = Electron.DevicePermissionHandlerHandlerDetails;
+    type DidChangeThemeColorEvent = Electron.DidChangeThemeColorEvent;
+    type DidCreateWindowDetails = Electron.DidCreateWindowDetails;
+    type DidFailLoadEvent = Electron.DidFailLoadEvent;
+    type DidFrameFinishLoadEvent = Electron.DidFrameFinishLoadEvent;
+    type DidFrameNavigateEvent = Electron.DidFrameNavigateEvent;
+    type DidNavigateEvent = Electron.DidNavigateEvent;
+    type DidNavigateInPageEvent = Electron.DidNavigateInPageEvent;
+    type DidRedirectNavigationEvent = Electron.DidRedirectNavigationEvent;
+    type DidStartNavigationEvent = Electron.DidStartNavigationEvent;
+    type DisplayBalloonOptions = Electron.DisplayBalloonOptions;
+    type EnableNetworkEmulationOptions = Electron.EnableNetworkEmulationOptions;
+    type FeedURLOptions = Electron.FeedURLOptions;
+    type FileIconOptions = Electron.FileIconOptions;
+    type FindInPageOptions = Electron.FindInPageOptions;
+    type FocusOptions = Electron.FocusOptions;
+    type FoundInPageEvent = Electron.FoundInPageEvent;
+    type FrameCreatedDetails = Electron.FrameCreatedDetails;
+    type FromPartitionOptions = Electron.FromPartitionOptions;
+    type HandlerDetails = Electron.HandlerDetails;
+    type HeadersReceivedResponse = Electron.HeadersReceivedResponse;
+    type HeapStatistics = Electron.HeapStatistics;
+    type HidDeviceAddedDetails = Electron.HidDeviceAddedDetails;
+    type HidDeviceRemovedDetails = Electron.HidDeviceRemovedDetails;
+    type HidDeviceRevokedDetails = Electron.HidDeviceRevokedDetails;
+    type IgnoreMouseEventsOptions = Electron.IgnoreMouseEventsOptions;
+    type ImportCertificateOptions = Electron.ImportCertificateOptions;
+    type Info = Electron.Info;
+    type Input = Electron.Input;
+    type InsertCSSOptions = Electron.InsertCSSOptions;
+    type IpcMessageEvent = Electron.IpcMessageEvent;
+    type Item = Electron.Item;
+    type JumpListSettings = Electron.JumpListSettings;
+    type LoadCommitEvent = Electron.LoadCommitEvent;
+    type LoadExtensionOptions = Electron.LoadExtensionOptions;
+    type LoadFileOptions = Electron.LoadFileOptions;
+    type LoadURLOptions = Electron.LoadURLOptions;
+    type LoginItemSettings = Electron.LoginItemSettings;
+    type LoginItemSettingsOptions = Electron.LoginItemSettingsOptions;
+    type MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
+    type MessageBoxOptions = Electron.MessageBoxOptions;
+    type MessageBoxReturnValue = Electron.MessageBoxReturnValue;
+    type MessageBoxSyncOptions = Electron.MessageBoxSyncOptions;
+    type MessageDetails = Electron.MessageDetails;
+    type MessageEvent = Electron.MessageEvent;
+    type MoveToApplicationsFolderOptions = Electron.MoveToApplicationsFolderOptions;
+    type NewWindowEvent = Electron.NewWindowEvent;
+    type NotificationConstructorOptions = Electron.NotificationConstructorOptions;
+    type OnBeforeRedirectListenerDetails = Electron.OnBeforeRedirectListenerDetails;
+    type OnBeforeRequestListenerDetails = Electron.OnBeforeRequestListenerDetails;
+    type OnBeforeSendHeadersListenerDetails = Electron.OnBeforeSendHeadersListenerDetails;
+    type OnCompletedListenerDetails = Electron.OnCompletedListenerDetails;
+    type OnErrorOccurredListenerDetails = Electron.OnErrorOccurredListenerDetails;
+    type OnHeadersReceivedListenerDetails = Electron.OnHeadersReceivedListenerDetails;
+    type OnResponseStartedListenerDetails = Electron.OnResponseStartedListenerDetails;
+    type OnSendHeadersListenerDetails = Electron.OnSendHeadersListenerDetails;
+    type OpenDevToolsOptions = Electron.OpenDevToolsOptions;
+    type OpenDialogOptions = Electron.OpenDialogOptions;
+    type OpenDialogReturnValue = Electron.OpenDialogReturnValue;
+    type OpenDialogSyncOptions = Electron.OpenDialogSyncOptions;
+    type OpenExternalOptions = Electron.OpenExternalOptions;
+    type Options = Electron.Options;
+    type PageFaviconUpdatedEvent = Electron.PageFaviconUpdatedEvent;
+    type PageTitleUpdatedEvent = Electron.PageTitleUpdatedEvent;
+    type Parameters = Electron.Parameters;
+    type Payment = Electron.Payment;
+    type PermissionCheckHandlerHandlerDetails = Electron.PermissionCheckHandlerHandlerDetails;
+    type PermissionRequestHandlerHandlerDetails = Electron.PermissionRequestHandlerHandlerDetails;
+    type PluginCrashedEvent = Electron.PluginCrashedEvent;
+    type PopupOptions = Electron.PopupOptions;
+    type PreconnectOptions = Electron.PreconnectOptions;
+    type PrintToPDFOptions = Electron.PrintToPDFOptions;
+    type Privileges = Electron.Privileges;
+    type ProgressBarOptions = Electron.ProgressBarOptions;
+    type Provider = Electron.Provider;
+    type ReadBookmark = Electron.ReadBookmark;
+    type RegistrationCompletedDetails = Electron.RegistrationCompletedDetails;
+    type RelaunchOptions = Electron.RelaunchOptions;
+    type RenderProcessGoneDetails = Electron.RenderProcessGoneDetails;
+    type Request = Electron.Request;
+    type ResizeOptions = Electron.ResizeOptions;
+    type ResourceUsage = Electron.ResourceUsage;
+    type Response = Electron.Response;
+    type Result = Electron.Result;
+    type SaveDialogOptions = Electron.SaveDialogOptions;
+    type SaveDialogReturnValue = Electron.SaveDialogReturnValue;
+    type SaveDialogSyncOptions = Electron.SaveDialogSyncOptions;
+    type SelectHidDeviceDetails = Electron.SelectHidDeviceDetails;
+    type Settings = Electron.Settings;
+    type SourcesOptions = Electron.SourcesOptions;
+    type SSLConfigConfig = Electron.SSLConfigConfig;
+    type StartLoggingOptions = Electron.StartLoggingOptions;
+    type SystemMemoryInfo = Electron.SystemMemoryInfo;
+    type TitleBarOverlayOptions = Electron.TitleBarOverlayOptions;
+    type TitleOptions = Electron.TitleOptions;
+    type ToBitmapOptions = Electron.ToBitmapOptions;
+    type ToDataURLOptions = Electron.ToDataURLOptions;
+    type ToPNGOptions = Electron.ToPNGOptions;
+    type TouchBarButtonConstructorOptions = Electron.TouchBarButtonConstructorOptions;
+    type TouchBarColorPickerConstructorOptions = Electron.TouchBarColorPickerConstructorOptions;
+    type TouchBarConstructorOptions = Electron.TouchBarConstructorOptions;
+    type TouchBarGroupConstructorOptions = Electron.TouchBarGroupConstructorOptions;
+    type TouchBarLabelConstructorOptions = Electron.TouchBarLabelConstructorOptions;
+    type TouchBarPopoverConstructorOptions = Electron.TouchBarPopoverConstructorOptions;
+    type TouchBarScrubberConstructorOptions = Electron.TouchBarScrubberConstructorOptions;
+    type TouchBarSegmentedControlConstructorOptions = Electron.TouchBarSegmentedControlConstructorOptions;
+    type TouchBarSliderConstructorOptions = Electron.TouchBarSliderConstructorOptions;
+    type TouchBarSpacerConstructorOptions = Electron.TouchBarSpacerConstructorOptions;
+    type TraceBufferUsageReturnValue = Electron.TraceBufferUsageReturnValue;
+    type UpdateTargetUrlEvent = Electron.UpdateTargetUrlEvent;
+    type UploadProgress = Electron.UploadProgress;
+    type VisibleOnAllWorkspacesOptions = Electron.VisibleOnAllWorkspacesOptions;
+    type WebContentsPrintOptions = Electron.WebContentsPrintOptions;
+    type WebviewTagPrintOptions = Electron.WebviewTagPrintOptions;
+    type WillNavigateEvent = Electron.WillNavigateEvent;
+    type WillResizeDetails = Electron.WillResizeDetails;
+    type EditFlags = Electron.EditFlags;
+    type FoundInPageResult = Electron.FoundInPageResult;
+    type LaunchItems = Electron.LaunchItems;
+    type Margins = Electron.Margins;
+    type MediaFlags = Electron.MediaFlags;
+    type PageRanges = Electron.PageRanges;
+    type Params = Electron.Params;
+    type TitleBarOverlay = Electron.TitleBarOverlay;
+    type WebPreferences = Electron.WebPreferences;
+    type DefaultFontFamily = Electron.DefaultFontFamily;
+    type BluetoothDevice = Electron.BluetoothDevice;
+    type Certificate = Electron.Certificate;
+    type CertificatePrincipal = Electron.CertificatePrincipal;
+    type Cookie = Electron.Cookie;
+    type CPUUsage = Electron.CPUUsage;
+    type CrashReport = Electron.CrashReport;
+    type CustomScheme = Electron.CustomScheme;
+    type DesktopCapturerSource = Electron.DesktopCapturerSource;
+    type Display = Electron.Display;
+    type Event = Electron.Event;
+    type Extension = Electron.Extension;
+    type ExtensionInfo = Electron.ExtensionInfo;
+    type FileFilter = Electron.FileFilter;
+    type FilePathWithHeaders = Electron.FilePathWithHeaders;
+    type GPUFeatureStatus = Electron.GPUFeatureStatus;
+    type HIDDevice = Electron.HIDDevice;
+    type InputEvent = Electron.InputEvent;
+    type IOCounters = Electron.IOCounters;
+    type IpcMainEvent = Electron.IpcMainEvent;
+    type IpcMainInvokeEvent = Electron.IpcMainInvokeEvent;
+    type IpcRendererEvent = Electron.IpcRendererEvent;
+    type JumpListCategory = Electron.JumpListCategory;
+    type JumpListItem = Electron.JumpListItem;
+    type KeyboardEvent = Electron.KeyboardEvent;
+    type KeyboardInputEvent = Electron.KeyboardInputEvent;
+    type MemoryInfo = Electron.MemoryInfo;
+    type MemoryUsageDetails = Electron.MemoryUsageDetails;
+    type MimeTypedBuffer = Electron.MimeTypedBuffer;
+    type MouseInputEvent = Electron.MouseInputEvent;
+    type MouseWheelInputEvent = Electron.MouseWheelInputEvent;
+    type NewWindowWebContentsEvent = Electron.NewWindowWebContentsEvent;
+    type NotificationAction = Electron.NotificationAction;
+    type NotificationResponse = Electron.NotificationResponse;
+    type PaymentDiscount = Electron.PaymentDiscount;
+    type Point = Electron.Point;
+    type PostBody = Electron.PostBody;
+    type PrinterInfo = Electron.PrinterInfo;
+    type ProcessMemoryInfo = Electron.ProcessMemoryInfo;
+    type ProcessMetric = Electron.ProcessMetric;
+    type Product = Electron.Product;
+    type ProductDiscount = Electron.ProductDiscount;
+    type ProductSubscriptionPeriod = Electron.ProductSubscriptionPeriod;
+    type ProtocolRequest = Electron.ProtocolRequest;
+    type ProtocolResponse = Electron.ProtocolResponse;
+    type ProtocolResponseUploadData = Electron.ProtocolResponseUploadData;
+    type Rectangle = Electron.Rectangle;
+    type Referrer = Electron.Referrer;
+    type ScrubberItem = Electron.ScrubberItem;
+    type SegmentedControlSegment = Electron.SegmentedControlSegment;
+    type SerialPort = Electron.SerialPort;
+    type ServiceWorkerInfo = Electron.ServiceWorkerInfo;
+    type SharedWorkerInfo = Electron.SharedWorkerInfo;
+    type SharingItem = Electron.SharingItem;
+    type ShortcutDetails = Electron.ShortcutDetails;
+    type Size = Electron.Size;
+    type Task = Electron.Task;
+    type ThumbarButton = Electron.ThumbarButton;
+    type TraceCategoriesAndOptions = Electron.TraceCategoriesAndOptions;
+    type TraceConfig = Electron.TraceConfig;
+    type Transaction = Electron.Transaction;
+    type UploadData = Electron.UploadData;
+    type UploadFile = Electron.UploadFile;
+    type UploadRawData = Electron.UploadRawData;
+    type UserDefaultTypes = Electron.UserDefaultTypes;
+    type WebRequestFilter = Electron.WebRequestFilter;
+    type WebSource = Electron.WebSource;
+  }
+
+  const app: App;
+  const autoUpdater: AutoUpdater;
+  const clipboard: Clipboard;
+  const contentTracing: ContentTracing;
+  const contextBridge: ContextBridge;
+  const crashReporter: CrashReporter;
+  const desktopCapturer: DesktopCapturer;
+  const dialog: Dialog;
+  const globalShortcut: GlobalShortcut;
+  const inAppPurchase: InAppPurchase;
+  const ipcMain: IpcMain;
+  const ipcRenderer: IpcRenderer;
+  const nativeImage: typeof NativeImage;
+  const nativeTheme: NativeTheme;
+  const net: Net;
+  const netLog: NetLog;
+  const powerMonitor: PowerMonitor;
+  const powerSaveBlocker: PowerSaveBlocker;
+  const protocol: Protocol;
+  const pushNotifications: PushNotifications;
+  const safeStorage: SafeStorage;
+  const screen: Screen;
+  const session: typeof Session;
+  const shell: Shell;
+  const systemPreferences: SystemPreferences;
+  const webContents: typeof WebContents;
+  const webFrame: WebFrame;
+  const webFrameMain: typeof WebFrameMain;
+
+}
+
+declare module 'electron' {
+  export = Electron.CrossProcessExports;
+}
+
+declare module 'electron/main' {
+  export = Electron.Main
+}
+
+declare module 'electron/common' {
+  export = Electron.Common
+}
+
+declare module 'electron/renderer' {
+  export = Electron.Renderer
+}
+
+interface NodeRequireFunction {
+  (moduleName: 'electron'): typeof Electron.CrossProcessExports;
+  (moduleName: 'electron/main'): typeof Electron.Main;
+  (moduleName: 'electron/common'): typeof Electron.Common;
+  (moduleName: 'electron/renderer'): typeof Electron.Renderer;
+}
+
+interface NodeRequire {
+  (moduleName: 'electron'): typeof Electron.CrossProcessExports;
+  (moduleName: 'electron/main'): typeof Electron.Main;
+  (moduleName: 'electron/common'): typeof Electron.Common;
+  (moduleName: 'electron/renderer'): typeof Electron.Renderer;
+}
+
+interface File {
+ /**
+  * The real path to the file on the users filesystem
+  */
+  path: string;
+}
+
+declare module 'original-fs' {
+  import * as fs from 'fs';
+  export = fs;
+}
+
+interface Document {
+  createElement(tagName: 'webview'): Electron.WebviewTag;
+}
+
+declare namespace NodeJS {
+  interface Process extends NodeJS.EventEmitter {
+
+    // Docs: https://electronjs.org/docs/api/process
+
+    /**
+     * Emitted when Electron has loaded its internal initialization script and is
+     * beginning to load the web page or the main script.
+     */
+    on(event: 'loaded', listener: Function): this;
+    once(event: 'loaded', listener: Function): this;
+    addListener(event: 'loaded', listener: Function): this;
+    removeListener(event: 'loaded', listener: Function): this;
+    /**
+     * Causes the main thread of the current process crash.
+     */
+    crash(): void;
+    /**
+     * * `allocated` Integer - Size of all allocated objects in Kilobytes.
+     * * `total` Integer - Total allocated space in Kilobytes.
+     * 
+     * Returns an object with Blink memory information. It can be useful for debugging
+     * rendering / DOM related memory issues. Note that all values are reported in
+     * Kilobytes.
+     */
+    getBlinkMemoryInfo(): Electron.BlinkMemoryInfo;
+    getCPUUsage(): Electron.CPUUsage;
+    /**
+     * The number of milliseconds since epoch, or `null` if the information is
+     * unavailable
+     * 
+     * Indicates the creation time of the application. The time is represented as
+     * number of milliseconds since epoch. It returns null if it is unable to get the
+     * process creation time.
+     */
+    getCreationTime(): (number) | (null);
+    /**
+     * * `totalHeapSize` Integer
+     * * `totalHeapSizeExecutable` Integer
+     * * `totalPhysicalSize` Integer
+     * * `totalAvailableSize` Integer
+     * * `usedHeapSize` Integer
+     * * `heapSizeLimit` Integer
+     * * `mallocedMemory` Integer
+     * * `peakMallocedMemory` Integer
+     * * `doesZapGarbage` boolean
+     * 
+     * Returns an object with V8 heap statistics. Note that all statistics are reported
+     * in Kilobytes.
+     */
+    getHeapStatistics(): Electron.HeapStatistics;
+    getIOCounters(): Electron.IOCounters;
+    /**
+     * Resolves with a ProcessMemoryInfo
+     * 
+     * Returns an object giving memory usage statistics about the current process. Note
+     * that all statistics are reported in Kilobytes. This api should be called after
+     * app ready.
+     * 
+     * Chromium does not provide `residentSet` value for macOS. This is because macOS
+     * performs in-memory compression of pages that haven't been recently used. As a
+     * result the resident set size value is not what one would expect. `private`
+     * memory is more representative of the actual pre-compression memory usage of the
+     * process on macOS.
+     */
+    getProcessMemoryInfo(): Promise<Electron.ProcessMemoryInfo>;
+    /**
+     * * `total` Integer - The total amount of physical memory in Kilobytes available
+     * to the system.
+     * * `free` Integer - The total amount of memory not being used by applications or
+     * disk cache.
+     * * `swapTotal` Integer _Windows_ _Linux_ - The total amount of swap memory in
+     * Kilobytes available to the system.
+     * * `swapFree` Integer _Windows_ _Linux_ - The free amount of swap memory in
+     * Kilobytes available to the system.
+     * 
+     * Returns an object giving memory usage statistics about the entire system. Note
+     * that all statistics are reported in Kilobytes.
+     */
+    getSystemMemoryInfo(): Electron.SystemMemoryInfo;
+    /**
+     * The version of the host operating system.
+     * 
+     * Example:
+     * 
+     * **Note:** It returns the actual operating system version instead of kernel
+     * version on macOS unlike `os.release()`.
+     */
+    getSystemVersion(): string;
+    /**
+     * Causes the main thread of the current process hang.
+     */
+    hang(): void;
+    /**
+     * Sets the file descriptor soft limit to `maxDescriptors` or the OS hard limit,
+     * whichever is lower for the current process.
+     *
+     * @platform darwin,linux
+     */
+    setFdLimit(maxDescriptors: number): void;
+    /**
+     * Indicates whether the snapshot has been created successfully.
+     * 
+     * Takes a V8 heap snapshot and saves it to `filePath`.
+     */
+    takeHeapSnapshot(filePath: string): boolean;
+    /**
+     * A `string` representing Chrome's version string.
+     *
+     */
+    readonly chrome: string;
+    /**
+     * A `string` (optional) representing a globally unique ID of the current
+     * JavaScript context. Each frame has its own JavaScript context. When
+     * contextIsolation is enabled, the isolated world also has a separate JavaScript
+     * context. This property is only available in the renderer process.
+     *
+     */
+    readonly contextId?: string;
+    /**
+     * A `boolean` that indicates whether the current renderer context has
+     * `contextIsolation` enabled. It is `undefined` in the main process.
+     *
+     */
+    readonly contextIsolated: boolean;
+    /**
+     * A `boolean`. When app is started by being passed as parameter to the default
+     * app, this property is `true` in the main process, otherwise it is `undefined`.
+     *
+     */
+    readonly defaultApp: boolean;
+    /**
+     * A `string` representing Electron's version string.
+     *
+     */
+    readonly electron: string;
+    /**
+     * A `boolean`, `true` when the current renderer context is the "main" renderer
+     * frame. If you want the ID of the current frame you should use
+     * `webFrame.routingId`.
+     *
+     */
+    readonly isMainFrame: boolean;
+    /**
+     * A `boolean`. For Mac App Store build, this property is `true`, for other builds
+     * it is `undefined`.
+     *
+     */
+    readonly mas: boolean;
+    /**
+     * A `boolean` that controls ASAR support inside your application. Setting this to
+     * `true` will disable the support for `asar` archives in Node's built-in modules.
+     */
+    noAsar: boolean;
+    /**
+     * A `boolean` that controls whether or not deprecation warnings are printed to
+     * `stderr`. Setting this to `true` will silence deprecation warnings. This
+     * property is used instead of the `--no-deprecation` command line flag.
+     */
+    noDeprecation: boolean;
+    /**
+     * A `string` representing the path to the resources directory.
+     *
+     */
+    readonly resourcesPath: string;
+    /**
+     * A `boolean`. When the renderer process is sandboxed, this property is `true`,
+     * otherwise it is `undefined`.
+     *
+     */
+    readonly sandboxed: boolean;
+    /**
+     * A `boolean` that controls whether or not deprecation warnings will be thrown as
+     * exceptions. Setting this to `true` will throw errors for deprecations. This
+     * property is used instead of the `--throw-deprecation` command line flag.
+     */
+    throwDeprecation: boolean;
+    /**
+     * A `boolean` that controls whether or not deprecations printed to `stderr`
+     * include their stack trace. Setting this to `true` will print stack traces for
+     * deprecations. This property is instead of the `--trace-deprecation` command line
+     * flag.
+     */
+    traceDeprecation: boolean;
+    /**
+     * A `boolean` that controls whether or not process warnings printed to `stderr`
+     * include their stack trace. Setting this to `true` will print stack traces for
+     * process warnings (including deprecations). This property is instead of the
+     * `--trace-warnings` command line flag.
+     */
+    traceProcessWarnings: boolean;
+    /**
+     * A `string` representing the current process's type, can be:
+     * 
+     * * `browser` - The main process
+     * * `renderer` - A renderer process
+     * * `worker` - In a web worker
+     *
+     */
+    readonly type: ('browser' | 'renderer' | 'worker');
+    /**
+     * A `boolean`. If the app is running as a Windows Store app (appx), this property
+     * is `true`, for otherwise it is `undefined`.
+     *
+     */
+    readonly windowsStore: boolean;
+  }
+  interface ProcessVersions {
+    readonly electron: string;
+    readonly chrome: string;
+  }
+}
\ No newline at end of file
diff --git a/docs/development/Electronite/electronite-tools.bat b/docs/development/Electronite/electronite-tools.bat
new file mode 100755
index 0000000000000..32c9b13b657d5
--- /dev/null
+++ b/docs/development/Electronite/electronite-tools.bat
@@ -0,0 +1,148 @@
+echo off
+set ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+set working_dir=%cd%
+set GIT_CACHE_PATH=%working_dir%\git_cache
+mkdir %GIT_CACHE_PATH%
+
+rem sccache no longer supported in Electron
+rem set SCCACHE_BUCKET=electronjs-sccache
+rem set SCCACHE_TWO_TIER=true
+
+set DEPOT_TOOLS_WIN_TOOLCHAIN=0
+set NINJA_STATUS="[%%r processes, %%f/%%t @ %%o/s : %%es] "
+echo "GIT_CACHE_PATH=%GIT_CACHE_PATH%"
+echo "SCCACHE_BUCKET=%SCCACHE_BUCKET%"
+echo "working_dir=%working_dir%"
+
+echo "%date% - %time%" > start_time.txt
+
+rem TODO: configure environment variables.
+
+rem ------------------------
+rem check command to execute
+rem ------------------------
+if %1.==. goto MissingArgs
+
+rem -------------
+rem start command
+rem -------------
+if "%1" == "get" goto Get
+if "%1" == "build" goto Build
+if "%1" == "release" goto Release
+goto MissingTag
+
+:Get
+rem ####################
+rem fetch code
+rem ####################
+if %2.==. goto MissingTag
+set checkout_tag=%2
+
+rem make sure depot_tools is clean
+echo Preparing depot_tools
+FOR /F "tokens=* USEBACKQ" %%F IN (`where gclient.bat`) DO (
+set depot_tools_dir=%%~dpF
+)
+echo depot_tools_dir=%depot_tools_dir%"
+cd %depot_tools_dir% && call git reset HEAD --hard && echo depot_tools is ready
+cd %working_dir%
+
+rem fetch code
+echo Fetching code. This will take a long time and download up to 16GB.
+echo Deleting electron-gn folder.
+if exist electron-gn rmdir /Q /S electron-gn
+echo Deleted electron-gn folder.
+mkdir electron-gn
+cd electron-gn
+call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
+call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+cd src\electron
+echo Checking out %checkout_tag% in %cd%
+call git checkout %checkout_tag%
+cd ..
+
+rem echo Show Changes
+rem call git status
+echo Commit all Changes so sync with patches will not fail?
+rem this is a hack so that Windows sync will not fail when there are uncommitted changes after git checkout
+call git add -A
+call git commit -m "commit changes" --author="A U Thor <author@example.com>"
+cd..
+
+echo Applying electron patches
+call gclient sync --with_branch_heads --with_tags
+
+goto End
+
+:Build
+rem ####################
+rem build release
+rem ####################
+set build_x64=false
+if "%2" == "" set build_x64=true
+
+echo Building release
+cd electron-gn\src
+set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
+
+if %build_x64% == false (
+    echo Generating %2 configuration...
+    call gn gen out/Release-%2 --args="target_cpu=\"%2\" import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release-%2 electron
+) else (
+    echo Generating configuration...
+    call gn gen out/Release --args="import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release electron
+)
+
+goto End
+
+:Release
+rem ####################
+rem create distributable
+rem ####################
+set build_x64=false
+if "%2" == "" set build_x64=true
+
+echo Making release
+cd electron-gn\src
+
+if %build_x64% == false (
+    echo Creating %2 distributable
+    electron\script\strip-binaries.py -d out\Release-%2
+    call ninja -C out\Release-%2 electron:electron_dist_zip
+) else (
+    echo Creating distributable
+    electron\script\strip-binaries.py -d out\Release
+    call ninja -C out\Release electron:electron_dist_zip
+)
+
+goto End
+
+rem ####################
+rem help text
+rem ####################
+
+:MissingArgs
+    echo ***********************
+    echo *  Electronite Tools  *
+    echo ***********************
+    echo This is a set of tools for compiling electronite.
+    echo The source for electronite is at https://github.com/unfoldingWord-dev/electronite.
+    echo Usage: ./electronite-tools.sh ^<command^>
+    echo where ^<command^> is one of:
+    echo     get ^<ref^>     - fetches all of the code.
+    echo                       Where ^<ref^> is a branch or tag.
+    echo     build [arch]    - compiles Electronite. The default arch is x64, but you can specify x86.
+    echo     release [arch]  - creates the distributable. The default arch is x64, but you can specify x86.
+    echo For detailed instructions on building Electron
+    echo see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+    goto End
+:MissingTag
+    echo Missing the ^<ref^> to checkout. Please specify a tag or branch name.
+    goto End
+:End
+
+cd %working_dir%
+
+echo "%date% - %time%" > end_time.txt
diff --git a/docs/development/Electronite/electronite-tools.sh b/docs/development/Electronite/electronite-tools.sh
new file mode 100755
index 0000000000000..dbab0c90b809d
--- /dev/null
+++ b/docs/development/Electronite/electronite-tools.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+set -e
+
+ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+COMMAND=$1
+
+# Configure environment variables and paths
+export GIT_CACHE_PATH=`pwd`/git_cache
+mkdir -p "${GIT_CACHE_PATH}"
+
+# sccache no longer supported in Electron
+# export SCCACHE_BUCKET="electronjs-sccache"
+# export SCCACHE_TWO_TIER=true
+
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+echo "GIT_CACHE_PATH=${GIT_CACHE_PATH}"
+echo "SCCACHE_BUCKET=${SCCACHE_BUCKET}"
+
+
+##########################
+# fetch code
+##########################
+if [ "$COMMAND" == "get" ]; then
+  if [ $# -ge 2 ]; then
+    BRANCH=$2
+  else
+    echo "Missing the <ref> to checkout. Please specify a tag or branch name."
+    exit 0
+  fi
+
+  echo "Deleting old work folders. This may take a long time with about 49GB and 850K files."
+  rm -rf electron-gn
+  mkdir -p electron-gn
+  cd electron-gn
+  echo "Fetching code. This will take a long time and download up to 16GB."
+  gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
+  gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+  cd src/electron
+  echo "Checking out $BRANCH"
+  git checkout $BRANCH
+  cd -
+  echo "Applying electron patches"
+  gclient sync --with_branch_heads --with_tags
+  exit 0
+fi
+
+##########################
+# build release
+##########################
+if [ "$COMMAND" == "build" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET=$2
+    RELEASE_TARGET="-${TARGET}"
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu = \"${TARGET}\""
+    echo "Building for ${TARGET}"
+    if [ "$TARGET" == "arm64" ] && [ "`uname`" == "Linux" ]; then
+      export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} fatal_linker_warnings = false enable_linux_installer = false"
+    fi
+    echo "Building for \"${TARGET}\", extra args: \"${GN_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    echo "Building for default \"x64\", extra args: \"${GN_EXTRA_ARGS}\""
+  fi
+
+  echo "Building target: ${RELEASE_TARGET}"
+
+  cd electron-gn/src
+  export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+#  export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
+  echo "Generating configuration..."
+  gn gen out/Release${RELEASE_TARGET} --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
+  ninja -C out/Release${RELEASE_TARGET} electron
+  cd -
+  exit 0
+fi
+
+##########################
+# create distributable
+##########################
+if [ "$COMMAND" == "release" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET="$2"
+    RELEASE_TARGET="-${TARGET}"
+    STRIP_EXTRA_ARGS=--target-cpu=$TARGET
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu=\"${TARGET}\""
+    echo "Releasing for \"${TARGET}\", extra args: \"${STRIP_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    STRIP_EXTRA_ARGS=""
+    echo "Releasing for default \"x64\", extra args: \"${STRIP_EXTRA_ARGS}\""    
+  fi
+
+  echo "Releasing: ${RELEASE_TARGET}"
+
+  echo "Creating distributable"
+  cd electron-gn/src
+  if [ "`uname`" != "Darwin" ]; then
+    ./electron/script/strip-binaries.py ${STRIP_EXTRA_ARGS} -d out/Release${RELEASE_TARGET}
+  fi
+  ninja -C out/Release${RELEASE_TARGET} electron:electron_dist_zip
+  exit 0
+fi
+
+##########################
+# help
+##########################
+if [ "$COMMAND" == "" ]; then
+  echo "***********************
+*  Electronite Tools  *
+***********************
+This is a set of tools for compiling Electronite.
+The source for Electronite is at https://github.com/unfoldingWord-dev/electronite.
+
+Usage: ./electronite-tools.sh <command>
+
+where <command> is one of:
+
+    get <ref> - fetches all of the code.
+                Where <ref> is a branch or tag.
+
+    build <target> - compiles Electronite, target is optional, defaults to x64,
+                       Could be arm64.
+
+    release <target> - creates the distributable.  Use same target as
+                       previous build.
+
+For detailed instructions on building Electron
+see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+"
+fi
\ No newline at end of file
diff --git a/docs/development/Electronite/electronite.patch b/docs/development/Electronite/electronite.patch
new file mode 100644
index 0000000000000..0da91209a8159
--- /dev/null
+++ b/docs/development/Electronite/electronite.patch
@@ -0,0 +1,288 @@
+diff --git a/DEPS b/DEPS
+index 5047b6b16..3c928c079 100644
+--- a/DEPS
++++ b/DEPS
+@@ -27,12 +27,14 @@ vars = {
+     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
+ 
+   'pyyaml_version': '3.12',
++  'graphite_version': '92f59dcc52f73ce747f1cdc831579ed2546884aa',
+ 
+   'chromium_git': 'https://chromium.googlesource.com',
+   'electron_git': 'https://github.com/electron',
+   'nodejs_git': 'https://github.com/nodejs',
+   'yaml_git': 'https://github.com/yaml',
+   'squirrel_git': 'https://github.com/Squirrel',
++  'graphite_git': 'https://github.com/silnrsi',
+ 
+   # KEEP IN SYNC WITH utils.js FILE
+   'yarn_version': '1.15.2',
+@@ -48,6 +50,7 @@ vars = {
+   'checkout_node': True,
+   'checkout_nan': True,
+   'checkout_pgo_profiles': True,
++  'checkout_graphite': True,
+ 
+   # It's only needed to parse the native tests configurations.
+   'checkout_pyyaml': False,
+@@ -98,6 +101,10 @@ deps = {
+     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
+     'condition': 'checkout_pyyaml and process_deps',
+   },
++  'src/third_party/graphite/graphite2': {
++    'url': (Var("graphite_git")) + '/graphite.git@' + (Var("graphite_version")),
++    'condition': 'checkout_graphite and process_deps',
++  },
+   'src/third_party/squirrel.mac': {
+     'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
+     'condition': 'process_deps',
+@@ -127,6 +134,16 @@ pre_deps_hooks = [
+       'src/electron/patches/config.json',
+     ],
+   },
++  {
++    'name': 'setup_graphite',
++    'condition': 'checkout_graphite and apply_patches and process_deps',
++    'pattern': 'src/electron',
++    'action': [
++      'python3',
++      '-c',
++      'import os; os.makedirs(os.path.join("src", "electron", "third_party", "graphite"));',
++    ],
++  },
+ ]
+ 
+ hooks = [
+diff --git a/patches/chromium/.patches b/patches/chromium/.patches
+index c7311e348..7f9c36e22 100644
+--- a/patches/chromium/.patches
++++ b/patches/chromium/.patches
+@@ -115,3 +115,4 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
+ remove_incorrect_width_height_adjustments.patch
+ introduce_ozoneplatform_electron_can_call_x11_property.patch
+ make_gtk_getlibgtk_public.patch
++add_graphite.patch
+diff --git a/patches/chromium/add_graphite.patch b/patches/chromium/add_graphite.patch
+new file mode 100644
+index 000000000..33bc776bd
+--- /dev/null
++++ b/patches/chromium/add_graphite.patch
+@@ -0,0 +1,217 @@
++From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
++From: Joel <da1nerd@pm.me>
++Date: Tue, 23 Jul 2019 15:48:39 -0700
++Subject: [PATCH] adds graphite support for font rendering - patched for v17.3.1 and v18.2.1
++
++diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
++index a62632e2c3fcf..0a8714996d3b9 100644
++--- a/third_party/BUILD.gn
+++++ b/third_party/BUILD.gn
++@@ -4,6 +4,7 @@q
++ 
++ import("//build/config/freetype/freetype.gni")
++ import("//third_party/harfbuzz-ng/harfbuzz.gni")
+++import("//third_party/graphite/graphite.gni")
++ import("//third_party/libjpeg.gni")
++ 
++ assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
++@@ -60,5 +61,8 @@ component("freetype_harfbuzz") {
++     public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
++   } else {
++     public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ]
+++    if (use_graphite) {
+++      public_deps += [ "//third_party/graphite:graphite_source" ]
+++    }
++   }
++ }
++diff --git a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc b/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
++index 6e388c9135c64..e6eea739ac230 100644
++--- a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
+++++ b/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
++@@ -95,6 +95,11 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
++   const uint32_t kCblcTag = OTS_TAG('C', 'B', 'L', 'C');
++   const uint32_t kColrTag = OTS_TAG('C', 'O', 'L', 'R');
++   const uint32_t kCpalTag = OTS_TAG('C', 'P', 'A', 'L');
+++  const uint32_t kFeatTag = OTS_TAG('F', 'e', 'a', 't');
+++  const uint32_t kGlatTag = OTS_TAG('G', 'l', 'a', 't');
+++  const uint32_t kGlocTag = OTS_TAG('G', 'l', 'o', 'c');
+++  const uint32_t kSilfTag = OTS_TAG('S', 'i', 'l', 'f');
+++  const uint32_t kSillTag = OTS_TAG('S', 'i', 'l', 'l');
++   const uint32_t kCff2Tag = OTS_TAG('C', 'F', 'F', '2');
++   const uint32_t kSbixTag = OTS_TAG('s', 'b', 'i', 'x');
++ #if HB_VERSION_ATLEAST(1, 0, 0)
++@@ -121,6 +126,12 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
++     // Windows Color Emoji Tables
++     case kColrTag:
++     case kCpalTag:
+++    // Graphite
+++    case kFeatTag:
+++    case kGlatTag:
+++    case kGlocTag:
+++    case kSilfTag:
+++    case kSillTag:
++     case kCff2Tag:
++     case kSbixTag:
++ #if HB_VERSION_ATLEAST(1, 0, 0)
++diff --git a/third_party/graphite/BUILD.gn b/third_party/graphite/BUILD.gn
++new file mode 100644
++index 0000000000000..75b8267c80910
++--- /dev/null
+++++ b/third_party/graphite/BUILD.gn
++@@ -0,0 +1,115 @@
+++
+++config("graphite_config") {
+++    include_dirs = [ "graphite2/include" ]
+++}
+++
+++config("graphite_build") {
+++    include_dirs = [ "graphite2/src" ]
+++    cflags = []
+++
+++    if (is_win) {
+++        defines = ["_SCL_SECURE_NO_WARNINGS",
+++                   "_CRT_SECURE_NO_WARNINGS",
+++                   "UNICODE",
+++                   "GRAPHITE2_STATIC"]
+++    } else {
+++        cflags += ["-Wall",  "-Wextra",  "-Wno-unknown-pragmas",
+++               "-Wendif-labels", "-Wshadow", "-Wctor-dtor-privacy",
+++               "-Wnon-virtual-dtor"]
+++
+++
+++#        if (is_clang) {
+++#            cflags += ["-Wimplicit-fallthrough", "-Wshorten-64-to-32"]
+++#        }
+++    }
+++}
+++
+++source_set("graphite_source") {
+++    visibility = [ "//third_party:freetype_harfbuzz" ]
+++
+++    sources = [
+++        "graphite2/src/direct_machine.cpp",
+++        "graphite2/src/gr_char_info.cpp",
+++        "graphite2/src/gr_face.cpp",
+++        "graphite2/src/gr_features.cpp",
+++        "graphite2/src/gr_font.cpp",
+++        "graphite2/src/gr_logging.cpp",
+++        "graphite2/src/gr_segment.cpp",
+++        "graphite2/src/gr_slot.cpp",
+++        "graphite2/src/json.cpp",
+++        "graphite2/src/CmapCache.cpp",
+++        "graphite2/src/Code.cpp",
+++        "graphite2/src/Collider.cpp",
+++        "graphite2/src/Decompressor.cpp",
+++        "graphite2/src/Face.cpp",
+++        "graphite2/src/FeatureMap.cpp",
+++        "graphite2/src/FileFace.cpp",
+++        "graphite2/src/Font.cpp",
+++        "graphite2/src/GlyphCache.cpp",
+++        "graphite2/src/GlyphFace.cpp",
+++        "graphite2/src/Intervals.cpp",
+++        "graphite2/src/Justifier.cpp",
+++        "graphite2/src/NameTable.cpp",
+++        "graphite2/src/Pass.cpp",
+++        "graphite2/src/Position.cpp",
+++        "graphite2/src/Segment.cpp",
+++        "graphite2/src/Silf.cpp",
+++        "graphite2/src/Slot.cpp",
+++        "graphite2/src/Sparse.cpp",
+++        "graphite2/src/TtfUtil.cpp",
+++        "graphite2/src/UtfCodec.cpp",
+++
+++        "graphite2/src/inc/bits.h",
+++        "graphite2/src/inc/debug.h",
+++        "graphite2/src/inc/json.h",
+++        "graphite2/src/inc/CharInfo.h",
+++        "graphite2/src/inc/CmapCache.h",
+++        "graphite2/src/inc/Code.h",
+++        "graphite2/src/inc/Collider.h",
+++        "graphite2/src/inc/Compression.h",
+++        "graphite2/src/inc/Decompressor.h",
+++        "graphite2/src/inc/Endian.h",
+++        "graphite2/src/inc/Error.h",
+++        "graphite2/src/inc/Face.h",
+++        "graphite2/src/inc/FeatureMap.h",
+++        "graphite2/src/inc/FeatureVal.h",
+++        "graphite2/src/inc/FileFace.h",
+++        "graphite2/src/inc/Font.h",
+++        "graphite2/src/inc/GlyphCache.h",
+++        "graphite2/src/inc/GlyphFace.h",
+++        "graphite2/src/inc/Intervals.h",
+++        "graphite2/src/inc/List.h",
+++        "graphite2/src/inc/locale2lcid.h",
+++        "graphite2/src/inc/Machine.h",
+++        "graphite2/src/inc/Main.h",
+++        "graphite2/src/inc/NameTable.h",
+++        "graphite2/src/inc/opcode_table.h",
+++        "graphite2/src/inc/opcodes.h",
+++        "graphite2/src/inc/Pass.h",
+++        "graphite2/src/inc/Position.h",
+++        "graphite2/src/inc/Rule.h",
+++        "graphite2/src/inc/Segment.h",
+++        "graphite2/src/inc/Silf.h",
+++        "graphite2/src/inc/Slot.h",
+++        "graphite2/src/inc/Sparse.h",
+++        "graphite2/src/inc/TtfTypes.h",
+++        "graphite2/src/inc/TtfUtil.h",
+++        "graphite2/src/inc/UtfCodec.h",
+++
+++        "graphite2/include/graphite2/Font.h",
+++        "graphite2/include/graphite2/Log.h",
+++        "graphite2/include/graphite2/Segment.h",
+++        "graphite2/include/graphite2/Types.h",
+++    ]
+++
+++    defines = [
+++        "GRAPHITE2_NTRACING",
+++        "GRAPHITE2_NSEGCACHE",
+++        "GRAPHITE2_NFILEFACE"
+++    ]
+++
+++    configs -= [ "//build/config/compiler:chromium_code" ]
+++    configs += [ "//build/config/compiler:no_chromium_code",
+++                 ":graphite_build" ]
+++    public_configs = [ ":graphite_config" ]
+++}
++diff --git a/third_party/graphite/graphite.gni b/third_party/graphite/graphite.gni
++new file mode 100644
++index 0000000000000..a053150ebfb47
++--- /dev/null
+++++ b/third_party/graphite/graphite.gni
++@@ -0,0 +1,4 @@
+++
+++declare_args() {
+++    use_graphite = true
+++}
++diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
++index be6f93b56915a..f175e50ff1447 100644
++--- a/third_party/harfbuzz-ng/BUILD.gn
+++++ b/third_party/harfbuzz-ng/BUILD.gn
++@@ -9,6 +9,7 @@ import("//build/config/freetype/freetype.gni")
++ import("//build/config/ui.gni")
++ import("//testing/libfuzzer/fuzzer_test.gni")
++ import("//third_party/harfbuzz-ng/harfbuzz.gni")
+++import("//third_party/graphite/graphite.gni")
++ 
++ if (use_system_harfbuzz) {
++   import("//build/config/linux/pkg_config.gni")
++@@ -393,6 +394,17 @@ if (use_system_harfbuzz) {
++       public += [ "src/src/hb-glib.h" ]
++       sources += [ "src/src/hb-glib.cc" ]
++     }
+++
+++    if (use_graphite) {
+++      configs += [ "//third_party/graphite:graphite_config" ]
+++      sources += [
+++        "src/src/hb-graphite2.cc",
+++        "src/src/hb-graphite2.h",
+++      ]
+++      defines += ["HAVE_GRAPHITE2",
+++                  "GRAPHITE2_STATIC"
+++                 ]
+++    }
++   }
++ }
++ 
++ 
+\ No newline at end of file
diff --git a/docs/development/Electronite/step.bat b/docs/development/Electronite/step.bat
new file mode 100755
index 0000000000000..b1ed897b7df1c
--- /dev/null
+++ b/docs/development/Electronite/step.bat
@@ -0,0 +1,155 @@
+rem echo off
+
+rem cd Development\Electronite
+rem set PATH=%cd%\depot_tools;%PATH%
+rem .\step.bat get v17.3.1-graphite
+
+
+set ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+set working_dir=%cd%
+set GIT_CACHE_PATH=%working_dir%\git_cache
+mkdir %GIT_CACHE_PATH%
+
+rem sccache no longer supported in Electron
+rem set SCCACHE_BUCKET=electronjs-sccache
+rem set SCCACHE_TWO_TIER=true
+set DEPOT_TOOLS_WIN_TOOLCHAIN=0
+set NINJA_STATUS="[%%r processes, %%f/%%t @ %%o/s : %%es] "
+echo "GIT_CACHE_PATH=%GIT_CACHE_PATH%"
+echo "SCCACHE_BUCKET=%SCCACHE_BUCKET%"
+echo "working_dir=%working_dir%"
+
+echo "%date% - %time%" > start_time.txt
+
+rem TODO: configure environment variables.
+
+rem ------------------------
+rem check command to execute
+rem ------------------------
+if %1.==. goto MissingArgs
+
+rem -------------
+rem start command
+rem -------------
+if "%1" == "get" goto Get
+if "%1" == "build" goto Build
+if "%1" == "release" goto Release
+goto MissingTag
+
+:Get
+rem ####################
+rem fetch code
+rem ####################
+if %2.==. goto MissingTag
+set checkout_tag=%2
+
+rem make sure depot_tools is clean
+echo Preparing depot_tools
+FOR /F "tokens=* USEBACKQ" %%F IN (`where gclient.bat`) DO (
+set depot_tools_dir=%%~dpF
+)
+echo depot_tools_dir=%depot_tools_dir%"
+cd %depot_tools_dir% && call git reset HEAD --hard && echo depot_tools is ready
+cd %working_dir%
+
+rem fetch code
+echo Fetching code. This will take a long time and download up to 16GB.
+
+rem echo Deleting electron-gn folder.
+rem if exist electron-gn rmdir /Q /S electron-gn
+rem echo Deleted electron-gn folder.
+
+mkdir electron-gn
+cd electron-gn
+rem call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
+rem call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+
+cd src\electron
+echo Checking out %checkout_tag% in %cd%
+call git checkout %checkout_tag%
+cd ..
+
+echo Changes
+call git status
+echo Commit all Changes so sync with patches will not fail?
+call git add -A
+call git commit -m "commit changes" --author="A U Thor <author@example.com>"
+cd..
+
+echo Applying electron patches
+
+rem echo Applying electron prehooks
+rem call gclient sync --with_branch_heads --with_tags  --nohooks --verbose --verbose
+call gclient sync --with_branch_heads --with_tags  --verbose --verbose
+
+goto End
+
+:Build
+rem ####################
+rem build release
+rem ####################
+set build_32bit=false
+if "%2" == "x86" set build_32bit=true
+
+echo Building release
+cd electron-gn\src
+set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
+
+if %build_32bit% == true (
+    echo Generating 32bit configuration...
+    call gn gen out/Release-x86 --args="target_cpu=\"x86\" import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release-x86 electron
+) else (
+    echo Generating configuration...
+    call gn gen out/Release --args="import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release electron
+)
+
+goto End
+
+:Release
+rem ####################
+rem create distributable
+rem ####################
+set release_32bit=false
+if "%2" == "x86" set release_32bit=true
+cd electron-gn\src
+if %release_32bit% == true (
+    echo Creating 32bit distributable
+    electron\script\strip-binaries.py -d out\Release-x86
+    call ninja -C out\Release-x86 electron:electron_dist_zip
+) else (
+    echo Creating distributable
+    electron\script\strip-binaries.py -d out\Release
+    call ninja -C out\Release electron:electron_dist_zip
+)
+
+goto End
+
+rem ####################
+rem help text
+rem ####################
+
+:MissingArgs
+    echo ***********************
+    echo *  Electronite Tools  *
+    echo ***********************
+    echo This is a set of tools for compiling electronite.
+    echo The source for electronite is at https://github.com/unfoldingWord-dev/electronite.
+    echo Usage: ./electronite-tools.sh ^<command^>
+    echo where ^<command^> is one of:
+    echo     get ^<ref^>     - fetches all of the code.
+    echo                       Where ^<ref^> is a branch or tag.
+    echo     build [arch]    - compiles electronite. The default arch is x64, but you can specify x86.
+    echo     release [arch]  - creates the distributable. The default arch is x64, but you can specify x86.
+    echo For detailed instructions on building Electron
+    echo see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+    goto End
+:MissingTag
+    echo Missing the ^<ref^> to checkout. Please specify a tag or branch name.
+    goto End
+:End
+
+cd %working_dir%
+
+echo "%date% - %time%" > end_time.txt
diff --git a/docs/development/Electronite/step.sh b/docs/development/Electronite/step.sh
new file mode 100755
index 0000000000000..a0213cf4b9203
--- /dev/null
+++ b/docs/development/Electronite/step.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+set -e
+
+# show commands as they are executed
+set -x
+
+ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+COMMAND=$1
+
+# Configure environment variables and paths
+export GIT_CACHE_PATH=`pwd`/git_cache
+mkdir -p "${GIT_CACHE_PATH}"
+
+# sccache no longer supported in Electron
+# export SCCACHE_BUCKET="electronjs-sccache"
+# export SCCACHE_TWO_TIER=true
+
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+echo "GIT_CACHE_PATH=${GIT_CACHE_PATH}"
+echo "SCCACHE_BUCKET=${SCCACHE_BUCKET}"
+
+
+##########################
+# fetch code
+##########################
+if [ "$COMMAND" == "get" ]; then
+  if [ $# -ge 2 ]; then
+    BRANCH=$2
+  else
+    echo "Missing the <ref> to checkout. Please specify a tag or branch name."
+    exit 0
+  fi
+
+  echo "Deleting old work folders. This may take a long time with about 49GB and 850K files."
+  rm -rf electron-gn
+  mkdir -p electron-gn
+  cd electron-gn
+  echo "Fetching code. This will take a long time and download up to 16GB."
+  gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
+  gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+  cd src/electron
+  echo "Checking out $BRANCH"
+  git checkout $BRANCH
+  cd -
+  echo "Applying electron patches"
+  gclient sync --with_branch_heads --with_tags
+  exit 0
+fi
+
+##########################
+# build release
+##########################
+if [ "$COMMAND" == "build" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET=$2
+    RELEASE_TARGET="-${TARGET}"
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu=\"${TARGET}\""
+    echo "Building for ${TARGET}"
+    if [ "$TARGET" == "arm64" ] && [ "`uname`" == "Linux" ]; then
+      export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} fatal_linker_warnings = false enable_linux_installer = false"
+    fi
+    echo "Building for \"${TARGET}\", extra args: \"${GN_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    echo "Building for default \"x64\", extra args: \"${GN_EXTRA_ARGS}\""
+  fi
+
+  echo "Building target: ${RELEASE_TARGET}"
+
+  cd electron-gn/src
+  export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+#  export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
+  echo "Generating configuration..."
+  gn gen out/Release${RELEASE_TARGET} --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
+  ninja -C out/Release${RELEASE_TARGET} electron
+  cd -
+  exit 0
+fi
+
+##########################
+# create distributable
+##########################
+if [ "$COMMAND" == "release" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET="$2"
+    RELEASE_TARGET="-${TARGET}"
+    STRIP_EXTRA_ARGS=--target-cpu=$TARGET
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu=\"${TARGET}\""
+    echo "Releasing for \"${TARGET}\", extra args: \"${STRIP_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    STRIP_EXTRA_ARGS=""
+    echo "Releasing for default \"x64\", extra args: \"${STRIP_EXTRA_ARGS}\""    
+  fi
+
+  echo "Releasing: ${RELEASE_TARGET}"
+
+  echo "Creating distributable"
+  cd electron-gn/src
+  if [ "`uname`" != "Darwin" ]; then
+    ./electron/script/strip-binaries.py ${STRIP_EXTRA_ARGS} -d out/Release${RELEASE_TARGET}
+  fi
+  ninja -C out/Release${RELEASE_TARGET} electron:electron_dist_zip
+  exit 0
+fi
+
+##########################
+# help
+##########################
+if [ "$COMMAND" == "" ]; then
+  echo "***********************
+*  Electronite Tools  *
+***********************
+This is a set of tools for compiling Electronite.
+The source for Electronite is at https://github.com/unfoldingWord-dev/electronite.
+
+Usage: ./electronite-tools.sh <command>
+
+where <command> is one of:
+
+    get <ref> - fetches all of the code.
+                Where <ref> is a branch or tag.
+
+    build <target> - compiles Electronite, target is optional, defaults to x64,
+                       Could be arm64.
+
+    release <target> - creates the distributable.  Use same target as
+                       previous build.
+
+For detailed instructions on building Electron
+see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+"
+fi
\ No newline at end of file
diff --git a/patches/chromium/add_graphite.patch b/patches/chromium/add_graphite.patch
new file mode 100644
index 0000000000000..68fb9e166bf79
--- /dev/null
+++ b/patches/chromium/add_graphite.patch
@@ -0,0 +1,217 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joel <da1nerd@pm.me>
+Date: Tue, 23 Jul 2019 15:48:39 -0700
+Subject: [PATCH] adds graphite support for font rendering - patched for v17.3.1 and v18.2.1
+
+diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
+index a62632e2c3fcf..0a8714996d3b9 100644
+--- a/third_party/BUILD.gn
++++ b/third_party/BUILD.gn
+@@ -4,6 +4,7 @@q
+ 
+ import("//build/config/freetype/freetype.gni")
+ import("//third_party/harfbuzz-ng/harfbuzz.gni")
++import("//third_party/graphite/graphite.gni")
+ import("//third_party/libjpeg.gni")
+ 
+ assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
+@@ -60,5 +61,8 @@ component("freetype_harfbuzz") {
+     public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
+   } else {
+     public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ]
++    if (use_graphite) {
++      public_deps += [ "//third_party/graphite:graphite_source" ]
++    }
+   }
+ }
+diff --git a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc b/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
+index 6e388c9135c64..e6eea739ac230 100644
+--- a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
++++ b/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
+@@ -95,6 +95,11 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+   const uint32_t kCblcTag = OTS_TAG('C', 'B', 'L', 'C');
+   const uint32_t kColrTag = OTS_TAG('C', 'O', 'L', 'R');
+   const uint32_t kCpalTag = OTS_TAG('C', 'P', 'A', 'L');
++  const uint32_t kFeatTag = OTS_TAG('F', 'e', 'a', 't');
++  const uint32_t kGlatTag = OTS_TAG('G', 'l', 'a', 't');
++  const uint32_t kGlocTag = OTS_TAG('G', 'l', 'o', 'c');
++  const uint32_t kSilfTag = OTS_TAG('S', 'i', 'l', 'f');
++  const uint32_t kSillTag = OTS_TAG('S', 'i', 'l', 'l');
+   const uint32_t kCff2Tag = OTS_TAG('C', 'F', 'F', '2');
+   const uint32_t kSbixTag = OTS_TAG('s', 'b', 'i', 'x');
+ #if HB_VERSION_ATLEAST(1, 0, 0)
+@@ -121,6 +126,12 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+     // Windows Color Emoji Tables
+     case kColrTag:
+     case kCpalTag:
++    // Graphite
++    case kFeatTag:
++    case kGlatTag:
++    case kGlocTag:
++    case kSilfTag:
++    case kSillTag:
+     case kCff2Tag:
+     case kSbixTag:
+ #if HB_VERSION_ATLEAST(1, 0, 0)
+diff --git a/third_party/graphite/BUILD.gn b/third_party/graphite/BUILD.gn
+new file mode 100644
+index 0000000000000..75b8267c80910
+--- /dev/null
++++ b/third_party/graphite/BUILD.gn
+@@ -0,0 +1,115 @@
++
++config("graphite_config") {
++    include_dirs = [ "graphite2/include" ]
++}
++
++config("graphite_build") {
++    include_dirs = [ "graphite2/src" ]
++    cflags = []
++
++    if (is_win) {
++        defines = ["_SCL_SECURE_NO_WARNINGS",
++                   "_CRT_SECURE_NO_WARNINGS",
++                   "UNICODE",
++                   "GRAPHITE2_STATIC"]
++    } else {
++        cflags += ["-Wall",  "-Wextra",  "-Wno-unknown-pragmas",
++               "-Wendif-labels", "-Wshadow", "-Wctor-dtor-privacy",
++               "-Wnon-virtual-dtor"]
++
++
++#        if (is_clang) {
++#            cflags += ["-Wimplicit-fallthrough", "-Wshorten-64-to-32"]
++#        }
++    }
++}
++
++source_set("graphite_source") {
++    visibility = [ "//third_party:freetype_harfbuzz" ]
++
++    sources = [
++        "graphite2/src/direct_machine.cpp",
++        "graphite2/src/gr_char_info.cpp",
++        "graphite2/src/gr_face.cpp",
++        "graphite2/src/gr_features.cpp",
++        "graphite2/src/gr_font.cpp",
++        "graphite2/src/gr_logging.cpp",
++        "graphite2/src/gr_segment.cpp",
++        "graphite2/src/gr_slot.cpp",
++        "graphite2/src/json.cpp",
++        "graphite2/src/CmapCache.cpp",
++        "graphite2/src/Code.cpp",
++        "graphite2/src/Collider.cpp",
++        "graphite2/src/Decompressor.cpp",
++        "graphite2/src/Face.cpp",
++        "graphite2/src/FeatureMap.cpp",
++        "graphite2/src/FileFace.cpp",
++        "graphite2/src/Font.cpp",
++        "graphite2/src/GlyphCache.cpp",
++        "graphite2/src/GlyphFace.cpp",
++        "graphite2/src/Intervals.cpp",
++        "graphite2/src/Justifier.cpp",
++        "graphite2/src/NameTable.cpp",
++        "graphite2/src/Pass.cpp",
++        "graphite2/src/Position.cpp",
++        "graphite2/src/Segment.cpp",
++        "graphite2/src/Silf.cpp",
++        "graphite2/src/Slot.cpp",
++        "graphite2/src/Sparse.cpp",
++        "graphite2/src/TtfUtil.cpp",
++        "graphite2/src/UtfCodec.cpp",
++
++        "graphite2/src/inc/bits.h",
++        "graphite2/src/inc/debug.h",
++        "graphite2/src/inc/json.h",
++        "graphite2/src/inc/CharInfo.h",
++        "graphite2/src/inc/CmapCache.h",
++        "graphite2/src/inc/Code.h",
++        "graphite2/src/inc/Collider.h",
++        "graphite2/src/inc/Compression.h",
++        "graphite2/src/inc/Decompressor.h",
++        "graphite2/src/inc/Endian.h",
++        "graphite2/src/inc/Error.h",
++        "graphite2/src/inc/Face.h",
++        "graphite2/src/inc/FeatureMap.h",
++        "graphite2/src/inc/FeatureVal.h",
++        "graphite2/src/inc/FileFace.h",
++        "graphite2/src/inc/Font.h",
++        "graphite2/src/inc/GlyphCache.h",
++        "graphite2/src/inc/GlyphFace.h",
++        "graphite2/src/inc/Intervals.h",
++        "graphite2/src/inc/List.h",
++        "graphite2/src/inc/locale2lcid.h",
++        "graphite2/src/inc/Machine.h",
++        "graphite2/src/inc/Main.h",
++        "graphite2/src/inc/NameTable.h",
++        "graphite2/src/inc/opcode_table.h",
++        "graphite2/src/inc/opcodes.h",
++        "graphite2/src/inc/Pass.h",
++        "graphite2/src/inc/Position.h",
++        "graphite2/src/inc/Rule.h",
++        "graphite2/src/inc/Segment.h",
++        "graphite2/src/inc/Silf.h",
++        "graphite2/src/inc/Slot.h",
++        "graphite2/src/inc/Sparse.h",
++        "graphite2/src/inc/TtfTypes.h",
++        "graphite2/src/inc/TtfUtil.h",
++        "graphite2/src/inc/UtfCodec.h",
++
++        "graphite2/include/graphite2/Font.h",
++        "graphite2/include/graphite2/Log.h",
++        "graphite2/include/graphite2/Segment.h",
++        "graphite2/include/graphite2/Types.h",
++    ]
++
++    defines = [
++        "GRAPHITE2_NTRACING",
++        "GRAPHITE2_NSEGCACHE",
++        "GRAPHITE2_NFILEFACE"
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [ "//build/config/compiler:no_chromium_code",
++                 ":graphite_build" ]
++    public_configs = [ ":graphite_config" ]
++}
+diff --git a/third_party/graphite/graphite.gni b/third_party/graphite/graphite.gni
+new file mode 100644
+index 0000000000000..a053150ebfb47
+--- /dev/null
++++ b/third_party/graphite/graphite.gni
+@@ -0,0 +1,4 @@
++
++declare_args() {
++    use_graphite = true
++}
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index be6f93b56915a..f175e50ff1447 100644
+--- a/third_party/harfbuzz-ng/BUILD.gn
++++ b/third_party/harfbuzz-ng/BUILD.gn
+@@ -9,6 +9,7 @@ import("//build/config/freetype/freetype.gni")
+ import("//build/config/ui.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ import("//third_party/harfbuzz-ng/harfbuzz.gni")
++import("//third_party/graphite/graphite.gni")
+ 
+ if (use_system_harfbuzz) {
+   import("//build/config/linux/pkg_config.gni")
+@@ -393,6 +394,17 @@ if (use_system_harfbuzz) {
+       public += [ "src/src/hb-glib.h" ]
+       sources += [ "src/src/hb-glib.cc" ]
+     }
++
++    if (use_graphite) {
++      configs += [ "//third_party/graphite:graphite_config" ]
++      sources += [
++        "src/src/hb-graphite2.cc",
++        "src/src/hb-graphite2.h",
++      ]
++      defines += ["HAVE_GRAPHITE2",
++                  "GRAPHITE2_STATIC"
++                 ]
++    }
+   }
+ }
+ 
+ 
\ No newline at end of file

From ce880393d6afd96d85ffd673cde4e11c81781911 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Mon, 24 Oct 2022 19:44:07 -0400
Subject: [PATCH 788/811] updated electron.d.ts

---
 docs/development/Electronite/electron.d.ts | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/development/Electronite/electron.d.ts b/docs/development/Electronite/electron.d.ts
index 4cbe4b615c14a..b6af4acc2218b 100644
--- a/docs/development/Electronite/electron.d.ts
+++ b/docs/development/Electronite/electron.d.ts
@@ -17862,34 +17862,34 @@ declare namespace Electron {
 
 }
 
-declare module 'electron' {
+declare module 'electronite' {
   export = Electron.CrossProcessExports;
 }
 
-declare module 'electron/main' {
+declare module 'electronite/main' {
   export = Electron.Main
 }
 
-declare module 'electron/common' {
+declare module 'electronite/common' {
   export = Electron.Common
 }
 
-declare module 'electron/renderer' {
+declare module 'electronite/renderer' {
   export = Electron.Renderer
 }
 
 interface NodeRequireFunction {
-  (moduleName: 'electron'): typeof Electron.CrossProcessExports;
-  (moduleName: 'electron/main'): typeof Electron.Main;
-  (moduleName: 'electron/common'): typeof Electron.Common;
-  (moduleName: 'electron/renderer'): typeof Electron.Renderer;
+  (moduleName: 'electronite'): typeof Electron.CrossProcessExports;
+  (moduleName: 'electronite/main'): typeof Electron.Main;
+  (moduleName: 'electronite/common'): typeof Electron.Common;
+  (moduleName: 'electronite/renderer'): typeof Electron.Renderer;
 }
 
 interface NodeRequire {
-  (moduleName: 'electron'): typeof Electron.CrossProcessExports;
-  (moduleName: 'electron/main'): typeof Electron.Main;
-  (moduleName: 'electron/common'): typeof Electron.Common;
-  (moduleName: 'electron/renderer'): typeof Electron.Renderer;
+  (moduleName: 'electronite'): typeof Electron.CrossProcessExports;
+  (moduleName: 'electronite/main'): typeof Electron.Main;
+  (moduleName: 'electronite/common'): typeof Electron.Common;
+  (moduleName: 'electronite/renderer'): typeof Electron.Renderer;
 }
 
 interface File {

From 3374b188c06e8d8e7a402a6e4f57c4fac519655e Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Mon, 24 Oct 2022 19:47:52 -0400
Subject: [PATCH 789/811] docs

---
 docs/development/Electronite/MacBuildNotes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 01786fdb9c3d3..4d0c3a77c6412 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -71,7 +71,7 @@ e build electron
 
 - Test the build. 
   - Do `e start`.
-  - Open the developer console by typing`Command-Shift-I`.
+  - Open the developer console by typing`Command-Alt-I`.
   - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
   - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
   - The example for Padauk from server will not be correct with the triangles.  So need to:

From 8cd6a8d3c69c2eea8aa72817e4daf67e94bae08e Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Mon, 24 Oct 2022 20:25:00 -0400
Subject: [PATCH 790/811] applied graphite patches manually

---
 DEPS                                          | 19 ++++++++++++++++++-
 .../development/Electronite/electronite.patch | 12 ++++++------
 patches/chromium/.patches                     |  1 +
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index af2db8b965485..9498ab6da934a 100644
--- a/DEPS
+++ b/DEPS
@@ -11,12 +11,14 @@ vars = {
     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
 
   'pyyaml_version': '3.12',
+  'graphite_version': '92f59dcc52f73ce747f1cdc831579ed2546884aa',
 
   'chromium_git': 'https://chromium.googlesource.com',
   'electron_git': 'https://github.com/electron',
   'nodejs_git': 'https://github.com/nodejs',
   'yaml_git': 'https://github.com/yaml',
   'squirrel_git': 'https://github.com/Squirrel',
+  'graphite_git': 'https://github.com/silnrsi',
 
   # KEEP IN SYNC WITH utils.js FILE
   'yarn_version': '1.15.2',
@@ -32,6 +34,7 @@ vars = {
   'checkout_node': True,
   'checkout_nan': True,
   'checkout_pgo_profiles': True,
+  'checkout_graphite': True,
 
   # It's only needed to parse the native tests configurations.
   'checkout_pyyaml': False,
@@ -82,6 +85,10 @@ deps = {
     'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
     'condition': 'checkout_pyyaml and process_deps',
   },
+  'src/third_party/graphite/graphite2': {
+    'url': (Var("graphite_git")) + '/graphite.git@' + (Var("graphite_version")),
+    'condition': 'checkout_graphite and process_deps',
+  },
   'src/third_party/squirrel.mac': {
     'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
     'condition': 'process_deps',
@@ -111,7 +118,17 @@ pre_deps_hooks = [
       'src/electron/patches/config.json',
     ],
   },
-]
+  {
+    'name': 'setup_graphite',
+    'condition': 'checkout_graphite and apply_patches and process_deps',
+    'pattern': 'src/electron',
+    'action': [
+      'python3',
+      '-c',
+      'import os; os.makedirs(os.path.join("src", "electron", "third_party", "graphite"));',
+     ],
+   },
+ ]
 
 hooks = [
   {
diff --git a/docs/development/Electronite/electronite.patch b/docs/development/Electronite/electronite.patch
index 0da91209a8159..87eeb8f59d812 100644
--- a/docs/development/Electronite/electronite.patch
+++ b/docs/development/Electronite/electronite.patch
@@ -2,7 +2,7 @@ diff --git a/DEPS b/DEPS
 index 5047b6b16..3c928c079 100644
 --- a/DEPS
 +++ b/DEPS
-@@ -27,12 +27,14 @@ vars = {
+@@ -11,12 +11,14 @@ vars = {
      '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
  
    'pyyaml_version': '3.12',
@@ -17,7 +17,7 @@ index 5047b6b16..3c928c079 100644
  
    # KEEP IN SYNC WITH utils.js FILE
    'yarn_version': '1.15.2',
-@@ -48,6 +50,7 @@ vars = {
+@@ -32,6 +34,7 @@ vars = {
    'checkout_node': True,
    'checkout_nan': True,
    'checkout_pgo_profiles': True,
@@ -25,7 +25,7 @@ index 5047b6b16..3c928c079 100644
  
    # It's only needed to parse the native tests configurations.
    'checkout_pyyaml': False,
-@@ -98,6 +101,10 @@ deps = {
+@@ -82,6 +85,10 @@ deps = {
      'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
      'condition': 'checkout_pyyaml and process_deps',
    },
@@ -36,7 +36,7 @@ index 5047b6b16..3c928c079 100644
    'src/third_party/squirrel.mac': {
      'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
      'condition': 'process_deps',
-@@ -127,6 +134,16 @@ pre_deps_hooks = [
+@@ -111,6 +118,16 @@ pre_deps_hooks = [
        'src/electron/patches/config.json',
      ],
    },
@@ -57,8 +57,8 @@ diff --git a/patches/chromium/.patches b/patches/chromium/.patches
 index c7311e348..7f9c36e22 100644
 --- a/patches/chromium/.patches
 +++ b/patches/chromium/.patches
-@@ -115,3 +115,4 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
- remove_incorrect_width_height_adjustments.patch
+@@ -105,3 +105,4 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
+ build_make_libcxx_abi_unstable_false_for_electron.patch
  introduce_ozoneplatform_electron_can_call_x11_property.patch
  make_gtk_getlibgtk_public.patch
 +add_graphite.patch
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index 5d4cdbaa54944..c4566ca063778 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -105,6 +105,7 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
+add_graphite.patch
 build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch

From 728475a376c63ae4ff22553aae9f1758f5e51a04 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Tue, 25 Oct 2022 08:08:29 -0400
Subject: [PATCH 791/811] update add_graphite.patch manually

---
 patches/chromium/add_graphite.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/chromium/add_graphite.patch b/patches/chromium/add_graphite.patch
index 68fb9e166bf79..3bbfaa4e752fb 100644
--- a/patches/chromium/add_graphite.patch
+++ b/patches/chromium/add_graphite.patch
@@ -28,7 +28,7 @@ diff --git a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc b/thi
 index 6e388c9135c64..e6eea739ac230 100644
 --- a/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
 +++ b/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
-@@ -95,6 +95,11 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+@@ -102,6 +102,11 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
    const uint32_t kCblcTag = OTS_TAG('C', 'B', 'L', 'C');
    const uint32_t kColrTag = OTS_TAG('C', 'O', 'L', 'R');
    const uint32_t kCpalTag = OTS_TAG('C', 'P', 'A', 'L');
@@ -40,7 +40,7 @@ index 6e388c9135c64..e6eea739ac230 100644
    const uint32_t kCff2Tag = OTS_TAG('C', 'F', 'F', '2');
    const uint32_t kSbixTag = OTS_TAG('s', 'b', 'i', 'x');
  #if HB_VERSION_ATLEAST(1, 0, 0)
-@@ -121,6 +126,12 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+@@ -128,6 +133,12 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
      // Windows Color Emoji Tables
      case kColrTag:
      case kCpalTag:

From 58e71d0c7c96c7f5e50ec305d9fbd433a3e21175 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Tue, 25 Oct 2022 10:04:57 -0400
Subject: [PATCH 792/811] fix notes

---
 docs/development/Electronite/WindowsBuildNotes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index 351473bd21a87..33be9ba5d3c5c 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -26,7 +26,7 @@ WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10
 
 - installed: https://chocolatey.org/install
 	
-- Setup Build tools (using command prompt, not powershell).  Install using didn't work for me:
+- Setup Build tools (using command prompt, not powershell).  Install using powershell didn't work for me:
 ```
 npm i -g @electron/build-tools
 C:

From 68a5ca840071dd1befbd400ac9a99378c010cb36 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Thu, 27 Oct 2022 09:25:10 -0400
Subject: [PATCH 793/811] fix notes

---
 docs/development/Electronite/ElectroniteBuildNotes.md | 2 +-
 docs/development/Electronite/WindowsBuildNotes.md     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/development/Electronite/ElectroniteBuildNotes.md b/docs/development/Electronite/ElectroniteBuildNotes.md
index 8081c88273f3e..dca7aab1fb4fb 100644
--- a/docs/development/Electronite/ElectroniteBuildNotes.md
+++ b/docs/development/Electronite/ElectroniteBuildNotes.md
@@ -26,7 +26,7 @@ The simplest way to update Electronite is to pull down the branch from upstream
 
 Updating Electronite is pretty straight forward.
 1. Get the version of Electron that you want to update to, e.g. `git checkout upstream v12.0.5`.
-2. Branch from Electron `git checkout -b electronite-12.0.5`
+2. Create new electronite branch from Electron `git checkout -b electronite-v12.0.5`
 3. Apply the [Graphite Patch](https://github.com/unfoldingWord/electronite/wiki/Graphite-Patch) `git am add-graphite-to-electron.patch` (you might need to manually apply it if there are conflicting changes from upstream).
 4. Build and test the Electronite branch (see below).
 5. If everything is working properly, push the branch and tag the release using the proper naming convention, and create a new release based on your new tag with the compiled binaries attached to it.
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index 33be9ba5d3c5c..118a3a18bf4d8 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -43,6 +43,7 @@ npm i
 #### Build Intel x64
 - open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
 ```
+rem - first cd to the base build directory and run:
 e init --root=.\Build-Electron -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
 ```
 

From efe913b3aaeced44a45cc1cd2c6ccea6efa83038 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 05:33:44 -0400
Subject: [PATCH 794/811] update setup instructions

---
 .../Electronite/LinuxBuildNotes.md            | 108 +++---------
 .../Electronite/LinuxBuildNotesChromeTools.md |   7 +-
 docs/development/Electronite/MacBuildNotes.md |  65 ++-----
 .../Electronite/WindowsBuildNotes.md          | 102 +++--------
 .../add_graphite_cpp_std_iterator.patch       |  30 ++++
 .../Electronite/electronite-tools-2.bat       | 161 ++++++++++++++++++
 .../Electronite/electronite-tools-2.sh        | 146 ++++++++++++++++
 7 files changed, 401 insertions(+), 218 deletions(-)
 create mode 100755 docs/development/Electronite/add_graphite_cpp_std_iterator.patch
 create mode 100755 docs/development/Electronite/electronite-tools-2.bat
 create mode 100755 docs/development/Electronite/electronite-tools-2.sh

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index 4284871af36a6..dece7cfd1c933 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -13,7 +13,7 @@ g++ --version
 - to create `arm64` and `arm` builds, you must have installed the arm dependencies mentioned in the Linux build instructions above.  Then run:
 - install and configure python:
 ```
-sudo apt install python python3.9
+sudo apt install python python3 python3-pip
 pip3 install --user --upgrade pip
 pip3 install --user pyobjc
 ```
@@ -27,85 +27,46 @@ npm i -g @electron/build-tools
 git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd ~/.electron_build_tools && npm install)
 ``` 
 
-#### Monitoring Goma status
-- if you browse to http://localhost:8088 on your local machine you can monitor compile jobs as they flow through the goma system.
-
-
 ### Build Electronite
 #### Build x64
-- open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
-e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~/.electron_build_tools/configs/evm.x64.json`
-  and add option to args:       `"target_cpu = \"x64\""`
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
-
-- checkout the correct Electronite tag
-```
-cd ~/Develop/Electronite-Build/src/electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ../..
-```
-
-- now get the Electronite sources
-```
-e sync
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
+./electronite-tools-2.sh get electronite-v20.3.3-beta
 ```
 
 - Do build (takes a long time)
 ```
-export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+./electronite-tools-2.sh build x64
 ```
 
 - Test the build.
-    - Do `e start`.
+    - Do `cd src/out/Release-x64 && electron`.
     - Open the developer console by typing`Control-Shift-I`.
     - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
     - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
     - The example for Padauk from server will not be correct with the triangles.  So need to:
       Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- Make the release to ~/Develop/Electronite-Build/src/out/x64/dist.zip
+- Make the release to ~/Develop/Electronite-Build/src/out/Release-x64/dist.zip
 ```
-./src/electron/script/strip-binaries.py -d src/out/x64
-e build electron:dist
+./electronite-tools-2.sh release x64
 ```
 
 #### Build x86
 - open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
 ```
 sudo apt-get install ia32-libs-gtk ia32-libs
-e init --root=~/Develop/Electronite-Build -o x86 x86 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~/.electron_build_tools/configs/evm.x86.json`
-  and add option to args:       `"target_cpu = \"x86\""`
-
-- if Electronite source already checked out, then skip to `Build Init` step:
-
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
 ```
 
-- checkout the correct Electronite tag
-```
-cd ~/Develop/Electronite-Build/src/electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ../..
-```
+- if Electronite source already checked out, then skip to `Build Init` step.
 
-- now get the Electronite sources
+- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
-e sync
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
+./electronite-tools-2.sh get electronite-v20.3.3-beta
 ```
 
 - Build Init: to create `x86` builds, you must have installed the x86 dependencies mentioned in the Linux build instructions above.  Then run:
@@ -117,44 +78,27 @@ cd ..
 
 - Do build (takes a long time)
 ```
-export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+./electronite-tools-2.sh build x86
 ```
 
-- Make the release to ~/Develop/Electronite-Build/src/out/x86/dist.zip
+- Make the release to ~/Develop/Electronite-Build/src/out/Release-x86/dist.zip
 ```
-./src/electron/script/strip-binaries.py --target-cpu=x86 -d src/out/x86
-e build electron:dist
+./electronite-tools-2.sh release x86
 ```
 
 #### Build Arm64
 - open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
 ```
 sudo apt-get install binutils-aarch64-linux-gnu
-e init --root=~/Develop/Electronite-Build -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
 ```
 
-- edit `~/.electron_build_tools/configs/evm.arm64.json`
-  and add option to args:       `"target_cpu = \"arm64\""`
-
-- if Electronite source already checked out, then skip to `Build Init` step:
-
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
-
-- checkout the correct Electronite tag
-```
-cd ~/Develop/Electronite-Build/src/electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ../..
-```
+- if Electronite source already checked out, then skip to `Build Init` step.
 
-- now get the Electronite sources
+- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
-e sync
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
+./electronite-tools-2.sh get electronite-v20.3.3-beta
 ```
 
 - Build Init: to create `arm64` builds, you must have installed the arm64 dependencies mentioned in the Linux build instructions above.  Then run:
@@ -166,12 +110,10 @@ cd ..
 
 - Do build (takes a long time)
 ```
-export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+./electronite-tools-2.sh build arm64
 ```
 
-- Make the release to ~/Develop/Electronite-Build/src/out/arm64/dist.zip
+- Make the release to ~/Develop/Electronite-Build/src/out/Release-arm64/dist.zip
 ```
-./src/electron/script/strip-binaries.py --target-cpu=arm64 -d src/out/arm64
-e build electron:dist
+./electronite-tools-2.sh release arm64
 ```
diff --git a/docs/development/Electronite/LinuxBuildNotesChromeTools.md b/docs/development/Electronite/LinuxBuildNotesChromeTools.md
index ad4847d8a560d..910c0b476d497 100644
--- a/docs/development/Electronite/LinuxBuildNotesChromeTools.md
+++ b/docs/development/Electronite/LinuxBuildNotesChromeTools.md
@@ -25,7 +25,12 @@ cd ../..
 - builds can take over 20 hours on a VM.
 - build Electronite for Intel 64-bit:
     - build for 64-bit: `./electronite-tools.sh build x64`
-    - create release for 32-bit: `./electronite-tools.sh release x64`
+    - create release for 64-bit: `./electronite-tools.sh release x64`
+
+- build Electronite for Intel 32-bit:
+    - initialize build configuration: `sudo apt-get install ia32-libs-gtk ia32-libs`
+    - build for 32-bit: `./electronite-tools.sh build x86`
+    - create release for 32-bit: `./electronite-tools.sh release x86`
 
 - build Electronite for Arm 64-bit:
     - build for arm 64-bit: `./electronite-tools.sh build arm64`
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 4d0c3a77c6412..0dd2a09373bbd 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -38,39 +38,20 @@ git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd
 
 ### Build Electronite
 #### Build Intel x64
-- open terminal and initialize build (on M1 Mac, had to use `--goma none`):
+- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
-e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~/.electron_build_tools/configs/evm.x64.json`
-  and add option to args:       `"target_cpu = \"x64\""`
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
-
-- checkout the correct Electronite tag
-```
-cd ~/Develop/Electronite-Build/src/electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ../..
-```
-
-- now get the Electronite sources
-```
-e sync
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
+./electronite-tools-2.sh get electronite-v20.3.3-beta
 ```
 
 - Do build (takes a long time)
 ```
-export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+./electronite-tools-2.sh build x64
 ```
 
 - Test the build. 
-  - Do `e start`.
+  - Do `e start`. (or `open /src/out/Release-x64/Electron.app`)
   - Open the developer console by typing`Command-Alt-I`.
   - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
   - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.
@@ -79,45 +60,25 @@ Open elements tab, select body of html, do command-F to search, and search for `
 
 - Make the release to ~/Develop/Electronite-Build/src/out/x64/dist.zip
 ```
-e build electron:dist
+./electronite-tools-2.sh release x64
 ```
 
 #### Build Arm64
-- open terminal and initialize build (on M1 Mac, had to use `--goma none`, and it may be faster if you have a slow or unreliable internet connection):
-```
-e init --root=~/Develop/Electronite-Build -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~/.electron_build_tools/configs/evm.arm64.json`
-and add option to args:       `"target_cpu = \"arm64\""`
-
 - if Electronite source already checked out, then skip to `Do build` step:
 
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
-
-- checkout the correct Electronite tag
-```
-cd ~/Develop/Electronite-Build/src/electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ../..
-```
-
-- now get the Electronite sources
+- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
-e sync
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
+./electronite-tools-2.sh get electronite-v20.3.3-beta
 ```
 
 - Do build (takes a long time)
 ```
-export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+./electronite-tools-2.sh build arm64
 ```
 
 - Make the release to ~/Develop/Electronite-Build/src/out/arm64/dist.zip
 ```
-e build electron:dist
+./electronite-tools-2.sh release arm64
 ```
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index 118a3a18bf4d8..916026b44f295 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -41,37 +41,19 @@ npm i
 
 ### Build Electronite
 #### Build Intel x64
-- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
+- open command prompt, cd to the build directory, and initialize build configuration:
 ```
-rem - first cd to the base build directory and run:
-e init --root=.\Build-Electron -o x64 x64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
+e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
 ```
 
-- edit `~\.electron_build_tools\configs\evm.x64.json`
-and add option to args:       `"target_cpu = \"x64\""`
-
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
-
-- checkout the correct Electronite tag
-```
-cd .\Build-Electron\src\electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ..\..
-```
-
-- now get the Electronite sources
+- get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-e sync
+.\electronite-tools-2.bat get electronite-v20.3.3-beta
 ```
 
 - Do build (takes a long time)
 ```
-set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+.\electronite-tools-2.bat build x64
 ```
 
 - Test the build.
@@ -82,88 +64,44 @@ e build electron
     - The example for Padauk from server will not be correct with the triangles.  So need to:
       Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- Make the release to .\Build-Electron\src\out\x64\dist.zip
+- Make the release to .\Build-Electron\src\out\Release-x64\dist.zip
 ```
-e build electron:dist
+.\electronite-tools-2.bat release x64
 ```
 
 #### Build Intel x86 (32 bit)
-- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
-```
-e init --root=.\Build-Electron -o x86 x86 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~\.electron_build_tools\configs\evm.x86.json`
-  and add option to args:       `"target_cpu = \"x86\""`
-
-- if Electronite source already checked out, then skip to `Do build` step:
-
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
-```
-e sync
-```
+- if Electronite source already checked out, then skip to `Do build` step.
 
-- checkout the correct Electronite tag
+- get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-cd .\Build-Electron\src\electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ..\..
-```
-
-- now get the Electronite sources
-```
-e sync
+.\electronite-tools-2.bat get electronite-v20.3.3-beta
 ```
 
 - Do build (takes a long time)
 ```
-set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+.\electronite-tools-2.bat build x86
 ```
 
-- Make the release to .\Build-Electron\src\out\x86\dist.zip
+- Make the release to .\Build-Electron\src\out\Release-x86\dist.zip
 ```
-e build electron:dist
+.\electronite-tools-2.bat release x86
 ```
 
 #### Build Intel arm64
-- open command prompt and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
-```
-e init --root=.\Build-Electron -o arm64 arm64 -i release --goma cache-only --fork unfoldingWord/electronite --use-https -f
-```
-
-- edit `~\.electron_build_tools\configs\evm.arm64.json`
-  and add option to args:       `"target_cpu = \"arm64\""`
-
-- if Electronite source already checked out, then skip to `Do build` step:
+- if Electronite source already checked out, then skip to `Do build` step.
 
-- get the base Electron source code (this can take many hours the first time as the git cache is loaded):
+-- get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-e sync
+.\electronite-tools-2.bat get electronite-v20.3.3-beta
 ```
-
-- checkout the correct Electronite tag
-```
-cd .\Build-Electron\src\electron
-git fetch --all
-git checkout tags/v18.3.2-graphite-beta -b v18.3.2-graphite-beta
-cd ..\..
-```
-
-- now get the Electronite sources
-```
-e sync
-```
-
+- 
 - Do build (takes a long time)
 ```
-set NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-e build electron
+.\electronite-tools-2.bat build arm64
 ```
 
-- Make the release to .\Build-Electron\src\out\arm64\dist.zip
+- Make the release to .\Build-Electron\src\out\Release-arm64\dist.zip
 ```
-e build electron:dist
+.\electronite-tools-2.bat release arm64
 ```
 
diff --git a/docs/development/Electronite/add_graphite_cpp_std_iterator.patch b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
new file mode 100755
index 0000000000000..b7fb431ce3c71
--- /dev/null
+++ b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Thu Nov 3 15:48:39 2022
+From: Bruce <bruce.mclean@unfoldingword.org>
+Date: Thu Nov 3 2022 15:48:39 -0700
+Subject: [PATCH] fix C++ std::iterator in graphite to be compatible with latest standard -- patched for v20.3.3
+
+diff --git a/third_party/graphite/graphite2/src/GlyphCache.cpp b/third_party/graphite/graphite2/src/GlyphCache.cpp
+index 282bdc18..336de3f1 100644
+--- a/third_party/graphite/graphite2/src/GlyphCache.cpp
++++ b/third_party/graphite/graphite2/src/GlyphCache.cpp
+@@ -44,12 +44,18 @@ namespace
+     // variable length structures.
+ 
+     template<typename W>
+-    class _glat_iterator : public std::iterator<std::input_iterator_tag, std::pair<sparse::key_type, sparse::mapped_type> >
++    class _glat_iterator
+     {
+         unsigned short  key() const             { return uint16(be::peek<W>(_e) + _n); }
+         unsigned int    run() const             { return be::peek<W>(_e+sizeof(W)); }
+         void            advance_entry()         { _n = 0; _e = _v; be::skip<W>(_v,2); }
+     public:
++        using iterator_category = std::input_iterator_tag;
++        using value_type = std::pair<sparse::key_type, sparse::mapped_type>;
++        using difference_type = std::pair<sparse::key_type, sparse::mapped_type>;
++        using pointer = std::pair<sparse::key_type, sparse::mapped_type>*;
++        using reference = std::pair<sparse::key_type, sparse::mapped_type>&;
++        
+         _glat_iterator(const void * glat=0) : _e(reinterpret_cast<const byte *>(glat)), _v(_e+2*sizeof(W)), _n(0) {}
+ 
+         _glat_iterator<W> & operator ++ () {
+
diff --git a/docs/development/Electronite/electronite-tools-2.bat b/docs/development/Electronite/electronite-tools-2.bat
new file mode 100755
index 0000000000000..095344a33e058
--- /dev/null
+++ b/docs/development/Electronite/electronite-tools-2.bat
@@ -0,0 +1,161 @@
+echo off
+set ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+set Path=%Path%;%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\third_party\depot_tools;%HOMEDRIVE%%HOMEPATH%\.electron_build_tools\src
+echo "Path = %Path%"
+set working_dir=%cd%
+set GIT_CACHE_PATH=%working_dir%\git_cache
+mkdir %GIT_CACHE_PATH%
+
+rem sccache no longer supported in Electron
+rem set SCCACHE_BUCKET=electronjs-sccache
+rem set SCCACHE_TWO_TIER=true
+
+set DEPOT_TOOLS_WIN_TOOLCHAIN=0
+set NINJA_STATUS="[%%r processes, %%f/%%t @ %%o/s : %%es] "
+echo "GIT_CACHE_PATH=%GIT_CACHE_PATH%"
+echo "SCCACHE_BUCKET=%SCCACHE_BUCKET%"
+echo "working_dir=%working_dir%"
+
+echo "%date% - %time%" > start_time.txt
+
+rem TODO: configure environment variables.
+
+rem ------------------------
+rem check command to execute
+rem ------------------------
+if %1.==. goto MissingArgs
+
+rem -------------
+rem start command
+rem -------------
+if "%1" == "get" goto Get
+if "%1" == "switch" goto Get
+if "%1" == "build" goto Build
+if "%1" == "release" goto Release
+goto MissingTag
+
+:Get
+rem ####################
+rem fetch code
+rem ####################
+if %2.==. goto MissingTag
+set checkout_tag=%2
+
+rem make sure depot_tools is clean
+echo Preparing depot_tools
+FOR /F "tokens=* USEBACKQ" %%F IN (`where gclient.bat`) DO (
+  set depot_tools_dir=%%~dpF
+)
+echo depot_tools_dir=%depot_tools_dir%"
+cd %depot_tools_dir% && call git reset HEAD --hard && echo depot_tools is ready
+cd %working_dir%
+
+if "%1" == "get" (
+    rem fetch the repo
+    echo Fetching code. This will take a long time and download up to 16GB.
+    echo Deleting src folder.
+    if exist src rmdir /Q /S src
+    echo Deleted src folder.
+    
+    call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
+    call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+)
+
+rem change to needed branch
+cd src\electron
+echo Checking out %checkout_tag% in %cd%
+call git checkout %checkout_tag%
+cd ..
+
+rem echo Show Changes
+rem call git status
+echo Commit all Changes so sync with patches will not fail?
+rem this is a hack so that Windows sync will not fail when there are uncommitted changes after git checkout
+call git add -A
+call git commit -m "commit changes" --author="A U Thor <author@example.com>"
+cd ..
+
+echo Applying electron patches
+call gclient sync --with_branch_heads --with_tags
+
+echo Applying graphite patches
+cd .\src
+git apply .\electron\docs\development\Electronite\add_graphite_cpp_std_iterator.patch
+cd ..
+
+goto End
+
+:Build
+rem ####################
+rem build release
+rem ####################
+set build_x64=false
+if "%2" == "" set build_x64=true
+
+echo Building release
+cd src
+set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
+
+if %build_x64% == false (
+    echo Generating %2 configuration...
+    call gn gen out/Release-%2 --args="target_cpu=\"%2\" import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release-%2 electron
+) else (
+    echo Generating configuration...
+    call gn gen out/Release --args="import(\"//electron/build/args/release.gn\")"
+    call ninja -C out/Release electron
+)
+
+goto End
+
+:Release
+rem ####################
+rem create distributable
+rem ####################
+set build_x64=false
+if "%2" == "" set build_x64=true
+
+echo Making release
+cd src
+
+if %build_x64% == false (
+    echo Creating %2 distributable
+    electron\script\strip-binaries.py -d out\Release-%2
+    call ninja -C out\Release-%2 electron:electron_dist_zip
+) else (
+    echo Creating distributable
+    electron\script\strip-binaries.py -d out\Release
+    call ninja -C out\Release electron:electron_dist_zip
+)
+
+goto End
+
+rem ####################
+rem help text
+rem ####################
+
+:MissingArgs
+    echo ***********************
+    echo *  Electronite Tools  *
+    echo ***********************
+    echo This is a set of tools for compiling electronite.
+    echo The source for electronite is at https://github.com/unfoldingWord-dev/electronite.
+    echo Usage: ./electronite-tools.sh ^<command^>
+    echo where ^<command^> is one of:
+    echo     get ^<ref^>     - fetches all of the code.
+    echo                       Where ^<ref^> is a branch or tag.
+    echo     build [arch]    - compiles Electronite. The default arch is x64, but you can specify x86.
+    echo     release [arch]  - creates the distributable. The default arch is x64, but you can specify x86.
+    echo For detailed instructions on building Electron
+    echo see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+    goto End
+
+:MissingTag
+    echo Missing the ^<ref^> to checkout. Please specify a tag or branch name.
+    goto End
+
+:End
+
+cd %working_dir%
+
+echo "%date% - %time%" > end_time.txt
diff --git a/docs/development/Electronite/electronite-tools-2.sh b/docs/development/Electronite/electronite-tools-2.sh
new file mode 100755
index 0000000000000..a2c60b8ddfba0
--- /dev/null
+++ b/docs/development/Electronite/electronite-tools-2.sh
@@ -0,0 +1,146 @@
+#!/bin/bash
+set -e
+
+ELECTRONITE_REPO="https://github.com/unfoldingWord/electronite"
+COMMAND=$1
+
+# Configure environment variables and paths
+export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
+echo "PATH = $PATH"
+export GIT_CACHE_PATH=`pwd`/git_cache
+mkdir -p "${GIT_CACHE_PATH}"
+
+# sccache no longer supported in Electron
+# export SCCACHE_BUCKET="electronjs-sccache"
+# export SCCACHE_TWO_TIER=true
+
+export NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+echo "GIT_CACHE_PATH=${GIT_CACHE_PATH}"
+echo "SCCACHE_BUCKET=${SCCACHE_BUCKET}"
+
+
+##########################
+# fetch code
+##########################
+if [ "$COMMAND" == "get" ] || [ "$COMMAND" == "switch" ]; then
+  if [ $# -ge 2 ]; then
+    BRANCH=$2
+  else
+    echo "Missing the <ref> to checkout. Please specify a tag or branch name."
+    exit 0
+  fi
+
+  if [ "$COMMAND" == "get" ]; then
+    if [ -d ./src ]; then
+      echo "Deleting old work folders in the background. This may take a long time with about 49GB and 850K files."
+      mv src src.old
+      # run in background
+      rm -rf src.old&
+    fi  
+  
+    echo "Fetching code. This will take a long time and download up to 16GB."
+    gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
+    gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+  fi
+  
+  cd src/electron
+  echo "Checking out $BRANCH"
+  git fetch --all
+  git checkout $BRANCH
+  cd -
+  echo "Applying electron patches"
+  gclient sync --with_branch_heads --with_tags
+  echo "Applying graphite patches"
+  cd ./src
+  git apply ./electron/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
+  cd ..
+  exit 0
+fi
+
+##########################
+# build release
+##########################
+if [ "$COMMAND" == "build" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET=$2
+    RELEASE_TARGET="-${TARGET}"
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu = \"${TARGET}\""
+    echo "Building for ${TARGET}"
+    if [ "$TARGET" == "arm64" ] && [ "`uname`" == "Linux" ]; then
+      export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} fatal_linker_warnings = false enable_linux_installer = false"
+    fi
+    echo "Building for \"${TARGET}\", extra args: \"${GN_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    echo "Building for default \"x64\", extra args: \"${GN_EXTRA_ARGS}\""
+  fi
+
+  echo "Building target: ${RELEASE_TARGET}"
+
+  cd src
+  export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+#  export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
+  echo "Generating configuration..."
+  gn gen out/Release${RELEASE_TARGET} --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
+  ninja -C out/Release${RELEASE_TARGET} electron
+  cd -
+  exit 0
+fi
+
+##########################
+# create distributable
+##########################
+if [ "$COMMAND" == "release" ]; then
+  if [ $# -ge 2 ]; then
+    TARGET="$2"
+    RELEASE_TARGET="-${TARGET}"
+    STRIP_EXTRA_ARGS=--target-cpu=$TARGET
+    export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} target_cpu=\"${TARGET}\""
+    echo "Releasing for \"${TARGET}\", extra args: \"${STRIP_EXTRA_ARGS}\""
+  else
+    RELEASE_TARGET=""
+    STRIP_EXTRA_ARGS=""
+    echo "Releasing for default \"x64\", extra args: \"${STRIP_EXTRA_ARGS}\""    
+  fi
+
+  echo "Releasing: ${RELEASE_TARGET}"
+
+  echo "Creating distributable"
+  cd src
+  if [ "`uname`" != "Darwin" ]; then
+    ./electron/script/strip-binaries.py ${STRIP_EXTRA_ARGS} -d out/Release${RELEASE_TARGET}
+  fi
+  ninja -C out/Release${RELEASE_TARGET} electron:electron_dist_zip
+  exit 0
+fi
+
+##########################
+# help
+##########################
+if [ "$COMMAND" == "" ]; then
+  echo "***********************
+*  Electronite Tools  *
+***********************
+This is a set of tools for compiling Electronite.
+The source for Electronite is at https://github.com/unfoldingWord-dev/electronite.
+
+Usage: ./electronite-tools.sh <command>
+
+where <command> is one of:
+
+    get <ref> - fetches all of the code.
+                Where <ref> is a branch or tag.
+
+    switch <ref> - changes the checked out tag/branch and then updates the code to match that.
+                   Where <ref> is a branch or tag.
+
+    build <target> - compiles Electronite, target is optional, defaults to x64,
+                       Could be arm64.
+
+    release <target> - creates the distributable.  Use same target as
+                       previous build.
+
+For detailed instructions on building Electron
+see https://github.com/electron/electron/blob/master/docs/development/build-instructions-gn.md
+"
+fi
\ No newline at end of file

From f522884edb0054adac721fc2bebc11d0d1c81d6b Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 05:56:08 -0400
Subject: [PATCH 795/811] update setup instructions

---
 docs/development/Electronite/LinuxBuildNotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index dece7cfd1c933..143f2ca70f0da 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -16,6 +16,7 @@ g++ --version
 sudo apt install python python3 python3-pip
 pip3 install --user --upgrade pip
 pip3 install --user pyobjc
+pip3 install importlib-metadata
 ```
 
 - installed electron build-tools (https://github.com/electron/build-tools):

From 95d40519fe177b6490c0a1c55f0b878f05d064ba Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 06:06:18 -0400
Subject: [PATCH 796/811] update setup instructions

---
 docs/development/Electronite/MacBuildNotes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 0dd2a09373bbd..e110b5f956feb 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -1,7 +1,7 @@
 ## Building Electronite on MacOS
 ### Setup on MacOS Big Sur
 - Configured using these notes as a reference: [build-instructions-macos](../build-instructions-macos.md)
-- Can build on Catalina by changing the build config. Change `~/Develop/Electronite-Build/src/electron/.circleci/config/base.yml` by setting `macos/parameters/xcode/default` to 12.4.0 (but will not get any speed up from goma, so probably best to set goma to `none`)
+- Can build on Monterey
 - Building for x64 does not work on M1 Silicon Macs, only for Arm64.  On Intel based Macs can build for both Arm64 and Intel x64
 - Make sure you have a lot of free disk space - need over 150GB free.
 - if you have trouble building with these notes, you could try the older Chromium Build tools: [MacBuildNotesChromeTools](MacBuildNotesChromeTools.md)
@@ -21,6 +21,7 @@ node --version
 ```
 pip3 install --user --upgrade pip
 pip3 install --user pyobjc
+pip3 install importlib-metadata
 ```
 - installed electron build-tools (https://github.com/electron/build-tools):
 ``` 

From 64706674af54a512c8bcbd4d1ccb3b470970bde7 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 06:12:41 -0400
Subject: [PATCH 797/811] update branch version

---
 docs/development/Electronite/LinuxBuildNotes.md             | 6 +++---
 docs/development/Electronite/MacBuildNotes.md               | 4 ++--
 docs/development/Electronite/WindowsBuildNotes.md           | 6 +++---
 .../Electronite/add_graphite_cpp_std_iterator.patch         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index 143f2ca70f0da..e2812e999fe0e 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -34,7 +34,7 @@ git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd
 ```
 export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
 e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v20.3.3-beta
+./electronite-tools-2.sh get electronite-v21.2.0-beta
 ```
 
 - Do build (takes a long time)
@@ -67,7 +67,7 @@ sudo apt-get install ia32-libs-gtk ia32-libs
 ```
 export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
 e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v20.3.3-beta
+./electronite-tools-2.sh get electronite-v21.2.0-beta
 ```
 
 - Build Init: to create `x86` builds, you must have installed the x86 dependencies mentioned in the Linux build instructions above.  Then run:
@@ -99,7 +99,7 @@ sudo apt-get install binutils-aarch64-linux-gnu
 ```
 export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
 e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v20.3.3-beta
+./electronite-tools-2.sh get electronite-v21.2.0-beta
 ```
 
 - Build Init: to create `arm64` builds, you must have installed the arm64 dependencies mentioned in the Linux build instructions above.  Then run:
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index e110b5f956feb..bfbd6979fa15e 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -43,7 +43,7 @@ git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd
 ```
 export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
 e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v20.3.3-beta
+./electronite-tools-2.sh get electronite-v21.2.0-beta
 ```
 
 - Do build (takes a long time)
@@ -71,7 +71,7 @@ Open elements tab, select body of html, do command-F to search, and search for `
 ```
 export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
 e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v20.3.3-beta
+./electronite-tools-2.sh get electronite-v21.2.0-beta
 ```
 
 - Do build (takes a long time)
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index 916026b44f295..a9650a81e9bdd 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -48,7 +48,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 
 - get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-.\electronite-tools-2.bat get electronite-v20.3.3-beta
+.\electronite-tools-2.bat get electronite-v21.2.0-beta
 ```
 
 - Do build (takes a long time)
@@ -74,7 +74,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 
 - get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-.\electronite-tools-2.bat get electronite-v20.3.3-beta
+.\electronite-tools-2.bat get electronite-v21.2.0-beta
 ```
 
 - Do build (takes a long time)
@@ -92,7 +92,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 
 -- get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources
 ```
-.\electronite-tools-2.bat get electronite-v20.3.3-beta
+.\electronite-tools-2.bat get electronite-v21.2.0-beta
 ```
 - 
 - Do build (takes a long time)
diff --git a/docs/development/Electronite/add_graphite_cpp_std_iterator.patch b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
index b7fb431ce3c71..19bb14da416d8 100755
--- a/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
+++ b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Thu Nov 3 15:48:39 2022
 From: Bruce <bruce.mclean@unfoldingword.org>
 Date: Thu Nov 3 2022 15:48:39 -0700
-Subject: [PATCH] fix C++ std::iterator in graphite to be compatible with latest standard -- patched for v20.3.3
+Subject: [PATCH] fix C++ std::iterator in graphite to be compatible with latest standard -- patched for v21.2.0
 
 diff --git a/third_party/graphite/graphite2/src/GlyphCache.cpp b/third_party/graphite/graphite2/src/GlyphCache.cpp
 index 282bdc18..336de3f1 100644

From 9446f6620d5bcf84b91c0b9440a209b006eb974d Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 06:27:03 -0400
Subject: [PATCH 798/811] fix switch in scripts

---
 docs/development/Electronite/electronite-tools-2.bat | 3 +++
 docs/development/Electronite/electronite-tools-2.sh  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/docs/development/Electronite/electronite-tools-2.bat b/docs/development/Electronite/electronite-tools-2.bat
index 095344a33e058..c01e6937a789b 100755
--- a/docs/development/Electronite/electronite-tools-2.bat
+++ b/docs/development/Electronite/electronite-tools-2.bat
@@ -59,6 +59,9 @@ if "%1" == "get" (
     
     call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
     call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+) else (
+  echo Deleting old graphite
+  rmdir /Q /S .\src\electron\third_party\graphite
 )
 
 rem change to needed branch
diff --git a/docs/development/Electronite/electronite-tools-2.sh b/docs/development/Electronite/electronite-tools-2.sh
index a2c60b8ddfba0..6e9e5ca178164 100755
--- a/docs/development/Electronite/electronite-tools-2.sh
+++ b/docs/development/Electronite/electronite-tools-2.sh
@@ -41,6 +41,9 @@ if [ "$COMMAND" == "get" ] || [ "$COMMAND" == "switch" ]; then
     echo "Fetching code. This will take a long time and download up to 16GB."
     gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
     gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
+  else
+    echo "Deleting old graphite"
+    rm -rf ./src/electron/third_party/graphite
   fi
   
   cd src/electron

From daf58e43bf3a934cb015dad2fb1bba1ec9c822d1 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 06:28:10 -0400
Subject: [PATCH 799/811] fix switch in scripts

---
 docs/development/Electronite/electronite-tools-2.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/development/Electronite/electronite-tools-2.bat b/docs/development/Electronite/electronite-tools-2.bat
index c01e6937a789b..5a5f9a1189dc7 100755
--- a/docs/development/Electronite/electronite-tools-2.bat
+++ b/docs/development/Electronite/electronite-tools-2.bat
@@ -67,6 +67,7 @@ if "%1" == "get" (
 rem change to needed branch
 cd src\electron
 echo Checking out %checkout_tag% in %cd%
+call git fetch --all
 call git checkout %checkout_tag%
 cd ..
 

From 713bdd124a1945db295e9b5b6d1b8a9f3f945827 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 06:32:12 -0400
Subject: [PATCH 800/811] remove switch in scripts - problems

---
 .../Electronite/electronite-tools-2.bat       | 22 +++++--------
 .../Electronite/electronite-tools-2.sh        | 31 +++++++------------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/docs/development/Electronite/electronite-tools-2.bat b/docs/development/Electronite/electronite-tools-2.bat
index 5a5f9a1189dc7..662087d19b52e 100755
--- a/docs/development/Electronite/electronite-tools-2.bat
+++ b/docs/development/Electronite/electronite-tools-2.bat
@@ -29,7 +29,6 @@ rem -------------
 rem start command
 rem -------------
 if "%1" == "get" goto Get
-if "%1" == "switch" goto Get
 if "%1" == "build" goto Build
 if "%1" == "release" goto Release
 goto MissingTag
@@ -50,21 +49,14 @@ echo depot_tools_dir=%depot_tools_dir%"
 cd %depot_tools_dir% && call git reset HEAD --hard && echo depot_tools is ready
 cd %working_dir%
 
-if "%1" == "get" (
-    rem fetch the repo
-    echo Fetching code. This will take a long time and download up to 16GB.
-    echo Deleting src folder.
-    if exist src rmdir /Q /S src
-    echo Deleted src folder.
-    
-    call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
-    call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
-) else (
-  echo Deleting old graphite
-  rmdir /Q /S .\src\electron\third_party\graphite
-)
+rem fetch code
+echo Fetching code. This will take a long time and download up to 16GB.
+echo Deleting src folder.
+if exist src rmdir /Q /S src
+echo Deleted src folder.
 
-rem change to needed branch
+call gclient config --name "src/electron" --unmanaged %ELECTRONITE_REPO%
+call gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
 cd src\electron
 echo Checking out %checkout_tag% in %cd%
 call git fetch --all
diff --git a/docs/development/Electronite/electronite-tools-2.sh b/docs/development/Electronite/electronite-tools-2.sh
index 6e9e5ca178164..91b58959c6630 100755
--- a/docs/development/Electronite/electronite-tools-2.sh
+++ b/docs/development/Electronite/electronite-tools-2.sh
@@ -22,7 +22,7 @@ echo "SCCACHE_BUCKET=${SCCACHE_BUCKET}"
 ##########################
 # fetch code
 ##########################
-if [ "$COMMAND" == "get" ] || [ "$COMMAND" == "switch" ]; then
+if [ "$COMMAND" == "get" ]; then
   if [ $# -ge 2 ]; then
     BRANCH=$2
   else
@@ -30,22 +30,16 @@ if [ "$COMMAND" == "get" ] || [ "$COMMAND" == "switch" ]; then
     exit 0
   fi
 
-  if [ "$COMMAND" == "get" ]; then
-    if [ -d ./src ]; then
-      echo "Deleting old work folders in the background. This may take a long time with about 49GB and 850K files."
-      mv src src.old
-      # run in background
-      rm -rf src.old&
-    fi  
-  
-    echo "Fetching code. This will take a long time and download up to 16GB."
-    gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
-    gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
-  else
-    echo "Deleting old graphite"
-    rm -rf ./src/electron/third_party/graphite
-  fi
-  
+  if [ -d ./src ]; then
+    echo "Deleting old work folders in the background. This may take a long time with about 49GB and 850K files."
+    mv src src.old
+    # run in background
+    rm -rf src.old&
+  fi  
+
+  echo "Fetching code. This will take a long time and download up to 16GB."
+  gclient config --name "src/electron" --unmanaged $ELECTRONITE_REPO
+  gclient sync --with_branch_heads --with_tags --nohooks --noprehooks
   cd src/electron
   echo "Checking out $BRANCH"
   git fetch --all
@@ -134,9 +128,6 @@ where <command> is one of:
     get <ref> - fetches all of the code.
                 Where <ref> is a branch or tag.
 
-    switch <ref> - changes the checked out tag/branch and then updates the code to match that.
-                   Where <ref> is a branch or tag.
-
     build <target> - compiles Electronite, target is optional, defaults to x64,
                        Could be arm64.
 

From 3364e79ca001fcecab2cb10b8fb8aa4088b2fe15 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 12:06:15 -0400
Subject: [PATCH 801/811] fix setup instructions

---
 docs/development/Electronite/LinuxBuildNotes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index e2812e999fe0e..29930c111fd3f 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -43,7 +43,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 ```
 
 - Test the build.
-    - Do `cd src/out/Release-x64 && electron`.
+    - Do `cd src/out/Release-x64 && ./electron`.
     - Open the developer console by typing`Control-Shift-I`.
     - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
     - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.

From 0165432a9d900fb7f77b8d2b74c8a4415b2d90f7 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 20:52:31 -0400
Subject: [PATCH 802/811] simplified build instructions

---
 .../Electronite/LinuxBuildNotes.md            | 18 ++++++----------
 docs/development/Electronite/MacBuildNotes.md | 12 ++++-------
 .../Electronite/WindowsBuildNotes.md          | 21 +++++++------------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index 29930c111fd3f..d3f33c6f8f437 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -40,6 +40,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 - Do build (takes a long time)
 ```
 ./electronite-tools-2.sh build x64
+./electronite-tools-2.sh release x64
 ```
 
 - Test the build.
@@ -50,10 +51,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
     - The example for Padauk from server will not be correct with the triangles.  So need to:
       Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- Make the release to ~/Develop/Electronite-Build/src/out/Release-x64/dist.zip
-```
-./electronite-tools-2.sh release x64
-```
+- The release is at ~/Develop/Electronite-Build/src/out/Release-x64/dist.zip
 
 #### Build x86
 - open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
@@ -80,13 +78,11 @@ cd ..
 - Do build (takes a long time)
 ```
 ./electronite-tools-2.sh build x86
-```
-
-- Make the release to ~/Develop/Electronite-Build/src/out/Release-x86/dist.zip
-```
 ./electronite-tools-2.sh release x86
 ```
 
+- The release is at ~/Develop/Electronite-Build/src/out/Release-x86/dist.zip
+
 #### Build Arm64
 - open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
 ```
@@ -112,9 +108,7 @@ cd ..
 - Do build (takes a long time)
 ```
 ./electronite-tools-2.sh build arm64
-```
-
-- Make the release to ~/Develop/Electronite-Build/src/out/Release-arm64/dist.zip
-```
 ./electronite-tools-2.sh release arm64
 ```
+
+- The release is at ~/Develop/Electronite-Build/src/out/Release-arm64/dist.zip
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index bfbd6979fa15e..f3c9dbbf18d8e 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -49,6 +49,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 - Do build (takes a long time)
 ```
 ./electronite-tools-2.sh build x64
+./electronite-tools-2.sh release x64
 ```
 
 - Test the build. 
@@ -59,10 +60,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
   - The example for Padauk from server will not be correct with the triangles.  So need to:
 Open elements tab, select body of html, do command-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- Make the release to ~/Develop/Electronite-Build/src/out/x64/dist.zip
-```
-./electronite-tools-2.sh release x64
-```
+- The release is at ~/Develop/Electronite-Build/src/out/x64/dist.zip
 
 #### Build Arm64
 - if Electronite source already checked out, then skip to `Do build` step:
@@ -77,9 +75,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 - Do build (takes a long time)
 ```
 ./electronite-tools-2.sh build arm64
-```
-
-- Make the release to ~/Develop/Electronite-Build/src/out/arm64/dist.zip
-```
 ./electronite-tools-2.sh release arm64
 ```
+
+- The release is at ~/Develop/Electronite-Build/src/out/arm64/dist.zip
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index a9650a81e9bdd..cc91ba52589e5 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -54,6 +54,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 - Do build (takes a long time)
 ```
 .\electronite-tools-2.bat build x64
+.\electronite-tools-2.bat release x64
 ```
 
 - Test the build.
@@ -64,10 +65,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
     - The example for Padauk from server will not be correct with the triangles.  So need to:
       Open elements tab, select body of html, do Control-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- Make the release to .\Build-Electron\src\out\Release-x64\dist.zip
-```
-.\electronite-tools-2.bat release x64
-```
+- The release is at .\Build-Electron\src\out\Release-x64\dist.zip
 
 #### Build Intel x86 (32 bit)
 - if Electronite source already checked out, then skip to `Do build` step.
@@ -80,13 +78,11 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 - Do build (takes a long time)
 ```
 .\electronite-tools-2.bat build x86
-```
-
-- Make the release to .\Build-Electron\src\out\Release-x86\dist.zip
-```
 .\electronite-tools-2.bat release x86
 ```
 
+- The release is at .\Build-Electron\src\out\Release-x86\dist.zip
+
 #### Build Intel arm64
 - if Electronite source already checked out, then skip to `Do build` step.
 
@@ -94,14 +90,13 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 ```
 .\electronite-tools-2.bat get electronite-v21.2.0-beta
 ```
-- 
+
 - Do build (takes a long time)
 ```
 .\electronite-tools-2.bat build arm64
-```
-
-- Make the release to .\Build-Electron\src\out\Release-arm64\dist.zip
-```
 .\electronite-tools-2.bat release arm64
 ```
 
+- The release is at .\Build-Electron\src\out\Release-arm64\dist.zip
+
+

From bdf6a52c876ceab572a2d2fda487fe96ccf0dd8c Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sat, 5 Nov 2022 22:09:19 -0400
Subject: [PATCH 803/811] fix build instructions

---
 docs/development/Electronite/MacBuildNotes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index f3c9dbbf18d8e..a7ba7f6212047 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -53,7 +53,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 ```
 
 - Test the build. 
-  - Do `e start`. (or `open /src/out/Release-x64/Electron.app`)
+  - Do `e start`. (or `open ./src/out/Release-x64/Electron.app`)
   - Open the developer console by typing`Command-Alt-I`.
   - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
   - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.

From 12152dc7f7a142db95350328702a89060775d953 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sun, 6 Nov 2022 07:12:32 -0500
Subject: [PATCH 804/811] fix build instructions

---
 docs/development/Electronite/MacBuildNotes.md     | 4 ++--
 docs/development/Electronite/WindowsBuildNotes.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index a7ba7f6212047..70b8a0fd3fc07 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -60,7 +60,7 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
   - The example for Padauk from server will not be correct with the triangles.  So need to:
 Open elements tab, select body of html, do command-F to search, and search for `padauk_ttf`, and apply attribute `font-feature-settings: "wtri" 1;`.  The triangles should now be rendered correctly.
 
-- The release is at ~/Develop/Electronite-Build/src/out/x64/dist.zip
+- The release is at ~/Develop/Electronite-Build/src/out/Release-x64/dist.zip
 
 #### Build Arm64
 - if Electronite source already checked out, then skip to `Do build` step:
@@ -78,4 +78,4 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 ./electronite-tools-2.sh release arm64
 ```
 
-- The release is at ~/Develop/Electronite-Build/src/out/arm64/dist.zip
+- The release is at ~/Develop/Electronite-Build/src/out/Release-arm64/dist.zip
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index cc91ba52589e5..fe83a642e859a 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -58,7 +58,7 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 ```
 
 - Test the build.
-    - Do `e start`.
+    - Do `e start`.  Or open electron.exe in finder.
     - Open the developer console by typing`Control-Shift-I`.
     - in console execute `window.location="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_fontdemo"`
     - Ensure all the tests pass by visually inspecting the rendered fonts and comparing against the image samples on the site.

From 5c0a322d2522951cab3ebd1ee2ef965a383e6d0f Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Sun, 6 Nov 2022 20:51:32 -0500
Subject: [PATCH 805/811] fix build instructions

---
 .../Electronite/LinuxBuildNotes.md            | 33 ++-----------------
 .../Electronite/WindowsBuildNotes.md          |  1 -
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index d3f33c6f8f437..8a84eae48cd48 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -28,6 +28,9 @@ npm i -g @electron/build-tools
 git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd ~/.electron_build_tools && npm install)
 ``` 
 
+- note 32-bit builds for Linux no longer supported.
+
+
 ### Build Electronite
 #### Build x64
 - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
@@ -53,36 +56,6 @@ e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fo
 
 - The release is at ~/Develop/Electronite-Build/src/out/Release-x64/dist.zip
 
-#### Build x86
-- open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
-```
-sudo apt-get install ia32-libs-gtk ia32-libs
-```
-
-- if Electronite source already checked out, then skip to `Build Init` step.
-
-- get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
-```
-export PATH=$PATH:~/.electron_build_tools/third_party/depot_tools:~/.electron_build_tools/src
-e init --root=~/Develop/Electronite-Build -o x64 x64 -i release --goma none --fork unfoldingWord/electronite --use-https -f
-./electronite-tools-2.sh get electronite-v21.2.0-beta
-```
-
-- Build Init: to create `x86` builds, you must have installed the x86 dependencies mentioned in the Linux build instructions above.  Then run:
-```
-cd ./src
-build/linux/sysroot_scripts/install-sysroot.py --arch=x86
-cd ..
-```
-
-- Do build (takes a long time)
-```
-./electronite-tools-2.sh build x86
-./electronite-tools-2.sh release x86
-```
-
-- The release is at ~/Develop/Electronite-Build/src/out/Release-x86/dist.zip
-
 #### Build Arm64
 - open terminal and initialize build configuration (note that if you have a slow or unreliable internet connection, it is better to change the goma setting from `cache-only` to `none`):
 ```
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index fe83a642e859a..685de6b38c283 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -99,4 +99,3 @@ e init --root=. -o x64 x64 -i release --goma none --fork unfoldingWord/electroni
 
 - The release is at .\Build-Electron\src\out\Release-arm64\dist.zip
 
-

From 8e72aa880a1323f2150a54149e58d1f5d312adc9 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Mon, 7 Nov 2022 05:36:27 -0500
Subject: [PATCH 806/811] fix build instructions

---
 docs/development/Electronite/LinuxBuildNotes.md   | 2 ++
 docs/development/Electronite/MacBuildNotes.md     | 2 ++
 docs/development/Electronite/WindowsBuildNotes.md | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index 8a84eae48cd48..d5b553d264d13 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -32,6 +32,8 @@ git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd
 
 
 ### Build Electronite
+- first make sure you have downloaded the current version of electronite-tools-2.sh.  There may have been changes from other electronite versions.
+
 #### Build x64
 - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 70b8a0fd3fc07..6468ed99eb266 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -38,6 +38,8 @@ git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd
 
 
 ### Build Electronite
+- first make sure you have downloaded the current version of electronite-tools-2.sh.  There may have been changes from other electronite versions.
+
 #### Build Intel x64
 - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded):
 ```
diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md
index 685de6b38c283..b2221d5dda703 100644
--- a/docs/development/Electronite/WindowsBuildNotes.md
+++ b/docs/development/Electronite/WindowsBuildNotes.md
@@ -40,6 +40,8 @@ npm i
 - if you browse to http://localhost:8088 on your local machine you can monitor compile jobs as they flow through the goma system.
 
 ### Build Electronite
+- first make sure you have downloaded the current version of electronite-tools-2.bat.  There may have been changes from other electronite versions.
+
 #### Build Intel x64
 - open command prompt, cd to the build directory, and initialize build configuration:
 ```

From 4af4d6b3906ad395d8556c15763eac94c5596c75 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Wed, 9 Nov 2022 05:32:28 -0500
Subject: [PATCH 807/811] improve build instructions

---
 docs/development/Electronite/LinuxBuildNotes.md | 1 +
 docs/development/Electronite/MacBuildNotes.md   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index d5b553d264d13..9ac188b19bb39 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -21,6 +21,7 @@ pip3 install importlib-metadata
 
 - installed electron build-tools (https://github.com/electron/build-tools):
 ```
+npm i -g yarn
 npm i -g @electron/build-tools
 ```
 - if e commands don’t work, try this and then initialization seemed to work:
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 6468ed99eb266..7461fd2cbc15b 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -25,6 +25,7 @@ pip3 install importlib-metadata
 ```
 - installed electron build-tools (https://github.com/electron/build-tools):
 ``` 
+npm i -g yarn
 sudo npm i -g @electron/build-tools
 ```
 

From 6893c55a29f8c87f252b3b13116cc8323243ae57 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Wed, 9 Nov 2022 05:33:10 -0500
Subject: [PATCH 808/811] improve build instructions

---
 docs/development/Electronite/LinuxBuildNotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index 9ac188b19bb39..f8e55f0fece33 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -24,6 +24,7 @@ pip3 install importlib-metadata
 npm i -g yarn
 npm i -g @electron/build-tools
 ```
+
 - if e commands don’t work, try this and then initialization seemed to work:
 ```
 git clone https://github.com/electron/build-tools ~/.electron_build_tools && (cd ~/.electron_build_tools && npm install)

From dcaf6ab126ab2aaf43e3ad70ba49be2b86d0a914 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Wed, 9 Nov 2022 07:00:49 -0500
Subject: [PATCH 809/811] improve build instructions

---
 docs/development/Electronite/MacBuildNotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index 7461fd2cbc15b..bc4471444389d 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -25,6 +25,7 @@ pip3 install importlib-metadata
 ```
 - installed electron build-tools (https://github.com/electron/build-tools):
 ``` 
+xcode-select --install
 npm i -g yarn
 sudo npm i -g @electron/build-tools
 ```

From 6f2e500f05401531143ab296938404be6eeefbd8 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Wed, 9 Nov 2022 12:55:09 -0500
Subject: [PATCH 810/811] update build notes

---
 docs/development/Electronite/LinuxBuildNotes.md | 1 +
 docs/development/Electronite/MacBuildNotes.md   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md
index f8e55f0fece33..6ba6ebe0286c2 100644
--- a/docs/development/Electronite/LinuxBuildNotes.md
+++ b/docs/development/Electronite/LinuxBuildNotes.md
@@ -19,6 +19,7 @@ pip3 install --user pyobjc
 pip3 install importlib-metadata
 ```
 
+- use node v16 (had build problems with latest v18)
 - installed electron build-tools (https://github.com/electron/build-tools):
 ```
 npm i -g yarn
diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md
index bc4471444389d..975ea40b4ad6a 100644
--- a/docs/development/Electronite/MacBuildNotes.md
+++ b/docs/development/Electronite/MacBuildNotes.md
@@ -9,10 +9,10 @@
 - installed node using nvm
   - install nvm: `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash`
   - restart terminal
-  - install latest stable node:
+  - install v16 (had build problems with latest v18):
 ```
-nvm install --lts
-nvm use --lts
+nvm install v16
+nvm use v16
 node --version
 ```
 - installed homebrew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"`

From 7d97f5e0a396880595fd52339818968f432a2441 Mon Sep 17 00:00:00 2001
From: blm <mcleanb@photo-nomad.net>
Date: Thu, 8 Dec 2022 10:09:39 -0500
Subject: [PATCH 811/811] resolve merge conflicts

---
 patches/chromium/.patches                     |   5 -
 .../chromium/cherry-pick-e2b8856012e0.patch   |  88 ---------
 ...e_incorrect_width_height_adjustments.patch |  39 ----
 patches/nan/.patches                          |   1 -
 ...use_new_constructor_for_scriptorigin.patch |  42 -----
 patches/node/.patches                         |  11 --
 ...rotect_fork_in_uv_spawn_from_signals.patch | 173 ------------------
 patches/webrtc/.patches                       |   1 -
 patches/webrtc/cherry-pick-a18fddcb53e6.patch |  48 -----
 shell/common/node_bindings_win.h              |   6 -
 spec-main/api-protocol-spec.ts                |   5 +-
 11 files changed, 1 insertion(+), 418 deletions(-)
 delete mode 100644 patches/chromium/cherry-pick-e2b8856012e0.patch
 delete mode 100644 patches/chromium/remove_incorrect_width_height_adjustments.patch
 delete mode 100644 patches/nan/use_new_constructor_for_scriptorigin.patch
 delete mode 100644 patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
 delete mode 100644 patches/webrtc/cherry-pick-a18fddcb53e6.patch

diff --git a/patches/chromium/.patches b/patches/chromium/.patches
index e1eff81eafae5..c4566ca063778 100644
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -102,11 +102,6 @@ fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
 fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
-remove_incorrect_width_height_adjustments.patch
-introduce_ozoneplatform_electron_can_call_x11_property.patch
-make_gtk_getlibgtk_public.patch
-cherry-pick-e2b8856012e0.patch
-add_graphite.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
diff --git a/patches/chromium/cherry-pick-e2b8856012e0.patch b/patches/chromium/cherry-pick-e2b8856012e0.patch
deleted file mode 100644
index 29addf1a159d5..0000000000000
--- a/patches/chromium/cherry-pick-e2b8856012e0.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xiaocheng Hu <xiaochengh@chromium.org>
-Date: Mon, 18 Apr 2022 01:14:45 +0000
-Subject: Sanitize DragData markup before inserting it into document
-
-(cherry picked from commit 5164a0fe3391283663e1196cf4576ec233985e89)
-
-Fixed: 1315040
-Change-Id: I8a0ddfb983d12c185f7e943d3d5277788199b011
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3579670
-Quick-Run: Xiaocheng Hu <xiaochengh@chromium.org>
-Auto-Submit: Xiaocheng Hu <xiaochengh@chromium.org>
-Reviewed-by: Kent Tamura <tkent@chromium.org>
-Commit-Queue: Kent Tamura <tkent@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#991324}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3588887
-Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4951@{#831}
-Cr-Branched-From: 27de6227ca357da0d57ae2c7b18da170c4651438-refs/heads/main@{#982481}
-
-diff --git a/third_party/blink/renderer/core/page/drag_data.cc b/third_party/blink/renderer/core/page/drag_data.cc
-index 2ce56b1fefe016ac34a1a3011a595fab342abfa5..4fb86bc645386ee806544ee3647b0a333cd8afc4 100644
---- a/third_party/blink/renderer/core/page/drag_data.cc
-+++ b/third_party/blink/renderer/core/page/drag_data.cc
-@@ -131,8 +131,8 @@ DocumentFragment* DragData::AsFragment(LocalFrame* frame) const {
-     platform_drag_data_->HtmlAndBaseURL(html, base_url);
-     DCHECK(frame->GetDocument());
-     if (DocumentFragment* fragment =
--            CreateFragmentFromMarkup(*frame->GetDocument(), html, base_url,
--                                     kDisallowScriptingAndPluginContent))
-+            CreateSanitizedFragmentFromMarkupWithContext(
-+                *frame->GetDocument(), html, 0, html.length(), base_url))
-       return fragment;
-   }
- 
-diff --git a/third_party/blink/web_tests/editing/pasteboard/drag-and-drop-svg-use-sanitize.html b/third_party/blink/web_tests/editing/pasteboard/drag-and-drop-svg-use-sanitize.html
-new file mode 100644
-index 0000000000000000000000000000000000000000..58551d28341d851dbd99322e2a5d3af68b3b0c72
---- /dev/null
-+++ b/third_party/blink/web_tests/editing/pasteboard/drag-and-drop-svg-use-sanitize.html
-@@ -0,0 +1,47 @@
-+<!doctype html>
-+<script src="../../resources/testharness.js"></script>
-+<script src="../../resources/testharnessreport.js"></script>
-+
-+<div id="drag-from" draggable=true>Drag from</div>
-+<div id="drag-to" contenteditable>Drag to</div>
-+
-+<script>
-+function computePoint(element) {
-+  return {
-+     x: element.offsetLeft + element.offsetWidth / 2,
-+     y: element.offsetTop + element.offsetHeight / 2
-+  };
-+}
-+
-+let dragged = false;
-+let executed = false;
-+const payload = `
-+  <svg><use href="data:image/svg+xml,&lt;svg id='x' xmlns='http://www.w3.org/2000/svg'&gt;&lt;image href='fake' onerror='executed=true' /&gt;&lt;/svg&gt;#x" />
-+`;
-+
-+const dragFrom = document.getElementById('drag-from');
-+dragFrom.ondragstart = event => {
-+  dragged = true;
-+  event.dataTransfer.setData('text/html', payload);
-+}
-+
-+const dragTo = document.getElementById('drag-to');
-+
-+promise_test(async test => {
-+  assert_own_property(window, 'eventSender', 'This test requires eventSender to simulate drag and drop');
-+
-+  const fromPoint = computePoint(dragFrom);
-+  eventSender.mouseMoveTo(fromPoint.x, fromPoint.y);
-+  eventSender.mouseDown();
-+
-+  const toPoint = computePoint(dragTo);
-+  eventSender.mouseMoveTo(toPoint.x, toPoint.y);
-+  eventSender.mouseUp();
-+
-+  assert_true(dragged, 'Element should be dragged');
-+
-+  // The 'error' event is dispatched asynchronously.
-+  await new Promise(resolve => test.step_timeout(resolve, 100));
-+  assert_false(executed, 'Script should be blocked');
-+}, 'Script in SVG use href should be sanitized');
-+</script>
diff --git a/patches/chromium/remove_incorrect_width_height_adjustments.patch b/patches/chromium/remove_incorrect_width_height_adjustments.patch
deleted file mode 100644
index 4fce52ba6e282..0000000000000
--- a/patches/chromium/remove_incorrect_width_height_adjustments.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bruce Dawson <brucedawson@chromium.org>
-Date: Mon, 28 Feb 2022 19:07:41 +0000
-Subject: Remove incorrect width/height adjustments
-
-In late 2016 a change which fixed some problems around window sizing
-when attaching or detaching additional displays was landed, which fixed
-some genuine bugs. Unfortunately it included a subtraction of 1 from the
-width and height of the Chrome window. I couldn't find any discussion of
-this size adjustment and I think that it was just a misunderstanding of
-how window rectangles work (inclusive versus exclusive extents).
-
-This size adjustment causes non-maximized Chrome windows to shrink every
-time a monitor is added or removed. The problematic commit was found
-by the bug-filer through a bisect of more than four years of Chrome
-history - I'm just landing the fix that they suggested.
-
-Bug: 1300415
-Change-Id: Ief124f584a91aa9cc3f10704b0cc1e83356dea5b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3492658
-Reviewed-by: Allen Bauer <kylixrd@chromium.org>
-Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#975872}
-
-diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index 264a9109e42c23e9be6bf7269b3cfee2634b61e4..86f06d2a2c9588a2210a9f78f47e73f1b7c5e329 100644
---- a/ui/views/win/hwnd_message_handler.cc
-+++ b/ui/views/win/hwnd_message_handler.cc
-@@ -2834,8 +2834,8 @@ void HWNDMessageHandler::OnWindowPosChanging(WINDOWPOS* window_pos) {
-       // (Win+Shift+Arrows). See crbug.com/656001.
-       window_rect.left = window_pos->x;
-       window_rect.top = window_pos->y;
--      window_rect.right = window_pos->x + window_pos->cx - 1;
--      window_rect.bottom = window_pos->y + window_pos->cy - 1;
-+      window_rect.right = window_pos->x + window_pos->cx;
-+      window_rect.bottom = window_pos->y + window_pos->cy;
-     }
- 
-     HMONITOR monitor;
diff --git a/patches/nan/.patches b/patches/nan/.patches
index 810fabe98ca71..55f1dd90c6bb6 100644
--- a/patches/nan/.patches
+++ b/patches/nan/.patches
@@ -1,3 +1,2 @@
-use_new_constructor_for_scriptorigin.patch
 use_new_constructor_for_scriptorigin_when_17_x.patch
 chore_remove_deprecated_accessorsignatures.patch
diff --git a/patches/nan/use_new_constructor_for_scriptorigin.patch b/patches/nan/use_new_constructor_for_scriptorigin.patch
deleted file mode 100644
index dfa36b750afc2..0000000000000
--- a/patches/nan/use_new_constructor_for_scriptorigin.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Rose <nornagon@nornagon.net>
-Date: Fri, 28 Jan 2022 13:46:07 -0800
-Subject: use new constructor for ScriptOrigin
-
-https://chromium-review.googlesource.com/c/v8/v8/+/3395880
-
-diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
-index 64c857996c4626f3a447bdb796d4d581a37d9299..95a12f9521b8c9bed0e5eed85b6e56917069ea09 100644
---- a/test/cpp/nannew.cpp
-+++ b/test/cpp/nannew.cpp
-@@ -248,7 +248,7 @@ NAN_METHOD(testScript) {
- 
- #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 8 ||                      \
-   (V8_MAJOR_VERSION == 8 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION >= 9))
--  ScriptOrigin origin(New("foo").ToLocalChecked(), 5);
-+  ScriptOrigin origin(v8::Isolate::GetCurrent(), New("foo").ToLocalChecked(), 5);
- #else
-   ScriptOrigin origin(New("foo").ToLocalChecked(), New(5));
- #endif
-diff --git a/test/cpp/news.cpp b/test/cpp/news.cpp
-index 5b54c0cedaaa824be71b8c6fee948139a34d3310..f0aa65cc80741d57ba6675f7d5d5908b24f601c5 100644
---- a/test/cpp/news.cpp
-+++ b/test/cpp/news.cpp
-@@ -114,7 +114,7 @@ NAN_METHOD(NewScript) {
- }
- 
- NAN_METHOD(NewScript2) {
--  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
-+  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
-   v8::Local<UnboundScript> script =
-       New<UnboundScript>(
-           New("2+4").ToLocalChecked()
-@@ -131,7 +131,7 @@ NAN_METHOD(CompileScript) {
- }
- 
- NAN_METHOD(CompileScript2) {
--  v8::ScriptOrigin origin(New<v8::String>("x").ToLocalChecked());
-+  v8::ScriptOrigin origin(v8::Isolate::GetCurrent(), New<v8::String>("x").ToLocalChecked());
-   v8::Local<BoundScript> script =
-       CompileScript(New("2+4").ToLocalChecked(), origin).ToLocalChecked();
-   info.GetReturnValue().Set(
diff --git a/patches/node/.patches b/patches/node/.patches
index 8d6d4b15dc3c6..298d3c8426171 100644
--- a/patches/node/.patches
+++ b/patches/node/.patches
@@ -18,15 +18,6 @@ repl_fix_crash_when_sharedarraybuffer_disabled.patch
 fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
 fix_crash_caused_by_gethostnamew_on_windows_7.patch
 fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
-fix_don_t_create_console_window_when_creating_process.patch
-darwin_remove_eprototype_error_workaround_3405.patch
-darwin_translate_eprototype_to_econnreset_3413.patch
-darwin_bump_minimum_supported_version_to_10_15_3406.patch
-fix_serdes_test.patch
-fix_failing_node_js_test_on_outdated.patch
-be_compatible_with_cppgc.patch
-process_monitor_for_exit_with_kqueue_on_bsds_3441.patch
-unix_protect_fork_in_uv_spawn_from_signals.patch
 fix_serdes_test.patch
 darwin_remove_eprototype_error_workaround_3405.patch
 darwin_translate_eprototype_to_econnreset_3413.patch
@@ -45,8 +36,6 @@ unix_remove_uv_cloexec_ioctl_3515.patch
 process_simplify_uv_write_int_calls_3519.patch
 macos_don_t_use_thread-unsafe_strtok_3524.patch
 process_fix_hang_after_note_exit_3521.patch
-worker_thread_add_asar_support.patch
-macos_avoid_posix_spawnp_cwd_bug_3597.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 fix_preserve_proper_method_names_as-is_in_error_stack.patch
 macos_avoid_posix_spawnp_cwd_bug_3597.patch
diff --git a/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch b/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
deleted file mode 100644
index e8f06d17973e6..0000000000000
--- a/patches/node/unix_protect_fork_in_uv_spawn_from_signals.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jameson Nash <vtjnash@gmail.com>
-Date: Thu, 29 Jul 2021 12:09:51 -0400
-Subject: unix: protect fork in uv_spawn from signals
-
-Years ago, we found that various kernels (linux, macOS) were known to
-fail if they try to deliver a signal during this syscall, so we prevent
-that from happening. They may have fixed those issues, but it is
-generally just a bad time for signals to arrive (glibc blocks them here,
-for example, including some more internal ones that it won't let us
-touch here).
-
-We try to be a bit conservative, and leave many signals unblocked which
-could happen during normal execution and should terminate the process if
-they do. There is a small race window after the child starts before we
-clear the old handlers, if the user was to send an fake signal from
-elsewhere, but that should be quite unlikely.
-
-PR-URL: https://github.com/libuv/libuv/pull/3251
-Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
-
-diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c
-index cfcba341e0e380ecd595e4b59e39c08a7b374a48..c1f6bd4b0076f0835caf83c45a6a896e7ae5def9 100644
---- a/deps/uv/src/unix/process.c
-+++ b/deps/uv/src/unix/process.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -223,13 +224,32 @@ static void uv__process_child_init(const uv_process_options_t* options,
-                                    int stdio_count,
-                                    int (*pipes)[2],
-                                    int error_fd) {
--  sigset_t set;
-+  sigset_t signewset;
-   int close_fd;
-   int use_fd;
--  int err;
-   int fd;
-   int n;
- 
-+  /* Reset signal disposition first. Use a hard-coded limit because NSIG is not
-+   * fixed on Linux: it's either 32, 34 or 64, depending on whether RT signals
-+   * are enabled. We are not allowed to touch RT signal handlers, glibc uses
-+   * them internally.
-+   */
-+  for (n = 1; n < 32; n += 1) {
-+    if (n == SIGKILL || n == SIGSTOP)
-+      continue;  /* Can't be changed. */
-+
-+#if defined(__HAIKU__)
-+    if (n == SIGKILLTHR)
-+      continue;  /* Can't be changed. */
-+#endif
-+
-+    if (SIG_ERR != signal(n, SIG_DFL))
-+      continue;
-+
-+    uv__write_errno(error_fd);
-+  }
-+
-   if (options->flags & UV_PROCESS_DETACHED)
-     setsid();
- 
-@@ -311,32 +331,10 @@ static void uv__process_child_init(const uv_process_options_t* options,
-     environ = options->env;
-   }
- 
--  /* Reset signal disposition.  Use a hard-coded limit because NSIG
--   * is not fixed on Linux: it's either 32, 34 or 64, depending on
--   * whether RT signals are enabled.  We are not allowed to touch
--   * RT signal handlers, glibc uses them internally.
--   */
--  for (n = 1; n < 32; n += 1) {
--    if (n == SIGKILL || n == SIGSTOP)
--      continue;  /* Can't be changed. */
--
--#if defined(__HAIKU__)
--    if (n == SIGKILLTHR)
--      continue;  /* Can't be changed. */
--#endif
--
--    if (SIG_ERR != signal(n, SIG_DFL))
--      continue;
--
--    uv__write_errno(error_fd);
--  }
--
--  /* Reset signal mask. */
--  sigemptyset(&set);
--  err = pthread_sigmask(SIG_SETMASK, &set, NULL);
--
--  if (err != 0)
--    uv__write_errno(error_fd);
-+  /* Reset signal mask just before exec. */
-+  sigemptyset(&signewset);
-+  if (sigprocmask(SIG_SETMASK, &signewset, NULL) != 0)
-+    abort();
- 
- #ifdef __MVS__
-   execvpe(options->file, options->args, environ);
-@@ -345,6 +343,7 @@ static void uv__process_child_init(const uv_process_options_t* options,
- #endif
- 
-   uv__write_errno(error_fd);
-+  abort();
- }
- #endif
- 
-@@ -356,6 +355,8 @@ int uv_spawn(uv_loop_t* loop,
-   /* fork is marked __WATCHOS_PROHIBITED __TVOS_PROHIBITED. */
-   return UV_ENOSYS;
- #else
-+  sigset_t signewset;
-+  sigset_t sigoldset;
-   int signal_pipe[2] = { -1, -1 };
-   int pipes_storage[8][2];
-   int (*pipes)[2];
-@@ -432,25 +433,41 @@ int uv_spawn(uv_loop_t* loop,
- 
-   /* Acquire write lock to prevent opening new fds in worker threads */
-   uv_rwlock_wrlock(&loop->cloexec_lock);
--  pid = fork();
- 
--  if (pid == -1) {
-+  /* Start the child with most signals blocked, to avoid any issues before we
-+   * can reset them, but allow program failures to exit (and not hang). */
-+  sigfillset(&signewset);
-+  sigdelset(&signewset, SIGKILL);
-+  sigdelset(&signewset, SIGSTOP);
-+  sigdelset(&signewset, SIGTRAP);
-+  sigdelset(&signewset, SIGSEGV);
-+  sigdelset(&signewset, SIGBUS);
-+  sigdelset(&signewset, SIGILL);
-+  sigdelset(&signewset, SIGSYS);
-+  sigdelset(&signewset, SIGABRT);
-+  if (pthread_sigmask(SIG_BLOCK, &signewset, &sigoldset) != 0)
-+    abort();
-+
-+  pid = fork();
-+  if (pid == -1)
-     err = UV__ERR(errno);
--    uv_rwlock_wrunlock(&loop->cloexec_lock);
--    uv__close(signal_pipe[0]);
--    uv__close(signal_pipe[1]);
--    goto error;
--  }
- 
--  if (pid == 0) {
-+  if (pid == 0)
-     uv__process_child_init(options, stdio_count, pipes, signal_pipe[1]);
-+
-+  if (pthread_sigmask(SIG_SETMASK, &sigoldset, NULL) != 0)
-     abort();
--  }
- 
-   /* Release lock in parent process */
-   uv_rwlock_wrunlock(&loop->cloexec_lock);
-+
-   uv__close(signal_pipe[1]);
- 
-+  if (pid == -1) {
-+    uv__close(signal_pipe[0]);
-+    goto error;
-+  }
-+
-   process->status = 0;
-   exec_errorno = 0;
-   do
diff --git a/patches/webrtc/.patches b/patches/webrtc/.patches
index b74a59b97d6fa..9cde1db8895b3 100644
--- a/patches/webrtc/.patches
+++ b/patches/webrtc/.patches
@@ -1,2 +1 @@
 add_thread_local_to_x_error_trap_cc.patch
-cherry-pick-a18fddcb53e6.patch
diff --git a/patches/webrtc/cherry-pick-a18fddcb53e6.patch b/patches/webrtc/cherry-pick-a18fddcb53e6.patch
deleted file mode 100644
index da5f2e41f9114..0000000000000
--- a/patches/webrtc/cherry-pick-a18fddcb53e6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Herre <herre@google.com>
-Date: Fri, 25 Mar 2022 09:33:14 +0100
-Subject: Filter out Mac StatusIndicator window from desktop capture list
-
-Since 12.2, the orange/red indicator at the top right of the screen shows up as a window in the Chrome getDisplayMedia() picker, as it's not filtered out by the existing filters. Screenshots in the bug.
-
-Bug: chromium:1297731, b/218211225
-Change-Id: I0f87e8d2af42a5a2e3d84f69fe73596e9cf35622
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251841
-Reviewed-by: Alexander Cooper <alcooper@chromium.org>
-Commit-Queue: Tony Herre <herre@google.com>
-Cr-Commit-Position: refs/heads/main@{#36350}
-
-diff --git a/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc
-index d2fb20ed4ca0689fd6f51ee994308e876680ab1e..5d881662ea2f2d86d2c33bf20f79d31ef4e7a481 100644
---- a/modules/desktop_capture/mac/window_list_utils.cc
-+++ b/modules/desktop_capture/mac/window_list_utils.cc
-@@ -31,6 +31,11 @@ namespace webrtc {
- 
- namespace {
- 
-+// WindowName of the status indicator dot shown since Monterey in the taskbar.
-+// Testing on 12.2.1 shows this is independent of system language setting.
-+const CFStringRef kStatusIndicator = CFSTR("StatusIndicator");
-+const CFStringRef kStatusIndicatorOwnerName = CFSTR("Window Server");
-+
- bool ToUtf8(const CFStringRef str16, std::string* str8) {
-   size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16),
-                                                     kCFStringEncodingUTF8) +
-@@ -145,6 +150,17 @@ bool GetWindowList(rtc::FunctionView<bool(CFDictionaryRef)> on_window,
-       continue;
-     }
- 
-+    CFStringRef window_owner_name = reinterpret_cast<CFStringRef>(
-+        CFDictionaryGetValue(window, kCGWindowOwnerName));
-+    // Ignore the red dot status indicator shown in the stats bar. Unlike the
-+    // rest of the system UI it has a window_layer of 0, so was otherwise
-+    // included. See crbug.com/1297731.
-+    if (window_title && CFEqual(window_title, kStatusIndicator) &&
-+        window_owner_name &&
-+        CFEqual(window_owner_name, kStatusIndicatorOwnerName)) {
-+      continue;
-+    }
-+
-     if (!on_window(window)) {
-       break;
-     }
diff --git a/shell/common/node_bindings_win.h b/shell/common/node_bindings_win.h
index 3cb0a8d53f648..a0dcd3378f909 100644
--- a/shell/common/node_bindings_win.h
+++ b/shell/common/node_bindings_win.h
@@ -14,14 +14,8 @@ class NodeBindingsWin : public NodeBindings {
  public:
   explicit NodeBindingsWin(BrowserEnvironment browser_env);
 
-  void PrepareMessageLoop() override;
-  void RunMessageLoop() override;
-
  private:
   void PollEvents() override;
-
-  // Indicates whether polling thread has been created.
-  bool initialized_ = false;
 };
 
 }  // namespace electron
diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
index c49c13b1344a5..7988724baf5b4 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec-main/api-protocol-spec.ts
@@ -785,10 +785,7 @@ describe('protocol module', () => {
       await expect(contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.notjs', {scope: './'})`)).to.be.rejected();
     });
 
-    // TODO(nornagon): I'm not sure why this isn't working, but I'm choosing to
-    // disable this test for now to land the roll. See
-    // https://github.com/electron/electron/issues/32664.
-    it.skip('should be able to register service worker for custom scheme', async () => {
+    it('should be able to register service worker for custom scheme', async () => {
       await contents.loadURL(`${serviceWorkerScheme}://${v4()}.com`);
       await contents.executeJavaScript(`navigator.serviceWorker.register('${v4()}.js', {scope: './'})`);
     });